Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[greatlrd] 33619: filter the higher part of DWORD for return value of VBE return value from the BIOS this will make allot ATI card working proper. thx again bear windows for the info and mail response which card need it, more info for this issue at http://www.bearwindows.boot-land.net/vbemp.htm#10
by greatlrd＠svn.reactos.org 21 May '08

21 May '08

Author: greatlrd Date: Wed May 21 08:47:22 2008 New Revision: 33619 URL: http://svn.reactos.org/svn/reactos?rev=33619&view=rev Log: filter the higher part of DWORD for return value of VBE return value from the BIOS this will make allot ATI card working proper. thx again bear windows for the info and mail response which card need it, more info for this issue at http://www.bearwindows.boot-land.net/vbemp.htm#10 Modified: trunk/reactos/drivers/video/miniport/vbe/edid.c trunk/reactos/drivers/video/miniport/vbe/vbemp.c trunk/reactos/drivers/video/miniport/vbe/vbemp.h Modified: trunk/reactos/drivers/video/miniport/vbe/edid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/edid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/edid.c [iso-8859-1] Wed May 21 08:47:22 2008 @@ -125,7 +125,7 @@ VBEDeviceExtension->Int10Interface.Int10CallBios( VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax != VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) != VBE_SUCCESS) return FALSE; VideoPortDebugPrint(Info, "VBEMP: VBE/SCI version %x\n", BiosRegisters.Ecx); if ((BiosRegisters.Ebx & 0xF) != 0xF) @@ -141,7 +141,7 @@ VBEDeviceExtension->Int10Interface.Int10CallBios( VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax != VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) != VBE_SUCCESS) return FALSE; /* @@ -198,7 +198,7 @@ VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax != VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) != VBE_SUCCESS) return FALSE; /* Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Wed May 21 08:47:22 2008 @@ -230,7 +230,7 @@ VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax == VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS) { VBEDeviceExtension->Int10Interface.Int10ReadMemory( VBEDeviceExtension->Int10Interface.Context, @@ -341,7 +341,7 @@ VbeModeInfo = VBEDeviceExtension->ModeInfo + SuitableModeCount; /* Is this mode acceptable? */ - if (BiosRegisters.Eax == VBE_SUCCESS && + if (VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS && VbeModeInfo->XResolution >= 640 && VbeModeInfo->YResolution >= 480 && (VbeModeInfo->MemoryModel == VBE_MEMORYMODEL_PACKEDPIXEL || @@ -626,9 +626,9 @@ VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax == VBE_NOT_SUPPORTED) + if ( VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_NOT_SUPPORTED) return ERROR_DEV_NOT_EXIST; - if (BiosRegisters.Eax != VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) != VBE_SUCCESS) return ERROR_INVALID_FUNCTION; /* @@ -644,7 +644,7 @@ VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax == VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS) { VideoPowerControl->DPMSVersion = BiosRegisters.Ebx & 0xFF; switch (BiosRegisters.Ebx >> 8) @@ -708,9 +708,9 @@ VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax == VBE_NOT_SUPPORTED) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_NOT_SUPPORTED) return ERROR_DEV_NOT_EXIST; - if (BiosRegisters.Eax != VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) != VBE_SUCCESS) return ERROR_INVALID_FUNCTION; return VBE_SUCCESS; @@ -742,7 +742,7 @@ DeviceExtension->Int10Interface.Context, &BiosRegisters); - if (BiosRegisters.Eax == VBE_SUCCESS) + if (VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS) { DeviceExtension->CurrentMode = RequestedMode->RequestedMode; } @@ -752,7 +752,7 @@ DeviceExtension->CurrentMode = -1; } - return BiosRegisters.Eax == VBE_SUCCESS; + return VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS; } /* @@ -776,7 +776,7 @@ DeviceExtension->Int10Interface.Context, &BiosRegisters); - return BiosRegisters.Eax == VBE_SUCCESS; + return VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS; } /* @@ -1080,6 +1080,6 @@ DeviceExtension->Int10Interface.Context, &BiosRegisters); - return BiosRegisters.Eax == VBE_SUCCESS; - } -} + return VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS; + } +} Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] Wed May 21 08:47:22 2008 @@ -104,6 +104,8 @@ #define VBE_NOT_SUPPORTED 0x24F #define VBE_FUNCTION_INVALID 0x34F +#define VBE_GETRETURNCODE(x) (x & 0xFFFF) + /* * VBE specification defined structure for general adapter info * returned by function VBE_GET_CONTROLLER_INFORMATION command.

1 0

[tkreuzer] 33618: - Fix wrong debug output when a process is terminated, by deleting the it's objects in a proper order, fixes bug 2954 - remove Fireball's, ugly nasty hack. - Fix debug output to show the right problem - For all people who think the handle table might be messed up: add a function that validates the handle table integrity after a process is closed, when GDI_DEBUG is defined. - fix the BaseObjects hHmgr field when converting an object to a stock object. - move all GDI_DEBUG stuff
by tkreuzer＠svn.reactos.org 20 May '08

