Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 42440: Add GetLogicalProcessorInformation() and a stub for ReOpenFile() by Alwyn Tan's request.
by dgorbachev＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: dgorbachev Date: Fri Aug 7 00:53:04 2009 New Revision: 42440 URL: http://svn.reactos.org/svn/reactos?rev=42440&view=rev Log: Add GetLogicalProcessorInformation() and a stub for ReOpenFile() by Alwyn Tan's request. Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/misc/sysinfo.c Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Fri Aug 7 00:53:04 2009 @@ -400,6 +400,7 @@ @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @ stdcall GetLogicalDrives() +@ stdcall GetLogicalProcessorInformation(ptr ptr) @ stdcall GetLongPathNameA (str long long) @ stdcall GetLongPathNameW (wstr long long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) @@ -710,6 +711,7 @@ @ stdcall QueueUserAPC(ptr long long) @ stdcall QueueUserWorkItem(ptr ptr long) @ stdcall RaiseException(long long long ptr) +@ stub ReOpenFile ;@ stdcall ReOpenFile(ptr long long long) @ stdcall ReadConsoleA(long ptr long ptr ptr) @ stdcall ReadConsoleInputA(long ptr long ptr) @ stdcall ReadConsoleInputExA(long ptr long ptr long) Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Fri Aug 7 00:53:04 2009 @@ -994,15 +994,6 @@ BOOL WINAPI -GetLogicalProcessorInformation(OUT PSYSTEM_LOGICAL_PROCESSOR_INFORMATION Buffer, - IN OUT PDWORD ReturnLength) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI GetNumaAvailableMemoryNode(IN UCHAR Node, OUT PULONGLONG AvailableBytes) { Modified: trunk/reactos/dll/win32/kernel32/misc/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/sy… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/sysinfo.c [iso-8859-1] Fri Aug 7 00:53:04 2009 @@ -232,3 +232,39 @@ // GetNativeSystemInfo should return PROCESSOR_ARCHITECTURE_AMD64 GetSystemInfo(lpSystemInfo); } + +/* + * @implemented + */ +BOOL +WINAPI +GetLogicalProcessorInformation(OUT PSYSTEM_LOGICAL_PROCESSOR_INFORMATION Buffer, + IN OUT PDWORD ReturnLength) +{ + NTSTATUS Status; + + if (!ReturnLength) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + Status = NtQuerySystemInformation(SystemLogicalProcessorInformation, + Buffer, + *ReturnLength, + ReturnLength); + + if (!NT_SUCCESS(Status)) + { + /* + * When NtQuerySystemInformation says STATUS_INFO_LENGTH_MISMATCH, + * return ERROR_INSUFFICIENT_BUFFER instead of ERROR_BAD_LENGTH. + */ + SetLastErrorByStatus(Status == STATUS_INFO_LENGTH_MISMATCH + ? STATUS_BUFFER_TOO_SMALL + : Status); + return FALSE; + } + + return TRUE; +}

1 0

