Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[ion] 19352: - Reimplement Fast Mutex implementation in HAL/NT to be compatible with the real implementation. (Fast Mutex needs to raise IRQL).
by ion＠svn.reactos.com 19 Nov '05

19 Nov '05

- Reimplement Fast Mutex implementation in HAL/NT to be compatible with the real implementation. (Fast Mutex needs to raise IRQL). - Implement ExEnterCriticalRegionAndAcquireFastMutexUnsafe and ExReleaseFastMutexUnsafeAndLeaveCriticalRegion. - Make win32k use those two new functions so that it can continue running at PASSIVE_LEVEL. - Remove CcBrokenMutex and use the new APIs instead. - Implement and export ntoskrnl version of Fast Mutex - Update headers for new fast-mutex definition and API exports. - Fix RemoveEntryList in NDK. - Add exfuncs.h to NDK. - Fix path in mmtypes.h in NDK to be compatible to how it shoudl be included. Modified: trunk/reactos/hal/halx86/generic/fmutex.c Modified: trunk/reactos/include/ndk/arch/mmtypes.h Added: trunk/reactos/include/ndk/exfuncs.h Modified: trunk/reactos/include/ndk/ntndk.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/win32k/bitmaps.h Modified: trunk/reactos/ntoskrnl/cc/ccmutex.c Modified: trunk/reactos/ntoskrnl/cc/fs.c Modified: trunk/reactos/ntoskrnl/cc/pin.c Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/ex/fmutex.c Modified: trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml Modified: trunk/reactos/subsys/win32k/eng/driverobj.c Modified: trunk/reactos/subsys/win32k/include/inteng.h Modified: trunk/reactos/subsys/win32k/include/text.h Modified: trunk/reactos/subsys/win32k/ntuser/guicheck.c Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c Modified: trunk/reactos/subsys/win32k/ntuser/ntuser.c Modified: trunk/reactos/subsys/win32k/ntuser/ssec.c Modified: trunk/reactos/subsys/win32k/ntuser/timer.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/hal/halx86/generic/fmutex.c --- trunk/reactos/hal/halx86/generic/fmutex.c 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/hal/halx86/generic/fmutex.c 2005-11-19 22:13:35 UTC (rev 19352) @@ -1,54 +1,96 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS HAL * FILE: ntoskrnl/hal/x86/fmutex.c - * PURPOSE: Implements fast mutexes - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * Eric Kohl (ekohl(a)rz-online.de) - * UPDATE HISTORY: - * Created 09/06/2000 + * PURPOSE: Deprecated HAL Fast Mutex + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ +/* + * NOTE: Even HAL itself has #defines to use the Exi* APIs inside NTOSKRNL. + * These are only exported here for compatibility with really old + * drivers. Also note that in theory, these can be made much faster + * by using assembly and inlining all the operations, including + * raising and lowering irql. + */ + /* INCLUDES *****************************************************************/ #include <hal.h> #define NDEBUG #include <debug.h> +#undef ExAcquireFastMutex +#undef ExReleaseFastMutex +#undef ExTryToAcquireFastMutex + /* FUNCTIONS *****************************************************************/ -#undef KeEnterCriticalRegion -#undef KeLeaveCriticalRegion -VOID FASTCALL -ExAcquireFastMutex (PFAST_MUTEX FastMutex) +VOID +FASTCALL +ExAcquireFastMutex(PFAST_MUTEX FastMutex) { - KeEnterCriticalRegion(); - ExAcquireFastMutexUnsafe(FastMutex); + KIRQL OldIrql; + + /* Raise IRQL to APC */ + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* Decrease the count */ + if (InterlockedDecrement(&FastMutex->Count)) + { + /* Someone is still holding it, use slow path */ + FastMutex->Contention++; + KeWaitForSingleObject(&FastMutex->Gate, + WrExecutive, + WaitAny, + FALSE, + NULL); + } + + /* Set the owner and IRQL */ + FastMutex->Owner = KeGetCurrentThread(); + FastMutex->OldIrql = OldIrql; } +VOID +FASTCALL +ExReleaseFastMutex(PFAST_MUTEX FastMutex) +{ + /* Erase the owner */ + FastMutex->Owner = (PVOID)1; -VOID FASTCALL -ExReleaseFastMutex (PFAST_MUTEX FastMutex) -{ - ExReleaseFastMutexUnsafe(FastMutex); - KeLeaveCriticalRegion(); + /* Increase the count */ + if (InterlockedIncrement(&FastMutex->Count) <= 0) + { + /* Someone was waiting for it, signal the waiter */ + KeSetEventBoostPriority(&FastMutex->Gate, IO_NO_INCREMENT); + } + + /* Lower IRQL back */ + KfLowerIrql(FastMutex->OldIrql); } +BOOLEAN +FASTCALL +ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) +{ + KIRQL OldIrql; -BOOLEAN FASTCALL -ExTryToAcquireFastMutex (PFAST_MUTEX FastMutex) -{ - KeEnterCriticalRegion(); - if (InterlockedExchange(&FastMutex->Count, 0) == 1) + /* Raise to APC_LEVEL */ + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* Check if we can quickly acquire it */ + if (InterlockedCompareExchange(&FastMutex->Count, 0, 1) == 1) { - FastMutex->Owner = KeGetCurrentThread(); - return(TRUE); + /* We have, set us as owners */ + FastMutex->Owner = KeGetCurrentThread(); + return TRUE; } - else + else { - KeLeaveCriticalRegion(); - return(FALSE); + /* Acquire attempt failed */ + KfLowerIrql(OldIrql); + return FALSE; } } _____ Modified: trunk/reactos/include/ndk/arch/mmtypes.h --- trunk/reactos/include/ndk/arch/mmtypes.h 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/include/ndk/arch/mmtypes.h 2005-11-19 22:13:35 UTC (rev 19352) @@ -10,7 +10,7 @@ #define _ARCH_MMTYPES_H #ifdef _M_IX86 -#include <ndk/i386/mmtypes.h> +#include "./../i386/mmtypes.h" #else #error "Unknown processor" #endif _____ Added: trunk/reactos/include/ndk/exfuncs.h --- trunk/reactos/include/ndk/exfuncs.h 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/include/ndk/exfuncs.h 2005-11-19 22:13:35 UTC (rev 19352) @@ -0,0 +1,26 @@ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/exfuncs.h + * PURPOSE: Prototypes for exported Executive Functions not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _EXFUNCS_H +#define _EXFUNCS_H + +/* DEPENDENCIES **************************************************************/ + +/* FUNCTION TYPES ************************************************************/ + +/* PROTOTYPES ****************************************************************/ + +VOID +FASTCALL +ExEnterCriticalRegionAndAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex); + +VOID +FASTCALL +ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(PFAST_MUTEX FastMutex); + +#endif _____ Modified: trunk/reactos/include/ndk/ntndk.h --- trunk/reactos/include/ndk/ntndk.h 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/include/ndk/ntndk.h 2005-11-19 22:13:35 UTC (rev 19352) @@ -27,6 +27,7 @@ #include "haltypes.h" /* Hardware Abstraction Layer Types */ #include "halfuncs.h" /* Hardware Abstraction Layer Functions */ #include "inbvfuncs.h" /* Initialization Boot Video Functions */ +#include "exfuncs.h" /* Executive Functions */ #include "iofuncs.h" /* Input/Output Manager Functions */ #include "kefuncs.h" /* Kernel Functions */ #include "mmfuncs.h" /* Memory Manager Functions */ _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/include/ndk/rtltypes.h 2005-11-19 22:13:35 UTC (rev 19352) @@ -175,7 +175,7 @@ OldBlink = Entry->Blink; OldFlink->Blink = OldBlink; OldBlink->Flink = OldFlink; - return (OldFlink == OldBlink); + return (BOOLEAN)(OldFlink == OldBlink); } static __inline _____ Modified: trunk/reactos/include/win32k/bitmaps.h --- trunk/reactos/include/win32k/bitmaps.h 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/include/win32k/bitmaps.h 2005-11-19 22:13:35 UTC (rev 19352) @@ -1,4 +1,3 @@ - #ifndef __WIN32K_BITMAPS_H #define __WIN32K_BITMAPS_H @@ -38,8 +37,8 @@ BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody); BOOL INTERNAL_CALL BITMAPOBJ_InitBitsLock(BITMAPOBJ *pBMObj); -#define BITMAPOBJ_LockBitmapBits(pBMObj) ExAcquireFastMutex((pBMObj)->BitsLock) -#define BITMAPOBJ_UnlockBitmapBits(pBMObj) ExReleaseFastMutex((pBMObj)->BitsLock) +#define BITMAPOBJ_LockBitmapBits(pBMObj) ExEnterCriticalRegionAndAcquireFastMutexUnsafe((pBMObj)->BitsLock) +#define BITMAPOBJ_UnlockBitmapBits(pBMObj) ExReleaseFastMutexUnsafeAndLeaveCriticalRegion((pBMObj)->BitsLock) void INTERNAL_CALL BITMAPOBJ_CleanupBitsLock(BITMAPOBJ *pBMObj); INT FASTCALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp); _____ Modified: trunk/reactos/ntoskrnl/cc/ccmutex.c --- trunk/reactos/ntoskrnl/cc/ccmutex.c 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/ntoskrnl/cc/ccmutex.c 2005-11-19 22:13:35 UTC (rev 19352) @@ -26,7 +26,7 @@ InterlockedIncrementUL(&FastMutex->Contention); while (InterlockedExchange(&FastMutex->Count, 0) == 0) { - KeWaitForSingleObject(&FastMutex->Event, + KeWaitForSingleObject(&FastMutex->Gate, Executive, KernelMode, FALSE, @@ -50,7 +50,7 @@ InterlockedExchange(&FastMutex->Count, 1); if (FastMutex->Contention > 0) { - KeSetEvent(&FastMutex->Event, 0, FALSE); + KeSetEvent(&FastMutex->Gate, 0, FALSE); } } _____ Modified: trunk/reactos/ntoskrnl/cc/fs.c --- trunk/reactos/ntoskrnl/cc/fs.c 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/ntoskrnl/cc/fs.c 2005-11-19 22:13:35 UTC (rev 19352) @@ -153,7 +153,7 @@ if (FileSizes->AllocationSize.QuadPart < Bcb->AllocationSize.QuadPart) { InitializeListHead(&FreeListHead); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); current_entry = Bcb->BcbSegmentListHead.Flink; @@ -186,7 +186,7 @@ Bcb->AllocationSize = FileSizes->AllocationSize; Bcb->FileSize = FileSizes->FileSize; KeReleaseSpinLock(&Bcb->BcbLock, oldirql); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); current_entry = FreeListHead.Flink; while(current_entry != &FreeListHead) _____ Modified: trunk/reactos/ntoskrnl/cc/pin.c --- trunk/reactos/ntoskrnl/cc/pin.c 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/ntoskrnl/cc/pin.c 2005-11-19 22:13:35 UTC (rev 19352) @@ -236,7 +236,7 @@ IoStatus->Information = 0; if (WriteThrough) { - CcAcquireBrokenMutex(&iBcb->CacheSegment->Lock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&iBcb->CacheSegment->Lock ); if (iBcb->CacheSegment->Dirty) { IoStatus->Status = CcRosFlushCacheSegment(iBcb->CacheSegment); @@ -245,7 +245,7 @@ { IoStatus->Status = STATUS_SUCCESS; } - CcReleaseBrokenMutex(&iBcb->CacheSegment->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&iBcb->CacheSegment->Lock ); } else { _____ Modified: trunk/reactos/ntoskrnl/cc/view.c --- trunk/reactos/ntoskrnl/cc/view.c 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/ntoskrnl/cc/view.c 2005-11-19 22:13:35 UTC (rev 19352) @@ -110,6 +110,23 @@ NTSTATUS CcRosInternalFreeCacheSegment(PCACHE_SEGMENT CacheSeg); +BOOLEAN +FASTCALL +CcTryToAcquireBrokenMutex(PFAST_MUTEX FastMutex) +{ + KeEnterCriticalRegion(); + if (InterlockedExchange(&FastMutex->Count, 0) == 1) + { + FastMutex->Owner = KeGetCurrentThread(); + return(TRUE); + } + else + { + KeLeaveCriticalRegion(); + return(FALSE); + } +} + /* FUNCTIONS *****************************************************************/ VOID @@ -132,7 +149,7 @@ { DPRINT1("Enabling Tracing for CacheMap 0x%p:\n", Bcb ); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); current_entry = Bcb->BcbSegmentListHead.Flink; @@ -145,7 +162,7 @@ current, current->ReferenceCount, current->Dirty, current->PageOut ); } KeReleaseSpinLock(&Bcb->BcbLock, oldirql); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } else { @@ -167,14 +184,14 @@ Status = WriteCacheSegment(CacheSegment); if (NT_SUCCESS(Status)) { - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); KeAcquireSpinLock(&CacheSegment->Bcb->BcbLock, &oldIrql); CacheSegment->Dirty = FALSE; RemoveEntryList(&CacheSegment->DirtySegmentListEntry); DirtyPageCount -= CacheSegment->Bcb->CacheSegmentSize / PAGE_SIZE; CcRosCacheSegmentDecRefCount ( CacheSegment ); KeReleaseSpinLock(&CacheSegment->Bcb->BcbLock, oldIrql); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } return(Status); } @@ -195,7 +212,7 @@ (*Count) = 0; - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); WriteCount[0] = WriteCount[1]; WriteCount[1] = WriteCount[2]; @@ -235,13 +252,13 @@ ASSERT(current->Dirty); if (current->ReferenceCount > 1) { - CcReleaseBrokenMutex(&current->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&current->Lock); continue; } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); PagesPerSegment = current->Bcb->CacheSegmentSize / PAGE_SIZE; Status = CcRosFlushCacheSegment(current); - CcReleaseBrokenMutex(&current->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&current->Lock); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) { DPRINT1("CC: Failed to flush cache segment.\n"); @@ -251,14 +268,14 @@ (*Count) += PagesPerSegment; Target -= PagesPerSegment; } - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); current_entry = DirtySegmentListHead.Flink; } if (*Count < NewTarget) { WriteCount[1] += (NewTarget - *Count); } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); DPRINT("CcRosFlushDirtyPages() finished\n"); return(STATUS_SUCCESS); @@ -288,7 +305,7 @@ InitializeListHead(&FreeList); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); current_entry = CacheSegmentLRUListHead.Flink; while (current_entry != &CacheSegmentLRUListHead && Target > 0) { @@ -320,7 +337,7 @@ last = current; current->PageOut = TRUE; KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); for (i = 0; i < current->Bcb->CacheSegmentSize / PAGE_SIZE; i++) { PFN_TYPE Page; @@ -331,7 +348,7 @@ break; } } - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); CcRosCacheSegmentDecRefCount(current); current->PageOut = FALSE; @@ -342,7 +359,7 @@ KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); } } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); while (!IsListEmpty(&FreeList)) { @@ -375,7 +392,7 @@ CacheSeg->Valid = Valid; CacheSeg->Dirty = CacheSeg->Dirty || Dirty; - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); if (!WasDirty && CacheSeg->Dirty) { InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); @@ -399,8 +416,8 @@ CcRosCacheSegmentIncRefCount(CacheSeg); } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - CcReleaseBrokenMutex(&ViewLock); - CcReleaseBrokenMutex(&CacheSeg->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&CacheSeg->Lock); return(STATUS_SUCCESS); } @@ -428,7 +445,7 @@ { CcRosCacheSegmentIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - CcAcquireBrokenMutex(&current->Lock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&current->Lock); return(current); } current_entry = current_entry->Flink; @@ -455,10 +472,10 @@ } if (!CacheSeg->Dirty) { - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE; - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } else { @@ -469,7 +486,7 @@ CacheSeg->Dirty = TRUE; - CcReleaseBrokenMutex(&CacheSeg->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&CacheSeg->Lock); return(STATUS_SUCCESS); } @@ -500,10 +517,10 @@ if (!WasDirty && NowDirty) { - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE; - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); @@ -518,7 +535,7 @@ } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - CcReleaseBrokenMutex(&CacheSeg->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&CacheSeg->Lock); return(STATUS_SUCCESS); } @@ -568,8 +585,8 @@ current->DirtySegmentListEntry.Blink = NULL; current->ReferenceCount = 1; ExInitializeFastMutex(&current->Lock); - CcAcquireBrokenMutex(&current->Lock); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&current->Lock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); *CacheSeg = current; /* There is window between the call to CcRosLookupCacheSegment @@ -598,11 +615,11 @@ current ); } #endif - CcReleaseBrokenMutex(&(*CacheSeg)->Lock); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&(*CacheSeg)->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); ExFreeToNPagedLookasideList(&CacheSegLookasideList, *CacheSeg); *CacheSeg = current; - CcAcquireBrokenMutex(&current->Lock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&current->Lock); return STATUS_SUCCESS; } if (current->FileOffset < FileOffset) @@ -634,7 +651,7 @@ KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); InsertTailList(&CacheSegmentListHead, &current->CacheSegmentListEntry); InsertTailList(&CacheSegmentLRUListHead, &current->CacheSegmentLRUListEntry); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); #ifdef CACHE_BITMAP KeAcquireSpinLock(&CiCacheSegMappingRegionLock, &oldIrql); @@ -907,7 +924,7 @@ DPRINT("CcRosFreeCacheSegment(Bcb 0x%p, CacheSeg 0x%p)\n", Bcb, CacheSeg); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); RemoveEntryList(&CacheSeg->BcbSegmentListEntry); RemoveEntryList(&CacheSeg->CacheSegmentListEntry); @@ -919,7 +936,7 @@ } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); Status = CcRosInternalFreeCacheSegment(CacheSeg); return(Status); @@ -977,7 +994,7 @@ } } KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - CcReleaseBrokenMutex(&current->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&current->Lock); CcRosCacheSegmentDecRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); } @@ -1018,11 +1035,11 @@ ASSERT(Bcb); Bcb->RefCount++; - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); CcFlushCache(FileObject->SectionObjectPointer, NULL, 0, NULL); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); Bcb->RefCount--; if (Bcb->RefCount == 0) { @@ -1059,7 +1076,7 @@ #endif KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); ObDereferenceObject (Bcb->FileObject); while (!IsListEmpty(&FreeList)) @@ -1069,7 +1086,7 @@ Status = CcRosInternalFreeCacheSegment(current); } ExFreeToNPagedLookasideList(&BcbLookasideList, Bcb); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); } return(STATUS_SUCCESS); } @@ -1079,7 +1096,7 @@ CcRosReferenceCache(PFILE_OBJECT FileObject) { PBCB Bcb; - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); Bcb = (PBCB)FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(Bcb); if (Bcb->RefCount == 0) @@ -1094,7 +1111,7 @@ ASSERT(Bcb->BcbRemoveListEntry.Flink == NULL); } Bcb->RefCount++; - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } VOID @@ -1103,7 +1120,7 @@ { PBCB Bcb; DPRINT("CcRosSetRemoveOnClose()\n"); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); Bcb = (PBCB)SectionObjectPointer->SharedCacheMap; if (Bcb) { @@ -1113,7 +1130,7 @@ CcRosDeleteFileCache(Bcb->FileObject, Bcb); } } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } @@ -1122,7 +1139,7 @@ CcRosDereferenceCache(PFILE_OBJECT FileObject) { PBCB Bcb; - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); Bcb = (PBCB)FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(Bcb); if (Bcb->RefCount > 0) @@ -1142,7 +1159,7 @@ } } } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } NTSTATUS STDCALL @@ -1154,7 +1171,7 @@ { PBCB Bcb; - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); if (FileObject->SectionObjectPointer->SharedCacheMap != NULL) { @@ -1181,7 +1198,7 @@ } } } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); return(STATUS_SUCCESS); } @@ -1192,7 +1209,7 @@ PBCB Bcb; NTSTATUS Status; - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); Bcb = FileObject->SectionObjectPointer->SharedCacheMap; if (Bcb == NULL) @@ -1213,7 +1230,7 @@ } Status = STATUS_SUCCESS; } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); return Status; } @@ -1232,13 +1249,13 @@ DPRINT("CcRosInitializeFileCache(FileObject 0x%p, Bcb 0x%p, CacheSegmentSize %d)\n", FileObject, Bcb, CacheSegmentSize); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); if (Bcb == NULL) { Bcb = ExAllocateFromNPagedLookasideList(&BcbLookasideList); if (Bcb == NULL) { - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); return(STATUS_UNSUCCESSFUL); } memset(Bcb, 0, sizeof(BCB)); @@ -1269,7 +1286,7 @@ RemoveEntryList(&Bcb->BcbRemoveListEntry); Bcb->BcbRemoveListEntry.Flink = NULL; } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); return(STATUS_SUCCESS); } @@ -1324,7 +1341,7 @@ break; } - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); CcTimeStamp++; if (CcTimeStamp >= 30) { @@ -1340,7 +1357,7 @@ CcRosDeleteFileCache(current->FileObject, current); } } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } } _____ Modified: trunk/reactos/ntoskrnl/ex/fmutex.c --- trunk/reactos/ntoskrnl/ex/fmutex.c 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/ntoskrnl/ex/fmutex.c 2005-11-19 22:13:35 UTC (rev 19352) @@ -1,11 +1,9 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel * FILE: ntoskrnl/ex/fmutex.c * PURPOSE: Implements fast mutexes - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ /* INCLUDES *****************************************************************/ @@ -13,49 +11,194 @@ #include <ntoskrnl.h> #include <internal/debug.h> +VOID +FASTCALL +KiAcquireFastMutex(IN PFAST_MUTEX FastMutex); + /* FUNCTIONS *****************************************************************/ /* * @implemented */ -VOID FASTCALL -ExAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex) +VOID +FASTCALL +ExEnterCriticalRegionAndAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex) { - ASSERT(KeGetCurrentThread() == NULL || FastMutex->Owner != KeGetCurrentThread()); - ASSERT(KeGetCurrentIrql() == APC_LEVEL || - KeGetCurrentThread() == NULL || - KeGetCurrentThread()->KernelApcDisable); + PKTHREAD Thread = KeGetCurrentThread(); + + /* Enter the Critical Region */ + KeEnterCriticalRegion(); + ASSERT((KeGetCurrentIrql() == APC_LEVEL) || + (Thread == NULL) || + (Thread->CombinedApcDisable != 0) || + (Thread->Teb == NULL) || + (Thread->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); + ASSERT((Thread == NULL) || (FastMutex->Owner != Thread)); + + /* Decrease the count */ + if (InterlockedDecrement(&FastMutex->Count)) + { + /* Someone is still holding it, use slow path */ + KiAcquireFastMutex(FastMutex); + } + + /* Set the owner */ + FastMutex->Owner = Thread; +} + +/* + * @implemented + */ +VOID +FASTCALL +ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(PFAST_MUTEX FastMutex) +{ + ASSERT((KeGetCurrentIrql() == APC_LEVEL) || + (KeGetCurrentThread() == NULL) || + (KeGetCurrentThread()->CombinedApcDisable != 0) || + (KeGetCurrentThread()->Teb == NULL) || + (KeGetCurrentThread()->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); + ASSERT(FastMutex->Owner == KeGetCurrentThread()); - InterlockedIncrementUL(&FastMutex->Contention); - while (InterlockedExchange(&FastMutex->Count, 0) == 0) - { - KeWaitForSingleObject(&FastMutex->Event, - Executive, - KernelMode, - FALSE, - NULL); - } - InterlockedDecrementUL(&FastMutex->Contention); - FastMutex->Owner = KeGetCurrentThread(); + /* Erase the owner */ + FastMutex->Owner = NULL; + + /* Increase the count */ + if (InterlockedIncrement(&FastMutex->Count) <= 0) + { + /* Someone was waiting for it, signal the waiter */ + KeSetEventBoostPriority(&FastMutex->Gate, IO_NO_INCREMENT); + } + + /* Leave the critical region */ + KeLeaveCriticalRegion(); } /* * @implemented */ -VOID FASTCALL +VOID +FASTCALL +ExAcquireFastMutex(PFAST_MUTEX FastMutex) +{ + ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); + KIRQL OldIrql; + + /* Raise IRQL to APC */ + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* Decrease the count */ + if (InterlockedDecrement(&FastMutex->Count)) + { + /* Someone is still holding it, use slow path */ + KiAcquireFastMutex(FastMutex); + } + + /* Set the owner and IRQL */ + FastMutex->Owner = KeGetCurrentThread(); + FastMutex->OldIrql = OldIrql; +} + +/* + * @implemented + */ +VOID +FASTCALL +ExReleaseFastMutex (PFAST_MUTEX FastMutex) +{ + ASSERT_IRQL(APC_LEVEL); + + /* Erase the owner */ + FastMutex->Owner = NULL; + + /* Increase the count */ + if (InterlockedIncrement(&FastMutex->Count) <= 0) + { + /* Someone was waiting for it, signal the waiter */ + KeSetEventBoostPriority(&FastMutex->Gate, IO_NO_INCREMENT); + } + + /* Lower IRQL back */ + KfLowerIrql(FastMutex->OldIrql); +} + +/* + * @implemented + */ +VOID +FASTCALL +ExAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex) +{ + PKTHREAD Thread = KeGetCurrentThread(); + ASSERT((KeGetCurrentIrql() == APC_LEVEL) || + (Thread == NULL) || + (Thread->CombinedApcDisable != 0) || + (Thread->Teb == NULL) || + (Thread->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); + ASSERT((Thread == NULL) || (FastMutex->Owner != Thread)); + + /* Decrease the count */ + if (InterlockedDecrement(&FastMutex->Count)) + { + /* Someone is still holding it, use slow path */ + KiAcquireFastMutex(FastMutex); + } + + /* Set the owner */ + FastMutex->Owner = Thread; +} + +/* + * @implemented + */ +VOID +FASTCALL ExReleaseFastMutexUnsafe(PFAST_MUTEX FastMutex) { - ASSERT(KeGetCurrentThread() == NULL || FastMutex->Owner == KeGetCurrentThread()); - ASSERT(KeGetCurrentIrql() == APC_LEVEL || - KeGetCurrentThread() == NULL || - KeGetCurrentThread()->KernelApcDisable); + ASSERT((KeGetCurrentIrql() == APC_LEVEL) || + (KeGetCurrentThread() == NULL) || + (KeGetCurrentThread()->CombinedApcDisable != 0) || + (KeGetCurrentThread()->Teb == NULL) || + (KeGetCurrentThread()->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); + ASSERT(FastMutex->Owner == KeGetCurrentThread()); - FastMutex->Owner = NULL; - InterlockedExchange(&FastMutex->Count, 1); - if (FastMutex->Contention > 0) + /* Erase the owner */ + FastMutex->Owner = NULL; + + /* Increase the count */ + if (InterlockedIncrement(&FastMutex->Count) <= 0) { - KeSetEvent(&FastMutex->Event, 0, FALSE); + /* Someone was waiting for it, signal the waiter */ + KeSetEventBoostPriority(&FastMutex->Gate, IO_NO_INCREMENT); } } +/* + * @implemented + */ +BOOLEAN +FASTCALL +ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) +{ + ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); + KIRQL OldIrql; + + /* Raise to APC_LEVEL */ + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* Check if we can quickly acquire it */ + if (InterlockedCompareExchange(&FastMutex->Count, 0, 1) == 1) + { + /* We have, set us as owners */ + FastMutex->Owner = KeGetCurrentThread(); + return TRUE; + } + else + { + /* Acquire attempt failed */ + KfLowerIrql(OldIrql); + return FALSE; + } +} + /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/cc.h --- trunk/reactos/ntoskrnl/include/internal/cc.h 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/ntoskrnl/include/internal/cc.h 2005-11-19 22:13:35 UTC (rev 19352) @@ -1,18 +1,6 @@ #ifndef __INCLUDE_INTERNAL_CC_H #define __INCLUDE_INTERNAL_CC_H -VOID -FASTCALL -CcAcquireBrokenMutex(PFAST_MUTEX FastMutex); - -VOID -FASTCALL -CcReleaseBrokenMutex(PFAST_MUTEX FastMutex); - -BOOLEAN -FASTCALL -CcTryToAcquireBrokenMutex(PFAST_MUTEX FastMutex); - typedef struct _BCB { LIST_ENTRY BcbSegmentListHead; _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-11-19 22:13:35 UTC (rev 19352) @@ -1,11 +1,10 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS project + * PROJECT: ReactOS Kernel * FILE: ntoskrnl/ke/wait.c [truncated at 1000 lines; 539 more skipped]

