Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 50672: - Fix a bug where a spinlock was acquired on not initialized local variable
by janderwald＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: janderwald Date: Sat Feb 12 18:54:43 2011 New Revision: 50672 URL: http://svn.reactos.org/svn/reactos?rev=50672&view=rev Log: - Fix a bug where a spinlock was acquired on not initialized local variable Modified: branches/audio-bringup/drivers/ksfilter/ks/swenum.c Modified: branches/audio-bringup/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sat Feb 12 18:54:43 2011 @@ -1156,11 +1156,11 @@ BOOLEAN DoInvalidate = FALSE; KIRQL OldLevel; + /* get device extension */ + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Parameter; + /* acquire lock */ KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); - - /* get device extension */ - BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Parameter; /* get current time */ KeQuerySystemTime(&Time);

1 0

[janderwald] 50671: [KS] - Fix a bug where a spinlock was acquired on not initialized local variable - Found by msvc
by janderwald＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: janderwald Date: Sat Feb 12 18:52:35 2011 New Revision: 50671 URL: http://svn.reactos.org/svn/reactos?rev=50671&view=rev Log: [KS] - Fix a bug where a spinlock was acquired on not initialized local variable - Found by msvc Modified: branches/cmake-bringup/drivers/ksfilter/ks/swenum.c Modified: branches/cmake-bringup/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sat Feb 12 18:52:35 2011 @@ -1156,11 +1156,11 @@ BOOLEAN DoInvalidate = FALSE; KIRQL OldLevel; + /* get device extension */ + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Parameter; + /* acquire lock */ KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); - - /* get device extension */ - BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Parameter; /* get current time */ KeQuerySystemTime(&Time);

1 0

[pschweitzer] 50670: [NTOSKRNL] For both FsRtlIsNameInExpression & FsRtlIsDbcsInExpression: - Remove useless checks - Move redundant sum before loop, so it's done only once - Fix handling of * wild...
by pschweitzer＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: pschweitzer Date: Sat Feb 12 18:39:17 2011 New Revision: 50670 URL: http://svn.reactos.org/svn/reactos?rev=50670&view=rev Log: [NTOSKRNL] For both FsRtlIsNameInExpression & FsRtlIsDbcsInExpression: - Remove useless checks - Move redundant sum before loop, so it's done only once - Fix handling of * wildcard This fixes failing kmtest tests added in r50614 Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Sat Feb 12 18:39:17 2011 @@ -160,7 +160,7 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, IN PANSI_STRING Name) { - USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars; + USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, StarFound = MAXUSHORT; PAGED_CODE(); ASSERT(Name->Length); @@ -169,34 +169,37 @@ while (NamePosition < Name->Length && ExpressionPosition < Expression->Length) { - if ((Expression->Buffer[ExpressionPosition] == Name->Buffer[NamePosition]) || - (Expression->Buffer[ExpressionPosition] == '?') || (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) || - (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT && Name->Buffer[NamePosition] == '.')) + if ((Expression->Buffer[ExpressionPosition] == Name->Buffer[NamePosition])) { NamePosition++; ExpressionPosition++; } + else if ((Expression->Buffer[ExpressionPosition] == '?') || (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) || + (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT && Name->Buffer[NamePosition] == '.')) + { + NamePosition++; + ExpressionPosition++; + StarFound = MAXUSHORT; + } else if (Expression->Buffer[ExpressionPosition] == '*') { - if (ExpressionPosition < (Expression->Length - 1)) - { - if (Expression->Buffer[ExpressionPosition+1] != '*' && Expression->Buffer[ExpressionPosition+1] != '?' && - Expression->Buffer[ExpressionPosition+1] != ANSI_DOS_DOT && - Expression->Buffer[ExpressionPosition+1] != ANSI_DOS_QM && - Expression->Buffer[ExpressionPosition+1] != ANSI_DOS_STAR) + StarFound = ExpressionPosition++; + if (StarFound < (Expression->Length - 1)) + { + while (Name->Buffer[NamePosition] != Expression->Buffer[ExpressionPosition] && + NamePosition < Name->Length) { - while (Name->Buffer[NamePosition] != Expression->Buffer[ExpressionPosition+1] && - NamePosition < Name->Length) NamePosition++; + NamePosition++; } } else { NamePosition = Name->Length; } - ExpressionPosition++; } else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_STAR) { + StarFound = MAXUSHORT; MatchingChars = NamePosition; while (MatchingChars < Name->Length) { @@ -207,6 +210,15 @@ MatchingChars++; } ExpressionPosition++; + } + else if (StarFound != MAXUSHORT) + { + ExpressionPosition = StarFound + 1; + while (Name->Buffer[NamePosition] != Expression->Buffer[ExpressionPosition] && + NamePosition < Name->Length) + { + NamePosition++; + } } else { Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sat Feb 12 18:39:17 2011 @@ -22,40 +22,44 @@ IN BOOLEAN IgnoreCase, IN PWCHAR UpcaseTable OPTIONAL) { - USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars; + USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, StarFound = MAXUSHORT; PAGED_CODE(); ASSERT(!IgnoreCase || UpcaseTable); while (NamePosition < Name->Length / sizeof(WCHAR) && ExpressionPosition < Expression->Length / sizeof(WCHAR)) { - if ((Expression->Buffer[ExpressionPosition] == (IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition])) || - (Expression->Buffer[ExpressionPosition] == L'?') || (Expression->Buffer[ExpressionPosition] == DOS_QM) || - (Expression->Buffer[ExpressionPosition] == DOS_DOT && Name->Buffer[NamePosition] == L'.')) + if ((Expression->Buffer[ExpressionPosition] == (IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition]))) { NamePosition++; ExpressionPosition++; } + else if (Expression->Buffer[ExpressionPosition] == L'?' || (Expression->Buffer[ExpressionPosition] == DOS_QM) || + (Expression->Buffer[ExpressionPosition] == DOS_DOT && Name->Buffer[NamePosition] == L'.')) + { + NamePosition++; + ExpressionPosition++; + StarFound = MAXUSHORT; + } else if (Expression->Buffer[ExpressionPosition] == L'*') { - if (ExpressionPosition < (Expression->Length / sizeof(WCHAR) - 1)) - { - if (Expression->Buffer[ExpressionPosition+1] != L'*' && Expression->Buffer[ExpressionPosition+1] != L'?' && - Expression->Buffer[ExpressionPosition+1] != DOS_DOT && Expression->Buffer[ExpressionPosition+1] != DOS_QM && - Expression->Buffer[ExpressionPosition+1] != DOS_STAR) + StarFound = ExpressionPosition++; + if (StarFound < (Expression->Length / sizeof(WCHAR) - 1)) + { + while ((IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition]) != Expression->Buffer[ExpressionPosition] && + NamePosition < Name->Length / sizeof(WCHAR)) { - while ((IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition]) != Expression->Buffer[ExpressionPosition+1] && - NamePosition < Name->Length / sizeof(WCHAR)) NamePosition++; + NamePosition++; } } else { NamePosition = Name->Length / sizeof(WCHAR); } - ExpressionPosition++; } else if (Expression->Buffer[ExpressionPosition] == DOS_STAR) { + StarFound = MAXUSHORT; MatchingChars = NamePosition; while (MatchingChars < Name->Length / sizeof(WCHAR)) { @@ -66,6 +70,15 @@ MatchingChars++; } ExpressionPosition++; + } + else if (StarFound != MAXUSHORT) + { + ExpressionPosition = StarFound + 1; + while ((IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition]) != Expression->Buffer[ExpressionPosition] && + NamePosition < Name->Length / sizeof(WCHAR)) + { + NamePosition++; + } } else {

1 0

[janderwald] 50669: - Revert 45676 - It appears that the definitions for IID_IUnknown differ for kernel mode COM and user mode COM
by janderwald＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: janderwald Date: Sat Feb 12 17:40:51 2011 New Revision: 50669 URL: http://svn.reactos.org/svn/reactos?rev=50669&view=rev Log: - Revert 45676 - It appears that the definitions for IID_IUnknown differ for kernel mode COM and user mode COM Modified: trunk/reactos/include/ddk/punknown.h Modified: trunk/reactos/include/ddk/punknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/punknown.h?rev… ============================================================================== --- trunk/reactos/include/ddk/punknown.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/punknown.h [iso-8859-1] Sat Feb 12 17:40:51 2011 @@ -32,7 +32,7 @@ #define __IUnknown_INTERFACE_DEFINED__ DEFINE_GUID(IID_IUnknown, - 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); + 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46); #undef INTERFACE #define INTERFACE IUnknown

