Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 14345: Fix handling of input and output buffers
by hpoussin＠svn.reactos.com 27 Mar '05

27 Mar '05

Fix handling of input and output buffers Modified: trunk/reactos/drivers/dd/serial/devctrl.c _____ Modified: trunk/reactos/drivers/dd/serial/devctrl.c --- trunk/reactos/drivers/dd/serial/devctrl.c 2005-03-27 11:13:25 UTC (rev 14344) +++ trunk/reactos/drivers/dd/serial/devctrl.c 2005-03-27 11:14:30 UTC (rev 14345) @@ -12,6 +12,38 @@ #define NDEBUG #include "serial.h" +#define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) + +static VOID +SerialGetUserBuffers( + IN PIRP Irp, + IN ULONG IoControlCode, + OUT PVOID* BufferIn, + OUT PVOID* BufferOut) +{ + ASSERT(Irp); + ASSERT(BufferIn); + ASSERT(BufferOut); + + switch (IO_METHOD_FROM_CTL_CODE(IoControlCode)) + { + case METHOD_BUFFERED: + *BufferIn = *BufferOut = Irp->AssociatedIrp.SystemBuffer; + return; + case METHOD_IN_DIRECT: + case METHOD_OUT_DIRECT: + *BufferIn = Irp->AssociatedIrp.SystemBuffer; + *BufferOut = MmGetSystemAddressForMdl(Irp->MdlAddress); + return; + case METHOD_NEITHER: + *BufferIn = IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.Type3Input Buffer; + *BufferOut = Irp->UserBuffer; + return; + } + + /* Should never happen */ +} + NTSTATUS STDCALL SerialSetBaudRate( IN PSERIAL_DEVICE_EXTENSION DeviceExtension, @@ -244,10 +276,11 @@ IN PIRP Irp) { PIO_STACK_LOCATION Stack; + ULONG IoControlCode; PSERIAL_DEVICE_EXTENSION DeviceExtension; ULONG LengthIn, LengthOut; ULONG Information = 0; - PUCHAR Buffer; + PVOID BufferIn, BufferOut; PUCHAR ComPortBase; NTSTATUS Status; @@ -258,13 +291,14 @@ Stack = IoGetCurrentIrpStackLocation(Irp); LengthIn = Stack->Parameters.DeviceIoControl.InputBufferLength; LengthOut = Stack->Parameters.DeviceIoControl.OutputBufferLength; - Buffer = Irp->AssociatedIrp.SystemBuffer; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + IoControlCode = Stack->Parameters.DeviceIoControl.IoControlCode; + SerialGetUserBuffers(Irp, IoControlCode, &BufferIn, &BufferOut); /* FIXME: need to probe buffers */ /* FIXME: see http://www.osronline.com/ddkx/serial/serref_61bm.htm */ - switch (Stack->Parameters.DeviceIoControl.IoControlCode) + switch (IoControlCode) { case IOCTL_SERIAL_CLEAR_STATS: { @@ -301,11 +335,11 @@ /* Obsolete on Microsoft Windows 2000+ */ PULONG pConfigSize; DPRINT("Serial: IOCTL_SERIAL_CONFIG_SIZE\n"); - if (LengthOut != sizeof(ULONG) || Buffer == NULL) + if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else { - pConfigSize = (PULONG)Buffer; + pConfigSize = (PULONG)BufferOut; *pConfigSize = 0; Status = STATUS_SUCCESS; } @@ -314,18 +348,17 @@ case IOCTL_SERIAL_GET_BAUD_RATE: { DPRINT("Serial: IOCTL_SERIAL_GET_BAUD_RATE\n"); - /* FIXME: HACK!!! following line MUST NOT be here! */ - Buffer = Irp->UserBuffer; if (LengthOut < sizeof(SERIAL_BAUD_RATE)) Status = STATUS_BUFFER_TOO_SMALL; - else if (Buffer == NULL) + else if (BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else { - ((PSERIAL_BAUD_RATE)Buffer)->BaudRate = DeviceExtension->BaudRate; + ((PSERIAL_BAUD_RATE)BufferOut)->BaudRate = DeviceExtension->BaudRate; Information = sizeof(SERIAL_BAUD_RATE); Status = STATUS_SUCCESS; } + break; } case IOCTL_SERIAL_GET_CHARS: { @@ -342,14 +375,14 @@ DPRINT("Serial: return STATUS_BUFFER_TOO_SMALL\n"); Status = STATUS_BUFFER_TOO_SMALL; } - else if (Buffer == NULL) + else if (BufferOut == NULL) { DPRINT("Serial: return STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; } else { - Status = SerialGetCommStatus((PSERIAL_STATUS)Buffer, DeviceExtension); + Status = SerialGetCommStatus((PSERIAL_STATUS)BufferOut, DeviceExtension); Information = sizeof(SERIAL_STATUS); } break; @@ -358,11 +391,11 @@ { PULONG pDtrRts; DPRINT("Serial: IOCTL_SERIAL_GET_DTRRTS\n"); - if (LengthOut != sizeof(ULONG) || Buffer == NULL) + if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else { - pDtrRts = (PULONG)Buffer; + pDtrRts = (PULONG)BufferOut; *pDtrRts = 0; if (DeviceExtension->MCR & SR_MCR_DTR) *pDtrRts |= SERIAL_DTR_STATE; @@ -384,11 +417,11 @@ DPRINT("Serial: IOCTL_SERIAL_GET_LINE_CONTROL\n"); if (LengthOut < sizeof(SERIAL_LINE_CONTROL)) Status = STATUS_BUFFER_TOO_SMALL; - else if (Buffer == NULL) + else if (BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else { - *((PSERIAL_LINE_CONTROL)Buffer) = DeviceExtension->SerialLineControl; + *((PSERIAL_LINE_CONTROL)BufferOut) = DeviceExtension->SerialLineControl; Information = sizeof(SERIAL_LINE_CONTROL); Status = STATUS_SUCCESS; } @@ -398,11 +431,11 @@ { PULONG pMCR; DPRINT("Serial: IOCTL_SERIAL_GET_MODEM_CONTROL\n"); - if (LengthOut != sizeof(ULONG) || Buffer == NULL) + if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else { - pMCR = (PULONG)Buffer; + pMCR = (PULONG)BufferOut; *pMCR = DeviceExtension->MCR; Status = STATUS_SUCCESS; } @@ -412,11 +445,11 @@ { PULONG pMSR; DPRINT("Serial: IOCTL_SERIAL_GET_MODEMSTATUS\n"); - if (LengthOut != sizeof(ULONG) || Buffer == NULL) + if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else { - pMSR = (PULONG)Buffer; + pMSR = (PULONG)BufferOut; *pMSR = DeviceExtension->MSR; Status = STATUS_SUCCESS; } @@ -430,14 +463,14 @@ DPRINT("Serial: return STATUS_BUFFER_TOO_SMALL\n"); Status = STATUS_BUFFER_TOO_SMALL; } - else if (Buffer == NULL) + else if (BufferOut == NULL) { DPRINT("Serial: return STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; } else { - Status = SerialGetCommProp((PSERIAL_COMMPROP)Buffer, DeviceExtension); + Status = SerialGetCommProp((PSERIAL_COMMPROP)BufferOut, DeviceExtension); Information = sizeof(SERIAL_COMMPROP); } break; @@ -450,7 +483,7 @@ DPRINT("Serial: return STATUS_BUFFER_TOO_SMALL\n"); Status = STATUS_BUFFER_TOO_SMALL; } - else if (Buffer == NULL) + else if (BufferOut == NULL) { DPRINT("Serial: return STATUS_INVALID_PARAMETER\n"); Status = STATUS_INVALID_PARAMETER; @@ -467,11 +500,11 @@ case IOCTL_SERIAL_GET_TIMEOUTS: { DPRINT("Serial: IOCTL_SERIAL_GET_TIMEOUTS\n"); - if (LengthOut != sizeof(SERIAL_TIMEOUTS) || Buffer == NULL) + if (LengthOut != sizeof(SERIAL_TIMEOUTS) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else { - *(PSERIAL_TIMEOUTS)Buffer = DeviceExtension->SerialTimeOuts; + *(PSERIAL_TIMEOUTS)BufferOut = DeviceExtension->SerialTimeOuts; Status = STATUS_SUCCESS; } break; @@ -480,11 +513,11 @@ { PULONG pWaitMask; DPRINT("Serial: IOCTL_SERIAL_GET_WAIT_MASK\n"); - if (LengthOut != sizeof(ULONG) || Buffer == NULL) + if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else { - pWaitMask = (PULONG)Buffer; + pWaitMask = (PULONG)BufferOut; *pWaitMask = DeviceExtension->WaitMask; Status = STATUS_SUCCESS; } @@ -534,11 +567,11 @@ { PULONG pNewBaudRate; DPRINT("Serial: IOCTL_SERIAL_SET_BAUD_RATE\n"); - if (LengthIn != sizeof(ULONG) || Buffer == NULL) + if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else { - pNewBaudRate = (PULONG)Buffer; + pNewBaudRate = (PULONG)BufferIn; Status = SerialSetBaudRate(DeviceExtension, *pNewBaudRate); } break; @@ -580,11 +613,11 @@ case IOCTL_SERIAL_SET_FIFO_CONTROL: { DPRINT("Serial: IOCTL_SERIAL_SET_FIFO_CONTROL\n"); - if (LengthIn != sizeof(ULONG) || Buffer == NULL) + if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else { - WRITE_PORT_UCHAR(SER_FCR(ComPortBase), (UCHAR)((*(PULONG)Buffer) & 0xff)); + WRITE_PORT_UCHAR(SER_FCR(ComPortBase), (UCHAR)((*(PULONG)BufferIn) & 0xff)); Status = STATUS_SUCCESS; } break; @@ -601,21 +634,21 @@ DPRINT("Serial: IOCTL_SERIAL_SET_LINE_CONTROL\n"); if (LengthIn < sizeof(SERIAL_LINE_CONTROL)) Status = STATUS_BUFFER_TOO_SMALL; - else if (Buffer == NULL) + else if (BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else - Status = SerialSetLineControl(DeviceExtension, (PSERIAL_LINE_CONTROL)Buffer); + Status = SerialSetLineControl(DeviceExtension, (PSERIAL_LINE_CONTROL)BufferIn); break; } case IOCTL_SERIAL_SET_MODEM_CONTROL: { PULONG pMCR; DPRINT("Serial: IOCTL_SERIAL_SET_MODEM_CONTROL\n"); - if (LengthIn != sizeof(ULONG) || Buffer == NULL) + if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else { - pMCR = (PULONG)Buffer; + pMCR = (PULONG)BufferIn; DeviceExtension->MCR = (UCHAR)(*pMCR & 0xff); WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); Status = STATUS_SUCCESS; @@ -626,22 +659,23 @@ { if (LengthIn < sizeof(SERIAL_QUEUE_SIZE )) return STATUS_BUFFER_TOO_SMALL; - else if (Buffer == NULL) + else if (BufferIn == NULL) return STATUS_INVALID_PARAMETER; else { KIRQL Irql; + PSERIAL_QUEUE_SIZE NewQueueSize = (PSERIAL_QUEUE_SIZE)BufferIn; Status = STATUS_SUCCESS; - if (((PSERIAL_QUEUE_SIZE)Buffer)->InSize > DeviceExtension->InputBuffer.Length) + if (NewQueueSize->InSize > DeviceExtension->InputBuffer.Length) { KeAcquireSpinLock(&DeviceExtension->InputBufferLock, &Irql); - Status = IncreaseCircularBufferSize(&DeviceExtension->InputBuffer, ((PSERIAL_QUEUE_SIZE)Buffer)->InSize); + Status = IncreaseCircularBufferSize(&DeviceExtension->InputBuffer, NewQueueSize->InSize); KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql); } - if (NT_SUCCESS(Status) && ((PSERIAL_QUEUE_SIZE)Buffer)->OutSize > DeviceExtension->OutputBuffer.Length) + if (NT_SUCCESS(Status) && NewQueueSize->OutSize > DeviceExtension->OutputBuffer.Length) { KeAcquireSpinLock(&DeviceExtension->OutputBufferLock, &Irql); - Status = IncreaseCircularBufferSize(&DeviceExtension->OutputBuffer, ((PSERIAL_QUEUE_SIZE)Buffer)->OutSize); + Status = IncreaseCircularBufferSize(&DeviceExtension->OutputBuffer, NewQueueSize->OutSize); KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); } } @@ -663,11 +697,11 @@ case IOCTL_SERIAL_SET_TIMEOUTS: { DPRINT("Serial: IOCTL_SERIAL_SET_TIMEOUTS\n"); - if (LengthIn != sizeof(SERIAL_TIMEOUTS) || Buffer == NULL) + if (LengthIn != sizeof(SERIAL_TIMEOUTS) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else { - DeviceExtension->SerialTimeOuts = *(PSERIAL_TIMEOUTS)Buffer; + DeviceExtension->SerialTimeOuts = *(PSERIAL_TIMEOUTS)BufferIn; Status = STATUS_SUCCESS; } break; @@ -676,11 +710,11 @@ { PULONG pWaitMask; DPRINT("Serial: IOCTL_SERIAL_SET_WAIT_MASK\n"); - if (LengthIn != sizeof(ULONG) || Buffer == NULL) + if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else { - pWaitMask = (PULONG)Buffer; + pWaitMask = (PULONG)BufferIn; DeviceExtension->WaitMask = *pWaitMask; Status = STATUS_SUCCESS; }