20 May '08

Author: tkreuzer Date: Tue May 20 15:39:32 2008 New Revision: 33618 URL: http://svn.reactos.org/svn/reactos?rev=33618&view=rev Log: - Fix wrong debug output when a process is terminated, by deleting the it's objects in a proper order, fixes bug 2954 - remove Fireball's, ugly nasty hack. - Fix debug output to show the right problem - For all people who think the handle table might be messed up: add a function that validates the handle table integrity after a process is closed, when GDI_DEBUG is defined. - fix the BaseObjects hHmgr field when converting an object to a stock object. - move all GDI_DEBUG stuff into it's own file See issue #2954 for more details. Added: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c (with props) Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Added: 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 (added) +++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Tue May 20 15:39:32 2008 @@ -1,0 +1,272 @@ +#ifdef GDI_DEBUG + +BOOLEAN STDCALL KiRosPrintAddress(PVOID Address); +NTSYSAPI ULONG NTAPI RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); + +static int leak_reported = 0; +#define GDI_STACK_LEVELS 12 +static ULONG GDIHandleAllocator[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; +static ULONG GDIHandleLocker[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; +struct DbgOpenGDIHandle +{ + ULONG idx; + int count; +}; +#define H 1024 +static struct DbgOpenGDIHandle h[H]; + +void IntDumpHandleTable(PGDI_HANDLE_TABLE HandleTable) +{ + int i, n = 0, j, k, J; + + if (leak_reported) + { + DPRINT1("gdi handle abusers already reported!\n"); + return; + } + + leak_reported = 1; + DPRINT1("reporting gdi handle abusers:\n"); + + /* step through GDI handle table and find out who our culprit is... */ + for (i = RESERVE_ENTRIES_COUNT; i < GDI_HANDLE_COUNT; i++) + { + for (j = 0; j < n; j++) + { +next: + J = h[j].idx; + for (k = 0; k < GDI_STACK_LEVELS; k++) + { + if (GDIHandleAllocator[i][k] + != GDIHandleAllocator[J][k]) + { + if (++j == n) + goto done; + else + goto next; + } + } + goto done; + } +done: + if (j < H) + { + if (j == n) + { + h[j].idx = i; + h[j].count = 1; + n = n + 1; + } + else + h[j].count++; + } + } + /* bubble sort time! weeeeee!! */ + for (i = 0; i < n-1; i++) + { + if (h[i].count < h[i+1].count) + { + struct DbgOpenGDIHandle t; + t = h[i+1]; + h[i+1] = h[i]; + j = i; + while (j > 0 && h[j-1].count < t.count) + j--; + h[j] = t; + } + } + /* print the worst offenders... */ + DbgPrint("Worst GDI Handle leak offenders (out of %i unique locations):\n", n); + for (i = 0; i < n && h[i].count > 1; i++) + { + int j; + DbgPrint(" %i allocs: ", h[i].count); + for (j = 0; j < GDI_STACK_LEVELS; j++) + { + ULONG Addr = GDIHandleAllocator[h[i].idx][j]; + if (!KiRosPrintAddress((PVOID)Addr)) + DbgPrint("<%X>", Addr); + } + DbgPrint("\n"); + } + if (i < n && h[i].count == 1) + DbgPrint("(list terminated - the remaining entries have 1 allocation only)\n"); +} + +ULONG +CaptureStackBackTace(PVOID* pFrames, ULONG nFramesToCapture) +{ + ULONG nFrameCount; + + memset(pFrames, 0x00, (nFramesToCapture + 1) * sizeof(PVOID)); + + nFrameCount = RtlCaptureStackBackTrace(1, nFramesToCapture, pFrames, NULL); + + if (nFrameCount < nFramesToCapture) + { + nFrameCount += RtlWalkFrameChain(pFrames + nFrameCount, nFramesToCapture - nFrameCount, 1); + } + + return nFrameCount; +} + +BOOL +GdiDbgHTIntegrityCheck() +{ + ULONG i, nDeleted = 0, nFree = 0, nUsed = 0; + PGDI_TABLE_ENTRY pEntry; + BOOL r = 1; + + KeEnterCriticalRegion(); + + /* FIXME: check reserved entries */ + + /* Now go through the deleted objects */ + i = GdiHandleTable->FirstFree; + if (i) + { + pEntry = &GdiHandleTable->Entries[i]; + for (;;) + { + nDeleted++; + + /* Check the entry */ + if ((pEntry->Type & GDI_ENTRY_BASETYPE_MASK) != 0) + { + r = 0; + DPRINT1("Deleted Entry has a type != 0\n"); + } + if ((ULONG_PTR)pEntry->KernelData >= GDI_HANDLE_COUNT) + { + r = 0; + DPRINT1("Deleted entries KernelPointer too big\n"); + } + if (pEntry->UserData != NULL) + { + r = 0; + DPRINT1("Deleted entry has UserData != 0\n"); + } + if (pEntry->ProcessId != 0) + { + r = 0; + DPRINT1("Deleted entry has ProcessId != 0\n"); + } + + i = (ULONG_PTR)pEntry->KernelData; + if (!i) + { + break; + } + pEntry = &GdiHandleTable->Entries[i]; + } + } + + for (i = GdiHandleTable->FirstUnused; + i < GDI_HANDLE_COUNT; + i++) + { + pEntry = &GdiHandleTable->Entries[i]; + + if ((pEntry->Type) != 0) + { + r = 0; + DPRINT1("Free Entry has a type != 0\n"); + } + if ((ULONG_PTR)pEntry->KernelData != 0) + { + r = 0; + DPRINT1("Free entries KernelPointer != 0\n"); + } + if (pEntry->UserData != NULL) + { + r = 0; + DPRINT1("Free entry has UserData != 0\n"); + } + if (pEntry->ProcessId != 0) + { + r = 0; + DPRINT1("Free entry has ProcessId != 0\n"); + } + nFree++; + } + + for (i = RESERVE_ENTRIES_COUNT; i < GDI_HANDLE_COUNT; i++) + { + HGDIOBJ Handle; + ULONG Type; + + pEntry = &GdiHandleTable->Entries[i]; + Type = pEntry->Type; + Handle = (HGDIOBJ)((Type << GDI_ENTRY_UPPER_SHIFT) + i); + + if (Type & GDI_ENTRY_BASETYPE_MASK) + { + if (pEntry->KernelData == NULL) + { + r = 0; + DPRINT1("Used entry has KernelData == 0\n"); + } + if (pEntry->KernelData <= MmHighestUserAddress) + { + r = 0; + DPRINT1("Used entry invalid KernelData\n"); + } + if (((POBJ)(pEntry->KernelData))->hHmgr != Handle) + { + r = 0; + DPRINT1("Used entry %ld, has invalid hHmg %p (expected: %p)\n", + i, ((POBJ)(pEntry->KernelData))->hHmgr, Handle); + } + nUsed++; + } + } + + if (RESERVE_ENTRIES_COUNT + nDeleted + nFree + nUsed != GDI_HANDLE_COUNT) + { + r = 0; + DPRINT1("Number of all entries incorrect: RESERVE_ENTRIES_COUNT = %ld, nDeleted = %ld, nFree = %ld, nUsed = %ld\n", + RESERVE_ENTRIES_COUNT, nDeleted, nFree, nUsed); + } + + KeLeaveCriticalRegion(); + + return r; +} + + +#define GDIDBG_TRACECALLER() \ + DPRINT1("-> called from:\n"); \ + KeRosDumpStackFrames(NULL, 20); +#define GDIDBG_TRACEALLOCATOR(index) \ + DPRINT1("-> allocated from:\n"); \ + KeRosDumpStackFrames(GDIHandleAllocator[index], GDI_STACK_LEVELS); +#define GDIDBG_TRACELOCKER(index) \ + DPRINT1("-> locked from:\n"); \ + KeRosDumpStackFrames(GDIHandleLocker[index], GDI_STACK_LEVELS); +#define GDIDBG_CAPTUREALLOCATOR(index) \ + CaptureStackBackTace((PVOID*)GDIHandleAllocator[index], GDI_STACK_LEVELS); +#define GDIDBG_CAPTURELOCKER(index) \ + CaptureStackBackTace((PVOID*)GDIHandleLocker[index], 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_CAPTUREALLOCATOR(index) +#define GDIDBG_CAPTURELOCKER(index) +#define GDIDBG_DUMPHANDLETABLE() +#define GDIDBG_INITLOOPTRACE() +#define GDIDBG_TRACELOOP(Handle, PrevThread, Thread) + +#endif /* GDI_DEBUG */ + Propchange: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Tue May 20 15:39:32 2008 @@ -17,11 +17,6 @@ VOID NTAPI KeRosDumpStackFrames(PULONG, ULONG); //#define GDI_DEBUG - -#ifdef GDI_DEBUG -BOOLEAN STDCALL KiRosPrintAddress(PVOID Address); -NTSYSAPI ULONG NTAPI RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); -#endif #define GDI_ENTRY_TO_INDEX(ht, e) \ (((ULONG_PTR)(e) - (ULONG_PTR)&((ht)->Entries[0])) / sizeof(GDI_TABLE_ENTRY)) @@ -89,151 +84,7 @@ /** DEBUGGING *****************************************************************/ -#ifdef GDI_DEBUG - -static int leak_reported = 0; -#define GDI_STACK_LEVELS 12 -static ULONG GDIHandleAllocator[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; -static ULONG GDIHandleLocker[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; -struct DbgOpenGDIHandle -{ - ULONG idx; - int count; -}; -#define H 1024 -static struct DbgOpenGDIHandle h[H]; - -void IntDumpHandleTable(PGDI_HANDLE_TABLE HandleTable) -{ - int i, n = 0, j, k, J; - - if (leak_reported) - { - DPRINT1("gdi handle abusers already reported!\n"); - return; - } - - leak_reported = 1; - DPRINT1("reporting gdi handle abusers:\n"); - - /* step through GDI handle table and find out who our culprit is... */ - for (i = RESERVE_ENTRIES_COUNT; i < GDI_HANDLE_COUNT; i++) - { - for (j = 0; j < n; j++) - { -next: - J = h[j].idx; - for (k = 0; k < GDI_STACK_LEVELS; k++) - { - if (GDIHandleAllocator[i][k] - != GDIHandleAllocator[J][k]) - { - if (++j == n) - goto done; - else - goto next; - } - } - goto done; - } -done: - if (j < H) - { - if (j == n) - { - h[j].idx = i; - h[j].count = 1; - n = n + 1; - } - else - h[j].count++; - } - } - /* bubble sort time! weeeeee!! */ - for (i = 0; i < n-1; i++) - { - if (h[i].count < h[i+1].count) - { - struct DbgOpenGDIHandle t; - t = h[i+1]; - h[i+1] = h[i]; - j = i; - while (j > 0 && h[j-1].count < t.count) - j--; - h[j] = t; - } - } - /* print the worst offenders... */ - DbgPrint("Worst GDI Handle leak offenders (out of %i unique locations):\n", n); - for (i = 0; i < n && h[i].count > 1; i++) - { - int j; - DbgPrint(" %i allocs: ", h[i].count); - for (j = 0; j < GDI_STACK_LEVELS; j++) - { - ULONG Addr = GDIHandleAllocator[h[i].idx][j]; - if (!KiRosPrintAddress((PVOID)Addr)) - DbgPrint("<%X>", Addr); - } - DbgPrint("\n"); - } - if (i < n && h[i].count == 1) - DbgPrint("(list terminated - the remaining entries have 1 allocation only)\n"); -} - -ULONG -CaptureStackBackTace(PVOID* pFrames, ULONG nFramesToCapture) -{ - ULONG nFrameCount; - - memset(pFrames, 0x00, (nFramesToCapture + 1) * sizeof(PVOID)); - - nFrameCount = RtlCaptureStackBackTrace(1, nFramesToCapture, pFrames, NULL); - - if (nFrameCount < nFramesToCapture) - { - nFrameCount += RtlWalkFrameChain(pFrames + nFrameCount, nFramesToCapture - nFrameCount, 1); - } - - return nFrameCount; -} - -#define GDIDBG_TRACECALLER() \ - DPRINT1("-> called from:\n"); \ - KeRosDumpStackFrames(NULL, 20); -#define GDIDBG_TRACEALLOCATOR(index) \ - DPRINT1("-> allocated from:\n"); \ - KeRosDumpStackFrames(GDIHandleAllocator[index], GDI_STACK_LEVELS); -#define GDIDBG_TRACELOCKER(index) \ - DPRINT1("-> locked from:\n"); \ - KeRosDumpStackFrames(GDIHandleLocker[index], GDI_STACK_LEVELS); -#define GDIDBG_CAPTUREALLOCATOR(index) \ - CaptureStackBackTace((PVOID*)GDIHandleAllocator[index], GDI_STACK_LEVELS); -#define GDIDBG_CAPTURELOCKER(index) \ - CaptureStackBackTace((PVOID*)GDIHandleLocker[index], 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_CAPTUREALLOCATOR(index) -#define GDIDBG_CAPTURELOCKER(index) -#define GDIDBG_DUMPHANDLETABLE() -#define GDIDBG_INITLOOPTRACE() -#define GDIDBG_TRACELOOP(Handle, PrevThread, Thread) - -#endif /* GDI_DEBUG */ - +#include "gdidbg.c" /** INTERNAL FUNCTIONS ********************************************************/ @@ -716,25 +567,19 @@ { if (!Silent) { - if (((ULONG_PTR)PrevProcId & ~0x1) == 0) + if ((Entry->Type & GDI_ENTRY_BASETYPE_MASK) == 0) + { + DPRINT1("Attempted to free gdi handle 0x%x that is already deleted!\n", hObj); + } + else if (((ULONG_PTR)PrevProcId & ~0x1) == 0) { DPRINT1("Attempted to free global gdi handle 0x%x, caller needs to get ownership first!!!\n", hObj); - DPRINT1("Type = 0x%lx, KernelData = 0x%p, ProcessId = 0x%p\n", Entry->Type, Entry->KernelData, Entry->ProcessId); - - /* HACK: Ugly and nasty */ - if ((ULONG_PTR)Entry->KernelData < 0x1000) - { - /* It's a memory-corruption bug (probably?), - overcome it by just saying "yes, object destroyed" */ - DPRINT1("Bad kerneldata!!! Blame Win32k developers!\n"); - return TRUE; - } - } else { DPRINT1("Attempted to free foreign handle: 0x%x Owner: 0x%x from Caller: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)ProcessId & ~0x1); } + DPRINT1("Type = 0x%lx, KernelData = 0x%p, ProcessId = 0x%p\n", Entry->Type, Entry->KernelData, Entry->ProcessId); GDIDBG_TRACECALLER(); GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj)); } @@ -782,6 +627,57 @@ } } +VOID +FASTCALL +IntDeleteHandlesForProcess(struct _EPROCESS *Process, ULONG ObjectType) +{ + PGDI_TABLE_ENTRY Entry, End; + ULONG Index = RESERVE_ENTRIES_COUNT; + HANDLE ProcId; + PW32PROCESS W32Process; + + W32Process = (PW32PROCESS)Process->Win32Process; + ASSERT(W32Process); + + if (W32Process->GDIObjects > 0) + { + ProcId = Process->UniqueProcessId; + + /* FIXME - Instead of building the handle here and delete it using GDIOBJ_FreeObj + we should delete it directly here! */ + + End = &GdiHandleTable->Entries[GDI_HANDLE_COUNT]; + for (Entry = &GdiHandleTable->Entries[RESERVE_ENTRIES_COUNT]; + Entry != End; + Entry++, Index++) + { + /* ignore the lock bit */ + if ( (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcId) + { + if ( (Entry->Type & GDI_ENTRY_BASETYPE_MASK) == ObjectType || + ObjectType == GDI_OBJECT_TYPE_DONTCARE) + { + HGDIOBJ ObjectHandle; + + /* Create the object handle for the entry, the lower(!) 16 bit of the + Type field includes the type of the object including the stock + object flag - but since stock objects don't have a process id we can + simply ignore this fact here. */ + ObjectHandle = (HGDIOBJ)(Index | (Entry->Type << GDI_ENTRY_UPPER_SHIFT)); + + if (GDIOBJ_FreeObjByHandle(ObjectHandle, GDI_OBJECT_TYPE_DONTCARE) && + W32Process->GDIObjects == 0) + { + /* there are no more gdi handles for this process, bail */ + break; + } + } + } + } + } +} + + /*! * Internal function. Called when the process is destroyed to free the remaining GDI handles. * \param Process - PID of the process that will be destroyed. @@ -789,11 +685,7 @@ BOOL INTERNAL_CALL GDI_CleanupForProcess(struct _EPROCESS *Process) { - PGDI_TABLE_ENTRY Entry, End; PEPROCESS CurrentProcess; - PW32PROCESS W32Process; - HANDLE ProcId; - ULONG Index = RESERVE_ENTRIES_COUNT; DPRINT("Starting CleanupForProcess prochandle %x Pid %d\n", Process, Process->UniqueProcessId); CurrentProcess = PsGetCurrentProcess(); @@ -801,46 +693,23 @@ { KeAttachProcess(&Process->Pcb); } - W32Process = (PW32PROCESS)Process->Win32Process; - ASSERT(W32Process); - - if (W32Process->GDIObjects > 0) - { - /* FIXME - Instead of building the handle here and delete it using GDIOBJ_FreeObj - we should delete it directly here! */ - ProcId = Process->UniqueProcessId; - - End = &GdiHandleTable->Entries[GDI_HANDLE_COUNT]; - for (Entry = &GdiHandleTable->Entries[RESERVE_ENTRIES_COUNT]; - Entry != End; - Entry++, Index++) - { - /* ignore the lock bit */ - if ( (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcId && - (Entry->Type & ~GDI_ENTRY_REUSE_MASK) != 0 ) - { - HGDIOBJ ObjectHandle; - - /* Create the object handle for the entry, the lower(!) 16 bit of the - Type field includes the type of the object including the stock - object flag - but since stock objects don't have a process id we can - simply ignore this fact here. */ - ObjectHandle = (HGDIOBJ)(Index | (Entry->Type << GDI_ENTRY_UPPER_SHIFT)); - - if (GDIOBJ_FreeObjByHandle(ObjectHandle, GDI_OBJECT_TYPE_DONTCARE) && - W32Process->GDIObjects == 0) - { - /* there are no more gdi handles for this process, bail */ - break; - } - } - } - } + + /* Delete objects. Begin with types that are not referenced by other types */ + IntDeleteHandlesForProcess(Process, GDILoObjType_LO_DC_TYPE); + IntDeleteHandlesForProcess(Process, GDILoObjType_LO_BRUSH_TYPE); + IntDeleteHandlesForProcess(Process, GDILoObjType_LO_BITMAP_TYPE); + + /* Finally finish with what's left */ + IntDeleteHandlesForProcess(Process, GDI_OBJECT_TYPE_DONTCARE); if (CurrentProcess != Process) { KeDetachProcess(); } + +#ifdef GDI_DEBUG + GdiDbgHTIntegrityCheck(); +#endif DPRINT("Completed cleanup for process %d\n", Process->UniqueProcessId); @@ -1240,11 +1109,12 @@ } } + hObj = (HGDIOBJ)((ULONG)(hObj) | GDI_HANDLE_STOCK_MASK); + *phObj = hObj; + Object->hHmgr = hObj; + /* remove the process id lock and make it global */ (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, GDI_GLOBAL_PROCESS); - - hObj = (HGDIOBJ)((ULONG)(hObj) | GDI_HANDLE_STOCK_MASK); - *phObj = hObj; /* we're done, successfully converted the object */ return TRUE;

