Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[sginsberg] 36484: - 64 bit fixes for Mm routines: Use SIZE_T and ULONG_PTR where appropriate - Note: MSDN is wrong about Nt/ZwAllocateVirtualMemory's ZeroBits. It really is a ULONG_PTR.
by sginsberg＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: sginsberg Date: Wed Sep 24 10:27:54 2008 New Revision: 36484 URL: http://svn.reactos.org/svn/reactos?rev=36484&view=rev Log: - 64 bit fixes for Mm routines: Use SIZE_T and ULONG_PTR where appropriate - Note: MSDN is wrong about Nt/ZwAllocateVirtualMemory's ZeroBits. It really is a ULONG_PTR. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/mmfuncs.h trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=36… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Wed Sep 24 10:27:54 2008 @@ -4870,7 +4870,7 @@ ZwAllocateVirtualMemory ( IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, + IN ULONG_PTR ZeroBits, IN OUT PSIZE_T RegionSize, IN ULONG AllocationType, IN ULONG Protect Modified: trunk/reactos/include/ndk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmfuncs.h [iso-8859-1] Wed Sep 24 10:27:54 2008 @@ -48,8 +48,8 @@ IN PVOID SectionObject, IN PEPROCESS Process, IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, - IN ULONG CommitSize, + IN ULONG_PTR ZeroBits, + IN SIZE_T CommitSize, IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, IN OUT PSIZE_T ViewSize, IN SECTION_INHERIT InheritDisposition, @@ -81,8 +81,8 @@ NTAPI NtAllocateUserPhysicalPages( IN HANDLE ProcessHandle, - IN OUT PULONG NumberOfPages, - IN OUT PULONG UserPfnArray + IN OUT PULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray ); NTSYSCALLAPI @@ -91,7 +91,7 @@ NtAllocateVirtualMemory( IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, + IN ULONG_PTR ZeroBits, IN OUT PSIZE_T RegionSize, IN ULONG AllocationType, IN ULONG Protect @@ -142,8 +142,8 @@ NTAPI NtFreeUserPhysicalPages( IN HANDLE ProcessHandle, - IN OUT PULONG NumberOfPages, - IN OUT PULONG UserPfnArray + IN OUT PULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray ); NTSYSCALLAPI @@ -163,9 +163,9 @@ IN HANDLE ProcessHandle, IN ULONG Flags, IN PVOID BaseAddress, - IN ULONG RegionSize, + IN SIZE_T RegionSize, IN PVOID *UserAddressArray, - OUT PULONG EntriesInUserAddressArray, + OUT PULONG_PTR EntriesInUserAddressArray, OUT PULONG Granularity ); @@ -175,24 +175,24 @@ NtLockVirtualMemory( HANDLE ProcessHandle, PVOID BaseAddress, - ULONG NumberOfBytesToLock, - PULONG NumberOfBytesLocked + SIZE_T NumberOfBytesToLock, + PSIZE_T NumberOfBytesLocked ); NTSTATUS NTAPI NtMapUserPhysicalPages( IN PVOID VirtualAddresses, - IN ULONG NumberOfPages, - IN OUT PULONG UserPfnArray + IN ULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray ); NTSTATUS NTAPI NtMapUserPhysicalPagesScatter( IN PVOID *VirtualAddresses, - IN ULONG NumberOfPages, - IN OUT PULONG UserPfnArray + IN ULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray ); NTSYSCALLAPI @@ -202,8 +202,8 @@ IN HANDLE SectionHandle, IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, - IN ULONG CommitSize, + IN ULONG_PTR ZeroBits, + IN SIZE_T CommitSize, IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, IN OUT PSIZE_T ViewSize, IN SECTION_INHERIT InheritDisposition, @@ -226,7 +226,7 @@ NtProtectVirtualMemory( IN HANDLE ProcessHandle, IN PVOID *BaseAddress, - IN ULONG *NumberOfBytesToProtect, + IN SIZE_T *NumberOfBytesToProtect, IN ULONG NewAccessProtection, OUT PULONG OldAccessProtection ); @@ -316,7 +316,7 @@ ZwAllocateVirtualMemory( IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, + IN ULONG_PTR ZeroBits, IN OUT PSIZE_T RegionSize, IN ULONG AllocationType, IN ULONG Protect @@ -380,8 +380,8 @@ IN HANDLE SectionHandle, IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, - IN ULONG CommitSize, + IN ULONG_PTR ZeroBits, + IN SIZE_T CommitSize, IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, IN OUT PSIZE_T ViewSize, IN SECTION_INHERIT InheritDisposition, @@ -404,7 +404,7 @@ ZwProtectVirtualMemory( IN HANDLE ProcessHandle, IN PVOID *BaseAddress, - IN ULONG *NumberOfBytesToProtect, + IN SIZE_T *NumberOfBytesToProtect, IN ULONG NewAccessProtection, OUT PULONG OldAccessProtection ); @@ -468,8 +468,8 @@ IN HANDLE ProcessHandle, IN PVOID BaseAddress, IN PVOID Buffer, - IN ULONG NumberOfBytesToWrite, - OUT PULONG NumberOfBytesWritten + IN SIZE_T NumberOfBytesToWrite, + OUT PSIZE_T NumberOfBytesWritten ); #endif Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Wed Sep 24 10:27:54 2008 @@ -522,7 +522,7 @@ NTSTATUS STDCALL NtAllocateVirtualMemory(IN HANDLE ProcessHandle, IN OUT PVOID* UBaseAddress, - IN ULONG ZeroBits, + IN ULONG_PTR ZeroBits, IN OUT PSIZE_T URegionSize, IN ULONG AllocationType, IN ULONG Protect) Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Sep 24 10:27:54 2008 @@ -3662,8 +3662,8 @@ NtMapViewOfSection(IN HANDLE SectionHandle, IN HANDLE ProcessHandle, IN OUT PVOID* BaseAddress OPTIONAL, - IN ULONG ZeroBits OPTIONAL, - IN ULONG CommitSize, + IN ULONG_PTR ZeroBits OPTIONAL, + IN SIZE_T CommitSize, IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, IN OUT PSIZE_T ViewSize, IN SECTION_INHERIT InheritDisposition, @@ -4482,8 +4482,8 @@ MmMapViewOfSection(IN PVOID SectionObject, IN PEPROCESS Process, IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, - IN ULONG CommitSize, + IN ULONG_PTR ZeroBits, + IN SIZE_T CommitSize, IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, IN OUT PSIZE_T ViewSize, IN SECTION_INHERIT InheritDisposition, @@ -4954,8 +4954,8 @@ NTSTATUS NTAPI NtAllocateUserPhysicalPages(IN HANDLE ProcessHandle, - IN OUT PULONG NumberOfPages, - IN OUT PULONG UserPfnArray) + IN OUT PULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -4964,8 +4964,8 @@ NTSTATUS NTAPI NtMapUserPhysicalPages(IN PVOID VirtualAddresses, - IN ULONG NumberOfPages, - IN OUT PULONG UserPfnArray) + IN ULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -4974,8 +4974,8 @@ NTSTATUS NTAPI NtMapUserPhysicalPagesScatter(IN PVOID *VirtualAddresses, - IN ULONG NumberOfPages, - IN OUT PULONG UserPfnArray) + IN ULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -4984,8 +4984,8 @@ NTSTATUS NTAPI NtFreeUserPhysicalPages(IN HANDLE ProcessHandle, - IN OUT PULONG NumberOfPages, - IN OUT PULONG UserPfnArray) + IN OUT PULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Wed Sep 24 10:27:54 2008 @@ -63,13 +63,13 @@ IN PVOID SourceAddress, IN PEPROCESS TargetProcess, OUT PVOID TargetAddress, - IN ULONG BufferSize, + IN SIZE_T BufferSize, IN KPROCESSOR_MODE PreviousMode, - OUT PULONG ReturnSize) + OUT PSIZE_T ReturnSize) { PFN_NUMBER MdlBuffer[(sizeof(MDL) / sizeof(PFN_NUMBER)) + MI_MAPPED_COPY_PAGES + 1]; PMDL Mdl = (PMDL)MdlBuffer; - ULONG TotalSize, CurrentSize, RemainingSize; + SIZE_T TotalSize, CurrentSize, RemainingSize; volatile BOOLEAN FailedInProbe = FALSE, FailedInMapping = FALSE, FailedInMoving; BOOLEAN PagesLocked; PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; @@ -219,12 +219,12 @@ IN PVOID SourceAddress, IN PEPROCESS TargetProcess, OUT PVOID TargetAddress, - IN ULONG BufferSize, + IN SIZE_T BufferSize, IN KPROCESSOR_MODE PreviousMode, - OUT PULONG ReturnSize) + OUT PSIZE_T ReturnSize) { UCHAR StackBuffer[MI_POOL_COPY_BYTES]; - ULONG TotalSize, CurrentSize, RemainingSize; + SIZE_T TotalSize, CurrentSize, RemainingSize; volatile BOOLEAN FailedInProbe = FALSE, FailedInMoving, HavePoolAddress = FALSE; PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; PVOID PoolAddress; @@ -365,9 +365,9 @@ IN PVOID SourceAddress, IN PEPROCESS TargetProcess, OUT PVOID TargetAddress, - IN ULONG BufferSize, + IN SIZE_T BufferSize, IN KPROCESSOR_MODE PreviousMode, - OUT PULONG ReturnSize) + OUT PSIZE_T ReturnSize) { NTSTATUS Status; PEPROCESS Process = SourceProcess; @@ -419,8 +419,8 @@ IN PVOID Address, IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, OUT PVOID VirtualMemoryInformation, - IN ULONG Length, - OUT PULONG ResultLength) + IN SIZE_T Length, + OUT PSIZE_T ResultLength) { NTSTATUS Status; PEPROCESS Process; @@ -584,7 +584,7 @@ NTSTATUS STDCALL MiProtectVirtualMemory(IN PEPROCESS Process, IN OUT PVOID *BaseAddress, - IN OUT PULONG NumberOfBytesToProtect, + IN OUT PSIZE_T NumberOfBytesToProtect, IN ULONG NewAccessProtection, OUT PULONG OldAccessProtection OPTIONAL) { @@ -678,13 +678,13 @@ NtReadVirtualMemory(IN HANDLE ProcessHandle, IN PVOID BaseAddress, OUT PVOID Buffer, - IN ULONG NumberOfBytesToRead, - OUT PULONG NumberOfBytesRead OPTIONAL) + IN SIZE_T NumberOfBytesToRead, + OUT PSIZE_T NumberOfBytesRead OPTIONAL) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PEPROCESS Process; NTSTATUS Status = STATUS_SUCCESS; - ULONG BytesRead = 0; + SIZE_T BytesRead = 0; PAGED_CODE(); /* Check if we came from user mode */ @@ -704,7 +704,7 @@ _SEH_TRY { /* Probe the output value */ - if (NumberOfBytesRead) ProbeForWriteUlong(NumberOfBytesRead); + if (NumberOfBytesRead) ProbeForWriteSize_t(NumberOfBytesRead); } _SEH_HANDLE { @@ -765,8 +765,8 @@ NtWriteVirtualMemory(IN HANDLE ProcessHandle, IN PVOID BaseAddress, IN PVOID Buffer, - IN ULONG NumberOfBytesToWrite, - OUT PULONG NumberOfBytesWritten OPTIONAL) + IN SIZE_T NumberOfBytesToWrite, + OUT PSIZE_T NumberOfBytesWritten OPTIONAL) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PEPROCESS Process; @@ -791,7 +791,7 @@ _SEH_TRY { /* Probe the output value */ - if (NumberOfBytesWritten) ProbeForWriteUlong(NumberOfBytesWritten); + if (NumberOfBytesWritten) ProbeForWriteSize_t(NumberOfBytesWritten); } _SEH_HANDLE { @@ -851,14 +851,14 @@ NTAPI NtProtectVirtualMemory(IN HANDLE ProcessHandle, IN OUT PVOID *UnsafeBaseAddress, - IN OUT ULONG *UnsafeNumberOfBytesToProtect, + IN OUT SIZE_T *UnsafeNumberOfBytesToProtect, IN ULONG NewAccessProtection, OUT PULONG UnsafeOldAccessProtection) { PEPROCESS Process; ULONG OldAccessProtection; PVOID BaseAddress = NULL; - ULONG NumberOfBytesToProtect = 0; + SIZE_T NumberOfBytesToProtect = 0; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; @@ -870,7 +870,7 @@ { /* Validate all outputs */ ProbeForWritePointer(UnsafeBaseAddress); - ProbeForWriteUlong(UnsafeNumberOfBytesToProtect); + ProbeForWriteSize_t(UnsafeNumberOfBytesToProtect); ProbeForWriteUlong(UnsafeOldAccessProtection); /* Capture them */ @@ -950,11 +950,11 @@ IN PVOID Address, IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, OUT PVOID VirtualMemoryInformation, - IN ULONG Length, - OUT PULONG UnsafeResultLength) + IN SIZE_T Length, + OUT PSIZE_T UnsafeResultLength) { NTSTATUS Status = STATUS_SUCCESS; - ULONG ResultLength = 0; + SIZE_T ResultLength = 0; KPROCESSOR_MODE PreviousMode; union { @@ -974,7 +974,7 @@ { _SEH_TRY { - ProbeForWriteUlong(UnsafeResultLength); + ProbeForWriteSize_t(UnsafeResultLength); } _SEH_HANDLE { @@ -1050,8 +1050,8 @@ NTAPI NtLockVirtualMemory(IN HANDLE ProcessHandle, IN PVOID BaseAddress, - IN ULONG NumberOfBytesToLock, - OUT PULONG NumberOfBytesLocked OPTIONAL) + IN SIZE_T NumberOfBytesToLock, + OUT PSIZE_T NumberOfBytesLocked OPTIONAL) { UNIMPLEMENTED; if (NumberOfBytesLocked) *NumberOfBytesLocked = 0; @@ -1062,8 +1062,8 @@ NTAPI NtUnlockVirtualMemory(IN HANDLE ProcessHandle, IN PVOID BaseAddress, - IN ULONG NumberOfBytesToUnlock, - OUT PULONG NumberOfBytesUnlocked OPTIONAL) + IN SIZE_T NumberOfBytesToUnlock, + OUT PSIZE_T NumberOfBytesUnlocked OPTIONAL) { UNIMPLEMENTED; if (NumberOfBytesUnlocked) *NumberOfBytesUnlocked = 0;