1 0

[tkreuzer] 50668: [COMCTL32] Fix bitmap resources. They were not very valid. Windows didn't even load them. Probably created with some linux tool *cough* Fixes part of the broken icons. Not the pin...
by tkreuzer＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: tkreuzer Date: Sat Feb 12 16:55:08 2011 New Revision: 50668 URL: http://svn.reactos.org/svn/reactos?rev=50668&view=rev Log: [COMCTL32] Fix bitmap resources. They were not very valid. Windows didn't even load them. Probably created with some linux tool *cough* Fixes part of the broken icons. Not the pink ones though. Modified: trunk/reactos/dll/win32/comctl32/idb_hist_large.bmp trunk/reactos/dll/win32/comctl32/idb_hist_small.bmp trunk/reactos/dll/win32/comctl32/idb_std_large.bmp trunk/reactos/dll/win32/comctl32/idb_std_small.bmp trunk/reactos/dll/win32/comctl32/idb_view_large.bmp trunk/reactos/dll/win32/comctl32/idb_view_small.bmp Modified: trunk/reactos/dll/win32/comctl32/idb_hist_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_his… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idb_hist_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_his… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idb_std_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_std… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idb_std_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_std… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idb_view_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_vie… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idb_view_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_vie… ============================================================================== Binary files - no diff available.

1 0