1 0

[chorns] 19351: Create parent directory before creating the definition file
by chorns＠svn.reactos.com 19 Nov '05

19 Nov '05

Create parent directory before creating the definition file Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-19 19:20:51 UTC (rev 19350) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-19 21:07:25 UTC (rev 19351) @@ -1081,9 +1081,10 @@ CLEAN_FILE(stub_file) fprintf ( fMakefile, - "%s: %s $(WINEBUILD_TARGET)\n", + "%s: %s $(WINEBUILD_TARGET) | %s\n", def_file.c_str (), - dependencies.c_str () ); + dependencies.c_str (), + GetDirectory ( def_file ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" ); fprintf ( fMakefile, "\t%s -o %s --def -E %s\n",

1 0

[weiden] 19350: Add dhcpcapi.dll to the bootcd. Fixes bug 1037
by weiden＠svn.reactos.com 19 Nov '05

19 Nov '05

Add dhcpcapi.dll to the bootcd. Fixes bug 1037 Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.rc _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-19 19:10:13 UTC (rev 19349) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-19 19:20:51 UTC (rev 19350) @@ -80,6 +80,7 @@ lib\dbghelp\dbghelp.dll 1 lib\ddraw\ddraw.dll 1 lib\devenum\devenum.dll 1 +lib\dhcpcapi\dhcpcapi.dll 1 lib\dinput\dinput.dll 1 lib\dinput8\dinput8.dll 1 lib\dnsapi\dnsapi.dll 1 Property changes on: trunk/reactos/lib/dhcpcapi/dhcpcapi.def ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.rc --- trunk/reactos/lib/dhcpcapi/dhcpcapi.rc 2005-11-19 19:10:13 UTC (rev 19349) +++ trunk/reactos/lib/dhcpcapi/dhcpcapi.rc 2005-11-19 19:20:51 UTC (rev 19350) @@ -1,7 +1,7 @@ -#include <windows.h> - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "DHCP Client API\0" -#define REACTOS_STR_INTERNAL_NAME "dhcpcapi\0" -#define REACTOS_STR_ORIGINAL_FILENAME "dhcpcapi.dll\0" -#include <reactos/version.rc> +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "DHCP Client API\0" +#define REACTOS_STR_INTERNAL_NAME "dhcpcapi\0" +#define REACTOS_STR_ORIGINAL_FILENAME "dhcpcapi.dll\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/lib/dhcpcapi/dhcpcapi.rc ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/reactos/lib/dhcpcapi/dhcpcapi.xml ___________________________________________________________________ Name: svn:eol-style + native

1 0

[fireball] 19349: According to MSDN: "PnP Manager queries a device's BusRelations (child devices) when the device is enumerated".
by fireball＠svn.reactos.com 19 Nov '05

19 Nov '05

According to MSDN: "PnP Manager queries a device's BusRelations (child devices) when the device is enumerated". This change implements this behaviour in reactos (thanks Filip Navara for providing this good idea). Before, querying BusRelations was done only for ACPI/BUS_EXTENDER DeviceType. Modified: trunk/reactos/ntoskrnl/io/device.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-11-19 18:58:04 UTC (rev 19348) +++ trunk/reactos/ntoskrnl/io/device.c 2005-11-19 19:10:13 UTC (rev 19349) @@ -121,6 +121,7 @@ } IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); + IopDeviceNodeSetFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); } return STATUS_SUCCESS; @@ -153,12 +154,11 @@ } else { - if (Fdo->DeviceType == FILE_DEVICE_BUS_EXTENDER || - Fdo->DeviceType == FILE_DEVICE_ACPI) + if (IopDeviceNodeHasFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY)) { - DPRINT("Bus extender found\n"); - + DPRINT("Device needs enumeration, invalidating bus relations\n"); Status = IopInvalidateDeviceRelations(DeviceNode, BusRelations); + IopDeviceNodeClearFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); } }

