Ros-diffs December 2011

ros-diffs@reactos.org

16 participants
242 discussions

[tfaber] 54748: [NTDLL_APITEST] - NtAllocateVirtualMemory: fix handling of an error condition; check that newly-committed memory is zeroed

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Dec 24 10:26:04 2011 New Revision: 54748 URL: http://svn.reactos.org/svn/reactos?rev=54748&view=rev Log: [NTDLL_APITEST] - NtAllocateVirtualMemory: fix handling of an error condition; check that newly-committed memory is zeroed Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtAllocate… ============================================================================== --- trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] Sat Dec 24 10:26:04 2011 @@ -60,11 +60,13 @@ Status = NtAllocateVirtualMemory(NtCurrentProcess(), &FirstPageStart, 0, &Size, MEM_COMMIT, PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - Size = 0; + AllocationSize = 0; Status = NtFreeVirtualMemory(NtCurrentProcess(), &AllocationStart, &AllocationSize, MEM_RELEASE); ASSERT(Status == STATUS_SUCCESS); return NULL; } + ASSERT(Size % sizeof(ULONG) == 0); + ASSERT(RtlCompareMemoryUlong(FirstPageStart, Size, 0) == Size); UserBuffer = AllocationStart; UserBuffer += AllocationSize - PAGE_SIZE - DataSize;

13 years

[cgutman] 54747: [NTOSKRNL] - Fix a reference count check in the flush path (broken by r54745)

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Dec 24 05:43:36 2011 New Revision: 54747 URL: http://svn.reactos.org/svn/reactos?rev=54747&view=rev Log: [NTOSKRNL] - Fix a reference count check in the flush path (broken by r54745) Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=547… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Dec 24 05:43:36 2011 @@ -228,7 +228,9 @@ } ASSERT(current->Dirty); - if (current->ReferenceCount > 1) + + /* One reference is added above */ + if (current->ReferenceCount > 2) { KeReleaseMutex(&current->Mutex, 0); current->Bcb->Callbacks->ReleaseFromLazyWrite(

13 years

[cgutman] 54746: [NTOSKRNL] - Fix inconsistent locking

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Dec 24 03:57:10 2011 New Revision: 54746 URL: http://svn.reactos.org/svn/reactos?rev=54746&view=rev Log: [NTOSKRNL] - Fix inconsistent locking Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=547… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Dec 24 03:57:10 2011 @@ -398,7 +398,7 @@ BOOLEAN Dirty, BOOLEAN Mapped) { - BOOLEAN WasDirty = CacheSeg->Dirty; + BOOLEAN WasDirty; KIRQL oldIrql; ASSERT(Bcb); @@ -406,10 +406,14 @@ DPRINT("CcReleaseCacheSegment(Bcb 0x%p, CacheSeg 0x%p, Valid %d)\n", Bcb, CacheSeg, Valid); + KeAcquireGuardedMutex(&ViewLock); + KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + CacheSeg->Valid = Valid; + + WasDirty = CacheSeg->Dirty; CacheSeg->Dirty = CacheSeg->Dirty || Dirty; - KeAcquireGuardedMutex(&ViewLock); if (!WasDirty && CacheSeg->Dirty) { InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); @@ -420,7 +424,6 @@ { CacheSeg->MappedCount++; } - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); CcRosCacheSegmentDecRefCount(CacheSeg); if (Mapped && CacheSeg->MappedCount == 1) { @@ -430,6 +433,7 @@ { CcRosCacheSegmentIncRefCount(CacheSeg); } + KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); KeReleaseMutex(&CacheSeg->Mutex, 0); @@ -449,8 +453,10 @@ ASSERT(Bcb); DPRINT("CcRosLookupCacheSegment(Bcb -x%p, FileOffset %d)\n", Bcb, FileOffset); - + + KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + current_entry = Bcb->BcbSegmentListHead.Flink; while (current_entry != &Bcb->BcbSegmentListHead) { @@ -461,6 +467,7 @@ { CcRosCacheSegmentIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseGuardedMutex(&ViewLock); KeWaitForSingleObject(&current->Mutex, Executive, KernelMode, @@ -470,7 +477,10 @@ } current_entry = current_entry->Flink; } + KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseGuardedMutex(&ViewLock); + return(NULL); } @@ -490,29 +500,28 @@ { KeBugCheck(CACHE_MANAGER); } + + KeAcquireGuardedMutex(&ViewLock); + KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + if (!CacheSeg->Dirty) - { - KeAcquireGuardedMutex(&ViewLock); + { InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE; - KeReleaseGuardedMutex(&ViewLock); - } + } else { - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - CcRosCacheSegmentDecRefCount(CacheSeg); - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - } - - KeAcquireGuardedMutex(&ViewLock); + CcRosCacheSegmentDecRefCount(CacheSeg); + } /* Move to the tail of the LRU list */ RemoveEntryList(&CacheSeg->CacheSegmentLRUListEntry); InsertTailList(&CacheSegmentLRUListHead, &CacheSeg->CacheSegmentLRUListEntry); + CacheSeg->Dirty = TRUE; + + KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - - CacheSeg->Dirty = TRUE; KeReleaseMutex(&CacheSeg->Mutex, 0); return(STATUS_SUCCESS); @@ -537,6 +546,9 @@ return(STATUS_UNSUCCESSFUL); } + KeAcquireGuardedMutex(&ViewLock); + KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + WasDirty = CacheSeg->Dirty; CacheSeg->Dirty = CacheSeg->Dirty || NowDirty; @@ -544,13 +556,10 @@ if (!WasDirty && NowDirty) { - KeAcquireGuardedMutex(&ViewLock); InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE; - KeReleaseGuardedMutex(&ViewLock); - } - - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + } + CcRosCacheSegmentDecRefCount(CacheSeg); if (!WasDirty && NowDirty) { @@ -560,8 +569,9 @@ { CcRosCacheSegmentDecRefCount(CacheSeg); } + KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - + KeReleaseGuardedMutex(&ViewLock); KeReleaseMutex(&CacheSeg->Mutex, 0); return(STATUS_SUCCESS); @@ -1039,9 +1049,12 @@ } } KeReleaseMutex(&current->Mutex, 0); + + KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); CcRosCacheSegmentDecRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseGuardedMutex(&ViewLock); } Offset.QuadPart += Bcb->CacheSegmentSize;

13 years

[cgutman] 54745: [NTOSKRNL] - Reference the cache segment when flushing to avoid a race between deleting the file cache and the balancer flushing pages to disk which causes random cache segments to...

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Dec 23 23:20:09 2011 New Revision: 54745 URL: http://svn.reactos.org/svn/reactos?rev=54745&view=rev Log: [NTOSKRNL] - Reference the cache segment when flushing to avoid a race between deleting the file cache and the balancer flushing pages to disk which causes random cache segments to be freed while we're holding a lock on it - Fixes a crash in KeReleaseMutex (used to be a crash in ExReleasePushLock) during periods of high memory load Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=547… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Fri Dec 23 23:20:09 2011 @@ -204,10 +204,13 @@ DirtySegmentListEntry); current_entry = current_entry->Flink; + CcRosCacheSegmentIncRefCount(current); + Locked = current->Bcb->Callbacks->AcquireForLazyWrite( current->Bcb->LazyWriteContext, Wait); if (!Locked) { + CcRosCacheSegmentDecRefCount(current); continue; } @@ -220,6 +223,7 @@ { current->Bcb->Callbacks->ReleaseFromLazyWrite( current->Bcb->LazyWriteContext); + CcRosCacheSegmentDecRefCount(current); continue; } @@ -229,6 +233,7 @@ KeReleaseMutex(&current->Mutex, 0); current->Bcb->Callbacks->ReleaseFromLazyWrite( current->Bcb->LazyWriteContext); + CcRosCacheSegmentDecRefCount(current); continue; } @@ -241,6 +246,9 @@ KeReleaseMutex(&current->Mutex, 0); current->Bcb->Callbacks->ReleaseFromLazyWrite( current->Bcb->LazyWriteContext); + + KeAcquireGuardedMutex(&ViewLock); + CcRosCacheSegmentDecRefCount(current); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) { @@ -251,8 +259,7 @@ (*Count) += PagesPerSegment; Target -= PagesPerSegment; } - - KeAcquireGuardedMutex(&ViewLock); + current_entry = DirtySegmentListHead.Flink; }

13 years

[fireball] 54744: [RAPPS] - Bump putty version to 0.62. See issue #6775 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 23 21:30:40 2011 New Revision: 54744 URL: http://svn.reactos.org/svn/reactos?rev=54744&view=rev Log: [RAPPS] - Bump putty version to 0.62. See issue #6775 for more details. Modified: trunk/reactos/base/applications/rapps/rapps/putty.txt Modified: trunk/reactos/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] Fri Dec 23 21:30:40 2011 @@ -2,13 +2,13 @@ [Section] Name = PuTTY -Version = 0.61 +Version = 0.62 Licence = MIT Description = A free SSH, Telnet, rlogin, and raw TCP client. Size = 1.8MB Category = 5 URLSite = http://www.chiark.greenend.org.uk/~sgtatham/putty/ -URLDownload = http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.61-installer.exe +URLDownload = http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.62-installer.exe CDPath = none [Section.0407]

13 years

[fireball] 54743: [DNSAPI] - Change file description in the resources. See issue #6653 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 23 21:25:25 2011 New Revision: 54743 URL: http://svn.reactos.org/svn/reactos?rev=54743&view=rev Log: [DNSAPI] - Change file description in the resources. See issue #6653 for more details. Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.rc Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.rc… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi.rc [iso-8859-1] Fri Dec 23 21:25:25 2011 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "DNSAPI.DLL Library\0" +#define REACTOS_STR_FILE_DESCRIPTION "DNS Client API Library\0" #define REACTOS_STR_INTERNAL_NAME "dnsapi\0" #define REACTOS_STR_ORIGINAL_FILENAME "dnsapi.dll\0" #include <reactos/version.rc>

13 years

[fireball] 54742: [RTL] - Samuel Serapion: Implement RtlIpv4AddressToStringEx A/W and minor enhancements RtlIpv4AddressToStringA/W. Fixes some ntdll:rtl winetests. See issue #6779 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 23 20:40:02 2011 New Revision: 54742 URL: http://svn.reactos.org/svn/reactos?rev=54742&view=rev Log: [RTL] - Samuel Serapion: Implement RtlIpv4AddressToStringEx A/W and minor enhancements RtlIpv4AddressToStringA/W. Fixes some ntdll:rtl winetests. See issue #6779 for more details. Modified: trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=5474… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Fri Dec 23 20:40:02 2011 @@ -12,6 +12,15 @@ #define NDEBUG #include <debug.h> +/* maximum length of an ipv4 address expressed as a string */ +#define IPV4_ADDR_STRING_MAX_LEN 16 + +/* maximum length of an ipv4 port expressed as a string */ +#define IPV4_PORT_STRING_MAX_LEN 7 /* with the leading ':' */ + +/* network to host order conversion for little endian machines */ +#define WN2H(w) (((w & 0xFF00) >> 8) | ((w & 0x00FF) << 8)) + /* FUNCTIONS ***************************************************************/ /* @@ -22,19 +31,23 @@ RtlIpv4AddressToStringA(IN struct in_addr *Addr, OUT PCHAR S) { - CHAR Buffer[sizeof("255.255.255.255")]; + CHAR Buffer[IPV4_ADDR_STRING_MAX_LEN]; INT Length; + + if(!S) + return NULL; + Length = sprintf(Buffer, "%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, Addr->S_un.S_un_b.s_b2, Addr->S_un.S_un_b.s_b3, Addr->S_un.S_un_b.s_b4); - if (S) - strcpy(S, Buffer); + + strcpy(S, Buffer); return S + Length; } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -43,8 +56,28 @@ OUT PCHAR AddressString, IN OUT PULONG AddressStringLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + CHAR Buffer[IPV4_ADDR_STRING_MAX_LEN+IPV4_PORT_STRING_MAX_LEN]; + ULONG Length; + + if (!Address || !AddressString || !AddressStringLength) + return STATUS_INVALID_PARAMETER; + + Length = sprintf(Buffer, "%u.%u.%u.%u", Address->S_un.S_un_b.s_b1, + Address->S_un.S_un_b.s_b2, + Address->S_un.S_un_b.s_b3, + Address->S_un.S_un_b.s_b4); + + if (Port) Length += sprintf(Buffer + Length, ":%u", WN2H(Port)); + + if (*AddressStringLength > Length) + { + *AddressStringLength = Length + 1; + strcpy(AddressString, Buffer); + return STATUS_SUCCESS; + } + + *AddressStringLength = Length + 1; + return STATUS_INVALID_PARAMETER; } /* @@ -55,14 +88,24 @@ RtlIpv4AddressToStringW(IN struct in_addr *Addr, OUT PWCHAR S) { - return S + swprintf(S, L"%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, - Addr->S_un.S_un_b.s_b2, - Addr->S_un.S_un_b.s_b3, - Addr->S_un.S_un_b.s_b4); -} - -/* - * @unimplemented + WCHAR Buffer[IPV4_ADDR_STRING_MAX_LEN]; + INT Length; + + if (!S) + return NULL; + + Length = swprintf(Buffer, L"%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, + Addr->S_un.S_un_b.s_b2, + Addr->S_un.S_un_b.s_b3, + Addr->S_un.S_un_b.s_b4); + + wcscpy(S, Buffer); + + return S + Length; +} + +/* + * @implemented */ NTSTATUS NTAPI @@ -71,8 +114,28 @@ OUT PWCHAR AddressString, IN OUT PULONG AddressStringLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + WCHAR Buffer[IPV4_ADDR_STRING_MAX_LEN+IPV4_PORT_STRING_MAX_LEN]; + ULONG Length; + + if (!Address || !AddressString || !AddressStringLength) + return STATUS_INVALID_PARAMETER; + + Length = swprintf(Buffer, L"%u.%u.%u.%u", Address->S_un.S_un_b.s_b1, + Address->S_un.S_un_b.s_b2, + Address->S_un.S_un_b.s_b3, + Address->S_un.S_un_b.s_b4); + + if (Port) Length += swprintf(Buffer + Length, L":%u", WN2H(Port)); + + if (*AddressStringLength > Length) + { + *AddressStringLength = Length + 1; + wcscpy(AddressString, Buffer); + return STATUS_SUCCESS; + } + + *AddressStringLength = Length + 1; + return STATUS_INVALID_PARAMETER; } /*

13 years

[fireball] 54741: - Misc changes, mostly involving the change in NDK path happened many many revisions ago. I commit this change since the compilability of arwinss branch itself is already broken (...

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 23 18:15:17 2011 New Revision: 54741 URL: http://svn.reactos.org/svn/reactos?rev=54741&view=rev Log: - Misc changes, mostly involving the change in NDK path happened many many revisions ago. I commit this change since the compilability of arwinss branch itself is already broken (it's supposed to compile in trunk now). Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c branches/arwinss/reactos/subsystems/win32/win32k/include/keyboard.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h branches/arwinss/reactos/subsystems/win32/win32k/main/keyboard.c branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c [iso-8859-1] Fri Dec 23 18:15:17 2011 @@ -684,7 +684,6 @@ PALETTE_ShareUnlockPalette(ppalSrc); } - VOID NTAPI EXLATEOBJ_vInitBrushXlate( Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/keyboard.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/keyboard.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/keyboard.h [iso-8859-1] Fri Dec 23 18:15:17 2011 @@ -1,7 +1,7 @@ #ifndef _WIN32K_KBD_H #define _WIN32K_KBD_H -#include <internal/kbd.h> +#include <ndk/kbd.h> typedef struct _KBL { Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Fri Dec 23 18:15:17 2011 @@ -11,11 +11,13 @@ #define _NO_COM /* DDK/NDK/SDK Headers */ -#include <ddk/ntddk.h> -#include <ddk/ntddmou.h> -#include <ddk/ntifs.h> -#include <ddk/tvout.h> -#include <ndk/ntndk.h> +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WS03SP1 +#include <ntddk.h> +#include <ntddmou.h> +#include <ntifs.h> +#include <tvout.h> +#include <ntndk.h> /* Win32 Headers */ /* FIXME: Defines in winbase.h that we need... */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/keyboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/keyboard.c [iso-8859-1] Fri Dec 23 18:15:17 2011 @@ -129,7 +129,7 @@ ModBits |= GetShiftBit( pkKT, VK_MENU ); /* Handle Alt+Gr */ - if (pkKT->fLocalFlags & 0x1) + if (pkKT->fLocaleFlags & 0x1) if (KeysSet( pkKT, KeyState, VK_RMENU, 0 ) & KEY_DOWN_BIT) ModBits |= GetShiftBit( pkKT, VK_CONTROL ); Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Fri Dec 23 18:15:17 2011 @@ -20,7 +20,7 @@ <library>ntoskrnl</library> <library>hal</library> - <library>freetype</library> + <library>freetype_s</library> <library>libcntpr</library> <library>pseh</library> @@ -156,4 +156,8 @@ </directory> <file>win32k.rc</file> </module> +<module name="win32ksys" type="staticlibrary"> + <include base="ReactOS">include/reactos</include> + <file>sys-stubs.S</file> +</module> </group>

13 years

[fireball] 54740: - Misc trunk 547xx-compatibility fixes.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 23 17:01:24 2011 New Revision: 54740 URL: http://svn.reactos.org/svn/reactos?rev=54740&view=rev Log: - Misc trunk 547xx-compatibility fixes. Modified: branches/arwinss/reactos/dll/win32/user32/user32.spec branches/arwinss/reactos/dll/win32/user32/user_main.c branches/arwinss/reactos/dll/win32/user32/user_private.h Modified: branches/arwinss/reactos/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] Fri Dec 23 17:01:24 2011 @@ -729,7 +729,7 @@ @ stdcall UnregisterDeviceNotification(long) @ stdcall UnregisterHotKey(long long) @ stub UnregisterMessagePumpHook -@ stub UnregisterUserApiHook +@ stdcall UnregisterUserApiHook() @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) @ stdcall UpdateLayeredWindowIndirect(long ptr) @ stdcall UpdatePerUserSystemParameters(long long) Modified: branches/arwinss/reactos/dll/win32/user32/user_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user_main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user_main.c [iso-8859-1] Fri Dec 23 17:01:24 2011 @@ -368,3 +368,7 @@ return TRUE; } +BOOL WINAPI UnregisterUserApiHook(VOID) +{ + return TRUE; +} Modified: branches/arwinss/reactos/dll/win32/user32/user_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] Fri Dec 23 17:01:24 2011 @@ -27,6 +27,7 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include <windowsx.h> #include "winternl.h" #define GET_WORD(ptr) (*(const WORD *)(ptr)) @@ -34,8 +35,8 @@ #ifndef __REACTOS__ #define WM_SYSTIMER 0x0118 +#define WM_POPUPSYSTEMMENU 0x0313 #endif -#define WM_POPUPSYSTEMMENU 0x0313 /* internal messages codes */ enum wine_internal_message

13 years

[fireball] 54739: - Misc trunk 547xx-compatibility fixes.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 23 17:00:51 2011 New Revision: 54739 URL: http://svn.reactos.org/svn/reactos?rev=54739&view=rev Log: - Misc trunk 547xx-compatibility fixes. Modified: branches/arwinss/reactos/dll/win32/gdi32/bidi.c Modified: branches/arwinss/reactos/dll/win32/gdi32/bidi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/bidi.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/bidi.c [iso-8859-1] Fri Dec 23 17:00:51 2011 @@ -108,12 +108,12 @@ /* the character type contains the C1_* flags in the low 12 bits */ /* and the C2_* type in the high 4 bits */ -static __inline unsigned short get_char_typeW( WCHAR ch ) +/*static __inline unsigned short get_char_typeW( WCHAR ch ) { WORD CharType; GetStringTypeW(CT_CTYPE1, &ch, 1, &CharType); return CharType; -} +}*/ /* Convert the libwine information to the direction enum */ static void classify(LPCWSTR lpString, WORD *chartype, DWORD uCount)

13 years

← Newer
1
2
3
4
5
6
7
8
9
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2011