1 0

[sginsberg] 36483: - FsRtlBalanceReads: Fail if we are out of memory instead of dereferencing null - Fix for Coverity error CID: 465
by sginsberg＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: sginsberg Date: Wed Sep 24 10:04:59 2008 New Revision: 36483 URL: http://svn.reactos.org/svn/reactos?rev=36483&view=rev Log: - FsRtlBalanceReads: Fail if we are out of memory instead of dereferencing null - Fix for Coverity error CID: 465 Modified: trunk/reactos/ntoskrnl/fsrtl/faulttol.c Modified: trunk/reactos/ntoskrnl/fsrtl/faulttol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/faulttol.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/faulttol.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/faulttol.c [iso-8859-1] Wed Sep 24 10:04:59 2008 @@ -52,6 +52,7 @@ FALSE, &Event, &IoStatusBlock); + if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; /* Send it */ Status = IoCallDriver(TargetDevice, Irp);

1 0

[sginsberg] 36482: - RawQueryFsSizeInfo: Fail if we are out of memory instead of dereferencing null
by sginsberg＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: sginsberg Date: Wed Sep 24 09:53:28 2008 New Revision: 36482 URL: http://svn.reactos.org/svn/reactos?rev=36482&view=rev Log: - RawQueryFsSizeInfo: Fail if we are out of memory instead of dereferencing null Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/rawfs.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] Wed Sep 24 09:53:28 2008 @@ -652,6 +652,7 @@ FALSE, &Event, &IoStatusBlock); + if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; /* Call driver and check if we're pending */ Status = IoCallDriver(RealDevice, Irp); @@ -692,6 +693,7 @@ FALSE, &Event, &IoStatusBlock); + if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; /* Call driver and check if we're pending */ Status = IoCallDriver(RealDevice, Irp);

1 0

[sginsberg] 36481: - Fix some non-x86 FLOATOBJ_*
by sginsberg＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: sginsberg Date: Wed Sep 24 09:01:43 2008 New Revision: 36481 URL: http://svn.reactos.org/svn/reactos?rev=36481&view=rev Log: - Fix some non-x86 FLOATOBJ_* Modified: trunk/reactos/include/ddk/winddi.h Modified: trunk/reactos/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddi.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddi.h [iso-8859-1] Wed Sep 24 09:01:43 2008 @@ -2472,9 +2472,9 @@ #define FLOATOBJ_Equal(pf, pf1) (*(pf) == *(pf1)) #define FLOATOBJ_GreaterThan(pf, pf1) (*(pf) > *(pf1)) #define FLOATOBJ_LessThan(pf, pf1) (*(pf) < *(pf1)) -#define FLOATOBJ_EqualLong(pf, 1) (*(pf) == (FLOAT)(1)) -#define FLOATOBJ_GreaterThanLong(pf, 1) (*(pf) > (FLOAT)(1)) -#define FLOATOBJ_LessThanLong(pf, 1) (*(pf) < (FLOAT)(1)) +#define FLOATOBJ_EqualLong(pf, l) (*(pf) == (FLOAT)(l)) +#define FLOATOBJ_GreaterThanLong(pf, l) (*(pf) > (FLOAT)(l)) +#define FLOATOBJ_LessThanLong(pf, l) (*(pf) < (FLOAT)(l)) #endif

1 0

[arty] 36480: Fix leaks reported by coverity 612-615. In each case, it'd be safe to free NULL, and failure to allocate isn't the only dropthrough case, leading to conversion buffer leaks.
by arty＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: arty Date: Wed Sep 24 08:35:37 2008 New Revision: 36480 URL: http://svn.reactos.org/svn/reactos?rev=36480&view=rev Log: Fix leaks reported by coverity 612-615. In each case, it'd be safe to free NULL, and failure to allocate isn't the only dropthrough case, leading to conversion buffer leaks. Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Wed Sep 24 08:35:37 2008 @@ -1112,6 +1112,7 @@ } UNLOCK_FILES(); } + free(modea); return file; } @@ -1571,8 +1572,8 @@ free(patha); return retval; } - __set_errno(GetLastError()); + free(patha); return -1; } @@ -2561,7 +2562,8 @@ free(modea); return retval; } - + free(patha); + free(modea); __set_errno(GetLastError()); return NULL; }

1 0

[arty] 36479: Fix my copypasta spotted by (coverity 1294)
by arty＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: arty Date: Wed Sep 24 07:56:30 2008 New Revision: 36479 URL: http://svn.reactos.org/svn/reactos?rev=36479&view=rev Log: Fix my copypasta spotted by (coverity 1294) Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=36… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Wed Sep 24 07:56:30 2008 @@ -1692,7 +1692,7 @@ IN PVOID Src, IN ULONG Bytes) { - BOOLEAN Result; + BOOLEAN Result = TRUE; ULONG_PTR Start, End, Write; for (Start = (ULONG_PTR)Src, @@ -1700,7 +1700,7 @@ Write = (ULONG_PTR)Dest; Result && (Start < End); Start++, Write++) - if (!KdpSafeReadMemory(Start, 1, (PVOID)Write)) + if (!KdpSafeWriteMemory(Write, 1, *((PCHAR)Start))) Result = FALSE; return Result ? STATUS_SUCCESS : STATUS_ACCESS_VIOLATION;

1 0

[dreimer] 36478: Revert the Header Play around for now. No one was able to tell me if it really was incorrect before and how to really fix it if wrong. It works this way, with GCC 4.4.0 or whatever
by dreimer＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: dreimer Date: Wed Sep 24 07:39:51 2008 New Revision: 36478 URL: http://svn.reactos.org/svn/reactos?rev=36478&view=rev Log: Revert the Header Play around for now. No one was able to tell me if it really was incorrect before and how to really fix it if wrong. It works this way, with GCC 4.4.0 or whatever Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Wed Sep 24 07:39:51 2008 @@ -49,25 +49,16 @@ set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% set _ROSBE_GCCVERSION= set _ROSBE_GCCTARGET= -if .%ROS_ARCH%. == .. ( - for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i - for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION2=%%i - for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i - for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET2=%%i -) else ( - for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i - for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION2=%%i - for /f "usebackq tokens=2" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i - for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET2=%%i -) +for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i +for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH% set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe if "%_ROSBE_MODE%" == "MinGW" ( set C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include - set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION2%;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION2%\%_ROSBE_GCCTARGET2%;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include + set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include ) else ( set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" - set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION2%" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION2%\%_ROSBE_GCCTARGET2%" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" + set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" ) set LIBRARY_PATH=%_ROSBE_MINGWPATH%\lib;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%

1 0

[sserapion] 36477: Small 64bit fix.
by sserapion＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: sserapion Date: Wed Sep 24 07:33:59 2008 New Revision: 36477 URL: http://svn.reactos.org/svn/reactos?rev=36477&view=rev Log: Small 64bit fix. Modified: branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c Modified: branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Wed Sep 24 07:33:59 2008 @@ -504,7 +504,7 @@ } cleanup: - hThread = (HANDLE)InterlockedExchange((LONG*)&hInstallationThread, 0); + hThread = (HANDLE)(ULONG_PTR)InterlockedExchange((LONG*)&hInstallationThread, 0); if(hThread != NULL) { CloseHandle(hThread);

1 0

[tkreuzer] 36476: add gdi32.spec taken from wine 1.13
by tkreuzer＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: tkreuzer Date: Wed Sep 24 07:21:04 2008 New Revision: 36476 URL: http://svn.reactos.org/svn/reactos?rev=36476&view=rev Log: add gdi32.spec taken from wine 1.13 Added: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec (with props) Added: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec (added) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] Wed Sep 24 07:21:04 2008 @@ -1,0 +1,532 @@ +# ordinal exports +100 stdcall @(long long str str str) GDI_CallDevInstall16 +101 stdcall @(long str str ptr) GDI_CallExtDeviceModePropSheet16 +102 stdcall @(long ptr str str ptr str long) GDI_CallExtDeviceMode16 +103 stdcall @(long str ptr ptr) GDI_CallAdvancedSetupDialog16 +104 stdcall @(str str long ptr ptr) GDI_CallDeviceCapabilities16 + +@ stdcall AbortDoc(long) +@ stdcall AbortPath(long) +@ stdcall AddFontMemResourceEx(ptr long ptr ptr) +@ stdcall AddFontResourceA(str) +@ stdcall AddFontResourceExA(str long ptr) +@ stdcall AddFontResourceExW(wstr long ptr) +@ stub AddFontResourceTracking +@ stdcall AddFontResourceW(wstr) +@ stdcall AngleArc(long long long long long long) +@ stdcall AnimatePalette(long long long ptr) +# @ stub AnyLinkedFonts +@ stdcall Arc(long long long long long long long long long) +@ stdcall ArcTo(long long long long long long long long long) +@ stdcall BeginPath(long) +@ stdcall BitBlt(long long long long long long long long long) +@ stub ByeByeGDI +@ stdcall CancelDC(long) +@ stub CheckColorsInGamut +@ stdcall ChoosePixelFormat(long ptr) +@ stdcall Chord(long long long long long long long long long) +# @ stub ClearBitmapAttributes +# @ stub ClearBrushAttributes +@ stdcall CloseEnhMetaFile(long) +@ stdcall CloseFigure(long) +@ stdcall CloseMetaFile(long) +@ stub ColorCorrectPalette +@ stub ColorMatchToTarget +@ stdcall CombineRgn(long long long long) +@ stdcall CombineTransform(ptr ptr ptr) +@ stdcall CopyEnhMetaFileA(long str) +@ stdcall CopyEnhMetaFileW(long wstr) +@ stdcall CopyMetaFileA(long str) +@ stdcall CopyMetaFileW(long wstr) +@ stdcall CreateBitmap(long long long long ptr) +@ stdcall CreateBitmapIndirect(ptr) +@ stdcall CreateBrushIndirect(ptr) +@ stdcall CreateColorSpaceA(ptr) +@ stdcall CreateColorSpaceW(ptr) +@ stdcall CreateCompatibleBitmap(long long long) +@ stdcall CreateCompatibleDC(long) +@ stdcall CreateDCA(str str str ptr) +@ stdcall CreateDCW(wstr wstr wstr ptr) +@ stdcall CreateDIBPatternBrush(long long) +@ stdcall CreateDIBPatternBrushPt(long long) +@ stdcall CreateDIBSection(long ptr long ptr long long) +@ stdcall CreateDIBitmap(long ptr long ptr ptr long) +@ stdcall CreateDiscardableBitmap(long long long) +@ stdcall CreateEllipticRgn(long long long long) +@ stdcall CreateEllipticRgnIndirect(ptr) +@ stdcall CreateEnhMetaFileA(long str ptr str) +@ stdcall CreateEnhMetaFileW(long wstr ptr wstr) +@ stdcall CreateFontA(long long long long long long long long long long long long long str) +@ stdcall CreateFontIndirectA(ptr) +# @ stub CreateFontIndirectExA +# @ stub CreateFontIndirectExW +@ stdcall CreateFontIndirectW(ptr) +@ stdcall CreateFontW(long long long long long long long long long long long long long wstr) +@ stdcall CreateHalftonePalette(long) +@ stdcall CreateHatchBrush(long long) +@ stdcall CreateICA(str str str ptr) +@ stdcall CreateICW(wstr wstr wstr ptr) +@ stdcall CreateMetaFileA(str) +@ stdcall CreateMetaFileW(wstr) +@ stdcall CreatePalette(ptr) +@ stdcall CreatePatternBrush(long) +@ stdcall CreatePen(long long long) +@ stdcall CreatePenIndirect(ptr) +@ stdcall CreatePolyPolygonRgn(ptr ptr long long) +@ stdcall CreatePolygonRgn(ptr long long) +@ stdcall CreateRectRgn(long long long long) +@ stdcall CreateRectRgnIndirect(ptr) +@ stdcall CreateRoundRectRgn(long long long long long long) +@ stdcall CreateScalableFontResourceA(long str str str) +@ stdcall CreateScalableFontResourceW(long wstr wstr wstr) +@ stdcall CreateSolidBrush(long) +@ stdcall DPtoLP(long ptr long) +@ stdcall DeleteColorSpace(long) +@ stdcall DeleteDC(long) +@ stdcall DeleteEnhMetaFile(long) +@ stdcall DeleteMetaFile(long) +@ stdcall DeleteObject(long) +@ stdcall DescribePixelFormat(long long long ptr) +@ stub DeviceCapabilitiesEx +@ stub DeviceCapabilitiesExA +@ stub DeviceCapabilitiesExW +@ stdcall DrawEscape(long long long ptr) +@ stdcall Ellipse(long long long long long) +@ stdcall EnableEUDC(long) +@ stdcall EndDoc(long) +# @ stub EndFormPage +@ stdcall EndPage(long) +@ stdcall EndPath(long) +@ stdcall EnumEnhMetaFile(long long ptr ptr ptr) +@ stdcall EnumFontFamiliesA(long str ptr long) +@ stdcall EnumFontFamiliesExA(long ptr ptr long long) +@ stdcall EnumFontFamiliesExW(long ptr ptr long long) +@ stdcall EnumFontFamiliesW(long wstr ptr long) +@ stdcall EnumFontsA(long str ptr long) +@ stdcall EnumFontsW(long wstr ptr long) +@ stdcall EnumICMProfilesA(long ptr long) +@ stdcall EnumICMProfilesW(long ptr long) +@ stdcall EnumMetaFile(long long ptr ptr) +@ stdcall EnumObjects(long long ptr long) +@ stdcall EqualRgn(long long) +@ stdcall Escape(long long long ptr ptr) +# @ stub EudcLoadLinkW +# @ stub EudcUnloadLinkW +@ stdcall ExcludeClipRect(long long long long long) +@ stdcall ExtCreatePen(long long ptr long ptr) +@ stdcall ExtCreateRegion(ptr long ptr) +@ stdcall ExtEscape(long long long ptr long ptr) +@ stdcall ExtFloodFill(long long long long long) +@ stdcall ExtSelectClipRgn(long long long) +@ stdcall ExtTextOutA(long long long long ptr str long ptr) +@ stdcall ExtTextOutW(long long long long ptr wstr long ptr) +@ stdcall FillPath(long) +@ stdcall FillRgn(long long long) +@ stdcall FixBrushOrgEx(long long long ptr) +@ stdcall FlattenPath(long) +@ stdcall FloodFill(long long long long) +@ stdcall FontIsLinked(long) +@ stdcall FrameRgn(long long long long long) +@ stub FreeImageColorMatcher +# @ stub GdiAddFontResourceW +# @ stub GdiAddGlsBounds +# @ stub GdiAddGlsRecord +@ stdcall GdiAlphaBlend(long long long long long long long long long long long) +# @ stub GdiArtificialDecrementDriver +@ stub GdiAssociateObject +@ stub GdiCleanCacheDC +@ stdcall GdiComment(long long ptr) +# @ stub GdiConsoleTextOut +@ stub GdiConvertAndCheckDC +@ stub GdiConvertBitmap +# @ stub GdiConvertBitmapV5 +@ stub GdiConvertBrush +@ stub GdiConvertDC +@ stub GdiConvertEnhMetaFile +@ stub GdiConvertFont +@ stub GdiConvertMetaFilePict +@ stub GdiConvertPalette +@ stub GdiConvertRegion +@ stdcall GdiConvertToDevmodeW(ptr) +@ stub GdiCreateLocalBitmap +@ stub GdiCreateLocalBrush +@ stub GdiCreateLocalEnhMetaFile +@ stub GdiCreateLocalFont +@ stub GdiCreateLocalMetaFilePict +@ stub GdiCreateLocalPalette +@ stub GdiCreateLocalRegion +@ stub GdiDciBeginAccess +@ stub GdiDciCreateOffscreenSurface +@ stub GdiDciCreateOverlaySurface +@ stub GdiDciCreatePrimarySurface +@ stub GdiDciDestroySurface +@ stub GdiDciDrawSurface +@ stub GdiDciEndAccess +@ stub GdiDciEnumSurface +@ stub GdiDciInitialize +@ stub GdiDciSetClipList +@ stub GdiDciSetDestination +@ stub GdiDeleteLocalDC +@ stub GdiDeleteLocalObject +# @ stub GdiDeleteSpoolFileHandle +# @ stub GdiDescribePixelFormat +@ stub GdiDllInitialize +# @ stub GdiDrawStream +# @ stub GdiEndDocEMF +# @ stub GdiEndPageEMF +# @ stub GdiFixUpHandle +@ stdcall GdiFlush() +# @ stub GdiFullscreenControl +@ stdcall GdiGetBatchLimit() +@ stdcall GdiGetCharDimensions(long ptr ptr) +@ stdcall GdiGetCodePage(long) +# @ stub GdiGetDC +# @ stub GdiGetDevmodeForPage +@ stub GdiGetLocalBitmap +@ stub GdiGetLocalBrush +@ stub GdiGetLocalDC +@ stub GdiGetLocalFont +# @ stub GdiGetPageCount +# @ stub GdiGetPageHandle +# @ stub GdiGetSpoolFileHandle +@ stdcall GdiGetSpoolMessage(ptr long ptr long) +@ stdcall GdiGradientFill(long ptr long ptr long long) +@ stdcall GdiInitSpool() +# @ stub GdiInitializeLanguagePack +@ stdcall GdiIsMetaFileDC(long) +@ stdcall GdiIsMetaPrintDC(long) +@ stdcall GdiIsPlayMetafileDC(long) +@ stub GdiPlayDCScript +# @ stub GdiPlayEMF +@ stub GdiPlayJournal +# @ stub GdiPlayPageEMF +# @ stub GdiPlayPrivatePageEMF +@ stub GdiPlayScript +# @ stub GdiPrinterThunk +# @ stub GdiProcessSetup +# @ stub GdiQueryFonts +# @ stub GdiQueryTable +@ stdcall GdiRealizationInfo(long ptr) +# @ stub GdiReleaseDC +@ stub GdiReleaseLocalDC +# @ stub GdiResetDCEMF +@ stub GdiSetAttrs +@ stdcall GdiSetBatchLimit(long) +# @ stub GdiSetLastError +# @ stub GdiSetPixelFormat +@ stub GdiSetServerAttr +# @ stub GdiStartDocEMF +# @ stub GdiStartPageEMF +# @ stub GdiSwapBuffers +@ stdcall GdiTransparentBlt(long long long long long long long long long long long) +# @ stub GdiValidateHandle +@ stub GdiWinWatchClose +@ stub GdiWinWatchDidStatusChange +@ stub GdiWinWatchGetClipList +@ stub GdiWinWatchOpen +@ stdcall GetArcDirection(long) +@ stdcall GetAspectRatioFilterEx(long ptr) +# @ stub GetBitmapAttributes +@ stdcall GetBitmapBits(long long ptr) +@ stdcall GetBitmapDimensionEx(long ptr) +@ stdcall GetBkColor(long) +@ stdcall GetBkMode(long) +@ stdcall GetBoundsRect(long ptr long) +# @ stub GetBrushAttributes +@ stdcall GetBrushOrgEx(long ptr) +@ stdcall GetCharABCWidthsA(long long long ptr) +@ stdcall GetCharABCWidthsFloatA(long long long ptr) +@ stdcall GetCharABCWidthsFloatW(long long long ptr) +@ stdcall GetCharABCWidthsI(long long long ptr ptr) +@ stdcall GetCharABCWidthsW(long long long ptr) +@ stdcall GetCharWidth32A(long long long long) +@ stdcall GetCharWidth32W(long long long long) +@ stdcall GetCharWidthA(long long long long) GetCharWidth32A +@ stdcall GetCharWidthFloatA(long long long ptr) +@ stdcall GetCharWidthFloatW(long long long ptr) +@ stdcall GetCharWidthI(ptr long long ptr ptr) +# @ stub GetCharWidthInfo +@ stdcall GetCharWidthW(long long long long) GetCharWidth32W +@ stub GetCharWidthWOW +@ stdcall GetCharacterPlacementA(long str long long ptr long) +@ stdcall GetCharacterPlacementW(long wstr long long ptr long) +@ stdcall GetClipBox(long ptr) +@ stdcall GetClipRgn(long long) +@ stdcall GetColorAdjustment(long ptr) +@ stdcall GetColorSpace(long) +@ stdcall GetCurrentObject(long long) +@ stdcall GetCurrentPositionEx(long ptr) +@ stdcall GetDCBrushColor(long) +@ stdcall GetDCOrgEx(long ptr) +@ stdcall GetDCPenColor(long) +@ stdcall GetDIBColorTable(long long long ptr) +@ stdcall GetDIBits(long long long long ptr ptr long) +@ stdcall GetDeviceCaps(long long) +@ stdcall GetDeviceGammaRamp(long ptr) +@ stub GetETM +# @ stub GetEUDCTimeStamp +# @ stub GetEUDCTimeStampExW +@ stdcall GetEnhMetaFileA(str) +@ stdcall GetEnhMetaFileBits(long long ptr) +@ stdcall GetEnhMetaFileDescriptionA(long long ptr) +@ stdcall GetEnhMetaFileDescriptionW(long long ptr) +@ stdcall GetEnhMetaFileHeader(long long ptr) +@ stdcall GetEnhMetaFilePaletteEntries (long long ptr) +# @ stub GetEnhMetaFilePixelFormat +@ stdcall GetEnhMetaFileW(wstr) +# @ stub GetFontAssocStatus +@ stdcall GetFontData(long long long ptr long) +@ stdcall GetFontLanguageInfo(long) +@ stub GetFontResourceInfo +@ stub GetFontResourceInfoW +@ stdcall GetFontUnicodeRanges(ptr ptr) +@ stdcall GetGlyphIndicesA(long ptr long ptr long) +@ stdcall GetGlyphIndicesW(long ptr long ptr long) +@ stdcall GetGlyphOutline(long long long ptr long ptr ptr) GetGlyphOutlineA +@ stdcall GetGlyphOutlineA(long long long ptr long ptr ptr) +@ stdcall GetGlyphOutlineW(long long long ptr long ptr ptr) +@ stub GetGlyphOutlineWow +@ stdcall GetGraphicsMode(long) +# @ stub GetHFONT +@ stdcall GetICMProfileA(long ptr ptr) +@ stdcall GetICMProfileW(long ptr ptr) +@ stdcall GetKerningPairs(long long ptr) GetKerningPairsA +@ stdcall GetKerningPairsA(long long ptr) +@ stdcall GetKerningPairsW(long long ptr) +@ stdcall GetLayout(long) +@ stdcall GetLogColorSpaceA(long ptr long) +@ stdcall GetLogColorSpaceW(long ptr long) +@ stdcall GetMapMode(long) +@ stdcall GetMetaFileA(str) +@ stdcall GetMetaFileBitsEx(long long ptr) +@ stdcall GetMetaFileW(wstr) +@ stdcall GetMetaRgn(long long) +@ stdcall GetMiterLimit(long ptr) +@ stdcall GetNearestColor(long long) +@ stdcall GetNearestPaletteIndex(long long) +@ stdcall GetObjectA(long long ptr) +@ stdcall GetObjectType(long) +@ stdcall GetObjectW(long long ptr) +@ stdcall GetOutlineTextMetricsA(long long ptr) +@ stdcall GetOutlineTextMetricsW(long long ptr) +@ stdcall GetPaletteEntries(long long long ptr) +@ stdcall GetPath(long ptr ptr long) +@ stdcall GetPixel(long long long) +@ stdcall GetPixelFormat(long) +@ stdcall GetPolyFillMode(long) +@ stdcall GetROP2(long) +@ stdcall GetRandomRgn(long long long) +@ stdcall GetRasterizerCaps(ptr long) +@ stdcall GetRegionData(long long ptr) +@ stdcall GetRelAbs(long long) +@ stdcall GetRgnBox(long ptr) +@ stdcall GetStockObject(long) +@ stdcall GetStretchBltMode(long) +# @ stub GetStringBitmapA +# @ stub GetStringBitmapW +@ stdcall GetSystemPaletteEntries(long long long ptr) +@ stdcall GetSystemPaletteUse(long) +@ stdcall GetTextAlign(long) +@ stdcall GetTextCharacterExtra(long) +@ stdcall GetTextCharset(long) +@ stdcall GetTextCharsetInfo(long ptr long) +@ stdcall GetTextColor(long) +@ stdcall GetTextExtentExPointA(long str long long ptr ptr ptr) +@ stdcall GetTextExtentExPointI(long ptr long long ptr ptr ptr) +@ stdcall GetTextExtentExPointW(long wstr long long ptr ptr ptr) +# @ stub GetTextExtentExPointWPri +@ stdcall GetTextExtentPoint32A(long str long ptr) +@ stdcall GetTextExtentPoint32W(long wstr long ptr) +@ stdcall GetTextExtentPointA(long str long ptr) +@ stdcall GetTextExtentPointI(long ptr long ptr) +@ stdcall GetTextExtentPointW(long wstr long ptr) +@ stdcall GetTextFaceA(long long ptr) +# @ stub GetTextFaceAliasW +@ stdcall GetTextFaceW(long long ptr) +@ stdcall GetTextMetricsA(long ptr) +@ stdcall GetTextMetricsW(long ptr) +@ stdcall GetTransform(long long ptr) +@ stdcall GetViewportExtEx(long ptr) +@ stdcall GetViewportOrgEx(long ptr) +@ stdcall GetWinMetaFileBits(long long ptr long long) +@ stdcall GetWindowExtEx(long ptr) +@ stdcall GetWindowOrgEx(long ptr) +@ stdcall GetWorldTransform(long ptr) +@ stdcall IntersectClipRect(long long long long long) +@ stdcall InvertRgn(long long) +# @ stub IsValidEnhMetaRecord +# @ stub IsValidEnhMetaRecordOffExt +@ stdcall LPtoDP(long ptr long) +@ stdcall LineDDA(long long long long ptr long) +@ stdcall LineTo(long long long) +@ stub LoadImageColorMatcherA +@ stub LoadImageColorMatcherW +@ stdcall MaskBlt(long long long long long long long long long long long long) +# @ stub MirrorRgn +@ stdcall ModifyWorldTransform(long ptr long) +@ stdcall MoveToEx(long long long ptr) +# @ stub NamedEscape +@ stdcall OffsetClipRgn(long long long) +@ stdcall OffsetRgn(long long long) +@ stdcall OffsetViewportOrgEx(long long long ptr) +@ stdcall OffsetWindowOrgEx(long long long ptr) +@ stdcall PaintRgn(long long) +@ stdcall PatBlt(long long long long long long) +@ stdcall PathToRegion(long) +@ stdcall Pie(long long long long long long long long long) +@ stdcall PlayEnhMetaFile(long long ptr) +@ stdcall PlayEnhMetaFileRecord(long ptr ptr long) +@ stdcall PlayMetaFile(long long) +@ stdcall PlayMetaFileRecord(long ptr ptr long) +@ stdcall PlgBlt(long ptr long long long long long long long long) +@ stdcall PolyBezier(long ptr long) +@ stdcall PolyBezierTo(long ptr long) +@ stdcall PolyDraw(long ptr ptr long) +# @ stub PolyPatBlt +@ stdcall PolyPolygon(long ptr ptr long) +@ stdcall PolyPolyline(long ptr ptr long) +@ stdcall PolyTextOutA(long ptr long) +@ stdcall PolyTextOutW(long ptr long) +@ stdcall Polygon(long ptr long) +@ stdcall Polyline(long ptr long) +@ stdcall PolylineTo(long ptr long) +@ stdcall PtInRegion(long long long) +@ stdcall PtVisible(long long long) +# @ stub QueryFontAssocStatus +@ stdcall RealizePalette(long) +@ stdcall RectInRegion(long ptr) +@ stdcall RectVisible(long ptr) +@ stdcall Rectangle(long long long long long) +@ stdcall RemoveFontMemResourceEx(ptr) +@ stdcall RemoveFontResourceA(str) +@ stdcall RemoveFontResourceExA(str long ptr) +@ stdcall RemoveFontResourceExW(wstr long ptr) +@ stub RemoveFontResourceTracking +@ stdcall RemoveFontResourceW(wstr) +@ stdcall ResetDCA(long ptr) +@ stdcall ResetDCW(long ptr) +@ stdcall ResizePalette(long long) +@ stdcall RestoreDC(long long) +@ stdcall RoundRect(long long long long long long long) +@ stdcall SaveDC(long) +@ stdcall ScaleViewportExtEx(long long long long long ptr) +@ stdcall ScaleWindowExtEx(long long long long long ptr) +@ stub SelectBrushLocal +@ stdcall SelectClipPath(long long) +@ stdcall SelectClipRgn(long long) +@ stub SelectFontLocal +@ stdcall SelectObject(long long) +@ stdcall SelectPalette(long long long) +@ stdcall SetAbortProc(long ptr) +@ stdcall SetArcDirection(long long) +# @ stub SetBitmapAttributes +@ stdcall SetBitmapBits(long long ptr) +@ stdcall SetBitmapDimensionEx(long long long ptr) +@ stdcall SetBkColor(long long) +@ stdcall SetBkMode(long long) +@ stdcall SetBoundsRect(long ptr long) +# @ stub SetBrushAttributes +@ stdcall SetBrushOrgEx(long long long ptr) +@ stdcall SetColorAdjustment(long ptr) +@ stdcall SetColorSpace(long long) +@ stdcall SetDCBrushColor(long long) +@ stdcall SetDCPenColor(long long) +@ stdcall SetDIBColorTable(long long long ptr) +@ stdcall SetDIBits(long long long long ptr ptr long) +@ stdcall SetDIBitsToDevice(long long long long long long long long long ptr ptr long) +@ stdcall SetDeviceGammaRamp(long ptr) +@ stdcall SetEnhMetaFileBits(long ptr) +@ stub SetFontEnumeration +@ stdcall SetGraphicsMode(long long) +@ stdcall SetICMMode(long long) +@ stdcall SetICMProfileA(long str) +@ stdcall SetICMProfileW(long wstr) +@ stdcall SetLayout(long long) +# @ stub SetLayoutWidth +@ stdcall SetMagicColors(ptr long long) +@ stdcall SetMapMode(long long) +@ stdcall SetMapperFlags(long long) +@ stdcall SetMetaFileBitsEx(long ptr) +@ stdcall SetMetaRgn(long) +@ stdcall SetMiterLimit(long long ptr) +@ stdcall SetObjectOwner(long long) +@ stdcall SetPaletteEntries(long long long ptr) +@ stdcall SetPixel(long long long long) +@ stdcall SetPixelFormat(long long ptr) +@ stdcall SetPixelV(long long long long) +@ stdcall SetPolyFillMode(long long) +@ stdcall SetROP2(long long) +@ stdcall SetRectRgn(long long long long long) +@ stdcall SetRelAbs(long long) +@ stdcall SetStretchBltMode(long long) +@ stdcall SetSystemPaletteUse(long long) +@ stdcall SetTextAlign(long long) +@ stdcall SetTextCharacterExtra(long long) +@ stdcall SetTextColor(long long) +@ stdcall SetTextJustification(long long long) +@ stdcall SetViewportExtEx(long long long ptr) +@ stdcall SetViewportOrgEx(long long long ptr) +@ stdcall SetVirtualResolution(long long long long long) +@ stdcall SetWinMetaFileBits(long ptr long ptr) +@ stdcall SetWindowExtEx(long long long ptr) +@ stdcall SetWindowOrgEx(long long long ptr) +@ stdcall SetWorldTransform(long ptr) +@ stdcall StartDocA(long ptr) +@ stdcall StartDocW(long ptr) +# @ stub StartFormPage +@ stdcall StartPage(long) +@ stdcall StretchBlt(long long long long long long long long long long long) +@ stdcall StretchDIBits(long long long long long long long long long ptr ptr long long) +@ stdcall StrokeAndFillPath(long) +@ stdcall StrokePath(long) +@ stdcall SwapBuffers(long) +@ stdcall TextOutA(long long long str long) +@ stdcall TextOutW(long long long wstr long) +@ stdcall TranslateCharsetInfo(ptr ptr long) +@ stub UnloadNetworkFonts +@ stdcall UnrealizeObject(long) +@ stdcall UpdateColors(long) +@ stdcall UpdateICMRegKey(long str str long) UpdateICMRegKeyA +@ stdcall UpdateICMRegKeyA(long str str long) +@ stdcall UpdateICMRegKeyW(long wstr wstr long) +@ stdcall WidenPath(long) +@ stub gdiPlaySpoolStream +@ extern pfnRealizePalette +@ extern pfnSelectPalette +@ stub pstackConnect + +################################################################ +# Wine extensions: OpenGL support +# +@ stdcall wglCopyContext(long long long) +@ stdcall wglCreateContext(long) +@ stdcall wglDeleteContext(long) +@ stdcall wglGetCurrentContext() +@ stdcall wglGetCurrentDC() +@ stdcall -private wglGetProcAddress(str) +@ stdcall wglMakeCurrent(long long) +@ stdcall wglShareLists(long long) +@ stdcall wglUseFontBitmapsA(long long long long) +@ stdcall wglUseFontBitmapsW(long long long long) + +################################################################ +# Wine extensions: Win16 functions that are needed by other dlls +# +@ stdcall CloseJob16(long) +@ stdcall DrvGetPrinterData16(str str ptr ptr long ptr) +@ stdcall DrvSetPrinterData16(str str long ptr long) +@ stdcall GetDCHook(long ptr) +@ stdcall OpenJob16(str str long) +@ stdcall SelectVisRgn(long long) +@ stdcall SetDCHook(long ptr long) +@ stdcall SetHookFlags(long long) +@ stdcall WriteSpool16(long ptr long) + +################################################################ +# Wine internal extensions +# +# All functions must be prefixed with '__wine_' (for internal functions) +# or 'wine_' (for user-visible functions) to avoid namespace conflicts. + +# GDI objects +@ cdecl __wine_make_gdi_object_system(long long) Propchange: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sserapion] 36475: - Fix ReadProcessMemory and Toolhelp32ReadProcessMemory definitions. - Numerous 64bit fixes. - Remove useless cast. - Remove Fls API exports as per trunk.
by sserapion＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: sserapion Date: Wed Sep 24 07:03:27 2008 New Revision: 36475 URL: http://svn.reactos.org/svn/reactos?rev=36475&view=rev Log: - Fix ReadProcessMemory and Toolhelp32ReadProcessMemory definitions. - Numerous 64bit fixes. - Remove useless cast. - Remove Fls API exports as per trunk. Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/except/except.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.spec branches/ros-amd64-bringup/reactos/dll/win32/kernel32/mem/procmem.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/mem/virtual.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/toolhelp.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/procsup.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/except/except.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/except/except.c [iso-8859-1] Wed Sep 24 07:03:27 2008 @@ -124,10 +124,11 @@ return psz; } -#ifdef _M_IX86 + static VOID _dump_context(PCONTEXT pc) { +#ifdef _M_IX86 /* * Print out the CPU registers */ @@ -138,10 +139,7 @@ DbgPrint("EDX: %.8x EBP: %.8x ESI: %.8x ESP: %.8x\n", pc->Edx, pc->Ebp, pc->Esi, pc->Esp); DbgPrint("EDI: %.8x EFLAGS: %.8x\n", pc->Edi, pc->EFlags); -} #elif defined(_M_AMD64) -_dump_context(PCONTEXT pc) -{ DbgPrint("CS:EIP %x:%I64x\n", pc->SegCs&0xffff, pc->Rip ); DbgPrint("DS %x ES %x FS %x GS %x\n", pc->SegDs&0xffff, pc->SegEs&0xffff, pc->SegFs&0xffff, pc->SegGs&0xfff); @@ -150,14 +148,10 @@ DbgPrint("R8: %I64x R9: %I64x R10: %I64x R11: %I64x\n", pc->R8, pc->R9, pc->R10, pc->R11); DbgPrint("R12: %I64x R13: %I64x R14: %I64x R15: %I64x\n", pc->R12, pc->R13, pc->R14, pc->R15); DbgPrint("EFLAGS: %.8x\n", pc->EFlags); -} #else #warning Unknown architecture -static VOID -_dump_context(PCONTEXT pc) -{ -} #endif +} static LONG BasepCheckForReadOnlyResource(IN PVOID Ptr) @@ -225,7 +219,7 @@ LONG RetValue; HANDLE DebugPort = NULL; NTSTATUS ErrCode; - ULONG ErrorParameters[4]; + ULONG_PTR ErrorParameters[4]; ULONG ErrorResponse; if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && @@ -322,7 +316,7 @@ /* Save exception code and address */ ErrorParameters[0] = (ULONG)ExceptionInfo->ExceptionRecord->ExceptionCode; - ErrorParameters[1] = (ULONG)ExceptionInfo->ExceptionRecord->ExceptionAddress; + ErrorParameters[1] = (ULONG_PTR)ExceptionInfo->ExceptionRecord->ExceptionAddress; if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) { Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Wed Sep 24 07:03:27 2008 @@ -250,10 +250,10 @@ @ stdcall FindResourceW(long wstr wstr) @ stdcall FindVolumeClose(ptr) @ stdcall FindVolumeMountPointClose(ptr) -@ stdcall FlsAlloc(ptr) -@ stdcall FlsFree(long) -@ stdcall FlsGetValue(long) -@ stdcall FlsSetValue(long ptr) +#@ stdcall FlsAlloc(ptr) +#@ stdcall FlsFree(long) +#@ stdcall FlsGetValue(long) +#@ stdcall FlsSetValue(long ptr) @ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/mem/procmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/mem/procmem.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/mem/procmem.c [iso-8859-1] Wed Sep 24 07:03:27 2008 @@ -23,8 +23,8 @@ ReadProcessMemory(IN HANDLE hProcess, IN LPCVOID lpBaseAddress, IN LPVOID lpBuffer, - IN DWORD nSize, - OUT LPDWORD lpNumberOfBytesRead) + IN SIZE_T nSize, + OUT SIZE_T* lpNumberOfBytesRead) { NTSTATUS Status; Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/mem/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/mem/virtual.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/mem/virtual.c [iso-8859-1] Wed Sep 24 07:03:27 2008 @@ -79,7 +79,7 @@ /* Free the memory */ Status = NtFreeVirtualMemory(hProcess, (PVOID *)&lpAddress, - (PULONG)&dwSize, + &dwSize, dwFreeType); if (!NT_SUCCESS(Status)) { Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/toolhelp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/toolhelp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/toolhelp.c [iso-8859-1] Wed Sep 24 07:03:27 2008 @@ -225,8 +225,8 @@ HANDLE hSection; PTH32SNAPSHOT Snapshot; ULONG_PTR DataOffset; - ULONG ViewSize, i; - ULONG nProcesses = 0, nThreads = 0, nHeaps = 0, nModules = 0; + SIZE_T ViewSize; + ULONG i, nProcesses = 0, nThreads = 0, nHeaps = 0, nModules = 0; ULONG RequiredSnapshotSize = sizeof(TH32SNAPSHOT); PRTL_PROCESS_HEAPS hi = NULL; PRTL_PROCESS_MODULES mi = NULL; @@ -670,7 +670,7 @@ { PTH32SNAPSHOT Snapshot; LARGE_INTEGER SOffset; - ULONG ViewSize; + SIZE_T ViewSize; NTSTATUS Status; CHECK_PARAM_SIZE(lphl, sizeof(HEAPLIST32)); @@ -724,7 +724,7 @@ { PTH32SNAPSHOT Snapshot; LARGE_INTEGER SOffset; - ULONG ViewSize; + SIZE_T ViewSize; NTSTATUS Status; CHECK_PARAM_SIZE(lphl, sizeof(HEAPLIST32)); @@ -811,7 +811,7 @@ { PTH32SNAPSHOT Snapshot; LARGE_INTEGER SOffset; - ULONG ViewSize; + SIZE_T ViewSize; NTSTATUS Status; CHECK_PARAM_SIZE(lpme, sizeof(MODULEENTRY32W)); @@ -898,7 +898,7 @@ { PTH32SNAPSHOT Snapshot; LARGE_INTEGER SOffset; - ULONG ViewSize; + SIZE_T ViewSize; NTSTATUS Status; CHECK_PARAM_SIZE(lpme, sizeof(MODULEENTRY32W)); @@ -985,7 +985,7 @@ { PTH32SNAPSHOT Snapshot; LARGE_INTEGER SOffset; - ULONG ViewSize; + SIZE_T ViewSize; NTSTATUS Status; CHECK_PARAM_SIZE(lppe, sizeof(PROCESSENTRY32W)); @@ -1074,7 +1074,7 @@ { PTH32SNAPSHOT Snapshot; LARGE_INTEGER SOffset; - ULONG ViewSize; + SIZE_T ViewSize; NTSTATUS Status; CHECK_PARAM_SIZE(lppe, sizeof(PROCESSENTRY32W)); @@ -1128,7 +1128,7 @@ { PTH32SNAPSHOT Snapshot; LARGE_INTEGER SOffset; - ULONG ViewSize; + SIZE_T ViewSize; NTSTATUS Status; CHECK_PARAM_SIZE(lpte, sizeof(THREADENTRY32)); @@ -1182,7 +1182,7 @@ { PTH32SNAPSHOT Snapshot; LARGE_INTEGER SOffset; - ULONG ViewSize; + SIZE_T ViewSize; NTSTATUS Status; CHECK_PARAM_SIZE(lpte, sizeof(THREADENTRY32)); @@ -1233,7 +1233,7 @@ BOOL STDCALL Toolhelp32ReadProcessMemory(DWORD th32ProcessID, LPCVOID lpBaseAddress, - LPVOID lpBuffer, DWORD cbRead, LPDWORD lpNumberOfBytesRead) + LPVOID lpBuffer, SIZE_T cbRead, SIZE_T* lpNumberOfBytesRead) { HANDLE hProcess = OpenProcess(PROCESS_VM_READ, FALSE, th32ProcessID); if(hProcess != NULL) Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] Wed Sep 24 07:03:27 2008 @@ -318,7 +318,7 @@ BasepFreeStack(HANDLE hProcess, PINITIAL_TEB InitialTeb) { - ULONG Dummy = 0; + SIZE_T Dummy = 0; /* Free the Stack */ NtFreeVirtualMemory(hProcess, Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Wed Sep 24 07:03:27 2008 @@ -288,7 +288,7 @@ { NTSTATUS Status; HANDLE DuplicatedHandle; - ULONG Dummy; + SIZE_T Dummy; DPRINT("BasepDuplicateAndWriteHandle. hProcess: %lx, Handle: %lx," "Address: %p\n", ProcessHandle, StandardHandle, Address);

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
75
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 September 2008