Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[weiden] 17028: define __NO_CTYPE_INLINES so DBG:=0 builds don't import from msvcrt

by weiden＠svn.reactos.com

define __NO_CTYPE_INLINES so DBG:=0 builds don't import from msvcrt Modified: trunk/reactos/lib/ntdll/ntdll.xml _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-08-03 19:15:47 UTC (rev 17027) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-08-03 19:28:51 UTC (rev 17028) @@ -7,6 +7,7 @@ <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0502</define> <define name="_NTOSKRNL_" /> + <define name="__NO_CTYPE_INLINES" /> <library>rtl</library> <library>intrlck</library> <library>string</library>

19 years, 3 months

[chorns] 17027: Fix building 'make test'

by chorns＠svn.reactos.com

Fix building 'make test' Modified: trunk/reactos/regtests/shared/regtests.c Modified: trunk/reactos/regtests/shared/regtests.h Modified: trunk/reactos/subsys/win32k/tests/stubs.xml Modified: trunk/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance. c _____ Modified: trunk/reactos/regtests/shared/regtests.c --- trunk/reactos/regtests/shared/regtests.c 2005-08-03 17:46:56 UTC (rev 17026) +++ trunk/reactos/regtests/shared/regtests.c 2005-08-03 19:15:47 UTC (rev 17027) @@ -78,8 +78,8 @@ PERFORM_TEST_ARGS *Args, DWORD TimeOut) { - FILETIME time; - FILETIME executionTime; + _FILETIME time; + _FILETIME executionTime; DWORD status; status = _WaitForSingleObject(hThread, TimeOut); _____ Modified: trunk/reactos/regtests/shared/regtests.h --- trunk/reactos/regtests/shared/regtests.h 2005-08-03 17:46:56 UTC (rev 17026) +++ trunk/reactos/regtests/shared/regtests.h 2005-08-03 19:15:47 UTC (rev 17027) @@ -9,6 +9,14 @@ #include <stdio.h> #include <string.h> +typedef DWORD (STDCALL _LPTHREAD_START_ROUTINE)(LPVOID lpParameter); + +typedef struct __FILETIME +{ + DWORD dwLowDateTime; + DWORD dwHighDateTime; +} _FILETIME, *_PFILETIME, *_LPFILETIME; + extern void SetupOnce(); #define _SetupOnce() \ @@ -195,7 +203,7 @@ HANDLE STDCALL _CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, DWORD dwStackSize, - LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, + _LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD lpThreadId); WINBOOL STDCALL @@ -211,9 +219,11 @@ _CloseHandle(HANDLE handle); BOOL STDCALL -_GetThreadTimes(HANDLE hThread, LPFILETIME lpCreationTime, - LPFILETIME lpExitTime, LPFILETIME lpKernelTime, - LPFILETIME lpUserTime); +_GetThreadTimes(HANDLE hThread, + _LPFILETIME lpCreationTime, + _LPFILETIME lpExitTime, + _LPFILETIME lpKernelTime, + _LPFILETIME lpUserTime); BOOL STDCALL _SetPriorityClass(HANDLE hProcess, DWORD dwPriorityClass); _____ Modified: trunk/reactos/subsys/win32k/tests/stubs.xml --- trunk/reactos/subsys/win32k/tests/stubs.xml 2005-08-03 17:46:56 UTC (rev 17026) +++ trunk/reactos/subsys/win32k/tests/stubs.xml 2005-08-03 19:15:47 UTC (rev 17027) @@ -148,6 +148,8 @@ <symbol>PsGetThreadWin32Thread@4</symbol> <symbol>PsEstablishWin32Callouts@4</symbol> <symbol>PsSetThreadWin32Thread@8</symbol> + <symbol>ProbeForRead@12</symbol> + <symbol>ProbeForWrite@12</symbol> </component> <component name="freetype.dll"> <symbol>FT_Init_FreeType</symbol> _____ Modified: trunk/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance. c --- trunk/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance. c 2005-08-03 17:46:56 UTC (rev 17026) +++ trunk/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance. c 2005-08-03 19:15:47 UTC (rev 17027) @@ -9,7 +9,7 @@ UINT size; UINT depth; - ZeroMemory(surface, sizeof(SURFOBJ)); + RtlZeroMemory(surface, sizeof(SURFOBJ)); depth = BitsPerFormat(BMF_24BPP); sizex = rect->right - rect->left; sizey = rect->bottom - rect->top;

19 years, 3 months

[mf] 17026: switch back to #include "precomp.h" for precomp.cpp because it's needed for VC++ and doesn't irritate GCC since it's not compiled with GCC anyways.

by mf＠svn.reactos.com

switch back to #include "precomp.h" for precomp.cpp because it's needed for VC++ and doesn't irritate GCC since it's not compiled with GCC anyways. Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/precomp.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-08-03 17:24:05 UTC (rev 17025) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-08-03 17:46:56 UTC (rev 17026) @@ -28,7 +28,7 @@ // -#include <precomp.h> +#include <precomp.h> // <precomp.h> instead of "precomp.h" because the ROS build system needs this to find the precompiled header file (*.gch) in the output directory tree #include "resource.h" _____ Modified: trunk/reactos/subsys/system/explorer/precomp.cpp --- trunk/reactos/subsys/system/explorer/precomp.cpp 2005-08-03 17:24:05 UTC (rev 17025) +++ trunk/reactos/subsys/system/explorer/precomp.cpp 2005-08-03 17:46:56 UTC (rev 17026) @@ -25,4 +25,4 @@ // Martin Fuchs, 17.05.2004 // -#include <precomp.h> +#include "precomp.h"

19 years, 3 months

[navaraf] 17025: Merge 16748 from trunk:

by navaraf＠svn.reactos.com

Merge 16748 from trunk: Add check for global handles to NtGdiDeleteDC, this prevents applications from destroying DCs that are part of DCEs. Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/objects/dc.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/objects/dc.c --- branches/ros-branch-0_2_7/reactos/subsys/win32k/objects/dc.c 2005-08-03 17:21:19 UTC (rev 17024) +++ branches/ros-branch-0_2_7/reactos/subsys/win32k/objects/dc.c 2005-08-03 17:24:05 UTC (rev 17025) @@ -924,10 +924,17 @@ { PDC DCToDelete; + if (!GDIOBJ_OwnedByCurrentProcess(DCHandle)) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + DCToDelete = DC_LockDc(DCHandle); if (DCToDelete == NULL) { - return FALSE; + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; } /* First delete all saved DCs */

19 years, 3 months

[navaraf] 17024: Merge 16933 from trunk:

by navaraf＠svn.reactos.com

Merge 16933 from trunk: Fix paramater validation and pointer manipulation in RtlAddAce. Modified: branches/ros-branch-0_2_7/reactos/lib/rtl/acl.c _____ Modified: branches/ros-branch-0_2_7/reactos/lib/rtl/acl.c --- branches/ros-branch-0_2_7/reactos/lib/rtl/acl.c 2005-08-03 17:20:53 UTC (rev 17023) +++ branches/ros-branch-0_2_7/reactos/lib/rtl/acl.c 2005-08-03 17:21:19 UTC (rev 17024) @@ -266,9 +266,9 @@ ULONG AceListLength) { PACE Ace; - ULONG i; PACE Current; - ULONG j; + ULONG NewAceCount; + ULONG Index; PAGED_CODE_RTL(); @@ -289,41 +289,35 @@ return(STATUS_INVALID_PARAMETER); } - i = 0; - Current = (PACE)(Acl + 1); - while ((ULONG_PTR)Current < ((ULONG_PTR)AceList + AceListLength)) + for (Current = AceList, NewAceCount = 0; + (ULONG_PTR)Current < ((ULONG_PTR)AceList + AceListLength); + Current = (PACE)((ULONG_PTR)Current + Current->Header.AceSize), + ++NewAceCount) { if (AceList->Header.AceType == ACCESS_ALLOWED_COMPOUND_ACE_TYPE && AclRevision < ACL_REVISION3) { return(STATUS_INVALID_PARAMETER); } - Current = (PACE)((ULONG_PTR)Current + Current->Header.AceSize); } if (Ace == NULL || - ((ULONG_PTR)Ace + AceListLength) >= ((ULONG_PTR)Acl + Acl->AclSize)) + ((ULONG_PTR)Ace + AceListLength) > ((ULONG_PTR)Acl + Acl->AclSize)) { return(STATUS_BUFFER_TOO_SMALL); } - if (StartingIndex != 0) + Current = (PACE)(Acl + 1); + for (Index = 0; Index < StartingIndex && Index < Acl->AceCount; Index++) { - if (Acl->AceCount > 0) - { - Current = (PACE)(Acl + 1); - for (j = 0; j < StartingIndex; j++) - { - Current = (PACE)((ULONG_PTR)Current + Current->Header.AceSize); - } - } + Current = (PACE)((ULONG_PTR)Current + Current->Header.AceSize); } RtlpAddData(AceList, AceListLength, Current, (ULONG)((ULONG_PTR)Ace - (ULONG_PTR)Current)); - Acl->AceCount = Acl->AceCount + i; + Acl->AceCount = Acl->AceCount + NewAceCount; Acl->AclRevision = AclRevision; return(STATUS_SUCCESS);

19 years, 3 months

[navaraf] 17023: Merge 16932 from trunk:

by navaraf＠svn.reactos.com

Merge 16932 from trunk: Fix locking in RtlPinAtomInAtomTable. Modified: branches/ros-branch-0_2_7/reactos/lib/rtl/atom.c _____ Modified: branches/ros-branch-0_2_7/reactos/lib/rtl/atom.c --- branches/ros-branch-0_2_7/reactos/lib/rtl/atom.c 2005-08-03 17:20:19 UTC (rev 17022) +++ branches/ros-branch-0_2_7/reactos/lib/rtl/atom.c 2005-08-03 17:20:53 UTC (rev 17023) @@ -557,8 +557,6 @@ RtlpUnlockAtomTable(AtomTable); } - RtlpLockAtomTable(AtomTable); - return Status; }

19 years, 3 months

[navaraf] 17022: Merge 16921 (weiden) from trunk:

by navaraf＠svn.reactos.com

Merge 16921 (weiden) from trunk: fixed success check in RtlpCreateAtomHandle, ExCreateHandle returns EX_INVALID_HANDLE in case of failure. Thx to Filip Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/rtl/libsupp.c _____ Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/rtl/libsupp.c --- branches/ros-branch-0_2_7/reactos/ntoskrnl/rtl/libsupp.c 2005-08-03 17:19:36 UTC (rev 17021) +++ branches/ros-branch-0_2_7/reactos/ntoskrnl/rtl/libsupp.c 2005-08-03 17:20:19 UTC (rev 17022) @@ -242,7 +242,7 @@ HandleIndex = ExCreateHandle(AtomTable->ExHandleTable, &ExEntry); - if (HandleIndex != 0) + if (HandleIndex != EX_INVALID_HANDLE) { /* FIXME - Handle Indexes >= 0xC000 ?! */ if (HandleIndex < 0xC000)

19 years, 3 months

[navaraf] 17021: Merge 16860 from trunk:

by navaraf＠svn.reactos.com

Merge 16860 from trunk: Initialize DescriptorTranslated->u.Interrupt.Level before calling HalGetInterruptVector. Remember, casting hides bugs! Debugged by Hervé Poussineau. Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/io/pnpmgr.c --- branches/ros-branch-0_2_7/reactos/ntoskrnl/io/pnpmgr.c 2005-08-03 17:18:54 UTC (rev 17020) +++ branches/ros-branch-0_2_7/reactos/ntoskrnl/io/pnpmgr.c 2005-08-03 17:19:36 UTC (rev 17021) @@ -1035,6 +1035,7 @@ else DescriptorRaw->u.Interrupt.Vector = ResourceDescriptor->u.Interrupt.MinimumVector; + DescriptorTranslated->u.Interrupt.Level = 0; DescriptorTranslated->u.Interrupt.Vector = HalGetInterruptVector( DeviceNode->ResourceRequirements->InterfaceType, DeviceNode->ResourceRequirements->BusNumber,

19 years, 3 months

[navaraf] 17020: Merge 16858 from trunk:

by navaraf＠svn.reactos.com

Merge 16858 from trunk: Properly propagate the SL_PENDING_RETURNED flag to stack locations in IofCompleteRequest and fix the priority boost for master IRPs. Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/io/irp.c _____ Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/io/irp.c --- branches/ros-branch-0_2_7/reactos/ntoskrnl/io/irp.c 2005-08-03 17:17:57 UTC (rev 17019) +++ branches/ros-branch-0_2_7/reactos/ntoskrnl/io/irp.c 2005-08-03 17:18:54 UTC (rev 17020) @@ -1158,10 +1158,7 @@ { if ((Irp->CurrentLocation <= Irp->StackCount) && (Irp->PendingReturned)) { - if (IoGetCurrentIrpStackLocation(Irp)->Control & SL_PENDING_RETURNED) - { - Irp->PendingReturned = TRUE; - } + IoMarkIrpPending(Irp); } } @@ -1191,7 +1188,7 @@ IoFreeIrp(Irp); /* Complete the Master IRP */ - if (!MasterIrpCount) IofCompleteRequest(MasterIrp, IO_NO_INCREMENT); + if (!MasterIrpCount) IofCompleteRequest(MasterIrp, PriorityBoost); return; } @@ -1219,12 +1216,10 @@ } else { - DPRINT1("BUG BUG, YOU SHOULDNT BE HERE\n"); - #if 0 +#if 0 /* Page 166 */ - /* When we'll actually support Async Paging I/O Properly... */ KeInitializeApc(&Irp->Tail.Apc - &Irp->tail.Overlay.Thread->Tcb, + &Irp->Tail.Overlay.Thread->Tcb, Irp->ApcEnvironment, IopCompletePageWrite, NULL, @@ -1235,7 +1230,10 @@ NULL, NULL, PriorityBoost); - #endif +#else + /* Not implemented yet. */ + ASSERT(FALSE); +#endif } return; }

19 years, 3 months

[navaraf] 17019: Megre 16749, 16750, 16751, 16763, 16764 from trunk:

by navaraf＠svn.reactos.com

Megre 16749, 16750, 16751, 16763, 16764 from trunk: Fix reverting of focus to owner windows. Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/winpos.c --- branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/winpos.c 2005-08-03 17:16:24 UTC (rev 17018) +++ branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/winpos.c 2005-08-03 17:17:57 UTC (rev 17019) @@ -107,62 +107,75 @@ WinPosActivateOtherWindow(PWINDOW_OBJECT Window) { PWINDOW_OBJECT Wnd, Old; - int TryTopmost; + HWND Fg; if (!Window || IntIsDesktopWindow(Window)) { IntSetFocusMessageQueue(NULL); return; } - Wnd = Window; - for(;;) + + /* If this is popup window, try to activate the owner first. */ + if ((Window->Style & WS_POPUP) && (Wnd = IntGetOwner(Window))) { - HWND *List, *phWnd; - - Old = Wnd; - Wnd = IntGetParentObject(Wnd); - if(Old != Window) + for(;;) { + Old = Wnd; + Wnd = IntGetParentObject(Wnd); + if(IntIsDesktopWindow(Wnd)) + { + IntReleaseWindowObject(Wnd); + Wnd = Old; + break; + } IntReleaseWindowObject(Old); } - if(!Wnd) + + if ((Wnd->Style & (WS_DISABLED | WS_VISIBLE)) == WS_VISIBLE && + (Wnd->Style & (WS_POPUP | WS_CHILD)) != WS_CHILD) + goto done; + + IntReleaseWindowObject(Wnd); + } + + /* Pick a next top-level window. */ + /* FIXME: Search for non-tooltip windows first. */ + Wnd = Window; + while (Wnd != NULL) + { + Old = Wnd; + IntLockRelatives(Old); + if (Old->NextSibling == NULL) { - IntSetFocusMessageQueue(NULL); - return; + Wnd = NULL; + IntUnLockRelatives(Old); + if (Old != Window) + IntReleaseWindowObject(Old); + break; } + Wnd = IntGetWindowObject(Old->NextSibling->Self); + IntUnLockRelatives(Old); + if (Old != Window) + IntReleaseWindowObject(Old); + if ((Wnd->Style & (WS_DISABLED | WS_VISIBLE)) == WS_VISIBLE && + (Wnd->Style & (WS_POPUP | WS_CHILD)) != WS_CHILD) + break; + } - if((List = IntWinListChildren(Wnd))) +done: + Fg = NtUserGetForegroundWindow(); + if (Wnd && (!Fg || Window->Self == Fg)) + { + if (IntSetForegroundWindow(Wnd)) { - for(TryTopmost = 0; TryTopmost <= 1; TryTopmost++) - { - for(phWnd = List; *phWnd; phWnd++) - { - PWINDOW_OBJECT Child; - - if((*phWnd) == Window->Self) - { - continue; - } - - if((Child = IntGetWindowObject(*phWnd))) - { - if(((! TryTopmost && (0 == (Child->ExStyle & WS_EX_TOPMOST))) - || (TryTopmost && (0 != (Child->ExStyle & WS_EX_TOPMOST)))) - && IntSetForegroundWindow(Child)) - { - ExFreePool(List); - IntReleaseWindowObject(Wnd); - IntReleaseWindowObject(Child); - return; - } - IntReleaseWindowObject(Child); - } - } - } - ExFreePool(List); + IntReleaseWindowObject(Wnd); + return; } } - IntReleaseWindowObject(Wnd); + if (!IntSetActiveWindow(Wnd)) + IntSetActiveWindow(0); + if (Wnd) + IntReleaseWindowObject(Wnd); } VOID STATIC FASTCALL

19 years, 3 months

← Newer
1
...
55
56
57
58
59
60
61
...
67
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 August 2005