Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[navaraf] 14864: tinus <o112w8r02@sneakemail.com>

by navaraf＠svn.reactos.com

tinus <o112w8r02(a)sneakemail.com> Change the backtrace command to show current EIP too. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-04-29 19:49:50 UTC (rev 14863) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-04-30 04:43:17 UTC (rev 14864) @@ -569,6 +569,15 @@ return TRUE; } } + else + { + KdbpPrint("Eip:\n"); + /* Try printing the function at EIP */ + if (!KdbSymPrintAddress((PVOID)KdbCurrentTrapFrame->Tf.Eip)) + KdbpPrint("<%08x>\n", KdbCurrentTrapFrame->Tf.Eip); + else + KdbpPrint("\n"); + } KdbpPrint("Frames:\n"); while (Frame != 0)

19 years, 4 months

[greatlrd] 14863: Remove all hardcode string to En.rc

by greatlrd＠svn.reactos.com

Remove all hardcode string to En.rc from locale.c Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/locale.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-29 16:41:52 UTC (rev 14862) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-29 19:49:50 UTC (rev 14863) @@ -274,6 +274,7 @@ STRING_LABEL_HELP4, "Volume Serial Number is %04X-%04X\n" STRING_LABEL_HELP5, "Drive label (11 Characters, ENTER if none)? " +STRING_LOCALE_HELP1, "Current time is" STRING_MKDIR_HELP, "Creates a directory.\n\n \ MKDIR [drive:]path\nMD [drive:]path" _____ Modified: trunk/reactos/subsys/system/cmd/locale.c --- trunk/reactos/subsys/system/cmd/locale.c 2005-04-29 16:41:52 UTC (rev 14862) +++ trunk/reactos/subsys/system/cmd/locale.c 2005-04-29 19:49:50 UTC (rev 14863) @@ -12,6 +12,7 @@ */ #include "precomp.h" +#include "resource.h" TCHAR cDateSeparator; @@ -148,21 +149,24 @@ { #ifdef __REACTOS__ SYSTEMTIME st; + WCHAR szMsg[RC_STRING_MAX_SIZE]; GetLocalTime (&st); + LoadString( GetModuleHandle(NULL), STRING_LOCALE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + switch (nTimeFormat) { case 0: /* 12 hour format */ - default: - ConOutPrintf (_T("Current time is %2d%c%02d%c%02d%c%02d%c\n"), + default: + ConOutPrintf (_T("%s %2d%c%02d%c%02d%c%02d%c\n"),(LPTSTR)szMsg, (st.wHour == 0 ? 12 : (st.wHour <= 12 ? st.wHour : st.wHour - 12)), cTimeSeparator, st.wMinute, cTimeSeparator, st.wSecond, cDecimalSeparator, st.wMilliseconds / 10, (st.wHour <= 11 ? 'a' : 'p')); break; case 1: /* 24 hour format */ - ConOutPrintf (_T("Current time is %2d%c%02d%c%02d%c%02d\n"), + ConOutPrintf (_T("%s %2d%c%02d%c%02d%c%02d\n"),(LPTSTR)szMsg, st.wHour, cTimeSeparator, st.wMinute, cTimeSeparator, st.wSecond, cDecimalSeparator, st.wMilliseconds / 10); break; @@ -172,6 +176,8 @@ GetTimeFormat (LOCALE_USER_DEFAULT, 0, NULL, NULL, szTime, sizeof (szTime)); - ConOutPrintf (_T("Current time is: %s\n"), szTime); + + LoadString( GetModuleHandle(NULL), STRING_LOCALE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T("%s: %s\n"),(LPTSTR)szMsg, szTime); #endif } _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-29 16:41:52 UTC (rev 14862) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-29 19:49:50 UTC (rev 14863) @@ -130,17 +130,19 @@ #define STRING_LABEL_HELP4 655 #define STRING_LABEL_HELP5 656 -#define STRING_MKDIR_HELP 657 +#define STRING_LOCALE_HELP1 657 -#define STRING_MEMMORY_HELP1 658 -#define STRING_MEMMORY_HELP2 659 +#define STRING_MKDIR_HELP 658 -#define STRING_RMDIR_HELP 660 +#define STRING_MEMMORY_HELP1 659 +#define STRING_MEMMORY_HELP2 660 -#define STRING_REM_HELP 661 +#define STRING_RMDIR_HELP 661 +#define STRING_REM_HELP 662 +

19 years, 4 months

[weiden] 14862: - added stubs for NtSuspendProcess and NtResumeProcess

by weiden＠svn.reactos.com

- added stubs for NtSuspendProcess and NtResumeProcess - the ProcessDebugPort information class is read-only on NT5.1+ Modified: trunk/reactos/include/ntos/ps.h Modified: trunk/reactos/include/ntos/zw.h Modified: trunk/reactos/lib/ntdll/def/ntdll.def Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/suspend.c Modified: trunk/reactos/tools/nci/sysfuncs.lst Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/include/ntos/ps.h --- trunk/reactos/include/ntos/ps.h 2005-04-29 14:38:05 UTC (rev 14861) +++ trunk/reactos/include/ntos/ps.h 2005-04-29 16:41:52 UTC (rev 14862) @@ -70,7 +70,7 @@ #define PROCESS_SET_QUOTA (0x0100L) #define PROCESS_SET_INFORMATION (0x0200L) #define PROCESS_QUERY_INFORMATION (0x0400L) -#define PROCESS_SET_PORT (0x0800L) +#define PROCESS_SUSPEND_RESUME (0x0800L) #define PROCESS_ALL_ACCESS (0x1f0fffL) _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-04-29 14:38:05 UTC (rev 14861) +++ trunk/reactos/include/ntos/zw.h 2005-04-29 16:41:52 UTC (rev 14862) @@ -3713,6 +3713,20 @@ IN HANDLE ThreadHandle, OUT PULONG SuspendCount OPTIONAL ); + + +NTSTATUS +STDCALL +NtResumeProcess( + IN HANDLE ProcessHandle + ); + +NTSTATUS +STDCALL +ZwResumeProcess( + IN HANDLE ProcessHandle + ); + /* * FUNCTION: Writes the content of a registry key to ascii file * ARGUMENTS: @@ -4879,6 +4893,18 @@ OUT PULONG PreviousSuspendCount OPTIONAL ); +NTSTATUS +STDCALL +NtSuspendProcess( + IN HANDLE ProcessHandle + ); + +NTSTATUS +STDCALL +ZwSuspendProcess( + IN HANDLE ProcessHandle + ); + /* * FUNCTION: Terminates the execution of a thread. * ARGUMENTS: _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-04-29 14:38:05 UTC (rev 14861) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-04-29 16:41:52 UTC (rev 14862) @@ -215,6 +215,7 @@ NtRequestWaitReplyPort@12 NtResetEvent@8 NtRestoreKey@12 +NtResumeProcess@4 NtResumeThread@8 NtSaveKey@8 NtSetContextThread@8 @@ -251,6 +252,7 @@ NtSignalAndWaitForSingleObject@16 NtStartProfile@4 NtStopProfile@4 +NtSuspendProcess@4 NtSuspendThread@8 NtSystemDebugControl@24 NtTerminateJobObject@8 @@ -843,6 +845,7 @@ ZwRequestWaitReplyPort@12 ZwResetEvent@8 ZwRestoreKey@12 +ZwResumeProcess@4 ZwResumeThread@8 ZwSaveKey@8 ZwSetContextThread@8 @@ -878,6 +881,7 @@ ZwSignalAndWaitForSingleObject@16 ZwStartProfile@4 ZwStopProfile@4 +ZwSuspendProcess@4 ZwSuspendThread@8 ZwSystemDebugControl@24 ZwTerminateProcess@8 _____ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c --- trunk/reactos/ntoskrnl/ps/psmgr.c 2005-04-29 14:38:05 UTC (rev 14861) +++ trunk/reactos/ntoskrnl/ps/psmgr.c 2005-04-29 16:41:52 UTC (rev 14862) @@ -22,7 +22,7 @@ STANDARD_RIGHTS_WRITE | PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | PROCESS_VM_OPERATION | PROCESS_VM_WRITE | PROCESS_DUP_HANDLE | PROCESS_TERMINATE | PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION | - PROCESS_SET_PORT, + PROCESS_SUSPEND_RESUME, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, PROCESS_ALL_ACCESS}; _____ Modified: trunk/reactos/ntoskrnl/ps/query.c --- trunk/reactos/ntoskrnl/ps/query.c 2005-04-29 14:38:05 UTC (rev 14861) +++ trunk/reactos/ntoskrnl/ps/query.c 2005-04-29 16:41:52 UTC (rev 14862) @@ -16,7 +16,6 @@ /* GLOBALS ******************************************************************/ - static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = { ICI_SQ_SAME( sizeof(PROCESS_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* ProcessBasicInformation */ @@ -26,7 +25,7 @@ ICI_SQ_SAME( sizeof(KERNEL_USER_TIMES), sizeof(ULONG), ICIF_QUERY ), /* ProcessTimes */ ICI_SQ_SAME( sizeof(KPRIORITY), sizeof(ULONG), ICIF_SET ), /* ProcessBasePriority */ ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_SET ), /* ProcessRaisePriority */ - ICI_SQ_SAME( sizeof(HANDLE), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessDebugPort */ + ICI_SQ_SAME( sizeof(HANDLE), sizeof(ULONG), ICIF_QUERY ), /* ProcessDebugPort */ ICI_SQ_SAME( sizeof(HANDLE), sizeof(ULONG), ICIF_SET ), /* ProcessExceptionPort */ ICI_SQ_SAME( sizeof(PROCESS_ACCESS_TOKEN), sizeof(ULONG), ICIF_SET ), /* ProcessAccessToken */ ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessLdtInformation */ @@ -672,8 +671,7 @@ Access = PROCESS_SET_INFORMATION | PROCESS_SET_SESSIONID; break; case ProcessExceptionPort: - case ProcessDebugPort: - Access = PROCESS_SET_INFORMATION | PROCESS_SET_PORT; + Access = PROCESS_SET_INFORMATION | PROCESS_SUSPEND_RESUME; break; default: @@ -700,87 +698,6 @@ Status = STATUS_NOT_IMPLEMENTED; break; - case ProcessDebugPort: - { - HANDLE PortHandle = NULL; - - /* make a safe copy of the buffer on the stack */ - _SEH_TRY - { - PortHandle = *(PHANDLE)ProcessInformation; - Status = (PortHandle != NULL ? STATUS_SUCCESS : STATUS_INVALID_PARAMETER); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(NT_SUCCESS(Status)) - { - PEPORT DebugPort; - - /* in case we had success reading from the buffer, verify the provided - * LPC port handle - */ - Status = ObReferenceObjectByHandle(PortHandle, - 0, - LpcPortObjectType, - PreviousMode, - (PVOID)&DebugPort, - NULL); - if(NT_SUCCESS(Status)) - { - /* lock the process to be thread-safe! */ - - Status = PsLockProcess(Process, FALSE); - if(NT_SUCCESS(Status)) - { - /* - * according to "NT Native API" documentation, setting the debug - * port is only permitted once! - */ - if(Process->DebugPort == NULL) - { - /* keep the reference to the handle! */ - Process->DebugPort = DebugPort; - - if(Process->Peb) - { - /* we're now debugging the process, so set the flag in the PEB - structure. However, to access it we need to attach to the - process so we're sure we're in the right context! */ - - KeAttachProcess(&Process->Pcb); - _SEH_TRY - { - Process->Peb->BeingDebugged = TRUE; - } - _SEH_HANDLE - { - DPRINT1("Trying to set the Peb->BeingDebugged field of process 0x%x failed, exception: 0x%x\n", Process, _SEH_GetExceptionCode()); - } - _SEH_END; - KeDetachProcess(); - } - Status = STATUS_SUCCESS; - } - else - { - ObDereferenceObject(DebugPort); - Status = STATUS_PORT_ALREADY_SET; - } - PsUnlockProcess(Process); - } - else - { - ObDereferenceObject(DebugPort); - } - } - } - break; - } - case ProcessExceptionPort: { HANDLE PortHandle = NULL; @@ -988,6 +905,7 @@ case ProcessWx86Information: case ProcessHandleCount: case ProcessWow64Information: + case ProcessDebugPort: default: Status = STATUS_INVALID_INFO_CLASS; } _____ Modified: trunk/reactos/ntoskrnl/ps/suspend.c --- trunk/reactos/ntoskrnl/ps/suspend.c 2005-04-29 14:38:05 UTC (rev 14861) +++ trunk/reactos/ntoskrnl/ps/suspend.c 2005-04-29 16:41:52 UTC (rev 14862) @@ -173,4 +173,72 @@ return Status; } + +/* + * @unimplemented + */ +NTSTATUS +STDCALL +NtSuspendProcess(IN HANDLE ProcessHandle) +{ + KPROCESSOR_MODE PreviousMode; + PEPROCESS Process; + NTSTATUS Status; + + PAGED_CODE(); + + PreviousMode = ExGetPreviousMode(); + + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_SUSPEND_RESUME, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (NT_SUCCESS(Status)) + { + /* FIXME */ + Status = STATUS_NOT_IMPLEMENTED; + DPRINT1("NtSuspendProcess not yet implemented!\n"); + + ObDereferenceObject(Process); + } + + return Status; +} + + +/* + * @unimplemented + */ +NTSTATUS +STDCALL +NtResumeProcess(IN HANDLE ProcessHandle) +{ + KPROCESSOR_MODE PreviousMode; + PEPROCESS Process; + NTSTATUS Status; + + PAGED_CODE(); + + PreviousMode = ExGetPreviousMode(); + + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_SUSPEND_RESUME, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (NT_SUCCESS(Status)) + { + /* FIXME */ + Status = STATUS_NOT_IMPLEMENTED; + DPRINT1("NtResumeProcess not yet implemented!\n"); + + ObDereferenceObject(Process); + } + + return Status; +} + /* EOF */ _____ Modified: trunk/reactos/tools/nci/sysfuncs.lst --- trunk/reactos/tools/nci/sysfuncs.lst 2005-04-29 14:38:05 UTC (rev 14861) +++ trunk/reactos/tools/nci/sysfuncs.lst 2005-04-29 16:41:52 UTC (rev 14862) @@ -166,6 +166,7 @@ NtRequestWaitReplyPort 3 NtResetEvent 2 NtRestoreKey 3 +NtResumeProcess 1 NtResumeThread 2 NtSaveKey 2 NtSaveKeyEx 3 @@ -206,6 +207,7 @@ NtSignalAndWaitForSingleObject 4 NtStartProfile 1 NtStopProfile 1 +NtSuspendProcess 1 NtSuspendThread 2 NtSystemDebugControl 6 NtTerminateJobObject 2 _____ Modified: trunk/reactos/w32api/include/winnt.h --- trunk/reactos/w32api/include/winnt.h 2005-04-29 14:38:05 UTC (rev 14861) +++ trunk/reactos/w32api/include/winnt.h 2005-04-29 16:41:52 UTC (rev 14862) @@ -368,6 +368,7 @@ #define PROCESS_SET_QUOTA 256 #define PROCESS_SET_INFORMATION 512 #define PROCESS_QUERY_INFORMATION 1024 +#define PROCESS_SUSPEND_RESUME 2048 #define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xFFF) #define THREAD_TERMINATE 1 #define THREAD_SUSPEND_RESUME 2

19 years, 4 months

[ion] 14861: IRP Completion Fixes for 2nd-Stage:

by ion＠svn.reactos.com

IRP Completion Fixes for 2nd-Stage: - Free ALL Mdls, not just the first - Don't copy buffered data just because the Device Object is buffered. Check if the IRP is. - Don't handle MajorFunctions differenty, use flags which are now correctly set in order to determine course of action. - Free memory by using flag. - Don't remove IRP from Thread List too soon. - Don't use FileObject fields after dereferencing it. - Don't call IO Completion if there is already an APC routine. - Signal FileObject/UserEvent properly depending on cases. - Don't call UserAPC and set events like before if the IRP actually failed. Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-04-29 11:25:55 UTC (rev 14860) +++ trunk/reactos/ntoskrnl/io/file.c 2005-04-29 14:38:05 UTC (rev 14861) @@ -500,13 +500,18 @@ KeResetEvent( &FileObject->Event ); + IO_STATUS_BLOCK Dummy; + /* WRONG WRONG WRONG WRONG!!!!!! */ Irp = IoBuildSynchronousFsdRequest(IRP_MJ_CLEANUP, FileObject->DeviceObject, NULL, 0, NULL, &FileObject->Event, - NULL); + &Dummy); + /* Hack to fix the above WRONG WRONG WRONG WRONG CODE!!! */ + Irp->UserIosb = &Irp->IoStatus; + StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->FileObject = FileObject; @@ -890,6 +895,7 @@ * immediately. */ Status = IofCallDriver(FileObject->DeviceObject, Irp ); + DPRINT1("Status :%x\n", Status); if (Status == STATUS_PENDING) { _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-04-29 11:25:55 UTC (rev 14860) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-04-29 14:38:05 UTC (rev 14861) @@ -132,7 +132,7 @@ else { /* Set the Input Operation flag and set this as a User Buffer */ - Irp->Flags = IRP_INPUT_OPERATION; + Irp->Flags |= IRP_INPUT_OPERATION; Irp->UserBuffer = Buffer; } } @@ -189,6 +189,7 @@ } /* Set the Current Thread and IOSB */ + if (!IoStatusBlock) KEBUGCHECK(0); /* Temporary to catch illegal ROS Drivers */ Irp->UserIosb = IoStatusBlock; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); @@ -391,6 +392,7 @@ } /* Now write the Event and IoSB */ + if (!IoStatusBlock) KEBUGCHECK(0); /* Temporary to catch illegal ROS Drivers */ Irp->UserIosb = IoStatusBlock; Irp->UserEvent = Event; @@ -1172,309 +1174,223 @@ } VOID -IoDeviceControlCompletion(PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PIO_STACK_LOCATION IoStack) +STDCALL +IoSecondStageCompletion_KernelApcRoutine(PKAPC Apc, + PKNORMAL_ROUTINE *NormalRoutine, + PVOID *NormalContext, + PVOID *SystemArgument1, + PVOID *SystemArgument2) { - ULONG IoControlCode; - ULONG OutputBufferLength; - - if (IoStack->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL) - { - IoControlCode = - IoStack->Parameters.FileSystemControl.FsControlCode; - OutputBufferLength = - IoStack->Parameters.FileSystemControl.OutputBufferLength; - } - else - { - IoControlCode = IoStack->Parameters.DeviceIoControl.IoControlCode; - - if (NT_SUCCESS(Irp->IoStatus.Status)) - { - OutputBufferLength = Irp->IoStatus.Information; - - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < OutputBufferLength) - { - OutputBufferLength = IoStack->Parameters.DeviceIoControl.OutputBufferLength; - } - } - else - { - OutputBufferLength = 0; - } - } - - switch (IO_METHOD_FROM_CTL_CODE(IoControlCode)) - { - case METHOD_BUFFERED: - - /* copy output buffer back and free it */ - if (Irp->AssociatedIrp.SystemBuffer) - { - if (OutputBufferLength) - { - RtlCopyMemory(Irp->UserBuffer, - Irp->AssociatedIrp.SystemBuffer, - OutputBufferLength); - } - ExFreePool (Irp->AssociatedIrp.SystemBuffer); - } - break; - - case METHOD_IN_DIRECT: - DPRINT ("Using METHOD_IN_DIRECT!\n"); - /* use the same code as for METHOD_OUT_DIRECT */ - - case METHOD_OUT_DIRECT: - DPRINT ("Using METHOD_OUT_DIRECT!\n"); - - /* free input buffer (control buffer) */ - if (Irp->AssociatedIrp.SystemBuffer) - ExFreePool (Irp->AssociatedIrp.SystemBuffer); - - /* free output buffer (data transfer buffer) */ - if (Irp->MdlAddress) - IoFreeMdl (Irp->MdlAddress); - break; - - case METHOD_NEITHER: - DPRINT ("Using METHOD_NEITHER!\n"); - /* nothing to do */ - break; - } + /* Free the IRP */ + IoFreeIrp(CONTAINING_RECORD(Apc, IRP, Tail.Apc)); } -VOID IoReadWriteCompletion(PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PIO_STACK_LOCATION IoStack) -{ - PFILE_OBJECT FileObject; - - FileObject = IoStack->FileObject; - - if (DeviceObject->Flags & DO_BUFFERED_IO) - { - if (IoStack->MajorFunction == IRP_MJ_READ) - { - DPRINT("Copying buffered io back to user\n"); - memcpy(Irp->UserBuffer,Irp->AssociatedIrp.SystemBuffer, - IoStack->Parameters.Read.Length); - } - ExFreePool(Irp->AssociatedIrp.SystemBuffer); - } - - if (DeviceObject->Flags & DO_DIRECT_IO) - { - if (Irp->MdlAddress) - { - IoFreeMdl(Irp->MdlAddress); - } - } -} - -VOID IoVolumeInformationCompletion(PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PIO_STACK_LOCATION IoStack) +VOID +STDCALL +IoSecondStageCompletion_RundownApcRoutine(PKAPC Apc) { + /* Free the IRP */ + IoFreeIrp(CONTAINING_RECORD(Apc, IRP, Tail.Apc)); } - -VOID STDCALL -IoSecondStageCompletion_KernelApcRoutine( - IN PKAPC Apc, - IN OUT PKNORMAL_ROUTINE *NormalRoutine, - IN OUT PVOID *NormalContext, - IN OUT PVOID *SystemArgument1, - IN OUT PVOID *SystemArgument2 - ) -{ - PIRP Irp; - - Irp = CONTAINING_RECORD(Apc, IRP, Tail.Apc); - IoFreeIrp(Irp); -} - - -VOID STDCALL -IoSecondStageCompletion_RundownApcRoutine( - IN PKAPC Apc - ) -{ - PIRP Irp; - - Irp = CONTAINING_RECORD(Apc, IRP, Tail.Apc); - IoFreeIrp(Irp); -} - - /* * FUNCTION: Performs the second stage of irp completion for read/write irps * * Called as a special kernel APC kernel-routine or directly from IofCompleteRequest() + * + * Note that we'll never see irp's flagged IRP_PAGING_IO (IRP_MOUNT_OPERATION) + * or IRP_CLOSE_OPERATION (IRP_MJ_CLOSE and IRP_MJ_CLEANUP) here since their + * cleanup/completion is fully taken care of in IoCompleteRequest. + * -Gunnar */ -VOID STDCALL -IoSecondStageCompletion( - PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArgument2) - +VOID +STDCALL +IoSecondStageCompletion(PKAPC Apc, + PKNORMAL_ROUTINE* NormalRoutine, + PVOID* NormalContext, + PVOID* SystemArgument1, + PVOID* SystemArgument2) { - PIO_STACK_LOCATION IoStack; - PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT OriginalFileObject; - PIRP Irp; + PFILE_OBJECT FileObject; + PIRP Irp; + PMDL Mdl, NextMdl; - if (Apc) DPRINT("IoSecondStageCompletition with APC: %x\n", Apc); + if (Apc) DPRINT("IoSecondStageCompletition with APC: %x\n", Apc); - OriginalFileObject = (PFILE_OBJECT)(*SystemArgument1); - DPRINT("OriginalFileObject: %x\n", OriginalFileObject); + /* Get data from the APC */ + FileObject = (PFILE_OBJECT)(*SystemArgument1); + Irp = CONTAINING_RECORD(Apc, IRP, Tail.Apc); + DPRINT("IoSecondStageCompletition, %x\n", Irp); + + /* Handle Buffered case first */ + if (Irp->Flags & IRP_BUFFERED_IO) + { + /* Check if we have an input buffer and if we suceeded */ + if (Irp->Flags & IRP_INPUT_OPERATION && NT_SUCCESS(Irp->IoStatus.Status)) + { + /* Copy the buffer back to the user */ + RtlCopyMemory(Irp->UserBuffer, + Irp->AssociatedIrp.SystemBuffer, + Irp->IoStatus.Information); + } + + /* Also check if we should de-allocate it */ + if (Irp->Flags & IRP_DEALLOCATE_BUFFER) + { + ExFreePool(Irp->AssociatedIrp.SystemBuffer); + } + } + + /* Now we got rid of these two... */ + Irp->Flags &= ~(IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER); + + /* Check if there's an MDL */ + if ((Mdl = Irp->MdlAddress)) + { + /* Clear all of them */ + do + { + NextMdl = Mdl->Next; + IoFreeMdl(Mdl); + Mdl = NextMdl; + } while (Mdl); + } + Irp->MdlAddress = NULL; + + /* Check for Success but allow failure for Async IRPs */ + if (NT_SUCCESS(Irp->IoStatus.Status) || + (Irp->PendingReturned && + !(Irp->Flags & IRP_SYNCHRONOUS_API) && + (FileObject == NULL || FileObject->Flags & FO_SYNCHRONOUS_IO))) + { + /* Save the IOSB Information */ + *Irp->UserIosb = Irp->IoStatus; + + /* Check if there's an event */ + if (Irp->UserEvent) + { + /* Signal the Event */ + KeSetEvent(Irp->UserEvent, 0, FALSE); + + } + else if (FileObject) + { + /* Signal the File Object Instead */ + KeSetEvent(&FileObject->Event, 0, FALSE); + + /* Set the Status */ + FileObject->FinalStatus = Irp->IoStatus.Status; + } + + /* Check if there's a File Object */ + if (FileObject) + { + /* Dereference the Event if this is an ASYNC IRP */ + if (!Irp->Flags & IRP_SYNCHRONOUS_API) + { + ObDereferenceObject(Irp->UserEvent); + } + + /* If the File Object is SYNC, then we need to signal its event too */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Signal Event */ - Irp = CONTAINING_RECORD(Apc, IRP, Tail.Apc); - DPRINT("Irp: %x\n", Irp); - - /* - * Note that we'll never see irp's flagged IRP_PAGING_IO (IRP_MOUNT_OPERATION) - * or IRP_CLOSE_OPERATION (IRP_MJ_CLOSE and IRP_MJ_CLEANUP) here since their - * cleanup/completion is fully taken care of in IoCompleteRequest. - * -Gunnar - */ + KeSetEvent(&FileObject->Event, 0, FALSE); + + /* Set the Status */ + FileObject->FinalStatus = Irp->IoStatus.Status; + } + } - /* - Remove synchronous irp's from the threads cleanup list. - To synchronize with the code inserting the entry, this code must run - at APC_LEVEL - */ - if (!IsListEmpty(&Irp->ThreadListEntry)) - { - RemoveEntryList(&Irp->ThreadListEntry); - InitializeListHead(&Irp->ThreadListEntry); - } - - IoStack = (PIO_STACK_LOCATION)(Irp+1) + Irp->CurrentLocation; - DeviceObject = IoStack->DeviceObject; + /* Remove the IRP from the list of Thread Pending IRPs */ + RemoveEntryList(&Irp->ThreadListEntry); + InitializeListHead(&Irp->ThreadListEntry); + + /* Now call the User APC if one was requested */ + if (Irp->Overlay.AsynchronousParameters.UserApcRoutine != NULL) + { + KeInitializeApc(&Irp->Tail.Apc, + KeGetCurrentThread(), + CurrentApcEnvironment, + IoSecondStageCompletion_KernelApcRoutine, + IoSecondStageCompletion_RundownApcRoutine, + (PKNORMAL_ROUTINE)Irp->Overlay.AsynchronousParameters.UserApcRoutine, + Irp->RequestorMode, + Irp->Overlay.AsynchronousParameters.UserApcContext); - DPRINT("IoSecondStageCompletion(Irp %x, MajorFunction %x)\n", Irp, IoStack->MajorFunction); - - switch (IoStack->MajorFunction) - { - case IRP_MJ_CREATE: - case IRP_MJ_FLUSH_BUFFERS: - /* NOP */ - break; - - case IRP_MJ_READ: - case IRP_MJ_WRITE: - IoReadWriteCompletion(DeviceObject,Irp,IoStack); - break; - - case IRP_MJ_DEVICE_CONTROL: - case IRP_MJ_INTERNAL_DEVICE_CONTROL: - case IRP_MJ_FILE_SYSTEM_CONTROL: - IoDeviceControlCompletion(DeviceObject, Irp, IoStack); - break; - - case IRP_MJ_QUERY_VOLUME_INFORMATION: - case IRP_MJ_SET_VOLUME_INFORMATION: - IoVolumeInformationCompletion(DeviceObject, Irp, IoStack); - break; - - default: - break; - } - - if (Irp->UserIosb!=NULL) - { - if (Irp->RequestorMode == KernelMode) - { - *Irp->UserIosb = Irp->IoStatus; - } - else - { - DPRINT("Irp->RequestorMode == UserMode\n"); - MmSafeCopyToUser(Irp->UserIosb, - &Irp->IoStatus, - sizeof(IO_STATUS_BLOCK)); - } - } - - if (Irp->UserEvent) - { - KeSetEvent(Irp->UserEvent,0,FALSE); - } - - //Windows NT File System Internals, page 169 - if (OriginalFileObject) - { - if (Irp->UserEvent == NULL) - { - KeSetEvent(&OriginalFileObject->Event,0,FALSE); - } - else if (OriginalFileObject->Flags & FO_SYNCHRONOUS_IO && Irp->UserEvent != &OriginalFileObject->Event) - { - KeSetEvent(&OriginalFileObject->Event,0,FALSE); - } - } - - //Windows NT File System Internals, page 154 - if (OriginalFileObject) - { - // if the event is not the one in the file object, it needs dereferenced - if (Irp->UserEvent && Irp->UserEvent != &OriginalFileObject->Event) - { - ObDereferenceObject(Irp->UserEvent); - } - - ObDereferenceObject(OriginalFileObject); - } - - if (Irp->Overlay.AsynchronousParameters.UserApcRoutine != NULL) - { - PKNORMAL_ROUTINE UserApcRoutine; - PVOID UserApcContext; - - DPRINT("Dispatching user APC\n"); - - UserApcRoutine = (PKNORMAL_ROUTINE)Irp->Overlay.AsynchronousParameters.UserApcRoutine; - UserApcContext = (PVOID)Irp->Overlay.AsynchronousParameters.UserApcContext; - - KeInitializeApc( &Irp->Tail.Apc, - KeGetCurrentThread(), - CurrentApcEnvironment, - IoSecondStageCompletion_KernelApcRoutine, - IoSecondStageCompletion_RundownApcRoutine, - UserApcRoutine, - UserMode, - UserApcContext); - - KeInsertQueueApc( &Irp->Tail.Apc, - Irp->UserIosb, - NULL, - 2); - - //NOTE: kernel (or rundown) routine frees the IRP - - return; - - } - - if (NULL != IoStack->FileObject - && NULL != IoStack->FileObject->CompletionContext - && (0 != (Irp->Flags & IRP_SYNCHRONOUS_API) - || 0 == (IoStack->FileObject->Flags & FO_SYNCHRONOUS_IO))) - { - PFILE_OBJECT FileObject = IoStack->FileObject; - IoSetIoCompletion(FileObject->CompletionContext->Port, - FileObject->CompletionContext->Key, - Irp->Overlay.AsynchronousParameters.UserApcContext, - Irp->IoStatus.Status, - Irp->IoStatus.Information, - FALSE); - } - - IoFreeIrp(Irp); + KeInsertQueueApc(&Irp->Tail.Apc, + Irp->UserIosb, + NULL, + 2); + } + else if (FileObject && FileObject->CompletionContext) + { + /* Call the IO Completion Port if we have one, instead */ + IoSetIoCompletion(FileObject->CompletionContext->Port, + FileObject->CompletionContext->Key, + Irp->Overlay.AsynchronousParameters.UserApcContext, + Irp->IoStatus.Status, + Irp->IoStatus.Information, + FALSE); + } + else + { + /* Don't have anything, free it */ + IoFreeIrp(Irp); + } + + /* Dereference the File Object */ + if (FileObject) ObDereferenceObject(FileObject); + } + else + { + /* Remove the IRP from the list of Thread Pending IRPs */ + RemoveEntryList(&Irp->ThreadListEntry); + InitializeListHead(&Irp->ThreadListEntry); + + /* Signal the Events only if PendingReturned and we have a File Object */ + if (FileObject && Irp->PendingReturned) + { + /* Check for SYNC IRP */ + if (Irp->Flags & IRP_SYNCHRONOUS_API) + { + /* Set the status in this case only */ + *Irp->UserIosb = Irp->IoStatus; + + /* Signal our event if we have one */ + if (Irp->UserEvent) + { + KeSetEvent(Irp->UserEvent, 0, FALSE); + } + else + { + /* Signal the File's Event instead */ + KeSetEvent(&FileObject->Event, 0, FALSE); + } + } + else + { + /* We'll report the Status to the File Object, not the IRP */ + FileObject->FinalStatus = Irp->IoStatus.Status; + + /* Signal the File Object ONLY if this was Async */ + KeSetEvent(&FileObject->Event, 0, FALSE); + } + } + + /* Dereference the Event if it's an ASYNC IRP on a File Object */ + if (Irp->UserEvent && !(Irp->Flags & IRP_SYNCHRONOUS_API) && FileObject) + { + ObDereferenceObject(Irp->UserEvent); + } + + /* Dereference the File Object */ + if (FileObject) ObDereferenceObject(FileObject); + + /* Free the IRP */ + IoFreeIrp(Irp); + } } /* EOF */

19 years, 4 months

[fireball] 14860: Import from WINE 25.04.05 (just because we have old version sitting in our SVN, which shows failures even on WinXP).

by fireball＠svn.reactos.com

Import from WINE 25.04.05 (just because we have old version sitting in our SVN, which shows failures even on WinXP). Now "advapi32_test registry" has 0 failures on Windows XP Pro. (and generally should have 0 failures under ROS too...) Modified: trunk/reactos/lib/advapi32/winetests/crypt.c Modified: trunk/reactos/lib/advapi32/winetests/crypt_lmhash.c Modified: trunk/reactos/lib/advapi32/winetests/crypt_md4.c Modified: trunk/reactos/lib/advapi32/winetests/crypt_md5.c Modified: trunk/reactos/lib/advapi32/winetests/crypt_sha.c Modified: trunk/reactos/lib/advapi32/winetests/registry.c Modified: trunk/reactos/lib/advapi32/winetests/security.c _____ Modified: trunk/reactos/lib/advapi32/winetests/crypt.c --- trunk/reactos/lib/advapi32/winetests/crypt.c 2005-04-29 07:35:01 UTC (rev 14859) +++ trunk/reactos/lib/advapi32/winetests/crypt.c 2005-04-29 11:25:55 UTC (rev 14860) @@ -1,575 +1,764 @@ -/* - * Unit tests for crypt functions - * - * Copyright (c) 2004 Michael Jung - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "winerror.h" -#include "winreg.h" - -#include "wine/test.h" - -static const char szRsaBaseProv[] = MS_DEF_PROV_A; -static const char szNonExistentProv[] = "Wine Nonexistent Cryptographic Provider v11.2"; -static const char szKeySet[] = "wine_test_keyset"; -static const char szBadKeySet[] = "wine_test_bad_keyset"; -#define NON_DEF_PROV_TYPE 999 - -static HMODULE hadvapi32; -static BOOL (WINAPI *pCryptAcquireContextA)(HCRYPTPROV*,LPCSTR,LPCSTR,DWORD,DWORD); -static BOOL (WINAPI *pCryptEnumProviderTypesA)(DWORD, DWORD*, DWORD, DWORD*, LPSTR, DWORD*); -static BOOL (WINAPI *pCryptEnumProvidersA)(DWORD, DWORD*, DWORD, DWORD*, LPSTR, DWORD*); -static BOOL (WINAPI *pCryptGetDefaultProviderA)(DWORD, DWORD*, DWORD, LPSTR, DWORD*); -static BOOL (WINAPI *pCryptReleaseContext)(HCRYPTPROV, DWORD); -static BOOL (WINAPI *pCryptSetProviderExA)(LPCSTR, DWORD, DWORD*, DWORD); - -static void init_function_pointers(void) -{ - hadvapi32 = GetModuleHandleA("advapi32.dll"); - - if(hadvapi32) - { - pCryptAcquireContextA = (void*)GetProcAddress(hadvapi32, "CryptAcquireContextA"); - pCryptEnumProviderTypesA = (void*)GetProcAddress(hadvapi32, "CryptEnumProviderTypesA"); - pCryptEnumProvidersA = (void*)GetProcAddress(hadvapi32, "CryptEnumProvidersA"); - pCryptGetDefaultProviderA = (void*)GetProcAddress(hadvapi32, "CryptGetDefaultProviderA"); - pCryptReleaseContext = (void*)GetProcAddress(hadvapi32, "CryptReleaseContext"); - pCryptSetProviderExA = (void*)GetProcAddress(hadvapi32, "CryptSetProviderExA"); - } -} - - -static void init_environment(void) -{ - HCRYPTPROV hProv; - - /* Ensure that container "wine_test_keyset" does exist */ - if (!pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) - { - pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_NEWKEYSET); - } - pCryptReleaseContext(hProv, 0); - - /* Ensure that container "wine_test_keyset" does exist in default PROV_RSA_FULL type provider */ - if (!pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, 0)) - { - pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); - } - pCryptReleaseContext(hProv, 0); - - /* Ensure that container "wine_test_bad_keyset" does not exist. */ - if (pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) - { - pCryptReleaseContext(hProv, 0); - pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - } -} - -static void clean_up_environment(void) -{ - HCRYPTPROV hProv; - - /* Remove container "wine_test_keyset" */ - if (pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) - { - pCryptReleaseContext(hProv, 0); - pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - } - - /* Remove container "wine_test_keyset" from default PROV_RSA_FULL type provider */ - if (pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, 0)) - { - pCryptReleaseContext(hProv, 0); - pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - } -} - -static void test_acquire_context(void) -{ - BOOL result; - HCRYPTPROV hProv; - - /* Provoke all kinds of error conditions (which are easy to provoke). - * The order of the error tests seems to match Windows XP's rsaenh.dll CSP, - * but since this is likely to change between CSP versions, we don't check - * this. Please don't change the order of tests. */ - result = pCryptAcquireContextA(&hProv, NULL, NULL, 0, 0); - ok(!result && GetLastError()==NTE_BAD_PROV_TYPE, "%ld\n", GetLastError()); - - result = pCryptAcquireContextA(&hProv, NULL, NULL, 1000, 0); - ok(!result && GetLastError()==NTE_BAD_PROV_TYPE, "%ld\n", GetLastError()); - - result = pCryptAcquireContextA(&hProv, NULL, NULL, NON_DEF_PROV_TYPE, 0); - ok(!result && GetLastError()==NTE_PROV_TYPE_NOT_DEF, "%ld\n", GetLastError()); - - result = pCryptAcquireContextA(&hProv, szKeySet, szNonExistentProv, PROV_RSA_FULL, 0); - ok(!result && GetLastError()==NTE_KEYSET_NOT_DEF, "%ld\n", GetLastError()); - - result = pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, NON_DEF_PROV_TYPE, 0); - ok(!result && GetLastError()==NTE_PROV_TYPE_NO_MATCH, "%ld\n", GetLastError()); - - /* This test fails under Win2k SP4: - result = TRUE, GetLastError() == ERROR_INVALID_PARAMETER - SetLastError(0xdeadbeef); - result = pCryptAcquireContextA(NULL, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); - ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "%d/%ld\n", result, GetLastError()); - */ - - /* Last not least, try to really acquire a context. */ - hProv = 0; - SetLastError(0xdeadbeef); - result = pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); - ok(result && (GetLastError() == ERROR_ENVVAR_NOT_FOUND || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_RING2_STACK_IN_USE), "%d/%ld\n", result, GetLastError()); - - if (hProv) - pCryptReleaseContext(hProv, 0); - - /* Try again, witch an empty ("\0") szProvider parameter */ - hProv = 0; - SetLastError(0xdeadbeef); - result = pCryptAcquireContextA(&hProv, szKeySet, "", PROV_RSA_FULL, 0); - ok(result && (GetLastError() == ERROR_ENVVAR_NOT_FOUND || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_RING2_STACK_IN_USE), "%d/%ld\n", result, GetLastError()); - - if (hProv) - pCryptReleaseContext(hProv, 0); -} - -static BOOL FindProvRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszProvName, - DWORD *pcbProvName, DWORD *pdwProvCount) -{ - HKEY hKey; - HKEY subkey; - DWORD size = sizeof(DWORD); - - if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\Defaults\\Provider", &hKey)) - return FALSE; - - RegQueryInfoKey(hKey, NULL, NULL, NULL, pdwProvCount, pcbProvName, - NULL, NULL, NULL, NULL, NULL, NULL); - (*pcbProvName)++; - - if (!(*pszProvName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, *pcbProvName)))) - return FALSE; - - RegEnumKeyEx(hKey, dwIndex, *pszProvName, pcbProvName, NULL, NULL, NULL, NULL); - (*pcbProvName)++; - - RegOpenKey(hKey, *pszProvName, &subkey); - RegQueryValueEx(subkey, "Type", NULL, NULL, (BYTE*)pdwProvType, &size); - - RegCloseKey(subkey); - RegCloseKey(hKey); - - return TRUE; -} - -static void test_enum_providers(void) -{ - /* expected results */ - CHAR *pszProvName = NULL; - DWORD cbName; - DWORD dwType; - DWORD provCount; - DWORD dwIndex = 0; - - /* actual results */ - CHAR *provider = NULL; - DWORD providerLen; - DWORD type; - DWORD count; - BOOL result; - DWORD notNull = 5; - DWORD notZeroFlags = 5; - - if(!pCryptEnumProvidersA) - { - trace("skipping CryptEnumProviders tests\n"); - return; - } - - if (!FindProvRegVals(dwIndex, &dwType, &pszProvName, &cbName, &provCount)) - return; - - /* check pdwReserved flag for NULL */ - result = pCryptEnumProvidersA(dwIndex, &notNull, 0, &type, NULL, &providerLen); - ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); - - /* check dwFlags == 0 */ - result = pCryptEnumProvidersA(dwIndex, NULL, notZeroFlags, &type, NULL, &providerLen); - ok(!result && GetLastError()==NTE_BAD_FLAGS, "%ld\n", GetLastError()); - - /* alloc provider to half the size required - * cbName holds the size required */ - providerLen = cbName / 2; - if (!(provider = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, providerLen)))) - return; - - result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, provider, &providerLen); - ok(!result && GetLastError()==ERROR_MORE_DATA, "expected %i, got %ld\n", - ERROR_MORE_DATA, GetLastError()); - - LocalFree(provider); - - /* loop through the providers to get the number of providers - * after loop ends, count should be provCount + 1 so subtract 1 - * to get actual number of providers */ - count = 0; - while(pCryptEnumProvidersA(count++, NULL, 0, &type, NULL, &providerLen)) - ; - count--; - ok(count==provCount, "expected %i, got %i\n", (int)provCount, (int)count); - - /* loop past the actual number of providers to get the error - * ERROR_NO_MORE_ITEMS */ - for (count = 0; count < provCount + 1; count++) - result = pCryptEnumProvidersA(count, NULL, 0, &type, NULL, &providerLen); - ok(!result && GetLastError()==ERROR_NO_MORE_ITEMS, "expected %i, got %ld\n", - ERROR_NO_MORE_ITEMS, GetLastError()); - - /* check expected versus actual values returned */ - result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, NULL, &providerLen); - ok(result && providerLen==cbName, "expected %i, got %i\n", (int)cbName, (int)providerLen); - if (!(provider = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, providerLen)))) - return; - - result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, provider, &providerLen); - ok(result && type==dwType, "expected %ld, got %ld\n", - dwType, type); - ok(result && !strcmp(pszProvName, provider), "expected %s, got %s\n", pszProvName, provider); - ok(result && cbName==providerLen, "expected %ld, got %ld\n", - cbName, providerLen); - - LocalFree(provider); -} - -static BOOL FindProvTypesRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszTypeName, - DWORD *pcbTypeName, DWORD *pdwTypeCount) -{ - HKEY hKey; - HKEY hSubKey; - PSTR ch; - - if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\Defaults\\Provider Types", &hKey)) - return FALSE; - - if (RegQueryInfoKey(hKey, NULL, NULL, NULL, pdwTypeCount, pcbTypeName, NULL, - NULL, NULL, NULL, NULL, NULL)) - return FALSE; - (*pcbTypeName)++; - - if (!(*pszTypeName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, *pcbTypeName)))) - return FALSE; - - if (RegEnumKeyEx(hKey, dwIndex, *pszTypeName, pcbTypeName, NULL, NULL, NULL, NULL)) - return FALSE; - (*pcbTypeName)++; - ch = *pszTypeName + strlen(*pszTypeName); - /* Convert "Type 000" to 0, etc/ */ - *pdwProvType = *(--ch) - '0'; - *pdwProvType += (*(--ch) - '0') * 10; - *pdwProvType += (*(--ch) - '0') * 100; - - if (RegOpenKey(hKey, *pszTypeName, &hSubKey)) - return FALSE; - - if (RegQueryValueEx(hSubKey, "TypeName", NULL, NULL, NULL, pcbTypeName)) - return FALSE; - - if (!(*pszTypeName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, *pcbTypeName)))) - return FALSE; - - if (RegQueryValueEx(hSubKey, "TypeName", NULL, NULL, *pszTypeName, pcbTypeName)) - return FALSE; - - RegCloseKey(hSubKey); - RegCloseKey(hKey); - - return TRUE; -} - -static void test_enum_provider_types() -{ - /* expected values */ - DWORD dwProvType; - LPSTR pszTypeName = NULL; - DWORD cbTypeName; - DWORD dwTypeCount; - - /* actual values */ - DWORD index = 0; - DWORD provType; - LPSTR typeName = NULL; - DWORD typeNameSize; - DWORD typeCount; - DWORD result; - DWORD notNull = 5; - DWORD notZeroFlags = 5; - - if(!pCryptEnumProviderTypesA) - { - trace("skipping CryptEnumProviderTypes tests\n"); - return; - } - - if (!FindProvTypesRegVals(index, &dwProvType, &pszTypeName, &cbTypeName, &dwTypeCount)) - { - trace("could not find provider types in registry, skipping the test\n"); - return; - } - - /* check pdwReserved for NULL */ - result = pCryptEnumProviderTypesA(index, &notNull, 0, &provType, typeName, &typeNameSize); - ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "expected %i, got %ld\n", - ERROR_INVALID_PARAMETER, GetLastError()); - - /* check dwFlags == zero */ - result = pCryptEnumProviderTypesA(index, NULL, notZeroFlags, &provType, typeName, &typeNameSize); - ok(!result && GetLastError()==NTE_BAD_FLAGS, "expected %i, got %ld\n", - ERROR_INVALID_PARAMETER, GetLastError()); - - /* alloc provider type to half the size required - * cbTypeName holds the size required */ - typeNameSize = cbTypeName / 2; - if (!(typeName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, typeNameSize)))) - return; - - /* This test fails under Win2k SP4: - result = TRUE, GetLastError() == 0xdeadbeef - SetLastError(0xdeadbeef); - result = pCryptEnumProviderTypesA(index, NULL, 0, &provType, typeName, &typeNameSize); - ok(!result && GetLastError()==ERROR_MORE_DATA, "expected 0/ERROR_MORE_DATA, got %d/%08lx\n", - result, GetLastError()); - */ - - LocalFree(typeName); - - /* loop through the provider types to get the number of provider types - * after loop ends, count should be dwTypeCount + 1 so subtract 1 - * to get actual number of provider types */ - typeCount = 0; - while(pCryptEnumProviderTypesA(typeCount++, NULL, 0, &provType, NULL, &typeNameSize)) - ; - typeCount--; - ok(typeCount==dwTypeCount, "expected %ld, got %ld\n", dwTypeCount, typeCount); - - /* loop past the actual number of provider types to get the error - * ERROR_NO_MORE_ITEMS */ - for (typeCount = 0; typeCount < dwTypeCount + 1; typeCount++) - result = pCryptEnumProviderTypesA(typeCount, NULL, 0, &provType, NULL, &typeNameSize); - ok(!result && GetLastError()==ERROR_NO_MORE_ITEMS, "expected %i, got %ld\n", - ERROR_NO_MORE_ITEMS, GetLastError()); - - - /* check expected versus actual values returned */ - result = pCryptEnumProviderTypesA(index, NULL, 0, &provType, NULL, &typeNameSize); - ok(result && typeNameSize==cbTypeName, "expected %ld, got %ld\n", cbTypeName, typeNameSize); - if (!(typeName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, typeNameSize)))) - return; - - typeNameSize = 0xdeadbeef; - result = pCryptEnumProviderTypesA(index, NULL, 0, &provType, typeName, &typeNameSize); - ok(result, "expected TRUE, got %ld\n", result); - ok(provType==dwProvType, "expected %ld, got %ld\n", dwProvType, provType); - if (pszTypeName) - ok(!strcmp(pszTypeName, typeName), "expected %s, got %s\n", pszTypeName, typeName); - ok(typeNameSize==cbTypeName, "expected %ld, got %ld\n", cbTypeName, typeNameSize); - - LocalFree(typeName); -} - -static BOOL FindDfltProvRegVals(DWORD dwProvType, DWORD dwFlags, LPSTR *pszProvName, DWORD *pcbProvName) -{ - HKEY hKey; - PSTR keyname; - PSTR ptr; - DWORD user = dwFlags & CRYPT_USER_DEFAULT; - - LPSTR MACHINESTR = "Software\\Microsoft\\Cryptography\\Defaults\\Provider Types\\Type XXX"; - LPSTR USERSTR = "Software\\Microsoft\\Cryptography\\Provider Type XXX"; - - keyname = LocalAlloc(LMEM_ZEROINIT, (user ? strlen(USERSTR) : strlen(MACHINESTR)) + 1); - if (keyname) - { - user ? strcpy(keyname, USERSTR) : strcpy(keyname, MACHINESTR); - ptr = keyname + strlen(keyname); - *(--ptr) = (dwProvType % 10) + '0'; - *(--ptr) = ((dwProvType / 10) % 10) + '0'; - *(--ptr) = (dwProvType / 100) + '0'; - } else - return FALSE; - - if (RegOpenKey((dwFlags & CRYPT_USER_DEFAULT) ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE ,keyname, &hKey)) - { - LocalFree(keyname); - return FALSE; - } - LocalFree(keyname); - - if (RegQueryValueEx(hKey, "Name", NULL, NULL, *pszProvName, pcbProvName)) - { - if (GetLastError() != ERROR_MORE_DATA) - SetLastError(NTE_PROV_TYPE_ENTRY_BAD); - return FALSE; - } - - if (!(*pszProvName = LocalAlloc(LMEM_ZEROINIT, *pcbProvName))) - return FALSE; - - if (RegQueryValueEx(hKey, "Name", NULL, NULL, *pszProvName, pcbProvName)) - { - if (GetLastError() != ERROR_MORE_DATA) - SetLastError(NTE_PROV_TYPE_ENTRY_BAD); - return FALSE; - } - - RegCloseKey(hKey); - - return TRUE; -} - -static void test_get_default_provider() -{ - /* expected results */ - DWORD dwProvType = PROV_RSA_FULL; - DWORD dwFlags = CRYPT_MACHINE_DEFAULT; - LPSTR pszProvName = NULL; - DWORD cbProvName; - - /* actual results */ - DWORD provType = PROV_RSA_FULL; - DWORD flags = CRYPT_MACHINE_DEFAULT; - LPSTR provName = NULL; - DWORD provNameSize; - DWORD result; - DWORD notNull = 5; - - if(!pCryptGetDefaultProviderA) - { - trace("skipping CryptGetDefaultProvider tests\n"); - return; - } - - FindDfltProvRegVals(dwProvType, dwFlags, &pszProvName, &cbProvName); - - /* check pdwReserved for NULL */ - result = pCryptGetDefaultProviderA(provType, &notNull, flags, provName, &provNameSize); - ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "expected %i, got %ld\n", - ERROR_INVALID_PARAMETER, GetLastError()); - - /* check for invalid flag */ - flags = 0xdeadbeef; - result = pCryptGetDefaultProviderA(provType, NULL, flags, provName, &provNameSize); - ok(!result && GetLastError()==NTE_BAD_FLAGS, "expected %ld, got %ld\n", - NTE_BAD_FLAGS, GetLastError()); - flags = CRYPT_MACHINE_DEFAULT; - - /* check for invalid prov type */ - provType = 0xdeadbeef; - result = pCryptGetDefaultProviderA(provType, NULL, flags, provName, &provNameSize); - ok(!result && (GetLastError() == NTE_BAD_PROV_TYPE || - GetLastError() == ERROR_INVALID_PARAMETER), - "expected NTE_BAD_PROV_TYPE or ERROR_INVALID_PARAMETER, got %ld/%ld\n", - result, GetLastError()); - provType = PROV_RSA_FULL; - - SetLastError(0); - - /* alloc provName to half the size required - * cbProvName holds the size required */ - provNameSize = cbProvName / 2; - if (!(provName = LocalAlloc(LMEM_ZEROINIT, provNameSize))) - return; - - result = pCryptGetDefaultProviderA(provType, NULL, flags, provName, &provNameSize); - ok(!result && GetLastError()==ERROR_MORE_DATA, "expected %i, got %ld\n", - ERROR_MORE_DATA, GetLastError()); - - LocalFree(provName); - - /* check expected versus actual values returned */ - result = pCryptGetDefaultProviderA(provType, NULL, flags, NULL, &provNameSize); - ok(result && provNameSize==cbProvName, "expected %ld, got %ld\n", cbProvName, provNameSize); - provNameSize = cbProvName; - - if (!(provName = LocalAlloc(LMEM_ZEROINIT, provNameSize))) - return; - - result = pCryptGetDefaultProviderA(provType, NULL, flags, provName, &provNameSize); - ok(result && !strcmp(pszProvName, provName), "expected %s, got %s\n", pszProvName, provName); - ok(result && provNameSize==cbProvName, "expected %ld, got %ld\n", cbProvName, provNameSize); - - LocalFree(provName); -} - -static void test_set_provider_ex() -{ - DWORD result; - DWORD notNull = 5; - - /* results */ - LPSTR pszProvName = NULL; - DWORD cbProvName; - - if(!pCryptGetDefaultProviderA || !pCryptSetProviderExA) - { - trace("skipping CryptSetProviderEx tests\n"); - return; - } - - /* check pdwReserved for NULL */ - result = pCryptSetProviderExA(MS_DEF_PROV, PROV_RSA_FULL, &notNull, CRYPT_MACHINE_DEFAULT); - ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "expected %i, got %ld\n", - ERROR_INVALID_PARAMETER, GetLastError()); - - /* remove the default provider and then set it to MS_DEF_PROV/PROV_RSA_FULL */ - result = pCryptSetProviderExA(MS_DEF_PROV, PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT | CRYPT_DELETE_DEFAULT); - ok(result, "%ld\n", GetLastError()); - - result = pCryptSetProviderExA(MS_DEF_PROV, PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT); - ok(result, "%ld\n", GetLastError()); - - /* call CryptGetDefaultProvider to see if they match */ - result = pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, NULL, &cbProvName); - if (!(pszProvName = LocalAlloc(LMEM_ZEROINIT, cbProvName))) - return; - - result = pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, pszProvName, &cbProvName); - ok(result && !strcmp(MS_DEF_PROV, pszProvName), "expected %s, got %s\n", MS_DEF_PROV, pszProvName); - ok(result && cbProvName==(strlen(MS_DEF_PROV) + 1), "expected %i, got %ld\n", (strlen(MS_DEF_PROV) + 1), cbProvName); - - LocalFree(pszProvName); -} - -START_TEST(crypt) -{ - init_function_pointers(); - if(pCryptAcquireContextA && pCryptReleaseContext) { - init_environment(); - test_acquire_context(); - clean_up_environment(); - } - - test_enum_providers(); - test_enum_provider_types(); - test_get_default_provider(); - test_set_provider_ex(); -} +/* + * Unit tests for crypt functions + * + * Copyright (c) 2004 Michael Jung + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wincrypt.h" +#include "winerror.h" +#include "winreg.h" + +#include "wine/test.h" + +static const char szRsaBaseProv[] = MS_DEF_PROV_A; +static const char szNonExistentProv[] = "Wine Nonexistent Cryptographic Provider v11.2"; +static const char szKeySet[] = "wine_test_keyset"; +static const char szBadKeySet[] = "wine_test_bad_keyset"; +#define NON_DEF_PROV_TYPE 999 + +static HMODULE hadvapi32; +static BOOL (WINAPI *pCryptAcquireContextA)(HCRYPTPROV*,LPCSTR,LPCSTR,DWORD,DWORD); +static BOOL (WINAPI *pCryptEnumProviderTypesA)(DWORD, DWORD*, DWORD, DWORD*, LPSTR, DWORD*); +static BOOL (WINAPI *pCryptEnumProvidersA)(DWORD, DWORD*, DWORD, DWORD*, LPSTR, DWORD*); +static BOOL (WINAPI *pCryptGetDefaultProviderA)(DWORD, DWORD*, DWORD, LPSTR, DWORD*); +static BOOL (WINAPI *pCryptReleaseContext)(HCRYPTPROV, DWORD); +static BOOL (WINAPI *pCryptSetProviderExA)(LPCSTR, DWORD, DWORD*, DWORD); +static BOOL (WINAPI *pCryptCreateHash)(HCRYPTPROV, ALG_ID, HCRYPTKEY, DWORD, HCRYPTHASH*); +static BOOL (WINAPI *pCryptDestroyHash)(HCRYPTHASH); +static BOOL (WINAPI *pCryptGenRandom)(HCRYPTPROV, DWORD, BYTE*); +static BOOL (WINAPI *pCryptContextAddRef)(HCRYPTPROV, DWORD*, DWORD dwFlags); +static BOOL (WINAPI *pCryptGenKey)(HCRYPTPROV, ALG_ID, DWORD, HCRYPTKEY*); +static BOOL (WINAPI *pCryptDestroyKey)(HCRYPTKEY); +static BOOL (WINAPI *pCryptDecrypt)(HCRYPTKEY, HCRYPTHASH, BOOL, DWORD, BYTE*, DWORD*); +static BOOL (WINAPI *pCryptDeriveKey)(HCRYPTPROV, ALG_ID, HCRYPTHASH, DWORD, HCRYPTKEY*); +static BOOL (WINAPI *pCryptDuplicateHash)(HCRYPTHASH, DWORD*, DWORD, HCRYPTHASH*); +static BOOL (WINAPI *pCryptDuplicateKey)(HCRYPTKEY, DWORD*, DWORD, HCRYPTKEY*); +static BOOL (WINAPI *pCryptEncrypt)(HCRYPTKEY, HCRYPTHASH, BOOL, DWORD, BYTE*, DWORD*, DWORD); +static BOOL (WINAPI *pCryptExportKey)(HCRYPTKEY, HCRYPTKEY, DWORD, DWORD, BYTE*, DWORD*); +static BOOL (WINAPI *pCryptGetHashParam)(HCRYPTHASH, DWORD, BYTE*, DWORD*, DWORD); +static BOOL (WINAPI *pCryptGetKeyParam)(HCRYPTKEY, DWORD, BYTE*, DWORD*, DWORD); +static BOOL (WINAPI *pCryptGetProvParam)(HCRYPTPROV, DWORD, BYTE*, DWORD*, DWORD); +static BOOL (WINAPI *pCryptGetUserKey)(HCRYPTPROV, DWORD, HCRYPTKEY*); +static BOOL (WINAPI *pCryptHashData)(HCRYPTHASH, BYTE*, DWORD, DWORD); +static BOOL (WINAPI *pCryptHashSessionKey)(HCRYPTHASH, HCRYPTKEY, DWORD); +static BOOL (WINAPI *pCryptImportKey)(HCRYPTPROV, BYTE*, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY*); +static BOOL (WINAPI *pCryptSignHashW)(HCRYPTHASH, DWORD, LPCWSTR, DWORD, BYTE*, DWORD*); +static BOOL (WINAPI *pCryptSetHashParam)(HCRYPTKEY, DWORD, BYTE*, DWORD); +static BOOL (WINAPI *pCryptSetKeyParam)(HCRYPTKEY, DWORD, BYTE*, DWORD); +static BOOL (WINAPI *pCryptSetProvParam)(HCRYPTPROV, DWORD, BYTE*, DWORD); +static BOOL (WINAPI *pCryptVerifySignatureW)(HCRYPTHASH, BYTE*, DWORD, HCRYPTKEY, LPCWSTR, DWORD); + +static void init_function_pointers(void) +{ + hadvapi32 = GetModuleHandleA("advapi32.dll"); + + if(hadvapi32) + { + pCryptAcquireContextA = (void*)GetProcAddress(hadvapi32, "CryptAcquireContextA"); + pCryptEnumProviderTypesA = (void*)GetProcAddress(hadvapi32, "CryptEnumProviderTypesA"); + pCryptEnumProvidersA = (void*)GetProcAddress(hadvapi32, "CryptEnumProvidersA"); + pCryptGetDefaultProviderA = (void*)GetProcAddress(hadvapi32, "CryptGetDefaultProviderA"); + pCryptReleaseContext = (void*)GetProcAddress(hadvapi32, "CryptReleaseContext"); + pCryptSetProviderExA = (void*)GetProcAddress(hadvapi32, "CryptSetProviderExA"); + pCryptCreateHash = (void*)GetProcAddress(hadvapi32, "CryptCreateHash"); + pCryptDestroyHash = (void*)GetProcAddress(hadvapi32, "CryptDestroyHash"); + pCryptGenRandom = (void*)GetProcAddress(hadvapi32, "CryptGenRandom"); + pCryptContextAddRef = (void*)GetProcAddress(hadvapi32, "CryptContextAddRef"); + pCryptGenKey = (void*)GetProcAddress(hadvapi32, "CryptGenKey"); + pCryptDestroyKey = (void*)GetProcAddress(hadvapi32, "CryptDestroyKey"); + pCryptDecrypt = (void*)GetProcAddress(hadvapi32, "CryptDecrypt"); + pCryptDeriveKey = (void*)GetProcAddress(hadvapi32, "CryptDeriveKey"); + pCryptDuplicateHash = (void*)GetProcAddress(hadvapi32, "CryptDuplicateHash"); + pCryptDuplicateKey = (void*)GetProcAddress(hadvapi32, "CryptDuplicateKey"); + pCryptEncrypt = (void*)GetProcAddress(hadvapi32, "CryptEncrypt"); + pCryptExportKey = (void*)GetProcAddress(hadvapi32, "CryptExportKey"); + pCryptGetHashParam = (void*)GetProcAddress(hadvapi32, "CryptGetHashParam"); + pCryptGetKeyParam = (void*)GetProcAddress(hadvapi32, "CryptGetKeyParam"); + pCryptGetProvParam = (void*)GetProcAddress(hadvapi32, "CryptGetProvParam"); + pCryptGetUserKey = (void*)GetProcAddress(hadvapi32, "CryptGetUserKey"); + pCryptHashData = (void*)GetProcAddress(hadvapi32, "CryptHashData"); + pCryptHashSessionKey = (void*)GetProcAddress(hadvapi32, "CryptHashSessionKey"); + pCryptImportKey = (void*)GetProcAddress(hadvapi32, "CryptImportKey"); + pCryptSignHashW = (void*)GetProcAddress(hadvapi32, "CryptSignHashW"); + pCryptSetHashParam = (void*)GetProcAddress(hadvapi32, "CryptSetHashParam"); + pCryptSetKeyParam = (void*)GetProcAddress(hadvapi32, "CryptSetKeyParam"); + pCryptSetProvParam = (void*)GetProcAddress(hadvapi32, "CryptSetProvParam"); + pCryptVerifySignatureW = (void*)GetProcAddress(hadvapi32, "CryptVerifySignatureW"); + } +} + +static void init_environment(void) +{ + HCRYPTPROV hProv; + + /* Ensure that container "wine_test_keyset" does exist */ + if (!pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) + { + pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_NEWKEYSET); + } + pCryptReleaseContext(hProv, 0); + + /* Ensure that container "wine_test_keyset" does exist in default PROV_RSA_FULL type provider */ + if (!pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, 0)) + { + pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); + } + pCryptReleaseContext(hProv, 0); + + /* Ensure that container "wine_test_bad_keyset" does not exist. */ + if (pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) + { + pCryptReleaseContext(hProv, 0); + pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + } +} + +static void clean_up_environment(void) +{ + HCRYPTPROV hProv; + + /* Remove container "wine_test_keyset" */ + if (pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) + { + pCryptReleaseContext(hProv, 0); + pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + } + + /* Remove container "wine_test_keyset" from default PROV_RSA_FULL type provider */ + if (pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, 0)) + { + pCryptReleaseContext(hProv, 0); + pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + } +} + +static void test_acquire_context(void) +{ + BOOL result; + HCRYPTPROV hProv; + + /* Provoke all kinds of error conditions (which are easy to provoke). + * The order of the error tests seems to match Windows XP's rsaenh.dll CSP, + * but since this is likely to change between CSP versions, we don't check + * this. Please don't change the order of tests. */ + result = pCryptAcquireContextA(&hProv, NULL, NULL, 0, 0); + ok(!result && GetLastError()==NTE_BAD_PROV_TYPE, "%ld\n", GetLastError()); + + result = pCryptAcquireContextA(&hProv, NULL, NULL, 1000, 0); + ok(!result && GetLastError()==NTE_BAD_PROV_TYPE, "%ld\n", GetLastError()); + + result = pCryptAcquireContextA(&hProv, NULL, NULL, NON_DEF_PROV_TYPE, 0); + ok(!result && GetLastError()==NTE_PROV_TYPE_NOT_DEF, "%ld\n", GetLastError()); + + result = pCryptAcquireContextA(&hProv, szKeySet, szNonExistentProv, PROV_RSA_FULL, 0); + ok(!result && GetLastError()==NTE_KEYSET_NOT_DEF, "%ld\n", GetLastError()); + + result = pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, NON_DEF_PROV_TYPE, 0); + ok(!result && GetLastError()==NTE_PROV_TYPE_NO_MATCH, "%ld\n", GetLastError()); + + /* This test fails under Win2k SP4: + result = TRUE, GetLastError() == ERROR_INVALID_PARAMETER + SetLastError(0xdeadbeef); + result = pCryptAcquireContextA(NULL, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); + ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "%d/%ld\n", result, GetLastError()); + */ + + /* Last not least, try to really acquire a context. */ + hProv = 0; + SetLastError(0xdeadbeef); + result = pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); + ok(result && (GetLastError() == ERROR_ENVVAR_NOT_FOUND || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_RING2_STACK_IN_USE || GetLastError() == NTE_FAIL), "%d/%ld\n", result, GetLastError()); + + if (hProv) + pCryptReleaseContext(hProv, 0); + + /* Try again, witch an empty ("\0") szProvider parameter */ + hProv = 0; + SetLastError(0xdeadbeef); + result = pCryptAcquireContextA(&hProv, szKeySet, "", PROV_RSA_FULL, 0); + ok(result && (GetLastError() == ERROR_ENVVAR_NOT_FOUND || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_RING2_STACK_IN_USE || GetLastError() == NTE_FAIL), "%d/%ld\n", result, GetLastError()); + + if (hProv) + pCryptReleaseContext(hProv, 0); +} + +static void test_incorrect_api_usage(void) +{ + BOOL result; + HCRYPTPROV hProv, hProv2; + HCRYPTHASH hHash, hHash2; + HCRYPTKEY hKey, hKey2; + BYTE temp; + DWORD dwLen, dwTemp; + + /* This is to document incorrect api usage in the + * "Uru - Ages beyond Myst Demo" installer as reported by Paul Vriens. + * + * The installer destroys a hash object after having released the context + * with which the hash was created. This is not allowed according to MSDN, + * since CryptReleaseContext destroys all hash and key objects belonging to + * the respective context. However, while wine used to crash, Windows is more + * robust here and returns an ERROR_INVALID_PARAMETER code. + */ + + result = pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, + PROV_RSA_FULL, CRYPT_NEWKEYSET); + ok (result, "%08lx\n", GetLastError()); + if (!result) return; + + result = pCryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash); + ok (result, "%ld\n", GetLastError()); + if (!result) return; + + result = pCryptGenKey(hProv, CALG_RC4, 0, &hKey); + ok (result, "%ld\n", GetLastError()); + if (!result) return; + + result = pCryptGenKey(hProv, CALG_RC4, 0, &hKey2); + ok (result, "%ld\n", GetLastError()); + if (!result) return; + + result = pCryptDestroyKey(hKey2); + ok (result, "%ld\n", GetLastError()); + + dwTemp = CRYPT_MODE_ECB; + result = pCryptSetKeyParam(hKey2, KP_MODE, (BYTE*)&dwTemp, sizeof(DWORD)); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + result = pCryptAcquireContextA(&hProv2, szBadKeySet, NULL, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); + ok (result, "%ld\n", GetLastError()); + if (!result) return; + + result = pCryptReleaseContext(hProv, 0); + ok (result, "%ld\n", GetLastError()); + if (!result) return; + + result = pCryptReleaseContext(hProv, 0); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + result = pCryptGenRandom(hProv, 1, &temp); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + +#ifdef CRASHES_ON_NT40 + result = pCryptContextAddRef(hProv, NULL, 0); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); +#endif + + result = pCryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash2); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + dwLen = 1; + result = pCryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, &temp, &dwLen); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + dwLen = 1; + result = pCryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, &temp, &dwLen, 1); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + result = pCryptDeriveKey(hProv, CALG_RC4, hHash, 0, &hKey2); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + +#ifdef CRASHES_ON_NT40 + result = pCryptDuplicateHash(hHash, NULL, 0, &hHash2); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + result = pCryptDuplicateKey(hKey, NULL, 0, &hKey2); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); +#endif + + dwLen = 1; + result = pCryptExportKey(hKey, (HCRYPTPROV)NULL, 0, 0, &temp, &dwLen); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + result = pCryptGenKey(hProv, CALG_RC4, 0, &hKey2); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + dwLen = 1; + result = pCryptGetHashParam(hHash, 0, &temp, &dwLen, 0); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + dwLen = 1; + result = pCryptGetKeyParam(hKey, 0, &temp, &dwLen, 0); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + dwLen = 1; + result = pCryptGetProvParam(hProv, 0, &temp, &dwLen, 0); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + result = pCryptGetUserKey(hProv, 0, &hKey2); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + result = pCryptHashData(hHash, &temp, 1, 0); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + result = pCryptHashSessionKey(hHash, hKey, 0); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + result = pCryptImportKey(hProv, &temp, 1, (HCRYPTKEY)NULL, 0, &hKey2); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + dwLen = 1; + result = pCryptSignHashW(hHash, 0, NULL, 0, &temp, &dwLen); + ok (!result && (GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), "%ld\n", GetLastError()); + + result = pCryptSetKeyParam(hKey, 0, &temp, 1); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + result = pCryptSetHashParam(hHash, 0, &temp, 1); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + result = pCryptSetProvParam(hProv, 0, &temp, 1); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + result = pCryptVerifySignatureW(hHash, &temp, 1, hKey, NULL, 0); + ok (!result && (GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), "%ld\n", GetLastError()); + + result = pCryptDestroyHash(hHash); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + result = pCryptDestroyKey(hKey); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); +} + +static BOOL FindProvRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszProvName, + DWORD *pcbProvName, DWORD *pdwProvCount) +{ + HKEY hKey; + HKEY subkey; + DWORD size = sizeof(DWORD); + + if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\Defaults\\Provider", &hKey)) + return FALSE; + + RegQueryInfoKey(hKey, NULL, NULL, NULL, pdwProvCount, pcbProvName, + NULL, NULL, NULL, NULL, NULL, NULL); + (*pcbProvName)++; + + if (!(*pszProvName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, *pcbProvName)))) + return FALSE; + + RegEnumKeyEx(hKey, dwIndex, *pszProvName, pcbProvName, NULL, NULL, NULL, NULL); + (*pcbProvName)++; + + RegOpenKey(hKey, *pszProvName, &subkey); + RegQueryValueEx(subkey, "Type", NULL, NULL, (BYTE*)pdwProvType, &size); + + RegCloseKey(subkey); + RegCloseKey(hKey); + + return TRUE; +} + +static void test_enum_providers(void) +{ + /* expected results */ + CHAR *pszProvName = NULL; + DWORD cbName; + DWORD dwType; + DWORD provCount; + DWORD dwIndex = 0; + + /* actual results */ + CHAR *provider = NULL; + DWORD providerLen; + DWORD type; + DWORD count; + BOOL result; + DWORD notNull = 5; + DWORD notZeroFlags = 5; + + if(!pCryptEnumProvidersA) + { + trace("skipping CryptEnumProviders tests\n"); + return; + } + + if (!FindProvRegVals(dwIndex, &dwType, &pszProvName, &cbName, &provCount)) + return; + + /* check pdwReserved flag for NULL */ + result = pCryptEnumProvidersA(dwIndex, &notNull, 0, &type, NULL, &providerLen); + ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + /* check dwFlags == 0 */ + result = pCryptEnumProvidersA(dwIndex, NULL, notZeroFlags, &type, NULL, &providerLen); + ok(!result && GetLastError()==NTE_BAD_FLAGS, "%ld\n", GetLastError()); + + /* alloc provider to half the size required + * cbName holds the size required */ + providerLen = cbName / 2; + if (!(provider = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, providerLen)))) + return; + + result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, provider, &providerLen); + ok(!result && GetLastError()==ERROR_MORE_DATA, "expected %i, got %ld\n", + ERROR_MORE_DATA, GetLastError()); + + LocalFree(provider); + + /* loop through the providers to get the number of providers [truncated at 1000 lines; 2758 more skipped]