1 0

[cfinck] 33617: Create a branch for silverblade's audio work
by cfinck＠svn.reactos.org 20 May '08

20 May '08

Author: cfinck Date: Tue May 20 15:38:22 2008 New Revision: 33617 URL: http://svn.reactos.org/svn/reactos?rev=33617&view=rev Log: Create a branch for silverblade's audio work Added: branches/silverblade-audio/ - copied from r33616, trunk/reactos/

1 0

[mpiulachs] 33616: - Added 'MessageHeader' module type for handling .mc files - turn .mc generated files (RC & Headers) into real dependencies
by mpiulachs＠svn.reactos.org 20 May '08

20 May '08

Author: mpiulachs Date: Tue May 20 14:46:14 2008 New Revision: 33616 URL: http://svn.reactos.org/svn/reactos?rev=33616&view=rev Log: - Added 'MessageHeader' module type for handling .mc files - turn .mc generated files (RC & Headers) into real dependencies Added: trunk/reactos/include/reactos/mc/ trunk/reactos/include/reactos/mc/bugcodes.mc (with props) trunk/reactos/include/reactos/mc/errcodes.mc (with props) trunk/reactos/include/reactos/mc/mc.rbuild (with props) trunk/reactos/include/reactos/mc/ntstatus.mc (with props) Removed: trunk/reactos/dll/ntdll/def/ntstatus.mc trunk/reactos/dll/win32/kernel32/errcodes.mc trunk/reactos/ntoskrnl/bugcodes.mc Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/include/reactos/reactos.rbuild trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… Removed: trunk/reactos/dll/ntdll/def/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntstatus.mc?… Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… Removed: trunk/reactos/dll/win32/kernel32/errcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/errcode… Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Added: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… Added: trunk/reactos/include/reactos/mc/errcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/errcode… Added: trunk/reactos/include/reactos/mc/mc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/mc.rbui… Added: trunk/reactos/include/reactos/mc/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/ntstatu… Modified: trunk/reactos/include/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/reactos.rb… Removed: trunk/reactos/ntoskrnl/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/bugcodes.mc?rev=3… Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=…

1 0

[mpiulachs] 33615: - Add svchost to build
by mpiulachs＠svn.reactos.org 20 May '08

20 May '08

Author: mpiulachs Date: Tue May 20 14:33:00 2008 New Revision: 33615 URL: http://svn.reactos.org/svn/reactos?rev=33615&view=rev Log: - Add svchost to build Modified: trunk/reactos/base/services/services.rbuild trunk/reactos/base/services/svchost/svchost.c trunk/reactos/base/services/svchost/svchost.rbuild Modified: trunk/reactos/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… ============================================================================== --- trunk/reactos/base/services/services.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/services.rbuild [iso-8859-1] Tue May 20 14:33:00 2008 @@ -13,6 +13,9 @@ <directory name="rpcss"> <xi:include href="rpcss/rpcss.rbuild" /> </directory> + <directory name="svchost"> + <xi:include href="svchost/svchost.rbuild" /> + </directory> <directory name="tcpsvcs"> <xi:include href="tcpsvcs/tcpsvcs.rbuild" /> </directory> Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] Tue May 20 14:33:00 2008 @@ -9,6 +9,8 @@ /* INCLUDES ******************************************************************/ #include "svchost.h" + +#define NDEBUG #include <debug.h> #ifdef _MSC_VER Modified: trunk/reactos/base/services/svchost/svchost.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.rbuild [iso-8859-1] Tue May 20 14:33:00 2008 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="svchost" type="win32cui" installbase="system32" installname="svchost.exe"> <include base="svchost">.</include> - <define name="__USE_W32API" /> <library>kernel32</library> <library>advapi32</library> <file>svchost.c</file>

1 0

[dchapyshev] 33614: - Add code for getting language name
by dchapyshev＠svn.reactos.org 20 May '08

20 May '08

Author: dchapyshev Date: Tue May 20 13:02:39 2008 New Revision: 33614 URL: http://svn.reactos.org/svn/reactos?rev=33614&view=rev Log: - Add code for getting language name Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Tue May 20 13:02:39 2008 @@ -281,15 +281,15 @@ HKL hKl; TCHAR szLayoutNum[CCH_ULONG_DEC + 1]; TCHAR szLCID[CCH_LAYOUT_ID + 1]; - TCHAR szName[MAX_PATH]; + TCHAR szLangName[MAX_PATH]; _ultot(uLayoutNum, szLayoutNum, 10); GetLayoutID(szLayoutNum, szLCID); - GetLayoutName(szLayoutNum, szName); CreateTrayIcon(szLCID); // Switch to the new keyboard layout - UpdateTrayIcon(hwnd, szLCID, szName); + GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR)); + UpdateTrayIcon(hwnd, szLCID, szLangName); hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE); EnumWindows(EnumWindowsProc, (LPARAM) hKl); @@ -397,13 +397,6 @@ if (hDllLib) FreeLibrary(hDllLib); } -BOOL CALLBACK -EnumChildProc(HWND hwnd, LPARAM lParam) -{ - SendMessage(hwnd, WM_INPUTLANGCHANGEREQUEST, 0, lParam); - return TRUE; -} - ULONG GetNextLayout() { @@ -438,7 +431,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static HMENU hLeftPopupMenu, hRightPopupMenu; - static TCHAR szLCID[MAX_PATH]; + static TCHAR szLCID[MAX_PATH], szLangName[MAX_PATH]; switch (Message) { @@ -454,7 +447,8 @@ case WM_LANG_CHANGED: { GetLayoutIDByHkl((HKL)lParam, szLCID); - UpdateTrayIcon(hwnd, szLCID, _T("")); + GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR)); + UpdateTrayIcon(hwnd, szLCID, szLangName); } break; @@ -467,7 +461,8 @@ case WM_WINDOW_ACTIVATE: { GetLayoutIDByHkl(GetKeyboardLayout(GetWindowThreadProcessId((HWND)wParam, 0)), szLCID); - UpdateTrayIcon(hwnd, szLCID, _T("")); + GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR)); + UpdateTrayIcon(hwnd, szLCID, szLangName); } break;

1 0

[janderwald] 33613: - monitor device name start with "\\.\\DISPLAY<number>" than with "\\??\\DISPLAY<number>" - implement handling MONITOR_DEFAULTTOPRIMARY in IntGetMonitorsFromRect - implement handling MONITOR_DEFAULTTONULL in NtUserMonitorFromWIndow - ReactOS now passes all user32_winetest monitor tests
by janderwald＠svn.reactos.org 20 May '08

20 May '08

Author: janderwald Date: Tue May 20 10:20:28 2008 New Revision: 33613 URL: http://svn.reactos.org/svn/reactos?rev=33613&view=rev Log: - monitor device name start with "\\.\\DISPLAY<number>" than with "\\??\\DISPLAY<number>" - implement handling MONITOR_DEFAULTTOPRIMARY in IntGetMonitorsFromRect - implement handling MONITOR_DEFAULTTONULL in NtUserMonitorFromWIndow - ReactOS now passes all user32_winetest monitor tests Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Tue May 20 10:20:28 2008 @@ -174,7 +174,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } - _snwprintf(Buffer, CCHDEVICENAME, L"\\??\\DISPLAY%d", DisplayNumber + 1); + _snwprintf(Buffer, CCHDEVICENAME, L"\\\\.\\DISPLAY%d", DisplayNumber + 1); if (!RtlCreateUnicodeString(&Monitor->DeviceName, Buffer)) { DPRINT("Couldn't duplicate monitor name!\n"); @@ -322,7 +322,7 @@ OPTIONAL IN DWORD listSize, OPTIONAL IN DWORD flags) { - PMONITOR_OBJECT Monitor, NearestMonitor = NULL; + PMONITOR_OBJECT Monitor, NearestMonitor = NULL, PrimaryMonitor = NULL; UINT iCount = 0; LONG iNearestDistanceX = 0x7fffffff, iNearestDistanceY = 0x7fffffff; @@ -384,6 +384,11 @@ IntersectionRect = MonitorRect; } + if (flags == MONITOR_DEFAULTTOPRIMARY && Monitor->IsPrimary) + { + PrimaryMonitor = Monitor; + } + if (iCount < listSize) { if (hMonitorList != NULL) @@ -403,7 +408,15 @@ } iCount++; } - + else if (iCount == 0 && flags == MONITOR_DEFAULTTOPRIMARY) + { + if (iCount < listSize) + { + if (hMonitorList != NULL) + hMonitorList[iCount] = PrimaryMonitor->Handle; + } + iCount++; + } return iCount; } @@ -878,7 +891,12 @@ if (!(Window = UserGetWindowObject(hWnd))) { - RETURN(NULL); + if (dwFlags == MONITOR_DEFAULTTONULL) + { + RETURN(hMonitor); + } + IntGetMonitorsFromRect(NULL, &hMonitor, NULL, 1, dwFlags); + RETURN(hMonitor); } Rect.left = Rect.right = Window->Wnd->WindowRect.left;

1 0

[janderwald] 33612: - zero DISPLAY_DEVICEW struct before passing it to NtUserEnumDisplayDevices - copy string the resulting strings on success but on failure - fix 2 memory leaks in EnumDisplayMonitors - fixes a user32_winetest error
by janderwald＠svn.reactos.org 20 May '08

20 May '08

Author: janderwald Date: Tue May 20 09:57:37 2008 New Revision: 33612 URL: http://svn.reactos.org/svn/reactos?rev=33612&view=rev Log: - zero DISPLAY_DEVICEW struct before passing it to NtUserEnumDisplayDevices - copy string the resulting strings on success but on failure - fix 2 memory leaks in EnumDisplayMonitors - fixes a user32_winetest error Modified: trunk/reactos/dll/win32/user32/misc/display.c Modified: trunk/reactos/dll/win32/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/disp… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] Tue May 20 09:57:37 2008 @@ -62,13 +62,14 @@ return FALSE; } + RtlZeroMemory(&DisplayDeviceW, sizeof(DISPLAY_DEVICEW)); DisplayDeviceW.cb = sizeof(DISPLAY_DEVICEW); rc = NtUserEnumDisplayDevices ( &Device, iDevNum, &DisplayDeviceW, dwFlags ); - if (!rc) + if (rc) { /* Copy result from DisplayDeviceW to lpDisplayDevice */ lpDisplayDevice->StateFlags = DisplayDeviceW.StateFlags; @@ -169,6 +170,8 @@ if (iCount <= 0) { /* FIXME: SetLastError() */ + HeapFree(hHeap, 0, hMonitorList); + HeapFree(hHeap, 0, pRectList); return FALSE; } @@ -188,7 +191,8 @@ if (!lpfnEnum(hMonitor, hMonitorDC, pMonitorRect, dwData)) break; } - + HeapFree(hHeap, 0, hMonitorList); + HeapFree(hHeap, 0, pRectList); return TRUE; }

1 0

[gedmurphy] 33611: iterate the number of sections, not the number of directory entries
by gedmurphy＠svn.reactos.org 20 May '08

20 May '08

Author: gedmurphy Date: Tue May 20 09:20:54 2008 New Revision: 33611 URL: http://svn.reactos.org/svn/reactos?rev=33611&view=rev Log: iterate the number of sections, not the number of directory entries Modified: trunk/reactos/tools/pefixup.c Modified: trunk/reactos/tools/pefixup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pefixup.c?rev=33611&… ============================================================================== --- trunk/reactos/tools/pefixup.c [iso-8859-1] (original) +++ trunk/reactos/tools/pefixup.c [iso-8859-1] Tue May 20 09:20:54 2008 @@ -201,7 +201,7 @@ unsigned int i; for (i = 0, section_header = IMAGE_FIRST_SECTION(nt_header); - i < dtohl(nt_header->OptionalHeader.NumberOfRvaAndSizes); + i < dtohl(nt_header->FileHeader.NumberOfSections); i++, section_header++) { if (rva >= dtohl(section_header->VirtualAddress) &&

1 0

[janderwald] 33610: - remove unneeded cast in GetClipboardData - use WideCharToMultiByte instead of RtlUnicodeStringToAnsiString - fix memory leak in GetClipboardFormatNameA - ReactOS now passes all user32_winetest.exe clipboard test (previously 2 failures)
by janderwald＠svn.reactos.org 20 May '08

20 May '08

Author: janderwald Date: Tue May 20 08:42:17 2008 New Revision: 33610 URL: http://svn.reactos.org/svn/reactos?rev=33610&view=rev Log: - remove unneeded cast in GetClipboardData - use WideCharToMultiByte instead of RtlUnicodeStringToAnsiString - fix memory leak in GetClipboardFormatNameA - ReactOS now passes all user32_winetest.exe clipboard test (previously 2 failures) Modified: trunk/reactos/dll/win32/user32/windows/clipboard.c Modified: trunk/reactos/dll/win32/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] Tue May 20 08:42:17 2008 @@ -93,7 +93,7 @@ hGlobal = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, size); pGlobal = GlobalLock(hGlobal); - size = (DWORD)NtUserGetClipboardData(uFormat, (DWORD)pGlobal); + size = (DWORD)NtUserGetClipboardData(uFormat, pGlobal); GlobalUnlock(hGlobal); } @@ -114,12 +114,7 @@ { LPWSTR lpBuffer; UNICODE_STRING FormatName; - ANSI_STRING FormatNameA; INT Length; - ANSI_STRING ClassName; - - ClassName.MaximumLength = cchMaxCount; - ClassName.Buffer = lpszFormatName; lpBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, cchMaxCount * sizeof(WCHAR)); if (!lpBuffer) @@ -137,16 +132,16 @@ if (Length != 0) { - FormatNameA.Length = 0; - FormatNameA.MaximumLength = cchMaxCount; - FormatNameA.Buffer = lpszFormatName; - - RtlUnicodeStringToAnsiString(&FormatNameA, &FormatName, FALSE); - - return FormatNameA.Length; + if (!WideCharToMultiByte(CP_ACP, 0, lpBuffer, Length, lpszFormatName, cchMaxCount, NULL, NULL)) + { + /* clear result string */ + lpszFormatName[0] = '\0'; + Length = 0; + } } - return 0; + RtlFreeHeap(RtlGetProcessHeap(), 0, lpBuffer); + return Length; } /*

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008