[janderwald] 42439: - Add a few parameters check - Calculate resource list size with FIELD_OFFSET macro - Fix a big bug in IResourceList_fnAddEntryFromParent which didnt copy the untranslated resource list entry
by janderwald＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: janderwald Date: Thu Aug 6 23:45:10 2009 New Revision: 42439 URL: http://svn.reactos.org/svn/reactos?rev=42439&view=rev Log: - Add a few parameters check - Calculate resource list size with FIELD_OFFSET macro - Fix a big bug in IResourceList_fnAddEntryFromParent which didnt copy the untranslated resource list entry Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] Thu Aug 6 23:45:10 2009 @@ -22,6 +22,7 @@ POOL_TYPE PoolType; PCM_RESOURCE_LIST TranslatedResourceList; PCM_RESOURCE_LIST UntranslatedResourceList; + ULONG NumberOfEntries; } IResourceListImpl; /* @@ -100,7 +101,7 @@ ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - return This->TranslatedResourceList->List[0].PartialResourceList.Count; + return This->NumberOfEntries; } ULONG @@ -114,6 +115,12 @@ PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + + if (!This->TranslatedResourceList) + { + /* no resource list */ + return 0; + } /* I guess the translated and untranslated lists will be same length? */ for (Index = 0; Index < This->TranslatedResourceList->List[0].PartialResourceList.Count; Index ++ ) @@ -143,6 +150,12 @@ PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + + if (!This->TranslatedResourceList) + { + /* no resource list */ + return NULL; + } for (DescIndex = 0; DescIndex < This->TranslatedResourceList->List[0].PartialResourceList.Count; DescIndex ++ ) { @@ -175,6 +188,12 @@ ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + if (!This->UntranslatedResourceList) + { + /* no resource list */ + return NULL; + } + for (DescIndex = 0; DescIndex < This->UntranslatedResourceList->List[0].PartialResourceList.Count; DescIndex ++ ) { PartialDescriptor = &This->UntranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[DescIndex]; @@ -200,17 +219,29 @@ IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Untranslated) { PCM_RESOURCE_LIST NewUntranslatedResources, NewTranslatedResources; - ULONG NewTranslatedSize, NewUntranslatedSize; - IResourceListImpl * This = (IResourceListImpl*)iface; - - ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - - NewTranslatedSize = sizeof(CM_RESOURCE_LIST) + This->TranslatedResourceList[0].List->PartialResourceList.Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + ULONG NewTranslatedSize, NewUntranslatedSize, TranslatedSize, UntranslatedSize, ResourceCount; + IResourceListImpl * This = (IResourceListImpl*)iface; + + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + + /* calculate translated resource list size */ + ResourceCount = This->TranslatedResourceList->List[0].PartialResourceList.Count; + NewTranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount+1]); + TranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); + + NewTranslatedResources = AllocateItem(This->PoolType, NewTranslatedSize, TAG_PORTCLASS); if (!NewTranslatedResources) return STATUS_INSUFFICIENT_RESOURCES; - NewUntranslatedSize = sizeof(CM_RESOURCE_LIST) + This->UntranslatedResourceList[0].List->PartialResourceList.Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + + /* calculate untranslated resouce list size */ + ResourceCount = This->UntranslatedResourceList->List[0].PartialResourceList.Count; + NewUntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount+1]); + UntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); + + + /* allocate untranslated resource list size */ NewUntranslatedResources = AllocateItem(This->PoolType, NewUntranslatedSize, TAG_PORTCLASS); if (!NewUntranslatedResources) { @@ -218,34 +249,28 @@ return STATUS_INSUFFICIENT_RESOURCES; } - RtlCopyMemory(NewTranslatedResources, This->TranslatedResourceList, sizeof(CM_RESOURCE_LIST)); - if (This->TranslatedResourceList[0].List->PartialResourceList.Count > 1) - { - RtlCopyMemory(&NewTranslatedResources->List[0].PartialResourceList.PartialDescriptors[0], - &This->TranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[0], - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * This->TranslatedResourceList->List[0].PartialResourceList.Count); - } - - RtlCopyMemory(&NewTranslatedResources->List[0].PartialResourceList.PartialDescriptors[This->TranslatedResourceList[0].List->PartialResourceList.Count], Translated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - - RtlCopyMemory(NewUntranslatedResources, This->UntranslatedResourceList, sizeof(CM_RESOURCE_LIST)); - if (This->UntranslatedResourceList[0].List->PartialResourceList.Count > 1) - { - RtlCopyMemory(&NewUntranslatedResources->List[0].PartialResourceList.PartialDescriptors[0], - &This->UntranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[0], - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * This->UntranslatedResourceList->List[0].PartialResourceList.Count); - } - - RtlCopyMemory(&NewUntranslatedResources->List[0].PartialResourceList.PartialDescriptors[This->UntranslatedResourceList[0].List->PartialResourceList.Count], Untranslated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - + /* now copy translated resource list */ + RtlMoveMemory(NewTranslatedResources, This->TranslatedResourceList, TranslatedSize); + RtlMoveMemory((PUCHAR)NewTranslatedResources + TranslatedSize, Translated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + + /* now copy untranslated resource list */ + RtlMoveMemory(NewUntranslatedResources, This->UntranslatedResourceList, UntranslatedSize); + RtlMoveMemory((PUCHAR)NewUntranslatedResources + UntranslatedSize, Untranslated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + + /* free old lists */ FreeItem(This->TranslatedResourceList, TAG_PORTCLASS); FreeItem(This->UntranslatedResourceList, TAG_PORTCLASS); + /* store new lists */ This->UntranslatedResourceList = NewUntranslatedResources; This->TranslatedResourceList = NewTranslatedResources; + /* increment descriptor count */ NewUntranslatedResources->List[0].PartialResourceList.Count++; NewTranslatedResources->List[0].PartialResourceList.Count++; + + /* add entry count */ + This->NumberOfEntries++; return STATUS_SUCCESS; } @@ -258,37 +283,21 @@ IN CM_RESOURCE_TYPE Type, IN ULONG Index) { - PCM_PARTIAL_RESOURCE_DESCRIPTOR Translated; - PCM_RESOURCE_LIST NewTranslatedResources; - ULONG NewTranslatedSize; - IResourceListImpl * This = (IResourceListImpl*)iface; + PCM_PARTIAL_RESOURCE_DESCRIPTOR Translated, Untranslated; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); Translated = Parent->lpVtbl->FindTranslatedEntry(Parent, Type, Index); - if (!Translated) - return STATUS_INVALID_PARAMETER; - - NewTranslatedSize = sizeof(CM_RESOURCE_LIST) + This->TranslatedResourceList[0].List->PartialResourceList.Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - NewTranslatedResources = AllocateItem(This->PoolType, NewTranslatedSize, TAG_PORTCLASS); - if (!NewTranslatedResources) - return STATUS_INSUFFICIENT_RESOURCES; - - RtlCopyMemory(NewTranslatedResources, This->TranslatedResourceList, sizeof(CM_RESOURCE_LIST)); - if (This->TranslatedResourceList[0].List->PartialResourceList.Count > 1) - { - RtlCopyMemory(&NewTranslatedResources->List[0].PartialResourceList.PartialDescriptors[0], - &This->TranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[0], - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * This->TranslatedResourceList->List[0].PartialResourceList.Count); - } - - RtlCopyMemory(&NewTranslatedResources->List[0].PartialResourceList.PartialDescriptors[This->TranslatedResourceList[0].List->PartialResourceList.Count], Translated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - - FreeItem(This->TranslatedResourceList, TAG_PORTCLASS); - This->TranslatedResourceList = NewTranslatedResources; - NewTranslatedResources->List[0].PartialResourceList.Count++; - - return STATUS_SUCCESS; + Untranslated = Parent->lpVtbl->FindUntranslatedEntry(Parent, Type, Index); + + if (Translated && Untranslated) + { + /* add entry from parent */ + return iface->lpVtbl->AddEntry(iface, Translated, Untranslated); + } + + /* entry not found */ + return STATUS_INVALID_PARAMETER; } PCM_RESOURCE_LIST @@ -399,6 +408,9 @@ ResourceCount = TranslatedResourceList->List[0].PartialResourceList.Count; NewTranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); + /* store resource count */ + NewList->NumberOfEntries = ResourceCount; + /* calculate untranslated resouce list size */ ResourceCount = UntranslatedResourceList->List[0].PartialResourceList.Count; NewUntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]);

