Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[hpoussin] 35373: No need to export DriverEntry
by hpoussin＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: hpoussin Date: Sat Aug 16 05:48:20 2008 New Revision: 35373 URL: http://svn.reactos.org/svn/reactos?rev=35373&view=rev Log: No need to export DriverEntry Removed: trunk/reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.def Modified: trunk/reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild Removed: trunk/reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.def [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.def (removed) @@ -1,6 +1,0 @@ -; -; Exports definition file for sb16_ks.sys -; -EXPORTS -DriverEntry@8 - Modified: trunk/reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild [iso-8859-1] Sat Aug 16 05:48:20 2008 @@ -3,7 +3,6 @@ <module name="sb16_nt4" type="kernelmodedriver" installbase="system32/drivers" installname="sndblst.sys" allowwarnings="true"> <include base="sb16_nt4">.</include> <include base="sb16_nt4">..</include> - <importlibrary definition="sb16_nt4.def" /> <library>ntoskrnl</library> <library>hal</library> <file>main.c</file>

1 0

[hpoussin] 35372: Replace .def file by a .spec file
by hpoussin＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: hpoussin Date: Sat Aug 16 05:45:25 2008 New Revision: 35372 URL: http://svn.reactos.org/svn/reactos?rev=35372&view=rev Log: Replace .def file by a .spec file Added: trunk/reactos/drivers/ksfilter/ks/ks.spec (with props) Removed: trunk/reactos/drivers/ksfilter/ks/ks.def Modified: trunk/reactos/drivers/ksfilter/ks/events.c trunk/reactos/drivers/ksfilter/ks/kcom.c (contents, props changed) trunk/reactos/drivers/ksfilter/ks/ks.rbuild trunk/reactos/drivers/ksfilter/ks/misc.c Modified: trunk/reactos/drivers/ksfilter/ks/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/events… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/events.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/events.c [iso-8859-1] Sat Aug 16 05:45:25 2008 @@ -95,7 +95,7 @@ KsFreeEventList( IN PFILE_OBJECT FileObject, IN OUT PLIST_ENTRY EventsList, - IN KSEVENTS_LOCKTYPE EVentsFlags, + IN KSEVENTS_LOCKTYPE EventsFlags, IN PVOID EventsLock) { UNIMPLEMENTED; Modified: trunk/reactos/drivers/ksfilter/ks/kcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kcom.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] Sat Aug 16 05:45:25 2008 @@ -1,51 +1,51 @@ -/* =============================================================== - Kernel-mode COM -*/ - -#include <windows.h> -#include <ntddk.h> -#include <ks.h> -#include <kcom.h> -#include <debug.h> - - -/* http://msdn2.microsoft.com/en-us/library/ms809781.aspx */ -COMDDKAPI NTSTATUS NTAPI -KoCreateInstance( - IN REFCLSID ClassId, - IN IUnknown* UnkOuter OPTIONAL, - IN ULONG ClsContext, - IN REFIID InterfaceId, - OUT PVOID* Interface) -{ - /* If UnkOuter isn't NULL, it must be IUnknown - TODO: CHECK THIS PARAM */ - /* TODO: Check IRQL? */ - - DPRINT("KoCreateInstance called\n"); - - if ( ClsContext != CLSCTX_KERNEL_SERVER ) - { - DPRINT("FAILED: ClsContext must be CLSCTX_KERNEL_SERVER\n"); - return STATUS_INVALID_PARAMETER_3; - } - - /* - Find the desired interface and create an instance. - - But we also need to supply a - pointer which will be set to a list of available interfaces, to - IoGetDeviceInterfaces. - - We can then create a file based on this information and thus talk - to the appropriate device. - - Useful references: - http://www.freelists.org/archives/wdmaudiodev/01-2003/msg00023.html - - TODO - */ - - DPRINT("** FAKING SUCCESS **\n"); - - return STATUS_SUCCESS; -} +/* =============================================================== + Kernel-mode COM +*/ + +#include <windows.h> +#include <ntddk.h> +#include <ks.h> +#include <kcom.h> +#include <debug.h> + + +/* http://msdn2.microsoft.com/en-us/library/ms809781.aspx */ +COMDDKAPI NTSTATUS NTAPI +KoCreateInstance( + IN REFCLSID ClassId, + IN IUnknown* UnkOuter OPTIONAL, + IN ULONG ClsContext, + IN REFIID InterfaceId, + OUT PVOID* Interface) +{ + /* If UnkOuter isn't NULL, it must be IUnknown - TODO: CHECK THIS PARAM */ + /* TODO: Check IRQL? */ + + DPRINT("KoCreateInstance called\n"); + + if ( ClsContext != CLSCTX_KERNEL_SERVER ) + { + DPRINT("FAILED: ClsContext must be CLSCTX_KERNEL_SERVER\n"); + return STATUS_INVALID_PARAMETER_3; + } + + /* + Find the desired interface and create an instance. + + But we also need to supply a + pointer which will be set to a list of available interfaces, to + IoGetDeviceInterfaces. + + We can then create a file based on this information and thus talk + to the appropriate device. + + Useful references: + http://www.freelists.org/archives/wdmaudiodev/01-2003/msg00023.html + + TODO + */ + + DPRINT("** FAKING SUCCESS **\n"); + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/ksfilter/ks/kcom.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/drivers/ksfilter/ks/ks.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.def… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.def [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.def (removed) @@ -1,115 +1,0 @@ -; -; Exports definition file for ks.sys -; - -EXPORTS -KsCreateAllocator@12 -KsCreateDefaultAllocator@4 -KsValidateAllocatorCreateRequest@8 -KsCreateDefaultAllocatorEx@24 -KsValidateAllocatorFramingEx@12 - -KsCreateClock@12 -KsCreateDefaultClock@8 -KsAllocateDefaultClock@4 -KsAllocateDefaultClockEx@28 -KsFreeDefaultClock@4 -KsValidateClockCreateRequest@8 -KsGetDefaultClockState@4 -KsSetDefaultClockState@8 -KsGetDefaultClockTime@4 -KsSetDefaultClockTime@12 - -KsMethodHandler@12 -KsMethodHandlerWithAllocator@20 -KsFastMethodHandler@32 - -KsPropertyHandler@12 -KsPropertyHandlerWithAllocator@20 -KsUnserializeObjectPropertiesFromRegistry@12 -KsFastPropertyHandler@32 - -KsGenerateEvent@4 -KsEnableEventWithAllocator@32 -KsGenerateDataEvent@12 -KsEnableEvent@24 -KsDiscardEvent@4 -KsDisableEvent@16 -KsFreeEventList@16 - -KsValidateTopologyNodeCreateRequest@12 -KsCreateTopologyNode@16 -KsTopologyPropertyHandler@16 - -KsCreatePin@16 -KsValidateConnectRequest@16 -KsPinPropertyHandler@20 -KsPinDataIntersection@24 - -KsHandleSizedListQuery@16 - -KsAcquireResetValue@8 -KsAddIrpToCancelableQueue@20 -KsAddObjectCreateItemToDeviceHeader@20 -KsAddObjectCreateItemToObjectHeader@20 -KsAllocateDeviceHeader@12 -KsAllocateExtraData@12 -KsAllocateObjectCreateItem@16 -KsAllocateObjectHeader@20 -KsCancelIo@8 -KsCancelRoutine@8 -KsDefaultDeviceIoCompletion@8 -KsDispatchFastIoDeviceControlFailure@36 -KsDispatchFastReadFailure@32 -; KsDispatchFastWriteFailure@32 -KsDispatchInvalidDeviceRequest@8 -KsDispatchIrp@8 -KsDispatchSpecificMethod@8 -KsDispatchSpecificProperty@8 -KsForwardAndCatchIrp@16 -KsForwardIrp@12 -KsFreeDeviceHeader@4 -KsFreeObjectHeader@4 -KsGetChildCreateParameter@8 -KsMoveIrpsOnCancelableQueue@28 -KsProbeStreamIrp@12 -KsQueryInformationFile@16 -KsQueryObjectAccessMask@4 -KsQueryObjectCreateItem@4 -KsReadFile@32 -KsReleaseIrpOnCancelableQueue@8 -KsRemoveIrpFromCancelableQueue@16 -KsRemoveSpecificIrpFromCancelableQueue@4 -KsSetInformationFile@16 -KsSetMajorFunctionHandler@8 -KsStreamIo@44 -KsWriteFile@32 - -KsRegisterWorker@8 -KsUnregisterWorker@4 -KsRegisterCountedWorker@12 -KsDecrementCountedWorker@4 -KsIncrementCountedWorker@4 -KsQueueWorkItem@8 - -KsCacheMedium@12 -KsDefaultDispatchPnp@8 -KsSetDevicePnpAndBaseObject@12 -KsDefaultDispatchPower@8 -KsSetPowerDispatch@12 -KsReferenceBusObject@4 -KsDereferenceBusObject@4 -KsFreeObjectCreateItem@8 -KsFreeObjectCreateItemsByContext@8 -KsLoadResource@24 -; KsNullDriverUnload@4 -KsPinDataIntersectionEx@32 -KsQueryDevicePnpObject@4 -KsRecalculateStackDepth@8 -KsSetTargetDeviceObject@8 -KsSetTargetState@8 -KsSynchronousIoControlDevice@32 -KsInitializeDriver@12 - -; Kernel COM -KoCreateInstance@20 Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.rbu… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] Sat Aug 16 05:45:25 2008 @@ -4,7 +4,7 @@ <include base="ks">.</include> <include base="ks">..</include> <include base="ks">../include</include> - <importlibrary definition="ks.def" /> + <importlibrary definition="ks.spec.def" /> <library>ntoskrnl</library> <define name="BUILDING_KS" /> <define name="_NTDDK_" /> @@ -21,4 +21,5 @@ <file>topology.c</file> <file>worker.c</file> <file>kcom.c</file> + <file>ks.spec</file> </module> Added: trunk/reactos/drivers/ksfilter/ks/ks.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.spe… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.spec (added) +++ trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] Sat Aug 16 05:45:25 2008 @@ -1,0 +1,110 @@ +@ stdcall KsCreateAllocator(ptr ptr ptr) +@ stdcall KsCreateDefaultAllocator(ptr) +@ stdcall KsValidateAllocatorCreateRequest(ptr ptr) +@ stdcall KsCreateDefaultAllocatorEx(ptr ptr ptr ptr ptr ptr) +@ stdcall KsValidateAllocatorFramingEx(ptr long ptr) + +@ stdcall KsCreateClock(ptr ptr ptr) +@ stdcall KsCreateDefaultClock(ptr ptr) +@ stdcall KsAllocateDefaultClock(ptr) +@ stdcall KsAllocateDefaultClockEx(ptr ptr ptr ptr ptr ptr long) +@ stdcall KsFreeDefaultClock(ptr) +@ stdcall KsValidateClockCreateRequest(ptr ptr) +@ stdcall KsGetDefaultClockState(ptr) +@ stdcall KsSetDefaultClockState(ptr long) +@ stdcall KsGetDefaultClockTime(ptr) +@ stdcall KsSetDefaultClockTime(ptr long long) + +@ stdcall KsMethodHandler(ptr long ptr) +@ stdcall KsMethodHandlerWithAllocator(ptr long ptr ptr long) +@ stdcall KsFastMethodHandler(ptr ptr long ptr long ptr long ptr) + +@ stdcall KsPropertyHandler(ptr long ptr) +@ stdcall KsPropertyHandlerWithAllocator(ptr long ptr ptr long) +@ stdcall KsUnserializeObjectPropertiesFromRegistry(ptr ptr ptr) +@ stdcall KsFastPropertyHandler(ptr ptr long ptr long ptr long ptr) + +@ stdcall KsGenerateEvent(ptr) +@ stdcall KsEnableEventWithAllocator(ptr long ptr ptr long ptr ptr long) +@ stdcall KsGenerateDataEvent(ptr long ptr) +@ stdcall KsEnableEvent(ptr long ptr ptr long ptr) +@ stdcall KsDiscardEvent(ptr) +@ stdcall KsDisableEvent(ptr ptr long ptr) +@ stdcall KsFreeEventList(ptr ptr long ptr) + +@ stdcall KsValidateTopologyNodeCreateRequest(ptr ptr ptr) +@ stdcall KsCreateTopologyNode(ptr ptr long ptr) +@ stdcall KsTopologyPropertyHandler(ptr ptr ptr ptr) + +@ stdcall KsCreatePin(ptr ptr long ptr) +@ stdcall KsValidateConnectRequest(ptr long ptr ptr) +@ stdcall KsPinPropertyHandler(ptr ptr ptr long ptr) +@ stdcall KsPinDataIntersection(ptr ptr ptr long ptr ptr) + +@ stdcall KsHandleSizedListQuery(ptr long long ptr) + +@ stdcall KsAcquireResetValue(ptr ptr) +@ stdcall KsAddIrpToCancelableQueue(ptr ptr ptr long ptr) +@ stdcall KsAddObjectCreateItemToDeviceHeader(ptr ptr ptr wstr ptr) +@ stdcall KsAddObjectCreateItemToObjectHeader(ptr ptr ptr wstr ptr) +@ stdcall KsAllocateDeviceHeader(ptr long ptr) +@ stdcall KsAllocateExtraData(ptr long ptr) +@ stdcall KsAllocateObjectCreateItem(long ptr long ptr) +@ stdcall KsAllocateObjectHeader(ptr long ptr ptr ptr) +@ stdcall KsCancelIo(ptr ptr) +@ stdcall KsCancelRoutine(ptr ptr) +@ stdcall KsDefaultDeviceIoCompletion(ptr ptr) +@ stdcall KsDispatchFastIoDeviceControlFailure(ptr long ptr long ptr long long ptr ptr) +@ stdcall KsDispatchFastReadFailure(ptr ptr long long long ptr ptr ptr) +; KsDispatchFastWriteFailure@32 +@ stdcall KsDispatchInvalidDeviceRequest(ptr ptr) +@ stdcall KsDispatchIrp(ptr ptr) +@ stdcall KsDispatchSpecificMethod(ptr ptr) +@ stdcall KsDispatchSpecificProperty(ptr ptr) +@ stdcall KsForwardAndCatchIrp(ptr ptr ptr long) +@ stdcall KsForwardIrp(ptr ptr long) +@ stdcall KsFreeDeviceHeader(ptr) +@ stdcall KsFreeObjectHeader(ptr) +@ stdcall KsGetChildCreateParameter(ptr ptr) +@ stdcall KsMoveIrpsOnCancelableQueue(ptr ptr ptr ptr long ptr ptr) +@ stdcall KsProbeStreamIrp(ptr long long) +@ stdcall KsQueryInformationFile(ptr ptr long long) +@ stdcall KsQueryObjectAccessMask(ptr) +@ stdcall KsQueryObjectCreateItem(ptr) +@ stdcall KsReadFile(ptr ptr ptr ptr ptr long long long) +@ stdcall KsReleaseIrpOnCancelableQueue(ptr ptr) +@ stdcall KsRemoveIrpFromCancelableQueue(ptr ptr long long) +@ stdcall KsRemoveSpecificIrpFromCancelableQueue(ptr) +@ stdcall KsSetInformationFile(ptr ptr long long) +@ stdcall KsSetMajorFunctionHandler(ptr long) +@ stdcall KsStreamIo(ptr ptr ptr ptr ptr long ptr ptr long long long) +@ stdcall KsWriteFile(ptr ptr ptr ptr ptr long long long) + +@ stdcall KsRegisterWorker(long ptr) +@ stdcall KsUnregisterWorker(ptr) +@ stdcall KsRegisterCountedWorker(long ptr ptr) +@ stdcall KsDecrementCountedWorker(ptr) +@ stdcall KsIncrementCountedWorker(ptr) +@ stdcall KsQueueWorkItem(ptr ptr) + +@ stdcall KsCacheMedium(ptr ptr long) +@ stdcall KsDefaultDispatchPnp(ptr ptr) +@ stdcall KsSetDevicePnpAndBaseObject(ptr ptr ptr) +@ stdcall KsDefaultDispatchPower(ptr ptr) +@ stdcall KsSetPowerDispatch(ptr ptr ptr) +@ stdcall KsReferenceBusObject(ptr) +@ stdcall KsDereferenceBusObject(ptr) +@ stdcall KsFreeObjectCreateItem(ptr ptr) +@ stdcall KsFreeObjectCreateItemsByContext(ptr ptr) +@ stdcall KsLoadResource(ptr long ptr long ptr ptr) +; KsNullDriverUnload@4 +@ stdcall KsPinDataIntersectionEx(ptr ptr ptr long ptr long ptr ptr) +@ stdcall KsQueryDevicePnpObject(ptr) +@ stdcall KsRecalculateStackDepth(ptr long) +@ stdcall KsSetTargetDeviceObject(ptr ptr) +@ stdcall KsSetTargetState(ptr long) +@ stdcall KsSynchronousIoControlDevice(ptr long long ptr long ptr long ptr) +@ stdcall KsInitializeDriver(ptr ptr ptr) + +; Kernel COM +@ stdcall KoCreateInstance(ptr ptr long ptr ptr) Propchange: trunk/reactos/drivers/ksfilter/ks/ks.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Sat Aug 16 05:45:25 2008 @@ -223,9 +223,9 @@ */ KSDDKAPI NTSTATUS NTAPI KsInitializeDriver( -IN PDRIVER_OBJECT DriverObject, -IN PUNICODE_STRING RegistryPath, -IN const KSDEVICE_DESCRIPTOR *Descriptor OPTIONAL + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath, + IN const KSDEVICE_DESCRIPTOR *Descriptor OPTIONAL ) { UNIMPLEMENTED;

1 0

[cfinck] 35371: Mario Kacmar (kario@szm.sk) - Print no approximate round trip times on 100% loss like Windows does See issue #2542 for more details.
by cfinck＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: cfinck Date: Sat Aug 16 05:44:53 2008 New Revision: 35371 URL: http://svn.reactos.org/svn/reactos?rev=35371&view=rev Log: Mario Kacmar (kario(a)szm.sk) - Print no approximate round trip times on 100% loss like Windows does See issue #2542 for more details. Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Sat Aug 16 05:44:53 2008 @@ -644,9 +644,13 @@ printf("\nPing statistics for %s:\n", TargetIP); printf(" Packets: Sent = %d, Received = %d, Lost = %d (%d%% loss),\n", SentCount, SentCount - LostCount, LostCount, Count); - printf("Approximate round trip times in milli-seconds:\n"); - printf(" Minimum = %s, Maximum = %s, Average = %s\n", - MinTime, MaxTime, AvgTime); + /* Print approximate times or NO approximate times if 100% loss */ + if ((SentCount - LostCount) > 0) + { + printf("Approximate round trip times in milli-seconds:\n"); + printf(" Minimum = %s, Maximum = %s, Average = %s\n", + MinTime, MaxTime, AvgTime); + } } return 0; }

1 0

[hpoussin] 35370: Remove unused file
by hpoussin＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: hpoussin Date: Sat Aug 16 04:29:12 2008 New Revision: 35370 URL: http://svn.reactos.org/svn/reactos?rev=35370&view=rev Log: Remove unused file Removed: trunk/reactos/drivers/filesystems/fastfat/vfatfs.def Removed: trunk/reactos/drivers/filesystems/fastfat/vfatfs.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfatfs.def [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfatfs.def (removed) @@ -1,1 +1,0 @@ -LIBRARY VFATFS.SYS

1 0

[hpoussin] 35369: Replace .def file by a .spec file
by hpoussin＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: hpoussin Date: Sat Aug 16 04:25:46 2008 New Revision: 35369 URL: http://svn.reactos.org/svn/reactos?rev=35369&view=rev Log: Replace .def file by a .spec file Added: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.spec (with props) Removed: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.def Modified: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild Modified: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c [iso-8859-1] Sat Aug 16 04:25:46 2008 @@ -88,8 +88,8 @@ return CallNextHookEx(hWinHook, code, wParam, lParam); } -BOOL -KbSwitchSetHooks() +BOOL WINAPI +KbSwitchSetHooks(VOID) { hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD, KeyboardHookProc, hInstance, 0); hLangHook = SetWindowsHookEx(WH_GETMESSAGE, LangHookProc, hInstance, 0); @@ -101,8 +101,8 @@ return FALSE; } -VOID -KbSwitchDeleteHooks() +VOID WINAPI +KbSwitchDeleteHooks(VOID) { if (hKeyboardHook) UnhookWindowsHookEx(hKeyboardHook); if (hLangHook) UnhookWindowsHookEx(hLangHook); Removed: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.def [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.def (removed) @@ -1,7 +1,0 @@ -LIBRARY kbsdll.dll - -EXPORTS -KbSwitchSetHooks -KbSwitchDeleteHooks - -; EOF Modified: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild [iso-8859-1] Sat Aug 16 04:25:46 2008 @@ -1,15 +1,15 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="kbsdll" type="win32dll" baseaddress="0x74720000" installbase="system32" installname="kbsdll.dll" unicode="yes"> - <importlibrary definition="kbsdll.def" /> + <importlibrary definition="kbsdll.spec.def" /> <include base="kbsdll">.</include> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> - <library>ntdll</library> <library>kernel32</library> <library>user32</library> <library>comctl32</library> <file>kbsdll.c</file> <file>kbsdll.rc</file> + <file>kbsdll.spec</file> </module> Added: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.spec (added) +++ trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.spec [iso-8859-1] Sat Aug 16 04:25:46 2008 @@ -1,0 +1,2 @@ +@ stdcall KbSwitchSetHooks() +@ stdcall KbSwitchDeleteHooks() Propchange: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 35368: - Move x86-specific code, which was accidentally committed to the generic part of crt library to arch specific area. - Include x86-specific _CI* functions into libcntpr.
by fireball＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: fireball Date: Sat Aug 16 03:15:49 2008 New Revision: 35368 URL: http://svn.reactos.org/svn/reactos?rev=35368&view=rev Log: - Move x86-specific code, which was accidentally committed to the generic part of crt library to arch specific area. - Include x86-specific _CI* functions into libcntpr. Added: trunk/reactos/lib/sdk/crt/math/i386/ci.c (contents, props changed) - copied, changed from r35357, trunk/reactos/lib/sdk/crt/math/stubs.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/libcntpr.rbuild trunk/reactos/lib/sdk/crt/math/stubs.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sat Aug 16 03:15:49 2008 @@ -104,6 +104,7 @@ <if property="ARCH" value="i386"> <directory name="i386"> <file>atan2.c</file> + <file>ci.c</file> <file>exp.c</file> <file>fmod.c</file> <file>ldexp.c</file> Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Sat Aug 16 03:15:49 2008 @@ -41,6 +41,7 @@ <file>aulldvrm_asm.s</file> <file>aullrem_asm.s</file> <file>aullshr_asm.s</file> + <file>ci.c</file> <file>ceil_asm.s</file> <file>cos_asm.s</file> <file>fabs_asm.s</file> Copied: trunk/reactos/lib/sdk/crt/math/i386/ci.c (from r35357, trunk/reactos/lib/sdk/crt/math/stubs.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ci.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/stubs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] Sat Aug 16 03:15:49 2008 @@ -135,90 +135,3 @@ FPU_DOUBLES(x, y); return fmod(x, y); } - -/* The following functions are likely workarounds for the pentium fdiv bug */ -void __stdcall _adj_fdiv_m32( unsigned int arg ) -{ - FIXME("_adj_fdiv_m32 stub\n"); -} -void __stdcall _adj_fdiv_m32i( int arg ) -{ - FIXME("_adj_fdiv_m32i stub\n"); -} - -void __stdcall _adj_fdiv_m64( unsigned __int64 arg ) -{ - FIXME("_adj_fdiv_m64 stub\n"); -} - -void _adj_fdiv_r(void) -{ - FIXME("_adj_fdiv_r stub\n"); -} - -void __stdcall _adj_fdivr_m32( unsigned int arg ) -{ - FIXME("_adj_fdivr_m32i stub\n"); -} - -void __stdcall _adj_fdivr_m32i( int arg ) -{ - FIXME("_adj_fdivr_m32i stub\n"); -} - -void __stdcall _adj_fdivr_m64( unsigned __int64 arg ) -{ - FIXME("_adj_fdivr_m64 stub\n"); -} - -void _adj_fpatan(void) -{ - FIXME("_adj_fpatan stub\n"); -} - -void __stdcall _adj_fdiv_m16i( short arg ) -{ - FIXME("_adj_fdiv_m16i stub\n"); -} - -void __stdcall _adj_fdivr_m16i( short arg ) -{ - FIXME("_adj_fdivr_m16i stub\n"); -} - -void _adj_fprem(void) -{ - FIXME("_adj_fprem stub\n"); -} - -void _adj_fprem1(void) -{ - FIXME("_adj_fprem1 stub\n"); -} - -void _adj_fptan(void) -{ - FIXME("_adj_fptan stub\n"); -} - -void _safe_fdiv(void) -{ - FIXME("_safe_fdiv stub\n"); -} - -void _safe_fdivr(void) -{ - FIXME("_safe_fdivr stub\n"); -} - -void _safe_fprem(void) -{ - FIXME("_safe_fprem stub\n"); -} - -void _safe_fprem1(void) -{ - FIXME("_safe_fprem1 stub\n"); -} - - Propchange: trunk/reactos/lib/sdk/crt/math/i386/ci.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/sdk/crt/math/i386/ci.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: trunk/reactos/lib/sdk/crt/math/i386/ci.c ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/reactos/lib/sdk/crt/math/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/stubs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/stubs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/stubs.c [iso-8859-1] Sat Aug 16 03:15:49 2008 @@ -1,138 +1,134 @@ #include <precomp.h> #include <math.h> -#define FPU_DOUBLE(var) double var; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) - -/* - * @implemented - */ -double CDECL _CIsin(void) -{ - FPU_DOUBLE(x); +double CDECL _CIsin(double x); +double CDECL _CIcos(double x); +double CDECL _CItan(double x); +double CDECL _CIsinh(double x); +double CDECL _CIcosh(double x); +double CDECL _CItanh(double x); +double CDECL _CIasin(double x); +double CDECL _CIacos(double x); +double CDECL _CIatan(double x); +double CDECL _CIatan2(double y, double x); +double CDECL _CIexp(double x); +double CDECL _CIlog(double x); +double CDECL _CIlog10(double x); +double CDECL _CIpow(double x, double y); +double CDECL _CIsqrt(double x); +double CDECL _CIfmod(double x, double y); + + +/* + * @implemented + */ +double CDECL _CIsin(double x) +{ return sin(x); } /* * @implemented */ -double CDECL _CIcos(void) -{ - FPU_DOUBLE(x); +double CDECL _CIcos(double x) +{ return cos(x); } /* * @implemented */ -double CDECL _CItan(void) -{ - FPU_DOUBLE(x); +double CDECL _CItan(double x) +{ return tan(x); } /* * @implemented */ -double CDECL _CIsinh(void) -{ - FPU_DOUBLE(x); +double CDECL _CIsinh(double x) +{ return sinh(x); } /* * @implemented */ -double CDECL _CIcosh(void) -{ - FPU_DOUBLE(x); +double CDECL _CIcosh(double x) +{ return cosh(x); } /* * @implemented */ -double CDECL _CItanh(void) -{ - FPU_DOUBLE(x); +double CDECL _CItanh(double x) +{ return tanh(x); } /* * @implemented */ -double CDECL _CIasin(void) -{ - FPU_DOUBLE(x); +double CDECL _CIasin(double x) +{ return asin(x); } /* * @implemented */ -double CDECL _CIacos(void) -{ - FPU_DOUBLE(x); +double CDECL _CIacos(double x) +{ return acos(x); } /* * @implemented */ -double CDECL _CIatan(void) -{ - FPU_DOUBLE(x); +double CDECL _CIatan(double x) +{ return atan(x); } /* * @implemented */ -double CDECL _CIatan2(void) -{ - FPU_DOUBLES(x, y); - return atan2(x, y); -} -/* - * @implemented - */ -double CDECL _CIexp(void) -{ - FPU_DOUBLE(x); +double CDECL _CIatan2(double x, double y) +{ + return atan2(y, x); +} +/* + * @implemented + */ +double CDECL _CIexp(double x) +{ return exp(x); } /* * @implemented */ -double CDECL _CIlog(void) -{ - FPU_DOUBLE(x); +double CDECL _CIlog(double x) +{ return log(x); } /* * @implemented */ -double CDECL _CIlog10(void) -{ - FPU_DOUBLE(x); +double CDECL _CIlog10(double x) +{ return log10(x); } /* * @implemented */ -double CDECL _CIpow(void) -{ - FPU_DOUBLES(x, y); +double CDECL _CIpow(double x, double y) +{ return pow(x, y); } /* * @implemented */ -double CDECL _CIsqrt(void) -{ - FPU_DOUBLE(x); +double CDECL _CIsqrt(double x) +{ return sqrt(x); } /* * @implemented */ -double CDECL _CIfmod(void) -{ - FPU_DOUBLES(x, y); +double CDECL _CIfmod(double x, double y) +{ return fmod(x, y); }

1 0

[dreimer] 35367: Update ReactOS Calc to Version 1.10.
by dreimer＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: dreimer Date: Sat Aug 16 03:08:55 2008 New Revision: 35367 URL: http://svn.reactos.org/svn/reactos?rev=35367&view=rev Log: Update ReactOS Calc to Version 1.10. Modified: trunk/reactos/base/applications/calc/calc.h trunk/reactos/base/applications/calc/calc.rbuild trunk/reactos/base/applications/calc/convert.c trunk/reactos/base/applications/calc/rpn.c trunk/reactos/base/applications/calc/rpn_mpfr.c trunk/reactos/base/applications/calc/whatsnew.txt trunk/reactos/base/applications/calc/winmain.c Modified: trunk/reactos/base/applications/calc/calc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… ============================================================================== --- trunk/reactos/base/applications/calc/calc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/calc.h [iso-8859-1] Sat Aug 16 03:08:55 2008 @@ -42,7 +42,9 @@ #define IDC_STATIC ((DWORD)-1) #endif -#define CALC_VERSION TEXT("1.09") +#define CALC_VERSION TEXT("1.10") + +#define MAX_CALC_SIZE 256 /*#define USE_KEYBOARD_HOOK*/ @@ -144,7 +146,8 @@ #endif HWND hWnd; DWORD layout; - TCHAR buffer[256]; + TCHAR buffer[MAX_CALC_SIZE]; + TCHAR source[MAX_CALC_SIZE]; TCHAR *ptr; calc_number_t code; calc_number_t prev; Modified: trunk/reactos/base/applications/calc/calc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… ============================================================================== --- trunk/reactos/base/applications/calc/calc.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/calc.rbuild [iso-8859-1] Sat Aug 16 03:08:55 2008 @@ -2,13 +2,13 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="calc" type="win32gui" installbase="system32" installname="calc.exe" allowwarnings="true" unicode="yes"> <include base="calc">.</include> - <define name="DISABLE_HTMLHELP_SUPPORT">1</define> + <define name="DISABLE_HTMLHELP_SUPPORT">1</define> <define name="_WIN32_WINNT">0x0501</define> <library>user32</library> <library>gdi32</library> <library>kernel32</library> <file>about.c</file> - <file>convert.c</file> + <file>convert.c</file> <file>function.c</file> <file>rpn.c</file> <file>utl.c</file> Modified: trunk/reactos/base/applications/calc/convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/con… ============================================================================== --- trunk/reactos/base/applications/calc/convert.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/convert.c [iso-8859-1] Sat Aug 16 03:08:55 2008 @@ -561,4 +561,3 @@ ConvAdjust(hWnd, 0); } - Modified: trunk/reactos/base/applications/calc/rpn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rpn… ============================================================================== --- trunk/reactos/base/applications/calc/rpn.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/rpn.c [iso-8859-1] Sat Aug 16 03:08:55 2008 @@ -310,6 +310,8 @@ operator_list[operation].op_p(&dc, &da, &db); } else operator_list[operation].op_f(&dc, &da, &db); + if (_finite(dc.f) == 0) + calc.is_nan = TRUE; } else { operator_list[operation].op_i(&dc, &da, &db); /* apply final limitator to result */ @@ -331,7 +333,6 @@ stack_node_t *op, ip; unsigned int prec; - percent_mode = FALSE; op = pop(); ip = *op; prec = operator_list[ip.node.operation].prec; @@ -373,6 +374,9 @@ return 0; } + if (func == RPN_OPERATOR_PERCENT) + percent_mode = TRUE; + tmp.node.number = *number; tmp.node.base = calc.base; tmp.node.operation = func; Modified: trunk/reactos/base/applications/calc/rpn_mpfr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rpn… ============================================================================== --- trunk/reactos/base/applications/calc/rpn_mpfr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/rpn_mpfr.c [iso-8859-1] Sat Aug 16 03:08:55 2008 @@ -311,7 +311,6 @@ unsigned int prec; mpfr_init(ip.node.number.mf); - percent_mode = FALSE; op = pop(); node_copy(&ip, op); prec = operator_list[ip.node.operation].prec; @@ -355,6 +354,9 @@ return 0; } + if (func == RPN_OPERATOR_PERCENT) + percent_mode = TRUE; + mpfr_init(tmp.node.number.mf); rpn_copy(&tmp.node.number, number); tmp.node.operation = func; Modified: trunk/reactos/base/applications/calc/whatsnew.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/wha… ============================================================================== --- trunk/reactos/base/applications/calc/whatsnew.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/whatsnew.txt [iso-8859-1] Sat Aug 16 03:08:55 2008 @@ -1,3 +1,14 @@ +1.10 (20080813) +======================= +* Added Norvegian and Korean translations. +* Fixed Polish and Slovak translations. +* Fixed percent mode. +* Fixed some unsignaled overflow errors. +* Fixed conversion method, now scientific notation is recognized too. +* Added compilation for UNICODE executables. +* Plain MINGW toolchain do not support wWinMain function, so I switched to old WinMain if it is not under ReactOS' build tree. +* Detect error if UNICODE version is launched into Win9x (avoid the lock). + 1.09 (20080630) ======================= * Fixed bug with Conversion function: "Category" type must be found like "from" and "to" because the combobox sorts its items alphabetically. Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Sat Aug 16 03:08:55 2008 @@ -784,68 +784,18 @@ static char *ReadConversion(const char *formula) { - unsigned int len = 256, n; - char *str; - char *code = NULL; - const char *p = formula; - char c; - calc_number_t x; - TCHAR buffer[SIZEOF(calc.buffer)]; -#ifdef UNICODE - char cbuffer[SIZEOF(calc.buffer)]; -#endif - - str = (char *)malloc(len); + int len = strlen(formula); + char *str = (char *)malloc(len+3); + if (str == NULL) return NULL; - /* prepare code string */ - rpn_alloc(&x); - convert_text2number(&x); - prepare_rpn_result(&x, - buffer, SIZEOF(buffer), - calc.base); - rpn_free(&x); - -#ifdef UNICODE - WideCharToMultiByte(CP_ACP, 0, buffer, -1, cbuffer, SIZEOF(cbuffer), NULL, NULL); -#endif - str[0] = '('; - n = 1; - while (1) { - if (code != NULL) { - c = *code++; - if (*code == '\0') - code = NULL; - } else - c = *p++; - - if (c == '\0') { - str[n++] = ')'; - if (n >= len-1) { - str = (char *)realloc(str, len += 16); - if (str == NULL) - return NULL; - } - break; - } else - if (c == '$') { -#ifdef UNICODE - code = cbuffer; -#else - code = buffer; -#endif - continue; - } - str[n++] = c; - if (n >= len-1) { - str = (char *)realloc(str, len += 16); - if (str == NULL) - return NULL; - } - } - str[n] = '\0'; + memcpy(str+1, formula, len); + str[len+1] = ')'; + str[len+2] = '\0'; + + _tcscpy(calc.source, (*calc.buffer == _T('\0')) ? _T("0") : calc.buffer); /* clear display content before proceeding */ calc.ptr = calc.buffer; @@ -991,6 +941,11 @@ case 'Q': PostMessage(hwnd, WM_COMMAND, (WPARAM)IDC_BUTTON_CANC, 0); break; case 'R': PostMessage(hwnd, WM_COMMAND, (WPARAM)IDC_BUTTON_MR, 0); break; } + } else + if (ch == '$') { + calc.ptr = + _tcscpy(calc.buffer, calc.source) + + _tcslen(calc.source); } else { for (x=0; x<SIZEOF(key2code); x++) { if (!(key2code[x].mask & BITMASK_IS_ASCII) || @@ -1650,13 +1605,15 @@ } return TRUE; case WM_HANDLE_FROM: - if (handle_sequence_input(hWnd, &calc.Convert[0]) == NULL) { + if (calc.is_nan) + break; + if (handle_sequence_input(hWnd, &calc.Convert[0]) == NULL) PostMessage(hWnd, WM_START_CONV, 0, MAKELPARAM(0x0001, WM_HANDLE_TO)); - } return TRUE; case WM_HANDLE_TO: - handle_sequence_input(hWnd, &calc.Convert[1]); + if (!calc.is_nan) + handle_sequence_input(hWnd, &calc.Convert[1]); return TRUE; case WM_CLOSE: calc.action = IDC_STATIC; @@ -1692,7 +1649,11 @@ return FALSE; } +#if defined(__GNUC__) && !defined(__REACTOS__) +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd) +#else int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nShowCmd) +#endif { MSG msg; DWORD dwLayout; @@ -1715,7 +1676,9 @@ else dwLayout = IDD_DIALOG_STANDARD; - CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL, (DLGPROC)DlgMainProc); + /* This call will always fail if UNICODE for Win9x */ + if (NULL == CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL, (DLGPROC)DlgMainProc)) + break; while (GetMessage(&msg, NULL, 0, 0)) { #ifndef USE_KEYBOARD_HOOK

1 0

[arty] 35366: Partial merge to keep current.
by arty＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: arty Date: Fri Aug 15 23:31:02 2008 New Revision: 35366 URL: http://svn.reactos.org/svn/reactos?rev=35366&view=rev Log: Partial merge to keep current. Added: branches/arty-newcc/dll/win32/shell32/res/icons/182.ico - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/182.ico branches/arty-newcc/dll/win32/shell32/res/icons/183.ico - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/183.ico branches/arty-newcc/dll/win32/shell32/res/icons/184.ico - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/184.ico branches/arty-newcc/dll/win32/shell32/res/icons/185.ico - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/185.ico branches/arty-newcc/dll/win32/shell32/res/icons/186.ico - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/186.ico branches/arty-newcc/dll/win32/shell32/res/icons/187.ico - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/187.ico branches/arty-newcc/dll/win32/shell32/shfldr_admintools.c - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/shfldr_admintools.c branches/arty-newcc/dll/win32/shell32/shfldr_mydocuments.c - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/shfldr_mydocuments.c branches/arty-newcc/dll/win32/shell32/shfldr_recyclebin.c - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c branches/arty-newcc/subsystems/win32/csrss/win32csr/lang/no-NO.rc - copied unchanged from r35355, trunk/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc Modified: branches/arty-newcc/ReactOS-arm.rbuild branches/arty-newcc/ReactOS-i386.rbuild branches/arty-newcc/boot/bootdata/hivesft_i386.inf branches/arty-newcc/boot/bootdata/txtsetup.sif branches/arty-newcc/boot/freeldr/freeldr/reactos/reactos.c branches/arty-newcc/boot/freeldr/freeldr/reactos/setupldr.c branches/arty-newcc/dll/3rdparty/dxtn/internal.h branches/arty-newcc/dll/3rdparty/mesa32/mesa32.rbuild branches/arty-newcc/dll/cpl/access/lang/fr-FR.rc branches/arty-newcc/dll/cpl/console/lang/no-NO.rc branches/arty-newcc/dll/cpl/desk/lang/fr-FR.rc branches/arty-newcc/dll/cpl/intl/lang/it-IT.rc branches/arty-newcc/dll/ntdll/ntdll.rbuild branches/arty-newcc/dll/win32/advapi32/advapi32.def branches/arty-newcc/dll/win32/devmgr/lang/no-NO.rc branches/arty-newcc/dll/win32/msgina/lang/it-IT.rc branches/arty-newcc/dll/win32/msvcrt/msvcrt.rbuild branches/arty-newcc/dll/win32/riched20/riched20.rbuild branches/arty-newcc/dll/win32/shell32/classes.c branches/arty-newcc/dll/win32/shell32/drive.c branches/arty-newcc/dll/win32/shell32/icon_res.rc branches/arty-newcc/dll/win32/shell32/lang/bg-BG.rc branches/arty-newcc/dll/win32/shell32/lang/ca-ES.rc branches/arty-newcc/dll/win32/shell32/lang/cs-CZ.rc branches/arty-newcc/dll/win32/shell32/lang/da-DK.rc branches/arty-newcc/dll/win32/shell32/lang/de-DE.rc branches/arty-newcc/dll/win32/shell32/lang/el-GR.rc branches/arty-newcc/dll/win32/shell32/lang/en-GB.rc branches/arty-newcc/dll/win32/shell32/lang/en-US.rc branches/arty-newcc/dll/win32/shell32/lang/es-ES.rc branches/arty-newcc/dll/win32/shell32/lang/fi-FI.rc branches/arty-newcc/dll/win32/shell32/lang/fr-FR.rc branches/arty-newcc/dll/win32/shell32/lang/hu-HU.rc branches/arty-newcc/dll/win32/shell32/lang/it-IT.rc branches/arty-newcc/dll/win32/shell32/lang/ja-JP.rc branches/arty-newcc/dll/win32/shell32/lang/ko-KR.rc branches/arty-newcc/dll/win32/shell32/lang/nl-NL.rc branches/arty-newcc/dll/win32/shell32/lang/no-NO.rc branches/arty-newcc/dll/win32/shell32/lang/pl-PL.rc branches/arty-newcc/dll/win32/shell32/lang/pt-BR.rc branches/arty-newcc/dll/win32/shell32/lang/pt-PT.rc branches/arty-newcc/dll/win32/shell32/lang/ru-RU.rc branches/arty-newcc/dll/win32/shell32/lang/sk-SK.rc branches/arty-newcc/dll/win32/shell32/lang/sl-SI.rc branches/arty-newcc/dll/win32/shell32/lang/sv-SE.rc branches/arty-newcc/dll/win32/shell32/lang/tr-TR.rc branches/arty-newcc/dll/win32/shell32/lang/uk-UA.rc branches/arty-newcc/dll/win32/shell32/lang/zh-CN.rc branches/arty-newcc/dll/win32/shell32/lang/zh-TW.rc branches/arty-newcc/dll/win32/shell32/pidl.c branches/arty-newcc/dll/win32/shell32/pidl.h branches/arty-newcc/dll/win32/shell32/regsvr.c branches/arty-newcc/dll/win32/shell32/shell32.rbuild branches/arty-newcc/dll/win32/shell32/shell32_main.h branches/arty-newcc/dll/win32/shell32/shellole.c branches/arty-newcc/dll/win32/shell32/shellord.c branches/arty-newcc/dll/win32/shell32/shresdef.h branches/arty-newcc/dll/win32/shlwapi/shlwapi_No.rc branches/arty-newcc/dll/win32/syssetup/lang/no-NO.rc branches/arty-newcc/dll/win32/userenv/setup.c branches/arty-newcc/drivers/network/afd/afd/connect.c branches/arty-newcc/drivers/network/afd/afd/listen.c branches/arty-newcc/drivers/network/afd/afd/lock.c branches/arty-newcc/drivers/network/afd/afd/main.c branches/arty-newcc/drivers/network/afd/afd/read.c branches/arty-newcc/drivers/network/afd/afd/select.c branches/arty-newcc/drivers/network/afd/afd/tdi.c branches/arty-newcc/drivers/network/afd/afd/tdiconn.c branches/arty-newcc/drivers/network/afd/afd/write.c branches/arty-newcc/drivers/network/afd/include/afd.h branches/arty-newcc/include/psdk/shellapi.h branches/arty-newcc/include/psdk/shlguid.h branches/arty-newcc/lib/recyclebin/recyclebin.c branches/arty-newcc/lib/recyclebin/recyclebin.h branches/arty-newcc/lib/sdk/crt/crt.rbuild branches/arty-newcc/lib/sdk/crt/stdio/lnx_sprintf.c (contents, props changed) branches/arty-newcc/media/fonts/fonts.rbuild branches/arty-newcc/subsystems/win32/csrss/win32csr/lang/fr-FR.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arty-newcc/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ReactOS-arm.rbuild?r… Modified: branches/arty-newcc/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ReactOS-i386.rbuild?… Modified: branches/arty-newcc/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/bootdata/hivesf… Modified: branches/arty-newcc/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/bootdata/txtset… Modified: branches/arty-newcc/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… Modified: branches/arty-newcc/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… Modified: branches/arty-newcc/dll/3rdparty/dxtn/internal.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/dxtn/in… Modified: branches/arty-newcc/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/mesa32/… Modified: branches/arty-newcc/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/access/lang/… Modified: branches/arty-newcc/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/console/lang… Modified: branches/arty-newcc/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/desk/lang/fr… Modified: branches/arty-newcc/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/intl/lang/it… Modified: branches/arty-newcc/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/ntdll/ntdll.rbui… Modified: branches/arty-newcc/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/advapi32/a… Modified: branches/arty-newcc/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/devmgr/lan… Modified: branches/arty-newcc/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/msgina/lan… Modified: branches/arty-newcc/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/msvcrt/msv… Modified: branches/arty-newcc/dll/win32/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/riched20/r… Modified: branches/arty-newcc/dll/win32/shell32/classes.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/cl… Modified: branches/arty-newcc/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/dr… Modified: branches/arty-newcc/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/ic… Modified: branches/arty-newcc/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/pi… Modified: branches/arty-newcc/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/pi… Modified: branches/arty-newcc/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/re… Modified: branches/arty-newcc/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/sh… Modified: branches/arty-newcc/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/sh… Modified: branches/arty-newcc/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/sh… Modified: branches/arty-newcc/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/sh… Modified: branches/arty-newcc/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/sh… Modified: branches/arty-newcc/dll/win32/shlwapi/shlwapi_No.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shlwapi/sh… Modified: branches/arty-newcc/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/syssetup/l… Modified: branches/arty-newcc/dll/win32/userenv/setup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/userenv/se… Modified: branches/arty-newcc/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/psdk/shellap… Modified: branches/arty-newcc/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/psdk/shlguid… Modified: branches/arty-newcc/lib/recyclebin/recyclebin.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/recyclebin/recyc… Modified: branches/arty-newcc/lib/recyclebin/recyclebin.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/recyclebin/recyc… Modified: branches/arty-newcc/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/sdk/crt/crt.rbui… Modified: branches/arty-newcc/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/sdk/crt/stdio/ln… Modified: branches/arty-newcc/media/fonts/fonts.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/fonts/fonts.rb… Modified: branches/arty-newcc/subsystems/win32/csrss/win32csr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr…

1 0

[arty] 35365: Fix thread and process listing. Quite helpful.
by arty＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: arty Date: Fri Aug 15 22:30:22 2008 New Revision: 35365 URL: http://svn.reactos.org/svn/reactos?rev=35365&view=rev Log: Fix thread and process listing. Quite helpful. Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/KDB… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] Fri Aug 15 22:30:22 2008 @@ -251,7 +251,7 @@ else { Match pidEntryMatch = mProcListEntry.Match(cleanedLine); - if (pidEntryMatch.Success) + if (pidEntryMatch.Success && mReceivingProcs) { if (ProcessListEvent != null) ProcessListEvent(this, new ProcessListEventArgs(ulong.Parse(pidEntryMatch.Groups["pid"].ToString(), NumberStyles.HexNumber), pidEntryMatch.Groups["cur"].Length > 0)); @@ -275,7 +275,7 @@ else { Match tidEntryMatch = mThreadListEntry.Match(cleanedLine); - if (tidEntryMatch.Success) + if (tidEntryMatch.Success && mReceivingThreads) { if (ThreadListEvent != null) ThreadListEvent(this, new ThreadListEventArgs(ulong.Parse(tidEntryMatch.Groups["tid"].ToString(), NumberStyles.HexNumber), tidEntryMatch.Groups["cur"].Length > 0));

1 0

[ros-arm-bringup] 35364: Implement InterlockedComparePte and InterlockedCompareExchangePte to: 1) Avoid all the casting currently being done 2) Allow portability with other platforms so that the code can be potentially shared later.
by ros-arm-bringup＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: ros-arm-bringup Date: Fri Aug 15 20:58:59 2008 New Revision: 35364 URL: http://svn.reactos.org/svn/reactos?rev=35364&view=rev Log: Implement InterlockedComparePte and InterlockedCompareExchangePte to: 1) Avoid all the casting currently being done 2) Allow portability with other platforms so that the code can be potentially shared later. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Fri Aug 15 20:58:59 2008 @@ -163,6 +163,13 @@ #define PAGE_IS_WRITECOPY \ (PAGE_WRITECOPY | \ PAGE_EXECUTE_WRITECOPY) + + +#define InterlockedCompareExchangePte(PointerPte, Exchange, Comperand) \ + InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand) + +#define InterlockedExchangePte(PointerPte, Value) \ + InterlockedExchange((PLONG)(PointerPte), Value) typedef struct { Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Fri Aug 15 20:58:59 2008 @@ -331,7 +331,7 @@ { KEBUGCHECK(0); } - if (0 == InterlockedCompareExchangeUL(&PageDir[PdeOffset], 0, 0)) + if (0 == InterlockedCompareExchangePte(&PageDir[PdeOffset], 0, 0)) { if (Create == FALSE) { @@ -343,7 +343,7 @@ { KEBUGCHECK(0); } - Entry = InterlockedCompareExchangeUL(&PageDir[PdeOffset], PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); + Entry = InterlockedCompareExchangePte(&PageDir[PdeOffset], PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); if (Entry != 0) { MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); @@ -363,11 +363,11 @@ return Pt + ADDR_TO_PTE_OFFSET(Address); } PageDir = (PULONG)MiAddressToPde(Address); - if (0 == InterlockedCompareExchangeUL(PageDir, 0, 0)) + if (0 == InterlockedCompareExchangePte(PageDir, 0, 0)) { if (Address >= MmSystemRangeStart) { - if (0 == InterlockedCompareExchangeUL(&MmGlobalKernelPageDirectory[PdeOffset], 0, 0)) + if (0 == InterlockedCompareExchangePte(&MmGlobalKernelPageDirectory[PdeOffset], 0, 0)) { if (Create == FALSE) { @@ -383,12 +383,12 @@ { Entry |= PA_GLOBAL; } - if(0 != InterlockedCompareExchangeUL(&MmGlobalKernelPageDirectory[PdeOffset], Entry, 0)) + if(0 != InterlockedCompareExchangePte(&MmGlobalKernelPageDirectory[PdeOffset], Entry, 0)) { MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); } } - (void)InterlockedExchangeUL(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); + InterlockedExchangePte(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); } else { @@ -401,7 +401,7 @@ { KEBUGCHECK(0); } - Entry = InterlockedCompareExchangeUL(PageDir, PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); + Entry = InterlockedCompareExchangePte(PageDir, PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); if (Entry != 0) { MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); @@ -476,7 +476,7 @@ do { Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_PRESENT, Pte)); + } while (Pte != InterlockedCompareExchangePte(Pt, Pte & ~PA_PRESENT, Pte)); MiFlushTlb(Pt, Address); WasValid = (PAGE_MASK(Pte) != 0); @@ -510,7 +510,7 @@ /* * Set the entry to zero */ - (void)InterlockedExchangeUL(Pt, 0); + InterlockedExchangePte(Pt, 0); MiFlushTlb(Pt, Address); } } @@ -549,7 +549,7 @@ /* * Atomically set the entry to zero and get the old value. */ - Pte = InterlockedExchangeUL(Pt, 0); + Pte = InterlockedExchangePte(Pt, 0); MiFlushTlb(Pt, Address); @@ -604,7 +604,7 @@ /* * Atomically set the entry to zero and get the old value. */ - Pte = InterlockedExchangeUL(Pt, 0); + Pte = InterlockedExchangePte(Pt, 0); MiFlushTlb(Pt, Address); @@ -659,7 +659,7 @@ do { Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_ACCESSED, Pte)); + } while (Pte != InterlockedCompareExchangePte(Pt, Pte & ~PA_ACCESSED, Pte)); if (Pte & PA_ACCESSED) { @@ -696,7 +696,7 @@ do { Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_DIRTY, Pte)); + } while (Pte != InterlockedCompareExchangePte(Pt, Pte & ~PA_DIRTY, Pte)); if (Pte & PA_DIRTY) { @@ -730,7 +730,7 @@ do { Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte | PA_DIRTY, Pte)); + } while (Pte != InterlockedCompareExchangePte(Pt, Pte | PA_DIRTY, Pte)); if (!(Pte & PA_DIRTY)) { MiFlushTlb(Pt, Address); @@ -757,7 +757,7 @@ do { Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte | PA_PRESENT, Pte)); + } while (Pte != InterlockedCompareExchangePte(Pt, Pte | PA_PRESENT, Pte)); if (!(Pte & PA_PRESENT)) { MiFlushTlb(Pt, Address); @@ -859,7 +859,7 @@ { KEBUGCHECK(0); } - (void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); + InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes); } return(STATUS_SUCCESS); @@ -899,7 +899,7 @@ { MmMarkPageUnmapped(PTE_TO_PFN((Pte))); } - (void)InterlockedExchangeUL(Pt, SwapEntry << 1); + InterlockedExchangePte(Pt, SwapEntry << 1); if (Pte != 0) { MiFlushTlb(Pt, Address); @@ -1018,7 +1018,7 @@ { MmMarkPageUnmapped(PTE_TO_PFN((Pte))); } - (void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); + InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes); if (Pte != 0) { if (Address > MmSystemRangeStart || @@ -1138,7 +1138,7 @@ { KEBUGCHECK(0); } - InterlockedExchange((PLONG)Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA_ACCESSED|PA_DIRTY))); + InterlockedExchangePte(Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA_ACCESSED|PA_DIRTY))); MiFlushTlb(Pt, Address); } @@ -1243,7 +1243,7 @@ ASSERT (IS_HYPERSPACE(Address)); - Entry = InterlockedExchange((PLONG)MiAddressToPte(Address), PFN_TO_PTE(NewPage) | PA_PRESENT | PA_READWRITE); + Entry = InterlockedExchangePte(MiAddressToPte(Address), PFN_TO_PTE(NewPage) | PA_PRESENT | PA_READWRITE); Pfn = PTE_TO_PFN(Entry); __invlpg(Address); @@ -1259,7 +1259,7 @@ ASSERT (IS_HYPERSPACE(Address)); - Entry = InterlockedExchange((PLONG)MiAddressToPte(Address), 0); + Entry = InterlockedExchangePte(MiAddressToPte(Address), 0); Pfn = PTE_TO_PFN(Entry); __invlpg(Address); @@ -1293,7 +1293,7 @@ { if (Offset != ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)) { - (void)InterlockedCompareExchangeUL(&Pde[Offset], MmGlobalKernelPageDirectory[Offset], 0); + InterlockedCompareExchangePte(&Pde[Offset], MmGlobalKernelPageDirectory[Offset], 0); } } if (Pde != (PULONG)PAGEDIRECTORY_MAP)

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
86
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 August 2008