1 0

[navaraf] 19348: Don't bail out for unparsable environment variables.
by navaraf＠svn.reactos.com 19 Nov '05

19 Nov '05

Don't bail out for unparsable environment variables. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-11-19 18:55:00 UTC (rev 19347) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-11-19 18:58:04 UTC (rev 19348) @@ -1319,11 +1319,11 @@ { UINT envNameLen; LPCTSTR envVal = GetParsedEnvVar ( ip, &envNameLen, bModeSetA ); - if ( !envVal ) - return 1; - ip += envNameLen; - cp = _stpcpy ( cp, envVal ); - continue; + if ( envVal ) + { + ip += envNameLen; + cp = _stpcpy ( cp, envVal ); + } } if (_istcntrl (*ip))

1 0

[navaraf] 19347: Revert r19346.
by navaraf＠svn.reactos.com 19 Nov '05

19 Nov '05

Revert r19346. Modified: branches/cache_manager_rewrite/reactos/subsys/system/cmd/cmd.c _____ Modified: branches/cache_manager_rewrite/reactos/subsys/system/cmd/cmd.c --- branches/cache_manager_rewrite/reactos/subsys/system/cmd/cmd.c 2005-11-19 18:53:38 UTC (rev 19346) +++ branches/cache_manager_rewrite/reactos/subsys/system/cmd/cmd.c 2005-11-19 18:55:00 UTC (rev 19347) @@ -1308,11 +1308,11 @@ { UINT envNameLen; LPCTSTR envVal = GetParsedEnvVar ( ip, &envNameLen, bModeSetA ); - if ( envVal ) - { - ip += envNameLen; - cp = _stpcpy ( cp, envVal ); - } + if ( !envVal ) + return 1; + ip += envNameLen; + cp = _stpcpy ( cp, envVal ); + continue; } if (_istcntrl (*ip))

1 0

[navaraf] 19346: Don't bail out for unparsable environment variables.
by navaraf＠svn.reactos.com 19 Nov '05

19 Nov '05

Don't bail out for unparsable environment variables. Modified: branches/cache_manager_rewrite/reactos/subsys/system/cmd/cmd.c _____ Modified: branches/cache_manager_rewrite/reactos/subsys/system/cmd/cmd.c --- branches/cache_manager_rewrite/reactos/subsys/system/cmd/cmd.c 2005-11-19 18:01:10 UTC (rev 19345) +++ branches/cache_manager_rewrite/reactos/subsys/system/cmd/cmd.c 2005-11-19 18:53:38 UTC (rev 19346) @@ -1308,11 +1308,11 @@ { UINT envNameLen; LPCTSTR envVal = GetParsedEnvVar ( ip, &envNameLen, bModeSetA ); - if ( !envVal ) - return 1; - ip += envNameLen; - cp = _stpcpy ( cp, envVal ); - continue; + if ( envVal ) + { + ip += envNameLen; + cp = _stpcpy ( cp, envVal ); + } } if (_istcntrl (*ip))

1 0

[navaraf] 19345: Uncomment MAC code page and font signature locale strings.
by navaraf＠svn.reactos.com 19 Nov '05

19 Nov '05

