Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[tkreuzer] 54020: [WIN32K] Remove a debug breakpoint that was not supposed to be comitted.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Oct 6 11:02:44 2011 New Revision: 54020 URL: http://svn.reactos.org/svn/reactos?rev=54020&view=rev Log: [WIN32K] Remove a debug breakpoint that was not supposed to be comitted. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Oct 6 11:02:44 2011 @@ -1426,7 +1426,6 @@ if (bi->biCompression == BI_RLE4 || bi->biCompression == BI_RLE8) { DPRINT1("no compressed format allowed\n"); - __debugbreak(); return (HBITMAP)NULL; }

12 years, 11 months

[tkreuzer] 54019: [WIN32K] Fix handling of RLE compressed bitmaps in NtGdiStretchDIBitsInternal, by using similar code as in NtGdiSetDIBitsToDeviceInternal calling GreCreateBitmapEx instead of NtGd...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Oct 6 10:56:58 2011 New Revision: 54019 URL: http://svn.reactos.org/svn/reactos?rev=54019&view=rev Log: [WIN32K] Fix handling of RLE compressed bitmaps in NtGdiStretchDIBitsInternal, by using similar code as in NtGdiSetDIBitsToDeviceInternal calling GreCreateBitmapEx instead of NtGdiCreateDIBitmapInternal. Fixes bug 6168. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Oct 6 10:56:58 2011 @@ -979,9 +979,12 @@ SIZEL sizel; RECTL rcSrc, rcDst; PDC pdc; - HBITMAP hbmTmp; - PSURFACE psurfTmp, psurfDst; + HBITMAP hbmTmp = 0; + PSURFACE psurfTmp = 0, psurfDst = 0; + HPALETTE hpalDIB = 0; + PPALETTE ppalDIB = 0; EXLATEOBJ exlo; + PVOID pvBits; if (!(pdc = DC_LockDc(hdc))) { @@ -1017,37 +1020,28 @@ hcmXform); } - /* Create an intermediate bitmap from the DIB */ - hbmTmp = NtGdiCreateDIBitmapInternal(hdc, - cxSrc, - cySrc, - CBM_INIT, - pjInit, - pbmi, - dwUsage, - cjMaxInfo, - cjMaxBits, - 0, - hcmXform); - if (!hbmTmp) - { - DPRINT1("NtGdiCreateDIBitmapInternal failed\n"); + pvBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, 'pmeT'); + if (!pvBits) + { return 0; } + + _SEH2_TRY + { + ProbeForRead(pjInit, cjMaxBits, 1); + RtlCopyMemory(pvBits, pjInit, cjMaxBits); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return 0); + } + _SEH2_END /* FIXME: locking twice is cheesy, coord tranlation in UM will fix it */ if (!(pdc = DC_LockDc(hdc))) { DPRINT1("Could not lock dc\n"); EngSetLastError(ERROR_INVALID_HANDLE); - GreDeleteObject(hbmTmp); - return 0; - } - - psurfTmp = SURFACE_ShareLockSurface(hbmTmp); - if (!psurfTmp) - { - DPRINT1("Could not lock bitmap :-(\n"); goto cleanup; } @@ -1071,9 +1065,48 @@ IntLPtoDP(pdc, (POINTL*)&rcDst, 2); RECTL_vOffsetRect(&rcDst, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); + hbmTmp = GreCreateBitmapEx(pbmi->bmiHeader.biWidth, + pbmi->bmiHeader.biHeight, + 0, + BitmapFormat(pbmi->bmiHeader.biBitCount, + pbmi->bmiHeader.biCompression), + pbmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, + pbmi->bmiHeader.biSizeImage, + pvBits, + 0); + + if (!hbmTmp) + { + bResult = FALSE; + goto cleanup; + } + + psurfTmp = SURFACE_ShareLockSurface(hbmTmp); + if (!psurfTmp) + { + bResult = FALSE; + goto cleanup; + } + + /* Create a palette for the DIB */ + hpalDIB = BuildDIBPalette(pbmi); + if (!hpalDIB) + { + bResult = FALSE; + goto cleanup; + } + + /* Lock the DIB palette */ + ppalDIB = PALETTE_ShareLockPalette(hpalDIB); + if (!ppalDIB) + { + bResult = FALSE; + goto cleanup; + } + /* Initialize XLATEOBJ */ EXLATEOBJ_vInitialize(&exlo, - psurfTmp->ppal, + ppalDIB, psurfDst->ppal, RGB(0xff, 0xff, 0xff), pdc->pdcattr->crBackgroundClr, @@ -1099,9 +1132,12 @@ DC_vFinishBlit(pdc, NULL); EXLATEOBJ_vCleanup(&exlo); cleanup: + if (ppalDIB) PALETTE_ShareUnlockPalette(ppalDIB); + if (hpalDIB) GreDeleteObject(hpalDIB); if (psurfTmp) SURFACE_ShareUnlockSurface(psurfTmp); if (hbmTmp) GreDeleteObject(hbmTmp); if (pdc) DC_UnlockDc(pdc); + ExFreePoolWithTag(pvBits, 'pmeT'); return bResult; } @@ -1390,6 +1426,7 @@ if (bi->biCompression == BI_RLE4 || bi->biCompression == BI_RLE8) { DPRINT1("no compressed format allowed\n"); + __debugbreak(); return (HBITMAP)NULL; }

12 years, 11 months

[fireball] 54018: [RTL] - Post-r52687 implementation of RtlIsDosDeviceName_U is more advanced than pre-r52687 one and covers more corner cases which may not be tested by existing winetests. - Thus ...

by fireball＠svn.reactos.org

Author: fireball Date: Wed Oct 5 22:20:30 2011 New Revision: 54018 URL: http://svn.reactos.org/svn/reactos?rev=54018&view=rev Log: [RTL] - Post-r52687 implementation of RtlIsDosDeviceName_U is more advanced than pre-r52687 one and covers more corner cases which may not be tested by existing winetests. - Thus bring back the post-r52687 and also introduce fixes for the following bugs in it: * Incorrect extension/space-at-the-end truncation * Incorrect encoding of returned offset/length pair * Incorrect condition for for-loop exit * Incorrect calculation of the return length in case of COMx/AUX devices (it should not include the terminating 0 character) - After those trivial fixes (mostly oneliners and typos), the function works as expected and passes all ntdll_winetest path tests. Sorry for any inconviniences! Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=54018&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Wed Oct 5 22:20:30 2011 @@ -45,9 +45,11 @@ NTAPI RtlIsDosDeviceName_Ustr(IN PUNICODE_STRING PathString) { - UNICODE_STRING DeviceName; - PWCHAR Start, End, Ptr; - SIZE_T DeviceNameLength; + UNICODE_STRING PathCopy; + PWCHAR Start, End; + ULONG PathChars, ColonCount = 0; + USHORT ReturnOffset = 0, ReturnLength; + WCHAR c; /* Validate the input */ if (!PathString) return 0; @@ -69,58 +71,128 @@ } return 0; - /* Skip the drive name for drive relative or absolute paths */ - case RtlPathTypeDriveAbsolute: - case RtlPathTypeDriveRelative: - Start = PathString->Buffer + 2; + default: break; - - default: - Start = PathString->Buffer; - break; - } - - /* Find start of file name */ - for (Ptr = Start; *Ptr; Ptr++) - if (IS_PATH_SEPARATOR(*Ptr)) - Start = Ptr + 1; - - /* Truncate at extension or stream */ - for (End = Start; *End; End++) - if (*End == L'.' || *End == L':') - break; - End--; - - /* Remove trailing spaces */ - while (End >= Start && *End == L' ') - End--; - - /* Build the device name string */ - DeviceNameLength = End - Start + 1; - DeviceName.Buffer = Start; - DeviceName.Length = (USHORT)DeviceNameLength * sizeof(WCHAR); - DeviceName.MaximumLength = DeviceName.Length; - - /* Check the device name */ - if (DeviceNameLength == 3) - { - if (RtlPrefixUnicodeString(&RtlpDosAUXDevice, &DeviceName, TRUE) || - RtlPrefixUnicodeString(&RtlpDosCONDevice, &DeviceName, TRUE) || - RtlPrefixUnicodeString(&RtlpDosNULDevice, &DeviceName, TRUE) || - RtlPrefixUnicodeString(&RtlpDosPRNDevice, &DeviceName, TRUE)) - { - return MAKELONG(DeviceNameLength * sizeof(WCHAR), (Start - PathString->Buffer) * sizeof(WCHAR)); - } - } - else if (DeviceNameLength == 4) - { - if ((RtlPrefixUnicodeString(&RtlpDosCOMDevice, &DeviceName, TRUE) || - RtlPrefixUnicodeString(&RtlpDosLPTDevice, &DeviceName, TRUE)) && - iswdigit(DeviceName.Buffer[3]) && - DeviceName.Buffer[3] != L'0') - { - return MAKELONG(DeviceNameLength * sizeof(WCHAR), (Start - PathString->Buffer) * sizeof(WCHAR)); - } + } + + /* Make a copy of the string */ + PathCopy = *PathString; + + /* Return if there's no characters */ + PathChars = PathCopy.Length / sizeof(WCHAR); + if (!PathChars) return 0; + + /* Check for drive path and truncate */ + if (PathCopy.Buffer[PathChars - 1] == L':') + { + /* Fixup the lengths */ + PathCopy.Length -= sizeof(WCHAR); + if (!--PathChars) return 0; + + /* Remember this for later */ + ColonCount = 1; + } + + /* Check for extension or space, and truncate */ + c = PathCopy.Buffer[PathChars - 1]; + do + { + /* Stop if we hit something else than a space or period */ + if ((c != '.') && (c != ' ')) break; + + /* Fixup the lengths and get the next character */ + PathCopy.Length -= sizeof(WCHAR); + if (--PathChars) c = PathCopy.Buffer[PathChars - 1]; + + /* Remember this for later */ + ColonCount++; + } while (PathChars); + + /* Anything still left? */ + if (PathChars) + { + /* Loop from the end */ + for (End = &PathCopy.Buffer[PathChars - 1]; + End >= PathCopy.Buffer; + --End) + { + /* Check if the character is a path or drive separator */ + c = *End; + if ((c == '\\') || (c == '/') || ((c == ':') && (End == PathCopy.Buffer + 1))) + { + /* Get the next lower case character */ + End++; + c = *End | ' '; // ' ' == ('z' - 'Z') + + /* Check if it's a DOS device (LPT, COM, PRN, AUX, or NUL) */ + if ((End < &PathCopy.Buffer[PathCopy.Length / sizeof(WCHAR)]) && + ((c == 'l') || (c == 'c') || (c == 'p') || (c == 'a') || (c == 'n'))) + { + /* Calculate the offset */ + ReturnOffset = (PCHAR)End - (PCHAR)PathCopy.Buffer; + + /* Build the final string */ + PathCopy.Length -= ReturnOffset; + PathCopy.Length -= (ColonCount * sizeof(WCHAR)); + PathCopy.Buffer = End; + break; + } + else + { + return 0; + } + } + } + + /* Get the next lower case character and check if it's a DOS device */ + c = *PathCopy.Buffer | ' '; // ' ' == ('z' - 'Z') + if ((c != 'l') && (c != 'c') && (c != 'p') && (c != 'a') && (c != 'n')) + { + /* Not LPT, COM, PRN, AUX, or NUL */ + return 0; + } + } + + /* Now skip past any extra extension or drive letter characters */ + Start = PathCopy.Buffer; + End = &Start[PathChars]; + while (Start < End) + { + c = *Start; + if ((c == '.') || (c == ':')) break; + Start++; + } + + /* And then go backwards to get rid of spaces */ + while ((Start > PathCopy.Buffer) && (Start[-1] == ' ')) --Start; + + /* Finally see how many characters are left, and that's our size */ + PathChars = Start - PathCopy.Buffer; + PathCopy.Length = PathChars * sizeof(WCHAR); + + /* Check if this is a COM or LPT port, which has a digit after it */ + if ((PathChars == 4) && + (iswdigit(PathCopy.Buffer[3]) && (PathCopy.Buffer[3] != '0'))) + { + /* Don't compare the number part, just check for LPT or COM */ + PathCopy.Length -= sizeof(WCHAR); + if ((RtlEqualUnicodeString(&PathCopy, &RtlpDosLPTDevice, TRUE)) || + (RtlEqualUnicodeString(&PathCopy, &RtlpDosCOMDevice, TRUE))) + { + /* Found it */ + ReturnLength = sizeof(L"COM1") - sizeof(WCHAR); + return MAKELONG(ReturnLength, ReturnOffset); + } + } + else if ((PathChars == 3) && + ((RtlEqualUnicodeString(&PathCopy, &RtlpDosPRNDevice, TRUE)) || + (RtlEqualUnicodeString(&PathCopy, &RtlpDosAUXDevice, TRUE)) || + (RtlEqualUnicodeString(&PathCopy, &RtlpDosNULDevice, TRUE)) || + (RtlEqualUnicodeString(&PathCopy, &RtlpDosCONDevice, TRUE)))) + { + /* Otherwise this was something like AUX, NUL, PRN, or CON */ + ReturnLength = sizeof(L"AUX") - sizeof(WCHAR); + return MAKELONG(ReturnLength, ReturnOffset); } /* Otherwise, this is not a valid DOS device */

12 years, 11 months

[cgutman] 54017: [NETSHELL] - Fix a typo - Intel PRO/1000 shows a link speed of 1 Gbps now

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Oct 5 20:58:54 2011 New Revision: 54017 URL: http://svn.reactos.org/svn/reactos?rev=54017&view=rev Log: [NETSHELL] - Fix a typo - Intel PRO/1000 shows a link speed of 1 Gbps now Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Wed Oct 5 20:58:54 2011 @@ -86,7 +86,7 @@ } else { - if (LoadStringW(netshell_hInstance, IDS_FORMAT_KBIT, szFormat, sizeof(szFormat)/sizeof(WCHAR))) + if (LoadStringW(netshell_hInstance, IDS_FORMAT_GBIT, szFormat, sizeof(szFormat)/sizeof(WCHAR))) { swprintf(szBuffer, szFormat, IfEntry->dwSpeed/1000000000); SendDlgItemMessageW(hwndDlg, IDC_SPEED, WM_SETTEXT, 0, (LPARAM)szBuffer);

12 years, 11 months

[cgutman] 54016: [HAL] - Implement support for scatter/gather DMA - Tested with Intel's NDIS 5.1 PRO/1000 driver (but more testing would be helpful to weed out bugs) [NDIS] - Report NDIS 5.1 now si...

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Oct 5 20:36:20 2011 New Revision: 54016 URL: http://svn.reactos.org/svn/reactos?rev=54016&view=rev Log: [HAL] - Implement support for scatter/gather DMA - Tested with Intel's NDIS 5.1 PRO/1000 driver (but more testing would be helpful to weed out bugs) [NDIS] - Report NDIS 5.1 now since S/G DMA is supported - Stop warning when S/G DMA is used Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h trunk/reactos/drivers/network/ndis/ndis/protocol.c trunk/reactos/hal/halx86/generic/dma.c Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] Wed Oct 5 20:36:20 2011 @@ -30,7 +30,7 @@ #endif /* the version of NDIS we claim to be */ -#define NDIS_VERSION 0x00050000 +#define NDIS_VERSION 0x00050001 #define NDIS_TAG 0x4e4d4953 Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Wed Oct 5 20:36:20 2011 @@ -516,7 +516,7 @@ } else { if (Adapter->NdisMiniportBlock.ScatterGatherListSize != 0) { - NDIS_DbgPrint(MIN_TRACE, ("Using Scatter/Gather DMA\n")); + NDIS_DbgPrint(MID_TRACE, ("Using Scatter/Gather DMA\n")); NdisQueryPacket(Packet, NULL, Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Wed Oct 5 20:36:20 2011 @@ -74,6 +74,8 @@ #include <hal.h> #define NDEBUG #include <debug.h> + +#define MAX_SG_ELEMENTS 0x10 #ifndef _MINIHAL_ static KEVENT HalpDmaLock; @@ -110,8 +112,8 @@ (PGET_DMA_ALIGNMENT)HalpDmaGetDmaAlignment, (PREAD_DMA_COUNTER)HalReadDmaCounter, /* FIXME: Implement the S/G funtions. */ - NULL /*(PGET_SCATTER_GATHER_LIST)HalGetScatterGatherList*/, - NULL /*(PPUT_SCATTER_GATHER_LIST)HalPutScatterGatherList*/, + (PGET_SCATTER_GATHER_LIST)HalGetScatterGatherList, + (PPUT_SCATTER_GATHER_LIST)HalPutScatterGatherList, NULL /*(PCALCULATE_SCATTER_GATHER_LIST_SIZE)HalCalculateScatterGatherListSize*/, NULL /*(PBUILD_SCATTER_GATHER_LIST)HalBuildScatterGatherList*/, NULL /*(PBUILD_MDL_FROM_SCATTER_GATHER_LIST)HalBuildMdlFromScatterGatherList*/ @@ -907,6 +909,192 @@ MmFreeContiguousMemorySpecifyCache(VirtualAddress, Length, CacheEnabled ? MmCached : MmNonCached); +} + +typedef struct _SCATTER_GATHER_CONTEXT { + PADAPTER_OBJECT AdapterObject; + PMDL Mdl; + PUCHAR CurrentVa; + ULONG Length; + PDRIVER_LIST_CONTROL AdapterListControlRoutine; + PVOID AdapterListControlContext, MapRegisterBase; + ULONG MapRegisterCount; + BOOLEAN WriteToDevice; +} SCATTER_GATHER_CONTEXT, *PSCATTER_GATHER_CONTEXT; + + +IO_ALLOCATION_ACTION +NTAPI +HalpScatterGatherAdapterControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID MapRegisterBase, + IN PVOID Context) +{ + PSCATTER_GATHER_CONTEXT AdapterControlContext = Context; + PADAPTER_OBJECT AdapterObject = AdapterControlContext->AdapterObject; + PSCATTER_GATHER_LIST ScatterGatherList; + SCATTER_GATHER_ELEMENT TempElements[MAX_SG_ELEMENTS]; + ULONG ElementCount = 0, RemainingLength = AdapterControlContext->Length; + PUCHAR CurrentVa = AdapterControlContext->CurrentVa; + + /* Store the map register base for later in HalPutScatterGatherList */ + AdapterControlContext->MapRegisterBase = MapRegisterBase; + + while (RemainingLength > 0 && ElementCount < MAX_SG_ELEMENTS) + { + TempElements[ElementCount].Length = RemainingLength; + TempElements[ElementCount].Reserved = 0; + TempElements[ElementCount].Address = IoMapTransfer(AdapterObject, + AdapterControlContext->Mdl, + MapRegisterBase, + CurrentVa + (AdapterControlContext->Length - RemainingLength), + &TempElements[ElementCount].Length, + AdapterControlContext->WriteToDevice); + if (TempElements[ElementCount].Length == 0) + break; + + DPRINT("Allocated one S/G element: 0x%I64u with length: 0x%x\n", + TempElements[ElementCount].Address.QuadPart, + TempElements[ElementCount].Length); + + ASSERT(TempElements[ElementCount].Length <= RemainingLength); + RemainingLength -= TempElements[ElementCount].Length; + ElementCount++; + } + + if (RemainingLength > 0) + { + DPRINT1("Scatter/gather list construction failed!\n"); + return DeallocateObject; + } + + ScatterGatherList = ExAllocatePoolWithTag(NonPagedPool, + sizeof(SCATTER_GATHER_LIST) + sizeof(SCATTER_GATHER_ELEMENT) * ElementCount, + TAG_DMA); + ASSERT(ScatterGatherList); + + ScatterGatherList->NumberOfElements = ElementCount; + ScatterGatherList->Reserved = (ULONG_PTR)AdapterControlContext; + RtlCopyMemory(ScatterGatherList->Elements, + TempElements, + sizeof(SCATTER_GATHER_ELEMENT) * ElementCount); + + DPRINT("Initiating S/G DMA with %d element(s)\n", ElementCount); + + AdapterControlContext->AdapterListControlRoutine(DeviceObject, + Irp, + ScatterGatherList, + AdapterControlContext->AdapterListControlContext); + + return DeallocateObjectKeepRegisters; +} + +/** + * @name HalGetScatterGatherList + * + * Creates a scatter-gather list to be using in scatter/gather DMA + * + * @param AdapterObject + * Adapter object representing the bus master or system dma controller. + * @param DeviceObject + * The device target for DMA. + * @param Mdl + * The MDL that describes the buffer to be mapped. + * @param CurrentVa + * The current VA in the buffer to be mapped for transfer. + * @param Length + * Specifies the length of data in bytes to be mapped. + * @param ExecutionRoutine + * A caller supplied AdapterListControl routine to be called when DMA is available. + * @param Context + * Context passed to the AdapterListControl routine. + * @param WriteToDevice + * Indicates direction of DMA operation. + * + * @return The status of the operation. + * + * @see HalPutScatterGatherList + * + * @implemented + */ + NTSTATUS + NTAPI + HalGetScatterGatherList(IN PADAPTER_OBJECT AdapterObject, + IN PDEVICE_OBJECT DeviceObject, + IN PMDL Mdl, + IN PVOID CurrentVa, + IN ULONG Length, + IN PDRIVER_LIST_CONTROL ExecutionRoutine, + IN PVOID Context, + IN BOOLEAN WriteToDevice) +{ + PSCATTER_GATHER_CONTEXT AdapterControlContext; + + AdapterControlContext = ExAllocatePoolWithTag(NonPagedPool, sizeof(SCATTER_GATHER_CONTEXT), TAG_DMA); + if (!AdapterControlContext) return STATUS_INSUFFICIENT_RESOURCES; + + AdapterControlContext->AdapterObject = AdapterObject; + AdapterControlContext->Mdl = Mdl; + AdapterControlContext->CurrentVa = CurrentVa; + AdapterControlContext->Length = Length; + AdapterControlContext->MapRegisterCount = PAGE_ROUND_UP(Length) >> PAGE_SHIFT; + AdapterControlContext->AdapterListControlRoutine = ExecutionRoutine; + AdapterControlContext->AdapterListControlContext = Context; + AdapterControlContext->WriteToDevice = WriteToDevice; + + return IoAllocateAdapterChannel(AdapterObject, + DeviceObject, + AdapterControlContext->MapRegisterCount, + HalpScatterGatherAdapterControl, + AdapterControlContext); +} + +/** + * @name HalPutScatterGatherList + * + * Frees a scatter-gather list allocated from HalGetScatterGatherList + * + * @param AdapterObject + * Adapter object representing the bus master or system dma controller. + * @param ScatterGather + * The scatter/gather list to be freed. + * @param WriteToDevice + * Indicates direction of DMA operation. + * + * @return None + * + * @see HalGetScatterGatherList + * + * @implemented + */ + VOID + NTAPI + HalPutScatterGatherList(IN PADAPTER_OBJECT AdapterObject, + IN PSCATTER_GATHER_LIST ScatterGather, + IN BOOLEAN WriteToDevice) +{ + PSCATTER_GATHER_CONTEXT AdapterControlContext = (PSCATTER_GATHER_CONTEXT)ScatterGather->Reserved; + ULONG i; + + for (i = 0; i < ScatterGather->NumberOfElements; i++) + { + IoFlushAdapterBuffers(AdapterObject, + AdapterControlContext->Mdl, + AdapterControlContext->MapRegisterBase, + AdapterControlContext->CurrentVa, + ScatterGather->Elements[i].Length, + AdapterControlContext->WriteToDevice); + AdapterControlContext->CurrentVa += ScatterGather->Elements[i].Length; + } + + IoFreeMapRegisters(AdapterObject, + AdapterControlContext->MapRegisterBase, + AdapterControlContext->MapRegisterCount); + + DPRINT("S/G DMA has finished!\n"); + + ExFreePoolWithTag(AdapterControlContext, TAG_DMA); + ExFreePoolWithTag(ScatterGather, TAG_DMA); } #endif

12 years, 11 months

[tfaber] 54015: [SETUPAPI] - Fix installation failure of services without a load order group

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Oct 5 19:15:08 2011 New Revision: 54015 URL: http://svn.reactos.org/svn/reactos?rev=54015&view=rev Log: [SETUPAPI] - Fix installation failure of services without a load order group Modified: trunk/reactos/dll/win32/setupapi/install.c Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Wed Oct 5 19:15:08 2011 @@ -1814,6 +1814,10 @@ GetLineText(hInf, ServiceSection, DescriptionKey, &Description); GetLineText(hInf, ServiceSection, DependenciesKey, &Dependencies); + /* If there is no group, we must not request a tag */ + if (!LoadOrderGroup || !*LoadOrderGroup) + useTag = FALSE; + hService = OpenServiceW( hSCManager, ServiceName,

12 years, 11 months

[rharabien] 54014: [WIN32K] - Don't send unicode characters in WM_CHAR to ascii windows

by rharabien＠svn.reactos.org

Author: rharabien Date: Wed Oct 5 19:11:00 2011 New Revision: 54014 URL: http://svn.reactos.org/svn/reactos?rev=54014&view=rev Log: [WIN32K] - Don't send unicode characters in WM_CHAR to ascii windows Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Wed Oct 5 19:11:00 2011 @@ -1050,7 +1050,15 @@ for (i = 0; i < cch; ++i) { TRACE("Msg: %x '%lc' (%04x) %08x\n", NewMsg.message, wch[i], wch[i], NewMsg.lParam); - NewMsg.wParam = wch[i]; + if (pWnd->Unicode) + NewMsg.wParam = wch[i]; + else + { + CHAR ch; + if (!NT_SUCCESS(RtlUnicodeToMultiByteN(&ch, sizeof(ch), NULL, &wch[i], sizeof(wch[i])))) + WARN("RtlUnicodeToMultiByteN failed!\n"); + NewMsg.wParam = ch; + } MsqPostMessage(pti->MessageQueue, &NewMsg, FALSE, QS_KEY); } bResult = TRUE;

12 years, 11 months

[rharabien] 54013: [KBDGR] - 1, 4, 5 keys should support CAPSLOCK. See issue #5296 for more details.

by rharabien＠svn.reactos.org

Author: rharabien Date: Wed Oct 5 18:11:21 2011 New Revision: 54013 URL: http://svn.reactos.org/svn/reactos?rev=54013&view=rev Log: [KBDGR] - 1, 4, 5 keys should support CAPSLOCK. See issue #5296 for more details. Modified: trunk/reactos/dll/keyboard/kbdgr/kbdgr.c Modified: trunk/reactos/dll/keyboard/kbdgr/kbdgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgr/kbdgr.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgr/kbdgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdgr/kbdgr.c [iso-8859-1] Wed Oct 5 18:11:21 2011 @@ -165,10 +165,10 @@ { 0xff, 0, {'^', WCH_NONE} }, // FIXME - why doesn't this work? /* Normal vs Shifted */ /* The numbers */ - { '1', 0, {'1', '!'} }, + { '1', CAPLOK, {'1', '!'} }, /* Ctrl-2 generates NUL */ - { '4', 0, {'4', '$'} }, - { '5', 0, {'5', '%'} }, + { '4', CAPLOK, {'4', '$'} }, + { '5', CAPLOK, {'5', '%'} }, { VK_OEM_6, 0, {WCH_DEAD, WCH_DEAD} }, { 0xff, 0, {0xb4, '`'} }, @@ -215,7 +215,7 @@ }; ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { - /* Normal, Shifted, Ctrl */ + /* Normal, Shifted, Ctrl+Alt */ /* Legacy (telnet-style) ascii escapes */ { '3', CAPLOK, {'3', 0xa7, 0xb3} }, { '7', CAPLOK, {'7', '/', '{'} },

12 years, 11 months

[akhaldi] 54012: [SOL/SPIDER] * Reduce the scope of some variables.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 5 17:54:07 2011 New Revision: 54012 URL: http://svn.reactos.org/svn/reactos?rev=54012&view=rev Log: [SOL/SPIDER] * Reduce the scope of some variables. Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/spider/spigame.cpp Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Wed Oct 5 17:54:07 2011 @@ -235,7 +235,6 @@ { DWORD dwOldOptions = dwOptions; RECT rcMain, rcStatus; - int nWidth, nHeight, nStatusHeight; if (DialogBox(hInstance, MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsDlgProc)) { @@ -244,6 +243,8 @@ if ((dwOldOptions & OPTION_SHOW_STATUS) != (dwOptions & OPTION_SHOW_STATUS)) { + int nWidth, nHeight, nStatusHeight; + GetClientRect(hwndMain, &rcMain); nHeight = rcMain.bottom - rcMain.top; nWidth = rcMain.right - rcMain.left; Modified: trunk/reactos/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] Wed Oct 5 17:54:07 2011 @@ -127,10 +127,10 @@ { CardStack temp, fakeDeck = pDeck->GetCardStack(); fGameStarted = true; - int i, j, facedown, faceup; if (fakeDeck.NumCards() != 0 && deck.NumCards() != 0) { + int i, facedown, faceup; /* Add one card to every stack */ for (i = 0; i < NUM_STACKS; i++) { @@ -145,6 +145,7 @@ /* Check stack finished, remove cards if so */ if (stackLookingGood(temp, NUM_ONECOLOR_CARDS - 1)) { + int j; for (j = 0; j < NUM_ONECOLOR_CARDS; j++) { temp.RemoveCard(0);

12 years, 11 months

[rharabien] 54011: [WIN32K] - Fix AltGr keys sending WM_SYSCHAR* messages - Improve debug messages

by rharabien＠svn.reactos.org

Author: rharabien Date: Wed Oct 5 15:48:39 2011 New Revision: 54011 URL: http://svn.reactos.org/svn/reactos?rev=54011&view=rev Log: [WIN32K] - Fix AltGr keys sending WM_SYSCHAR* messages - Improve debug messages Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Wed Oct 5 15:48:39 2011 @@ -462,7 +462,7 @@ { UINT i; WCHAR wchFirst, wchSecond; - TRACE("PREVIOUS DEAD CHAR: %c\n", wchDead); + TRACE("Previous dead char: %lc (%x)\n", wchDead, wchDead); for (i = 0; pKbdTbl->pDeadKey[i].dwBoth; i++) { @@ -477,7 +477,7 @@ } } - TRACE("FINAL CHAR: %c\n", wchTranslatedChar); + TRACE("Final char: %lc (%x)\n", wchTranslatedChar, wchTranslatedChar); } /* dead char has not been not found */ @@ -713,7 +713,7 @@ BOOL NTAPI UserSendKeyboardInput(KEYBDINPUT *pKbdInput, BOOL bInjected) { - WORD wScanCode, wVk, wSimpleVk, wVkOtherSide; + WORD wScanCode, wVk, wSimpleVk, wVkOtherSide, wSysKey; PKBL pKbl = NULL; PKBDTABLES pKbdTbl; PUSER_MESSAGE_QUEUE pFocusQueue; @@ -845,9 +845,10 @@ MSG Msg; /* If it is F10 or ALT is down and CTRL is up, it's a system key */ + wSysKey = (pKbdTbl->fLocaleFlags & KLLF_ALTGR) ? VK_LMENU : VK_MENU; if (wVk == VK_F10 || //uVkNoShift == VK_MENU || // FIXME: If only LALT is pressed WM_SYSKEYUP is generated instead of WM_KEYUP - ((gKeyStateTable[VK_MENU] & KS_DOWN_BIT) && + ((gKeyStateTable[wSysKey] & KS_DOWN_BIT) && // FIXME !(gKeyStateTable[VK_CONTROL] & KS_DOWN_BIT))) { if (bKeyUp) @@ -1048,7 +1049,7 @@ /* Send all characters */ for (i = 0; i < cch; ++i) { - TRACE("CHAR='%c' %04x %08x\n", wch[i], wch[i], lpMsg->lParam); + TRACE("Msg: %x '%lc' (%04x) %08x\n", NewMsg.message, wch[i], wch[i], NewMsg.lParam); NewMsg.wParam = wch[i]; MsqPostMessage(pti->MessageQueue, &NewMsg, FALSE, QS_KEY); }

12 years, 11 months

← Newer
1
...
24
25
26
27
28
29
30
...
37
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 October 2011