1 0

[janderwald] 42438: - Check if translated / untranslated resource list is empty - If both are empty, create an empty resource list - May fix a crash with Yamaha XG Pci
by janderwald＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: janderwald Date: Thu Aug 6 22:44:53 2009 New Revision: 42438 URL: http://svn.reactos.org/svn/reactos?rev=42438&view=rev Log: - Check if translated / untranslated resource list is empty - If both are empty, create an empty resource list - May fix a crash with Yamaha XG Pci Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] Thu Aug 6 22:44:53 2009 @@ -351,13 +351,31 @@ IN PCM_RESOURCE_LIST UntranslatedResourceList) { PCM_RESOURCE_LIST NewUntranslatedResources, NewTranslatedResources; - ULONG NewTranslatedSize, NewUntranslatedSize; + ULONG NewTranslatedSize, NewUntranslatedSize, ResourceCount; IResourceListImpl* NewList; - /* TODO: Validate parameters */ - + if (!TranslatedResourceList) + { + /* if the untranslated resource list is also not provided, it becomes an empty resource list */ + if (UntranslatedResourceList) + { + /* invalid parameter mix */ + return STATUS_INVALID_PARAMETER; + } + } + else + { + /* if the translated resource list is also not provided, it becomes an empty resource list */ + if (!UntranslatedResourceList) + { + /* invalid parameter mix */ + return STATUS_INVALID_PARAMETER; + } + } + + /* allocate resource list ctx */ NewList = AllocateItem(PoolType, sizeof(IResourceListImpl), TAG_PORTCLASS); - + /* check for success */ if (!NewList) { DPRINT("AllocateItem failed\n"); @@ -365,39 +383,50 @@ } /* Initialize */ - - NewTranslatedSize = sizeof(CM_RESOURCE_LIST); - if (TranslatedResourceList[0].List->PartialResourceList.Count > 1) - NewTranslatedSize += (TranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - - NewTranslatedResources = AllocateItem(PoolType, NewTranslatedSize, TAG_PORTCLASS); - if (!NewTranslatedResources) - { - FreeItem(NewList, TAG_PORTCLASS); - return STATUS_INSUFFICIENT_RESOURCES; - } - - NewUntranslatedSize = sizeof(CM_RESOURCE_LIST); - if (UntranslatedResourceList[0].List->PartialResourceList.Count > 1) - NewUntranslatedSize += (UntranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - - NewUntranslatedResources = AllocateItem(PoolType, NewUntranslatedSize, TAG_PORTCLASS); - if (!NewUntranslatedResources) - { - FreeItem(NewList, TAG_PORTCLASS); - FreeItem(NewTranslatedResources, TAG_PORTCLASS); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCopyMemory(NewTranslatedResources, TranslatedResourceList, NewTranslatedSize); - RtlCopyMemory(NewUntranslatedResources, UntranslatedResourceList, NewUntranslatedSize); - NewList->lpVtbl = (IResourceListVtbl*)&vt_ResourceListVtbl; NewList->ref = 1; NewList->OuterUnknown = OuterUnknown; + NewList->PoolType = PoolType; + + if (!TranslatedResourceList || !UntranslatedResourceList) + { + /* empty resource list */ + *OutResourceList = (IResourceList*)&NewList->lpVtbl; + return STATUS_SUCCESS; + } + + /* calculate translated resource list size */ + ResourceCount = TranslatedResourceList->List[0].PartialResourceList.Count; + NewTranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); + + /* calculate untranslated resouce list size */ + ResourceCount = UntranslatedResourceList->List[0].PartialResourceList.Count; + NewUntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); + + /* allocate translated resource list */ + NewTranslatedResources = AllocateItem(PoolType, NewTranslatedSize, TAG_PORTCLASS); + if (!NewTranslatedResources) + { + FreeItem(NewList, TAG_PORTCLASS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* allocate untranslated resource list */ + NewUntranslatedResources = AllocateItem(PoolType, NewUntranslatedSize, TAG_PORTCLASS); + if (!NewUntranslatedResources) + { + FreeItem(NewList, TAG_PORTCLASS); + FreeItem(NewTranslatedResources, TAG_PORTCLASS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* copy resource lists */ + RtlCopyMemory(NewTranslatedResources, TranslatedResourceList, NewTranslatedSize); + RtlCopyMemory(NewUntranslatedResources, UntranslatedResourceList, NewUntranslatedSize); + + /* store resource lists */ NewList->TranslatedResourceList= NewTranslatedResources; NewList->UntranslatedResourceList = NewUntranslatedResources; - NewList->PoolType = PoolType; /* Increment our usage count and set the pointer to this object */ *OutResourceList = (IResourceList*)&NewList->lpVtbl; @@ -405,7 +434,9 @@ return STATUS_SUCCESS; } -PORTCLASSAPI NTSTATUS NTAPI +PORTCLASSAPI +NTSTATUS +NTAPI PcNewResourceSublist( OUT PRESOURCELIST* OutResourceList, IN PUNKNOWN OuterUnknown OPTIONAL,