Uncomment MAC code page and font signature locale strings. Modified: trunk/reactos/lib/kernel32/nls/afk.nls Modified: trunk/reactos/lib/kernel32/nls/bel.nls Modified: trunk/reactos/lib/kernel32/nls/bgr.nls Modified: trunk/reactos/lib/kernel32/nls/cat.nls Modified: trunk/reactos/lib/kernel32/nls/chs.nls Modified: trunk/reactos/lib/kernel32/nls/cht.nls Modified: trunk/reactos/lib/kernel32/nls/csy.nls Modified: trunk/reactos/lib/kernel32/nls/dan.nls Modified: trunk/reactos/lib/kernel32/nls/dea.nls Modified: trunk/reactos/lib/kernel32/nls/dec.nls Modified: trunk/reactos/lib/kernel32/nls/del.nls Modified: trunk/reactos/lib/kernel32/nls/des.nls Modified: trunk/reactos/lib/kernel32/nls/deu.nls Modified: trunk/reactos/lib/kernel32/nls/ell.nls Modified: trunk/reactos/lib/kernel32/nls/ena.nls Modified: trunk/reactos/lib/kernel32/nls/enb.nls Modified: trunk/reactos/lib/kernel32/nls/enc.nls Modified: trunk/reactos/lib/kernel32/nls/eng.nls Modified: trunk/reactos/lib/kernel32/nls/eni.nls Modified: trunk/reactos/lib/kernel32/nls/enj.nls Modified: trunk/reactos/lib/kernel32/nls/enl.nls Modified: trunk/reactos/lib/kernel32/nls/enp.nls Modified: trunk/reactos/lib/kernel32/nls/ens.nls Modified: trunk/reactos/lib/kernel32/nls/ent.nls Modified: trunk/reactos/lib/kernel32/nls/enu.nls Modified: trunk/reactos/lib/kernel32/nls/enw.nls Modified: trunk/reactos/lib/kernel32/nls/enz.nls Modified: trunk/reactos/lib/kernel32/nls/esa.nls Modified: trunk/reactos/lib/kernel32/nls/esb.nls Modified: trunk/reactos/lib/kernel32/nls/esd.nls Modified: trunk/reactos/lib/kernel32/nls/ese.nls Modified: trunk/reactos/lib/kernel32/nls/esf.nls Modified: trunk/reactos/lib/kernel32/nls/esg.nls Modified: trunk/reactos/lib/kernel32/nls/esh.nls Modified: trunk/reactos/lib/kernel32/nls/esi.nls Modified: trunk/reactos/lib/kernel32/nls/esl.nls Modified: trunk/reactos/lib/kernel32/nls/esm.nls Modified: trunk/reactos/lib/kernel32/nls/esn.nls Modified: trunk/reactos/lib/kernel32/nls/eso.nls Modified: trunk/reactos/lib/kernel32/nls/esp.nls Modified: trunk/reactos/lib/kernel32/nls/esr.nls Modified: trunk/reactos/lib/kernel32/nls/ess.nls Modified: trunk/reactos/lib/kernel32/nls/esu.nls Modified: trunk/reactos/lib/kernel32/nls/esv.nls Modified: trunk/reactos/lib/kernel32/nls/esy.nls Modified: trunk/reactos/lib/kernel32/nls/esz.nls Modified: trunk/reactos/lib/kernel32/nls/eti.nls Modified: trunk/reactos/lib/kernel32/nls/euq.nls Modified: trunk/reactos/lib/kernel32/nls/fin.nls Modified: trunk/reactos/lib/kernel32/nls/fos.nls Modified: trunk/reactos/lib/kernel32/nls/fra.nls Modified: trunk/reactos/lib/kernel32/nls/frb.nls Modified: trunk/reactos/lib/kernel32/nls/frc.nls Modified: trunk/reactos/lib/kernel32/nls/frl.nls Modified: trunk/reactos/lib/kernel32/nls/frm.nls Modified: trunk/reactos/lib/kernel32/nls/frs.nls Modified: trunk/reactos/lib/kernel32/nls/glc.nls Modified: trunk/reactos/lib/kernel32/nls/heb.nls Modified: trunk/reactos/lib/kernel32/nls/hrv.nls Modified: trunk/reactos/lib/kernel32/nls/hun.nls Modified: trunk/reactos/lib/kernel32/nls/ind.nls Modified: trunk/reactos/lib/kernel32/nls/isl.nls Modified: trunk/reactos/lib/kernel32/nls/ita.nls Modified: trunk/reactos/lib/kernel32/nls/its.nls Modified: trunk/reactos/lib/kernel32/nls/lvi.nls Modified: trunk/reactos/lib/kernel32/nls/mki.nls Modified: trunk/reactos/lib/kernel32/nls/msb.nls Modified: trunk/reactos/lib/kernel32/nls/msl.nls Modified: trunk/reactos/lib/kernel32/nls/nlb.nls Modified: trunk/reactos/lib/kernel32/nls/nld.nls Modified: trunk/reactos/lib/kernel32/nls/non.nls Modified: trunk/reactos/lib/kernel32/nls/nor.nls Modified: trunk/reactos/lib/kernel32/nls/plk.nls Modified: trunk/reactos/lib/kernel32/nls/ptb.nls Modified: trunk/reactos/lib/kernel32/nls/ptg.nls Modified: trunk/reactos/lib/kernel32/nls/rom.nls Modified: trunk/reactos/lib/kernel32/nls/rus.nls Modified: trunk/reactos/lib/kernel32/nls/sky.nls Modified: trunk/reactos/lib/kernel32/nls/slv.nls Modified: trunk/reactos/lib/kernel32/nls/sqi.nls Modified: trunk/reactos/lib/kernel32/nls/srb.nls Modified: trunk/reactos/lib/kernel32/nls/srl.nls Modified: trunk/reactos/lib/kernel32/nls/sve.nls Modified: trunk/reactos/lib/kernel32/nls/svf.nls Modified: trunk/reactos/lib/kernel32/nls/swk.nls Modified: trunk/reactos/lib/kernel32/nls/tam.nls Modified: trunk/reactos/lib/kernel32/nls/tha.nls Modified: trunk/reactos/lib/kernel32/nls/trk.nls Modified: trunk/reactos/lib/kernel32/nls/ukr.nls Modified: trunk/reactos/lib/kernel32/nls/uzb.nls Modified: trunk/reactos/lib/kernel32/nls/zhi.nls _____ Modified: trunk/reactos/lib/kernel32/nls/afk.nls --- trunk/reactos/lib/kernel32/nls/afk.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/afk.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_AFRIKAANS, SUBLANG_DEFAULT { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "27" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "27" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "0436" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/bel.nls --- trunk/reactos/lib/kernel32/nls/bel.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/bel.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT { -//FIXME LOCALE_FONTSIGNATURE L"\x0203\x8000\x3848\x0000\x0000\x0000\x0000\x0000\x0004\x0000\x0000\x00 02\x0004\x0000\x0000\x0202" + LOCALE_FONTSIGNATURE L"\x0203\x8000\x3848\x0000\x0000\x0000\x0000\x0000\x0004\x0000\x0000\x00 02\x0004\x0000\x0000\x0202" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "375" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "375" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "0423" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10007" + LOCALE_IDEFAULTMACCODEPAGE "10007" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "1251" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/bgr.nls --- trunk/reactos/lib/kernel32/nls/bgr.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/bgr.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT { -//FIXME LOCALE_FONTSIGNATURE L"\x0203\x8000\x3848\x0000\x0000\x0000\x0000\x0000\x0004\x0000\x0000\x00 02\x0004\x0000\x0000\x0202" + LOCALE_FONTSIGNATURE L"\x0203\x8000\x3848\x0000\x0000\x0000\x0000\x0000\x0004\x0000\x0000\x00 02\x0004\x0000\x0000\x0202" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "359" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "359" LOCALE_IDEFAULTEBCDICCODEPAGE "20420" LOCALE_IDEFAULTLANGUAGE "0402" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10007" + LOCALE_IDEFAULTMACCODEPAGE "10007" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "1251" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/cat.nls --- trunk/reactos/lib/kernel32/nls/cat.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/cat.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0003\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0003\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "34" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "34" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "040a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28605" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/chs.nls --- trunk/reactos/lib/kernel32/nls/chs.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/chs.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED { -//FIXME LOCALE_FONTSIGNATURE L"\x02af\x8000\x6cf8\x184f\x0010\x0000\x0000\x0000\x0000\x0004\x0000\x00 00\x0000\x0004\x0000\x0000" + LOCALE_FONTSIGNATURE L"\x02af\x8000\x6cf8\x184f\x0010\x0000\x0000\x0000\x0000\x0004\x0000\x00 00\x0000\x0004\x0000\x0000" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "86" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "86" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "0804" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10008" + LOCALE_IDEFAULTMACCODEPAGE "10008" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "936" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/cht.nls --- trunk/reactos/lib/kernel32/nls/cht.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/cht.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL { -//FIXME LOCALE_FONTSIGNATURE L"\x00a3\x8000\x7878\x38c9\x0016\x0000\x0000\x0000\x0000\x0010\x0000\x00 00\x0000\x0010\x0000\x0000" + LOCALE_FONTSIGNATURE L"\x00a3\x8000\x7878\x38c9\x0016\x0000\x0000\x0000\x0000\x0010\x0000\x00 00\x0000\x0010\x0000\x0000" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "886" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "886" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "0404" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10002" + LOCALE_IDEFAULTMACCODEPAGE "10002" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "950" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/csy.nls --- trunk/reactos/lib/kernel32/nls/csy.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/csy.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT { -//FIXME LOCALE_FONTSIGNATURE L"\x0027\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0002\x0000\x0000\x04 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x0027\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0002\x0000\x0000\x04 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "420" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "420" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "0405" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10029" + LOCALE_IDEFAULTMACCODEPAGE "10029" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28592" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/dan.nls --- trunk/reactos/lib/kernel32/nls/dan.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/dan.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "45" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "45" LOCALE_IDEFAULTEBCDICCODEPAGE "20277" LOCALE_IDEFAULTLANGUAGE "0406" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28605" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/dea.nls --- trunk/reactos/lib/kernel32/nls/dea.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/dea.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0093\x0000\x0000\xcdd4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0093\x0000\x0000\xcdd4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "43" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "43" LOCALE_IDEFAULTEBCDICCODEPAGE "20273" LOCALE_IDEFAULTLANGUAGE "0c07" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28605" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/dec.nls --- trunk/reactos/lib/kernel32/nls/dec.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/dec.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0093\x0000\x0000\xcdd4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0093\x0000\x0000\xcdd4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "41" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "41" LOCALE_IDEFAULTEBCDICCODEPAGE "20273" LOCALE_IDEFAULTLANGUAGE "1407" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28605" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/del.nls --- trunk/reactos/lib/kernel32/nls/del.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/del.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0093\x0000\x0000\xcdd4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0093\x0000\x0000\xcdd4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "352" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "352" LOCALE_IDEFAULTEBCDICCODEPAGE "20273" LOCALE_IDEFAULTLANGUAGE "1007" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28605" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/des.nls --- trunk/reactos/lib/kernel32/nls/des.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/des.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0093\x0000\x0000\xcdd4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0093\x0000\x0000\xcdd4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "41" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "41" LOCALE_IDEFAULTEBCDICCODEPAGE "20273" LOCALE_IDEFAULTLANGUAGE "0807" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28605" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/deu.nls --- trunk/reactos/lib/kernel32/nls/deu.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/deu.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0093\x0000\x0000\xcdd4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0093\x0000\x0000\xcdd4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "49" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "49" LOCALE_IDEFAULTEBCDICCODEPAGE "20273" LOCALE_IDEFAULTLANGUAGE "0407" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28605" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/ell.nls --- trunk/reactos/lib/kernel32/nls/ell.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/ell.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_GREEK, SUBLANG_DEFAULT { -//FIXME LOCALE_FONTSIGNATURE L"\x008b\x8000\x3849\x1000\x0000\x0000\x0000\x0000\x0008\x0000\x0000\x10 00\x0008\x0000\x0000\x1001" + LOCALE_FONTSIGNATURE L"\x008b\x8000\x3849\x1000\x0000\x0000\x0000\x0000\x0008\x0000\x0000\x10 00\x0008\x0000\x0000\x1001" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "30" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "30" LOCALE_IDEFAULTEBCDICCODEPAGE "20273" LOCALE_IDEFAULTLANGUAGE "0408" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10006" + LOCALE_IDEFAULTMACCODEPAGE "10006" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28597" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/ena.nls --- trunk/reactos/lib/kernel32/nls/ena.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/ena.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "61" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "61" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "0c09" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/enb.nls --- trunk/reactos/lib/kernel32/nls/enb.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/enb.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "1" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "1" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "2c09" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/enc.nls --- trunk/reactos/lib/kernel32/nls/enc.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/enc.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "2" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "2" LOCALE_IDEFAULTEBCDICCODEPAGE "037" LOCALE_IDEFAULTLANGUAGE "1009" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/eng.nls --- trunk/reactos/lib/kernel32/nls/eng.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/eng.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x01ff\x003f\x8000\xffff" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x01ff\x003f\x8000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "44" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "44" LOCALE_IDEFAULTEBCDICCODEPAGE "20285" LOCALE_IDEFAULTLANGUAGE "0809" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28605" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/eni.nls --- trunk/reactos/lib/kernel32/nls/eni.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/eni.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_EIRE { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "353" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "353" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "1809" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28605" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/enj.nls --- trunk/reactos/lib/kernel32/nls/enj.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/enj.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_JAMAICA { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "1" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "1" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "2009" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/enl.nls --- trunk/reactos/lib/kernel32/nls/enl.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/enl.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_BELIZE { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "501" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "501" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "2809" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/enp.nls --- trunk/reactos/lib/kernel32/nls/enp.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/enp.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_PHILIPPINES { -//FIXME LOCALE_FONTSIGNATURE L"\x00af\x8000\x38cb\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x80 00\x00ff\x003f\x0000\xffff" + LOCALE_FONTSIGNATURE L"\x00af\x8000\x38cb\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x80 00\x00ff\x003f\x0000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "63" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "63" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "3409" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/ens.nls --- trunk/reactos/lib/kernel32/nls/ens.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/ens.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_SOUTH_AFRICA { -//FIXME LOCALE_FONTSIGNATURE L"\x00af\x8000\x38cb\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x80 00\x00ff\x003f\x0000\xffff" + LOCALE_FONTSIGNATURE L"\x00af\x8000\x38cb\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x80 00\x00ff\x003f\x0000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "27" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "27" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "1c09" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/ent.nls --- trunk/reactos/lib/kernel32/nls/ent.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/ent.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_TRINIDAD { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "1" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "1" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "2c09" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/enu.nls --- trunk/reactos/lib/kernel32/nls/enu.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/enu.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US { -//FIXME LOCALE_FONTSIGNATURE L"\x00af\x8000\x38cb\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x80 00\x01ff\x003f\x8000\xffff" + LOCALE_FONTSIGNATURE L"\x00af\x8000\x38cb\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x80 00\x01ff\x003f\x8000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "1" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "1" LOCALE_IDEFAULTEBCDICCODEPAGE "037" LOCALE_IDEFAULTLANGUAGE "0409" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/enw.nls --- trunk/reactos/lib/kernel32/nls/enw.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/enw.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_ZIMBABWE { -//FIXME LOCALE_FONTSIGNATURE L"\x00af\x8000\x38cb\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x80 00\x00ff\x003f\x0000\xffff" + LOCALE_FONTSIGNATURE L"\x00af\x8000\x38cb\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x80 00\x00ff\x003f\x0000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "263" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "263" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "3009" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/enz.nls --- trunk/reactos/lib/kernel32/nls/enz.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/enz.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_NZ { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "64" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "64" LOCALE_IDEFAULTEBCDICCODEPAGE "500" LOCALE_IDEFAULTLANGUAGE "1409" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esa.nls --- trunk/reactos/lib/kernel32/nls/esa.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esa.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PANAMA { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "507" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "507" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "180a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esb.nls --- trunk/reactos/lib/kernel32/nls/esb.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esb.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_BOLIVIA { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "591" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "591" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "400a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esd.nls --- trunk/reactos/lib/kernel32/nls/esd.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esd.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN_REPUBLIC { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "1" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "1" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "1c0a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/ese.nls --- trunk/reactos/lib/kernel32/nls/ese.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/ese.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_EL_SALVADOR { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "503" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "503" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "440a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esf.nls --- trunk/reactos/lib/kernel32/nls/esf.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esf.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ECUADOR { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "593" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "593" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "300a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esg.nls --- trunk/reactos/lib/kernel32/nls/esg.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esg.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "502" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "502" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "100a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esh.nls --- trunk/reactos/lib/kernel32/nls/esh.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esh.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_HONDURAS { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "504" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "504" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "480a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esi.nls --- trunk/reactos/lib/kernel32/nls/esi.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esi.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "505" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "505" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "4c0a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esl.nls --- trunk/reactos/lib/kernel32/nls/esl.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esl.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_CHILE { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "56" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "56" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "340a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esm.nls --- trunk/reactos/lib/kernel32/nls/esm.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esm.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "52" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "52" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "080a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esn.nls --- trunk/reactos/lib/kernel32/nls/esn.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esn.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "34" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "34" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "0c0a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28605" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/eso.nls --- trunk/reactos/lib/kernel32/nls/eso.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/eso.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COLOMBIA { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "57" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "57" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "240a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esp.nls --- trunk/reactos/lib/kernel32/nls/esp.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esp.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "34" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "34" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "040a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28605" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esr.nls --- trunk/reactos/lib/kernel32/nls/esr.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esr.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PERU { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "51" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "51" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "280a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/ess.nls --- trunk/reactos/lib/kernel32/nls/ess.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/ess.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "54" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "54" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "2c0a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esu.nls --- trunk/reactos/lib/kernel32/nls/esu.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esu.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "1" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "1" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "500a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esv.nls --- trunk/reactos/lib/kernel32/nls/esv.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esv.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "58" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "58" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "200a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esy.nls --- trunk/reactos/lib/kernel32/nls/esy.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esy.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_URUGUAY { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "598" @@ -35,7 +35,7 @@ LOCALE_IDEFAULTCOUNTRY "598" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" LOCALE_IDEFAULTLANGUAGE "380a" -//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTMACCODEPAGE "10000" //FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" _____ Modified: trunk/reactos/lib/kernel32/nls/esz.nls --- trunk/reactos/lib/kernel32/nls/esz.nls 2005-11-19 14:23:33 UTC (rev 19344) +++ trunk/reactos/lib/kernel32/nls/esz.nls 2005-11-19 18:01:10 UTC (rev 19345) @@ -22,7 +22,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PARAGUAY { -//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0013\x0000\x0000\xc5d4" [truncated at 1000 lines; 1002 more skipped]

1 0

[greatlrd] 19344: "sync up sprintf.c with swprintf.c. They both do the same except one is the wchar-version, so they shouldn't differ in other parts." by Elrond <elrond(at)samba(dash)tng(dot)org>
by greatlrd＠svn.reactos.com 19 Nov '05

19 Nov '05

"sync up sprintf.c with swprintf.c. They both do the same except one is the wchar-version, so they shouldn't differ in other parts." by Elrond <elrond(at)samba(dash)tng(dot)org> Modified: trunk/reactos/lib/rtl/sprintf.c Modified: trunk/reactos/lib/rtl/swprintf.c _____ Modified: trunk/reactos/lib/rtl/sprintf.c --- trunk/reactos/lib/rtl/sprintf.c 2005-11-19 13:31:52 UTC (rev 19343) +++ trunk/reactos/lib/rtl/sprintf.c 2005-11-19 14:23:33 UTC (rev 19344) @@ -2,6 +2,8 @@ * PROGRAMMERS: David Welch * Eric Kohl * + * TODO: + * - Verify the implementation of '%Z'. */ /* @@ -14,6 +16,7 @@ /* * Wirzenius wrote this portably, Torvalds fucked it up :-) */ + #include <rtl.h> #define ZEROPAD 1 /* pad with zero */ @@ -84,7 +87,7 @@ } i = 0; if (num == 0) - tmp[i++]='0'; + tmp[i++] = '0'; else while (num != 0) tmp[i++] = digits[do_div(&num,base)]; if (i > precision) @@ -214,19 +217,19 @@ { if (buf <= end) *buf = ' '; - ++buf; + buf++; } for (i = 0; i < len; ++i) { if (buf <= end) *buf = (unsigned char)(*sw++); - ++buf; + buf++; } while (len < field_width--) { if (buf <= end) *buf = ' '; - ++buf; + buf++; } return buf; } _____ Modified: trunk/reactos/lib/rtl/swprintf.c --- trunk/reactos/lib/rtl/swprintf.c 2005-11-19 13:31:52 UTC (rev 19343) +++ trunk/reactos/lib/rtl/swprintf.c 2005-11-19 14:23:33 UTC (rev 19344) @@ -537,6 +537,9 @@ } +/* + * @implemented + */ int vswprintf(wchar_t *buf, const wchar_t *fmt, va_list args) { return _vsnwprintf(buf,MAXLONG,fmt,args);

1 0

[ros-diffs] [hpoussin] 19343: Sorry, I forgot to commit this file...
by hpoussin＠svn.reactos.com 19 Nov '05

19 Nov '05

Sorry, I forgot to commit this file... Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-11-19 13:27:27 UTC (rev 19342) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-11-19 13:31:52 UTC (rev 19343) @@ -705,6 +705,15 @@ IN ULONG Offset, IN ULONG Length); +/* PCI_DEVICE_PRESENCE_PARAMETERS.Flags */ +#define PCI_USE_SUBSYSTEM_IDS 0x00000001 +#define PCI_USE_REVISION 0x00000002 +#define PCI_USE_VENDEV_IDS 0x00000004 +#define PCI_USE_CLASS_SUBCLASS 0x00000008 +#define PCI_USE_PROGIF 0x00000010 +#define PCI_USE_LOCAL_BUS 0x00000020 +#define PCI_USE_LOCAL_DEVICE 0x00000040 + typedef struct _PCI_DEVICE_PRESENCE_PARAMETERS { ULONG Size; ULONG Flags;

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005