[fireball] 50667: [RTL/DPH] - Add core DPH (Debug Page Heap) structures based on Windows 2003/Vista. - Add misc generic support routines. - Implement DPH version of RtlCreateHeap(). - Debug prints ...
by fireball＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: fireball Date: Sat Feb 12 16:38:00 2011 New Revision: 50667 URL: http://svn.reactos.org/svn/reactos?rev=50667&view=rev Log: [RTL/DPH] - Add core DPH (Debug Page Heap) structures based on Windows 2003/Vista. - Add misc generic support routines. - Implement DPH version of RtlCreateHeap(). - Debug prints match those printed by Windows 2003. Modified: trunk/reactos/dll/ntdll/ldr/startup.c trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Sat Feb 12 16:38:00 2011 @@ -74,9 +74,9 @@ UNICODE_STRING ImageName; UNICODE_STRING ImagePathName; ULONG ValueSize; - extern ULONG RtlpPageHeapGlobalFlags, RtlpPageHeapSizeRangeStart, RtlpPageHeapSizeRangeEnd; + extern ULONG RtlpDphGlobalFlags, RtlpPageHeapSizeRangeStart, RtlpPageHeapSizeRangeEnd; extern ULONG RtlpPageHeapDllRangeStart, RtlpPageHeapDllRangeEnd; - extern WCHAR RtlpPageHeapTargetDlls[512]; + extern WCHAR RtlpDphTargetDlls[512]; extern BOOLEAN RtlpPageHeapEnabled; if (Peb->ProcessParameters && @@ -144,8 +144,8 @@ LdrQueryImageFileExecutionOptions(&ImageName, L"PageHeapFlags", REG_DWORD, - (PVOID)&RtlpPageHeapGlobalFlags, - sizeof(RtlpPageHeapGlobalFlags), + (PVOID)&RtlpDphGlobalFlags, + sizeof(RtlpDphGlobalFlags), &ValueSize); LdrQueryImageFileExecutionOptions(&ImageName, @@ -179,8 +179,8 @@ LdrQueryImageFileExecutionOptions(&ImageName, L"PageHeapTargetDlls", REG_SZ, - (PVOID)RtlpPageHeapTargetDlls, - sizeof(RtlpPageHeapTargetDlls), + (PVOID)RtlpDphTargetDlls, + sizeof(RtlpDphTargetDlls), &ValueSize); /* Now when all parameters are read, enable page heap */ Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Sat Feb 12 16:38:00 2011 @@ -17,13 +17,367 @@ #define NDEBUG #include <debug.h> +/* TYPES **********************************************************************/ + +typedef struct _DPH_BLOCK_INFORMATION +{ + ULONG StartStamp; + PVOID Heap; + ULONG RequestedSize; + ULONG ActualSize; + union + { + LIST_ENTRY FreeQueue; + SINGLE_LIST_ENTRY FreePushList; + WORD TraceIndex; + }; + PVOID StackTrace; + ULONG EndStamp; +} DPH_BLOCK_INFORMATION, *PDPH_BLOCK_INFORMATION; + +typedef struct _DPH_HEAP_BLOCK +{ + union + { + struct _DPH_HEAP_BLOCK *pNextAlloc; + LIST_ENTRY AvailableEntry; + RTL_BALANCED_LINKS TableLinks; + }; + PUCHAR pUserAllocation; + PUCHAR pVirtualBlock; + ULONG nVirtualBlockSize; + ULONG nVirtualAccessSize; + ULONG nUserRequestedSize; + ULONG nUserActualSize; + PVOID UserValue; + ULONG UserFlags; + PRTL_TRACE_BLOCK StackTrace; + LIST_ENTRY AdjacencyEntry; + PUCHAR pVirtualRegion; +} DPH_HEAP_BLOCK, *PDPH_HEAP_BLOCK; + +typedef struct _DPH_HEAP_ROOT +{ + ULONG Signature; + ULONG HeapFlags; + PRTL_CRITICAL_SECTION HeapCritSect; + ULONG nRemoteLockAcquired; + + PDPH_HEAP_BLOCK pVirtualStorageListHead; + PDPH_HEAP_BLOCK pVirtualStorageListTail; + ULONG nVirtualStorageRanges; + ULONG nVirtualStorageBytes; + + RTL_AVL_TABLE BusyNodesTable; + PDPH_HEAP_BLOCK NodeToAllocate; + ULONG nBusyAllocations; + ULONG nBusyAllocationBytesCommitted; + + PDPH_HEAP_BLOCK pFreeAllocationListHead; + PDPH_HEAP_BLOCK pFreeAllocationListTail; + ULONG nFreeAllocations; + ULONG nFreeAllocationBytesCommitted; + + LIST_ENTRY AvailableAllocationHead; + ULONG nAvailableAllocations; + ULONG nAvailableAllocationBytesCommitted; + + PDPH_HEAP_BLOCK pUnusedNodeListHead; + PDPH_HEAP_BLOCK pUnusedNodeListTail; + ULONG nUnusedNodes; + ULONG nBusyAllocationBytesAccessible; + PDPH_HEAP_BLOCK pNodePoolListHead; + PDPH_HEAP_BLOCK pNodePoolListTail; + ULONG nNodePools; + ULONG nNodePoolBytes; + + LIST_ENTRY NextHeap; + ULONG ExtraFlags; + ULONG Seed; + PVOID NormalHeap; + PRTL_TRACE_BLOCK CreateStackTrace; + PVOID FirstThread; +} DPH_HEAP_ROOT, *PDPH_HEAP_ROOT; + +/* GLOBALS ********************************************************************/ + BOOLEAN RtlpPageHeapEnabled = FALSE; -ULONG RtlpPageHeapGlobalFlags; +ULONG RtlpDphGlobalFlags; ULONG RtlpPageHeapSizeRangeStart, RtlpPageHeapSizeRangeEnd; ULONG RtlpPageHeapDllRangeStart, RtlpPageHeapDllRangeEnd; -WCHAR RtlpPageHeapTargetDlls[512]; +WCHAR RtlpDphTargetDlls[512]; + +ULONG RtlpDphBreakOptions; +ULONG RtlpDphDebugOptions; + +LIST_ENTRY RtlpDphPageHeapList; +BOOLEAN RtlpDphPageHeapListInitialized; +RTL_CRITICAL_SECTION RtlpDphPageHeapListLock; +ULONG RtlpDphPageHeapListLength; +UNICODE_STRING RtlpDphTargetDllsUnicode; + +/* Counters */ +LONG RtlpDphCounter; +LONG RtlpDphAllocFails; +LONG RtlpDphReleaseFails; +LONG RtlpDphFreeFails; +LONG RtlpDphProtectFails; + +#define DPH_RESERVE_SIZE 0x100000 +#define DPH_POOL_SIZE 0x4000 + +/* RtlpDphBreakOptions */ +#define DPH_BREAK_ON_RESERVE_FAIL 0x01 +#define DPH_BREAK_ON_COMMIT_FAIL 0x02 +#define DPH_BREAK_ON_RELEASE_FAIL 0x04 +#define DPH_BREAK_ON_FREE_FAIL 0x08 +#define DPH_BREAK_ON_PROTECT_FAIL 0x10 + +/* RtlpDphDebugOptions */ +#define DPH_DEBUG_INTERNAL_VALIDATE 0x01 +#define DPH_DEBUG_VERBOSE 0x04 + +/* Fillers */ +#define DPH_FILL 0xEEEEEEEE + +/* Signatures */ +#define DPH_SIGNATURE 0xFFEEDDCC /* FUNCTIONS ******************************************************************/ + +NTSTATUS NTAPI +RtlpSecMemFreeVirtualMemory(HANDLE Process, PVOID *Base, PSIZE_T Size, ULONG Type) +{ + NTSTATUS Status; + //PVOID *SavedBase = Base; + //PSIZE_T SavedSize = Size; + + /* Free the memory */ + Status = ZwFreeVirtualMemory(Process, Base, Size, Type); + + /* Flush secure memory cache if needed and retry freeing */ +#if 0 + if (Status == STATUS_INVALID_PAGE_PROTECTION && + Process == NtCurrentProcess() && + RtlFlushSecureMemoryCache(*SavedBase, *SavedSize)) + { + Status = ZwFreeVirtualMemory(NtCurrentProcess(), SavedBase, SavedSize, Type); + } +#endif + + return Status; +} + +NTSTATUS NTAPI +RtlpDphAllocateVm(PVOID *Base, SIZE_T Size, ULONG Type, ULONG Protection) +{ + NTSTATUS Status; + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + Base, + 0, + &Size, + Type, + Protection); + + /* Check for failures */ + if (!NT_SUCCESS(Status)) + { + if (Type == MEM_RESERVE) + { + _InterlockedIncrement(&RtlpDphCounter); + if (RtlpDphBreakOptions & DPH_BREAK_ON_RESERVE_FAIL) + { + DPRINT1("Page heap: AllocVm (%p, %p, %x) failed with %x \n", Base, Size, Type, Status); + DbgBreakPoint(); + return Status; + } + } + else + { + _InterlockedIncrement(&RtlpDphAllocFails); + if (RtlpDphBreakOptions & DPH_BREAK_ON_COMMIT_FAIL) + { + DPRINT1("Page heap: AllocVm (%p, %p, %x) failed with %x \n", Base, Size, Type, Status); + DbgBreakPoint(); + return Status; + } + } + } + + return Status; +} + +NTSTATUS NTAPI +RtlpDphFreeVm(PVOID Base, SIZE_T Size, ULONG Type, ULONG Protection) +{ + NTSTATUS Status; + + /* Free the memory */ + Status = RtlpSecMemFreeVirtualMemory(NtCurrentProcess(), &Base, &Size, Type); + + /* Log/report failures */ + if (!NT_SUCCESS(Status)) + { + if (Type == MEM_RELEASE) + { + _InterlockedIncrement(&RtlpDphReleaseFails); + if (RtlpDphBreakOptions & DPH_BREAK_ON_RELEASE_FAIL) + { + DPRINT1("Page heap: FreeVm (%p, %p, %x) failed with %x \n", Base, Size, Type, Status); + DbgBreakPoint(); + return Status; + } + } + else + { + _InterlockedIncrement(&RtlpDphFreeFails); + if (RtlpDphBreakOptions & DPH_BREAK_ON_FREE_FAIL) + { + DPRINT1("Page heap: FreeVm (%p, %p, %x) failed with %x \n", Base, Size, Type, Status); + DbgBreakPoint(); + return Status; + } + } + } + + return Status; +} + +NTSTATUS NTAPI +RtlpDphProtectVm(PVOID Base, SIZE_T Size, ULONG Protection) +{ + NTSTATUS Status; + ULONG OldProtection; + + /* Change protection */ + Status = ZwProtectVirtualMemory(NtCurrentProcess(), &Base, &Size, Protection, &OldProtection); + + /* Log/report failures */ + if (!NT_SUCCESS(Status)) + { + _InterlockedIncrement(&RtlpDphProtectFails); + if (RtlpDphBreakOptions & DPH_BREAK_ON_PROTECT_FAIL) + { + DPRINT1("Page heap: ProtectVm (%p, %p, %x) failed with %x \n", Base, Size, Protection, Status); + DbgBreakPoint(); + return Status; + } + } + + return Status; +} + +VOID NTAPI +RtlpDphAddNewPool(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK NodeBlock, PVOID Virtual, SIZE_T Size, BOOLEAN Add) +{ + UNIMPLEMENTED; +} + +PDPH_HEAP_BLOCK NTAPI +RtlpDphAllocateNode(PDPH_HEAP_ROOT DphRoot) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID NTAPI +RtlpDphPlaceOnPoolList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK DphNode) +{ + UNIMPLEMENTED; +} + +VOID NTAPI +RtlpDphPlaceOnVirtualList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK DphNode) +{ + UNIMPLEMENTED; +} + +VOID NTAPI +RtlpDphCoalesceNodeIntoAvailable(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK DphNode) +{ + UNIMPLEMENTED; +} + +RTL_GENERIC_COMPARE_RESULTS +NTAPI +RtlpDphCompareNodeForTable(IN PRTL_AVL_TABLE Table, + IN PVOID FirstStruct, + IN PVOID SecondStruct) +{ + /* FIXME: TODO */ + ASSERT(FALSE); + return 0; +} + +PVOID +NTAPI +RtlpDphAllocateNodeForTable(IN PRTL_AVL_TABLE Table, + IN CLONG ByteSize) +{ + /* FIXME: TODO */ + ASSERT(FALSE); + return NULL; +} + +VOID +NTAPI +RtlpDphFreeNodeForTable(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer) +{ + /* FIXME: TODO */ + ASSERT(FALSE); +} + +NTSTATUS NTAPI +RtlpDphInitializeDelayedFreeQueue() +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +RtlpDphTargetDllsLogicInitialize() +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +VOID NTAPI +RtlpDphInternalValidatePageHeap(PDPH_HEAP_ROOT DphRoot, PVOID Address, ULONG Value) +{ + UNIMPLEMENTED; +} + +NTSTATUS NTAPI +RtlpDphProcessStartupInitialization() +{ + NTSTATUS Status; + PTEB Teb = NtCurrentTeb(); + + /* Initialize the DPH heap list and its critical section */ + InitializeListHead(&RtlpDphPageHeapList); + Status = RtlInitializeCriticalSection(&RtlpDphPageHeapListLock); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + return Status; + } + + /* Initialize delayed-free queue */ + Status = RtlpDphInitializeDelayedFreeQueue(); + if (!NT_SUCCESS(Status)) return Status; + + /* Initialize the target dlls string */ + RtlInitUnicodeString(&RtlpDphTargetDllsUnicode, RtlpDphTargetDlls); + Status = RtlpDphTargetDllsLogicInitialize(); + + /* Per-process DPH init is done */ + RtlpDphPageHeapListInitialized = TRUE; + + DPRINT1("Page heap: pid 0x%X: page heap enabled with flags 0x%X.\n", Teb->ClientId.UniqueProcess, RtlpDphGlobalFlags); + + return Status; +} HANDLE NTAPI RtlpPageHeapCreate(ULONG Flags, @@ -33,7 +387,135 @@ PVOID Lock, PRTL_HEAP_PARAMETERS Parameters) { - return NULL; + PVOID Base; + PHEAP HeapPtr; + PDPH_HEAP_ROOT DphRoot; + PDPH_HEAP_BLOCK DphNode; + ULONG MemSize; + NTSTATUS Status; + LARGE_INTEGER PerfCounter; + + /* Check for a DPH bypass flag */ + if ((ULONG_PTR)Parameters == -1) return NULL; + + /* Make sure no user-allocated stuff was provided */ + if (Addr || Lock) return NULL; + + /* Allocate minimum amount of virtual memory */ + MemSize = DPH_RESERVE_SIZE; + Status = RtlpDphAllocateVm(&Base, MemSize, MEM_COMMIT, PAGE_NOACCESS); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + return NULL; + } + + /* Set protection */ + Status = RtlpDphProtectVm(Base, 2*PAGE_SIZE + DPH_POOL_SIZE, PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + //RtlpDphFreeVm(Base, 0, 0, 0); + ASSERT(FALSE); + return NULL; + } + + /* Start preparing the 1st page. Fill it with the default filler */ + RtlFillMemory(Base, PAGE_SIZE, DPH_FILL); + + /* Set flags in the "HEAP" structure */ + HeapPtr = (PHEAP)Base; + HeapPtr->Flags = Flags | HEAP_FLAG_PAGE_ALLOCS; + HeapPtr->ForceFlags = Flags | HEAP_FLAG_PAGE_ALLOCS; + + /* Set 1st page to read only now */ + Status = RtlpDphProtectVm(Base, PAGE_SIZE, PAGE_READONLY); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + return NULL; + } + + /* 2nd page is the real DPH root block */ + DphRoot = (PDPH_HEAP_ROOT)((PCHAR)Base + PAGE_SIZE); + + /* Initialize the DPH root */ + DphRoot->Signature = DPH_SIGNATURE; + DphRoot->HeapFlags = Flags; + DphRoot->HeapCritSect = (PRTL_CRITICAL_SECTION)((PCHAR)DphRoot + DPH_POOL_SIZE); + DphRoot->ExtraFlags = RtlpDphGlobalFlags; + + ZwQueryPerformanceCounter(&PerfCounter, NULL); + DphRoot->Seed = PerfCounter.LowPart; + + RtlInitializeCriticalSection(DphRoot->HeapCritSect); + + /* Create a normal heap for this paged heap */ + DphRoot->NormalHeap = RtlCreateHeap(Flags, NULL, TotalSize, CommitSize, NULL, (PRTL_HEAP_PARAMETERS)-1); + if (!DphRoot->NormalHeap) + { + ASSERT(FALSE); + return NULL; + } + + /* 3rd page: a pool for DPH allocations */ + RtlpDphAddNewPool(DphRoot, NULL, DphRoot + 1, DPH_POOL_SIZE - sizeof(DPH_HEAP_ROOT), FALSE); + + /* Allocate internal heap blocks. For the root */ + DphNode = RtlpDphAllocateNode(DphRoot); + ASSERT(DphNode != NULL); + DphNode->pVirtualBlock = (PUCHAR)DphRoot; + DphNode->nVirtualBlockSize = DPH_POOL_SIZE; + RtlpDphPlaceOnPoolList(DphRoot, DphNode); + + /* For the memory we allocated as a whole */ + DphNode = RtlpDphAllocateNode(DphRoot); + ASSERT(DphNode != NULL); + DphNode->pVirtualBlock = Base; + DphNode->nVirtualBlockSize = MemSize; + RtlpDphPlaceOnVirtualList(DphRoot, DphNode); + + /* For the remaining part */ + DphNode = RtlpDphAllocateNode(DphRoot); + ASSERT(DphNode != NULL); + DphNode->pVirtualBlock = (PUCHAR)Base + 2*PAGE_SIZE + DPH_POOL_SIZE; + DphNode->nVirtualBlockSize = MemSize - (2*PAGE_SIZE + DPH_POOL_SIZE); + RtlpDphCoalesceNodeIntoAvailable(DphRoot, DphNode); + + //DphRoot->CreateStackTrace = RtlpDphLogStackTrace(1); + + /* Initialize AVL-based busy nodes table */ + RtlInitializeGenericTableAvl(&DphRoot->BusyNodesTable, + RtlpDphCompareNodeForTable, + RtlpDphAllocateNodeForTable, + RtlpDphFreeNodeForTable, + NULL); + + /* Initialize per-process startup info */ + if (!RtlpDphPageHeapListInitialized) RtlpDphProcessStartupInitialization(); + + /* Acquire the heap list lock */ + RtlEnterCriticalSection(&RtlpDphPageHeapListLock); + + /* Insert this heap to the tail of the global list */ + InsertTailList(&RtlpDphPageHeapList, &DphRoot->NextHeap); + + /* Note we increased the size of the list */ + RtlpDphPageHeapListLength++; + + /* Release the heap list lock */ + RtlLeaveCriticalSection(&RtlpDphPageHeapListLock); + + if (RtlpDphDebugOptions & DPH_DEBUG_VERBOSE) + { + DPRINT1("Page heap: process 0x%X created heap @ %p (%p, flags 0x%X)\n", + NtCurrentTeb()->ClientId.UniqueProcess, (PUCHAR)DphRoot - PAGE_SIZE, DphRoot->NormalHeap, DphRoot->ExtraFlags); + } + + /* Perform internal validation if required */ + if (RtlpDphDebugOptions & DPH_DEBUG_INTERNAL_VALIDATE) + RtlpDphInternalValidatePageHeap(DphRoot, NULL, 0); + + return (PUCHAR)DphRoot - PAGE_SIZE; } PVOID NTAPI