1 0

[hpoussin] 14344: Mark Junker <mjscod@gmx.de>
by hpoussin＠svn.reactos.com 27 Mar '05

27 Mar '05

Mark Junker <mjscod(a)gmx.de> Don't detect a 16550A UART if it is a 16550. Modified: trunk/reactos/drivers/dd/serial/legacy.c _____ Modified: trunk/reactos/drivers/dd/serial/legacy.c --- trunk/reactos/drivers/dd/serial/legacy.c 2005-03-27 11:00:41 UTC (rev 14343) +++ trunk/reactos/drivers/dd/serial/legacy.c 2005-03-27 11:13:25 UTC (rev 14344) @@ -62,7 +62,11 @@ { case 0x00: return Uart16450; + case 0x40: case 0x80: + /* Not sure about this but the documentation says that 0x40 + * indicates an unusable FIFO but my tests only worked + * with 0x80 */ return Uart16550; }

1 0

[navaraf] 14343: Correct DLL loading order and honour the LOAD_WITH_ALTERED_SEARCH_PATH flag.
by navaraf＠svn.reactos.com 27 Mar '05

27 Mar '05

Correct DLL loading order and honour the LOAD_WITH_ALTERED_SEARCH_PATH flag. Modified: trunk/reactos/lib/kernel32/misc/ldr.c _____ Modified: trunk/reactos/lib/kernel32/misc/ldr.c --- trunk/reactos/lib/kernel32/misc/ldr.c 2005-03-27 08:29:25 UTC (rev 14342) +++ trunk/reactos/lib/kernel32/misc/ldr.c 2005-03-27 11:00:41 UTC (rev 14343) @@ -21,6 +21,70 @@ /* FUNCTIONS ****************************************************************/ +/** + * @name GetDllLoadPath + * + * Internal function to compute the load path to use for a given dll. + * + * @remarks Returned pointer must be freed by caller. + */ + +LPWSTR STDCALL +GetDllLoadPath(LPCWSTR lpModule) +{ + ULONG Pos = 0, Length = 0; + PWCHAR EnvironmentBufferW = NULL; + LPCWSTR lpModuleEnd = NULL; + UNICODE_STRING ModuleName; + + if (lpModule != NULL) + { + lpModuleEnd = lpModule + wcslen(lpModule); + } + else + { + ModuleName = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName; + lpModule = ModuleName.Buffer; + lpModuleEnd = lpModule + (ModuleName.Length / sizeof(WCHAR)); + } + + if (lpModule != NULL) + { + while (lpModuleEnd > lpModule && *lpModuleEnd != L'/' && + *lpModuleEnd != L'\\' && *lpModuleEnd != L':') + --lpModuleEnd; + Length = (lpModuleEnd - lpModule) + 1; + } + + Length += GetCurrentDirectoryW(0, NULL) + 1; + Length += GetSystemDirectoryW(NULL, 0) + 1; + Length += GetWindowsDirectoryW(NULL, 0) + 1; + Length += GetEnvironmentVariableW(L"PATH", NULL, 0) + 1; + + EnvironmentBufferW = RtlAllocateHeap(RtlGetProcessHeap(), 0, + Length * sizeof(WCHAR)); + if (EnvironmentBufferW == NULL) + return NULL; + + if (lpModule) + { + RtlCopyMemory(EnvironmentBufferW, lpModule, + (lpModuleEnd - lpModule) * sizeof(WCHAR)); + Pos += lpModuleEnd - lpModule; + EnvironmentBufferW[Pos++] = L';'; + } + Pos += GetCurrentDirectoryW(Length, EnvironmentBufferW + Pos); + EnvironmentBufferW[Pos++] = L';'; + Pos += GetSystemDirectoryW(EnvironmentBufferW + Pos, Length - Pos); + EnvironmentBufferW[Pos++] = L';'; + Pos += GetWindowsDirectoryW(EnvironmentBufferW + Pos, Length - Pos); + EnvironmentBufferW[Pos++] = L';'; + Pos += GetEnvironmentVariableW(L"PATH", EnvironmentBufferW + Pos, Length - Pos); + EnvironmentBufferW[Pos] = 0; + + return EnvironmentBufferW; +} + /* * @implemented */ @@ -66,40 +130,12 @@ DWORD dwFlags ) { - UNICODE_STRING LibFileNameU; - ANSI_STRING LibFileName; - HINSTANCE hInst; - NTSTATUS Status; + PWCHAR FileNameW; + + if (!(FileNameW = FilenameA2W(lpLibFileName, FALSE))) + return FALSE; - (void)hFile; - - RtlInitAnsiString (&LibFileName, - (LPSTR)lpLibFileName); - - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - RtlAnsiStringToUnicodeString (&LibFileNameU, - &LibFileName, - TRUE); - else - RtlOemStringToUnicodeString (&LibFileNameU, - &LibFileName, - TRUE); - - Status = LdrLoadDll(NULL, - dwFlags, - &LibFileNameU, - (PVOID*)&hInst); - - RtlFreeUnicodeString (&LibFileNameU); - - if ( !NT_SUCCESS(Status)) - { - SetLastErrorByStatus (Status); - return NULL; - } - - return hInst; + return LoadLibraryExW(FileNameW, hFile, dwFlags); } @@ -130,6 +166,7 @@ UNICODE_STRING DllName; HINSTANCE hInst; NTSTATUS Status; + PWSTR SearchPath; (void)hFile; @@ -141,8 +178,11 @@ LOAD_LIBRARY_AS_DATAFILE | LOAD_WITH_ALTERED_SEARCH_PATH; + SearchPath = GetDllLoadPath( + dwFlags & LOAD_WITH_ALTERED_SEARCH_PATH ? lpLibFileName : NULL); + RtlInitUnicodeString (&DllName, (LPWSTR)lpLibFileName); - Status = LdrLoadDll(NULL, dwFlags, &DllName, (PVOID*)&hInst); + Status = LdrLoadDll(SearchPath, dwFlags, &DllName, (PVOID*)&hInst); if ( !NT_SUCCESS(Status)) { SetLastErrorByStatus (Status);

1 0

[navaraf] 14342: - Rewrite NtUserGetUpdateRect. It should return TRUE when the window needs to be pained, not only when the client update rect is non-empty.
by navaraf＠svn.reactos.com 27 Mar '05

27 Mar '05

- Rewrite NtUserGetUpdateRect. It should return TRUE when the window needs to be pained, not only when the client update rect is non-empty. - Return TRUE for windows with pending WM_NCPAINT message in IntIsWindowDirty. Modified: trunk/reactos/subsys/win32k/ntuser/painting.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-03-27 01:57:26 UTC (rev 14341) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-03-27 08:29:25 UTC (rev 14342) @@ -537,7 +537,8 @@ { return (Window->Style & WS_VISIBLE) && ((Window->UpdateRegion != NULL) || - (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT)); + (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) || + (Window->Flags & WINDOWOBJECT_NEED_NCPAINT)); } HWND STDCALL @@ -873,6 +874,7 @@ return ERROR; } + IntLockWindowUpdate(Window); if (Window->UpdateRegion == NULL) { RegionType = (NtGdiSetRectRgn(hRgn, 0, 0, 0, 0) ? NULLREGION : ERROR); @@ -885,6 +887,7 @@ Window->WindowRect.left - Window->ClientRect.left, Window->WindowRect.top - Window->ClientRect.top); } + IntUnLockWindowUpdate(Window); IntReleaseWindowObject(Window); @@ -904,49 +907,56 @@ */ BOOL STDCALL -NtUserGetUpdateRect(HWND Wnd, LPRECT UnsafeRect, BOOL Erase) +NtUserGetUpdateRect(HWND hWnd, LPRECT UnsafeRect, BOOL bErase) { - RECT Rect; - HRGN Rgn; - PROSRGNDATA RgnData; - NTSTATUS Status; + PWINDOW_OBJECT Window; + RECT Rect; + INT RegionType; + PROSRGNDATA RgnData; + BOOL AlwaysPaint; + NTSTATUS Status; - Rgn = NtGdiCreateRectRgn(0, 0, 0, 0); - if (NULL == Rgn) - { - NtGdiDeleteObject(Rgn); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } - NtUserGetUpdateRgn(Wnd, Rgn, Erase); - RgnData = RGNDATA_LockRgn(Rgn); - if (NULL == RgnData) - { - NtGdiDeleteObject(Rgn); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } - if (ERROR == UnsafeIntGetRgnBox(RgnData, &Rect)) - { - RGNDATA_UnlockRgn(Rgn); - NtGdiDeleteObject(Rgn); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } - RGNDATA_UnlockRgn(Rgn); - NtGdiDeleteObject(Rgn); + if (!(Window = IntGetWindowObject(hWnd))) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); + return ERROR; + } + + IntLockWindowUpdate(Window); + if (Window->UpdateRegion == NULL) + { + Rect.left = Rect.top = Rect.right = Rect.bottom = 0; + } + else + { + RgnData = RGNDATA_LockRgn(Window->UpdateRegion); + ASSERT(RgnData != NULL); + RegionType = UnsafeIntGetRgnBox(RgnData, &Rect); + ASSERT(RegionType != ERROR); + RGNDATA_UnlockRgn(Window->UpdateRegion); + } + AlwaysPaint = (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) || + (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT); + IntUnLockWindowUpdate(Window); - if (UnsafeRect != NULL) - { + IntReleaseWindowObject(Window); + + if (bErase && Rect.left < Rect.right && Rect.top < Rect.bottom) + { + NtUserRedrawWindow(hWnd, NULL, NULL, RDW_ERASENOW | RDW_NOCHILDREN); + } + + if (UnsafeRect != NULL) + { Status = MmCopyToCaller(UnsafeRect, &Rect, sizeof(RECT)); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - } + if (!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + } - return Rect.left < Rect.right && Rect.top < Rect.bottom; + return (Rect.left < Rect.right && Rect.top < Rect.bottom) || AlwaysPaint; } /*

1 0

[hyperion] 14341: Implemented PSEH wrapper for native compiler SEH. Changed copyright years
by hyperion＠svn.reactos.com 27 Mar '05

27 Mar '05

Implemented PSEH wrapper for native compiler SEH. Changed copyright years Modified: trunk/reactos/include/pseh/excpt.h Modified: trunk/reactos/include/pseh/framebased/internal.h Modified: trunk/reactos/include/pseh/framebased.h Added: trunk/reactos/include/pseh/native.h Modified: trunk/reactos/include/pseh/setjmp.h Modified: trunk/reactos/include/pseh.h _____ Modified: trunk/reactos/include/pseh/excpt.h --- trunk/reactos/include/pseh/excpt.h 2005-03-27 00:53:15 UTC (rev 14340) +++ trunk/reactos/include/pseh/excpt.h 2005-03-27 01:57:26 UTC (rev 14341) @@ -1,5 +1,5 @@ /* - Copyright (c) 2004 KJK::Hyperion + Copyright (c) 2004/2005 KJK::Hyperion Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in _____ Modified: trunk/reactos/include/pseh/framebased/internal.h --- trunk/reactos/include/pseh/framebased/internal.h 2005-03-27 00:53:15 UTC (rev 14340) +++ trunk/reactos/include/pseh/framebased/internal.h 2005-03-27 01:57:26 UTC (rev 14341) @@ -1,5 +1,5 @@ /* - Copyright (c) 2004 KJK::Hyperion + Copyright (c) 2004/2005 KJK::Hyperion Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in _____ Modified: trunk/reactos/include/pseh/framebased.h --- trunk/reactos/include/pseh/framebased.h 2005-03-27 00:53:15 UTC (rev 14340) +++ trunk/reactos/include/pseh/framebased.h 2005-03-27 01:57:26 UTC (rev 14341) @@ -1,5 +1,5 @@ /* - Copyright (c) 2004 KJK::Hyperion + Copyright (c) 2004/2005 KJK::Hyperion Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in @@ -33,7 +33,10 @@ /* Fall back to non-optimal, non-native NLG implementation for environments - without their own (e.g., currently, kernel-mode ReactOS/Windows) + without their own (e.g., currently, kernel-mode ReactOS/Windows). THIS IS NOT + RECOMMENDED AND IT WILL BE DROPPED IN A FUTURE VERSION BECAUSE IT MAY CAUSE + SEVERE STACK CORRUPTION. REIMPLEMENT OR PORT YOUR COMPILER'S NATIVE NLG + IMPLEMENTATION INSTEAD. */ #ifdef _SEH_NO_NATIVE_NLG # include <pseh/setjmp.h> _____ Added: trunk/reactos/include/pseh/native.h --- trunk/reactos/include/pseh/native.h 2005-03-27 00:53:15 UTC (rev 14340) +++ trunk/reactos/include/pseh/native.h 2005-03-27 01:57:26 UTC (rev 14341) @@ -0,0 +1,242 @@ +/* + Copyright (c) 2004/2005 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#ifndef KJK_PSEH_NATIVE_H_ +#define KJK_PSEH_NATIVE_H_ + +#include <excpt.h> +#include <pseh/excpt.h> + +/* + Note: just define __inline to an empty symbol if your C compiler doesn't + support it +*/ +#ifdef __cplusplus +# ifndef __inline +# define __inline inline +# endif +#endif + +typedef long (__stdcall * _SEHFilter_t) +( + long, + struct _EXCEPTION_POINTERS *, + void * +); + +typedef void (__stdcall * _SEHFinally_t) +( + int, + void * +); + +static __inline long _SEHCallFilter +( + _SEHFilter_t _SEHFilter, + long _SEHExceptionCode, + struct _EXCEPTION_POINTERS * _SEHExceptionPointers, + void * _SEHPVLocals +) +{ + if(_SEHFilter == _SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER)) + return _SEH_EXECUTE_HANDLER; + else if(_SEHFilter == _SEH_STATIC_FILTER(_SEH_CONTINUE_SEARCH)) + return _SEH_CONTINUE_SEARCH; + else if(_SEHFilter == _SEH_STATIC_FILTER(_SEH_CONTINUE_EXECUTION)) + return _SEH_CONTINUE_EXECUTION; + else if(_SEHFilter) + return _SEHFilter(_SEHExceptionCode, _SEHExceptionPointers, _SEHPVLocals); + else + return _SEH_CONTINUE_SEARCH; +} + +static __inline void _SEHCallFinally +( + _SEHFinally_t _SEHFinally, + int _SEHAbnormalTermination, + void * _SEHPVLocals +) +{ + if(_SEHFinally) + (_SEHFinally)(_SEHAbnormalTermination, _SEHPVLocals); +} + +/* SHARED LOCALS */ +/* Access the locals for the current frame */ +#define _SEH_ACCESS_LOCALS(LOCALS_) \ + _SEH_LOCALS_TYPENAME(LOCALS_) * _SEHPLocals; \ + _SEHPLocals = _SEH_PVOID_CAST(_SEH_LOCALS_TYPENAME(LOCALS_) *, _SEHPVLocals); + +/* Access local variable VAR_ */ +#define _SEH_VAR(VAR_) _SEHPLocals->VAR_ + +/* FILTER FUNCTIONS */ +/* Declares a filter function's prototype */ +#define _SEH_FILTER(NAME_) \ + long __stdcall NAME_ \ + ( \ + long _SEHExceptionCode, \ + struct _EXCEPTION_POINTERS * _SEHExceptionPointers, \ + void * _SEHPVLocals \ + ) + +/* Declares a static filter */ +#define _SEH_STATIC_FILTER(ACTION_) ((_SEHFilter_t)((ACTION_) + 2)) + +/* Declares a PSEH filter wrapping a regular filter function */ +#define _SEH_WRAP_FILTER(WRAPPER_, NAME_) \ + static __inline _SEH_FILTER(WRAPPER_) \ + { \ + return (NAME_)(_SEHExceptionPointers); \ + } + +/* FINALLY FUNCTIONS */ +/* Declares a finally function's prototype */ +#define _SEH_FINALLY(NAME_) \ + void __stdcall NAME_ \ + ( \ + int _SEHAbnormalTermination, \ + void * _SEHPVLocals \ + ) + +/* Declares a PSEH finally function wrapping a regular function */ +#define _SEH_WRAP_FINALLY(WRAPPER_, NAME_) \ + _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ()) + +#define _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ARGS_) \ + static __inline _SEH_FINALLY(WRAPPER_) \ + { \ + NAME_ ARGS_; \ + } + +#define _SEH_WRAP_FINALLY_LOCALS_ARGS(WRAPPER_, LOCALS_, NAME_, ARGS_) \ + static __inline _SEH_FINALLY(WRAPPER_) \ + { \ + _SEH_ACCESS_LOCALS(LOCALS_); \ + NAME_ ARGS_; \ + } + +/* SAFE BLOCKS */ +#define _SEH_TRY_FINALLY(FINALLY_) \ + _SEH_TRY_FILTER_FINALLY \ + ( \ + _SEH_STATIC_FILTER(_SEH_CONTINUE_SEARCH), \ + (FINALLY_) \ + ) + +#define _SEH_END_FINALLY _SEH_HANDLE _SEH_END + +#define _SEH_TRY_FILTER(FILTER_) \ + _SEH_TRY_FILTER_FINALLY((FILTER_), NULL) + +#define _SEH_TRY_HANDLE_FINALLY(FINALLY_) \ + _SEH_TRY_FILTER_FINALLY \ + ( \ + _SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER), \ + (FINALLY_) \ + ) + +#define _SEH_TRY \ + _SEH_TRY_HANDLE_FINALLY(NULL) + +#define _SEH_CALL_FILTER(FILTER_) \ + _SEHCallFilter \ + ( \ + (FILTER_), \ + GetExceptionCode(), \ + GetExceptionPointers(), \ + _SEHPVLocals \ + ) + +#define _SEH_CALL_FINALLY(FINALLY_) \ + _SEHCallFinally((FINALLY_), (AbnormalTermination() != 0), _SEHPVLocals) + +#define _SEH_TRY_FILTER_FINALLY(FILTER_, FINALLY_) \ + __try \ + { \ + _SEHFinally_t _SEHFinally = (FINALLY_); \ + _SEHFilter_t _SEHFilter = (FILTER_); \ + void * _SEHPVLocals = &_SEHLocals; \ + (void)_SEHPVLocals; \ + \ + __try \ + { + +#define _SEH_HANDLE \ + } \ + __except(_SEH_CALL_FILTER(_SEHFilter)) \ + { \ + struct _EXCEPTION_POINTERS * _SEHExceptionPointers = GetExceptionPointers();\ + long _SEHExceptionCode = GetExceptionCode(); \ + +#define _SEH_END \ + } \ + } \ + __finally \ + { \ + _SEH_CALL_FINALLY(_SEHFinally); \ + } + +#define _SEH_LEAVE __leave + +#define _SEH_GetExceptionCode() (_SEHExceptionCode) +#define _SEH_GetExceptionPointers() (_SEHExceptionPointers) +#define _SEH_AbnormalTermination() (_SEHAbnormalTermination) + +/* New syntax */ + +#define _SEH2_TRY \ + { \ + void * _SEHPVLocals = &_SEHLocals; \ + (void)_SEHPVLocals; \ + \ + __try \ + { + +#define _SEH2_EXCEPT(FILTER_) \ + } \ + __except(_SEH_CALL_FILTER(FILTER_)) \ + { \ + struct _EXCEPTION_POINTERS * _SEHExceptionPointers = GetExceptionPointers();\ + long _SEHExceptionCode = GetExceptionCode(); \ + +#define _SEH2_FINALLY(FINALLY_) \ + } \ + __finally \ + { \ + _SEH_CALL_FINALLY(FINALLY_) + +#define _SEH2_END \ + } \ + } + +#define _SEH2_HANDLE _SEH2_EXCEPT(_SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER)) + +#define _SEH2_LEAVE _SEH_LEAVE + +#define _SEH2_GetExceptionCode _SEH_GetExceptionCode +#define _SEH2_GetExceptionPointers _SEH_GetExceptionPointers +#define _SEH2_AbnormalTermination _SEH_AbnormalTermination + +#endif + +/* EOF */ _____ Modified: trunk/reactos/include/pseh/setjmp.h --- trunk/reactos/include/pseh/setjmp.h 2005-03-27 00:53:15 UTC (rev 14340) +++ trunk/reactos/include/pseh/setjmp.h 2005-03-27 01:57:26 UTC (rev 14341) @@ -1,5 +1,5 @@ /* - Copyright (c) 2004 KJK::Hyperion + Copyright (c) 2004/2005 KJK::Hyperion Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in _____ Modified: trunk/reactos/include/pseh.h --- trunk/reactos/include/pseh.h 2005-03-27 00:53:15 UTC (rev 14340) +++ trunk/reactos/include/pseh.h 2005-03-27 01:57:26 UTC (rev 14341) @@ -1,5 +1,5 @@ /* - Copyright (c) 2004 KJK::Hyperion + Copyright (c) 2004/2005 KJK::Hyperion Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in @@ -67,7 +67,6 @@ static _SEH_LOCALS_TYPENAME(_SEHDummyLocals) { int Dummy_; } _SEHLocals; static void __inline _SEHDummyLocalsUser(void) { (void)_SEHLocals; } -/* TODO: <pseh/native.h> to wrap native SEH implementations */ #include <pseh/framebased.h> #endif

1 0

[hyperion] 14340: Forgot to implement _SEH2_LEAVE. Also added some _SEH2 aliases to clean any possible ambiguity
by hyperion＠svn.reactos.com 27 Mar '05

27 Mar '05

Forgot to implement _SEH2_LEAVE. Also added some _SEH2 aliases to clean any possible ambiguity Modified: trunk/reactos/include/pseh/framebased.h _____ Modified: trunk/reactos/include/pseh/framebased.h --- trunk/reactos/include/pseh/framebased.h 2005-03-27 00:44:53 UTC (rev 14339) +++ trunk/reactos/include/pseh/framebased.h 2005-03-27 00:53:15 UTC (rev 14340) @@ -215,6 +215,13 @@ #define _SEH_LEAVE break +#define _SEH_GetExceptionCode() (unsigned long)(_SEHPortableFrame->SPF_Code) + +#define _SEH_GetExceptionPointers() \ + ((struct _EXCEPTION_POINTERS *)_SEHExceptionPointers) + +#define _SEH_AbnormalTermination() (_SEHPortableFrame->SPF_Code != 0) + /* New syntax */ #define _SEH2_STATE_INIT_EXCEPT (1) #define _SEH2_STATE_INIT_FINALLY (_SEH2_STATE_INIT_EXCEPT + 1) @@ -222,6 +229,8 @@ #define _SEH2_STATE_HANDLER (_SEH2_STATE_BODY + 1) #define _SEH2_STATE_DONE (_SEH2_STATE_HANDLER + 1) +#define _SEH2_LEAVE { _SEH2State = _SEH2_STATE_DONE; break; } + #define _SEH2_TRY \ { \ int _SEH2State; \ @@ -300,13 +309,10 @@ #define _SEH2_HANDLE _SEH2_EXCEPT(_SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER)) -#define _SEH_GetExceptionCode() (unsigned long)(_SEHPortableFrame->SPF_Code) +#define _SEH2_GetExceptionCode _SEH_GetExceptionCode +#define _SEH2_GetExceptionPointers _SEH_GetExceptionPointers +#define _SEH2_AbnormalTermination _SEH_AbnormalTermination -#define _SEH_GetExceptionPointers() \ - ((struct _EXCEPTION_POINTERS *)_SEHExceptionPointers) - -#define _SEH_AbnormalTermination() (_SEHPortableFrame->SPF_Code != 0) - #endif /* EOF */

1 0

[hyperion] 14339: _SEH2_HANDLE as a short-hand for _SEH2_EXCEPT(_SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER))
by hyperion＠svn.reactos.com 27 Mar '05

27 Mar '05

_SEH2_HANDLE as a short-hand for _SEH2_EXCEPT(_SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER)) Modified: trunk/reactos/include/pseh/framebased.h _____ Modified: trunk/reactos/include/pseh/framebased.h --- trunk/reactos/include/pseh/framebased.h 2005-03-27 00:41:31 UTC (rev 14338) +++ trunk/reactos/include/pseh/framebased.h 2005-03-27 00:44:53 UTC (rev 14339) @@ -298,6 +298,8 @@ _SEHHandlers.SH_Finally(&_SEHFrame->SEH_Header); \ } +#define _SEH2_HANDLE _SEH2_EXCEPT(_SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER)) + #define _SEH_GetExceptionCode() (unsigned long)(_SEHPortableFrame->SPF_Code) #define _SEH_GetExceptionPointers() \

1 0

[hyperion] 14338: New syntax for PSEH. UNTESTED, any takers? It can be used like this:
by hyperion＠svn.reactos.com 27 Mar '05

27 Mar '05

New syntax for PSEH. UNTESTED, any takers? It can be used like this: _SEH2_TRY { // Code that might raise an exception } _SEH2_EXCEPT(FilterFunc) { // Handle the exception } _SEH2_END; or like this: _SEH2_TRY { // Code that might raise an exception } _SEH2_FINALLY(UnwindFunc) _SEH2_END; or even like this (but PLEASE forget I said it): _SEH2_TRY { // Code that might raise an exception } _SEH2_EXCEPT(FilterFunc) { // Handle the exception } _SEH2_FINALLY(UnwindFunc) _SEH2_END; _SEH2_TRY { // Code that might raise an exception } _SEH2_END; Modified: trunk/reactos/include/pseh/framebased.h _____ Modified: trunk/reactos/include/pseh/framebased.h --- trunk/reactos/include/pseh/framebased.h 2005-03-26 22:10:04 UTC (rev 14337) +++ trunk/reactos/include/pseh/framebased.h 2005-03-27 00:41:31 UTC (rev 14338) @@ -215,6 +215,89 @@ #define _SEH_LEAVE break +/* New syntax */ +#define _SEH2_STATE_INIT_EXCEPT (1) +#define _SEH2_STATE_INIT_FINALLY (_SEH2_STATE_INIT_EXCEPT + 1) +#define _SEH2_STATE_BODY (_SEH2_STATE_INIT_FINALLY + 1) +#define _SEH2_STATE_HANDLER (_SEH2_STATE_BODY + 1) +#define _SEH2_STATE_DONE (_SEH2_STATE_HANDLER + 1) + +#define _SEH2_TRY \ +{ \ + int _SEH2State; \ + _SEHFilter_t _SEH2Filter; \ + _SEHFinally_t _SEH2Finally; \ + \ + _SEHFrame_t * _SEHFrame; \ + volatile _SEHPortableFrame_t * _SEHPortableFrame; \ + \ + for(_SEH2State = 0; _SEH2State < _SEH2_STATE_DONE; ++ _SEH2State) \ + { \ + switch(_SEH2State) \ + { \ + case _SEH2_STATE_BODY: \ + { \ + _SEH_DECLARE_HANDLERS(_SEH2Filter, _SEH2Finally); \ + \ + _SEHFrame = _alloca(sizeof(_SEHFrame_t)); \ + _SEHFrame->SEH_Header.SPF_Handlers = &_SEHHandlers; \ + _SEHFrame->SEH_Locals = &_SEHLocals; \ + \ + _SEHPortableFrame = &_SEHFrame->SEH_Header; \ + (void)_SEHPortableFrame; \ + \ + if(_SEHSetJmp(_SEHFrame->SEH_JmpBuf)) \ + break; \ + \ + _SEHEnter(&_SEHFrame->SEH_Header); + +#define _SEH2_EXCEPT(FILTER_) \ + _SEHLeave(&_SEHFrame->SEH_Header); \ + _SEH2State = _SEH2_STATE_DONE; \ + \ + break; \ + } \ + \ + case _SEH2_STATE_INIT_EXCEPT: \ + { \ + _SEH2Filter = (FILTER_); \ + break; \ + } \ + \ + case _SEH2_STATE_HANDLER: \ + { \ + _SEHLeave(&_SEHFrame->SEH_Header); + +#define _SEH2_FINALLY(FINALLY_) \ + break; \ + } \ + \ + case _SEH2_STATE_INIT_FINALLY: \ + { \ + _SEH2Finally = (FINALLY_); + +#define _SEH2_END \ + break; \ + } \ + \ + default: \ + { \ + switch(state) \ + { \ + case _SEH2_STATE_INIT_EXCEPT: _SEH2Filter = NULL; break; \ + case _SEH2_STATE_INIT_FINALLY: _SEH2Finally = NULL; break; \ + case _SEH2_STATE_HANDLER: _SEHLeave(&_SEHFrame->SEH_Header); break; \ + } \ + \ + break; \ + } \ + } \ + } \ + \ + if(_SEHHandlers.SH_Finally) \ + _SEHHandlers.SH_Finally(&_SEHFrame->SEH_Header); \ +} + #define _SEH_GetExceptionCode() (unsigned long)(_SEHPortableFrame->SPF_Code) #define _SEH_GetExceptionPointers() \

1 0

[ea] 14337: Some stubbing and some stack sizes in exported symbols.
by ea＠svn.reactos.com 26 Mar '05

26 Mar '05

Some stubbing and some stack sizes in exported symbols. Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/crypt/crypt.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-03-26 21:16:42 UTC (rev 14336) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-03-26 22:10:04 UTC (rev 14337) @@ -15,24 +15,24 @@ AccessCheckAndAuditAlarmA@44 AccessCheckAndAuditAlarmW@44 ;AccessCheckByType -;AccessCheckByTypeAndAuditAlarmA -;AccessCheckByTypeAndAuditAlarmW -;AccessCheckByTypeResultList -;AccessCheckByTypeResultListAndAuditAlarmA -;AccessCheckByTypeResultListAndAuditAlarmByHandleA -;AccessCheckByTypeResultListAndAuditAlarmByHandleW -;AccessCheckByTypeResultListAndAuditAlarmW +;AccessCheckByTypeAndAuditAlarmA@64 +;AccessCheckByTypeAndAuditAlarmW@64 +;AccessCheckByTypeResultList@44 +;AccessCheckByTypeResultListAndAuditAlarmA@64 +;AccessCheckByTypeResultListAndAuditAlarmByHandleA@68 +;AccessCheckByTypeResultListAndAuditAlarmByHandleW@68 +;AccessCheckByTypeResultListAndAuditAlarmW@64 AddAccessAllowedAce@16 AddAccessAllowedAceEx@20 -;AddAccessAllowedObjectAce +;AddAccessAllowedObjectAce@28 AddAccessDeniedAce@16 AddAccessDeniedAceEx@20 -;AddAccessDeniedObjectAce +;AddAccessDeniedObjectAce@28 AddAce@20 AddAuditAccessAce@24 AddAuditAccessAceEx@28 -;AddAuditAccessObjectAce -;AddUsersToEncryptedFile +;AddAuditAccessObjectAce@36 +;AddUsersToEncryptedFile@8 AdjustTokenGroups@24 AdjustTokenPrivileges@24 AllocateAndInitializeSid@44 @@ -41,8 +41,6 @@ AreAnyAccessesGranted@8 BackupEventLogA@8 BackupEventLogW@8 -;BuildAccessRequestA -;BuildAccessRequestW BuildExplicitAccessWithNameA@20 BuildExplicitAccessWithNameW@20 BuildImpersonateExplicitAccessWithNameA@24 @@ -53,77 +51,77 @@ ;BuildSecurityDescriptorW@36 BuildTrusteeWithNameA@8 BuildTrusteeWithNameW@8 -;BuildTrusteeWithObjectsAndNameA -;BuildTrusteeWithObjectsAndNameW -;BuildTrusteeWithObjectsAndSidA -;BuildTrusteeWithObjectsAndSidW +;BuildTrusteeWithObjectsAndNameA@24 +;BuildTrusteeWithObjectsAndNameW@24 +;BuildTrusteeWithObjectsAndSidA@20 +;BuildTrusteeWithObjectsAndSidW@20 BuildTrusteeWithSidA@8 BuildTrusteeWithSidW@8 -;CancelOverlappedAccess -;ChangeServiceConfig2A -;ChangeServiceConfig2W +;CancelOverlappedAccess@4 +;ChangeServiceConfig2A@12 +;ChangeServiceConfig2W@12 ChangeServiceConfigA@44 ChangeServiceConfigW@44 CheckTokenMembership@12 ClearEventLogA@8 ClearEventLogW@8 -;CloseCodeAuthzLevel +;CloseCodeAuthzLevel@4 ;CloseEncryptedFileRaw CloseEventLog@4 CloseServiceHandle@4 -;CloseTrace -;CommandLineFromMsiDescriptor -;ComputeAccessTokenFromCodeAuthzLevel +;CloseTrace@8 +;CommandLineFromMsiDescriptor@12 +;ComputeAccessTokenFromCodeAuthzLevel@20 ControlService@12 -;ControlTraceA -;ControlTraceW -;ConvertAccessToSecurityDescriptorA -;ConvertAccessToSecurityDescriptorW -;ConvertSDToStringSDRootDomainA -;ConvertSDToStringSDRootDomainW -;ConvertSecurityDescriptorToAccessA -;ConvertSecurityDescriptorToAccessNamedA -;ConvertSecurityDescriptorToAccessNamedW -;ConvertSecurityDescriptorToAccessW -;ConvertSecurityDescriptorToStringSecurityDescriptorA -;ConvertSecurityDescriptorToStringSecurityDescriptorW +;ControlTraceA@12 +;ControlTraceW@12 +;ConvertAccessToSecurityDescriptorA@20 +;ConvertAccessToSecurityDescriptorW@20 +;ConvertSDToStringSDRootDomainA@24 +;ConvertSDToStringSDRootDomainW@24 +;ConvertSecurityDescriptorToAccessA@28 +;ConvertSecurityDescriptorToAccessNamedA=ConvertSecurityDescriptorToAcc essA@28 +;ConvertSecurityDescriptorToAccessNamedW=ConvertSecurityDescriptorToAcc essW@28 +;ConvertSecurityDescriptorToAccessW@28 +;ConvertSecurityDescriptorToStringSecurityDescriptorA@20 +;ConvertSecurityDescriptorToStringSecurityDescriptorW@20 ConvertSidToStringSidA@8 ConvertSidToStringSidW@8 -;ConvertStringSDToSDDomainA -;ConvertStringSDToSDDomainW -;ConvertStringSDToSDRootDomainA -;ConvertStringSDToSDRootDomainW -;ConvertStringSecurityDescriptorToSecurityDescriptorA -;ConvertStringSecurityDescriptorToSecurityDescriptorW -;ConvertStringSidToSidA -;ConvertStringSidToSidW -;ConvertToAutoInheritPrivateObjectSecurity +;ConvertStringSDToSDDomainA@24 +;ConvertStringSDToSDDomainW@24 +;ConvertStringSDToSDRootDomainA@20 +;ConvertStringSDToSDRootDomainW@20 +;ConvertStringSecurityDescriptorToSecurityDescriptorA@20 +;ConvertStringSecurityDescriptorToSecurityDescriptorW@20 +;ConvertStringSidToSidA@8 +;ConvertStringSidToSidW@8 +;ConvertToAutoInheritPrivateObjectSecurity@24 CopySid@12 -;CreateCodeAuthzLevel +;CreateCodeAuthzLevel@20 ;CreatePrivateObjectSecurity@24 -;CreatePrivateObjectSecurityEx -;CreatePrivateObjectSecurityWithMultipleInheritance +;CreatePrivateObjectSecurityEx@32 +;CreatePrivateObjectSecurityWithMultipleInheritance@36 CreateProcessAsUserA@44 ;CreateProcessAsUserSecure CreateProcessAsUserW@44 ;CreateProcessWithLogonW -;CreateRestrictedToken +;CreateRestrictedToken@36 CreateServiceA@52 CreateServiceW@52 -;CreateTraceInstanceId -;CreateWellKnownSid -;CredDeleteA -;CredDeleteW -;CredEnumerateA -;CredEnumerateW -;CredFree -;CredGetSessionTypes -;CredGetTargetInfoA -;CredGetTargetInfoW -;CredIsMarshaledCredentialA -;CredIsMarshaledCredentialW -;CredMarshalCredentialA -;CredMarshalCredentialW +;CreateTraceInstanceId@8 +;CreateWellKnownSid@16 +;CredDeleteA@12 +;CredDeleteW@12 +;CredEnumerateA@16 +;CredEnumerateW@16 +;CredFree@4 +;CredGetSessionTypes@8 +;CredGetTargetInfoA@12 +;CredGetTargetInfoW@12 +;CredIsMarshaledCredentialA@4 +;CredIsMarshaledCredentialW@4 +;CredMarshalCredentialA@12 +;CredMarshalCredentialW@12 ;CredProfileLoaded ;CredReadA ;CredReadDomainCredentialsA @@ -149,18 +147,18 @@ CryptDeriveKey@20 CryptDestroyHash@4 CryptDestroyKey@4 -;CryptDuplicateHash -;CryptDuplicateKey +;CryptDuplicateHash@16 +;CryptDuplicateKey@16 CryptEncrypt@28 -;CryptEnumProviderTypesA -;CryptEnumProviderTypesW -;CryptEnumProvidersA -;CryptEnumProvidersW +;CryptEnumProviderTypesA@24 +;CryptEnumProviderTypesW@24 +;CryptEnumProvidersA@24 +;CryptEnumProvidersW@24 CryptExportKey@24 CryptGenKey@16 CryptGenRandom@12 -;CryptGetDefaultProviderA -;CryptGetDefaultProviderW +;CryptGetDefaultProviderA@20 +;CryptGetDefaultProviderW@20 CryptGetHashParam@20 CryptGetKeyParam@20 CryptGetProvParam@20 @@ -173,15 +171,15 @@ CryptSetKeyParam@16 CryptSetProvParam@16 CryptSetProviderA@8 -;CryptSetProviderExA -;CryptSetProviderExW +;CryptSetProviderExA@16 +;CryptSetProviderExW@16 CryptSetProviderW@8 CryptSignHashA@24 ;CryptSignHashW@24 CryptVerifySignatureA@24 -;CryptVerifySignatureW@24 -;DecryptFileA -;DecryptFileW +CryptVerifySignatureW@24 +;DecryptFileA@8 +;DecryptFileW@8 DeleteAce@8 DeleteService@4 DeregisterEventSource@4 @@ -316,8 +314,8 @@ InitializeSecurityDescriptor@8 InitializeSid@12 InitiateSystemShutdownA@20 -;InitiateSystemShutdownExA -;InitiateSystemShutdownExW +;InitiateSystemShutdownExA@24 +;InitiateSystemShutdownExW@24 InitiateSystemShutdownW@20 ;InstallApplication IsTextUnicode(a)12=NTDLL.RtlIsTextUnicode _____ Modified: trunk/reactos/lib/advapi32/crypt/crypt.c --- trunk/reactos/lib/advapi32/crypt/crypt.c 2005-03-26 21:16:42 UTC (rev 14336) +++ trunk/reactos/lib/advapi32/crypt/crypt.c 2005-03-26 22:10:04 UTC (rev 14337) @@ -1887,6 +1887,17 @@ key->hPrivate, NULL, dwFlags); } +BOOL WINAPI +CryptVerifySignatureW (HCRYPTHASH hHash, + BYTE *pbSignature, + DWORD dwSigLen, + HCRYPTKEY hPubKey, + LPCWSTR sDescription, + DWORD dwFlags) +{ + OutputDebugStringA ("ADVAPI32!CryptVerifySignatureW not implemented!"); + return FALSE; +} /* These functions have nearly identical prototypes to CryptProtectMemory and CryptUnprotectMemory,

1 0

[navaraf] 14336: Fix return value of SwitchToThread.
by navaraf＠svn.reactos.com 26 Mar '05

26 Mar '05

Fix return value of SwitchToThread. Modified: trunk/reactos/lib/kernel32/thread/thread.c _____ Modified: trunk/reactos/lib/kernel32/thread/thread.c --- trunk/reactos/lib/kernel32/thread/thread.c 2005-03-26 20:14:06 UTC (rev 14335) +++ trunk/reactos/lib/kernel32/thread/thread.c 2005-03-26 21:16:42 UTC (rev 14336) @@ -330,9 +330,9 @@ BOOL STDCALL SwitchToThread(VOID) { - NTSTATUS errCode; - errCode = NtYieldExecution(); - return TRUE; + NTSTATUS Status; + Status = NtYieldExecution(); + return Status != STATUS_NO_YIELD_PERFORMED; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs