Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 35953: fix x64 build of hal
by tkreuzer＠svn.reactos.org 04 Sep '08

04 Sep '08

Author: tkreuzer Date: Thu Sep 4 16:24:44 2008 New Revision: 35953 URL: http://svn.reactos.org/svn/reactos?rev=35953&view=rev Log: fix x64 build of hal Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def [iso-8859-1] Thu Sep 4 16:24:44 2008 @@ -14,9 +14,9 @@ HalCalibratePerformanceCounter HalClearSoftwareInterrupt ;HalConvertDeviceIdtToIrql -HalDisableInterrupt +;HalDisableInterrupt HalDisplayString -HalEnableInterrupt +;HalEnableInterrupt ;HalEnumerateEnvironmentVariablesEx ;HalEnumerateProcessors HalFlushCommonBuffer @@ -52,7 +52,7 @@ HalRequestSoftwareInterrupt HalReturnToFirmware ;HalSendNMI -HalSendSoftwareInterrupt +;HalSendSoftwareInterrupt HalSetBusData HalSetBusDataByOffset HalSetDisplayParameters

1 0

[tkreuzer] 35952: fix a typo
by tkreuzer＠svn.reactos.org 04 Sep '08

04 Sep '08

Author: tkreuzer Date: Thu Sep 4 16:22:14 2008 New Revision: 35952 URL: http://svn.reactos.org/svn/reactos?rev=35952&view=rev Log: fix a typo Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Thu Sep 4 16:22:14 2008 @@ -788,7 +788,7 @@ typedef struct _KEXCEPTION_FRAME KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; // -// Macro to get current KPRCB +// Inline function to get current KPRCB // FORCEINLINE struct _KPRCB *

1 0

[tkreuzer] 35951: Remove hacks from __addgsbyte, __addgsword, __addgsdword. They are correct on ms compiler. (fs ones still broken on x86 compiler that comes with the wdk). Implement __addgsqword.
by tkreuzer＠svn.reactos.org 04 Sep '08

04 Sep '08

Author: tkreuzer Date: Thu Sep 4 15:55:46 2008 New Revision: 35951 URL: http://svn.reactos.org/svn/reactos?rev=35951&view=rev Log: Remove hacks from __addgsbyte, __addgsword, __addgsdword. They are correct on ms compiler. (fs ones still broken on x86 compiler that comes with the wdk). Implement __addgsqword. Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Thu Sep 4 15:55:46 2008 @@ -650,29 +650,24 @@ __asm__ __volatile__("incl %%gs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); } -/* NOTE: the bizarre implementation of __addgsxxx mimics the broken Visual C++ behavior */ static __inline__ __attribute__((always_inline)) void __addgsbyte(const unsigned long Offset, const unsigned char Data) { - if(!__builtin_constant_p(Offset)) - __asm__ __volatile__("addb %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); - else - __asm__ __volatile__("addb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("addb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } static __inline__ __attribute__((always_inline)) void __addgsword(const unsigned long Offset, const unsigned short Data) { - if(!__builtin_constant_p(Offset)) - __asm__ __volatile__("addw %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); - else - __asm__ __volatile__("addw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("addw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } static __inline__ __attribute__((always_inline)) void __addgsdword(const unsigned long Offset, const unsigned int Data) { - if(!__builtin_constant_p(Offset)) - __asm__ __volatile__("addl %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); - else - __asm__ __volatile__("addl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("addl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); +} + +static __inline__ __attribute__((always_inline)) void __addgsqword(const unsigned long Offset, const unsigned __int64 Data) +{ + __asm__ __volatile__("addq %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } #else

1 0

[tkreuzer] 35950: implement __readeflags and __writeeflags
by tkreuzer＠svn.reactos.org 04 Sep '08

04 Sep '08

Author: tkreuzer Date: Thu Sep 4 14:39:29 2008 New Revision: 35950 URL: http://svn.reactos.org/svn/reactos?rev=35950&view=rev Log: implement __readeflags and __writeeflags Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Thu Sep 4 14:39:29 2008 @@ -1064,6 +1064,17 @@ return retval; } +static __inline__ __attribute__((always_inline)) void __writeeflags(uintptr_t Value) +{ + __asm__ __volatile__("push %0\n popf" : : "rim"(Value)); +} + +static __inline__ __attribute__((always_inline)) uintptr_t __readeflags(void) +{ + uintptr_t retval; + __asm__ __volatile__("pushf\n pop %0" : "=rm"(retval)); + return retval; +} /*** Interrupts ***/ static __inline__ __attribute__((always_inline)) void __debugbreak(void)

1 0

[tkreuzer] 35949: Revert the testcode I accidentally committed.
by tkreuzer＠svn.reactos.org 04 Sep '08

04 Sep '08

Author: tkreuzer Date: Thu Sep 4 14:36:48 2008 New Revision: 35949 URL: http://svn.reactos.org/svn/reactos?rev=35949&view=rev Log: Revert the testcode I accidentally committed. Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.c Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal/hal.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal/hal.c [iso-8859-1] Thu Sep 4 14:36:48 2008 @@ -38,9 +38,8 @@ PUNICODE_STRING RegistryPath) { UNIMPLEMENTED; -intptr_t y = __readeflags(); -__writeeflags(34); - return y;//STATUS_SUCCESS; + + return STATUS_SUCCESS; } /*

1 0

[tkreuzer] 35948: fix hal build on x86
by tkreuzer＠svn.reactos.org 04 Sep '08

04 Sep '08

Author: tkreuzer Date: Thu Sep 4 14:29:48 2008 New Revision: 35948 URL: http://svn.reactos.org/svn/reactos?rev=35948&view=rev Log: fix hal build on x86 Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.c Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal/hal.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal/hal.c [iso-8859-1] Thu Sep 4 14:29:48 2008 @@ -38,8 +38,9 @@ PUNICODE_STRING RegistryPath) { UNIMPLEMENTED; - - return STATUS_SUCCESS; +intptr_t y = __readeflags(); +__writeeflags(34); + return y;//STATUS_SUCCESS; } /* @@ -821,7 +822,7 @@ return Value; } -#if 0 +#ifndef _M_AMD64 #undef KeRaiseIrql VOID NTAPI

1 0

[tkreuzer] 35947: Don't use hal_generic_pc.rbuild. Remove obsolete hal.c. Add apic.c from x86 to build. Add some stubs.
by tkreuzer＠svn.reactos.org 04 Sep '08

04 Sep '08

Author: tkreuzer Date: Thu Sep 4 14:11:19 2008 New Revision: 35947 URL: http://svn.reactos.org/svn/reactos?rev=35947&view=rev Log: Don't use hal_generic_pc.rbuild. Remove obsolete hal.c. Add apic.c from x86 to build. Add some stubs. Added: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/mps.S (with props) Removed: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c Modified: branches/ros-amd64-bringup/reactos/hal/hal.rbuild branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def branches/ros-amd64-bringup/reactos/hal/halamd64/generic/generic.rbuild branches/ros-amd64-bringup/reactos/hal/halamd64/generic/irq.S branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_amd64.rbuild Modified: branches/ros-amd64-bringup/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] Thu Sep 4 14:11:19 2008 @@ -27,7 +27,6 @@ <if property="ARCH" value="amd64"> <directory name="halx86"> <xi:include href="halx86/hal_generic_amd64.rbuild" /> - <xi:include href="halx86/hal_generic_pc.rbuild" /> </directory> <directory name="halamd64"> <xi:include href="halamd64/directory.rbuild" /> Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def [iso-8859-1] Thu Sep 4 14:11:19 2008 @@ -14,9 +14,9 @@ HalCalibratePerformanceCounter HalClearSoftwareInterrupt ;HalConvertDeviceIdtToIrql -;HalDisableInterrupt +HalDisableInterrupt HalDisplayString -;HalEnableInterrupt +HalEnableInterrupt ;HalEnumerateEnvironmentVariablesEx ;HalEnumerateProcessors HalFlushCommonBuffer @@ -52,7 +52,7 @@ HalRequestSoftwareInterrupt HalReturnToFirmware ;HalSendNMI -;HalSendSoftwareInterrupt +HalSendSoftwareInterrupt HalSetBusData HalSetBusDataByOffset HalSetDisplayParameters Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/generic.rbuild [iso-8859-1] Thu Sep 4 14:11:19 2008 @@ -9,6 +9,7 @@ <file>halinit.c</file> <file>irq.S</file> <file>misc.c</file> + <file>mps.S</file> <file>systimer.S</file> <pch>../include/hal.h</pch> </module> Removed: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c (removed) @@ -1,781 +1,0 @@ -/* - * PROJECT: ReactOS HAL - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: hal/halarm/generic/hal.c - * PURPOSE: Hardware Abstraction Layer - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -/* INCLUDES *******************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> -#include <ndk/inbvfuncs.h> - -#define READ_REGISTER_ULONG(r) (*(volatile ULONG * const)(r)) -#define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG *)(r) = (v)) - -/* DATA **********************************************************************/ - -ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount; -ULONG _KdComPortInUse = 0; - -/* FUNCTIONS *****************************************************************/ - -NTSTATUS -NTAPI -DriverEntry( - PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) -{ - UNIMPLEMENTED; - - return STATUS_SUCCESS; -} - -/* -* @unimplemented -*/ -VOID -NTAPI -HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) -{ - KEBUGCHECK(0); - return; -} - -/* -* @unimplemented -*/ -VOID -NTAPI -HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) -{ - KEBUGCHECK(0); - return; -} - -/* -* @unimplemented -*/ -ULONG_PTR -NTAPI -HalSetProfileInterval(IN ULONG_PTR Interval) -{ - KEBUGCHECK(0); - return Interval; -} - -NTSTATUS -NTAPI -HalAdjustResourceList( - PCM_RESOURCE_LIST Resources) -{ - UNIMPLEMENTED; - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -BOOLEAN -NTAPI -HalAllProcessorsStarted(VOID) -{ - /* Do nothing */ - return TRUE; -} - - -NTSTATUS -NTAPI -HalAllocateAdapterChannel( - PADAPTER_OBJECT AdapterObject, - PWAIT_CONTEXT_BLOCK WaitContextBlock, - ULONG NumberOfMapRegisters, - PDRIVER_CONTROL ExecutionRoutine) -{ - UNIMPLEMENTED; - - return STATUS_SUCCESS; -} - - -PVOID -NTAPI -HalAllocateCommonBuffer( - PADAPTER_OBJECT AdapterObject, - ULONG Length, - PPHYSICAL_ADDRESS LogicalAddress, - BOOLEAN CacheEnabled) -{ - UNIMPLEMENTED; - - return NULL; -} - - -PVOID -NTAPI -HalAllocateCrashDumpRegisters( - PADAPTER_OBJECT AdapterObject, - PULONG NumberOfMapRegisters) -{ - UNIMPLEMENTED; - return NULL; -} - - -NTSTATUS -NTAPI -HalAssignSlotResources( - PUNICODE_STRING RegistryPath, - PUNICODE_STRING DriverClassName, - PDRIVER_OBJECT DriverObject, - PDEVICE_OBJECT DeviceObject, - INTERFACE_TYPE BusType, - ULONG BusNumber, - ULONG SlotNumber, - PCM_RESOURCE_LIST *AllocatedResources) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -BOOLEAN -NTAPI -HalBeginSystemInterrupt (KIRQL Irql, - ULONG Vector, - PKIRQL OldIrql) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -VOID -NTAPI -HalCalibratePerformanceCounter( - volatile LONG *Count, - ULONGLONG NewCount) -{ - UNIMPLEMENTED; -} - - -BOOLEAN -NTAPI -HalDisableSystemInterrupt( - ULONG Vector, - KIRQL Irql) -{ - UNIMPLEMENTED; - - return TRUE; -} - -VOID -NTAPI -HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters) -{ - // - // Stub since Windows XP implemented Inbv - // - return; -} - -VOID -NTAPI -HalDisplayString(IN PCH String) -{ - // - // Call the Inbv driver - // - InbvDisplayString(String); -} - -VOID -NTAPI -HalQueryDisplayParameters(OUT PULONG DispSizeX, - OUT PULONG DispSizeY, - OUT PULONG CursorPosX, - OUT PULONG CursorPosY) -{ - // - // Stub since Windows XP implemented Inbv - // - return; -} - -VOID -NTAPI -HalSetDisplayParameters(IN ULONG CursorPosX, - IN ULONG CursorPosY) -{ - // - // Stub since Windows XP implemented Inbv - // - return; -} - -BOOLEAN -NTAPI -HalEnableSystemInterrupt( - ULONG Vector, - KIRQL Irql, - KINTERRUPT_MODE InterruptMode) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -VOID -NTAPI -HalEndSystemInterrupt( - KIRQL Irql, - ULONG Unknown2) -{ - UNIMPLEMENTED; -} - - -BOOLEAN -NTAPI -HalFlushCommonBuffer( - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3, - ULONG Unknown4, - ULONG Unknown5) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -VOID -NTAPI -HalFreeCommonBuffer( - PADAPTER_OBJECT AdapterObject, - ULONG Length, - PHYSICAL_ADDRESS LogicalAddress, - PVOID VirtualAddress, - BOOLEAN CacheEnabled) -{ - UNIMPLEMENTED; -} - - -PADAPTER_OBJECT -NTAPI -HalGetAdapter( - PDEVICE_DESCRIPTION DeviceDescription, - PULONG NumberOfMapRegisters) -{ - UNIMPLEMENTED; - - return (PADAPTER_OBJECT)NULL; -} - - -ULONG -NTAPI -HalGetBusData( - BUS_DATA_TYPE BusDataType, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Length) -{ - UNIMPLEMENTED; - - return 0; -} - - -ULONG -NTAPI -HalGetBusDataByOffset( - BUS_DATA_TYPE BusDataType, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length) -{ - UNIMPLEMENTED; - - return 0; -} - - -ARC_STATUS -NTAPI -HalGetEnvironmentVariable( - PCH Name, - USHORT ValueLength, - PCH Value) -{ - UNIMPLEMENTED; - - return ENOENT; -} - - -ULONG -NTAPI -HalGetInterruptVector( - INTERFACE_TYPE InterfaceType, - ULONG BusNumber, - ULONG BusInterruptLevel, - ULONG BusInterruptVector, - PKIRQL Irql, - PKAFFINITY Affinity) -{ - UNIMPLEMENTED; - - return 0; -} - - -VOID -NTAPI -HalHandleNMI( - PVOID NmiData) -{ - UNIMPLEMENTED; -} - -VOID -NTAPI -HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PCHAR CommandLine; - - /* Make sure we have a loader block and command line */ - if ((LoaderBlock) && (LoaderBlock->LoadOptions)) - { - /* Read the command line */ - CommandLine = LoaderBlock->LoadOptions; - - /* Check for initial breakpoint */ - if (strstr(CommandLine, "BREAK")) DbgBreakPoint(); - } -} - -ULONG -HalGetInterruptSource(VOID) -{ - KEBUGCHECK(0); - return 0; -} - -VOID -HalpClockInterrupt(VOID) -{ - KEBUGCHECK(0); - return; -} - -VOID -HalpStallInterrupt(VOID) -{ - KEBUGCHECK(0); - return; -} - -VOID -HalpInitializeInterrupts(VOID) -{ - KEBUGCHECK(0); - return; -} - -/* - * @implemented - */ -BOOLEAN -NTAPI -HalInitSystem(IN ULONG BootPhase, - IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - KEBUGCHECK(0); - return; -} - - -VOID -NTAPI -HalInitializeProcessor(IN ULONG ProcessorNumber, - IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - // - // Nothing to do - // - return; -} - - -BOOLEAN -NTAPI -HalMakeBeep( - ULONG Frequency) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -VOID -NTAPI -HalProcessorIdle(VOID) -{ - UNIMPLEMENTED; -} - - -#define RTC_DATA (PVOID)0xE00E8000 - -BOOLEAN -NTAPI -HalQueryRealTimeClock(IN PTIME_FIELDS Time) -{ - KEBUGCHECK(0); - return TRUE; -} - -ULONG -NTAPI -HalReadDmaCounter( - PADAPTER_OBJECT AdapterObject) -{ - UNIMPLEMENTED; - - return 0; -} - - -VOID -NTAPI -HalReportResourceUsage(VOID) -{ - UNIMPLEMENTED; -} - - -VOID -NTAPI -HalRequestIpi( - KAFFINITY TargetSet) -{ - UNIMPLEMENTED; -} - - -VOID -FASTCALL -HalRequestSoftwareInterrupt(IN KIRQL Request) -{ - KEBUGCHECK(0); - return; -} - -VOID -FASTCALL -HalClearSoftwareInterrupt(IN KIRQL Request) -{ - KEBUGCHECK(0); - return; -} - -VOID -NTAPI -HalReturnToFirmware( - FIRMWARE_REENTRY Action) -{ - UNIMPLEMENTED; -} - - -ULONG -NTAPI -HalSetBusData( - BUS_DATA_TYPE BusDataType, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Length) -{ - UNIMPLEMENTED; - - return 0; -} - - -ULONG -NTAPI -HalSetBusDataByOffset( - BUS_DATA_TYPE BusDataType, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length) -{ - UNIMPLEMENTED; - - return 0; -} - - -ARC_STATUS -NTAPI -HalSetEnvironmentVariable( - PCH Name, - PCH Value) -{ - UNIMPLEMENTED; - - return ESUCCESS; -} - - -BOOLEAN -NTAPI -HalSetRealTimeClock( - PTIME_FIELDS Time) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -ULONG -NTAPI -HalSetTimeIncrement( - ULONG Increment) -{ - UNIMPLEMENTED; - - return Increment; -} - - -BOOLEAN -NTAPI -HalStartNextProcessor(IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PKPROCESSOR_STATE ProcessorState) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -ULONG -FASTCALL -HalSystemVectorDispatchEntry( - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3) -{ - UNIMPLEMENTED; - - return 0; -} - - -BOOLEAN -NTAPI -HalTranslateBusAddress( - INTERFACE_TYPE InterfaceType, - ULONG BusNumber, - PHYSICAL_ADDRESS BusAddress, - PULONG AddressSpace, - PPHYSICAL_ADDRESS TranslatedAddress) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -VOID -NTAPI -HalpAssignDriveLetters(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, - IN PSTRING NtDeviceName, - OUT PUCHAR NtSystemPath, - OUT PSTRING NtSystemPathString) -{ - /* Call the kernel */ - IoAssignDriveLetters(LoaderBlock, - NtDeviceName, - NtSystemPath, - NtSystemPathString); -} - -NTSTATUS -NTAPI -HalpReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN BOOLEAN ReturnRecognizedPartitions, - IN OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) -{ - /* Call the kernel */ - return IoReadPartitionTable(DeviceObject, - SectorSize, - ReturnRecognizedPartitions, - PartitionBuffer); -} - -NTSTATUS -NTAPI -HalpWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG SectorsPerTrack, - IN ULONG NumberOfHeads, - IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer) -{ - /* Call the kernel */ - return IoWritePartitionTable(DeviceObject, - SectorSize, - SectorsPerTrack, - NumberOfHeads, - PartitionBuffer); -} - -NTSTATUS -NTAPI -HalpSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG PartitionNumber, - IN ULONG PartitionType) -{ - /* Call the kernel */ - return IoSetPartitionInformation(DeviceObject, - SectorSize, - PartitionNumber, - PartitionType); -} - - -BOOLEAN -NTAPI -IoFlushAdapterBuffers( - PADAPTER_OBJECT AdapterObject, - PMDL Mdl, - PVOID MapRegisterBase, - PVOID CurrentVa, - ULONG Length, - BOOLEAN WriteToDevice) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -VOID -NTAPI -IoFreeAdapterChannel( - PADAPTER_OBJECT AdapterObject) -{ - UNIMPLEMENTED; -} - - -VOID -NTAPI -IoFreeMapRegisters( - PADAPTER_OBJECT AdapterObject, - PVOID MapRegisterBase, - ULONG NumberOfMapRegisters) -{ - UNIMPLEMENTED; -} - - -PHYSICAL_ADDRESS -NTAPI -IoMapTransfer( - PADAPTER_OBJECT AdapterObject, - PMDL Mdl, - PVOID MapRegisterBase, - PVOID CurrentVa, - PULONG Length, - BOOLEAN WriteToDevice) -{ - PHYSICAL_ADDRESS Address; - - UNIMPLEMENTED; - - Address.QuadPart = 0; - - return Address; -} - -VOID -NTAPI -KeFlushWriteBuffer(VOID) -{ - UNIMPLEMENTED; -} - -LARGE_INTEGER -NTAPI -KeQueryPerformanceCounter( - PLARGE_INTEGER PerformanceFreq) -{ - LARGE_INTEGER Value; - - UNIMPLEMENTED; - - Value.QuadPart = 0; - - return Value; -} - -VOID -NTAPI -KeStallExecutionProcessor(IN ULONG Microseconds) -{ - UNIMPLEMENTED; - return; -} - -BOOLEAN HalpProcessorIdentified; -BOOLEAN HalpTestCleanSupported; - -VOID -HalpIdentifyProcessor(VOID) -{ - UNIMPLEMENTED; - return; -} - -VOID -HalSweepDcache(VOID) -{ - UNIMPLEMENTED; - return; -} - -VOID -HalSweepIcache(VOID) -{ - UNIMPLEMENTED; - return; -} - -/* EOF */ Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/irq.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/irq.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/irq.S [iso-8859-1] Thu Sep 4 14:11:19 2008 @@ -34,13 +34,44 @@ .globl _HalpInitPICs .func _HalpInitPICs _HalpInitPICs: -UNIMPLEMENTED "HalpInitPICs" + UNIMPLEMENTED "HalpInitPICs" +.endfunc +.global _HalEnableInterrupt +.func _HalEnableInterrupt +_HalEnableInterrupt: + UNIMPLEMENTED "HalEnableInterrupt" .endfunc + +.global _HalDisableInterrupt +.func _HalDisableInterrupt +_HalDisableInterrupt: + UNIMPLEMENTED "HalDisableInterrupt" +.endfunc + +.global _HalRequestSoftwareInterrupt +.func _HalRequestSoftwareInterrupt +_HalRequestSoftwareInterrupt: + UNIMPLEMENTED "HalRequestSoftwareInterrupt" +.endfunc + +.global _HalSendSoftwareInterrupt +.func _HalSendSoftwareInterrupt +_HalSendSoftwareInterrupt: + UNIMPLEMENTED "HalSendSoftwareInterrupt" +.endfunc + +.global _HalEndSystemInterrupt +.func _HalEndSystemInterrupt +_HalEndSystemInterrupt: + UNIMPLEMENTED "HalEndSystemInterrupt" +.endfunc + .globl _HalClearSoftwareInterrupt .func _HalClearSoftwareInterrupt _HalClearSoftwareInterrupt: + UNIMPLEMENTED "HalClearSoftwareInterrupt" /* Get IRR mask */ mov eax, 1 @@ -52,42 +83,9 @@ ret .endfunc -.globl _HalRequestSoftwareInterrupt -.func _HalRequestSoftwareInterrupt -_HalRequestSoftwareInterrupt: -UNIMPLEMENTED "HalRequestSoftwareInterrupt" -.endfunc - .globl _HalBeginSystemInterrupt .func _HalBeginSystemInterrupt _HalBeginSystemInterrupt: -UNIMPLEMENTED "HalBeginSystemInterrupt" + UNIMPLEMENTED "HalBeginSystemInterrupt" .endfunc -.globl _HalpApcInterrupt -.func _HalpApcInterrupt -//TRAP_FIXUPS hapc_a, hapc_t, DoFixupV86, DoFixupAbios -_HalpApcInterrupt: -UNIMPLEMENTED "HalpApcInterrupt" -.endfunc - -.globl _HalpApcInterrupt2ndEntry -.func _HalpApcInterrupt2ndEntry -_HalpApcInterrupt2ndEntry: -UNIMPLEMENTED "HalpApcInterrupt2ndEntry" -.endfunc - -.globl _HalpDispatchInterrupt -.func _HalpDispatchInterrupt -//TRAP_FIXUPS hdpc_a, hdpc_t, DoFixupV86, DoFixupAbios -_HalpDispatchInterrupt: -UNIMPLEMENTED "HalpDispatchInterrupt" -.endfunc - - -.globl _HalpDispatchInterrupt2ndEntry -.func _HalpDispatchInterrupt2ndEntry -_HalpDispatchInterrupt2ndEntry: -UNIMPLEMENTED "HalpDispatchInterrupt2ndEntry" -.endfunc - Added: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/mps.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/mps.S (added) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/mps.S [iso-8859-1] Thu Sep 4 14:11:19 2008 @@ -1,0 +1,95 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/hal/amd64/generic/mps.S + * PURPOSE: Intel MultiProcessor specification support + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + */ + +/* INCLUDES ******************************************************************/ + +#include <ndk/asm.h> + +/* FUNCTIONS *****************************************************************/ + +#define BEFORE \ + cld; \ + pushq %rax; \ + pushq %rbx; \ + pushq %rcx; \ + pushq %rdx; \ + pushq %rsi; \ + pushq %rdi; \ + pushq %fs; \ + pushq %gs; \ + +#define AFTER \ + popq %gs; \ + popq %fs; \ + popq %rdi; \ + popq %rsi; \ + popq %rdx; \ + popq %rcx; \ + popq %rbx; \ + popq %rax; \ + +#ifdef CONFIG_SMP +.global _MpsIpiInterrupt +_MpsIpiInterrupt: + /* Save registers */ + BEFORE + + /* Call the C handler */ + call _MpsIpiHandler + + /* Return to the caller */ + AFTER + iret +#endif + +.globl _MpsErrorInterrupt +_MpsErrorInterrupt: + /* Save registers */ + BEFORE + + /* Call the C handler */ + call _MpsErrorHandler + + /* Return to the caller */ + AFTER + iret + + +.globl _MpsSpuriousInterrupt +_MpsSpuriousInterrupt: + /* Save registers */ + BEFORE + + /* Call the C handler */ + call _MpsSpuriousHandler + + /* Return to the caller */ + AFTER + iret + +.global _MpsTimerInterrupt +_MpsTimerInterrupt: + /* Save registers */ + BEFORE + + movl $0xef,%ebx + movl $0xceafbeef,%eax + pushq %rax + pushq %rsp + pushq %rbx + call _MpsTimerHandler + popq %rax + popq %rax + popq %rax + + /* Return to the caller */ + AFTER + iret + + +/* EOF */ Propchange: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/mps.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1] Thu Sep 4 14:11:19 2008 @@ -8,7 +8,6 @@ <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <library>hal_generic_amd64</library> - <library>hal_generic_pc</library> <library>hal_generic</library> <library>ntoskrnl</library> <file>halinit_up.c</file> Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] Thu Sep 4 14:11:19 2008 @@ -13,13 +13,14 @@ <file>dma.c</file> <file>drive.c</file> <file>display.c</file> + <file>pci.c</file> <file>profil.c</file> <file>reboot.c</file> <file>sysinfo.c</file> <file>timer.c</file> </directory> <directory name="mp"> -  + <file>apic.c</file> </directory> <directory name="include"> <pch>hal.h</pch>

1 0

[cgutman] 35946: - Fix cleanup code - We could possibly end up there with a NULL FileHandleObject and return a garbage FileHandle or crash - Now we always return a NULL FileHandle when we fail and free FileHandleObject if it has been allocated
by cgutman＠svn.reactos.org 04 Sep '08

04 Sep '08

Author: cgutman Date: Thu Sep 4 14:08:08 2008 New Revision: 35946 URL: http://svn.reactos.org/svn/reactos?rev=35946&view=rev Log: - Fix cleanup code - We could possibly end up there with a NULL FileHandleObject and return a garbage FileHandle or crash - Now we always return a NULL FileHandle when we fail and free FileHandleObject if it has been allocated Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c [iso-8859-1] Thu Sep 4 14:08:08 2008 @@ -331,10 +331,12 @@ ExFreePool ( FullFileName.Buffer ); FullFileName.Buffer = NULL; } - if ( !NT_SUCCESS(*Status) && FileHandleObject != NULL ) + if ( !NT_SUCCESS(*Status) ) { - ExFreePool ( FileHandleObject ); - FileHandleObject = NULL; + if( FileHandleObject ) { + ExFreePool ( FileHandleObject ); + FileHandleObject = NULL; + } *FileHandle = NULL; } else

1 0

[cwittich] 35945: fix some advapi crypt winetests
by cwittich＠svn.reactos.org 04 Sep '08

04 Sep '08

Author: cwittich Date: Thu Sep 4 13:43:56 2008 New Revision: 35945 URL: http://svn.reactos.org/svn/reactos?rev=35945&view=rev Log: fix some advapi crypt winetests Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Thu Sep 4 13:43:56 2008 @@ -22,8 +22,7 @@ * TODO: * - Reference counting * - Thread-safing - * - Signature checking - */ + */ #include <advapi32.h> #include "crypt.h" @@ -49,9 +48,7 @@ } while (--longs); } -HWND crypt_hWindow = 0; - -#define CRYPT_ReturnLastError(err) {SetLastError(err); return FALSE;} +static HWND crypt_hWindow = 0; #define CRYPT_Alloc(size) ((LPVOID)LocalAlloc(LMEM_ZEROINIT, size)) #define CRYPT_Free(buffer) (LocalFree((HLOCAL)buffer)) @@ -127,9 +124,10 @@ return TRUE; } count = WideCharToMultiByte(CP_ACP, 0, wstr, -1, NULL, 0, NULL, NULL); - count = count < strsize ? count : strsize; if (strsize == -1) *str = CRYPT_Alloc(count * sizeof(CHAR)); + else + count = min( count, strsize ); if (*str) { WideCharToMultiByte(CP_ACP, 0, wstr, -1, *str, count, NULL, NULL); @@ -146,7 +144,7 @@ */ static inline BOOL CRYPT_ANSIToUnicode(LPCSTR str, LPWSTR* wstr, int wstrsize) { - int wcount; + unsigned int wcount; if (!str) { @@ -154,9 +152,10 @@ return TRUE; } wcount = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - wcount = wcount < wstrsize/(int)sizeof(WCHAR) ? wcount : wstrsize/(int)sizeof(WCHAR); if (wstrsize == -1) *wstr = CRYPT_Alloc(wcount * sizeof(WCHAR)); + else + wcount = min( wcount, wstrsize/sizeof(WCHAR) ); if (*wstr) { MultiByteToWideChar(CP_ACP, 0, str, -1, *wstr, wcount); @@ -264,6 +263,64 @@ #undef CRYPT_GetProvFunc #undef CRYPT_GetProvFuncOpt +static void CRYPT_CreateMachineGuid(void) +{ + static const WCHAR cryptographyW[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'C','r','y','p','t','o','g','r','a','p','h','y',0 }; + static const WCHAR machineGuidW[] = { + 'M','a','c','h','i','n','e','G','u','i','d',0 }; + LONG r; + HKEY key; + + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, cryptographyW, 0, KEY_ALL_ACCESS, + &key); + if (!r) + { + DWORD size; + + r = RegQueryValueExW(key, machineGuidW, NULL, NULL, NULL, &size); + if (r == ERROR_FILE_NOT_FOUND) + { + static const WCHAR rpcrt4[] = { + 'r','p','c','r','t','4',0 }; + HMODULE lib = LoadLibraryW(rpcrt4); + + if (lib) + { + RPC_STATUS (RPC_ENTRY *pUuidCreate)(UUID *); + UUID uuid; + WCHAR buf[37]; + RPC_STATUS rs; + static const WCHAR uuidFmt[] = { + '%','0','8','x','-','%','0','4','x','-', + '%','0','4','x','-','%','0','2','x', + '%','0','2','x','-','%','0','2','x', + '%','0','2','x','%','0','2','x', + '%','0','2','x','%','0','2','x', + '%','0','2','x',0 }; + + pUuidCreate = (LPVOID) GetProcAddress(lib, "UuidCreate"); + rs = pUuidCreate(&uuid); + if (rs == S_OK) + { + swprintf(buf, uuidFmt, + uuid.Data1, uuid.Data2, uuid.Data3, + uuid.Data4[0], uuid.Data4[1], + uuid.Data4[2], uuid.Data4[3], + uuid.Data4[4], uuid.Data4[5], + uuid.Data4[6], uuid.Data4[7] ); + RegSetValueExW(key, machineGuidW, 0, REG_SZ, + (const BYTE *)buf, + (lstrlenW(buf)+1)*sizeof(WCHAR)); + } + FreeLibrary(lib); + } + } + RegCloseKey(key); + } +} /****************************************************************************** * CryptAcquireContextW (ADVAPI32.@) @@ -307,6 +364,9 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + + /* Make sure the MachineGuid value exists */ + CRYPT_CreateMachineGuid(); if (!pszProvider || !*pszProvider) { @@ -566,16 +626,22 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE; - TRACE("(0x%lx, %08ld)\n", hProv, dwFlags); + TRACE("(0x%lx, %08lx)\n", hProv, dwFlags); if (!pProv) { SetLastError(NTE_BAD_UID); + return FALSE; + } + + if (pProv->dwMagic != MAGIC_CRYPTPROV) + { + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -583,6 +649,7 @@ if (pProv->refcount <= 0) { ret = pProv->pFuncs->pCPReleaseContext(pProv->hPrivate, dwFlags); + pProv->dwMagic = 0; FreeLibrary(pProv->hModule); #if 0 CRYPT_Free(pProv->pVTable->pContextInfo); @@ -619,10 +686,16 @@ TRACE("(0x%lx, %ld, %p)\n", hProv, dwLen, pbBuffer); if (!hProv) - CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); - - if (prov->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (prov->dwMagic != MAGIC_CRYPTPROV) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } return prov->pFuncs->pCPGenRandom(prov->hPrivate, dwLen, pbBuffer); } @@ -656,13 +729,25 @@ TRACE("(0x%lx, 0x%x, 0x%lx, %08lx, %p)\n", hProv, Algid, hKey, dwFlags, phHash); if (!prov) - CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } if (!phHash || prov->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (dwFlags) - CRYPT_ReturnLastError(NTE_BAD_FLAGS); - if (!(hash = CRYPT_Alloc(sizeof(CRYPTHASH)))) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); + { + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } + if ( !(hash = CRYPT_Alloc(sizeof(CRYPTHASH))) ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } hash->pProvider = prov; @@ -706,8 +791,11 @@ TRACE("(0x%lx, 0x%lx, %d, %08lx, %p, %p)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen); - if (!key || !pbData || !pdwDataLen || key->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + if (!key || !pbData || !pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = key->pProvider; return prov->pFuncs->pCPDecrypt(prov->hPrivate, key->hPrivate, hash ? hash->hPrivate : 0, @@ -740,11 +828,20 @@ TRACE("(0x%lx, 0x%08x, 0x%lx, 0x%08lx, %p)\n", hProv, Algid, hBaseData, dwFlags, phKey); if (!prov || !hash) - CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } if (!phKey || prov->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); - if (!(key = CRYPT_Alloc(sizeof(CRYPTKEY)))) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if ( !(key = CRYPT_Alloc(sizeof(CRYPTKEY))) ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } key->pProvider = prov; if (prov->pFuncs->pCPDeriveKey(prov->hPrivate, Algid, hash->hPrivate, dwFlags, &key->hPrivate)) @@ -779,8 +876,17 @@ TRACE("(0x%lx)\n", hHash); - if (!hash || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); + if (!hash) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = hash->pProvider; ret = prov->pFuncs->pCPDestroyHash(prov->hPrivate, hash->hPrivate); @@ -809,10 +915,16 @@ TRACE("(0x%lx)\n", hKey); if (!key) - CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); - - if (!key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = key->pProvider; ret = prov->pFuncs->pCPDestroyKey(prov->hPrivate, key->hPrivate); @@ -844,16 +956,25 @@ TRACE("(0x%lx, %p, %08ld, %p)\n", hHash, pdwReserved, dwFlags, phHash); orghash = (PCRYPTHASH)hHash; - if (!orghash || pdwReserved || !phHash|| - orghash->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + if (!orghash || pdwReserved || !phHash || !orghash->pProvider || + orghash->pProvider->dwMagic != MAGIC_CRYPTPROV) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = orghash->pProvider; if (!prov->pFuncs->pCPDuplicateHash) - CRYPT_ReturnLastError(ERROR_CALL_NOT_IMPLEMENTED); - - if (!(newhash = CRYPT_Alloc(sizeof(CRYPTHASH)))) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + if ( !(newhash = CRYPT_Alloc(sizeof(CRYPTHASH))) ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } newhash->pProvider = prov; if (prov->pFuncs->pCPDuplicateHash(prov->hPrivate, orghash->hPrivate, pdwReserved, dwFlags, &newhash->hPrivate)) @@ -888,15 +1009,25 @@ TRACE("(0x%lx, %p, %08ld, %p)\n", hKey, pdwReserved, dwFlags, phKey); orgkey = (PCRYPTKEY)hKey; - if (!orgkey || pdwReserved || !phKey || orgkey->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + if (!orgkey || pdwReserved || !phKey || !orgkey->pProvider || + orgkey->pProvider->dwMagic != MAGIC_CRYPTPROV) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = orgkey->pProvider; if (!prov->pFuncs->pCPDuplicateKey) - CRYPT_ReturnLastError(ERROR_CALL_NOT_IMPLEMENTED); - - if (!(newkey = CRYPT_Alloc(sizeof(CRYPTKEY)))) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + if ( !(newkey = CRYPT_Alloc(sizeof(CRYPTKEY))) ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } newkey->pProvider = prov; if (prov->pFuncs->pCPDuplicateKey(prov->hPrivate, orgkey->hPrivate, pdwReserved, dwFlags, &newkey->hPrivate)) @@ -940,8 +1071,11 @@ TRACE("(0x%lx, 0x%lx, %d, %08ld, %p, %p, %ld)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen, dwBufLen); - if (!key || !pdwDataLen || key->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + if (!key || !pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = key->pProvider; return prov->pFuncs->pCPEncrypt(prov->hPrivate, key->hPrivate, hash ? hash->hPrivate : 0, @@ -951,7 +1085,7 @@ /****************************************************************************** * CryptEnumProvidersW (ADVAPI32.@) * - * Returns the next availabe CSP. + * Returns the next available CSP. * * PARAMS * dwIndex [I] Index of the next provider to be enumerated. @@ -979,14 +1113,23 @@ pdwProvType, pszProvName, pcbProvName); if (pdwReserved || !pcbProvName) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (dwFlags) - CRYPT_ReturnLastError(NTE_BAD_FLAGS); + { + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (RegOpenKeyW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Cryptography\\Defaults\\Provider", &hKey)) - CRYPT_ReturnLastError(NTE_FAIL); + { + SetLastError(NTE_FAIL); + return FALSE; + } if (!pszProvName) { @@ -997,16 +1140,21 @@ NULL, NULL, NULL, NULL, NULL, NULL); if (!(provNameW = CRYPT_Alloc(*pcbProvName * sizeof(WCHAR)))) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } RegEnumKeyExW(hKey, dwIndex, provNameW, pcbProvName, NULL, NULL, NULL, NULL); + CRYPT_Free(provNameW); (*pcbProvName)++; *pcbProvName *= sizeof(WCHAR); - CRYPT_Free(provNameW); - if (dwIndex >= numkeys) - CRYPT_ReturnLastError(ERROR_NO_MORE_ITEMS); + { + SetLastError(ERROR_NO_MORE_ITEMS); + return FALSE; + } } else { @@ -1016,7 +1164,10 @@ result = RegEnumKeyW(hKey, dwIndex, pszProvName, *pcbProvName / sizeof(WCHAR)); if (result) - CRYPT_ReturnLastError(result); + { + SetLastError(result); + return FALSE; + } if (RegOpenKeyW(hKey, pszProvName, &subkey)) return FALSE; if (RegQueryValueExW(subkey, L"Type", NULL, NULL, (BYTE*)pdwProvType, &size)) @@ -1044,12 +1195,15 @@ if(!CryptEnumProvidersW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &bufsize)) return FALSE; - if (pszProvName && !(str = CRYPT_Alloc(bufsize))) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); + if ( pszProvName && !(str = CRYPT_Alloc(bufsize)) ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } ret = CryptEnumProvidersW(dwIndex, pdwReserved, dwFlags, pdwProvType, str, &bufsize); if (str) CRYPT_UnicodeToANSI(str, &pszProvName, *pcbProvName); - *pcbProvName = bufsize / sizeof(WCHAR); + *pcbProvName = bufsize / sizeof(WCHAR); /* FIXME: not correct */ if (str) { CRYPT_Free(str); @@ -1063,7 +1217,7 @@ } /****************************************************************************** - * CryptEnumProviderTypesA (ADVAPI32i.@) + * CryptEnumProviderTypesW (ADVAPI32.@) * * Retrieves the next type of CSP supported. * @@ -1084,47 +1238,62 @@ * If pszTypeName is NULL, CryptEnumProviderTypesA sets the size of the name * for memory allocation purposes. */ -BOOL WINAPI CryptEnumProviderTypesA (DWORD dwIndex, DWORD *pdwReserved, - DWORD dwFlags, DWORD *pdwProvType, LPSTR pszTypeName, DWORD *pcbTypeName) +BOOL WINAPI CryptEnumProviderTypesW (DWORD dwIndex, DWORD *pdwReserved, + DWORD dwFlags, DWORD *pdwProvType, LPWSTR pszTypeName, DWORD *pcbTypeName) { HKEY hKey, hSubkey; DWORD keylen, numkeys, dwType; - PSTR keyname, ch; + PWSTR keyname, ch; DWORD result; TRACE("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszTypeName, pcbTypeName); if (pdwReserved || !pdwProvType || !pcbTypeName) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (dwFlags) - CRYPT_ReturnLastError(NTE_BAD_FLAGS); - - if (RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\Defaults\\Provider Types", &hKey)) - return FALSE; - - RegQueryInfoKeyA(hKey, NULL, NULL, NULL, &numkeys, &keylen, NULL, NULL, NULL, NULL, NULL, NULL); + { + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Cryptography\\Defaults\\Provider Types", &hKey)) + return FALSE; + + RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &numkeys, &keylen, NULL, NULL, NULL, NULL, NULL, NULL); if (dwIndex >= numkeys) - CRYPT_ReturnLastError(ERROR_NO_MORE_ITEMS); + { + SetLastError(ERROR_NO_MORE_ITEMS); + return FALSE; + } keylen++; - if ( !(keyname = CRYPT_Alloc(keylen)) ) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); - if ( RegEnumKeyA(hKey, dwIndex, keyname, keylen) ) + if ( !(keyname = CRYPT_Alloc(keylen*sizeof(WCHAR))) ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + if ( RegEnumKeyW(hKey, dwIndex, keyname, keylen) ) { CRYPT_Free(keyname); return FALSE; } - RegOpenKeyA(hKey, keyname, &hSubkey); - ch = keyname + strlen(keyname); + RegOpenKeyW(hKey, keyname, &hSubkey); + ch = keyname + wcslen(keyname); /* Convert "Type 000" to 0, etc/ */ *pdwProvType = *(--ch) - '0'; *pdwProvType += (*(--ch) - '0') * 10; *pdwProvType += (*(--ch) - '0') * 100; CRYPT_Free(keyname); - result = RegQueryValueExA(hSubkey, "TypeName", NULL, &dwType, (LPBYTE)pszTypeName, pcbTypeName); + result = RegQueryValueExW(hSubkey, L"TypeName", NULL, &dwType, (LPBYTE)pszTypeName, pcbTypeName); if (result) - CRYPT_ReturnLastError(result); + { + SetLastError(result); + return FALSE; + } RegCloseKey(hSubkey); RegCloseKey(hKey); @@ -1132,29 +1301,40 @@ } /****************************************************************************** - * CryptEnumProviderTypesW (ADVAPI32.@) - * - * see CryptEnumProviderTypesA - */ -BOOL WINAPI CryptEnumProviderTypesW (DWORD dwIndex, DWORD *pdwReserved, - DWORD dwFlags, DWORD *pdwProvType, LPWSTR pszTypeName, DWORD *pcbTypeName) -{ - PSTR str = NULL; - DWORD strlen; + * CryptEnumProviderTypesA (ADVAPI32.@) + * + * see CryptEnumProviderTypesW. + */ +BOOL WINAPI CryptEnumProviderTypesA (DWORD dwIndex, DWORD *pdwReserved, + DWORD dwFlags, DWORD *pdwProvType, LPSTR pszTypeName, DWORD *pcbTypeName) +{ + PWSTR str = NULL; + DWORD bufsize; BOOL ret; TRACE("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszTypeName, pcbTypeName); - strlen = *pcbTypeName / sizeof(WCHAR); - if (pszTypeName && !(str = CRYPT_Alloc(strlen))) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); - ret = CryptEnumProviderTypesA(dwIndex, pdwReserved, dwFlags, pdwProvType, str, &strlen); + + if(!CryptEnumProviderTypesW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &bufsize)) + return FALSE; + if ( pszTypeName && !(str = CRYPT_Alloc(bufsize)) ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + ret = CryptEnumProviderTypesW(dwIndex, pdwReserved, dwFlags, pdwProvType, str, &bufsize); if (str) - { - CRYPT_ANSIToUnicode(str, &pszTypeName, *pcbTypeName); + CRYPT_UnicodeToANSI(str, &pszTypeName, *pcbTypeName); + *pcbTypeName = bufsize / sizeof(WCHAR); + if (str) + { CRYPT_Free(str); - } - *pcbTypeName = strlen * sizeof(WCHAR); + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + SetLastError(ERROR_MORE_DATA); + return FALSE; + } + } return ret; } @@ -1188,7 +1368,10 @@ TRACE("(0x%lx, 0x%lx, %ld, %08ld, %p, %p)\n", hKey, hExpKey, dwBlobType, dwFlags, pbData, pdwDataLen); if (!key || !pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = key->pProvider; return prov->pFuncs->pCPExportKey(prov->hPrivate, key->hPrivate, expkey ? expkey->hPrivate : 0, @@ -1218,11 +1401,20 @@ TRACE("(0x%lx, %d, %08ld, %p)\n", hProv, Algid, dwFlags, phKey); if (!prov) - CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); - if (!phKey || prov->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); - if (!(key = CRYPT_Alloc(sizeof(CRYPTKEY)))) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!phKey || !prov || prov->dwMagic != MAGIC_CRYPTPROV) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if ( !(key = CRYPT_Alloc(sizeof(CRYPTKEY))) ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } key->pProvider = prov; @@ -1317,21 +1509,21 @@ DWORD dwFlags, LPSTR pszProvName, DWORD *pcbProvName) { PWSTR str = NULL; - DWORD strlen; + DWORD bufsize; BOOL ret = FALSE; TRACE("(%d, %p, %08x, %p, %p)\n", dwProvType, pdwReserved, dwFlags, pszProvName, pcbProvName); - CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, NULL, &strlen); - if ( pszProvName && !(str = CRYPT_Alloc(strlen)) ) + CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, NULL, &bufsize); + if ( pszProvName && !(str = CRYPT_Alloc(bufsize)) ) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - ret = CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, str, &strlen); + ret = CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, str, &bufsize); if (str) CRYPT_UnicodeToANSI(str, &pszProvName, *pcbProvName); - *pcbProvName = strlen / sizeof(WCHAR); + *pcbProvName = bufsize / sizeof(WCHAR); if (str) { CRYPT_Free(str); @@ -1372,7 +1564,10 @@ TRACE("(0x%lx, %ld, %p, %p, %08ld)\n", hHash, dwParam, pbData, pdwDataLen, dwFlags); if (!hash || !pdwDataLen || !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = hash->pProvider; return prov->pFuncs->pCPGetHashParam(prov->hPrivate, hash->hPrivate, dwParam, @@ -1407,7 +1602,10 @@ TRACE("(0x%lx, %ld, %p, %p, %08ld)\n", hKey, dwParam, pbData, pdwDataLen, dwFlags); if (!key || !pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = key->pProvider; return prov->pFuncs->pCPGetKeyParam(prov->hPrivate, key->hPrivate, dwParam, @@ -1440,8 +1638,11 @@ TRACE("(0x%lx, %ld, %p, %p, %08ld)\n", hProv, dwParam, pbData, pdwDataLen, dwFlags); - if (!prov || prov->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + if (!prov || prov->dwMagic != MAGIC_CRYPTPROV) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } return prov->pFuncs->pCPGetProvParam(prov->hPrivate, dwParam, pbData, pdwDataLen, dwFlags); } @@ -1468,11 +1669,20 @@ TRACE("(0x%lx, %ld, %p)\n", hProv, dwKeySpec, phUserKey); if (!prov) - CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } if (!phUserKey || prov->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); - if (!(key = CRYPT_Alloc(sizeof(CRYPTKEY)))) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if ( !(key = CRYPT_Alloc(sizeof(CRYPTKEY))) ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } key->pProvider = prov; @@ -1511,9 +1721,15 @@ TRACE("(0x%lx, %p, %ld, %08ld)\n", hHash, pbData, dwDataLen, dwFlags); if (!hash) - CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = hash->pProvider; return prov->pFuncs->pCPHashData(prov->hPrivate, hash->hPrivate, pbData, dwDataLen, dwFlags); @@ -1540,9 +1756,16 @@ TRACE("(0x%lx, 0x%lx, %08ld)\n", hHash, hKey, dwFlags); if (!hash || !key) - CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); - if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = hash->pProvider; return prov->pFuncs->pCPHashSessionKey(prov->hPrivate, hash->hPrivate, key->hPrivate, dwFlags); @@ -1572,10 +1795,16 @@ TRACE("(0x%lx, %p, %ld, 0x%lx, %08ld, %p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); if (!prov || !pbData || !dwDataLen || !phKey || prov->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); - - if (!(importkey = CRYPT_Alloc(sizeof(CRYPTKEY)))) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!(importkey = CRYPT_Alloc(sizeof(CRYPTKEY))) ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } importkey->pProvider = prov; if (prov->pFuncs->pCPImportKey(prov->hPrivate, pbData, dwDataLen, @@ -1635,9 +1864,15 @@ } if (!hash) - CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } if (!pdwSigLen || !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = hash->pProvider; return prov->pFuncs->pCPSignHash(prov->hPrivate, hash->hPrivate, dwKeySpec, NULL, @@ -1668,7 +1903,10 @@ TRACE("(0x%lx, %ld, %p, %08ld)\n", hHash, dwParam, pbData, dwFlags); if (!hash || !pbData || !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = hash->pProvider; return prov->pFuncs->pCPSetHashParam(prov->hPrivate, hash->hPrivate, @@ -1698,7 +1936,10 @@ TRACE("(0x%lx, %ld, %p, %08ld)\n", hKey, dwParam, pbData, dwFlags); if (!key || !pbData || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = key->pProvider; return prov->pFuncs->pCPSetKeyParam(prov->hPrivate, key->hPrivate, @@ -1868,9 +2109,15 @@ TRACE("(0x%lx, %ld, %p, %08ld)\n", hProv, dwParam, pbData, dwFlags); if (!prov) - CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); - if (prov->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (prov->dwMagic != MAGIC_CRYPTPROV) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (dwFlags & PP_USE_HARDWARE_RNG) { FIXME("PP_USE_HARDWARE_RNG: What do I do with this?\n"); @@ -1930,13 +2177,8 @@ return CryptVerifySignatureW(hHash, pbSignature, dwSigLen, hPubKey, NULL, dwFlags); } -BOOL WINAPI -CryptVerifySignatureW (HCRYPTHASH hHash, - CONST BYTE *pbSignature, - DWORD dwSigLen, - HCRYPTKEY hPubKey, - LPCWSTR sDescription, - DWORD dwFlags) +BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, + HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags) { PCRYPTHASH hash = (PCRYPTHASH)hHash; PCRYPTKEY key = (PCRYPTKEY)hPubKey; @@ -1945,16 +2187,13 @@ TRACE("(0x%lx, %p, %d, 0x%lx, %s, %08x)\n", hHash, pbSignature, dwSigLen, hPubKey, debugstr_w(sDescription), dwFlags); - if (sDescription) - { - WARN("The sDescription parameter is not supported (and no longer used). Ignoring.\n"); - } - - if (!hash || !key || - !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV || - !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); - + if (!hash || !key || + !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV || + !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } prov = hash->pProvider; return prov->pFuncs->pCPVerifySignature(prov->hPrivate, hash->hPrivate, pbSignature, dwSigLen,

1 0

[cgutman] 35944: - Fix 2 memory leaks - Set ParameterValue to NULL on failure
by cgutman＠svn.reactos.org 04 Sep '08

04 Sep '08

Author: cgutman Date: Thu Sep 4 13:42:49 2008 New Revision: 35944 URL: http://svn.reactos.org/svn/reactos?rev=35944&view=rev Log: - Fix 2 memory leaks - Set ParameterValue to NULL on failure Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c [iso-8859-1] Thu Sep 4 13:42:49 2008 @@ -521,9 +521,11 @@ ExFreePool(KeyInformation); - if(*Status != STATUS_SUCCESS) + if(*Status != STATUS_SUCCESS) { + ExFreePool(*ParameterValue); + *ParameterValue = NULL; *Status = NDIS_STATUS_FAILURE; - else + } else *Status = NDIS_STATUS_SUCCESS; return; @@ -567,6 +569,7 @@ if(!MiniportResource) { NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + ExFreePool(RegData); ExFreePool(KeyInformation); ExFreePool(*ParameterValue); *ParameterValue = NULL;

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