1 0

[tkreuzer] 50666: Fix merge artifact
by tkreuzer＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: tkreuzer Date: Sat Feb 12 10:46:17 2011 New Revision: 50666 URL: http://svn.reactos.org/svn/reactos?rev=50666&view=rev Log: Fix merge artifact Modified: branches/cmake-bringup/dll/win32/setupapi/devinst.c Modified: branches/cmake-bringup/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupap… ============================================================================== --- branches/cmake-bringup/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/setupapi/devinst.c [iso-8859-1] Sat Feb 12 10:46:17 2011 @@ -2203,7 +2203,7 @@ MachineName, Reserved); if (hKey == INVALID_HANDLE_VALUE) - return FALSE; + return FALSE; /* Retrieve the class description data and close the key */ rc = QueryRegistryValue(hKey, NULL, (LPBYTE *) &Buffer, &dwRegType, &dwLength);

1 0

[fireball] 50665: [NDK] - Add RTL_TRACE_BLOCK structure definition.
by fireball＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: fireball Date: Sat Feb 12 09:28:41 2011 New Revision: 50665 URL: http://svn.reactos.org/svn/reactos?rev=50665&view=rev Log: [NDK] - Add RTL_TRACE_BLOCK structure definition. Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Sat Feb 12 09:28:41 2011 @@ -1285,6 +1285,18 @@ RTL_CRITICAL_SECTION CriticalSection; } STACK_TRACE_DATABASE, *PSTACK_TRACE_DATABASE; +typedef struct _RTL_TRACE_BLOCK +{ + ULONG Magic; + ULONG Count; + ULONG Size; + ULONG UserCount; + ULONG UserSize; + PVOID UserContext; + struct _RTL_TRACE_BLOCK *Next; + PVOID *Trace; +} RTL_TRACE_BLOCK, *PRTL_TRACE_BLOCK; + #ifndef NTOS_MODE_USER //

1 0

