Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 38430: - Add ISubdevice interface - This interface is used as the generic interface for all IPort drivers when connecting with ks.sys
by janderwald＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: janderwald Date: Sun Dec 28 11:28:23 2008 New Revision: 38430 URL: http://svn.reactos.org/svn/reactos?rev=38430&view=rev Log: - Add ISubdevice interface - This interface is used as the generic interface for all IPort drivers when connecting with ks.sys Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h (with props) Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Sun Dec 28 11:28:23 2008 @@ -1,0 +1,66 @@ +#ifndef INTERFACES_H__ +#define INTERFACES_H__ + +DEFINE_GUID(IID_IIrpTarget, 0xB4C90A60, 0x5791, 0x11D0, 0x86, 0xF9, 0x00, 0xA0, 0xC9, 0x11, 0xB5, 0x44); +DEFINE_GUID(IID_ISubdevice, 0xB4C90A61, 0x5791, 0x11D0, 0x86, 0xF9, 0x00, 0xA0, 0xC9, 0x11, 0xB5, 0x44); +DEFINE_GUID(IID_IIrpTargetFactory, 0xB4C90A62, 0x5791, 0x11D0, 0x86, 0xF9, 0x00, 0xA0, 0xC9, 0x11, 0xB5, 0x44); + +/***************************************************************************** + * ISubdevice + ***************************************************************************** + */ +struct SUBDEVICE_DESCRIPTOR; +struct IIrpTarget; +struct IIrpTargetFactory; + +#undef INTERFACE +#define INTERFACE ISubdevice + +DECLARE_INTERFACE_(ISubdevice, IUnknown) +{ + STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ + REFIID InterfaceId, + PVOID* Interface + ) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + STDMETHOD_(NTSTATUS, NewIrpTarget)(THIS_ + OUT struct IIrpTarget **OutTarget, + IN WCHAR * Name, + IN PUNKNOWN Unknown, + IN POOL_TYPE PoolType, + IN PDEVICE_OBJECT * DeviceObject, + IN PIRP Irp, + IN KSOBJECT_CREATE *CreateObject) PURE; + + STDMETHOD_(NTSTATUS, ReleaseChildren)(THIS) PURE; + + STDMETHOD_(NTSTATUS, GetDescriptor)(THIS_ + IN struct SUBDEVICE_DESCRIPTOR **) PURE; + + STDMETHOD_(NTSTATUS, DataRangeIntersection)(THIS_ + IN ULONG PinId, + IN PKSDATARANGE DataRange, + IN PKSDATARANGE MatchingDataRange, + IN ULONG OutputBufferLength, + OUT PVOID ResultantFormat OPTIONAL, + OUT PULONG ResultantFormatLength) PURE; + + STDMETHOD_(NTSTATUS, PowerChangeNotify)(THIS_ + IN POWER_STATE PowerState) PURE; + + STDMETHOD_(NTSTATUS, PinCount)(THIS_ + IN ULONG PinId, + IN OUT PULONG FilterNecessary, + IN OUT PULONG FilterCurrent, + IN OUT PULONG FilterPossible, + IN OUT PULONG GlobalCurrent, + IN OUT PULONG GlobalPossible)PURE; + + +}; +#undef INTERFACE + + +#endif Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 38429: - Acquire lock before deleting
by janderwald＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: janderwald Date: Sun Dec 28 11:19:18 2008 New Revision: 38429 URL: http://svn.reactos.org/svn/reactos?rev=38429&view=rev Log: - Acquire lock before deleting Modified: trunk/reactos/drivers/ksfilter/ks/worker.c Modified: trunk/reactos/drivers/ksfilter/ks/worker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/worker… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] Sun Dec 28 11:19:18 2008 @@ -62,13 +62,14 @@ IN PKSWORKER Worker) { KS_WORKER * KsWorker; - KIRQL OldIrql = 0; // hack!!! janderwald!!! - //ULONG bWait = FALSE; + KIRQL OldIrql; if (!Worker) return; KsWorker = (KS_WORKER *)Worker; + + KeAcquireSpinLock(&KsWorker->Lock, &OldIrql); KsWorker->DeleteInProgress = TRUE;

1 0

[dchapyshev] 38428: - Fix GetLogicalDriveStringsA/W. +5 passed tests - Add params check for GetVolumeNameForVolumeMountPointW
by dchapyshev＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: dchapyshev Date: Sun Dec 28 09:38:17 2008 New Revision: 38428 URL: http://svn.reactos.org/svn/reactos?rev=38428&view=rev Log: - Fix GetLogicalDriveStringsA/W. +5 passed tests - Add params check for GetVolumeNameForVolumeMountPointW Modified: trunk/reactos/dll/win32/kernel32/file/volume.c Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] Sun Dec 28 09:38:17 2008 @@ -81,7 +81,7 @@ /* * @implemented */ -/* Synced to Wine-? */ +/* Synced to Wine-2008/12/28 */ DWORD WINAPI GetLogicalDriveStringsA(DWORD nBufferLength, LPSTR lpBuffer) @@ -98,8 +98,8 @@ } - if (count * 4 <= nBufferLength) - { + if ((count * 4) + 1 > nBufferLength) return ((count * 4) + 1); + LPSTR p = lpBuffer; for (drive = 0; drive < MAX_DOS_DRIVES; drive++) @@ -111,7 +111,7 @@ *p++ = '\0'; } *p = '\0'; - } + return (count * 4); } @@ -119,7 +119,7 @@ /* * @implemented */ -/* Synced to Wine-? */ +/* Synced to Wine-2008/12/28 */ DWORD WINAPI GetLogicalDriveStringsW(DWORD nBufferLength, LPWSTR lpBuffer) @@ -135,19 +135,19 @@ count++; } - if (count * 4 <= nBufferLength) - { - LPWSTR p = lpBuffer; - for (drive = 0; drive < MAX_DOS_DRIVES; drive++) - if (dwDriveMap & (1<<drive)) - { - *p++ = (WCHAR)('A' + drive); - *p++ = (WCHAR)':'; - *p++ = (WCHAR)'\\'; - *p++ = (WCHAR)'\0'; - } - *p = (WCHAR)'\0'; - } + if ((count * 4) + 1 > nBufferLength) return ((count * 4) + 1); + + LPWSTR p = lpBuffer; + for (drive = 0; drive < MAX_DOS_DRIVES; drive++) + if (dwDriveMap & (1<<drive)) + { + *p++ = (WCHAR)('A' + drive); + *p++ = (WCHAR)':'; + *p++ = (WCHAR)'\\'; + *p++ = (WCHAR)'\0'; + } + *p = (WCHAR)'\0'; + return (count * 4); } @@ -871,6 +871,12 @@ PUCHAR SymbolicLinkName; BOOL Result; NTSTATUS Status; + + if (!VolumeMountPoint || !VolumeMountPoint[0]) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } /* * First step is to convert the passed volume mount point name to

1 0

[fireball] 38427: - Kernel is in a lot better shape now, so revert 23213 ("Temporarily comment out the call to ObDereferenceObject, because it triggers a bug, which causes the kernel to crash. (See krnlfun.c) Now the branch appears to work again.").
by fireball＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: fireball Date: Sun Dec 28 09:15:48 2008 New Revision: 38427 URL: http://svn.reactos.org/svn/reactos?rev=38427&view=rev Log: - Kernel is in a lot better shape now, so revert 23213 ("Temporarily comment out the call to ObDereferenceObject, because it triggers a bug, which causes the kernel to crash. (See krnlfun.c) Now the branch appears to work again."). Modified: branches/cache_manager_rewrite/cc/view.c Modified: branches/cache_manager_rewrite/cc/view.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/view.c… ============================================================================== --- branches/cache_manager_rewrite/cc/view.c [iso-8859-1] (original) +++ branches/cache_manager_rewrite/cc/view.c [iso-8859-1] Sun Dec 28 09:15:48 2008 @@ -271,7 +271,7 @@ } DPRINT ("%x\n", Bcb->Section); - //ObDereferenceObject (Bcb->Section); + ObDereferenceObject (Bcb->Section); FileObject->SectionObjectPointer->SharedCacheMap = NULL; ExFreeToNPagedLookasideList (&BcbLookasideList, Bcb); }

1 0

[dreimer] 38426: Hello, new config.template parameter. Here is your support.
by dreimer＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: dreimer Date: Sun Dec 28 09:08:40 2008 New Revision: 38426 URL: http://svn.reactos.org/svn/reactos?rev=38426&view=rev Log: Hello, new config.template parameter. Here is your support. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/plans.txt Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Sun Dec 28 09:08:40 2008 @@ -111,22 +111,35 @@ $SARCH_CH = Read-Host "(), (xbox)" clear-host -"Which CPU ReactOS should be optimized for." -"" -"Examples:" -"Intel: i486, i586 / pentium, pentium-mmx, i686 / pentiumpro, pentium2, pentium3" -" pentium3m, pentium-m, pentium4 / pentium4m, prescott, nocona" -" AMD: k6, k6-2 / k6-3, athlon / athlon-tbird, athlon-4 / athlon-xp / athlon-mp" -" k8 / opteron / athlon64 / athlon-fx" -" IDT: winchip-c6, winchip2" -" VIA: c3, c3-2" -" Default is: pentium" +"Generate instructions for this CPU type. Specify one of:" +"" +"Intel: i386, i486, i586, pentium, pentium-mmx, i686, pentiumpro, pentium2" +" pentium3, pentium3m, pentium-m, pentium4, pentium4m, prescott, nocona" +" core2" +"AMD: k6, k6-2, k6-3, athlon, athlon-tbird, athlon-4, athlon-xp, athlon-mp, k8" +" opteron, athlon64, athlon-fx, opteron-sse3, barcelona, geode" +"IDT: winchip-c6, winchip2" +"VIA: c3, c3-2" +"Default is: pentium" "" $OARCH = $xml.group.property | ? { $_.Name -eq "OARCH" } | % { $_.Value} "Right now: $OARCH" $OARCH_CH = Read-Host if ($OARCH_CH -eq $null) { $OARCH_CH = $OARCH +} +clear-host + +"Which CPU ReactOS should be optimized for. Specify one of the above CPUs or" +"generic. When this option is not used, GCC will optimize for the processor" +"specified by OARCH." +"Default is: i686" +"" +$TUNE = $xml.group.property | ? { $_.Name -eq "TUNE" } | % { $_.Value} +"Right now: $TUNE" +$TUNE_CH = Read-Host +if ($TUNE_CH -eq $null) { + $TUNE_CH = $TUNE } clear-host @@ -227,6 +240,7 @@ # $xml.group.property | ? { $_.Name -eq "SARCH" } | % { $_.Value = "$SARCH_CH"} $xml.group.property | ? { $_.Name -eq "OARCH" } | % { $_.Value = "$OARCH_CH"} +$xml.group.property | ? { $_.Name -eq "TUNE" } | % { $_.Value = "$TUNE_CH"} $xml.group.property | ? { $_.Name -eq "OPTIMIZE" } | % { $_.Value = "$OPTIMIZE_CH"} $xml.group.property | ? { $_.Name -eq "KDBG" } | % { $_.Value = "$KDBG_CH"} $xml.group.property | ? { $_.Name -eq "DBG" } | % { $_.Value = "$DBG_CH"} @@ -245,6 +259,8 @@ # Unload all used Vars. # $YESNO = $null +$TUNE = $null +$TUNE_CH = $null $SARCH_CH = $null $OARCH_CH = $null $OPTIMIZE_CH = $null Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Sun Dec 28 09:08:40 2008 @@ -116,13 +116,13 @@ set /p SARCH_CH="(), (xbox)" cls -echo Which CPU ReactOS should be optimized for. -echo. -echo Examples: -echo Intel: i486, i586 / pentium, pentium-mmx, i686 / pentiumpro, pentium2, pentium3 -echo pentium3m, pentium-m, pentium4 / pentium4m, prescott, nocona -echo AMD: k6, k6-2 / k6-3, athlon / athlon-tbird, athlon-4 / athlon-xp / athlon-mp -echo k8 / opteron / athlon64 / athlon-fx +echo Generate instructions for this CPU type. Specify one of: +echo. +echo Intel: i386, i486, i586, pentium, pentium-mmx, i686, pentiumpro, pentium2 +echo pentium3, pentium3m, pentium-m, pentium4, pentium4m, prescott, nocona +echo core2 +echo AMD: k6, k6-2, k6-3, athlon, athlon-tbird, athlon-4, athlon-xp, athlon-mp, k8 +echo opteron, athlon64, athlon-fx, opteron-sse3, barcelona, geode echo IDT: winchip-c6, winchip2 echo VIA: c3, c3-2 echo Default is: pentium @@ -133,6 +133,20 @@ set /p OARCH_CH= if "%OARCH_CH%" == "" ( set OARCH_CH=%OARCH% +) +cls + +echo Which CPU ReactOS should be optimized for. Specify one of the above CPUs or +echo generic. When this option is not used, GCC will optimize for the processor +echo specified by OARCH. +echo Default is: i686 +echo. +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "TUNE" | find "property name""`) do set TUNE=%%i +set TUNE=%TUNE:~7,-1% +echo Right now: %TUNE% +set /p TUNE_CH= +if "%TUNE_CH%" == "" ( + set TUNE_CH=%TUNE% ) cls @@ -243,6 +257,7 @@ echo ^<group^>>%TEMP%\config.tmp echo ^<property name="SARCH" value="%SARCH_CH%" /^>>>%TEMP%\config.tmp echo ^<property name="OARCH" value="%OARCH_CH%" /^>>>%TEMP%\config.tmp +echo ^<property name="TUNE" value="%TUNE_CH%" /^>>>%TEMP%\config.tmp echo ^<property name="OPTIMIZE" value="%OPTIMIZE_CH%" /^>>>%TEMP%\config.tmp echo ^<property name="KDBG" value="%KDBG_CH%" /^>>>%TEMP%\config.tmp echo ^<property name="DBG" value="%DBG_CH%" /^>>>%TEMP%\config.tmp @@ -268,6 +283,8 @@ :: Unload all used Vars. :: set YESNO= +set TUNE= +set TUNE_CH= set SARCH_CH= set OARCH_CH= set OPTIMIZE_CH= Modified: trunk/tools/RosBE/RosBE-Windows/plans.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/plans.tx… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/plans.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/plans.txt [iso-8859-1] Sun Dec 28 09:08:40 2008 @@ -1,23 +1,2 @@ -updater ideen: -Erweiterte Update Pakete für einzelne Komponenten. - -Die Dateien werden durchnummeriert. %_ROSBE_VERSION%-1.7z, %_ROSBE_VERSION%-2.7z, %_ROSBE_VERSION%-3.7z und die dazugehörigen Changelogs mit der selben Benennung. Gespeichert werden sie in %_ROSBE_BASEDIR%\Updates - -Die klassische Methode, wie schon bei den anderen 7z Dateien wird angewendet, um zu erfahren, ob die Dateien aktualisiert oder erstellt wurden. - -Wenn ja, gebe die heruntergeladene changelog + Größenangabe über type aus und frage nach ob man das Paket laden will. Wenn nein wird wegen der Struktur an sich später nicht mehr nachgefragt, ob das Paket installiert werden soll. Deswegen löschen wir die changelog, um dies zu forcieren. - -Wenn es installiert werden soll, entpacke in \. und starte die %_ROSBE_VERSION%-1.cmd, %_ROSBE_VERSION%-2.cmd, %_ROSBE_VERSION%-3.cmd... der aktualisierten Pakete als update skript. - -Die abfrage kann entweder statisch geschehn, also z.b. fest codiert von %_ROSBE_VERSION%-1.7z bis %_ROSBE_VERSION%-9.7z, oder uU variabel über %_ROSBE_VERSION%-%_ROSBE_UPDATE%.7z und dann set /a %_ROSBE_UPDATE% += 1, bis eine Datei nicht vorhanden und deswegen der Updatevorgang fertig ist. Ab aus der schleife und gut ist. - -Die einzelnen Skripts haben folgende Grundelemente: -- Befehle zum Kopieren der Dateien. -- u.U integrierte Abfragen und Entscheidungen möglich. - -Einzelne Commands: -reset - Löscht alle changelogs, also werden alle updates wieder ausgeführt, ob installiert oder nicht. - -nr X - Installiert nur Paket Nummer X, egal ob schon installiert oder nicht und beendet. - -status - Prüft nach neuen Updates und gibt das Resultat als Einzeiler aus. Kopiere die changelogs in einen temp Ordner. Jedes noch nicht vorhandene Update wird mit seiner Nummer an eine variable angehängt und diese am Ende ausgegeben, also z.B. "Update Packs 3,4,5,6 are available" Diese updates werden zu der Zeit noch nicht heruntergeladen und die zur Überprüfung verwendeten changelogs sind deswegen in einem Temp Ordner angesiedelt, um die Aussagekräftigen changelogs nicht zu verändern. Sinnvoll für den Start von RosBE. +- New icons for every arch we support +- More Error catching

1 0

[sserapion] 38425: Fixed a pointer truncation for 64-bit platform.
by sserapion＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: sserapion Date: Sun Dec 28 08:26:21 2008 New Revision: 38425 URL: http://svn.reactos.org/svn/reactos?rev=38425&view=rev Log: Fixed a pointer truncation for 64-bit platform. Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/cpp.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/cpp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] Sun Dec 28 08:26:21 2008 @@ -631,6 +631,21 @@ } /* vtables */ +#ifdef _WIN64 + +#define __ASM_VTABLE(name,funcs) \ + __asm__(".data\n" \ + "\t.align 8\n" \ + "\t.quad " __ASM_NAME(#name "_rtti") "\n" \ + "\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \ + __ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \ + "\t.quad " THISCALL_NAME(MSVCRT_ ## name ## _vector_dtor) "\n" \ + funcs "\n\t.text"); + +#define __ASM_EXCEPTION_VTABLE(name) \ + __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCRT_what_exception) ) + +#else #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ @@ -643,6 +658,8 @@ #define __ASM_EXCEPTION_VTABLE(name) \ __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCRT_what_exception) ) + +#endif /* _WIN64 */ #ifndef __GNUC__ void __asm_dummy_vtables(void) {

1 0

[sserapion] 38424: More heap fixes, ported from WINE
by sserapion＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: sserapion Date: Sun Dec 28 08:24:49 2008 New Revision: 38424 URL: http://svn.reactos.org/svn/reactos?rev=38424&view=rev Log: More heap fixes, ported from WINE Modified: branches/ros-amd64-bringup/reactos/lib/rtl/heap.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/heap.c [iso-8859-1] Sun Dec 28 08:24:49 2008 @@ -100,14 +100,15 @@ #else #define ALIGNMENT 16 #endif - -#define ROUND_SIZE(size) (((size) + ALIGNMENT - 1) & ~(ALIGNMENT-1)) +#define ARENA_OFFSET (ALIGNMENT - sizeof(ARENA_INUSE)) + +#define ROUND_SIZE(size) (((size) + ALIGNMENT - 1) & ~(ALIGNMENT-1)) + ARENA_OFFSET #define QUIET 1 /* Suppress messages */ #define NOISY 0 /* Report all errors */ /* minimum data size (without arenas) of an allocated block */ -#define HEAP_MIN_DATA_SIZE 16 +#define HEAP_MIN_DATA_SIZE ROUND_SIZE(2 * sizeof(struct list)) /* minimum size that must remain to shrink an allocated block */ #define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) @@ -119,9 +120,10 @@ 0x20, 0x80, 0x200, ~0UL }; -typedef struct +typedef union { ARENA_FREE arena; + void *alignment[4]; } FREE_LIST_ENTRY; struct tagHEAP; @@ -151,7 +153,7 @@ SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ - FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; /* Free lists */ + FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS] DECLSPEC_ALIGN(8); /* Free lists */ DWORD flags; /* Heap flags */ DWORD magic; /* Magic number */ PRTL_HEAP_COMMIT_ROUTINE commitRoutine; @@ -776,6 +778,7 @@ totalSize = (totalSize + 0xffff) & 0xffff0000; commitSize = (commitSize + 0xffff) & 0xffff0000; if (!commitSize) commitSize = 0x10000; + totalSize = min(totalSize, 0xffff0000); /* don't allow a heap larger than 4Gb */ if (totalSize < commitSize) totalSize = commitSize; if (!address) @@ -884,7 +887,7 @@ char *heapEnd = (char *)subheap + subheap->size; /* Check for unaligned pointers */ - if ( (ULONG_PTR)pArena % ALIGNMENT != 0 ) + if ( (ULONG_PTR)pArena % ALIGNMENT != ARENA_OFFSET ) { ERR("Heap %p: unaligned arena pointer %p\n", subheap->heap, pArena ); return FALSE; @@ -974,7 +977,7 @@ const char *heapEnd = (const char *)subheap + subheap->size; /* Check for unaligned pointers */ - if ( (ULONG_PTR)pArena % ALIGNMENT != 0 ) + if ( (ULONG_PTR)pArena % ALIGNMENT != ARENA_OFFSET) { if ( quiet == NOISY ) { @@ -1179,6 +1182,7 @@ { processHeap = subheap->heap; /* assume the first heap we create is the process main heap */ list_init( &processHeap->entry ); + ASSERT( (ULONG_PTR) processHeap->freeList % ALIGNMENT == ARENA_OFFSET ); } } @@ -1243,7 +1247,7 @@ PVOID NTAPI RtlAllocateHeap(HANDLE heap, /* [in] Handle of private heap block */ ULONG flags, /* [in] Heap allocation control flags */ - ULONG size) /* [in] Number of bytes to allocate */ + SIZE_T size) /* [in] Number of bytes to allocate */ { ARENA_FREE *pArena; ARENA_INUSE *pInUse; @@ -1568,14 +1572,14 @@ * * @implemented */ -ULONG NTAPI +SIZE_T NTAPI RtlSizeHeap( HANDLE heap, ULONG flags, PVOID ptr ) { - SIZE_T ret; + SIZE_T ret; HEAP *heapPtr = HEAP_GetPtr( heap ); if (!heapPtr) @@ -1860,7 +1864,7 @@ RtlExtendHeap(IN HANDLE Heap, IN ULONG Flags, IN PVOID P, - IN ULONG Size) + IN SIZE_T Size) { /* TODO */ UNIMPLEMENTED;

1 0

[sserapion] 38423: Fix RtlAllocateHeap, RtlExtendHeap, RtlSizeHeap definitions.
by sserapion＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: sserapion Date: Sun Dec 28 08:20:37 2008 New Revision: 38423 URL: http://svn.reactos.org/svn/reactos?rev=38423&view=rev Log: Fix RtlAllocateHeap, RtlExtendHeap,RtlSizeHeap definitions. Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h branches/ros-amd64-bringup/reactos/include/ndk/rtlfuncs.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h [iso-8859-1] Sun Dec 28 08:20:37 2008 @@ -4754,7 +4754,7 @@ RtlAllocateHeap ( IN HANDLE HeapHandle, IN ULONG Flags, - IN ULONG Size + IN SIZE_T Size ); NTSYSAPI Modified: branches/ros-amd64-bringup/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Dec 28 08:20:37 2008 @@ -481,7 +481,7 @@ RtlAllocateHeap( IN HANDLE HeapHandle, IN ULONG Flags, - IN ULONG Size + IN SIZE_T Size ); NTSYSAPI @@ -539,7 +539,7 @@ IN HANDLE Heap, IN ULONG Flags, IN PVOID P, - IN ULONG Size + IN SIZE_T Size ); NTSYSAPI @@ -646,7 +646,7 @@ ); NTSYSAPI -ULONG +SIZE_T NTAPI RtlSizeHeap( IN PVOID HeapHandle,

1 0

[dchapyshev] 38422: - Fix build ;)
by dchapyshev＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: dchapyshev Date: Sun Dec 28 07:48:52 2008 New Revision: 38422 URL: http://svn.reactos.org/svn/reactos?rev=38422&view=rev Log: - Fix build ;) Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Sun Dec 28 07:48:52 2008 @@ -472,24 +472,6 @@ GetNumaProcessorNode( UCHAR Processor, PUCHAR NodeNumber - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -UINT -WINAPI -GetWriteWatch( - DWORD dwFlags, - PVOID lpBaseAddress, - SIZE_T dwRegionSize, - PVOID *lpAddresses, - PULONG_PTR lpdwCount, - PULONG lpdwGranularity ) { STUB;

1 0

[dchapyshev] 38421: - Add check of params for VirtualAllocEx and VirtualFreeEx - Implement GetWriteWatch (based on Wine) - Fix VirtualQueryEx
by dchapyshev＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: dchapyshev Date: Sun Dec 28 07:03:05 2008 New Revision: 38421 URL: http://svn.reactos.org/svn/reactos?rev=38421&view=rev Log: - Add check of params for VirtualAllocEx and VirtualFreeEx - Implement GetWriteWatch (based on Wine) - Fix VirtualQueryEx Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/vir… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/virtual.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/virtual.c [iso-8859-1] Sun Dec 28 07:03:05 2008 @@ -27,6 +27,12 @@ IN DWORD flProtect) { NTSTATUS Status; + + if (lpAddress != NULL) + { + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return NULL; + } /* Allocate the memory */ Status = NtAllocateVirtualMemory(hProcess, @@ -76,20 +82,26 @@ { NTSTATUS Status; - /* Free the memory */ - Status = NtFreeVirtualMemory(hProcess, - (PVOID *)&lpAddress, - (PULONG)&dwSize, - dwFreeType); - if (!NT_SUCCESS(Status)) - { - /* We failed */ - SetLastErrorByStatus(Status); - return FALSE; - } - - /* Return success */ - return TRUE; + if (dwSize == 0 || !(dwFreeType & MEM_RELEASE)) + { + /* Free the memory */ + Status = NtFreeVirtualMemory(hProcess, + (PVOID *)&lpAddress, + (PULONG)&dwSize, + dwFreeType); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Return success */ + return TRUE; + } + + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return FALSE; } /* @@ -217,7 +229,7 @@ (LPVOID)lpAddress, MemoryBasicInformation, lpBuffer, - sizeof(MEMORY_BASIC_INFORMATION), + dwLength, &ResultLength); if (!NT_SUCCESS(Status)) { @@ -257,4 +269,37 @@ return TRUE; } +/* + * @implemented + */ +UINT +WINAPI +GetWriteWatch( + DWORD dwFlags, + PVOID lpBaseAddress, + SIZE_T dwRegionSize, + PVOID *lpAddresses, + PULONG_PTR lpdwCount, + PULONG lpdwGranularity + ) +{ + NTSTATUS Status; + + Status = NtGetWriteWatch(GetCurrentProcess(), + dwFlags, + lpBaseAddress, + dwRegionSize, + lpAddresses, + lpdwCount, + lpdwGranularity); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return -1; + } + + return 0; +} + /* EOF */

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