19 years, 4 months

[hpoussin] 14859: Remove debug message

by hpoussin＠svn.reactos.com

Remove debug message Modified: trunk/reactos/lib/kernel32/misc/lang.c _____ Modified: trunk/reactos/lib/kernel32/misc/lang.c --- trunk/reactos/lib/kernel32/misc/lang.c 2005-04-29 02:13:42 UTC (rev 14858) +++ trunk/reactos/lib/kernel32/misc/lang.c 2005-04-29 07:35:01 UTC (rev 14859) @@ -695,8 +695,6 @@ } if (!cchData) lpLCData = NULL; - DPRINT1("Info for locale: %x\n", Locale); // REMOVE Fireball - if (Locale == LOCALE_NEUTRAL || Locale == LOCALE_SYSTEM_DEFAULT) Locale = GetSystemDefaultLCID(); else if (Locale == LOCALE_USER_DEFAULT) Locale = GetUserDefaultLCID();

19 years, 4 months

[ion] 14858: And look who made a dumber mistake ; ). Thanks WaxDragon

by ion＠svn.reactos.com

And look who made a dumber mistake ;). Thanks WaxDragon Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c --- trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-04-28 23:17:13 UTC (rev 14857) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-04-29 02:13:42 UTC (rev 14858) @@ -2147,8 +2147,6 @@ ((PUCHAR)AdapterBusInfo + sizeof(SCSI_ADAPTER_BUS_INFO) + (sizeof(SCSI_BUS_DATA) * (AdapterBusInfo->NumberOfBuses - 1))); - RtlZeroMemory(UnitInfo, sizeof(*UnitInfo)); - for (Bus = 0; Bus < AdapterBusInfo->NumberOfBuses; Bus++) { AdapterBusInfo->BusData[Bus].InitiatorBusId = @@ -2171,7 +2169,7 @@ { DPRINT("(Bus %lu Target %lu Lun %lu)\n", Bus, Target, Lun); - + RtlZeroMemory(UnitInfo, sizeof(*UnitInfo)); UnitInfo->PathId = Bus; UnitInfo->TargetId = Target; UnitInfo->Lun = Lun;

19 years, 4 months

[greatlrd] 14857: Swedish translations by Kris Engeman

by greatlrd＠svn.reactos.com

Swedish translations by Kris Engeman Added: trunk/reactos/lib/cpl/sysdm/sv.rc Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc _____ Added: trunk/reactos/lib/cpl/sysdm/sv.rc --- trunk/reactos/lib/cpl/sysdm/sv.rc 2005-04-28 23:15:26 UTC (rev 14856) +++ trunk/reactos/lib/cpl/sysdm/sv.rc 2005-04-28 23:17:13 UTC (rev 14857) @@ -0,0 +1,141 @@ +//Swedish resources by Kris Engeman 2005-04-28 + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +RC_LICENSE RTDATA "resources/gpl.txt" + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allmõnt" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Operativsystem",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_COL UMN-PROPSHEETPADDING,8 + LTEXT REACTOS_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(3), PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "Version" REACTOS_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE( 4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + LTEXT "Dator",-1,SYSTEM_COLUMN,LABELLINE(6),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPS HEETPADDING,8 + LTEXT "",IDC_PROCESSORMANUFACTURER,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(7) ,PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSOR,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(8),PROPSHEETWI DTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSORSPEED,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(9),PROPSH EETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(10),PROPSHE ETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + EDITTEXT IDC_LICENSEMEMO,PROPSHEETPADDING,LABELLINE(13),PROPSHEETWIDTH-(2*PROPSHE ETPADDING),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING,ES_LEFT|WS_TAB STOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY +END + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Nõtverksidentitet" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Windows anvõnder f÷ljande information f÷r att identifiera din dator pÕ nõtverket.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Fullstõndigt datornamn:",-1,PROPSHEETPADDING,LABELLINE(4)-4,PROPSHEETWIDTH-(6*PROPSHE ETPADDING)-ICONSIZE,LABELLINE(4)-4 + LTEXT "",IDC_COMPUTERNAME,120,LABELLINE(4)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDIN G)-ICONSIZE,LABELLINE(4)-5 + LTEXT "Arbetsgrupp:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,PROPS HEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)-6 + LTEXT "",IDC_WORKGROUPDOMAIN_NAME,120,LABELLINE(6)-6,PROPSHEETWIDTH-(6*PROPSHE ETPADDING)-ICONSIZE,LABELLINE(6)-6 + LTEXT "Klicka pÕ Nõtverksidentitet f÷r att anvõnda guiden Nõtverksidentifikation f÷r att ansluta till en domõn och skapa en lokal anvõndare.",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSH EETPADDING)-ICONSIZE,LABELLINE(8)+5 + PUSHBUTTON "&Nõtverksidentitet...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1 )+4 + LTEXT "Klicka pÕ egenskaper f÷r att ansluta till en domõn eller õndra datornamnet.",-1,PROPSHEETPADDING,LABELLINE(11)+2,PROPSHEETWIDTH-(12*PRO PSHEETPADDING)-ICONSIZE,LABELLINE(12)+2 + PUSHBUTTON "&Egenskaper...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1 )+4 +END + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "HÕrdvara" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Guiden anslut ny hÕrdvara",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPA DDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Guiden anslut ny hÕrdvara hjõlper dig att installera, avinstallera, reparera, koppla ur, mata ut och konfigurera din hÕrdvara.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + PUSHBUTTON "&Guiden anslut ny hÕrdvara...",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LA BELLINE(5)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Enhetshanteraren",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2* PROPSHEETPADDING),LABELLINE(7)+2 + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Enhetshanteraren visar all hÕrdvara i din dator.. Anvõnd enhetshanteraren f÷r att õndra egenskaper pÕ dina enheter.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDT H-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "&Enhetshanteraren...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(17*PR OPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "HÕrdvaruprofiler",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2 *PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "HÕrdvaruprofiler ger dig m÷jligheten att konfigurera och lagra olika hÕrdvarukonfigurationer..",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18) -5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "HÕrdvaruprofiler...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(17*PROPSHEETP ADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14 +END + +IDD_PROPPAGEUSERPROFILE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Anvõndarprofiler" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Anvõndarprofiler innehÕller skrivbordsinstõllningar och annan information om ditt konto. Olika profiler kan skapas pÕ varje dator du anvõnder eller sÕ kan du võlja en central profil som õr likadan pÕ alla datorer du anvõnder.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4) + LTEXT "Anvõndarprofiler pÕ datorn:",-1,PROPSHEETPADDING,LABELLINE(6),PROPSHEETWIDTH-(6*PROPSHEETPAD DING)-ICONSIZE,LABELLINE(1) + CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHO WSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING,LABEL LINE(8),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(11),WS_EX_CLIENTED GE + + PUSHBUTTON "Ta bort",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(20),60,LABELLINE (1)+2 + PUSHBUTTON "?ndra typ...",IDC_USERPROFILE_CHANGE,95,LABELLINE(20),60,LABELLINE(1)+2 + PUSHBUTTON "Kopiera till...",IDC_USERPROFILE_COPY,180,LABELLINE(20),60,LABELLINE(1)+2 +END + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Avancerat" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Prestanda",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEET PADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Prestandainstõllningar kontrollerar hur program anvõnder minne, vilket pÕverkar din dators hastighet.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Prestandainstõllningar...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADD ING),LABELLINE(5)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "Milj÷variabler",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PR OPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Milj÷variabler anger var din dator ska hõmta viss typ av information.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEET WIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(11) + PUSHBUTTON "&Milj÷variabler...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LAB ELLINE(12)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "&Start och Õterstõllning",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2*PRO PSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Start och Õterstõllning stõller in hur din dator ska starta och hur den ska bete sig om den st÷ter pÕ ett fel.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH-(6* PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Start och Õterstõllning...",IDC_STAREC,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELL INE(19)+2,(18*PROPSHEETPADDING),14 +END + +IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Milj÷variabler" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Anvõndarvariabler",-1,7,12,238,100 + LTEXT "&Variabler:",-1,14,24,224,8 + CONTROL "",IDC_USER_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_S HOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS _TABSTOP,14,35,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "&Ny...",IDC_USER_VARIABLE_NEW,80,90,50,14 + PUSHBUTTON "&Redigera...",IDC_USER_VARIABLE_EDIT,134,90,50,14 + PUSHBUTTON "&Ta bort",IDC_USER_VARIABLE_DELETE,188,90,50,14 + + GROUPBOX "Systemvariabler",-1,7,116,238,100 + LTEXT "Variabler:",-1,14,128,224,8 + CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS _SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL| WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "Ny...",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14 + PUSHBUTTON "Redigera...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14 + PUSHBUTTON "Ta bort",IDC_SYSTEM_VARIABLE_DELETE,188,194,50,14 + + DEFPUSHBUTTON "OK",IDOK,141,224,50,14,WS_GROUP + PUSHBUTTON "Avbryt",IDCANCEL,195,224,50,14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "?ndra variabel" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Variabelnamn:",-1,7,14,50,8 + EDITTEXT IDC_VARIABLE_NAME,75,12,145,12,ES_AUTOHSCROLL + LTEXT "Variabelvõrde:",-1,7,32,50,8 + EDITTEXT IDC_VARIABLE_VALUE,75,30,145,12,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK",IDOK,116,50,50,14,WS_GROUP + PUSHBUTTON "Avbryt",IDCANCEL,170,50,50,14 +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "System" + IDS_CPLSYSTEMDESCRIPTION "Se information om din dator och õndra olika system- och hÕrdvaruinstõllningar." +END _____ Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc --- trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-04-28 23:15:26 UTC (rev 14856) +++ trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-04-28 23:17:13 UTC (rev 14857) @@ -21,3 +21,4 @@ #include "de.rc" #include "dk.rc" #include "fr.rc" +#include "sv.rc"

19 years, 4 months

[greatlrd] 14856: Translate by Andreas Bjerkeholt (harteex@gmail.com)

by greatlrd＠svn.reactos.com

Translate by Andreas Bjerkeholt (harteex(a)gmail.com) Modified: trunk/reactos/lib/mpr/mpr.rc Added: trunk/reactos/lib/mpr/mpr_Sv.rc _____ Modified: trunk/reactos/lib/mpr/mpr.rc --- trunk/reactos/lib/mpr/mpr.rc 2005-04-28 23:14:54 UTC (rev 14855) +++ trunk/reactos/lib/mpr/mpr.rc 2005-04-28 23:15:26 UTC (rev 14856) @@ -33,3 +33,4 @@ #include "mpr_Ja.rc" #include "mpr_Nl.rc" #include "mpr_Pt.rc" +#include "mpr_Sv.rc" _____ Added: trunk/reactos/lib/mpr/mpr_Sv.rc --- trunk/reactos/lib/mpr/mpr_Sv.rc 2005-04-28 23:14:54 UTC (rev 14855) +++ trunk/reactos/lib/mpr/mpr_Sv.rc 2005-04-28 23:15:26 UTC (rev 14856) @@ -0,0 +1,46 @@ +/* + * MPR dll Swedish resources + * + * Copyright (C) 2005 Andreas Bjerkeholt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Hela nõtverket" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ange nõtverksl÷senord" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ange ditt anvõndarnamn och l÷senord:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Anvõndare", -1, 40, 66, 50, 10 + LTEXT "L÷senord", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Spara detta l÷senord (Osõkert)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Avbryt", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +}

19 years, 4 months

[hpoussin] 14855: SVN maintenance:

by hpoussin＠svn.reactos.com

SVN maintenance: Add svn:eol-style = native Add svn:keywords = author date id revision Modified: trunk/reactos/ntoskrnl/kd/kdinit.c Modified: trunk/reactos/ntoskrnl/kdbg/i386/longjmp.S Modified: trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_string.c _____ Modified: trunk/reactos/ntoskrnl/kd/kdinit.c --- trunk/reactos/ntoskrnl/kd/kdinit.c 2005-04-28 23:11:04 UTC (rev 14854) +++ trunk/reactos/ntoskrnl/kd/kdinit.c 2005-04-28 23:14:54 UTC (rev 14855) @@ -103,7 +103,7 @@ KdpDebugMode.Serial = TRUE; /* Set the port to use */ - SerialPortInfo.ComPort = Value; + SerialPortInfo.ComPort = Value; KdpPort = Value; } } Property changes on: trunk/reactos/ntoskrnl/kd/kdinit.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/ntoskrnl/kd/kdio.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/ntoskrnl/kd/kdmain.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/kdbg/i386/longjmp.S --- trunk/reactos/ntoskrnl/kdbg/i386/longjmp.S 2005-04-28 23:11:04 UTC (rev 14854) +++ trunk/reactos/ntoskrnl/kdbg/i386/longjmp.S 2005-04-28 23:14:54 UTC (rev 14855) @@ -1,70 +1,70 @@ - .file "longjmp.S" -/* - * Copyright (C) 1998, 1999, Jonathan S. Shapiro. - * - * This file is part of the EROS Operating System. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2, - * or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - - /* - * typedef struct { - * unsigned long ebx, esi, edi; - * unsigned long ebp; - * unsigned long sp; - * unsigned long pc; - * } jmp_buf[1]; - */ - - /* - * On entry, the stack to longjmp looks like: - * - * value - * ptr to jmp_buf - * return PC - */ - -.globl _longjmp -_longjmp: - pushl %ebp - movl %esp,%ebp - - movl 8(%ebp),%ecx /* address of jmp_buf to ecx */ - movl 12(%ebp),%eax /* return value to %eax */ - testl %eax,%eax - jne 1f - incl %eax /* return 1 if handed 0 */ - -1: - movl (%ecx),%ebx /* restore %ebx */ - movl 4(%ecx),%esi /* restore %esi */ - movl 8(%ecx),%edi /* restore %edi */ - - /* - * From this instant on we are not running in a valid frame - */ - - movl 12(%ecx),%ebp /* restore %ebp */ - movl 16(%ecx),%esp /* restore %esp */ - /* movl 20(%ecx),%eax return PC */ - - /* - * Since we are abandoning the stack in any case, - * there isn't much point in doing the usual return - * discipline. - */ - - jmpl *20(%ecx) - + .file "longjmp.S" +/* + * Copyright (C) 1998, 1999, Jonathan S. Shapiro. + * + * This file is part of the EROS Operating System. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2, + * or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + + /* + * typedef struct { + * unsigned long ebx, esi, edi; + * unsigned long ebp; + * unsigned long sp; + * unsigned long pc; + * } jmp_buf[1]; + */ + + /* + * On entry, the stack to longjmp looks like: + * + * value + * ptr to jmp_buf + * return PC + */ + +.globl _longjmp +_longjmp: + pushl %ebp + movl %esp,%ebp + + movl 8(%ebp),%ecx /* address of jmp_buf to ecx */ + movl 12(%ebp),%eax /* return value to %eax */ + testl %eax,%eax + jne 1f + incl %eax /* return 1 if handed 0 */ + +1: + movl (%ecx),%ebx /* restore %ebx */ + movl 4(%ecx),%esi /* restore %esi */ + movl 8(%ecx),%edi /* restore %edi */ + + /* + * From this instant on we are not running in a valid frame + */ + + movl 12(%ecx),%ebp /* restore %ebp */ + movl 16(%ecx),%esp /* restore %esp */ + /* movl 20(%ecx),%eax return PC */ + + /* + * Since we are abandoning the stack in any case, + * there isn't much point in doing the usual return + * discipline. + */ + + jmpl *20(%ecx) + Property changes on: trunk/reactos/ntoskrnl/kdbg/i386/longjmp.S ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S --- trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S 2005-04-28 23:11:04 UTC (rev 14854) +++ trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S 2005-04-28 23:14:54 UTC (rev 14855) @@ -1,59 +1,59 @@ - .file "setjmp.S" -/* - * Copyright (C) 1998, 1999, Jonathan S. Shapiro. - * - * This file is part of the EROS Operating System. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2, - * or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/* #include <eros/i486/asm.h> */ - - - /* - * typedef struct { - * unsigned long ebx, esi, edi; - * unsigned long ebp; - * unsigned long sp; - * unsigned long pc; - * } jmp_buf[1]; - */ - - /* - * On entry, the stack to setjmp looks like: - * - * ptr to jmp_buf - * return PC - */ -.globl _setjmp -_setjmp: - pushl %ebp - movl %esp,%ebp - - movl 0x8(%ebp),%eax /* address of jmp_buf to eax */ - movl %ebx,(%eax) /* save %ebx */ - movl %esi,4(%eax) /* save %esi */ - movl %edi,8(%eax) /* save %edi */ - leal 8(%ebp),%edx /* calling proc's esp, not ours! */ - movl %edx,16(%eax) - movl 4(%ebp), %edx /* save return PC */ - movl %edx,20(%eax) - movl 0(%ebp),%edx /* calling proc's ebp, not ours! */ - movl %edx,12(%eax) - - xorl %eax,%eax /* return 0 the first time */ - leave - ret $4 - + .file "setjmp.S" +/* + * Copyright (C) 1998, 1999, Jonathan S. Shapiro. + * + * This file is part of the EROS Operating System. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2, + * or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/* #include <eros/i486/asm.h> */ + + + /* + * typedef struct { + * unsigned long ebx, esi, edi; + * unsigned long ebp; + * unsigned long sp; + * unsigned long pc; + * } jmp_buf[1]; + */ + + /* + * On entry, the stack to setjmp looks like: + * + * ptr to jmp_buf + * return PC + */ +.globl _setjmp +_setjmp: + pushl %ebp + movl %esp,%ebp + + movl 0x8(%ebp),%eax /* address of jmp_buf to eax */ + movl %ebx,(%eax) /* save %ebx */ + movl %esi,4(%eax) /* save %esi */ + movl %edi,8(%eax) /* save %edi */ + leal 8(%ebp),%edx /* calling proc's esp, not ours! */ + movl %edx,16(%eax) + movl 4(%ebp), %edx /* save return PC */ + movl %edx,20(%eax) + movl 0(%ebp),%edx /* calling proc's ebp, not ours! */ + movl %edx,12(%eax) + + xorl %eax,%eax /* return 0 the first time */ + leave + ret $4 + Property changes on: trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c --- trunk/reactos/ntoskrnl/kdbg/kdb_expr.c 2005-04-28 23:11:04 UTC (rev 14854) +++ trunk/reactos/ntoskrnl/kdbg/kdb_expr.c 2005-04-28 23:14:54 UTC (rev 14855) @@ -1,1081 +1,1081 @@ -/* - * ReactOS kernel - * Copyright (C) 2005 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/dbg/kdb_expr.c - * PURPOSE: Kernel debugger expression evaluation - * PROGRAMMER: Gregor Anich (blight(a)blight.eu.org) - * UPDATE HISTORY: - * Created 15/01/2005 - */ - -/* Note: - * - * The given expression is parsed and stored in reverse polish notation, - * then it is evaluated and the result is returned. - */ - -/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> -#include <internal/kdb.h> -#define NDEBUG -#include <internal/debug.h> - -/* TYPES *********************************************************************/ -typedef enum _RPN_OP_TYPE -{ - RpnOpNop, - RpnOpBinaryOperator, - RpnOpUnaryOperator, - RpnOpImmediate, - RpnOpRegister, - RpnOpDereference -} RPN_OP_TYPE; - -typedef ULONGLONG (*RPN_BINARY_OPERATOR)(ULONGLONG a, ULONGLONG b); - -typedef struct _RPN_OP -{ - RPN_OP_TYPE Type; - ULONG CharacterOffset; - union { - /* RpnOpBinaryOperator */ - RPN_BINARY_OPERATOR BinaryOperator; - /* RpnOpImmediate */ - ULONGLONG Immediate; - /* RpnOpRegister */ - UCHAR Register; - /* RpnOpDereference */ - UCHAR DerefMemorySize; - } Data; -} RPN_OP, *PRPN_OP; - -typedef struct _RPN_STACK -{ - ULONG Size; /* Number of RPN_OPs on Ops */ - ULONG Sp; /* Stack pointer */ - RPN_OP Ops[1]; /* Array of RPN_OPs */ -} RPN_STACK, *PRPN_STACK; - -/* DEFINES *******************************************************************/ -#define stricmp _stricmp - -#ifndef RTL_FIELD_SIZE -# define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field)) -#endif - -#define CONST_STRCPY(dst, src) \ - do { if ((dst) != NULL) { memcpy(dst, src, sizeof(src)); } } while (0); - -#define RPN_OP_STACK_SIZE 256 -#define RPN_VALUE_STACK_SIZE 256 - -/* GLOBALS *******************************************************************/ -STATIC struct { ULONG Size; ULONG Sp; RPN_OP Ops[RPN_OP_STACK_SIZE]; } RpnStack = { RPN_OP_STACK_SIZE, 0 }; - -STATIC CONST struct { PCHAR Name; UCHAR Offset; UCHAR Size; } RegisterToTrapFrame[] = -{ - {"eip", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Eip), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Eip)}, - {"eflags", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Eflags), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Eflags)}, - {"eax", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Eax), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Eax)}, - {"ebx", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ebx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ebx)}, - {"ecx", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ecx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ecx)}, - {"edx", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Edx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Edx)}, - {"esi", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Esi), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Esi)}, - {"edi", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Edi), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Edi)}, - {"esp", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Esp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Esp)}, - {"ebp", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ebp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ebp)}, - {"cs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Cs), 2 }, /* Use only the lower 2 bytes */ - {"ds", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ds), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ds)}, - {"es", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Es), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Es)}, - {"fs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Fs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Fs)}, - {"gs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Gs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Gs)}, - {"ss", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ss), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ss)}, - {"dr0", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr0), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr0)}, - {"dr1", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr1), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr1)}, - {"dr2", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr2), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr2)}, - {"dr3", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr3), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr3)}, - {"dr6", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr6), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr6)}, - {"dr7", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr7), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr7)}, - {"cr0", FIELD_OFFSET(KDB_KTRAP_FRAME, Cr0), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr0)}, - {"cr2", FIELD_OFFSET(KDB_KTRAP_FRAME, Cr2), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr2)}, - {"cr3", FIELD_OFFSET(KDB_KTRAP_FRAME, Cr3), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr3)}, - {"cr4", FIELD_OFFSET(KDB_KTRAP_FRAME, Cr4), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr4)} -}; -STATIC CONST INT RegisterToTrapFrameCount = - sizeof (RegisterToTrapFrame) / sizeof (RegisterToTrapFrame[0]); - -/* FUNCTIONS *****************************************************************/ - -ULONGLONG -RpnBinaryOperatorAdd(ULONGLONG a, ULONGLONG b) -{ - return a + b; -} - -ULONGLONG -RpnBinaryOperatorSub(ULONGLONG a, ULONGLONG b) -{ - return a - b; -} - -ULONGLONG -RpnBinaryOperatorMul(ULONGLONG a, ULONGLONG b) -{ - return a * b; -} - -ULONGLONG -RpnBinaryOperatorDiv(ULONGLONG a, ULONGLONG b) -{ - - return a / b; -} - -ULONGLONG -RpnBinaryOperatorMod(ULONGLONG a, ULONGLONG b) -{ - return a % b; -} - -ULONGLONG -RpnBinaryOperatorEquals(ULONGLONG a, ULONGLONG b) -{ - return (a == b); -} - -ULONGLONG -RpnBinaryOperatorNotEquals(ULONGLONG a, ULONGLONG b) -{ - return (a != b); -} - -ULONGLONG -RpnBinaryOperatorLessThan(ULONGLONG a, ULONGLONG b) -{ - return (a < b); -} - -ULONGLONG -RpnBinaryOperatorLessThanOrEquals(ULONGLONG a, ULONGLONG b) -{ - return (a <= b); -} - -ULONGLONG -RpnBinaryOperatorGreaterThan(ULONGLONG a, ULONGLONG b) -{ - return (a > b); -} - -ULONGLONG -RpnBinaryOperatorGreaterThanOrEquals(ULONGLONG a, ULONGLONG b) -{ - return (a >= b); -} - -/*!\brief Dumps the given RPN stack content - * - * \param Stack Pointer to a RPN_STACK structure. - */ -VOID -RpnpDumpStack( - IN PRPN_STACK Stack) -{ - ULONG ul; - - ASSERT(Stack != NULL); - DbgPrint("\nStack size: %ld\n", Stack->Sp); - for (ul = 0; ul < Stack->Sp; ul++) - { - PRPN_OP Op = Stack->Ops + ul; - switch (Op->Type) - { - case RpnOpNop: - DbgPrint("NOP,"); - break; - - case RpnOpImmediate: - DbgPrint("0x%I64x,", Op->Data.Immediate); - break; - - case RpnOpBinaryOperator: - if (Op->Data.BinaryOperator == RpnBinaryOperatorAdd) - DbgPrint("+,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorSub) - DbgPrint("-,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorMul) - DbgPrint("*,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorDiv) - DbgPrint("/,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorMod) - DbgPrint("%%,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorEquals) - DbgPrint("==,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorNotEquals) - DbgPrint("!=,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorLessThan) - DbgPrint("<,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorLessThanOrEquals) - DbgPrint("<=,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorGreaterThan) - DbgPrint(">,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorGreaterThanOrEquals) - DbgPrint(">=,"); - else - DbgPrint("UNKNOWN OP,"); - break; - - case RpnOpRegister: - DbgPrint("%s,", RegisterToTrapFrame[Op->Data.Register].Name); - break; - - case RpnOpDereference: - DbgPrint("[%s],", - (Op->Data.DerefMemorySize == 1) ? ("byte") : - ((Op->Data.DerefMemorySize == 2) ? ("word") : - ((Op->Data.DerefMemorySize == 4) ? ("dword") : ("qword")) - ) - ); - break; - - default: - DbgPrint("\nUnsupported Type: %d\n", Op->Type); - ul = Stack->Sp; - break; - } - } - DbgPrint("\n"); -} - -/*!\brief Clears the given RPN stack. - * - * \param Stack Pointer to a RPN_STACK structure. - */ -STATIC VOID -RpnpClearStack( - OUT PRPN_STACK Stack) -{ - ASSERT(Stack != NULL); - Stack->Sp = 0; -} - -/*!\brief Pushes an RPN_OP onto the stack. - * - * \param Stack Pointer to a RPN_STACK structure. - * \param Op RPN_OP to be copied onto the stack. - */ -STATIC BOOLEAN -RpnpPushStack( - IN OUT PRPN_STACK Stack, - IN PRPN_OP Op) -{ - ASSERT(Stack != NULL); - ASSERT(Op != NULL); - - if (Stack->Sp >= Stack->Size) - return FALSE; - - memcpy(Stack->Ops + Stack->Sp, Op, sizeof (RPN_OP)); - Stack->Sp++; - return TRUE; -} - -/*!\brief Pops the top op from the stack. - * - * \param Stack Pointer to a RPN_STACK structure. - * \param Op Pointer to an RPN_OP to store the popped op into (can be NULL). - * - * \retval TRUE Success. - * \retval FALSE Failure (stack empty) - */ -STATIC BOOLEAN -RpnpPopStack( - IN OUT PRPN_STACK Stack, - OUT PRPN_OP Op OPTIONAL) -{ - ASSERT(Stack != NULL); - - if (Stack->Sp == 0) - return FALSE; - - Stack->Sp--; - if (Op != NULL) - memcpy(Op, Stack->Ops + Stack->Sp, sizeof (RPN_OP)); - return TRUE; -} - -/*!\brief Gets the top op from the stack (not popping it) - * - * \param Stack Pointer to a RPN_STACK structure. - * \param Op Pointer to an RPN_OP to copy the top op into. - * - * \retval TRUE Success. - * \retval FALSE Failure (stack empty) - */ -STATIC BOOLEAN -RpnpTopStack( - IN PRPN_STACK Stack, - OUT PRPN_OP Op) -{ - ASSERT(Stack != NULL); - ASSERT(Op != NULL); - - if (Stack->Sp == 0) - return FALSE; - - memcpy(Op, Stack->Ops + Stack->Sp - 1, sizeof (RPN_OP)); - return TRUE; -} - -/*!\brief Parses an expression. - * - * This functions parses the given expression until the end of string or a closing - * brace is found. As the function parses the string it pushes RPN_OPs onto the - * stack. - * - * Examples: 1+2*3 ; eax+10 ; (eax+16) * (ebx+4) ; dword[eax] - * - * \param Stack Pointer to a RPN_STACK structure. - * \param Expression String to parse. - * \param CharacterOffset Character offset of the subexpression from the beginning of the expression. - * \param End On success End is set to the character at which parsing stopped. - * \param ErrOffset On failure this is set to the character offset at which the error occoured. - * \param ErrMsg On failure a message describing the problem is copied into this buffer (128 bytes) - * - * \retval TRUE Success. - * \retval FALSE Failure. - */ -STATIC BOOLEAN -RpnpParseExpression( - IN PRPN_STACK Stack, - IN PCHAR Expression, - OUT PCHAR *End OPTIONAL, - IN ULONG CharacterOffset, - OUT PLONG ErrOffset OPTIONAL, - OUT PCHAR ErrMsg OPTIONAL) -{ - PCHAR p = Expression; - PCHAR pend; - PCHAR Operator = NULL; - LONG OperatorOffset = -1; - RPN_OP RpnOp; - RPN_OP PoppedOperator; - BOOLEAN HavePoppedOperator = FALSE; - RPN_OP ComparativeOp; - BOOLEAN ComparativeOpFilled = FALSE; - BOOLEAN IsComparativeOp; - INT i, i2; - ULONG ul; - UCHAR MemorySize; - CHAR Buffer[16]; - BOOLEAN First; - - ASSERT(Stack != NULL); - ASSERT(Expression != NULL); - - First = TRUE; - for (;;) - { - /* Skip whitespace */ - while (isspace(*p)) - { - p++; - CharacterOffset++; - } - - /* Check for end of expression */ - if (p[0] == '\0' || p[0] == ')' || p[0] == ']') - break; - - if (!First) - { - /* Remember operator */ - Operator = p++; - OperatorOffset = CharacterOffset++;; - - /* Pop operator (to get the right operator precedence) */ - HavePoppedOperator = FALSE; - if (*Operator == '*' || *Operator == '/' || *Operator == '%') - { - if (RpnpTopStack(Stack, &PoppedOperator) && - PoppedOperator.Type == RpnOpBinaryOperator && - (PoppedOperator.Data.BinaryOperator == RpnBinaryOperatorAdd || - PoppedOperator.Data.BinaryOperator == RpnBinaryOperatorSub)) - { - RpnpPopStack(Stack, NULL); - HavePoppedOperator = TRUE; - } - else if (PoppedOperator.Type == RpnOpNop) - { - RpnpPopStack(Stack, NULL); - /* Discard the NOP - it was only pushed to indicate there was a - * closing brace, so the previous operator shouldn't be popped. - */ - } - } - else if ((Operator[0] == '=' && Operator[1] == '=') || - (Operator[0] == '!' && Operator[1] == '=') || - Operator[0] == '<' || Operator[0] == '>') - { - if (Operator[0] == '=' || Operator[0] == '!' || - (Operator[0] == '<' && Operator[1] == '=') || - (Operator[0] == '>' && Operator[1] == '=')) - { - p++; - CharacterOffset++; - } -#if 0 - /* Parse rest of expression */ - if (!RpnpParseExpression(Stack, p + 1, &pend, CharacterOffset + 1, - ErrOffset, ErrMsg)) - { - return FALSE; - } - else if (pend == p + 1) - { - CONST_STRCPY(ErrMsg, "Expression expected"); - if (ErrOffset != NULL) - *ErrOffset = CharacterOffset + 1; - return FALSE; - } - goto end_of_expression; /* return */ -#endif - } - else if (Operator[0] != '+' && Operator[0] != '-') - { - CONST_STRCPY(ErrMsg, "Operator expected"); - if (ErrOffset != NULL) - *ErrOffset = OperatorOffset; - return FALSE; - } - - /* Skip whitespace */ - while (isspace(*p)) - { - p++; - CharacterOffset++; - } - } - - /* Get operand */ - MemorySize = sizeof(ULONG_PTR); /* default to pointer size */ -get_operand: - i = strcspn(p, "+-*/%()[]<>!="); - if (i > 0) - { - i2 = i; - - /* Copy register name/memory size */ - while (isspace(p[--i2])); - i2 = min(i2 + 1, sizeof (Buffer) - 1); - strncpy(Buffer, p, i2); - Buffer[i2] = '\0'; - - /* Memory size prefix */ - if (p[i] == '[') - { - if (stricmp(Buffer, "byte") == 0) - MemorySize = 1; - else if (stricmp(Buffer, "word") == 0) - MemorySize = 2; - else if (stricmp(Buffer, "dword") == 0) - MemorySize = 4; - else if (stricmp(Buffer, "qword") == 0) - MemorySize = 8; - else - { - CONST_STRCPY(ErrMsg, "Invalid memory size prefix"); - if (ErrOffset != NULL) - *ErrOffset = CharacterOffset; - return FALSE; - } - - p += i; - CharacterOffset += i; - goto get_operand; - } - - /* Try to find register */ - for (i = 0; i < RegisterToTrapFrameCount; i++) - { - if (stricmp(RegisterToTrapFrame[i].Name, Buffer) == 0) - break; - } - if (i < RegisterToTrapFrameCount) - { - RpnOp.Type = RpnOpRegister; - RpnOp.CharacterOffset = CharacterOffset; - RpnOp.Data.Register = i; - i = strlen(RegisterToTrapFrame[i].Name); - CharacterOffset += i; - p += i; - } - else - { - /* Immediate value */ - /* FIXME: Need string to ULONGLONG function */ - ul = strtoul(p, &pend, 0); - if (p != pend) - { - RpnOp.Type = RpnOpImmediate; - RpnOp.CharacterOffset = CharacterOffset; - RpnOp.Data.Immediate = (ULONGLONG)ul; - CharacterOffset += pend - p; - p = pend; - } - else - { - CONST_STRCPY(ErrMsg, "Operand expected"); - if (ErrOffset != NULL) - *ErrOffset = CharacterOffset; - return FALSE; - } - } - - /* Push operand */ - if (!RpnpPushStack(Stack, &RpnOp)) - { - CONST_STRCPY(ErrMsg, "RPN op stack overflow"); - if (ErrOffset != NULL) - *ErrOffset = -1; - return FALSE; - } - } - else if (i == 0) - { - if (p[0] == '(' || p[0] == '[') /* subexpression */ - { - if (!RpnpParseExpression(Stack, p + 1, &pend, CharacterOffset + 1, - ErrOffset, ErrMsg)) - { - return FALSE; - } - else if (pend == p + 1) - { - CONST_STRCPY(ErrMsg, "Expression expected"); - if (ErrOffset != NULL) - *ErrOffset = CharacterOffset + 1; - return FALSE; - } - - if (p[0] == '[') /* dereference */ - { - ASSERT(MemorySize == 1 || MemorySize == 2 || - MemorySize == 4 || MemorySize == 8); - if (pend[0] != ']') - { - CONST_STRCPY(ErrMsg, "']' expected"); - if (ErrOffset != NULL) - *ErrOffset = CharacterOffset + (pend - p); - return FALSE; - } - RpnOp.Type = RpnOpDereference; - RpnOp.CharacterOffset = CharacterOffset; - RpnOp.Data.DerefMemorySize = MemorySize; - if (!RpnpPushStack(Stack, &RpnOp)) - { - CONST_STRCPY(ErrMsg, "RPN op stack overflow"); - if (ErrOffset != NULL) - *ErrOffset = -1; - return FALSE; - } - } - else /* p[0] == '(' */ - { - if (pend[0] != ')') - { - CONST_STRCPY(ErrMsg, "')' expected"); - if (ErrOffset != NULL) - *ErrOffset = CharacterOffset + (pend - p); - return FALSE; - } - } - - /* Push a "nop" to prevent popping of the + operator (which would - * result in (10+10)/2 beeing evaluated as 15) - */ - RpnOp.Type = RpnOpNop; - if (!RpnpPushStack(Stack, &RpnOp)) - { - CONST_STRCPY(ErrMsg, "RPN op stack overflow"); - if (ErrOffset != NULL) - *ErrOffset = -1; - return FALSE; - } - - /* Skip closing brace/bracket */ - pend++; - - CharacterOffset += pend - p; - p = pend; - } - else if (First && p[0] == '-') /* Allow expressions like "- eax" */ - { - RpnOp.Type = RpnOpImmediate; - RpnOp.CharacterOffset = CharacterOffset; - RpnOp.Data.Immediate = 0; - if (!RpnpPushStack(Stack, &RpnOp)) - { - CONST_STRCPY(ErrMsg, "RPN op stack overflow"); - if (ErrOffset != NULL) - *ErrOffset = -1; - return FALSE; - } - } - else - { - CONST_STRCPY(ErrMsg, "Operand expected"); - if (ErrOffset != NULL) - *ErrOffset = CharacterOffset; - return FALSE; - } - } - else - { - CONST_STRCPY(ErrMsg, "strcspn() failed"); - if (ErrOffset != NULL) - *ErrOffset = -1; - return FALSE; - } - - if (!First) - { - /* Push operator */ - RpnOp.CharacterOffset = OperatorOffset; - RpnOp.Type = RpnOpBinaryOperator; - IsComparativeOp = FALSE; - switch (*Operator) - { - case '+': - RpnOp.Data.BinaryOperator = RpnBinaryOperatorAdd; - break; - - case '-': - RpnOp.Data.BinaryOperator = RpnBinaryOperatorSub; - break; - - case '*': - RpnOp.Data.BinaryOperator = RpnBinaryOperatorMul; - break; [truncated at 1000 lines; 1749 more skipped]

19 years, 4 months

← Newer
1
2
3
4
5
6
7
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005