1 0

[fireball] 42437: - Remove unneeded and wrong LPtoDP translation in kernelmode graphics engine.
by fireball＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: fireball Date: Thu Aug 6 22:29:46 2009 New Revision: 42437 URL: http://svn.reactos.org/svn/reactos?rev=42437&view=rev Log: - Remove unneeded and wrong LPtoDP translation in kernelmode graphics engine. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Thu Aug 6 22:29:46 2009 @@ -166,8 +166,6 @@ DestRect.top = YDest; DestRect.right = XDest+Width; DestRect.bottom = YDest+Height; - // FIXME: LP->DP missing! - //IntLPtoDP(pDest, (LPPOINT)&DestRect, 2); DestRect.left += pDest->rcVport.left + pDest->rcDcRect.left; DestRect.top += pDest->rcVport.top + pDest->rcDcRect.top; @@ -316,7 +314,6 @@ DestRect.top = YOriginDest; DestRect.right = XOriginDest+WidthDest; DestRect.bottom = YOriginDest+HeightDest; - IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2); // FIXME: Why? DestRect.left += DCDest->rcVport.left + DCDest->rcDcRect.left; DestRect.top += DCDest->rcVport.top + DCDest->rcDcRect.top; @@ -330,8 +327,6 @@ if (UsesSource) { - IntLPtoDP(DCSrc, (LPPOINT)&SourceRect, 2); - SourceRect.left += DCSrc->rcVport.left + DCSrc->rcDcRect.left; SourceRect.top += DCSrc->rcVport.top + DCSrc->rcDcRect.top; SourceRect.right += DCSrc->rcVport.left + DCSrc->rcDcRect.left;

1 0

[fireball] 42436: - Translate coordinates (logical to device) for blitting operations in usermode. - Implement ScrollDC (almost fully based on winex11's implementation). Work in progress.
by fireball＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: fireball Date: Thu Aug 6 22:28:46 2009 New Revision: 42436 URL: http://svn.reactos.org/svn/reactos?rev=42436&view=rev Log: - Translate coordinates (logical to device) for blitting operations in usermode. - Implement ScrollDC (almost fully based on winex11's implementation). Work in progress. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Thu Aug 6 22:28:46 2009 @@ -44,6 +44,30 @@ INT width, INT height, NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, DWORD rop ) { + POINT pts[2]; + + /* map source coordinates */ + if (physDevSrc) + { + pts[0].x = xSrc; + pts[0].y = ySrc; + pts[1].x = xSrc + width; + pts[1].y = ySrc + height; + + LPtoDP(physDevSrc->hUserDC, pts, 2); + width = pts[1].x - pts[0].x; + height = pts[1].y - pts[0].y; + xSrc = pts[0].x; + ySrc = pts[0].y; + } + + /* map dest coordinates */ + pts[0].x = xDst; + pts[0].y = yDst; + LPtoDP(physDevDst->hUserDC, pts, 1); + xDst = pts[0].x; + yDst = pts[0].y; + return RosGdiBitBlt(physDevDst->hKernelDC, xDst, yDst, width, height, physDevSrc->hKernelDC, xSrc, ySrc, rop); } @@ -357,6 +381,20 @@ BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ) { + POINT pts[2]; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = left + width; + pts[1].y = top + height; + + LPtoDP(physDev->hUserDC, pts, 2); + width = pts[1].x - pts[0].x; + height = pts[1].y - pts[0].y; + left = pts[0].x; + top = pts[0].y; + return RosGdiPatBlt(physDev->hKernelDC, left, top, width, height, rop); } @@ -667,6 +705,34 @@ NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, DWORD rop ) { + POINT pts[2]; + + /* map source coordinates */ + if (physDevSrc) + { + pts[0].x = xSrc; + pts[0].y = ySrc; + pts[1].x = xSrc + widthSrc; + pts[1].y = ySrc + heightSrc; + + LPtoDP(physDevSrc->hUserDC, pts, 2); + widthSrc = pts[1].x - pts[0].x; + heightSrc = pts[1].y - pts[0].y; + xSrc = pts[0].x; + ySrc = pts[0].y; + } + + /* map dest coordinates */ + pts[0].x = xDst; + pts[0].y = yDst; + pts[1].x = xDst + widthDst; + pts[1].y = yDst + heightDst; + LPtoDP(physDevDst->hUserDC, pts, 2); + widthDst = pts[1].x - pts[0].x; + heightDst = pts[1].y - pts[0].y; + xDst = pts[0].x; + yDst = pts[0].y; + return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); } Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Thu Aug 6 22:28:46 2009 @@ -559,11 +559,142 @@ ExtEscape( hdc, NTDRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); } -BOOL CDECL RosDrv_ScrollDC( HDC hdc, INT dx, INT dy, const RECT *scroll, const RECT *clip, - HRGN hrgn, LPRECT update ) -{ - UNIMPLEMENTED; - return FALSE; +/* + * Scroll windows and DCs + * + * Copyright 1993 David W. Metcalfe + * Copyright 1995, 1996 Alex Korobka + * Copyright 2001 Alexandre Julliard + */ +BOOL CDECL RosDrv_ScrollDC( HDC hdc, INT dx, INT dy, const RECT *lprcScroll, + const RECT *lprcClip, HRGN hrgnUpdate, LPRECT lprcUpdate ) +{ + RECT rcSrc, rcClip, offset; + INT dxdev, dydev, res; + HRGN DstRgn, clipRgn, visrgn; + //INT code = X11DRV_START_EXPOSURES; + + TRACE("dx,dy %d,%d rcScroll %s rcClip %s hrgnUpdate %p lprcUpdate %p\n", + dx, dy, wine_dbgstr_rect(lprcScroll), wine_dbgstr_rect(lprcClip), + hrgnUpdate, lprcUpdate); + /* enable X-exposure events */ + //if (hrgnUpdate || lprcUpdate) + // ExtEscape( hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); + /* get the visible region */ + visrgn=CreateRectRgn( 0, 0, 0, 0); + GetRandomRgn( hdc, visrgn, SYSRGN); + if( !(GetVersion() & 0x80000000)) { + /* Window NT/2k/XP */ + POINT org; + GetDCOrgEx(hdc, &org); + OffsetRgn( visrgn, -org.x, -org.y); + } + /* intersect with the clipping Region if the DC has one */ + clipRgn = CreateRectRgn( 0, 0, 0, 0); + if (GetClipRgn( hdc, clipRgn) != 1) { + DeleteObject(clipRgn); + clipRgn=NULL; + } else + CombineRgn( visrgn, visrgn, clipRgn, RGN_AND); + /* only those pixels in the scroll rectangle that remain in the clipping + * rect are scrolled. */ + if( lprcClip) + rcClip = *lprcClip; + else + GetClipBox( hdc, &rcClip); + rcSrc = rcClip; + OffsetRect( &rcClip, -dx, -dy); + IntersectRect( &rcSrc, &rcSrc, &rcClip); + /* if an scroll rectangle is specified, only the pixels within that + * rectangle are scrolled */ + if( lprcScroll) + IntersectRect( &rcSrc, &rcSrc, lprcScroll); + /* now convert to device coordinates */ + LPtoDP(hdc, (LPPOINT)&rcSrc, 2); + TRACE("source rect: %s\n", wine_dbgstr_rect(&rcSrc)); + /* also dx and dy */ + SetRect(&offset, 0, 0, dx, dy); + LPtoDP(hdc, (LPPOINT)&offset, 2); + dxdev = offset.right - offset.left; + dydev = offset.bottom - offset.top; + /* now intersect with the visible region to get the pixels that will + * actually scroll */ + DstRgn = CreateRectRgnIndirect( &rcSrc); + res = CombineRgn( DstRgn, DstRgn, visrgn, RGN_AND); + /* and translate, giving the destination region */ + OffsetRgn( DstRgn, dxdev, dydev); + //if( TRACE_ON( scroll)) dump_region( "Destination scroll region: ", DstRgn); + /* if there are any, do it */ + if( res > NULLREGION) { + RECT rect ; + /* clip to the destination region, so we can BitBlt with a simple + * bounding rectangle */ + if( clipRgn) + ExtSelectClipRgn( hdc, DstRgn, RGN_AND); + else + SelectClipRgn( hdc, DstRgn); + GetRgnBox( DstRgn, &rect); + DPtoLP(hdc, (LPPOINT)&rect, 2); + TRACE("destination rect: %s\n", wine_dbgstr_rect(&rect)); + + BitBlt( hdc, rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, + hdc, rect.left - dx, rect.top - dy, SRCCOPY); + } + /* compute the update areas. This is the combined clip rectangle + * minus the scrolled region, and intersected with the visible + * region. */ + if (hrgnUpdate || lprcUpdate) + { + HRGN hrgn = hrgnUpdate; + HRGN ExpRgn = 0; + + /* collect all the exposures */ + //code = X11DRV_END_EXPOSURES; + //ExtEscape( hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, + // sizeof(ExpRgn), (LPSTR)&ExpRgn ); + /* Intersect clip and scroll rectangles, allowing NULL values */ + if( lprcScroll) + if( lprcClip) + IntersectRect( &rcClip, lprcClip, lprcScroll); + else + rcClip = *lprcScroll; + else + if( lprcClip) + rcClip = *lprcClip; + else + GetClipBox( hdc, &rcClip); + /* Convert the combined clip rectangle to device coordinates */ + LPtoDP(hdc, (LPPOINT)&rcClip, 2); + if( hrgn ) + SetRectRgn( hrgn, rcClip.left, rcClip.top, rcClip.right, + rcClip.bottom); + else + hrgn = CreateRectRgnIndirect( &rcClip); + CombineRgn( hrgn, hrgn, visrgn, RGN_AND); + CombineRgn( hrgn, hrgn, DstRgn, RGN_DIFF); + /* add the exposures to this */ + if( ExpRgn) { + //if( TRACE_ON( scroll)) dump_region( "Expose region: ", ExpRgn); + CombineRgn( hrgn, hrgn, ExpRgn, RGN_OR); + DeleteObject( ExpRgn); + } + //if( TRACE_ON( scroll)) dump_region( "Update region: ", hrgn); + if( lprcUpdate) { + GetRgnBox( hrgn, lprcUpdate ); + /* Put the lprcUpdate in logical coordinates */ + DPtoLP( hdc, (LPPOINT)lprcUpdate, 2 ); + TRACE("returning lprcUpdate %s\n", wine_dbgstr_rect(lprcUpdate)); + } + if( !hrgnUpdate) + DeleteObject( hrgn); + } + /* restore original clipping region */ + SelectClipRgn( hdc, clipRgn); + DeleteObject( visrgn); + DeleteObject( DstRgn); + if( clipRgn) DeleteObject( clipRgn); + return TRUE; } void CDECL RosDrv_SetCapture( HWND hwnd, UINT flags )

1 0

[sginsberg] 42435: - Fix the last mingw msvc build issues -- just use function forwarders for msvc instead of using gcc alias symbols. Also add msvc assembly to the "fp10" implementation.
by sginsberg＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: sginsberg Date: Thu Aug 6 21:23:44 2009 New Revision: 42435 URL: http://svn.reactos.org/svn/reactos?rev=42435&view=rev Log: - Fix the last mingw msvc build issues -- just use function forwarders for msvc instead of using gcc alias symbols. Also add msvc assembly to the "fp10" implementation. Modified: trunk/reactos/lib/3rdparty/mingw/CRT_fp10.c trunk/reactos/lib/3rdparty/mingw/CRT_fp8.c Modified: trunk/reactos/lib/3rdparty/mingw/CRT_fp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CRT_fp1… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/CRT_fp10.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/CRT_fp10.c [iso-8859-1] Thu Aug 6 21:23:44 2009 @@ -5,6 +5,16 @@ */ void _fpreset (void) - { __asm__ ("fninit" ) ;} +{ +#ifdef __GNUC__ + __asm__ ("fninit" ); +#else + __asm fninit; +#endif +} +#ifdef __GNUC__ void __attribute__ ((alias ("_fpreset"))) fpreset(void); +#else +void fpreset(void) { _fpreset(); } +#endif Modified: trunk/reactos/lib/3rdparty/mingw/CRT_fp8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CRT_fp8… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/CRT_fp8.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/CRT_fp8.c [iso-8859-1] Thu Aug 6 21:23:44 2009 @@ -8,4 +8,8 @@ void _fpreset (void) { (*_imp___fpreset)(); } +#ifdef __GNUC__ void __attribute__ ((alias ("_fpreset"))) fpreset(void); +#else +void fpreset(void) { _fpreset(); } +#endif

1 0

[fireball] 42434: - Implement GetDCOrgEx.
by fireball＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: fireball Date: Thu Aug 6 19:47:08 2009 New Revision: 42434 URL: http://svn.reactos.org/svn/reactos?rev=42434&view=rev Log: - Implement GetDCOrgEx. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Thu Aug 6 19:47:08 2009 @@ -258,8 +258,17 @@ BOOL CDECL RosDrv_GetDCOrgEx( NTDRV_PDEVICE *physDev, LPPOINT lpp ) { - UNIMPLEMENTED; - return FALSE; + RECT dc_rect, drawable_rect; + + /* Get DC rectangles */ + RosGdiGetDcRects(physDev->hKernelDC, &dc_rect, &drawable_rect); + + /* Calculate origin */ + lpp->x = dc_rect.left + drawable_rect.left; + lpp->y = dc_rect.top + drawable_rect.top; + + /* Report success */ + return TRUE; } INT CDECL RosDrv_GetDIBits( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, UINT lines,

1 0

[gschneider] 42433: [Temp] Revert checkpoints, comment out first two tests to check possible memory corruptions from those functions, trace mktime tests in more detail
by gschneider＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: gschneider Date: Thu Aug 6 19:32:36 2009 New Revision: 42433 URL: http://svn.reactos.org/svn/reactos?rev=42433&view=rev Log: [Temp] Revert checkpoints, comment out first two tests to check possible memory corruptions from those functions, trace mktime tests in more detail Modified: trunk/rostests/winetests/msvcrt/time.c Modified: trunk/rostests/winetests/msvcrt/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/time.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/time.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/time.c [iso-8859-1] Thu Aug 6 19:32:36 2009 @@ -83,15 +83,15 @@ char buffer[64]; int year; time_t ref, secs; - +DPRINT1("Entered test_mktime, getting test year\n"); year = get_test_year( &ref ); ref += SECSPERDAY; - +DPRINT1("Checking return value, testyear=%d, ref=%ld\n", year, ref); ok (res != TIME_ZONE_ID_INVALID, "GetTimeZoneInformation failed\n"); +DPRINT1("Converting StdName, tzi=%p, res=%ld\n", (char*)&tzinfo, res); WideCharToMultiByte( CP_ACP, 0, tzinfo.StandardName, -1, buffer, sizeof(buffer), NULL, NULL ); trace( "bias %d std %d dst %d zone %s\n", tzinfo.Bias, tzinfo.StandardBias, tzinfo.DaylightBias, buffer ); -DPRINT1("Finshed 1st\n"); /* Bias may be positive or negative, to use offset of one day */ my_tm = *localtime(&ref); /* retrieve current dst flag */ secs = SECSPERDAY - tzinfo.Bias * SECSPERMIN; @@ -112,7 +112,6 @@ local_time = mktime(&my_tm); ok(local_time == ref, "mktime returned %u, expected %u\n", (DWORD)local_time, (DWORD)ref); -DPRINT1("Finshed 2nd\n"); /* now test some unnormalized struct tm's */ my_tm = sav_tm; my_tm.tm_sec += 60; @@ -128,7 +127,6 @@ my_tm.tm_hour,my_tm.tm_sec, sav_tm.tm_year,sav_tm.tm_mon,sav_tm.tm_mday, sav_tm.tm_hour,sav_tm.tm_sec); -DPRINT1("Finshed 3rd\n"); my_tm = sav_tm; my_tm.tm_min -= 60; my_tm.tm_hour += 1; @@ -143,7 +141,6 @@ my_tm.tm_hour,my_tm.tm_sec, sav_tm.tm_year,sav_tm.tm_mon,sav_tm.tm_mday, sav_tm.tm_hour,sav_tm.tm_sec); -DPRINT1("Finshed 4th\n"); my_tm = sav_tm; my_tm.tm_mon -= 12; my_tm.tm_year += 1; @@ -158,7 +155,6 @@ my_tm.tm_hour,my_tm.tm_sec, sav_tm.tm_year,sav_tm.tm_mon,sav_tm.tm_mday, sav_tm.tm_hour,sav_tm.tm_sec); -DPRINT1("Finshed 5th\n"); my_tm = sav_tm; my_tm.tm_mon += 12; my_tm.tm_year -= 1; @@ -173,13 +169,12 @@ my_tm.tm_hour,my_tm.tm_sec, sav_tm.tm_year,sav_tm.tm_mon,sav_tm.tm_mday, sav_tm.tm_hour,sav_tm.tm_sec); -DPRINT1("Finshed 6th\n"); /* now a bad time example */ my_tm = sav_tm; my_tm.tm_year = 69; local_time = mktime(&my_tm); ok((local_time == -1), "(bad time) mktime returned %d, expected -1\n", (int)local_time); -DPRINT1("Finshed 7th\n"); + my_tm = sav_tm; /* TEST that we are independent from the TZ variable */ /*Argh, msvcrt doesn't have setenv() */ @@ -187,7 +182,6 @@ putenv("TZ=GMT"); nulltime = mktime(&my_tm); ok(nulltime == ref,"mktime returned 0x%08x\n",(DWORD)nulltime); -DPRINT1("Finshed 8th\n"); putenv(TZ_env); } @@ -294,20 +288,14 @@ START_TEST(time) { +#if 0 test_ctime(); -DPRINT1("test_ctime finished\n"); test_gmtime(); -DPRINT1("test_gmtime finished\n"); +#endif test_mktime(); -DPRINT1("test_mktime finished\n"); test_localtime(); -DPRINT1("test_localtime finished\n"); test_strdate(); -DPRINT1("test_strdate finished\n"); test_strtime(); -DPRINT1("test_strtime finished\n"); test_wstrdate(); -DPRINT1("test_wstrdate finished\n"); test_wstrtime(); -DPRINT1("test_wstrtime finished\n"); -} +}

1 0

[sginsberg] 42432: - Don't define ssize_t -- it is already done in rosdhcp.h
by sginsberg＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: sginsberg Date: Thu Aug 6 18:57:56 2009 New Revision: 42432 URL: http://svn.reactos.org/svn/reactos?rev=42432&view=rev Log: - Don't define ssize_t -- it is already done in rosdhcp.h Modified: trunk/reactos/base/services/dhcp/include/dhcpd.h Modified: trunk/reactos/base/services/dhcp/include/dhcpd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include… ============================================================================== --- trunk/reactos/base/services/dhcp/include/dhcpd.h [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/include/dhcpd.h [iso-8859-1] Thu Aug 6 18:57:56 2009 @@ -279,9 +279,6 @@ #define MAX_TIME 0x7fffffff #define MIN_TIME 0 -#ifdef _MSC_VER -typedef SIZE_T ssize_t; -#endif /* External definitions... */

1 0

[fireball] 42431: - Fix a typo (missing braces), spotted in bug 4764. - Wrap returns from SEH into _SEH2_YIELD. Probably exceptions need to just be fully converted to ReactOS PSEH2 syntax.
by fireball＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: fireball Date: Thu Aug 6 18:37:12 2009 New Revision: 42431 URL: http://svn.reactos.org/svn/reactos?rev=42431&view=rev Log: - Fix a typo (missing braces), spotted in bug 4764. - Wrap returns from SEH into _SEH2_YIELD. Probably exceptions need to just be fully converted to ReactOS PSEH2 syntax. Modified: branches/arwinss/reactos/dll/win32/user32/defwnd.c branches/arwinss/reactos/dll/win32/user32/listbox.c branches/arwinss/reactos/dll/win32/user32/lstr.c Modified: branches/arwinss/reactos/dll/win32/user32/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/defwnd.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/defwnd.c [iso-8859-1] Thu Aug 6 18:37:12 2009 @@ -791,7 +791,7 @@ } __EXCEPT_PAGE_FAULT { - return 0; + _SEH2_YIELD(return 0;) } __ENDTRY return result; @@ -930,7 +930,7 @@ } __EXCEPT_PAGE_FAULT { - return 0; + _SEH2_YIELD(return 0;) } __ENDTRY Modified: branches/arwinss/reactos/dll/win32/user32/listbox.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/listbox.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/listbox.c [iso-8859-1] Thu Aug 6 18:37:12 2009 @@ -837,7 +837,7 @@ { WARN( "got an invalid buffer (Delphi bug?)\n" ); SetLastError( ERROR_INVALID_PARAMETER ); - return LB_ERR; + _SEH2_YIELD(return LB_ERR;) } __ENDTRY } else { @@ -1027,7 +1027,7 @@ return count; } - +#if 0 /*********************************************************************** * LISTBOX_GetSelItems16 */ @@ -1041,7 +1041,7 @@ if (item->selected) array[count++] = (INT16)i; return count; } - +#endif /*********************************************************************** * LISTBOX_GetSelItems Modified: branches/arwinss/reactos/dll/win32/user32/lstr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/lstr.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/lstr.c [iso-8859-1] Thu Aug 6 18:37:12 2009 @@ -244,7 +244,7 @@ __EXCEPT_PAGE_FAULT { SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; + _SEH2_YIELD(return NULL;) } __ENDTRY return str; @@ -270,7 +270,7 @@ __EXCEPT_PAGE_FAULT { SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; + _SEH2_YIELD(return NULL;) } __ENDTRY return str; @@ -455,5 +455,5 @@ BOOL WINAPI IsCharAlphaW(WCHAR x) { //return (get_char_typeW(x) & C1_ALPHA) != 0; - return iswalpha; -} + return iswalpha(x); +}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs