Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 43031: - ObpCreateDosDevicesDirectory: Check that allocation succeeded before dereference
by sginsberg＠svn.reactos.org 11 Sep '09

11 Sep '09

Author: sginsberg Date: Sat Sep 12 00:31:46 2009 New Revision: 43031 URL: http://svn.reactos.org/svn/reactos?rev=43031&view=rev Log: - ObpCreateDosDevicesDirectory: Check that allocation succeeded before dereference Modified: trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Sat Sep 12 00:31:46 2009 @@ -101,6 +101,7 @@ ObSystemDeviceMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(*ObSystemDeviceMap), 'mDbO'); + if (!ObSystemDeviceMap) return STATUS_INSUFFICIENT_RESOURCES; RtlZeroMemory(ObSystemDeviceMap, sizeof(*ObSystemDeviceMap)); /* Return status */

1 0

[sginsberg] 43030: - Remove accidental change from 42918
by sginsberg＠svn.reactos.org 11 Sep '09

11 Sep '09

Author: sginsberg Date: Fri Sep 11 20:18:21 2009 New Revision: 43030 URL: http://svn.reactos.org/svn/reactos?rev=43030&view=rev Log: - Remove accidental change from 42918 Modified: trunk/rostests/tests/pseh2/psehtest.c Modified: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Fri Sep 11 20:18:21 2009 @@ -778,12 +778,6 @@ _SEH2_END; return ret == return_positive(); -} - -DEFINE_TEST(test_continue_execution_13) -{ - /* XXX */ - return 1; } //}}} @@ -2579,8 +2573,6 @@ USE_TEST(test_execute_handler_12), USE_TEST(test_continue_execution_12), - USE_TEST(test_continue_execution_13), - USE_TEST(test_leave_1), USE_TEST(test_leave_2), USE_TEST(test_leave_3),

1 0

[jimtabor] 43029: - Quick implementation of RtlIsThreadWithinLoaderCallout.
by jimtabor＠svn.reactos.org 11 Sep '09

11 Sep '09

Author: jimtabor Date: Fri Sep 11 09:12:30 2009 New Revision: 43029 URL: http://svn.reactos.org/svn/reactos?rev=43029&view=rev Log: - Quick implementation of RtlIsThreadWithinLoaderCallout. Modified: trunk/reactos/dll/ntdll/def/ntdll_i386.def trunk/reactos/dll/ntdll/ldr/startup.c trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/dll/ntdll/def/ntdll_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll_i386.d… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll_i386.def [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll_i386.def [iso-8859-1] Fri Sep 11 09:12:30 2009 @@ -748,7 +748,7 @@ RtlIsGenericTableEmptyAvl@4 RtlIsNameLegalDOS8Dot3@12 RtlIsTextUnicode@12 -;RtlIsThreadWithinLoaderCallout +RtlIsThreadWithinLoaderCallout@0 RtlIsValidHandle@8 RtlIsValidIndexHandle@12 RtlLargeIntegerAdd@16 Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Fri Sep 11 09:12:30 2009 @@ -19,6 +19,7 @@ VOID NTAPI RtlpInitDeferedCriticalSection(VOID); NTSTATUS LdrpAttachThread(VOID); VOID RtlpInitializeVectoredExceptionHandling(VOID); +extern PTEB LdrpTopLevelDllBeingLoadedTeb; /* GLOBALS *******************************************************************/ @@ -470,6 +471,8 @@ ExeModule->SizeOfImage = LdrpGetResidentSize(NTHeaders); ExeModule->TimeDateStamp = NTHeaders->FileHeader.TimeDateStamp; + LdrpTopLevelDllBeingLoadedTeb = NtCurrentTeb(); + InsertHeadList(&Peb->Ldr->InLoadOrderModuleList, &ExeModule->InLoadOrderLinks); Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Fri Sep 11 09:12:30 2009 @@ -14,6 +14,7 @@ #include <debug.h> SIZE_T RtlpAllocDeallocQueryBufferSize = PAGE_SIZE; +PTEB LdrpTopLevelDllBeingLoadedTeb = NULL; /* FUNCTIONS ***************************************************************/ @@ -201,6 +202,13 @@ *StackBegin = (ULONG_PTR)NtCurrentTeb()->Tib.StackLimit; *StackEnd = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase; return TRUE; +} + +BOOLEAN +NTAPI +RtlIsThreadWithinLoaderCallout(VOID) +{ + return LdrpTopLevelDllBeingLoadedTeb == NtCurrentTeb(); } /* RTL Atom Tables ************************************************************/ Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Fri Sep 11 09:12:30 2009 @@ -2013,6 +2013,11 @@ ); NTSYSAPI +BOOLEAN +NTAPI +RtlIsThreadWithinLoaderCallout(VOID); + +NTSYSAPI PRTL_USER_PROCESS_PARAMETERS NTAPI RtlNormalizeProcessParams(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters);

1 0

[janderwald] 43028: - Fix build #2
by janderwald＠svn.reactos.org 11 Sep '09

11 Sep '09

Author: janderwald Date: Fri Sep 11 08:53:50 2009 New Revision: 43028 URL: http://svn.reactos.org/svn/reactos?rev=43028&view=rev Log: - Fix build #2 Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pool.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pool.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pool.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pool.cpp [iso-8859-1] Fri Sep 11 08:53:50 2009 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "private.h" +#include "private.hpp" PVOID AllocateItem(

1 0

[janderwald] 43027: - Fix build
by janderwald＠svn.reactos.org 11 Sep '09

11 Sep '09

Author: janderwald Date: Fri Sep 11 08:45:30 2009 New Revision: 43027 URL: http://svn.reactos.org/svn/reactos?rev=43027&view=rev Log: - Fix build Modified: trunk/reactos/include/ddk/kcom.h Modified: trunk/reactos/include/ddk/kcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/kcom.h?rev=430… ============================================================================== --- trunk/reactos/include/ddk/kcom.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/kcom.h [iso-8859-1] Fri Sep 11 08:45:30 2009 @@ -236,7 +236,7 @@ #if defined(_SYS_GUID_OPERATOR_EQ_) #define _GUID_OPERATORS_ -#pragma message("WARNING: Using system operator==/!= for GUIDs") +//#pragma message("WARNING: Using system operator==/!= for GUIDs") #endif #ifndef _GUID_OPERATORS_

1 0

[janderwald] 43026: - Convert portcls to a C++ driver - Tested with Vbox 2.2.4 + AC97 with Winamp - WIP, Testing recommended
by janderwald＠svn.reactos.org 11 Sep '09

11 Sep '09

Author: janderwald Date: Fri Sep 11 08:33:55 2009 New Revision: 43026 URL: http://svn.reactos.org/svn/reactos?rev=43026&view=rev Log: - Convert portcls to a C++ driver - Tested with Vbox 2.2.4 + AC97 with Winamp - WIP, Testing recommended Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/api.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.c trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c trunk/reactos/drivers/wdm/audio/backpln/portcls/drm.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/drm.c trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp - copied, changed from r42913, trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.c trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp - copied, changed from r42913, trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp - copied, changed from r42913, trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport.c trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp - copied, changed from r42913, trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pool.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/pool.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port.hpp - copied unchanged from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/port.h trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_factory.cpp - copied unchanged from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_factory.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp - copied, changed from r42892, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp - copied, changed from r42892, trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp - copied, changed from r42913, trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c trunk/reactos/drivers/wdm/audio/backpln/portcls/purecall.cpp (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c trunk/reactos/drivers/wdm/audio/backpln/portcls/version.cpp - copied, changed from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/version.c Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/ResourceList.c trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.c trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c trunk/reactos/drivers/wdm/audio/backpln/portcls/drm.c trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.c trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport.c trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pool.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port.h trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_factory.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c trunk/reactos/drivers/wdm/audio/backpln/portcls/version.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/ResourceList.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/drm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/drm.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/drm.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp (from r42913, trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp (from r42913, trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp (from r42913, trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp (from r42913, trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/pool.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/pool.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/port.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp (from r42892, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp (from r42892, trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp (from r42913, trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/purecall.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Copied: trunk/reactos/drivers/wdm/audio/backpln/portcls/version.cpp (from r42820, trunk/reactos/drivers/wdm/audio/backpln/portcls/version.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…

1 0

[janderwald] 43025: - Remove dead code
by janderwald＠svn.reactos.org 11 Sep '09

11 Sep '09

Author: janderwald Date: Fri Sep 11 08:33:01 2009 New Revision: 43025 URL: http://svn.reactos.org/svn/reactos?rev=43025&view=rev Log: - Remove dead code Removed: trunk/reactos/drivers/wdm/audio/backpln/stdunk/

1 0

[sginsberg] 43024: - Fix various warnings in inflib (thanks to Ged for help with what appears to be a gcc bug in push_token) - Disable useless gcc warning in libjpeg - Fix a 64-bit warning in pefixup
by sginsberg＠svn.reactos.org 10 Sep '09

10 Sep '09

Author: sginsberg Date: Thu Sep 10 19:41:44 2009 New Revision: 43024 URL: http://svn.reactos.org/svn/reactos?rev=43024&view=rev Log: - Fix various warnings in inflib (thanks to Ged for help with what appears to be a gcc bug in push_token) - Disable useless gcc warning in libjpeg - Fix a 64-bit warning in pefixup Modified: trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild trunk/reactos/lib/inflib/infcore.c trunk/reactos/lib/inflib/infget.c trunk/reactos/lib/inflib/infpriv.h trunk/reactos/lib/inflib/infput.c trunk/reactos/tools/pefixup.c Modified: trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/libjp… ============================================================================== --- trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild [iso-8859-1] Thu Sep 10 19:41:44 2009 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="libjpeg" type="win32dll" entrypoint="0" installbase="system32" installname="libjpeg.dll" allowwarnings="true" crt="msvcrt"> + <compilerflag compilerset="gcc">-Wno-main</compilerflag> <define name="WIN32" /> <define name="_WINDOWS" /> <define name="_MBCS" /> Modified: trunk/reactos/lib/inflib/infcore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infcore.c?rev=4… ============================================================================== --- trunk/reactos/lib/inflib/infcore.c [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infcore.c [iso-8859-1] Thu Sep 10 19:41:44 2009 @@ -48,7 +48,7 @@ PINFCACHESECTION cur_section; /* pointer to the section being parsed*/ PINFCACHELINE line; /* current line */ unsigned int line_pos; /* current line position in file */ - unsigned int error; /* error code */ + INFSTATUS error; /* error code */ unsigned int token_len; /* current token len */ TCHAR token[MAX_FIELD_LEN+1]; /* current token */ }; @@ -391,7 +391,17 @@ parser->token_len += len; for ( ; len > 0; len--, dst++, src++) - *dst = *src ? (TCHAR)*src : L' '; + { + if (*src) + { + *dst = *src; + } + else + { + *dst = _T(' '); + } + } + *dst = 0; parser->start = pos; @@ -808,7 +818,7 @@ { if (error_line) *error_line = parser.line_pos; - return (INFSTATUS)parser.error; + return parser.error; } /* find the [strings] section */ Modified: trunk/reactos/lib/inflib/infget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infget.c?rev=43… ============================================================================== --- trunk/reactos/lib/inflib/infget.c [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infget.c [iso-8859-1] Thu Sep 10 19:41:44 2009 @@ -305,7 +305,7 @@ Ptr = CacheField->Data; } - *IntegerValue = _tcstol(Ptr, NULL, 0); + *IntegerValue = (LONG)_tcstol(Ptr, NULL, 0); return INF_STATUS_SUCCESS; } @@ -348,7 +348,7 @@ Size = 0; while (FieldPtr != NULL) { - Size += (_tcslen (FieldPtr->Data) + 1); + Size += ((ULONG)_tcslen (FieldPtr->Data) + 1); FieldPtr = FieldPtr->Next; } Size++; @@ -366,7 +366,7 @@ FieldPtr = CacheField; while (FieldPtr != NULL) { - Size = _tcslen (FieldPtr->Data) + 1; + Size = (ULONG)_tcslen (FieldPtr->Data) + 1; _tcscpy (Ptr, FieldPtr->Data); @@ -420,7 +420,7 @@ Ptr = CacheField->Data; } - Size = _tcslen (Ptr) + 1; + Size = (ULONG)_tcslen (Ptr) + 1; if (RequiredSize != NULL) *RequiredSize = Size; Modified: trunk/reactos/lib/inflib/infpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infpriv.h?rev=4… ============================================================================== --- trunk/reactos/lib/inflib/infpriv.h [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infpriv.h [iso-8859-1] Thu Sep 10 19:41:44 2009 @@ -13,11 +13,11 @@ #define FIELD_OFFSET(t,f) ((ptrdiff_t)&(((t*)0)->f)) #endif -#define INF_STATUS_INSUFFICIENT_RESOURCES (0xC000009A) -#define INF_STATUS_BAD_SECTION_NAME_LINE (0xC0700001) -#define INF_STATUS_SECTION_NAME_TOO_LONG (0xC0700002) -#define INF_STATUS_WRONG_INF_STYLE (0xC0700003) -#define INF_STATUS_NOT_ENOUGH_MEMORY (0xC0700004) +#define INF_STATUS_INSUFFICIENT_RESOURCES ((INFSTATUS)0xC000009A) +#define INF_STATUS_BAD_SECTION_NAME_LINE ((INFSTATUS)0xC0700001) +#define INF_STATUS_SECTION_NAME_TOO_LONG ((INFSTATUS)0xC0700002) +#define INF_STATUS_WRONG_INF_STYLE ((INFSTATUS)0xC0700003) +#define INF_STATUS_NOT_ENOUGH_MEMORY ((INFSTATUS)0xC0700004) typedef struct _INFCACHEFIELD { Modified: trunk/reactos/lib/inflib/infput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infput.c?rev=43… ============================================================================== --- trunk/reactos/lib/inflib/infput.c [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infput.c [iso-8859-1] Thu Sep 10 19:41:44 2009 @@ -37,7 +37,7 @@ } /* Doesn't fit? */ - Length = _tcslen(Text); + Length = (ULONG)_tcslen(Text); if (OutBuf->FreeSize < Length + 1 && INF_SUCCESS(OutBuf->Status)) { DPRINT("Out of free space. TotalSize %u FreeSize %u Length %u\n", @@ -145,8 +145,8 @@ NeedQuotes = FALSE; while (_T('\0') != *p && ! NeedQuotes) { - NeedQuotes = _T(',') == *p || _T(';') == *p || - _T('\\') == *p; + NeedQuotes = (BOOLEAN)(_T(',') == *p || _T(';') == *p || + _T('\\') == *p); p++; } if (NeedQuotes) Modified: trunk/reactos/tools/pefixup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pefixup.c?rev=43024&… ============================================================================== --- trunk/reactos/tools/pefixup.c [iso-8859-1] (original) +++ trunk/reactos/tools/pefixup.c [iso-8859-1] Thu Sep 10 19:41:44 2009 @@ -39,6 +39,7 @@ typedef unsigned short WORD; typedef unsigned int DWORD; typedef int LONG; +typedef long LONG_PTR; #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 #define IMAGE_SIZEOF_SHORT_NAME 8 @@ -46,7 +47,7 @@ #define IMAGE_NT_SIGNATURE 0x00004550 #define IMAGE_SCN_MEM_DISCARDABLE 0x2000000 #define IMAGE_SCN_MEM_NOT_PAGED 0x8000000 -#define FIELD_OFFSET(t,f) ((LONG)&(((t*)0)->f)) +#define FIELD_OFFSET(t,f) ((LONG)(LONG_PTR)&(((t*)0)->f)) #define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((unsigned long)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEADERS)(h))->FileHeader.SizeOfOptionalHeader)) #define IMAGE_DIRECTORY_ENTRY_EXPORT 0

1 0

[janderwald] 43023: - A few header updates
by janderwald＠svn.reactos.org 10 Sep '09

10 Sep '09

Author: janderwald Date: Thu Sep 10 11:52:40 2009 New Revision: 43023 URL: http://svn.reactos.org/svn/reactos?rev=43023&view=rev Log: - A few header updates Modified: trunk/reactos/include/ddk/dmusicks.h trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/dmusicks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmusicks.h?rev… ============================================================================== --- trunk/reactos/include/ddk/dmusicks.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/dmusicks.h [iso-8859-1] Thu Sep 10 11:52:40 2009 @@ -45,12 +45,7 @@ DECLARE_INTERFACE_(IMasterClock,IUnknown) { - STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ - REFIID InterfaceId, - PVOID* Interface - ) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; + DEFINE_ABSTRACT_UNKNOWN() STDMETHOD_(NTSTATUS,GetTime)( THIS_ OUT REFERENCE_TIME * pTime @@ -58,6 +53,11 @@ }; typedef IMasterClock *PMASTERCLOCK; + +#define IMP_IMasterClock \ + STDMETHODIMP_(NTSTATUS) GetTime( \ + OUT REFERENCE_TIME * pTime \ + ) /* =============================================================== IMXF Interface @@ -69,30 +69,47 @@ struct IMXF; typedef struct IMXF *PMXF; +#define DEFINE_ABSTRACT_IMXF() \ + STDMETHOD_(NTSTATUS,SetState)(THIS_ \ + IN KSSTATE State \ + ) PURE; \ + STDMETHOD_(NTSTATUS,PutMessage) \ + ( THIS_ \ + IN PDMUS_KERNEL_EVENT pDMKEvt \ + ) PURE; \ + STDMETHOD_(NTSTATUS,ConnectOutput) \ + ( THIS_ \ + IN PMXF sinkMXF \ + ) PURE; \ + STDMETHOD_(NTSTATUS,DisconnectOutput) \ + ( THIS_ \ + IN PMXF sinkMXF \ + ) PURE; + +#define IMP_IMXF \ + STDMETHODIMP_(NTSTATUS) SetState \ + ( \ + IN KSSTATE State \ + ); \ + STDMETHODIMP_(NTSTATUS) PutMessage \ + ( THIS_ \ + IN PDMUS_KERNEL_EVENT pDMKEvt \ + ); \ + STDMETHODIMP_(NTSTATUS) ConnectOutput \ + ( THIS_ \ + IN PMXF sinkMXF \ + ); \ + STDMETHODIMP_(NTSTATUS) DisconnectOutput \ + ( THIS_ \ + IN PMXF sinkMXF \ + ) + + DECLARE_INTERFACE_(IMXF,IUnknown) { - STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ - REFIID InterfaceId, - PVOID* Interface - ) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - - STDMETHOD_(NTSTATUS,SetState)(THIS_ - IN KSSTATE State - ) PURE; - STDMETHOD_(NTSTATUS,PutMessage) - ( THIS_ - IN PDMUS_KERNEL_EVENT pDMKEvt - ) PURE; - STDMETHOD_(NTSTATUS,ConnectOutput) - ( THIS_ - IN PMXF sinkMXF - ) PURE; - STDMETHOD_(NTSTATUS,DisconnectOutput) - ( THIS_ - IN PMXF sinkMXF - ) PURE; + DEFINE_ABSTRACT_UNKNOWN() + + DEFINE_ABSTRACT_IMXF() }; /* =============================================================== @@ -105,30 +122,17 @@ struct IAllocatorMXF; typedef struct IAllocatorMXF *PAllocatorMXF; -DECLARE_INTERFACE_(IAllocatorMXF,IMXF) -{ - STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ - REFIID InterfaceId, - PVOID* Interface - ) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - - STDMETHOD_(NTSTATUS,SetState)(THIS_ - IN KSSTATE State - ) PURE; - STDMETHOD_(NTSTATUS,PutMessage) - ( THIS_ - IN PDMUS_KERNEL_EVENT pDMKEvt - ) PURE; - STDMETHOD_(NTSTATUS,ConnectOutput) - ( THIS_ - IN PMXF sinkMXF - ) PURE; - STDMETHOD_(NTSTATUS,DisconnectOutput) - ( THIS_ - IN PMXF sinkMXF - ) PURE; +#define STATIC_IID_IAllocatorMXF\ + 0xa5f0d62c, 0xb30f, 0x11d2, 0xb7, 0xa3, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1 +DEFINE_GUIDSTRUCT("a5f0d62c-b30f-11d2-b7a3-0060083316c1", IID_IAllocatorMXF); +#define IID_IAllocatorMXF DEFINE_GUIDNAMED(IID_IAllocatorMXF) + + +DECLARE_INTERFACE_(IAllocatorMXF, IMXF) +{ + DEFINE_ABSTRACT_UNKNOWN() + + DEFINE_ABSTRACT_IMXF() STDMETHOD_(NTSTATUS,GetMessage)(THIS_ OUT PDMUS_KERNEL_EVENT * ppDMKEvt @@ -145,6 +149,21 @@ ) PURE; }; +#define IMP_IAllocatorMXF \ + IMP_IMXF; \ + STDMETHODIMP_(NTSTATUS) GetMessage( \ + OUT PDMUS_KERNEL_EVENT * ppDMKEvt \ + ); \ + \ + STDMETHODIMP_(USHORT) GetBufferSize(void); \ + \ + STDMETHODIMP_(NTSTATUS) GetBuffer( \ + OUT PBYTE * ppBuffer \ + ); \ + \ + STDMETHODIMP_(NTSTATUS) PutBuffer( \ + IN PBYTE pBuffer \ + ) #undef INTERFACE #define INTERFACE IPortDMus @@ -154,35 +173,10 @@ DECLARE_INTERFACE_(IPortDMus, IPort) { - STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ - REFIID InterfaceId, - PVOID* Interface - ) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - - STDMETHOD_(NTSTATUS,Init)(THIS_ - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PUNKNOWN UnknownMiniport, - IN PUNKNOWN UnknownAdapter OPTIONAL, - IN PRESOURCELIST ResourceList - )PURE; - STDMETHOD_(NTSTATUS,GetDeviceProperty)(THIS_ - IN DEVICE_REGISTRY_PROPERTY DeviceProperty, - IN ULONG BufferLength, - OUT PVOID PropertyBuffer, - OUT PULONG ResultLength - )PURE; - STDMETHOD_(NTSTATUS,NewRegistryKey)(THIS_ - OUT PREGISTRYKEY * OutRegistryKey, - IN PUNKNOWN OuterUnknown, - IN ULONG RegistryKeyType, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN ULONG CreateOptions OPTIONAL, - OUT PULONG Disposition OPTIONAL - )PURE; + DEFINE_ABSTRACT_UNKNOWN() + + DEFINE_ABSTRACT_PORT() + STDMETHOD_(void,Notify)(THIS_ IN PSERVICEGROUP ServiceGroup OPTIONAL )PURE; @@ -193,7 +187,15 @@ }; typedef IPortDMus *PPORTDMUS; - +#define IMP_IPortDMus \ + IMP_IPort; \ + STDMETHODIMP_(void) Notify( \ + IN PSERVICEGROUP ServiceGroup OPTIONAL \ + ); \ + \ + STDMETHODIMP_(void) RegisterServiceGroup( \ + IN PSERVICEGROUP ServiceGroup \ + ) #undef INTERFACE #define INTERFACE IMiniportDMus @@ -201,24 +203,10 @@ DEFINE_GUID(IID_IMiniportDMus, 0xc096df9d, 0xfb09, 0x11d1, 0x81, 0xb0, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1); DECLARE_INTERFACE_(IMiniportDMus, IMiniport) { - STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ - REFIID InterfaceId, - PVOID* Interface - ) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - - STDMETHOD_(NTSTATUS,GetDescription)(THIS_ - OUT PPCFILTER_DESCRIPTOR * Description - ) 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; + DEFINE_ABSTRACT_UNKNOWN() + + DEFINE_ABSTRACT_MINIPORT() + STDMETHOD_(NTSTATUS,Init)(THIS_ IN PUNKNOWN UnknownAdapter, @@ -246,9 +234,28 @@ typedef IMiniportDMus *PMINIPORTDMUS; #undef INTERFACE -#define STATIC_IID_IAllocatorMXF\ - 0xa5f0d62c, 0xb30f, 0x11d2, 0xb7, 0xa3, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1 -DEFINE_GUIDSTRUCT("a5f0d62c-b30f-11d2-b7a3-0060083316c1", IID_IAllocatorMXF); -#define IID_IAllocatorMXF DEFINE_GUIDNAMED(IID_IAllocatorMXF) +#define IMP_IMiniportDMus \ + IMP_IMiniport; \ + STDMETHODIMP_(NTSTATUS) Init( \ + IN PUNKNOWN UnknownAdapter, \ + IN PRESOURCELIST ResourceList, \ + IN PPORTDMUS Port, \ + OUT PSERVICEGROUP * ServiceGroup \ + ); \ + \ + STDMETHODIMP_(void) Service(THIS); \ + \ + STDMETHODIMP_(NTSTATUS) NewStream( \ + OUT PMXF * MXF, \ + IN PUNKNOWN OuterUnknown, \ + IN POOL_TYPE PoolType, \ + IN ULONG PinID, \ + IN DMUS_STREAM_TYPE StreamType, \ + IN PKSDATAFORMAT DataFormat, \ + OUT PSERVICEGROUP * ServiceGroup, \ + IN PAllocatorMXF AllocatorMXF, \ + IN PMASTERCLOCK MasterClock, \ + OUT PULONGLONG SchedulePreFetch \ + ) #endif Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Thu Sep 10 11:52:40 2009 @@ -665,6 +665,11 @@ typedef IUnregisterSubdevice *PUNREGISTERSUBDEVICE; +#define IMP_IUnregisterSubdevice \ + STDMETHODIMP_(NTSTATUS) UnregisterSubdevice(THIS_ \ + IN PDEVICE_OBJECT DeviceObject, \ + IN PUNKNOWN Unknown) + /* =============================================================== IUnregisterPhysicalConnection Interface */ @@ -703,6 +708,29 @@ typedef IUnregisterPhysicalConnection *PUNREGISTERPHYSICALCONNECTION; #endif +#define IMP_IUnregisterPhysicalConnection \ + STDMETHODIMP_(NTSTATUS) UnregisterPhysicalConnection( \ + IN PDEVICE_OBJECT DeviceObject, \ + IN PUNKNOWN FromUnknown, \ + IN ULONG FromPin, \ + IN PUNKNOWN ToUnknown, \ + IN ULONG ToPin); \ + \ + STDMETHODIMP_(NTSTATUS) UnregisterPhysicalConnectionToExternal( \ + IN PDEVICE_OBJECT DeviceObject, \ + IN PUNKNOWN FromUnknown, \ + IN ULONG FromPin, \ + IN PUNICODE_STRING ToString, \ + IN ULONG ToPin); \ + \ + STDMETHODIMP_(NTSTATUS) UnregisterPhysicalConnectionFromExternal( \ + IN PDEVICE_OBJECT DeviceObject, \ + IN PUNICODE_STRING FromString, \ + IN ULONG FromPin, \ + IN PUNKNOWN ToUnknown, \ + IN ULONG ToPin) + + /* =============================================================== IDmaChannel Interface */ @@ -735,33 +763,33 @@ IN PVOID Source, \ IN ULONG ByteCount) PURE; -#define IMP_IDmaChannel() \ - STDMETHODIMP_(NTSTATUS) AllocateBuffer( \ - IN ULONG BufferSize, \ - IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL); \ -\ - STDMETHODIMP_(void) FreeBuffer(void); \ - STDMETHODIMP_(ULONG) TransferCount(void); \ - STDMETHODIMP_(ULONG) MaximumBufferSize(void); \ - STDMETHODIMP_(ULONG) AllocatedBufferSize(void); \ - STDMETHODIMP_(ULONG) BufferSize(void); \ -\ - STDMETHODIMP_(void) SetBufferSize)( \ - IN ULONG BufferSize); \ -\ - STDMETHODIMP_(PVOID) SystemAddress(void); \ - STDMETHODIMP_(PHYSICAL_ADDRESS) PhysicalAddress(void); \ - STDMETHODIMP_(PADAPTER_OBJECT) GetAdapterObject(void); \ -\ - STDMETHODIMP_(void) CopyTo( \ - IN PVOID Destination, \ - IN PVOID Source, \ - IN ULONG ByteCount); \ -\ - STDMETHODIMP_(void) CopyFrom( \ - IN PVOID Destination, \ - IN PVOID Source, \ - IN ULONG ByteCount); +#define IMP_IDmaChannel \ + STDMETHODIMP_(NTSTATUS) AllocateBuffer( \ + IN ULONG BufferSize, \ + IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL); \ + \ + STDMETHODIMP_(void) FreeBuffer(void); \ + STDMETHODIMP_(ULONG) TransferCount(void); \ + STDMETHODIMP_(ULONG) MaximumBufferSize(void); \ + STDMETHODIMP_(ULONG) AllocatedBufferSize(void); \ + STDMETHODIMP_(ULONG) BufferSize(void); \ + \ + STDMETHODIMP_(void) SetBufferSize( \ + IN ULONG BufferSize); \ + \ + STDMETHODIMP_(PVOID) SystemAddress(void); \ + STDMETHODIMP_(PHYSICAL_ADDRESS) PhysicalAddress(void); \ + STDMETHODIMP_(PADAPTER_OBJECT) GetAdapterObject(void); \ + \ + STDMETHODIMP_(void) CopyTo( \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount); \ + \ + STDMETHODIMP_(void) CopyFrom( \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount) #undef INTERFACE #define INTERFACE IDmaChannel @@ -792,16 +820,17 @@ STDMETHOD_(NTSTATUS, WaitForTC)( THIS_ \ ULONG Timeout) PURE; -#define IMP_IDmaChannelSlave \ - STDMETHODIMP_(NTSTATUS) Start( \ - IN ULONG MapSize, \ - IN BOOLEAN WriteToDevice); \ -\ - STDMETHODIMP_(NTSTATUS) Stop(void); \ - STDMETHODIMP_(ULONG) ReadCounter)(void); \ -\ - STDMETHODIMP_(NTSTATUS, WaitForTC)( \ - ULONG Timeout); +#define IMP_IDmaChannelSlave \ + IMP_IDmaChannel; \ + STDMETHODIMP_(NTSTATUS) Start( \ + IN ULONG MapSize, \ + IN BOOLEAN WriteToDevice); \ + \ + STDMETHODIMP_(NTSTATUS) Stop(void); \ + STDMETHODIMP_(ULONG) ReadCounter(void); \ + \ + STDMETHODIMP_(NTSTATUS) WaitForTC( \ + ULONG Timeout) #undef INTERFACE #define INTERFACE IDmaChannelSlave @@ -863,19 +892,19 @@ DEFINE_GUID(IID_IInterruptSync, 0x22C6AC63L, 0x851B, 0x11D0, 0x9A, 0x7F, 0x00, 0xAA, 0x00, 0x38, 0xAC, 0xFE); -#define IMP_IInterruptSync \ - STDMETHODIMP_(NTSTATUS, CallSynchronizedRoutine)( \ - IN PINTERRUPTSYNCROUTINE Routine, \ - IN PVOID DynamicContext); \ -\ - STDMETHODIMP_(PKINTERRUPT, GetKInterrupt)(void); \ - STDMETHODIMP_(NTSTATUS, Connect)(void); \ - STDMETHODIMP_(void, Disconnect)(void); \ -\ - STDMETHODIMP_(NTSTATUS, RegisterServiceRoutine)( \ - IN PINTERRUPTSYNCROUTINE Routine, \ - IN PVOID DynamicContext, \ - IN BOOLEAN First); +#define IMP_IInterruptSync \ + STDMETHODIMP_(NTSTATUS) CallSynchronizedRoutine( \ + IN PINTERRUPTSYNCROUTINE Routine, \ + IN PVOID DynamicContext); \ + \ + STDMETHODIMP_(PKINTERRUPT) GetKInterrupt(void); \ + STDMETHODIMP_(NTSTATUS) Connect(void); \ + STDMETHODIMP_(void) Disconnect(void); \ + \ + STDMETHODIMP_(NTSTATUS) RegisterServiceRoutine( \ + IN PINTERRUPTSYNCROUTINE Routine, \ + IN PVOID DynamicContext, \ + IN BOOLEAN First) typedef IInterruptSync *PINTERRUPTSYNC; @@ -1059,28 +1088,31 @@ IN ULONG CreateOptiona OPTIONAL, \ OUT PULONG Disposition OPTIONAL) PURE; -#define IMP_IPort() \ - STDMETHODIMP_(NTSTATUS) Init( \ - IN PDEVICE_OBJECT DeviceObject, \ - IN PIRP Irp, \ - IN PUNKNOWN UnknownMiniport, \ - IN PUNKNOWN UnknownAdapter OPTIONAL, \ - IN PRESOURCELIST ResourceList); \ -\ - STDMETHODIMP_(NTSTATUS) GetDeviceProperty( \ - IN DEVICE_REGISTRY_PROPERTY DeviceProperty, \ - IN ULONG BufferLength, \ - OUT PVOID PropertyBuffer, \ - OUT PULONG ResultLength); \ -\ - STDMETHODIMP_(NTSTATUS) NewRegistryKey( \ - OUT PREGISTRYKEY* OutRegistryKey, \ - IN PUNKNOWN OuterUnknown OPTIONAL, \ - IN ULONG RegistryKeyType, \ - IN ACCESS_MASK DesiredAccess, \ - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, \ - IN ULONG CreateOptiona OPTIONAL, \ - OUT PULONG Disposition OPTIONAL); +#ifdef PC_IMPLEMENTATION +#define IMP_IPort\ + STDMETHODIMP_(NTSTATUS) Init\ + ( IN PDEVICE_OBJECT DeviceObject,\ + IN PIRP Irp,\ + IN PUNKNOWN UnknownMiniport,\ + IN PUNKNOWN UnknownAdapter OPTIONAL,\ + IN PRESOURCELIST ResourceList\ + );\ + STDMETHODIMP_(NTSTATUS) GetDeviceProperty\ + ( IN DEVICE_REGISTRY_PROPERTY DeviceProperty,\ + IN ULONG BufferLength,\ + OUT PVOID PropertyBuffer,\ + OUT PULONG ResultLength\ + );\ + STDMETHODIMP_(NTSTATUS) NewRegistryKey\ + ( OUT PREGISTRYKEY * OutRegistryKey,\ + IN PUNKNOWN OuterUnknown OPTIONAL,\ + IN ULONG RegistryKeyType,\ + IN ACCESS_MASK DesiredAccess,\ + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL,\ + IN ULONG CreateOptions OPTIONAL,\ + OUT PULONG Disposition OPTIONAL\ + ) +#endif #undef INTERFACE #define INTERFACE IPort @@ -1171,6 +1203,33 @@ }; typedef IPortWaveCyclic *PPORTWAVECYCLIC; + +#ifdef PC_IMPLEMENTATION +#define IMP_IPortWaveCyclic \ + IMP_IPort; \ + STDMETHODIMP_(VOID) Notify( \ + IN PSERVICEGROUP ServiceGroup); \ + \ + STDMETHODIMP_(NTSTATUS) NewSlaveDmaChannel( \ + OUT PDMACHANNELSLAVE* DmaChannel, \ + IN PUNKNOWN OuterUnknown, \ + IN PRESOURCELIST ResourceList OPTIONAL, \ + IN ULONG DmaIndex, \ + IN ULONG MaximumLength, \ + IN BOOL DemandMode, \ + IN DMA_SPEED DmaSpeed); \ + \ + STDMETHODIMP_(NTSTATUS) NewMasterDmaChannel( \ + OUT PDMACHANNEL* DmaChannel, \ + IN PUNKNOWN OuterUnknown, \ + IN PRESOURCELIST ResourceList OPTIONAL, \ + IN ULONG MaximumLength, \ + IN BOOL Dma32BitAddresses, \ + IN BOOL Dma64BitAddresses, \ + IN DMA_WIDTH DmaWidth, \ + IN DMA_SPEED DmaSpeed) +#endif + #undef INTERFACE /* =============================================================== @@ -1210,6 +1269,26 @@ typedef IPortWavePci *PPORTWAVEPCI; #undef INTERFACE +#ifdef PC_IMPLEMENTATION +#define IMP_IPortWavePci \ + IMP_IPort; \ + STDMETHODIMP_(VOID) Notify( \ + IN PSERVICEGROUP ServiceGroup); \ + \ + STDMETHODIMP_(NTSTATUS) NewMasterDmaChannel( \ + OUT PDMACHANNEL* DmaChannel, \ + IN PUNKNOWN OuterUnknown, \ + IN POOL_TYPE PoolType, \ + IN PRESOURCELIST ResourceList OPTIONAL, \ + IN BOOLEAN ScatterGather, \ + IN BOOLEAN Dma32BitAddresses, \ + IN BOOLEAN Dma64BitAddresses, \ + IN BOOLEAN IgnoreCount, \ + IN DMA_WIDTH DmaWidth, \ + IN DMA_SPEED DmaSpeed, \ + IN ULONG MaximumLength, \ + IN ULONG DmaPort); +#endif /* =============================================================== IMiniPort Interface @@ -1230,17 +1309,17 @@ OUT PVOID ResultantFormat OPTIONAL, \ OUT PULONG ResultantFormatLength) PURE; -#define IMP_IMiniport \ - STDMETHODIMP_(NTSTATUS) GetDescription( \ - OUT PPCFILTER_DESCRIPTOR* Description); \ -\ - STDMETHODIMP_(NTSTATUS) DataRangeIntersection( \ - IN ULONG PinId, \ - IN PKSDATARANGE DataRange, \ - IN PKSDATARANGE MatchingDataRange, \ - IN ULONG OutputBufferLength, \ - OUT PVOID ResultantFormat OPTIONAL, \ - OUT PULONG ResultantFormatLength); +#define IMP_IMiniport \ + STDMETHODIMP_(NTSTATUS) GetDescription( \ + OUT PPCFILTER_DESCRIPTOR* Description); \ + \ + STDMETHODIMP_(NTSTATUS) DataRangeIntersection( \ + IN ULONG PinId, \ + IN PKSDATARANGE DataRange, \ + IN PKSDATARANGE MatchingDataRange, \ + IN ULONG OutputBufferLength, \ + OUT PVOID ResultantFormat OPTIONAL, \ + OUT PULONG ResultantFormatLength) DECLARE_INTERFACE_(IMiniport, IUnknown) { @@ -1523,6 +1602,20 @@ }; typedef IPortWavePciStream *PPORTWAVEPCISTREAM; + +#define IMP_IPortWavePciStream \ + STDMETHODIMP_(NTSTATUS) GetMapping( \ + IN PVOID Tag, \ + OUT PPHYSICAL_ADDRESS PhysicalAddress, \ + OUT PVOID * VirtualAddress, \ + OUT PULONG ByteCount, \ + OUT PULONG Flags); \ + \ + STDMETHODIMP_(NTSTATUS) ReleaseMapping( \ + IN PVOID Tag); \ + \ + STDMETHODIMP_(NTSTATUS) TerminatePacket(THIS) + /* =============================================================== IMiniportWavePciStream Interface @@ -1668,6 +1761,10 @@ typedef IPortWaveRT *PPORTWAVERT; +#ifdef PC_IMPLEMENTATION +#define IMP_IPortWaveRT IMP_IPort +#endif + /* =============================================================== IPortWaveRTStream Interface @@ -1940,6 +2037,18 @@ typedef IPortEvents *PPORTEVENTS; + +#define IMP_IPortEvents \ + STDMETHODIMP_(void) AddEventToEventList( \ + IN PKSEVENT_ENTRY EventEntry); \ + \ + STDMETHODIMP_(void) GenerateEventList( \ + IN GUID* Set OPTIONAL, \ + IN ULONG EventId, \ + IN BOOL PinEvent, \ + IN ULONG PinId, \ + IN BOOL NodeEvent, \ + IN ULONG NodeId) /* =============================================================== IDrmPort / IDrmPort2 Interfaces @@ -1983,6 +2092,29 @@ typedef IDrmPort *PDRMPORT; +#define IMP_IDrmPort \ + STDMETHODIMP_(NTSTATUS) CreateContentMixed( \ + IN PULONG paContentId, \ + IN ULONG cContentId, \ + OUT PULONG pMixedContentId); \ + \ + STDMETHODIMP_(NTSTATUS) DestroyContent( \ + IN ULONG ContentId); \ + \ + STDMETHODIMP_(NTSTATUS) ForwardContentToFileObject( \ + IN ULONG ContentId, \ + IN PFILE_OBJECT FileObject); \ + \ + STDMETHODIMP_(NTSTATUS) ForwardContentToInterface( \ + IN ULONG ContentId, \ + IN PUNKNOWN pUnknown, \ + IN ULONG NumMethods); \ + \ + STDMETHODIMP_(NTSTATUS) GetContentRights( \ + IN ULONG ContentId, \ + OUT PDRMRIGHTS DrmRights) + + /* =============================================================== IDrmPort2 Interface */ @@ -2011,6 +2143,19 @@ }; typedef IDrmPort2 *PDRMPORT2; + +#define IMP_IDrmPort2 \ + IMP_IDrmPort; \ + STDMETHODIMP_(NTSTATUS) AddContentHandlers( \ + IN ULONG ContentId, \ + IN PVOID * paHandlers, \ + IN ULONG NumHandlers); \ + \ + STDMETHODIMP_(NTSTATUS) ForwardContentToDeviceObject( \ + IN ULONG ContentId, \ + IN PVOID Reserved, \ + IN PCDRMFORWARD DrmForward) + /* =============================================================== IPortClsVersion Interface

1 0

[dgorbachev] 43022: Correct the terms for measurement systems. Love Nystrom (lovenystrom]at[hotmail]dot[com), bug #4838.
by dgorbachev＠svn.reactos.org 10 Sep '09

10 Sep '09

Author: dgorbachev Date: Thu Sep 10 07:11:55 2009 New Revision: 43022 URL: http://svn.reactos.org/svn/reactos?rev=43022&view=rev Log: Correct the terms for measurement systems. Love Nystrom (lovenystrom]at[hotmail]dot[com), bug #4838. Modified: trunk/reactos/dll/cpl/intl/numbers.c Modified: trunk/reactos/dll/cpl/intl/numbers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/numbers.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl/numbers.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/numbers.c [iso-8859-1] Thu Sep 10 07:11:55 2009 @@ -59,7 +59,7 @@ static LPTSTR lpListSepSamples[MAX_LIST_SEP_SAMPLES] = {_T(";")}; static LPTSTR lpUnitsSysSamples[MAX_UNITS_SYS_SAMPLES] = - {_T("Metrics"), _T("Americans")}; + {_T("Metric"), _T("Imperial")}; /* Init num decimal separator control box */

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