[tkreuzer] 50664: [RICHED20] Fix compilation with MSVC the small fix in txtsrv.c should be sent to wine (tm)
by tkreuzer＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: tkreuzer Date: Sat Feb 12 01:40:32 2011 New Revision: 50664 URL: http://svn.reactos.org/svn/reactos?rev=50664&view=rev Log: [RICHED20] Fix compilation with MSVC the small fix in txtsrv.c should be sent to wine (tm) Added: branches/cmake-bringup/dll/win32/riched20/msvc-thiscall.c (with props) branches/cmake-bringup/dll/win32/riched20/msvc.h (with props) Modified: branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt branches/cmake-bringup/dll/win32/riched20/txtsrv.c Modified: branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched2… ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] Sat Feb 12 01:40:32 2011 @@ -30,13 +30,14 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/riched20.def) +if(MSVC) + list(APPEND SOURCE msvc-thiscall.c) + set_source_files_properties(txthost.c txtsrv.c PROPERTIES COMPILE_FLAGS "/FImsvc.h") +endif() + add_library(riched20 SHARED ${SOURCE}) set_module_type(riched20 win32dll) target_link_libraries(riched20 wine uuid) - -if(MSVC) - set_target_properties(riched20 PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") -endif(MSVC) add_importlibs(riched20 msvcrt Added: branches/cmake-bringup/dll/win32/riched20/msvc-thiscall.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched2… ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/msvc-thiscall.c (added) +++ branches/cmake-bringup/dll/win32/riched20/msvc-thiscall.c [iso-8859-1] Sat Feb 12 01:40:32 2011 @@ -1,0 +1,124 @@ +#include "config.h" +#include "editor.h" + +#define DEFINE_THISCALL_WRAPPER(func,args) \ + typedef struct {int x[args/4];} _tag_##func; \ + void __stdcall func(_tag_##func p1); \ + __declspec(naked) void __stdcall __thiscall_##func(_tag_##func p1) \ + { \ + __asm pop eax \ + __asm push ecx \ + __asm push eax \ + __asm jmp func \ + } + +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetDC,4) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxReleaseDC,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowScrollBar,12) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxEnableScrollBar,12) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollRange,20) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollPos,16) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxInvalidateRect,12) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxViewChange,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxCreateCaret,16) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowCaret,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCaretPos,12) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetTimer,12) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxKillTimer,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScrollWindowEx,32) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCapture,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetFocus,4) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCursor,12) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScreenToClient,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxClientToScreen,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxActivate,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxDeactivate,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetClientRect,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetViewInset,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetCharFormat,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetParaFormat,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSysColor,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetBackStyle,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetMaxLength,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetScrollBars,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPasswordChar,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetAcceleratorPos,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetExtent,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxCharFormatChange,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxParaFormatChange,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPropertyBits,12) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxNotify,12) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmGetContext,4) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmReleaseContext,8) +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) + +#define STDCALL(func) __stdcall_ ## func +#define DEFINE_STDCALL_WRAPPER(num,func,args) \ + __declspec(naked) void __stdcall __stdcall_##func(_tag_##func p1) \ + { \ + __asm pop eax \ + __asm pop eax \ + __asm pop ecx \ + __asm push eax \ + __asm mov eax, [ecx] \ + __asm jmp dword ptr [eax + 4*num] \ + } + +DEFINE_STDCALL_WRAPPER(3,ITextHostImpl_TxGetDC,4) +DEFINE_STDCALL_WRAPPER(4,ITextHostImpl_TxReleaseDC,8) +DEFINE_STDCALL_WRAPPER(5,ITextHostImpl_TxShowScrollBar,12) +DEFINE_STDCALL_WRAPPER(6,ITextHostImpl_TxEnableScrollBar,12) +DEFINE_STDCALL_WRAPPER(7,ITextHostImpl_TxSetScrollRange,20) +DEFINE_STDCALL_WRAPPER(8,ITextHostImpl_TxSetScrollPos,16) +DEFINE_STDCALL_WRAPPER(9,ITextHostImpl_TxInvalidateRect,12) +DEFINE_STDCALL_WRAPPER(10,ITextHostImpl_TxViewChange,8) +DEFINE_STDCALL_WRAPPER(11,ITextHostImpl_TxCreateCaret,16) +DEFINE_STDCALL_WRAPPER(12,ITextHostImpl_TxShowCaret,8) +DEFINE_STDCALL_WRAPPER(13,ITextHostImpl_TxSetCaretPos,12) +DEFINE_STDCALL_WRAPPER(14,ITextHostImpl_TxSetTimer,12) +DEFINE_STDCALL_WRAPPER(15,ITextHostImpl_TxKillTimer,8) +DEFINE_STDCALL_WRAPPER(16,ITextHostImpl_TxScrollWindowEx,32) +DEFINE_STDCALL_WRAPPER(17,ITextHostImpl_TxSetCapture,8) +DEFINE_STDCALL_WRAPPER(18,ITextHostImpl_TxSetFocus,4) +DEFINE_STDCALL_WRAPPER(19,ITextHostImpl_TxSetCursor,12) +DEFINE_STDCALL_WRAPPER(20,ITextHostImpl_TxScreenToClient,8) +DEFINE_STDCALL_WRAPPER(21,ITextHostImpl_TxClientToScreen,8) +DEFINE_STDCALL_WRAPPER(22,ITextHostImpl_TxActivate,8) +DEFINE_STDCALL_WRAPPER(23,ITextHostImpl_TxDeactivate,8) +DEFINE_STDCALL_WRAPPER(24,ITextHostImpl_TxGetClientRect,8) +DEFINE_STDCALL_WRAPPER(25,ITextHostImpl_TxGetViewInset,8) +DEFINE_STDCALL_WRAPPER(26,ITextHostImpl_TxGetCharFormat,8) +DEFINE_STDCALL_WRAPPER(27,ITextHostImpl_TxGetParaFormat,8) +DEFINE_STDCALL_WRAPPER(28,ITextHostImpl_TxGetSysColor,8) +DEFINE_STDCALL_WRAPPER(29,ITextHostImpl_TxGetBackStyle,8) +DEFINE_STDCALL_WRAPPER(30,ITextHostImpl_TxGetMaxLength,8) +DEFINE_STDCALL_WRAPPER(31,ITextHostImpl_TxGetScrollBars,8) +DEFINE_STDCALL_WRAPPER(32,ITextHostImpl_TxGetPasswordChar,8) +DEFINE_STDCALL_WRAPPER(33,ITextHostImpl_TxGetAcceleratorPos,8) +DEFINE_STDCALL_WRAPPER(34,ITextHostImpl_TxGetExtent,8) +DEFINE_STDCALL_WRAPPER(35,ITextHostImpl_OnTxCharFormatChange,8) +DEFINE_STDCALL_WRAPPER(36,ITextHostImpl_OnTxParaFormatChange,8) +DEFINE_STDCALL_WRAPPER(37,ITextHostImpl_TxGetPropertyBits,12) +DEFINE_STDCALL_WRAPPER(38,ITextHostImpl_TxNotify,12) +DEFINE_STDCALL_WRAPPER(39,ITextHostImpl_TxImmGetContext,4) +DEFINE_STDCALL_WRAPPER(40,ITextHostImpl_TxImmReleaseContext,8) +DEFINE_STDCALL_WRAPPER(41,ITextHostImpl_TxGetSelectionBarWidth,8) + +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSendMessage,20) +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxDraw,52) +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetHScroll,24) +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetVScroll,24) +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxSetCursor,40) +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxQueryHitPoint,44) +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceActivate,8) +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceDeactivate,4) +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIActivate,4) +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIDeactivate,4) +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetText,8) +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSetText,8) +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCurrentTargetX,8) +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetBaseLinePos,8) +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetNaturalSize,36) +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget,8) +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxPropertyBitsChange,12) +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCachedSize,12) Propchange: branches/cmake-bringup/dll/win32/riched20/msvc-thiscall.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/riched20/msvc.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched2… ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/msvc.h (added) +++ branches/cmake-bringup/dll/win32/riched20/msvc.h [iso-8859-1] Sat Feb 12 01:40:32 2011 @@ -1,0 +1,138 @@ + + +#define __ASM_STDCALL_FUNC(name,args,code) + +#define typeof(X_) __typeof_ ## X_ + +struct ITextHost; +struct _RECT; +struct _CHARFORMATW; +struct _PARAFORMAT; +struct _POINT; +struct _SIZEL; +struct HDC__; + +#define WINAPI __stdcall +#define HRESULT int +#define HDC struct HDC__* +#define BOOL int +#define HIMC void* +#define ITextHost struct ITextHost +#define INT int +#define UINT unsigned int +#define HBITMAP void* +#define LPCRECT const struct tagRECT * +#define LPRECT struct tagRECT * +#define LPCRECTL const struct _RECTL* +#define CHARFORMATW struct _charformatw +#define PARAFORMAT struct _paraformat +#define DWORD unsigned int /* HACK */ +#define COLORREF DWORD +#define LONG int /* HACK */ +#define WPARAM unsigned long +#define LPARAM long +#define HRGN void* +#define HCURSOR void* +#define LPPOINT struct tagPOINT* +#define TXTBACKSTYLE enum _TXTBACKSTYLE +#define WCHAR unsigned short +#define BSTR WCHAR* +#define LPCWSTR const WCHAR * +#define SIZEL struct tagSIZE +#define LPSIZEL struct tagSIZE* +#define ITextServices struct ITextServices +#define LRESULT long +#define DVTARGETDEVICE struct tagDVTARGETDEVICE + +typedef HDC (WINAPI typeof(ITextHostImpl_TxGetDC))(ITextHost * iface); +typedef int (WINAPI typeof(ITextHostImpl_TxReleaseDC))(ITextHost *iface,HDC hdc); +typedef BOOL (WINAPI typeof(ITextHostImpl_TxShowScrollBar))(ITextHost *iface,INT fnBar,BOOL fShow); +typedef BOOL (WINAPI typeof(ITextHostImpl_TxEnableScrollBar))(ITextHost *iface,INT fuSBFlags,INT fuArrowflags); +typedef BOOL (WINAPI typeof(ITextHostImpl_TxSetScrollRange))(ITextHost *iface,INT fnBar,LONG nMinPos,INT nMaxPos,BOOL fRedraw); +typedef BOOL (WINAPI typeof(ITextHostImpl_TxSetScrollPos))(ITextHost *iface,INT fnBar,INT nPos,BOOL fRedraw); +typedef void (WINAPI typeof(ITextHostImpl_TxInvalidateRect))(ITextHost *iface,LPCRECT prc,BOOL fMode); +typedef void (WINAPI typeof(ITextHostImpl_TxViewChange))(ITextHost *iface,BOOL fUpdate); +typedef BOOL (WINAPI typeof(ITextHostImpl_TxCreateCaret))(ITextHost *iface,HBITMAP hbmp,INT xWidth, INT yHeight); +typedef BOOL (WINAPI typeof(ITextHostImpl_TxShowCaret))(ITextHost *iface, BOOL fShow); +typedef BOOL (WINAPI typeof(ITextHostImpl_TxSetCaretPos))(ITextHost *iface,INT x, INT y); +typedef BOOL (WINAPI typeof(ITextHostImpl_TxSetTimer))(ITextHost *iface,UINT idTimer, UINT uTimeout); +typedef void (WINAPI typeof(ITextHostImpl_TxKillTimer))(ITextHost *iface,UINT idTimer); +typedef void (WINAPI typeof(ITextHostImpl_TxScrollWindowEx))(ITextHost *iface,INT dx, INT dy,LPCRECT lprcScroll,LPCRECT lprcClip,HRGN hRgnUpdate,LPRECT lprcUpdate,UINT fuScroll); +typedef void (WINAPI typeof(ITextHostImpl_TxSetCapture))(ITextHost *iface,BOOL fCapture); +typedef void (WINAPI typeof(ITextHostImpl_TxSetFocus))(ITextHost *iface); +typedef void (WINAPI typeof(ITextHostImpl_TxSetCursor))(ITextHost *iface,HCURSOR hcur,BOOL fText); +typedef BOOL (WINAPI typeof(ITextHostImpl_TxScreenToClient))(ITextHost *iface,LPPOINT lppt); +typedef BOOL (WINAPI typeof(ITextHostImpl_TxClientToScreen))(ITextHost *iface,LPPOINT lppt); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxActivate))(ITextHost *iface,LONG *plOldState); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxDeactivate))(ITextHost *iface,LONG lNewState); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetClientRect))(ITextHost *iface,LPRECT prc); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetViewInset))(ITextHost *iface,LPRECT prc); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetCharFormat))(ITextHost *iface,const CHARFORMATW **ppCF); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetParaFormat))(ITextHost *iface,const PARAFORMAT **ppPF); +typedef COLORREF (WINAPI typeof(ITextHostImpl_TxGetSysColor))(ITextHost *iface,int nIndex); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetBackStyle))(ITextHost *iface,TXTBACKSTYLE *pStyle); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetMaxLength))(ITextHost *iface,DWORD *pLength); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetScrollBars))(ITextHost *iface,DWORD *pdwScrollBar); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetPasswordChar))(ITextHost *iface,WCHAR *pch); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetAcceleratorPos))(ITextHost *iface,LONG *pch); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetExtent))(ITextHost *iface,LPSIZEL lpExtent); +typedef HRESULT (WINAPI typeof(ITextHostImpl_OnTxCharFormatChange))(ITextHost *iface,const CHARFORMATW *pcf); +typedef HRESULT (WINAPI typeof(ITextHostImpl_OnTxParaFormatChange))(ITextHost *iface,const PARAFORMAT *ppf); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetPropertyBits))(ITextHost *iface,DWORD dwMask,DWORD *pdwBits); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxNotify))(ITextHost *iface,DWORD iNotify,void *pv); +typedef HIMC (WINAPI typeof(ITextHostImpl_TxImmGetContext))(ITextHost *iface); +typedef void (WINAPI typeof(ITextHostImpl_TxImmReleaseContext))(ITextHost *iface,HIMC himc); +typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetSelectionBarWidth))(ITextHost *iface,LONG *lSelBarWidth); + +typedef HRESULT (WINAPI typeof(fnTextSrv_TxSendMessage))(ITextServices *iface,UINT msg,WPARAM wparam,LPARAM lparam,LRESULT* plresult); +typedef HRESULT (WINAPI typeof(fnTextSrv_TxDraw))(ITextServices *iface,DWORD dwDrawAspect,LONG lindex,void* pvAspect,DVTARGETDEVICE* ptd,HDC hdcDraw,HDC hdcTargetDev,LPCRECTL lprcBounds,LPCRECTL lprcWBounds,LPRECT lprcUpdate,BOOL (__stdcall * pfnContinue)(DWORD),DWORD dwContinue,LONG lViewId); +typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetHScroll))(ITextServices *iface,LONG* plMin,LONG* plMax,LONG* plPos,LONG* plPage,BOOL* pfEnabled); +typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetVScroll))(ITextServices *iface,LONG* plMin,LONG* plMax,LONG* plPos,LONG* plPage,BOOL* pfEnabled); +typedef HRESULT (WINAPI typeof(fnTextSrv_OnTxSetCursor))(ITextServices *iface,DWORD dwDrawAspect,LONG lindex,void* pvAspect,DVTARGETDEVICE* ptd,HDC hdcDraw,HDC hicTargetDev,LPCRECT lprcClient,INT x, INT y); +typedef HRESULT (WINAPI typeof(fnTextSrv_TxQueryHitPoint))(ITextServices *iface,DWORD dwDrawAspect,LONG lindex,void* pvAspect,DVTARGETDEVICE* ptd,HDC hdcDraw,HDC hicTargetDev,LPCRECT lprcClient,INT x, INT y,DWORD* pHitResult); +typedef HRESULT (WINAPI typeof(fnTextSrv_OnTxInplaceActivate))(ITextServices *iface,LPCRECT prcClient); +typedef HRESULT (WINAPI typeof(fnTextSrv_OnTxInplaceDeactivate))(ITextServices *iface); +typedef HRESULT (WINAPI typeof(fnTextSrv_OnTxUIActivate))(ITextServices *iface); +typedef HRESULT (WINAPI typeof(fnTextSrv_OnTxUIDeactivate))(ITextServices *iface); +typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetText))(ITextServices *iface,BSTR* pbstrText); +typedef HRESULT (WINAPI typeof(fnTextSrv_TxSetText))(ITextServices *iface,LPCWSTR pszText); +typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetCurrentTargetX))(ITextServices *iface,LONG* x); +typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetBaseLinePos))(ITextServices *iface,LONG* x); +typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetNaturalSize))(ITextServices *iface,DWORD dwAspect,HDC hdcDraw,HDC hicTargetDev,DVTARGETDEVICE* ptd,DWORD dwMode,const SIZEL* psizelExtent,LONG* pwidth,LONG* pheight); +typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetDropTarget))(ITextServices *iface,struct IDropTarget** ppDropTarget); +typedef HRESULT (WINAPI typeof(fnTextSrv_OnTxPropertyBitsChange))(ITextServices *iface,DWORD dwMask,DWORD dwBits); +typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetCachedSize))(ITextServices *iface,DWORD* pdwWidth,DWORD* pdwHeight); + +#undef WINAPI +#undef HRESULT +#undef HDC +#undef BOOL +#undef COLORREF +#undef HIMC +#undef ITextHost +#undef INT +#undef UINT +#undef HBITMAP +#undef LPCRECT +#undef LPRECT +#undef LPCRECTL +#undef CHARFORMATW +#undef PARAFORMAT +#undef DWORD +#undef LONG +#undef WPARAM +#undef LPARAM +#undef HRGN +#undef HCURSOR +#undef LPPOINT +#undef TXTBACKSTYLE +#undef WCHAR +#undef BSTR +#undef LPCWSTR +#undef SIZEL +#undef LPSIZEL +#undef ITextServices +#undef LRESULT +#undef DVTARGETDEVICE + +//#undef typeof Propchange: branches/cmake-bringup/dll/win32/riched20/msvc.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched2… ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/txtsrv.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched20/txtsrv.c [iso-8859-1] Sat Feb 12 01:40:32 2011 @@ -88,7 +88,10 @@ ITextImpl->lpVtbl = &textservices_Vtbl; ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); ITextImpl->editor->exStyleFlags = 0; - ITextImpl->editor->rcFormat = (RECT){0,0,0,0}; + ITextImpl->editor->rcFormat.left = 0; + ITextImpl->editor->rcFormat.top = 0; + ITextImpl->editor->rcFormat.right = 0; + ITextImpl->editor->rcFormat.bottom = 0; ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); if (pUnkOuter)

1 0

[tkreuzer] 50663: [NTDLL_APITEST] some printf tests
by tkreuzer＠svn.reactos.org 11 Feb '11

11 Feb '11

Author: tkreuzer Date: Fri Feb 11 21:22:18 2011 New Revision: 50663 URL: http://svn.reactos.org/svn/reactos?rev=50663&view=rev Log: [NTDLL_APITEST] some printf tests Added: trunk/rostests/apitests/ntdll/sprintf.c (with props) Added: trunk/rostests/apitests/ntdll/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/sprintf.c?… ============================================================================== --- trunk/rostests/apitests/ntdll/sprintf.c (added) +++ trunk/rostests/apitests/ntdll/sprintf.c [iso-8859-1] Fri Feb 11 21:22:18 2011 @@ -1,0 +1,524 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for sprintf + * PROGRAMMER: Timo Kreuzer + */ + +#include <stdio.h> +#include <stdlib.h> +#include <strings.h> +#include <math.h> +#include <stdarg.h> +#include <wine/test.h> +#include <windows.h> + + +#define ok_str(x, y) \ + ok(strcmp(x, y) == 0, "got '%s', expected '%s'\n", x, y); + +#define ok_int(x, y) \ + ok(x == y, "got %d, expected %d\n", x, y); + +int (*p_vsprintf)(char *buf, const char *fmt, va_list argptr); + + +int +my_sprintf(char *buf, const char *format, ...) +{ + const TCHAR * fmt = format; + va_list argptr; + + va_start(argptr, format); + return p_vsprintf(buf, fmt, argptr); +} + +int +my_swprintf(wchar_t *buf, const wchar_t *format, ...) +{ + const wchar_t * fmt = format; + va_list argptr; + + va_start(argptr, format); + return _vsnwprintf(buf, MAXLONG, fmt, argptr); +} + +#define sprintf(buf, format, ...) my_sprintf(buf, format, __VA_ARGS__); +#define swprintf(buf, format, ...) my_swprintf((wchar_t*)buf, format, __VA_ARGS__); + +void +test_c() +{ + char buffer[64]; + + sprintf(buffer, "%c", 0x3031); + ok_str(buffer, "1"); + + sprintf(buffer, "%hc", 0x3031); + ok_str(buffer, "1"); + + sprintf(buffer, "%wc", 0x3031); + ok_str(buffer, "?"); + + sprintf(buffer, "%lc", 0x3031); + ok_str(buffer, "?"); + + sprintf(buffer, "%Lc", 0x3031); + ok_str(buffer, "1"); + + sprintf(buffer, "%Ic", 0x3031); + ok_str(buffer, "Ic"); + + sprintf(buffer, "%Iwc", 0x3031); + ok_str(buffer, "Iwc"); + + sprintf(buffer, "%I32c", 0x3031); + ok_str(buffer, "1"); + + sprintf(buffer, "%I64c", 0x3031); + ok_str(buffer, "1"); + + sprintf(buffer, "%4c", 0x3031); + ok_str(buffer, " 1"); + + sprintf(buffer, "%04c", 0x3031); + ok_str(buffer, "0001"); + + sprintf(buffer, "%+4c", 0x3031); + ok_str(buffer, " 1"); + +} + +void +test_d() +{ + char buffer[5000]; + int result; + + sprintf(buffer, "%d", 1234567); + ok_str(buffer, "1234567"); + + sprintf(buffer, "%d", -1234567); + ok_str(buffer, "-1234567"); + + sprintf(buffer, "%hd", 1234567); + ok_str(buffer, "-10617"); + + sprintf(buffer, "%08d", 1234); + ok_str(buffer, "00001234"); + + sprintf(buffer, "%-08d", 1234); + ok_str(buffer, "1234 "); + + sprintf(buffer, "%+08d", 1234); + ok_str(buffer, "+0001234"); + + sprintf(buffer, "%+3d", 1234); + ok_str(buffer, "+1234"); + + sprintf(buffer, "%3.3d", 1234); + ok_str(buffer, "1234"); + + sprintf(buffer, "%3.6d", 1234); + ok_str(buffer, "001234"); + + sprintf(buffer, "%8d", -1234); + ok_str(buffer, " -1234"); + + sprintf(buffer, "%08d", -1234); + ok_str(buffer, "-0001234"); + + sprintf(buffer, "%ld", -1234); + ok_str(buffer, "-1234"); + + sprintf(buffer, "%wd", -1234); + ok_str(buffer, "-1234"); + + sprintf(buffer, "%ld", -5149074030855LL); + ok_str(buffer, "591757049"); + + sprintf(buffer, "%lld", -5149074030855LL); + ok_str(buffer, "591757049"); + + sprintf(buffer, "%I64d", -5149074030855LL); + ok_str(buffer, "-5149074030855"); + + sprintf(buffer, "%Ld", -5149074030855LL); + ok_str(buffer, "591757049"); + + sprintf(buffer, "%lhwI64d", -5149074030855LL); + ok_str(buffer, "-5149074030855"); + + sprintf(buffer, "%I64hlwd", -5149074030855LL); + ok_str(buffer, "-5149074030855"); + + sprintf(buffer, "%hlwd", -5149074030855LL); + ok_str(buffer, "32505"); + + sprintf(buffer, "%Ild", -5149074030855LL); + ok_str(buffer, "Ild"); + + sprintf(buffer, "%hd", -5149074030855LL); + ok_str(buffer, "32505"); + + sprintf(buffer, "%hhd", -5149074030855LL); + ok_str(buffer, "32505"); + + sprintf(buffer, "%hI32hd", -5149074030855LL); + ok_str(buffer, "32505"); + + sprintf(buffer, "%wd", -5149074030855LL); + ok_str(buffer, "591757049"); + + result = sprintf(buffer, " %d.%d", 3, 0); + ok_int(result, 4); + +} + +void +test_u() +{ + char buffer[64]; + + sprintf(buffer, "%u", 1234); + ok_str(buffer, "1234"); + + sprintf(buffer, "%u", -1234); + ok_str(buffer, "4294966062"); + + sprintf(buffer, "%lu", -1234); + ok_str(buffer, "4294966062"); + + sprintf(buffer, "%llu", -1234); + ok_str(buffer, "4294966062"); + + sprintf(buffer, "%+u", 1234); + ok_str(buffer, "1234"); + + sprintf(buffer, "% u", 1234); + ok_str(buffer, "1234"); + +} + +void +test_x() +{ + char buffer[64]; + + sprintf(buffer, "%x", 0x1234abcd); + ok_str(buffer, "1234abcd"); + + sprintf(buffer, "%X", 0x1234abcd); + ok_str(buffer, "1234ABCD"); + + sprintf(buffer, "%#x", 0x1234abcd); + ok_str(buffer, "0x1234abcd"); + + sprintf(buffer, "%#X", 0x1234abcd); + ok_str(buffer, "0X1234ABCD"); + + /* "0x" is contained in the field length */ + sprintf(buffer, "%#012X", 0x1234abcd); + ok_str(buffer, "0X001234ABCD"); + + sprintf(buffer, "%llx", 0x1234abcd5678ULL); + ok_str(buffer, "abcd5678"); + + sprintf(buffer, "%I64x", 0x1234abcd5678ULL); + ok_str(buffer, "1234abcd5678"); + +} + +void +test_p() +{ + char buffer[64]; + + sprintf(buffer, "%p", (void*)(ptrdiff_t)0x123abc); + ok_str(buffer, "00123ABC"); + + sprintf(buffer, "%#p", (void*)(ptrdiff_t)0x123abc); + ok_str(buffer, "0X00123ABC"); + + sprintf(buffer, "%#012p", (void*)(ptrdiff_t)0x123abc); + ok_str(buffer, " 0X00123ABC"); + + sprintf(buffer, "%9p", (void*)(ptrdiff_t)0x123abc); + ok_str(buffer, " 00123ABC"); + + sprintf(buffer, "%09p", (void*)(ptrdiff_t)0x123abc); + ok_str(buffer, " 00123ABC"); + + sprintf(buffer, "% 9p", (void*)(ptrdiff_t)0x123abc); + ok_str(buffer, " 00123ABC"); + + sprintf(buffer, "%-9p", (void*)(ptrdiff_t)0x123abc); + ok_str(buffer, "00123ABC "); + + sprintf(buffer, "%4p", (void*)(ptrdiff_t)0x123abc); + ok_str(buffer, "00123ABC"); + + sprintf(buffer, "%9.4p", (void*)(ptrdiff_t)0x123abc); + ok_str(buffer, " 00123ABC"); + + sprintf(buffer, "%I64p", 0x123abc456789ULL); + ok_str(buffer, "123ABC456789"); + + sprintf(buffer, "%hp", 0x123abc); + ok_str(buffer, "00003ABC"); + +} + +void +test_o() +{ + TCHAR buffer[64]; + + sprintf(buffer, "%o", 1234); + ok_str(buffer, "2322"); + + sprintf(buffer, "%o", -1234); + ok_str(buffer, "37777775456"); + +} + +void +test_s() +{ + char buffer[64]; + + sprintf(buffer, "%s", "test"); + ok_str(buffer, "test"); + + sprintf(buffer, "%S", L"test"); + ok_str(buffer, "test"); + + sprintf(buffer, "%ls", L"test"); + ok_str(buffer, "test"); + + sprintf(buffer, "%ws", L"test"); + ok_str(buffer, "test"); + + sprintf(buffer, "%hs", "test"); + ok_str(buffer, "test"); + + sprintf(buffer, "%hS", "test"); + ok_str(buffer, "test"); + + sprintf(buffer, "%7s", "test"); + ok_str(buffer, " test"); + + sprintf(buffer, "%07s", "test"); + ok_str(buffer, "000test"); + + sprintf(buffer, "%.3s", "test"); + ok_str(buffer, "tes"); + + sprintf(buffer, "%+7.3s", "test"); + ok_str(buffer, " tes"); + + sprintf(buffer, "%+4.0s", "test"); + ok_str(buffer, " "); + + +} + +void +test_n() +{ + int len = 123; + __int64 len64; + char buffer[64]; + + sprintf(buffer, "%07s%n", "test", &len); + ok_int(len, 7); + + len = 0x12345678; + sprintf(buffer, "%s%hn", "test", &len); + ok_int(len, 0x12340004); + + len = 0x12345678; + sprintf(buffer, "%s%hhn", "test", &len); + ok_int(len, 0x12340004); + + len64 = 0x0123456781234567ULL; + sprintf(buffer, "%s%lln", "test", &len64); + ok(len64 == 0x123456700000004ULL, " "); + +} + +void +test_f() +{ + char buffer[128]; + long double fpval; + + fpval = 1. / 3.; + sprintf(buffer, "%f", fpval); + ok_str(buffer, "-0.000000"); + + sprintf(buffer, "%lf", fpval); + ok_str(buffer, "-0.000000"); + + sprintf(buffer, "%llf", fpval); + ok_str(buffer, "-0.000000"); + + sprintf(buffer, "%Lf", fpval); + ok_str(buffer, "-0.000000"); + + sprintf(buffer, "%f", (double)fpval); + ok_str(buffer, "0.333333"); + + sprintf(buffer, "%f", (double)0.125); + ok_str(buffer, "0.125000"); + + sprintf(buffer, "%3.7f", (double)fpval); + ok_str(buffer, "0.3333333"); + + sprintf(buffer, "%3.30f", (double)fpval); + ok_str(buffer, "0.333333333333333310000000000000"); + + sprintf(buffer, "%3.60f", (double)fpval); + ok_str(buffer, "0.333333333333333310000000000000000000000000000000000000000000"); + + sprintf(buffer, "%3.80f", (double)fpval); + ok_str(buffer, "0.33333333333333331000000000000000000000000000000000000000000000000000000000000000"); + + fpval = 1. / 0.; + sprintf(buffer, "%f", fpval); + ok_str(buffer, "0.000000"); + + sprintf(buffer, "%f", 0x7ff8000000000000ULL); // NAN + ok_str(buffer, "1.#QNAN0"); + + sprintf(buffer, "%.9f", 0x7ff8000000000000ULL); + ok_str(buffer, "1.#QNAN0000"); + + sprintf(buffer, "%f", 0x7ff0000000000000ULL ); // INFINITY + ok_str(buffer, "1.#INF00"); + + sprintf(buffer, "%f", 0xfff0000000000000ULL ); // -INFINITY + ok_str(buffer, "-1.#INF00"); + + sprintf(buffer, "%f", 0xfff8000000000000ULL); // broken + ok_str(buffer, "-1.#IND00"); + +} + +void +test_e() +{ + char buffer[128]; + long double fpval; + + fpval = 1. / 3.; + sprintf(buffer, "%e", fpval); + ok_str(buffer, "-3.720662e-103"); + + fpval = 1. / 3.; + sprintf(buffer, "%e", (double)fpval); + ok_str(buffer, "3.333333e-001"); + + sprintf(buffer, "%e", 33.54223); + ok_str(buffer, "3.354223e+001"); + + sprintf(buffer, "%e", NAN); + ok_str(buffer, "1.#QNAN0e+000"); + + sprintf(buffer, "%.9e", NAN); + ok_str(buffer, "1.#QNAN0000e+000"); + + sprintf(buffer, "%e", INFINITY ); + ok_str(buffer, "1.#INF00e+000"); + + sprintf(buffer, "%e", -INFINITY ); + ok_str(buffer, "-1.#INF00e+000"); + + +} + +typedef struct _STRING +{ + unsigned short Length; + unsigned short MaximumLength; + void *Buffer; +} STRING; + +void +test_Z() +{ + char buffer[128]; + STRING string; + int result; + + string.Buffer = "Test\0Hallo"; + string.Length = 4; + string.MaximumLength = 5; + + sprintf(buffer, "%Z", &string); + ok_str(buffer, "Test"); + + string.Length = 8; + sprintf(buffer, "%Z", &string); + ok_str(buffer, "Test"); + + string.Length = 3; + sprintf(buffer, "%Z", &string); + ok_str(buffer, "Tes"); + + string.Buffer = 0; + sprintf(buffer, "%Z", &string); + ok_str(buffer, "(null)"); + + sprintf(buffer, "%Z", 0); + ok_str(buffer, "(null)"); + + string.Buffer = (char*)L"Test\0Hallo"; + string.Length = 8; + string.MaximumLength = 10; + + + string.Buffer = (char*)L"test"; + string.Length = 12; + string.MaximumLength = 15; + result = _snprintf(buffer, 127, "%Z %u%c", &string, 1, 0); + ok_int(result, 15); + +} + +void +test_other() +{ + char buffer[128]; + + sprintf(buffer, "%lI64wQ", "test"); + ok_str(buffer, "Q"); + +} + +START_TEST(sprintf) +{ + HANDLE hModule; + + hModule = GetModuleHandleA("msvcrt.dll"); + if (!hModule) return; + p_vsprintf = (PVOID)GetProcAddress(hModule, "vsprintf"); + if (!p_vsprintf) return; + + test_c(); + test_d(); + test_u(); + test_x(); + test_p(); + test_o(); + + test_s(); + + test_f(); + test_e(); + test_Z(); + + test_n(); + test_other(); +} + Propchange: trunk/rostests/apitests/ntdll/sprintf.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs