Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

[tkreuzer] 50806: [NTOSKRNL] Alex messed up. Fix by Patch by Rafal Harabien, <rafalh1992 AT o2 DOT pl>
by tkreuzer＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: tkreuzer Date: Fri Feb 18 15:59:32 2011 New Revision: 50806 URL: http://svn.reactos.org/svn/reactos?rev=50806&view=rev Log: [NTOSKRNL] Alex messed up. Fix by Patch by Rafal Harabien, <rafalh1992 AT o2 DOT pl> Modified: trunk/reactos/ntoskrnl/ps/state.c Modified: trunk/reactos/ntoskrnl/ps/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/state.c?rev=50… ============================================================================== --- trunk/reactos/ntoskrnl/ps/state.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/state.c [iso-8859-1] Fri Feb 18 15:59:32 2011 @@ -510,7 +510,7 @@ ExGetPreviousMode(), (PVOID)&Thread, NULL); - if (NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) return Status; /* Check if this is a System Thread */ if (Thread->SystemThread)

1 0

[janderwald] 50805: - Fix for the fix (suggested by cmake doyen)
by janderwald＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: janderwald Date: Fri Feb 18 15:09:22 2011 New Revision: 50805 URL: http://svn.reactos.org/svn/reactos?rev=50805&view=rev Log: - Fix for the fix (suggested by cmake doyen) Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Fri Feb 18 15:09:22 2011 @@ -7,6 +7,10 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() + +if(MSVC) + add_definitions(-Disnan=_isnan) +endif() spec2def(wined3.dll wined3d.spec) Modified: branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c [iso-8859-1] Fri Feb 18 15:09:22 2011 @@ -43,7 +43,7 @@ /* Deal with special numbers */ if (*in == 0.0f) return 0x0000; - if(_isnan(*in)) return 0x7C01; + if(isnan(*in)) return 0x7C01; if (isinf(*in)) return (*in < 0.0f ? 0xFC00 : 0x7c00); if(tmp < powf(2, 10)) {

1 0

[tkreuzer] 50804: [WIN32K] Fix a bug in GDIOBJ_LockObj, that would cause a deadlock, when an object was deleted while another thread was waiting to acquire the handle lock.
by tkreuzer＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: tkreuzer Date: Fri Feb 18 15:08:50 2011 New Revision: 50804 URL: http://svn.reactos.org/svn/reactos?rev=50804&view=rev Log: [WIN32K] Fix a bug in GDIOBJ_LockObj, that would cause a deadlock, when an object was deleted while another thread was waiting to acquire the handle lock. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Fri Feb 18 15:08:50 2011 @@ -1005,16 +1005,6 @@ } ProcessId = (HANDLE)((ULONG_PTR)PsGetCurrentProcessId() & ~1); - HandleProcessId = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~1); - - /* Check for invalid owner. */ - if (ProcessId != HandleProcessId && HandleProcessId != NULL) - { - DPRINT1("Tried to lock object (0x%p) of wrong owner! ProcessId = %p, HandleProcessId = %p\n", hObj, ProcessId, HandleProcessId); - GDIDBG_TRACECALLER(); - GDIDBG_TRACEALLOCATOR(hObj); - return NULL; - } /* * Prevent the thread from being terminated during the locking process. @@ -1031,6 +1021,17 @@ for (;;) { + HandleProcessId = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~1); + + /* Check for invalid owner. */ + if (ProcessId != HandleProcessId && HandleProcessId != NULL) + { + DPRINT1("Tried to lock object (0x%p) of wrong owner! ProcessId = %p, HandleProcessId = %p\n", hObj, ProcessId, HandleProcessId); + GDIDBG_TRACECALLER(); + GDIDBG_TRACEALLOCATOR(hObj); + break; + } + /* Lock the handle table entry. */ LockedProcessId = (HANDLE)((ULONG_PTR)HandleProcessId | 0x1); PrevProcId = InterlockedCompareExchangePointer((PVOID*)&Entry->ProcessId,

1 0

[tkreuzer] 50803: [CSRSRV] Dereference all threads, when a process is terminated. Fixes ghost processes in taskmgr! Patch by Rafal Harabien, <rafalh1992 AT o2 DOT pl> See issue #1567 for more details.
by tkreuzer＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: tkreuzer Date: Fri Feb 18 15:01:00 2011 New Revision: 50803 URL: http://svn.reactos.org/svn/reactos?rev=50803&view=rev Log: [CSRSRV] Dereference all threads, when a process is terminated. Fixes ghost processes in taskmgr! Patch by Rafal Harabien, <rafalh1992 AT o2 DOT pl> See issue #1567 for more details. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Fri Feb 18 15:01:00 2011 @@ -145,6 +145,8 @@ ULONG hash; PCSRSS_PROCESS_DATA pProcessData, *pPrevLink; HANDLE Process; + PLIST_ENTRY NextEntry; + PCSR_THREAD Thread; hash = ((ULONG_PTR)Pid >> 2) % (sizeof(ProcessData) / sizeof(*ProcessData)); pPrevLink = &ProcessData[hash]; @@ -161,14 +163,27 @@ DPRINT("CsrFreeProcessData pid: %d\n", Pid); Process = pProcessData->Process; CallProcessDeleted(pProcessData); + + /* Dereference all process threads */ + NextEntry = pProcessData->ThreadList.Flink; + while (NextEntry != &pProcessData->ThreadList) + { + Thread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); + NextEntry = NextEntry->Flink; + + CsrThreadRefcountZero(Thread); + } + if (pProcessData->CsrSectionViewBase) { NtUnmapViewOfSection(NtCurrentProcess(), pProcessData->CsrSectionViewBase); } + if (pProcessData->ServerCommunicationPort) { NtClose(pProcessData->ServerCommunicationPort); } + *pPrevLink = pProcessData->next; RtlFreeHeap(CsrssApiHeap, 0, pProcessData);

1 0

[janderwald] 50802: - Fix a few linking errors for msvc CMakeLists - Fails to find _isinf
by janderwald＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: janderwald Date: Fri Feb 18 14:58:30 2011 New Revision: 50802 URL: http://svn.reactos.org/svn/reactos?rev=50802&view=rev Log: - Fix a few linking errors for msvc CMakeLists - Fails to find _isinf Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Fri Feb 18 14:58:30 2011 @@ -46,7 +46,6 @@ volumetexture.c wined3d_main.c version.rc - #${REACTOS_BINARY_DIR}/include/reactos/wine/wined3d_i.c ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def) if(ARCH MATCHES amd64) @@ -58,7 +57,7 @@ add_library(wined3d SHARED ${SOURCE}) set_module_type(wined3d win32dll) -target_link_libraries(wined3d wine uuid) +target_link_libraries(wined3d wine uuid wined3d_guid) add_importlibs(wined3d user32 Modified: branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c [iso-8859-1] Fri Feb 18 14:58:30 2011 @@ -43,7 +43,7 @@ /* Deal with special numbers */ if (*in == 0.0f) return 0x0000; - if(isnan(*in)) return 0x7C01; + if(_isnan(*in)) return 0x7C01; if (isinf(*in)) return (*in < 0.0f ? 0xFC00 : 0x7c00); if(tmp < powf(2, 10)) {

1 0

[janderwald] 50801: - Fix ddraw build
by janderwald＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: janderwald Date: Fri Feb 18 14:48:09 2011 New Revision: 50801 URL: http://svn.reactos.org/svn/reactos?rev=50801&view=rev Log: - Fix ddraw build Modified: branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt branches/cmake-bringup/include/reactos/wine/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] Fri Feb 18 14:48:09 2011 @@ -30,7 +30,6 @@ vertexbuffer.c viewport.c version.rc - #${REACTOS_BINARY_DIR}/include/reactos/wine/wined3d_i.c ${CMAKE_CURRENT_BINARY_DIR}/ddraw_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def) @@ -41,6 +40,7 @@ wine uuid dxguid + wined3d_guid ${PSEH_LIB}) add_importlibs(ddraw Modified: branches/cmake-bringup/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] Fri Feb 18 14:48:09 2011 @@ -5,3 +5,4 @@ add_rpc_library(epmrpc epm.idl) add_rpc_library(irotrpc irot.idl) +add_iid_library(wined3d_guid wined3d.idl)

1 0

[fireball] 50800: [RTL/DPH] - Zero-initialize VM allocation base. - Don't reserve VM, just commit it right away. This was a premature optimisation. Instead, retry committing a smaller amount of mem...
by fireball＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: fireball Date: Fri Feb 18 14:45:13 2011 New Revision: 50800 URL: http://svn.reactos.org/svn/reactos?rev=50800&view=rev Log: [RTL/DPH] - Zero-initialize VM allocation base. - Don't reserve VM, just commit it right away. This was a premature optimisation. Instead, retry committing a smaller amount of memory if committing all memory fails. Modified: trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=508… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Fri Feb 18 14:45:13 2011 @@ -108,9 +108,6 @@ ULONG RtlpPageHeapDllRangeStart, RtlpPageHeapDllRangeEnd; WCHAR RtlpDphTargetDlls[512]; -ULONG RtlpDphBreakOptions; -ULONG RtlpDphDebugOptions; - LIST_ENTRY RtlpDphPageHeapList; BOOLEAN RtlpDphPageHeapListInitialized; RTL_CRITICAL_SECTION RtlpDphPageHeapListLock; @@ -177,6 +174,10 @@ #define POINTER_REMOVE_BIAS(ptr) ((ULONG_PTR)(ptr) & ~(ULONG_PTR)1) #define POINTER_ADD_BIAS(ptr) ((ULONG_PTR)(ptr) & 1) + +ULONG RtlpDphBreakOptions = 0;//0xFFFFFFFF; +ULONG RtlpDphDebugOptions; + /* FUNCTIONS ******************************************************************/ BOOLEAN NTAPI @@ -312,7 +313,7 @@ &Size, Type, Protection); - + DPRINT1("Page heap: AllocVm (%p, %p, %x) status %x \n", Base, Size, Type, Status); /* Check for failures */ if (!NT_SUCCESS(Status)) { @@ -348,7 +349,7 @@ /* Free the memory */ Status = RtlpSecMemFreeVirtualMemory(NtCurrentProcess(), &Base, &Size, Type); - + DPRINT1("Page heap: FreeVm (%p, %p, %x) status %x \n", Base, Size, Type, Status); /* Log/report failures */ if (!NT_SUCCESS(Status)) { @@ -811,7 +812,7 @@ PDPH_HEAP_BLOCK Node; NTSTATUS Status; SIZE_T Size = DPH_POOL_SIZE, SizeVirtual; - PVOID Ptr; + PVOID Ptr = NULL; /* Check for the easy case */ if (DphRoot->pUnusedNodeListHead) @@ -920,7 +921,7 @@ SIZE_T Size) { PDPH_HEAP_BLOCK Node, AvailableNode; - PVOID Base; + PVOID Base = NULL; SIZE_T VirtualSize; NTSTATUS Status; @@ -937,18 +938,26 @@ } /* Calculate size of VM to allocate by rounding it up */ - VirtualSize = (Size + 0xFFFF) & 0xFFFF0000; - if (VirtualSize < DPH_RESERVE_SIZE) + Size = ROUND_UP(Size, 0xFFFF); + VirtualSize = Size; + if (Size < DPH_RESERVE_SIZE) VirtualSize = DPH_RESERVE_SIZE; /* Allocate the virtual memory */ - Status = RtlpDphAllocateVm(&Base, VirtualSize, MEM_RESERVE, PAGE_NOACCESS); + // FIXME: Shouldn't it be MEM_RESERVE with later committing? + Status = RtlpDphAllocateVm(&Base, VirtualSize, MEM_COMMIT, PAGE_NOACCESS); if (!NT_SUCCESS(Status)) { - /* Free the allocated node and return failure */ - RtlpDphReturnNodeToUnusedList(DphRoot, Node); - RtlpDphReturnNodeToUnusedList(DphRoot, AvailableNode); - return FALSE; + /* Retry again with a smaller size */ + VirtualSize = Size; + Status = RtlpDphAllocateVm(&Base, VirtualSize, MEM_COMMIT, PAGE_NOACCESS); + if (!NT_SUCCESS(Status)) + { + /* Free the allocated node and return failure */ + RtlpDphReturnNodeToUnusedList(DphRoot, Node); + RtlpDphReturnNodeToUnusedList(DphRoot, AvailableNode); + return FALSE; + } } /* Set up our two nodes describing this VM */ @@ -1287,7 +1296,7 @@ PVOID Lock, PRTL_HEAP_PARAMETERS Parameters) { - PVOID Base; + PVOID Base = NULL; PHEAP HeapPtr; PDPH_HEAP_ROOT DphRoot; PDPH_HEAP_BLOCK DphNode;

1 0

[tkreuzer] 50799: [WIN32K] compile gdidebug code as a seperate file and give it a seperate header
by tkreuzer＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: tkreuzer Date: Fri Feb 18 14:35:44 2011 New Revision: 50799 URL: http://svn.reactos.org/svn/reactos?rev=50799&view=rev Log: [WIN32K] compile gdidebug code as a seperate file and give it a seperate header Added: trunk/reactos/subsystems/win32/win32k/include/gdidebug.h (with props) Modified: trunk/reactos/subsystems/win32/win32k/include/win32kp.h trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Added: trunk/reactos/subsystems/win32/win32k/include/gdidebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdidebug.h (added) +++ trunk/reactos/subsystems/win32/win32k/include/gdidebug.h [iso-8859-1] Fri Feb 18 14:35:44 2011 @@ -1,0 +1,75 @@ +#pragma once + +extern ULONG gulDebugChannels; + +enum _DEBUGCHANNELS +{ + DbgCustom = 1, + DbgObjects = 2, + DbgBitBlt = 4, + DbgXlate = 8, + DbgModeSwitch = 16, +}; + +#define DBGENABLE(ch) gulDebugChannels |= (ch); +#define DBGDISABLE(ch) gulDebugChannels &= ~(ch); +#define DPRINTCH(ch) if (gulDebugChannels & (ch)) DbgPrint + +#ifdef GDI_DEBUG + +#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) +NTSYSAPI ULONG APIENTRY RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); + +#define IS_HANDLE_VALID(idx) \ + ((GdiHandleTable->Entries[idx].Type & GDI_ENTRY_BASETYPE_MASK) != 0) + +#define GDIDBG_TRACECALLER() \ + DPRINT1("-> called from:\n"); \ + KeRosDumpStackFrames(NULL, 20); +#define GDIDBG_TRACEALLOCATOR(handle) \ + DPRINT1("-> allocated from:\n"); \ + KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_TRACELOCKER(handle) \ + DPRINT1("-> locked from:\n"); \ + KeRosDumpStackFrames(GDIHandleLocker[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_TRACESHARELOCKER(handle) \ + DPRINT1("-> locked from:\n"); \ + KeRosDumpStackFrames(GDIHandleShareLocker[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_TRACEDELETER(handle) \ + DPRINT1("-> deleted from:\n"); \ + KeRosDumpStackFrames(GDIHandleDeleter[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_CAPTUREALLOCATOR(handle) \ + CaptureStackBackTace((PVOID*)GDIHandleAllocator[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_CAPTURELOCKER(handle) \ + CaptureStackBackTace((PVOID*)GDIHandleLocker[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_CAPTURESHARELOCKER(handle) \ + CaptureStackBackTace((PVOID*)GDIHandleShareLocker[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_CAPTUREDELETER(handle) \ + CaptureStackBackTace((PVOID*)GDIHandleDeleter[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_DUMPHANDLETABLE() \ + IntDumpHandleTable(GdiHandleTable) +#define GDIDBG_INITLOOPTRACE() \ + ULONG Attempts = 0; +#define GDIDBG_TRACELOOP(Handle, PrevThread, Thread) \ + if ((++Attempts % 20) == 0) \ + { \ + DPRINT1("[%d] Handle 0x%p Locked by 0x%x (we're 0x%x)\n", Attempts, Handle, PrevThread, Thread); \ + } + +#else + +#define GDIDBG_TRACECALLER() +#define GDIDBG_TRACEALLOCATOR(index) +#define GDIDBG_TRACELOCKER(index) +#define GDIDBG_TRACESHARELOCKER(index) +#define GDIDBG_CAPTUREALLOCATOR(index) +#define GDIDBG_CAPTURELOCKER(index) +#define GDIDBG_CAPTURESHARELOCKER(index) +#define GDIDBG_CAPTUREDELETER(handle) +#define GDIDBG_DUMPHANDLETABLE() +#define GDIDBG_INITLOOPTRACE() +#define GDIDBG_TRACELOOP(Handle, PrevThread, Thread) +#define GDIDBG_TRACEDELETER(handle) + +#endif /* GDI_DEBUG */ + Propchange: trunk/reactos/subsystems/win32/win32k/include/gdidebug.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Fri Feb 18 14:35:44 2011 @@ -87,3 +87,4 @@ #include <include/ldevobj.h> #include <include/device.h> #include <dib/dib.h> +#include <include/gdidebug.h> Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Fri Feb 18 14:35:44 2011 @@ -1,7 +1,21 @@ +/* + * PROJECT: ReactOS win32 kernel mode subsystem + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/objects/gdidbg.c + * PURPOSE: Special debugging functions for gdi + * PROGRAMMERS: Timo Kreuzer + */ + +/** INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + + +ULONG gulDebugChannels = 0; + #ifdef GDI_DEBUG - -#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) -NTSYSAPI ULONG APIENTRY RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); #define GDI_STACK_LEVELS 20 static ULONG_PTR GDIHandleAllocator[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; @@ -36,9 +50,6 @@ return TRUE; } - -#define IS_HANDLE_VALID(idx) \ - ((GdiHandleTable->Entries[idx].Type & GDI_ENTRY_BASETYPE_MASK) != 0) void IntDumpHandleTable(PGDI_HANDLE_TABLE HandleTable) { @@ -110,8 +121,8 @@ for (i = 0; i < nTraces && AllocatorTable[i].count > 1; i++) { /* Print out the allocation count */ - DbgPrint(" %i allocs, type = 0x%lx:\n", - AllocatorTable[i].count, + DbgPrint(" %i allocs, type = 0x%lx:\n", + AllocatorTable[i].count, GdiHandleTable->Entries[AllocatorTable[i].idx].Type); /* Dump the frames */ @@ -271,39 +282,6 @@ return r; } - -#define GDIDBG_TRACECALLER() \ - DPRINT1("-> called from:\n"); \ - KeRosDumpStackFrames(NULL, 20); -#define GDIDBG_TRACEALLOCATOR(handle) \ - DPRINT1("-> allocated from:\n"); \ - KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); -#define GDIDBG_TRACELOCKER(handle) \ - DPRINT1("-> locked from:\n"); \ - KeRosDumpStackFrames(GDIHandleLocker[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); -#define GDIDBG_TRACESHARELOCKER(handle) \ - DPRINT1("-> locked from:\n"); \ - KeRosDumpStackFrames(GDIHandleShareLocker[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); -#define GDIDBG_TRACEDELETER(handle) \ - DPRINT1("-> deleted from:\n"); \ - KeRosDumpStackFrames(GDIHandleDeleter[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); -#define GDIDBG_CAPTUREALLOCATOR(handle) \ - CaptureStackBackTace((PVOID*)GDIHandleAllocator[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); -#define GDIDBG_CAPTURELOCKER(handle) \ - CaptureStackBackTace((PVOID*)GDIHandleLocker[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); -#define GDIDBG_CAPTURESHARELOCKER(handle) \ - CaptureStackBackTace((PVOID*)GDIHandleShareLocker[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); -#define GDIDBG_CAPTUREDELETER(handle) \ - CaptureStackBackTace((PVOID*)GDIHandleDeleter[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); -#define GDIDBG_DUMPHANDLETABLE() \ - IntDumpHandleTable(GdiHandleTable) -#define GDIDBG_INITLOOPTRACE() \ - ULONG Attempts = 0; -#define GDIDBG_TRACELOOP(Handle, PrevThread, Thread) \ - if ((++Attempts % 20) == 0) \ - { \ - DPRINT1("[%d] Handle 0x%p Locked by 0x%x (we're 0x%x)\n", Attempts, Handle, PrevThread, Thread); \ - } ULONG FASTCALL @@ -315,20 +293,5 @@ return cLocks; } -#else - -#define GDIDBG_TRACECALLER() -#define GDIDBG_TRACEALLOCATOR(index) -#define GDIDBG_TRACELOCKER(index) -#define GDIDBG_TRACESHARELOCKER(index) -#define GDIDBG_CAPTUREALLOCATOR(index) -#define GDIDBG_CAPTURELOCKER(index) -#define GDIDBG_CAPTURESHARELOCKER(index) -#define GDIDBG_CAPTUREDELETER(handle) -#define GDIDBG_DUMPHANDLETABLE() -#define GDIDBG_INITLOOPTRACE() -#define GDIDBG_TRACELOOP(Handle, PrevThread, Thread) -#define GDIDBG_TRACEDELETER(handle) - #endif /* GDI_DEBUG */ Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Fri Feb 18 14:35:44 2011 @@ -8,8 +8,6 @@ /** INCLUDES ******************************************************************/ -//#define GDI_DEBUG - #include <win32k.h> #define NDEBUG #include <debug.h> @@ -27,8 +25,6 @@ #define DelayExecution() \ DPRINT("%s:%i: Delay\n", __FILE__, __LINE__); \ KeDelayExecutionThread(KernelMode, FALSE, &ShortDelay) - -#include "gdidbg.c" static BOOL INTERNAL_CALL GDI_CleanupDummy(PVOID ObjectBody); Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Fri Feb 18 14:35:44 2011 @@ -184,6 +184,7 @@ <file>freetype.c</file> <file>gdibatch.c</file> <file>gdiobj.c</file> + <file>gdidbg.c</file> <file>icm.c</file> <file>line.c</file> <file>metafile.c</file>

1 0

[gadamopoulos] 50798: [explorer] - Fix some visual problems in the toolbar
by gadamopoulos＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: gadamopoulos Date: Fri Feb 18 14:28:58 2011 New Revision: 50798 URL: http://svn.reactos.org/svn/reactos?rev=50798&view=rev Log: [explorer] - Fix some visual problems in the toolbar Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp trunk/reactos/base/shell/explorer/utility/window.cpp Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Fri Feb 18 14:28:58 2011 @@ -873,7 +873,7 @@ HMENU hMenuFrame = LoadMenu(g_Globals._hInstance, MAKEINTRESOURCE(IDM_MDIFRAME)); return Window::Create(WINDOW_CREATOR(MDIMainFrame), 0, - (LPCTSTR)(int)g_Globals._hframeClass, ResString(IDS_TITLE), WS_OVERLAPPEDWINDOW, + (LPCTSTR)(int)g_Globals._hframeClass, ResString(IDS_TITLE), WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 0/*hwndDesktop*/, hMenuFrame); } Modified: trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp [iso-8859-1] Fri Feb 18 14:28:58 2011 @@ -654,8 +654,12 @@ MDIShellBrowserChild* MDIShellBrowserChild::create(const ShellChildWndInfo& info) { - ChildWindow* child = ChildWindow::create(info, info._pos.rcNormalPosition, - WINDOW_CREATOR_INFO(MDIShellBrowserChild,ShellChildWndInfo), CLASSNAME_CHILDWND, NULL, info._pos.showCmd==SW_SHOWMAXIMIZED? WS_MAXIMIZE: 0); + ChildWindow* child = ChildWindow::create(info, + info._pos.rcNormalPosition, + WINDOW_CREATOR_INFO(MDIShellBrowserChild,ShellChildWndInfo), + CLASSNAME_CHILDWND, + NULL, + WS_CLIPCHILDREN | (info._pos.showCmd==SW_SHOWMAXIMIZED? WS_MAXIMIZE: 0)); return static_cast<MDIShellBrowserChild*>(child); } Modified: trunk/reactos/base/shell/explorer/utility/window.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/window.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/window.cpp [iso-8859-1] Fri Feb 18 14:28:58 2011 @@ -39,7 +39,7 @@ style = style_; hInstance = g_Globals._hInstance; hCursor = LoadCursor(0, IDC_ARROW); - + this->hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); lpszClassName = classname; lpfnWndProc = wndproc;

1 0

[gadamopoulos] 50797: [win32k] - Check if CombinedClip is NULL before accesing it Should fix a crash with Download Master
by gadamopoulos＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: gadamopoulos Date: Fri Feb 18 14:26:11 2011 New Revision: 50797 URL: http://svn.reactos.org/svn/reactos?rev=50797&view=rev Log: [win32k] - Check if CombinedClip is NULL before accesing it Should fix a crash with Download Master Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Fri Feb 18 14:26:11 2011 @@ -438,7 +438,8 @@ XPos += dc->ptlDCOrig.x; YPos += dc->ptlDCOrig.y; - if (RECTL_bPointInRect(&dc->rosdc.CombinedClip->rclBounds, XPos, YPos)) + if ((dc->rosdc.CombinedClip == NULL) || + (RECTL_bPointInRect(&dc->rosdc.CombinedClip->rclBounds, XPos, YPos))) { bInRect = TRUE; psurf = dc->dclevel.pSurface;

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
36
Older →

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 February 2011