Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 24987: - Client IDs were OK, I incorrectly assumed they weren't due to the concidence they were equal to the thead/process handles. Actual bug was NtDebugContinue not accepting a valid status value. This is fixed now.
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 12:30:07 2006 New Revision: 24987 URL: http://svn.reactos.org/svn/reactos?rev=24987&view=rev Log: - Client IDs were OK, I incorrectly assumed they weren't due to the concidence they were equal to the thead/process handles. Actual bug was NtDebugContinue not accepting a valid status value. This is fixed now. Modified: trunk/reactos/ntoskrnl/dbgk/debug.c Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Thu Nov 30 12:30:07 2006 @@ -1517,7 +1517,8 @@ } /* Make sure that the status is valid */ - if ((ContinueStatus != DBG_EXCEPTION_NOT_HANDLED) && + if ((ContinueStatus != DBG_CONTINUE) && + (ContinueStatus != DBG_EXCEPTION_NOT_HANDLED) && (ContinueStatus != DBG_REPLY_LATER) && (ContinueStatus != DBG_UNABLE_TO_PROVIDE_HANDLE) && (ContinueStatus != DBG_TERMINATE_THREAD) &&

1 0

[ion] 24986: - Fix some bugs in NtWaitForDebugEvent which caused debug events to be sent in the wrong order and also more then one event to be sent at the same time (and thus some events skipped). - Test app now properly receives the "create process" event along with valid process/thread handles and the image base. No file handle sent yet because of the I/O Manager File Object bug. - There's still a bug in NtContinueDebugEvent due to wrong Client IDs being sent.
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 12:22:07 2006 New Revision: 24986 URL: http://svn.reactos.org/svn/reactos?rev=24986&view=rev Log: - Fix some bugs in NtWaitForDebugEvent which caused debug events to be sent in the wrong order and also more then one event to be sent at the same time (and thus some events skipped). - Test app now properly receives the "create process" event along with valid process/thread handles and the image base. No file handle sent yet because of the I/O Manager File Object bug. - There's still a bug in NtContinueDebugEvent due to wrong Client IDs being sent. Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c trunk/reactos/ntoskrnl/dbgk/dbgkutil.c trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dbg/dbgui.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/dbg/dbgui.c (original) +++ trunk/reactos/dll/ntdll/dbg/dbgui.c Thu Nov 30 12:22:07 2006 @@ -243,7 +243,7 @@ break; /* DLL Load */ - case DbgLoadDllStateChange : + case DbgLoadDllStateChange: /* Set the Win32 debug code */ DebugEvent->dwDebugEventCode = LOAD_DLL_DEBUG_EVENT; @@ -261,9 +261,9 @@ /* Open the thread */ InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); Status = NtOpenThread(&ThreadHandle, - THREAD_QUERY_INFORMATION, - &ObjectAttributes, - &WaitStateChange->AppClientId); + THREAD_QUERY_INFORMATION, + &ObjectAttributes, + &WaitStateChange->AppClientId); if (NT_SUCCESS(Status)) { /* Query thread information */ Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Thu Nov 30 12:22:07 2006 @@ -39,14 +39,12 @@ NULL); /* Open the file */ - DPRINT1("Trying to open: %wZ\n", &FileName->Name); Status = ZwOpenFile(&Handle, GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); - DPRINT1("Status: %lx\n", Status); /* Free the name and return the handle if we succeeded */ ExFreePool(FileName); Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Thu Nov 30 12:22:07 2006 @@ -51,7 +51,6 @@ DBGKTRACE(DBGK_MESSAGE_DEBUG, "Process: %p Thread: %p Message: %p Flags: %lx\n", Process, Thread, Message, Flags); - DBGKTRACE(DBGK_MESSAGE_DEBUG, "MessageType: %lx\n", Message->ApiNumber); /* Check if we have to allocate a debug event */ NewEvent = (Flags & 2) ? TRUE : FALSE; @@ -134,6 +133,8 @@ if (!DebugObject->DebuggerInactive) { /* Add the event into the object's list */ + DBGKTRACE(DBGK_MESSAGE_DEBUG, "Inserting: %lx %p\n", + DebugEvent, Message->ApiNumber); InsertTailList(&DebugObject->EventList, &DebugEvent->EventList); /* Check if we have to signal it */ @@ -653,17 +654,14 @@ if (First) { /* So we'll start with the create process message */ - DPRINT1("new proces!\n"); ApiMessage.ApiNumber = DbgKmCreateProcessApi; /* Get the file handle */ - DPRINT1("section object: %p\n", Process->SectionObject); if (Process->SectionObject) { /* Use the section object */ CreateProcess->FileHandle = DbgkpSectionToFileHandle(Process->SectionObject); - DPRINT1("FileHandle: %p\n", CreateProcess->FileHandle); } else { @@ -672,9 +670,7 @@ } /* Set the base address */ - DPRINT1("SectionBaseAddress: %p\n", Process->SectionBaseAddress); CreateProcess->BaseOfImage = Process->SectionBaseAddress; - KEBUGCHECK(0); /* Get the NT Header */ NtHeader = RtlImageNtHeader(Process->SectionBaseAddress); @@ -803,6 +799,8 @@ DbgkpConvertKernelToUserStateChange(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange, IN PDEBUG_EVENT DebugEvent) { + DBGKTRACE(DBGK_OBJECT_DEBUG, "DebugEvent: %p\n", DebugEvent); + /* Start by copying the client ID */ WaitStateChange->AppClientId = DebugEvent->ClientId; @@ -954,8 +952,8 @@ HANDLE Handle; PHANDLE DupHandle; PAGED_CODE(); - DBGKTRACE(DBGK_OBJECT_DEBUG, "Process: %p Thread: %p\n", - Process, Thread); + DBGKTRACE(DBGK_OBJECT_DEBUG, "Process: %p Thread: %p State: %lx\n", + Process, Thread, WaitStateChange->NewState); /* Check which state this is */ switch (WaitStateChange->NewState) @@ -1272,11 +1270,12 @@ { /* Get the debug event */ DebugEvent = CONTAINING_RECORD(NextEntry, DEBUG_EVENT, EventList); - DBGKTRACE(DBGK_PROCESS_DEBUG, "DebugEvent: %p Flags: %lx\n", - DebugEvent, DebugEvent->Flags); + DBGKTRACE(DBGK_PROCESS_DEBUG, "DebugEvent: %p Flags: %lx TH: %p/%p\n", + DebugEvent, DebugEvent->Flags, + DebugEvent->BackoutThread, PsGetCurrentThread()); /* Check for if the debug event queue needs flushing */ - if ((DebugEvent->Flags & 4) & + if ((DebugEvent->Flags & 4) && (DebugEvent->BackoutThread == PsGetCurrentThread())) { /* Get the event's thread */ @@ -1905,6 +1904,8 @@ DebugEvent = CONTAINING_RECORD(NextEntry, DEBUG_EVENT, EventList); + DBGKTRACE(DBGK_PROCESS_DEBUG, "DebugEvent: %p Flags: %lx\n", + DebugEvent, DebugEvent->Flags); /* Check flags */ if (!(DebugEvent->Flags & (4 | 1))) @@ -1973,7 +1974,7 @@ if (!NT_SUCCESS(Status)) break; /* Check if we got an event */ - if (GotEvent) + if (!GotEvent) { /* Check if we can wait again */ if (!SafeTimeOut.QuadPart) Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Thu Nov 30 12:22:07 2006 @@ -929,6 +929,10 @@ if (!LocalInfo) return STATUS_INSUFFICIENT_RESOURCES; /* Query the name */ + DPRINT("Do. Drv, DrvName: %p %p %wZ\n", + FileObject->DeviceObject, + FileObject->DeviceObject->DriverObject, + &FileObject->DeviceObject->DriverObject->DriverName); Status = ObQueryNameString(FileObject->DeviceObject, LocalInfo, Length, @@ -943,7 +947,7 @@ /* Copy the information */ RtlCopyMemory(ObjectNameInfo, LocalInfo, - LocalReturnLength > Length ? + (LocalReturnLength > Length) ? Length : LocalReturnLength); /* Set buffer pointer */

1 0

[ion] 24985: - Fix DbgkSectionHandleToFileHandle. - Implement MmGetFileNameForSection. - There is a bug in ObQueryNameString for file objects, so the full name isn't returned...
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 08:22:20 2006 New Revision: 24985 URL: http://svn.reactos.org/svn/reactos?rev=24985&view=rev Log: - Fix DbgkSectionHandleToFileHandle. - Implement MmGetFileNameForSection. - There is a bug in ObQueryNameString for file objects, so the full name isn't returned... Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Thu Nov 30 08:22:20 2006 @@ -19,7 +19,7 @@ DbgkpSectionToFileHandle(IN PVOID Section) { NTSTATUS Status; - UNICODE_STRING FileName; + POBJECT_NAME_INFORMATION FileName; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; HANDLE Handle; @@ -31,7 +31,7 @@ /* Initialize object attributes */ InitializeObjectAttributes(&ObjectAttributes, - &FileName, + &FileName->Name, OBJ_CASE_INSENSITIVE | OBJ_FORCE_ACCESS_CHECK | OBJ_KERNEL_HANDLE, @@ -39,15 +39,17 @@ NULL); /* Open the file */ + DPRINT1("Trying to open: %wZ\n", &FileName->Name); Status = ZwOpenFile(&Handle, GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); + DPRINT1("Status: %lx\n", Status); /* Free the name and return the handle if we succeeded */ - ExFreePool(FileName.Buffer); + ExFreePool(FileName); if (!NT_SUCCESS(Status)) return NULL; return Handle; } @@ -91,7 +93,8 @@ ULONG ProcessFlags; IMAGE_INFO ImageInfo; PIMAGE_NT_HEADERS NtHeader; - UNICODE_STRING ModuleName; + POBJECT_NAME_INFORMATION ModuleName; + UNICODE_STRING NtDllName; NTSTATUS Status; PVOID DebugPort; DBGKM_MSG ApiMessage; @@ -130,10 +133,10 @@ if (NT_SUCCESS(Status)) { /* Call the notify routines and free the name */ - PspRunLoadImageNotifyRoutines(&ModuleName, + PspRunLoadImageNotifyRoutines(&ModuleName->Name, Process->UniqueProcessId, &ImageInfo); - ExFreePool(ModuleName.Buffer); + ExFreePool(ModuleName); } else { @@ -160,9 +163,9 @@ } /* Call the notify routines */ - RtlInitUnicodeString(&ModuleName, + RtlInitUnicodeString(&NtDllName, L"\\SystemRoot\\System32\\ntdll.dll"); - PspRunLoadImageNotifyRoutines(&ModuleName, + PspRunLoadImageNotifyRoutines(&NtDllName, Process->UniqueProcessId, &ImageInfo); } Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Thu Nov 30 08:22:20 2006 @@ -653,14 +653,17 @@ if (First) { /* So we'll start with the create process message */ + DPRINT1("new proces!\n"); ApiMessage.ApiNumber = DbgKmCreateProcessApi; /* Get the file handle */ + DPRINT1("section object: %p\n", Process->SectionObject); if (Process->SectionObject) { /* Use the section object */ CreateProcess->FileHandle = DbgkpSectionToFileHandle(Process->SectionObject); + DPRINT1("FileHandle: %p\n", CreateProcess->FileHandle); } else { @@ -669,7 +672,9 @@ } /* Set the base address */ + DPRINT1("SectionBaseAddress: %p\n", Process->SectionBaseAddress); CreateProcess->BaseOfImage = Process->SectionBaseAddress; + KEBUGCHECK(0); /* Get the NT Header */ NtHeader = RtlImageNtHeader(Process->SectionBaseAddress); Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Nov 30 08:22:20 2006 @@ -1326,7 +1326,7 @@ NTAPI MmGetFileNameForSection( IN PROS_SECTION_OBJECT Section, - OUT PUNICODE_STRING ModuleName + OUT POBJECT_NAME_INFORMATION *ModuleName ); PVOID Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Thu Nov 30 08:22:20 2006 @@ -109,10 +109,40 @@ NTSTATUS NTAPI MmGetFileNameForSection(IN PROS_SECTION_OBJECT Section, - OUT PUNICODE_STRING ModuleName) -{ - /* FIXME: TODO. ObQueryNameString on the FileObject */ - RtlCreateUnicodeString(ModuleName, L"C:\\ReactOS\\system32\\ntdll.dll"); + OUT POBJECT_NAME_INFORMATION *ModuleName) +{ + POBJECT_NAME_INFORMATION ObjectNameInfo; + NTSTATUS Status; + ULONG ReturnLength; + + /* Make sure it's an image section */ + *ModuleName = NULL; + if (!(Section->AllocationAttributes & SEC_IMAGE)) + { + /* It's not, fail */ + return STATUS_SECTION_NOT_IMAGE; + } + + /* Allocate memory for our structure */ + ObjectNameInfo = ExAllocatePoolWithTag(PagedPool, + 1024, + TAG('M', 'm', ' ', ' ')); + if (!ObjectNameInfo) return STATUS_NO_MEMORY; + + /* Query the name */ + Status = ObQueryNameString(Section->FileObject, + ObjectNameInfo, + 1024, + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + /* Failed, free memory */ + ExFreePool(ObjectNameInfo); + return Status; + } + + /* Success */ + *ModuleName = ObjectNameInfo; return STATUS_SUCCESS; }

1 0

[ion] 24984: - Fix a bug in NtWaitForDebugEvent. - Dbgk kindaaaa works now, as a proof-of-concept more then anything else since some helper Mm routines are missing. Still have some bugs to fix, but connecting, attaching and waiting on events seems not to crash anymore (And returns partially valid data).
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 07:52:22 2006 New Revision: 24984 URL: http://svn.reactos.org/svn/reactos?rev=24984&view=rev Log: - Fix a bug in NtWaitForDebugEvent. - Dbgk kindaaaa works now, as a proof-of-concept more then anything else since some helper Mm routines are missing. Still have some bugs to fix, but connecting, attaching and waiting on events seems not to crash anymore (And returns partially valid data). Modified: trunk/reactos/ntoskrnl/dbgk/debug.c Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Thu Nov 30 07:52:22 2006 @@ -1868,8 +1868,6 @@ PreviousMode, Alertable, Timeout); - - /* Start the wait loop */ while (TRUE) { if (!NT_SUCCESS(Status) || @@ -1988,10 +1986,11 @@ DbgkpOpenHandles(&WaitStateChange, Process, Thread); ObDereferenceObject(Process); ObDereferenceObject(Thread); - } - } - - /* We're, dereference the object */ + break; + } + } + + /* We're done, dereference the object */ ObDereferenceObject(DebugObject); /* Protect write with SEH */

1 0

[ion] 24983: - Implement an unhandled case in DbgkSetProcessDebugPort. The event queue is now properly parsed during connect and the event is signaled to start flushing the queue. - Still got some bugs, but attach works...
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 07:45:01 2006 New Revision: 24983 URL: http://svn.reactos.org/svn/reactos?rev=24983&view=rev Log: - Implement an unhandled case in DbgkSetProcessDebugPort. The event queue is now properly parsed during connect and the event is signaled to start flushing the queue. - Still got some bugs, but attach works... Modified: trunk/reactos/ntoskrnl/dbgk/debug.c Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Thu Nov 30 07:45:01 2006 @@ -1151,9 +1151,11 @@ { NTSTATUS Status; LIST_ENTRY TempList; - BOOLEAN GlobalHeld = FALSE; + BOOLEAN GlobalHeld = FALSE, DoSetEvent = TRUE; PETHREAD ThisThread, FirstThread; PLIST_ENTRY NextEntry; + PDEBUG_EVENT DebugEvent; + PETHREAD EventThread; PAGED_CODE(); DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p DebugObject: %p\n", Process, DebugObject); @@ -1263,10 +1265,69 @@ NextEntry = DebugObject->EventList.Flink; while (NextEntry != &DebugObject->EventList) { - DPRINT1("Next Entry: %p\n", NextEntry); - DPRINT1("List: %p\n", &DebugObject->EventList); - /* FIXME: TODO */ - KEBUGCHECK(0); + /* Get the debug event */ + DebugEvent = CONTAINING_RECORD(NextEntry, DEBUG_EVENT, EventList); + DBGKTRACE(DBGK_PROCESS_DEBUG, "DebugEvent: %p Flags: %lx\n", + DebugEvent, DebugEvent->Flags); + + /* Check for if the debug event queue needs flushing */ + if ((DebugEvent->Flags & 4) & + (DebugEvent->BackoutThread == PsGetCurrentThread())) + { + /* Get the event's thread */ + EventThread = DebugEvent->Thread; + DBGKTRACE(DBGK_PROCESS_DEBUG, "EventThread: %p MsgStatus: %lx\n", + EventThread, MsgStatus); + + /* Check if the status is success */ + if ((MsgStatus == STATUS_SUCCESS) && + (EventThread->GrantedAccess) && + (!EventThread->SystemThread)) + { + /* Check if we couldn't acquire rundown for it */ + if (DebugEvent->Flags & 0x10) + { + /* Set busy flag */ + InterlockedOr(&DebugEvent->Flags, 0x100); + } + else + { + /* Do we need to signal the event */ + if (DoSetEvent) + { + /* Do it */ + DebugEvent->Flags &= ~4; + KeSetEvent(&DebugObject->EventsPresent, + IO_NO_INCREMENT, + FALSE); + DoSetEvent = FALSE; + } + + /* Clear the backout thread */ + DebugEvent->BackoutThread = NULL; + + /* Set flag */ + InterlockedOr(&DebugEvent->Flags, 0x80); + } + } + else + { + /* FIXME: TODO */ + DPRINT1("Unhandled dbgk path!\n"); + KEBUGCHECK(0); + } + + /* Check if the lock is held */ + if (DebugEvent->Flags & 8) + { + /* Release it */ + DebugEvent->Flags &= ~8; + ExReleaseRundownProtection(&EventThread->RundownProtect); + } + } + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; } /* Release the debug object */

1 0

[greatlrd] 24982: forgot this file
by greatlrd＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: greatlrd Date: Thu Nov 30 07:35:10 2006 New Revision: 24982 URL: http://svn.reactos.org/svn/reactos?rev=24982&view=rev Log: forgot this file Added: trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c (with props) Added: trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/callback… ============================================================================== --- trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c (added) +++ trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c Thu Nov 30 07:35:10 2006 @@ -1,0 +1,93 @@ +/* $Id: main.c 21434 2006-04-01 19:12:56Z greatlrd $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/ddraw/ddraw.c + * PURPOSE: DirectDraw Library + * PROGRAMMER: Magnus Olsen (greatlrd) + * + */ + +#include <windows.h> +#include "rosdraw.h" +#include "d3dhal.h" +#include "ddrawgdi.h" + + +DWORD CALLBACK HelDdSurfAddAttachedSurface(LPDDHAL_ADDATTACHEDSURFACEDATA lpDestroySurface) +{ + DX_STUB; +} + +DWORD CALLBACK HelDdSurfBlt(LPDDHAL_BLTDATA lpBltData) +{ + DX_STUB; +} + +DWORD CALLBACK HelDdSurfDestroySurface(LPDDHAL_DESTROYSURFACEDATA lpDestroySurfaceData) +{ + DX_STUB; +} + +DWORD CALLBACK HelDdSurfFlip(LPDDHAL_FLIPDATA lpFlipData) +{ + DX_STUB; +} + +DWORD CALLBACK HelDdSurfGetBltStatus(LPDDHAL_GETBLTSTATUSDATA lpGetBltStatusData) +{ + DX_STUB; +} + +DWORD CALLBACK HelDdSurfGetFlipStatus(LPDDHAL_GETFLIPSTATUSDATA lpGetFlipStatusData) +{ + DX_STUB; +} + +DWORD CALLBACK HelDdSurfLock(LPDDHAL_LOCKDATA lpLockData) +{ + DX_STUB; +} + + +DWORD CALLBACK HelDdSurfreserved4(DWORD *lpPtr) +{ + /* + This api is not doucment by MS So I leave it + as stub. + */ + + DX_STUB; +} + +DWORD CALLBACK HelDdSurfSetClipList(LPDDHAL_SETCLIPLISTDATA lpSetClipListData) +{ + DX_STUB; +} + +DWORD CALLBACK HelDdSurfSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKeyData) +{ + DX_STUB; +} + + +DWORD CALLBACK HelDdSurfSetOverlayPosition(LPDDHAL_SETOVERLAYPOSITIONDATA lpSetOverlayPositionData) +{ + DX_STUB; +} + +DWORD CALLBACK HelDdSurfSetPalette(LPDDHAL_SETPALETTEDATA lpSetPaletteData) +{ + DX_STUB; +} + +DWORD CALLBACK HelDdSurfUnlock(LPDDHAL_UNLOCKDATA lpUnLockData) +{ + DX_STUB; +} + +DWORD CALLBACK HelDdSurfUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA lpUpDateOveryLayData) +{ + DX_STUB; +} + Propchange: trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ion] 24981: - Forgot to actually initialize Dbgk during system initialization, so any API would crash. - Fix some stupid bugs in NtCreateDebugObject. - Add tracing framework and add tracing to all of debug.c. - Dbgk *almost* works: http://www.tinykrnl.org/dbgworking.png. Here I attach to services.exe and the kernel is sending notifications for all threads and DLLs loaded.
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 07:16:35 2006 New Revision: 24981 URL: http://svn.reactos.org/svn/reactos?rev=24981&view=rev Log: - Forgot to actually initialize Dbgk during system initialization, so any API would crash. - Fix some stupid bugs in NtCreateDebugObject. - Add tracing framework and add tracing to all of debug.c. - Dbgk *almost* works: http://www.tinykrnl.org/dbgworking.png. Here I attach to services.exe and the kernel is sending notifications for all threads and DLLs loaded. Modified: trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/dbgk.h trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Thu Nov 30 07:16:35 2006 @@ -14,6 +14,7 @@ POBJECT_TYPE DbgkDebugObjectType; FAST_MUTEX DbgkpProcessDebugPortMutex; +ULONG DbgkpTraceLevel = -1; GENERIC_MAPPING DbgkDebugObjectMapping = { @@ -47,6 +48,10 @@ NTSTATUS Status; BOOLEAN NewEvent; PAGED_CODE(); + DBGKTRACE(DBGK_MESSAGE_DEBUG, + "Process: %p Thread: %p Message: %p Flags: %lx\n", + Process, Thread, Message, Flags); + DBGKTRACE(DBGK_MESSAGE_DEBUG, "MessageType: %lx\n", Message->ApiNumber); /* Check if we have to allocate a debug event */ NewEvent = (Flags & 2) ? TRUE : FALSE; @@ -191,6 +196,7 @@ } /* Return status */ + DBGKTRACE(DBGK_MESSAGE_DEBUG, "Status: %lx\n", Status); return Status; } @@ -240,6 +246,7 @@ { NTSTATUS Status; PAGED_CODE(); + DBGKTRACE(DBGK_MESSAGE_DEBUG, "ApiMsg: %p Flags: %lx\n", ApiMsg, Flags); /* Suspend process if required */ if (Flags) DbgkpSuspendProcess(); @@ -272,6 +279,7 @@ { PDEBUG_OBJECT DebugObject; PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p Parent: %p\n", Process, Parent); /* Clear this process's port */ Process->DebugPort = NULL; @@ -318,6 +326,8 @@ PVOID Port; BOOLEAN UseLpc = FALSE; PAGED_CODE(); + DBGKTRACE(DBGK_EXCEPTION_DEBUG, + "ExceptionRecord: %p Port: %p\n", ExceptionRecord, DebugPort); /* Setup the API Message */ ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | @@ -379,6 +389,7 @@ { PHANDLE Handle = NULL; PAGED_CODE(); + DBGKTRACE(DBGK_OBJECT_DEBUG, "DebugEvent: %p\n", DebugEvent); /* Check if this event had a file handle */ switch (DebugEvent->ApiMsg.ApiNumber) @@ -414,6 +425,7 @@ { PETHREAD Thread = DebugEvent->Thread; PAGED_CODE(); + DBGKTRACE(DBGK_OBJECT_DEBUG, "DebugEvent: %p\n", DebugEvent); /* Check if we have to wake the thread */ if (DebugEvent->Flags & 20) PsResumeThread(Thread, NULL); @@ -457,6 +469,8 @@ IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p Thread: %p DebugObject: %p\n", + Process, Thread, DebugObject); /* Quit if there's no PEB */ if (!Peb) return STATUS_SUCCESS; @@ -492,6 +506,10 @@ PointerToSymbolTable; LoadDll->DebugInfoSize = NtHeader->FileHeader.NumberOfSymbols; } + + /* Trace */ + DBGKTRACE(DBGK_PROCESS_DEBUG, "Name: %wZ. Base: %p\n", + &LdrEntry->FullDllName, LdrEntry->DllBase); /* Get the name of the DLL */ Status = MmGetFileNameForAddress(NtHeader, &ModuleName); @@ -561,6 +579,8 @@ BOOLEAN First; PIMAGE_NT_HEADERS NtHeader; PAGED_CODE(); + DBGKTRACE(DBGK_THREAD_DEBUG, "Process: %p StartThread: %p Object: %p\n", + Process, StartThread, DebugObject); /* Check if we have a start thread */ if (StartThread) @@ -668,6 +688,12 @@ ApiMessage.ApiNumber = DbgKmCreateThreadApi; CreateThread->StartAddress = ThisThread->StartAddress; } + + /* Trace */ + DBGKTRACE(DBGK_THREAD_DEBUG, "Thread: %p. First: %lx, OldThread: %p\n", + ThisThread, First, OldThread); + DBGKTRACE(DBGK_THREAD_DEBUG, "Start Address: %p\n", + ThisThread->StartAddress); /* Queue the message */ Status = DbgkpQueueMessage(Process, @@ -726,6 +752,8 @@ PETHREAD ReturnThread = NULL; NTSTATUS Status; PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p DebugObject: %p\n", + Process, DebugObject); /* Attach to the process */ KeStackAttachProcess(&Process->Pcb, &ApcState); @@ -883,6 +911,7 @@ { KAPC_STATE ApcState; PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p\n", Process); /* Acquire process rundown */ if (!ExAcquireRundownProtection(&Process->RundownProtect)) return; @@ -920,6 +949,8 @@ HANDLE Handle; PHANDLE DupHandle; PAGED_CODE(); + DBGKTRACE(DBGK_OBJECT_DEBUG, "Process: %p Thread: %p\n", + Process, Thread); /* Check which state this is */ switch (WaitStateChange->NewState) @@ -1035,6 +1066,8 @@ BOOLEAN DebugPortCleared = FALSE; PLIST_ENTRY DebugEventList; PDEBUG_EVENT DebugEvent; + DBGKTRACE(DBGK_OBJECT_DEBUG, "OwnerProcess: %p DebugObject: %p\n", + OwnerProcess, DebugObject); /* If this isn't the last handle, do nothing */ if (HandleCount > 1) return; @@ -1122,6 +1155,8 @@ PETHREAD ThisThread, FirstThread; PLIST_ENTRY NextEntry; PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p DebugObject: %p\n", + Process, DebugObject); /* Initialize the temporary list */ InitializeListHead(&TempList); @@ -1228,6 +1263,8 @@ NextEntry = DebugObject->EventList.Flink; while (NextEntry != &DebugObject->EventList) { + DPRINT1("Next Entry: %p\n", NextEntry); + DPRINT1("List: %p\n", &DebugObject->EventList); /* FIXME: TODO */ KEBUGCHECK(0); } @@ -1260,6 +1297,8 @@ IN PDEBUG_OBJECT SourceDebugObject) { /* FIXME: TODO */ + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p DebugObject: %p\n", + Process, SourceDebugObject); return STATUS_UNSUCCESSFUL; } @@ -1330,7 +1369,7 @@ ObjectAttributes, PreviousMode, NULL, - sizeof(PDEBUG_OBJECT), + sizeof(DEBUG_OBJECT), 0, 0, (PVOID*)&DebugObject); @@ -1343,7 +1382,9 @@ InitializeListHead(&DebugObject->EventList); /* Initialize the Debug Object's Wait Event */ - KeInitializeEvent(&DebugObject->EventsPresent, NotificationEvent, 0); + KeInitializeEvent(&DebugObject->EventsPresent, + NotificationEvent, + FALSE); /* Set the Flags */ DebugObject->KillProcessOnExit = KillProcessOnExit; @@ -1355,9 +1396,6 @@ 0, NULL, &hDebug); - ObDereferenceObject(DebugObject); - - /* Check for success and return handle */ if (NT_SUCCESS(Status)) { _SEH_TRY @@ -1372,6 +1410,8 @@ } /* Return Status */ + DBGKTRACE(DBGK_OBJECT_DEBUG, "Handle: %p DebugObject: %p\n", + hDebug, DebugObject); return Status; } @@ -1389,6 +1429,8 @@ BOOLEAN NeedsWake = FALSE; CLIENT_ID ClientId; PAGED_CODE(); + DBGKTRACE(DBGK_OBJECT_DEBUG, "Handle: %p Status: %p\n", + DebugHandle, ContinueStatus); /* Check if we were called from user mode*/ if (PreviousMode != KernelMode) @@ -1513,6 +1555,9 @@ KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); PETHREAD LastThread; NTSTATUS Status; + PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p Handle: %p\n", + ProcessHandle, DebugHandle); /* Reference the process */ Status = ObReferenceObjectByHandle(ProcessHandle, @@ -1576,6 +1621,9 @@ PDEBUG_OBJECT DebugObject; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); NTSTATUS Status; + PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p Handle: %p\n", + ProcessHandle, DebugHandle); /* Reference the process */ Status = ObReferenceObjectByHandle(ProcessHandle, @@ -1705,6 +1753,8 @@ NTSTATUS Status = STATUS_SUCCESS; PDEBUG_EVENT DebugEvent, DebugEvent2; PLIST_ENTRY ListHead, NextEntry; + PAGED_CODE(); + DBGKTRACE(DBGK_OBJECT_DEBUG, "Handle: %p\n", DebugHandle); /* Clear the initial wait state change structure */ RtlZeroMemory(&WaitStateChange, sizeof(WaitStateChange)); Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=249… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Nov 30 07:16:35 2006 @@ -792,6 +792,9 @@ /* Initialize the Process Manager */ if (!PsInitSystem()) KEBUGCHECK(PROCESS_INITIALIZATION_FAILED); + /* Initialize the User-Mode Debugging Subsystem */ + DbgkInitialize(); + /* Calculate the tick count multiplier */ ExpTickCountMultiplier = ExComputeTickCountMultiplier(KeMaximumIncrement); SharedUserData->TickCountMultiplier = ExpTickCountMultiplier; Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/dbgk.h (original) +++ trunk/reactos/ntoskrnl/include/internal/dbgk.h Thu Nov 30 07:16:35 2006 @@ -1,5 +1,57 @@ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_DBGK_H -#define __NTOSKRNL_INCLUDE_INTERNAL_DBGK_H +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/include/dbgk.h + * PURPOSE: Internal header for the User-Mode Debugging Backend + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +// +// Define this if you want debugging support +// +#define _DBGK_DEBUG_ 0x01 + +// +// These define the Debug Masks Supported +// +#define DBGK_THREAD_DEBUG 0x01 +#define DBGK_PROCESS_DEBUG 0x02 +#define DBGK_OBJECT_DEBUG 0x04 +#define DBGK_MESSAGE_DEBUG 0x08 +#define DBGK_EXCEPTION_DEBUG 0x10 + +// +// Debug/Tracing support +// +#if _DBGK_DEBUG_ +#ifdef NEW_DEBUG_SYSTEM_IMPLEMENTED // enable when Debug Filters are implemented +#define DBGKTRACE(x, ...) \ + { \ + DbgPrintEx("%s [%.16s] - ", \ + __FUNCTION__, \ + PsGetCurrentProcess()->ImageFileName); \ + DbgPrintEx(__VA_ARGS__); \ + } +#else +#define DBGKTRACE(x, ...) \ + if (x & DbgkpTraceLevel) \ + { \ + DbgPrint("%s [%.16s] - ", \ + __FUNCTION__, \ + PsGetCurrentProcess()->ImageFileName); \ + DbgPrint(__VA_ARGS__); \ + } +#endif +#else +#define DBGKTRACE(x, ...) DPRINT(__VA_ARGS__); +#endif + +VOID +INIT_FUNCTION +NTAPI +DbgkInitialize( + VOID +); VOID NTAPI @@ -82,6 +134,5 @@ ); extern POBJECT_TYPE DbgkDebugObjectType; -#endif /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Thu Nov 30 07:16:35 2006 @@ -1,10 +1,10 @@ /* -* PROJECT: ReactOS Kernel -* LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/include/ps.h -* PURPOSE: Internal header for the Process Manager -* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) -*/ + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/include/ps.h + * PURPOSE: Internal header for the Process Manager + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ // // Define this if you want debugging support

1 0

[ion] 24980: - Implement DbgkPostFakeThreadMessages. - Add Dbgk-calls to NtMap/UnmapViewOfSection to nodify debugging services of new DLL image load. - Dbgk support is now skeletally complete, I will write a simple test app to test some functionality and start finding/fixing bugs.
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 04:57:25 2006 New Revision: 24980 URL: http://svn.reactos.org/svn/reactos?rev=24980&view=rev Log: - Implement DbgkPostFakeThreadMessages. - Add Dbgk-calls to NtMap/UnmapViewOfSection to nodify debugging services of new DLL image load. - Dbgk support is now skeletally complete, I will write a simple test app to test some functionality and start finding/fixing bugs. Modified: trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/include/internal/dbgk.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Thu Nov 30 04:57:25 2006 @@ -551,8 +551,168 @@ OUT PETHREAD *FirstThread, OUT PETHREAD *LastThread) { - /* FIXME: TODO */ - return STATUS_UNSUCCESSFUL; + PETHREAD pFirstThread = NULL, ThisThread, OldThread = NULL, pLastThread; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + BOOLEAN IsFirstThread; + ULONG Flags; + DBGKM_MSG ApiMessage; + PDBGKM_CREATE_THREAD CreateThread = &ApiMessage.CreateThread; + PDBGKM_CREATE_PROCESS CreateProcess = &ApiMessage.CreateProcess; + BOOLEAN First; + PIMAGE_NT_HEADERS NtHeader; + PAGED_CODE(); + + /* Check if we have a start thread */ + if (StartThread) + { + /* Then the one we'll find won't be the first one */ + IsFirstThread = FALSE; + pFirstThread = StartThread; + ThisThread = StartThread; + + /* Reference it */ + ObReferenceObject(StartThread); + } + else + { + /* Get the first thread ourselves */ + ThisThread = PsGetNextProcessThread(Process, OldThread); + IsFirstThread = TRUE; + } + + /* Start thread loop */ + do + { + /* Dereference the previous thread if we had one */ + if (OldThread) ObDereferenceObject(OldThread); + + /* Set this as the last thread and lock it */ + pLastThread = ThisThread; + ObReferenceObject(ThisThread); + if (ExAcquireRundownProtection(&ThisThread->RundownProtect)) + { + /* Acquire worked, set flags */ + Flags = 0x8 | 0x2; + + /* Check if this is a user thread */ + if (!ThisThread->SystemThread) + { + /* Suspend it */ + if (NT_SUCCESS(PsSuspendThread(ThisThread, NULL))) + { + /* Remember this */ + Flags = 0x8 | 0x2 | 0x20; + } + } + } + else + { + /* Couldn't acquire rundown */ + Flags = 0x10 | 0x2; + } + + /* Clear the API Message */ + RtlZeroMemory(&ApiMessage, sizeof(ApiMessage)); + + /* Check if this is the first thread */ + if ((IsFirstThread) && + !(Flags & 0x10) && + !(ThisThread->SystemThread) && + (ThisThread->GrantedAccess)) + { + /* It is, save the flag */ + First = TRUE; + } + else + { + /* It isn't, save the flag */ + First = FALSE; + } + + /* Check if this is the first */ + if (First) + { + /* So we'll start with the create process message */ + ApiMessage.ApiNumber = DbgKmCreateProcessApi; + + /* Get the file handle */ + if (Process->SectionObject) + { + /* Use the section object */ + CreateProcess->FileHandle = + DbgkpSectionToFileHandle(Process->SectionObject); + } + else + { + /* Don't return any handle */ + CreateProcess->FileHandle = NULL; + } + + /* Set the base address */ + CreateProcess->BaseOfImage = Process->SectionBaseAddress; + + /* Get the NT Header */ + NtHeader = RtlImageNtHeader(Process->SectionBaseAddress); + if (NtHeader) + { + /* Fill out data from the header */ + CreateProcess->DebugInfoFileOffset = NtHeader->FileHeader. + PointerToSymbolTable; + CreateProcess->DebugInfoSize = NtHeader->FileHeader. + NumberOfSymbols; + } + } + else + { + /* Otherwise it's a thread message */ + ApiMessage.ApiNumber = DbgKmCreateThreadApi; + CreateThread->StartAddress = ThisThread->StartAddress; + } + + /* Queue the message */ + Status = DbgkpQueueMessage(Process, + ThisThread, + &ApiMessage, + Flags, + DebugObject); + if (!NT_SUCCESS(Status)) + { + /* We failed. FIXME: Handle this */ + DPRINT1("Unhandled Dbgk codepath!\n"); + KEBUGCHECK(0); + } + + /* Check if this was the first message */ + if (First) + { + /* It isn't the first thread anymore */ + IsFirstThread = FALSE; + + /* Reference this thread and set it as first */ + ObDereferenceObject(ThisThread); + pFirstThread = ThisThread; + } + + /* Get the next thread */ + ThisThread = PsGetNextProcessThread(Process, ThisThread); + OldThread = pLastThread; + } while(ThisThread); + + /* Check the API status */ + if (!NT_SUCCESS(Status)) + { + /* We failed. FIXME: Handle this */ + DPRINT1("Unhandled Dbgk codepath!\n"); + KEBUGCHECK(0); + } + + /* Make sure we have a first thread */ + if (!pFirstThread) return STATUS_UNSUCCESSFUL; + + /* Return thread pointers */ + *FirstThread = pFirstThread; + *LastThread = pLastThread; + return Status; } NTSTATUS Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/dbgk.h (original) +++ trunk/reactos/ntoskrnl/include/internal/dbgk.h Thu Nov 30 04:57:25 2006 @@ -19,6 +19,21 @@ IN NTSTATUS ExitStatus ); +VOID +NTAPI +DbgkMapViewOfSection( + IN HANDLE SectionHandle, + IN PVOID BaseAddress, + IN ULONG SectionOffset, + IN ULONG_PTR ViewSize +); + +VOID +NTAPI +DbgkUnMapViewOfSection( + IN PVOID BaseAddress +); + BOOLEAN NTAPI DbgkpSuspendProcess( @@ -36,6 +51,12 @@ DbgkpSendApiMessage( IN OUT PDBGKM_MSG ApiMsg, IN ULONG Flags +); + +HANDLE +NTAPI +DbgkpSectionToFileHandle( + IN PVOID Section ); VOID Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Thu Nov 30 04:57:25 2006 @@ -338,6 +338,13 @@ NTSTATUS NTAPI PsResumeThread( + IN PETHREAD Thread, + OUT PULONG PreviousCount OPTIONAL +); + +NTSTATUS +NTAPI +PsSuspendThread( IN PETHREAD Thread, OUT PULONG PreviousCount OPTIONAL ); Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Thu Nov 30 04:57:25 2006 @@ -3742,6 +3742,18 @@ AllocationType, Protect); + /* Check if this is an image for the current process */ + if ((Section->AllocationAttributes & SEC_IMAGE) && + (Process == PsGetCurrentProcess()) && + (Status != STATUS_IMAGE_NOT_AT_BASE)) + { + /* Notify the debugger */ + DbgkMapViewOfSection(SectionHandle, + SafeBaseAddress, + SafeSectionOffset.LowPart, + SafeViewSize); + } + ObDereferenceObject(Section); ObDereferenceObject(Process); @@ -3945,6 +3957,7 @@ PROS_SECTION_OBJECT Section; PMM_PAGEOP PageOp; ULONG_PTR Offset; + PVOID ImageBaseAddress = 0; DPRINT("Opening memory area Process %x BaseAddress %x\n", Process, BaseAddress); @@ -4007,7 +4020,6 @@ ULONG NrSegments; PMM_IMAGE_SECTION_OBJECT ImageSectionObject; PMM_SECTION_SEGMENT SectionSegments; - PVOID ImageBaseAddress = 0; PMM_SECTION_SEGMENT Segment; Segment = MemoryArea->Data.SectionData.Segment; @@ -4048,6 +4060,10 @@ { Status = MmUnmapViewOfSegment(AddressSpace, BaseAddress); } + + /* Notify debugger */ + if (ImageBaseAddress) DbgkUnMapViewOfSection(ImageBaseAddress); + MmUnlockAddressSpace(AddressSpace); return(STATUS_SUCCESS); }

1 0

[ekohl] 24979: Move global variables into a struct that is attached to the property sheet page dialog.
by ekohl＠svn.reactos.org 29 Nov '06

29 Nov '06

Author: ekohl Date: Thu Nov 30 02:03:18 2006 New Revision: 24979 URL: http://svn.reactos.org/svn/reactos?rev=24979&view=rev Log: Move global variables into a struct that is attached to the property sheet page dialog. Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Thu Nov 30 02:03:18 2006 @@ -41,34 +41,37 @@ SETTINGS_ENTRY InitialSettings; } DISPLAY_DEVICE_ENTRY, *PDISPLAY_DEVICE_ENTRY; -static PDISPLAY_DEVICE_ENTRY DisplayDeviceList = NULL; -static PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice = NULL; - -HBITMAP hBitmap = NULL; -int cxSource, cySource; +typedef struct _GLOBAL_DATA +{ + PDISPLAY_DEVICE_ENTRY DisplayDeviceList; + PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice; + HBITMAP hBitmap; + int cxSource; + int cySource; +} GLOBAL_DATA, *PGLOBAL_DATA; static VOID -UpdateDisplay(IN HWND hwndDlg) +UpdateDisplay(IN HWND hwndDlg, PGLOBAL_DATA pGlobalData) { TCHAR Buffer[64]; TCHAR Pixel[64]; DWORD index; LoadString(hApplet, IDS_PIXEL, Pixel, sizeof(Pixel) / sizeof(TCHAR)); - _stprintf(Buffer, Pixel, CurrentDisplayDevice->CurrentSettings->dmPelsWidth, CurrentDisplayDevice->CurrentSettings->dmPelsHeight, Pixel); + _stprintf(Buffer, Pixel, pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth, pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight, Pixel); SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION_TEXT, WM_SETTEXT, 0, (LPARAM)Buffer); - for (index = 0; index < CurrentDisplayDevice->ResolutionsCount; index++) - { - - if (CurrentDisplayDevice->Resolutions[index].dmPelsWidth == CurrentDisplayDevice->CurrentSettings->dmPelsWidth && - CurrentDisplayDevice->Resolutions[index].dmPelsHeight == CurrentDisplayDevice->CurrentSettings->dmPelsHeight) + for (index = 0; index < pGlobalData->CurrentDisplayDevice->ResolutionsCount; index++) + { + + if (pGlobalData->CurrentDisplayDevice->Resolutions[index].dmPelsWidth == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth && + pGlobalData->CurrentDisplayDevice->Resolutions[index].dmPelsHeight == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight) { SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_SETPOS, TRUE, index); break; } } - if (LoadString(hApplet, (2900 + CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) + if (LoadString(hApplet, (2900 + pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SELECTSTRING, (WPARAM)-1, (LPARAM)Buffer); } @@ -149,7 +152,7 @@ } static BOOL -AddDisplayDevice(IN LPTSTR Description, IN LPTSTR DeviceName) +AddDisplayDevice(IN PGLOBAL_DATA pGlobalData, IN LPTSTR Description, IN LPTSTR DeviceName) { PDISPLAY_DEVICE_ENTRY newEntry = NULL; LPTSTR description = NULL; @@ -201,8 +204,8 @@ memcpy(name, DeviceName, nameSize); newEntry->DeviceDescription = description; newEntry->DeviceName = name; - newEntry->Flink = DisplayDeviceList; - DisplayDeviceList = newEntry; + newEntry->Flink = pGlobalData->DisplayDeviceList; + pGlobalData->DisplayDeviceList = newEntry; return TRUE; ByeBye: @@ -230,12 +233,12 @@ } static VOID -OnDisplayDeviceChanged(IN HWND hwndDlg, IN PDISPLAY_DEVICE_ENTRY pDeviceEntry) +OnDisplayDeviceChanged(IN HWND hwndDlg, IN PGLOBAL_DATA pGlobalData, IN PDISPLAY_DEVICE_ENTRY pDeviceEntry) { PSETTINGS_ENTRY Current; DWORD index; - CurrentDisplayDevice = pDeviceEntry; /* Update global variable */ + pGlobalData->CurrentDisplayDevice = pDeviceEntry; /* Update global variable */ /* Fill color depths combo box */ SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_RESETCONTENT, 0, 0); @@ -257,7 +260,7 @@ SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_CLEARTICS, TRUE, 0); SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_SETRANGE, TRUE, MAKELONG(0, pDeviceEntry->ResolutionsCount - 1)); - UpdateDisplay(hwndDlg); + UpdateDisplay(hwndDlg, pGlobalData); } static VOID @@ -267,6 +270,13 @@ DWORD iDevNum = 0; DISPLAY_DEVICE displayDevice; BITMAP bitmap; + PGLOBAL_DATA pGlobalData; + + pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + if (pGlobalData == NULL) + return; + + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); /* Get video cards list */ displayDevice.cb = (DWORD)sizeof(DISPLAY_DEVICE); @@ -274,7 +284,7 @@ { if ((displayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) != 0) { - if (AddDisplayDevice(displayDevice.DeviceString, displayDevice.DeviceName)) + if (AddDisplayDevice(pGlobalData, displayDevice.DeviceString, displayDevice.DeviceName)) Result++; } iDevNum++; @@ -290,8 +300,8 @@ else if (Result == 1) { /* Single video adapter */ - SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)DisplayDeviceList->DeviceDescription); - OnDisplayDeviceChanged(hwndDlg, DisplayDeviceList); + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pGlobalData->DisplayDeviceList->DeviceDescription); + OnDisplayDeviceChanged(hwndDlg, pGlobalData, pGlobalData->DisplayDeviceList); } else { @@ -299,18 +309,18 @@ /* FIXME: choose selected adapter being the primary one */ } - hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT); - if (hBitmap != NULL) - { - GetObject(hBitmap, sizeof(BITMAP), &bitmap); - - cxSource = bitmap.bmWidth; - cySource = bitmap.bmHeight; + pGlobalData->hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT); + if (pGlobalData->hBitmap != NULL) + { + GetObject(pGlobalData->hBitmap, sizeof(BITMAP), &bitmap); + + pGlobalData->cxSource = bitmap.bmWidth; + pGlobalData->cySource = bitmap.bmHeight; } } static VOID -OnBPPChanged(IN HWND hwndDlg) +OnBPPChanged(IN HWND hwndDlg, IN PGLOBAL_DATA pGlobalData) { /* if new BPP is not compatible with resolution: * 1) try to find the nearest smaller matching resolution @@ -326,7 +336,7 @@ dmNewBitsPerPel = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_GETITEMDATA, index, 0); /* find if new parameters are valid */ - Current = CurrentDisplayDevice->CurrentSettings; + Current = pGlobalData->CurrentDisplayDevice->CurrentSettings; if (dmNewBitsPerPel == Current->dmBitsPerPel) { /* no change */ @@ -341,11 +351,11 @@ while (Current != NULL) { if (Current->dmBitsPerPel == dmNewBitsPerPel - && Current->dmPelsHeight == CurrentDisplayDevice->CurrentSettings->dmPelsHeight - && Current->dmPelsWidth == CurrentDisplayDevice->CurrentSettings->dmPelsWidth) - { - CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg); + && Current->dmPelsHeight == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight + && Current->dmPelsWidth == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth) + { + pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pGlobalData); return; } Current = Current->Blink; @@ -357,11 +367,11 @@ while (Current != NULL) { if (Current->dmBitsPerPel == dmNewBitsPerPel - && Current->dmPelsHeight == CurrentDisplayDevice->CurrentSettings->dmPelsHeight - && Current->dmPelsWidth == CurrentDisplayDevice->CurrentSettings->dmPelsWidth) - { - CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg); + && Current->dmPelsHeight == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight + && Current->dmPelsWidth == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth) + { + pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pGlobalData); return; } Current = Current->Flink; @@ -369,26 +379,26 @@ } /* search smaller resolution compatible with current color depth */ - Current = CurrentDisplayDevice->CurrentSettings->Blink; + Current = pGlobalData->CurrentDisplayDevice->CurrentSettings->Blink; while (Current != NULL) { if (Current->dmBitsPerPel == dmNewBitsPerPel) { - CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg); + pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pGlobalData); return; } Current = Current->Blink; } /* search bigger resolution compatible with current color depth */ - Current = CurrentDisplayDevice->CurrentSettings->Flink; + Current = pGlobalData->CurrentDisplayDevice->CurrentSettings->Flink; while (Current != NULL) { if (Current->dmBitsPerPel == dmNewBitsPerPel) { - CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg); + pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pGlobalData); return; } Current = Current->Flink; @@ -398,18 +408,18 @@ } static VOID -OnResolutionChanged(IN HWND hwndDlg, IN DWORD NewPosition) +OnResolutionChanged(IN HWND hwndDlg, IN PGLOBAL_DATA pGlobalData, IN DWORD NewPosition) { /* if new resolution is not compatible with color depth: * 1) try to find the nearest bigger matching color depth * 2) otherwise, get the nearest smaller color depth */ PSETTINGS_ENTRY Current; - DWORD dmNewPelsHeight = CurrentDisplayDevice->Resolutions[NewPosition].dmPelsHeight; - DWORD dmNewPelsWidth = CurrentDisplayDevice->Resolutions[NewPosition].dmPelsWidth; + DWORD dmNewPelsHeight = pGlobalData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsHeight; + DWORD dmNewPelsWidth = pGlobalData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsWidth; /* find if new parameters are valid */ - Current = CurrentDisplayDevice->CurrentSettings; + Current = pGlobalData->CurrentDisplayDevice->CurrentSettings; if (dmNewPelsHeight == Current->dmPelsHeight && dmNewPelsWidth == Current->dmPelsWidth) { /* no change */ @@ -425,10 +435,10 @@ { if (Current->dmPelsHeight == dmNewPelsHeight && Current->dmPelsWidth == dmNewPelsWidth - && Current->dmBitsPerPel == CurrentDisplayDevice->CurrentSettings->dmBitsPerPel) - { - CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg); + && Current->dmBitsPerPel == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel) + { + pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pGlobalData); return; } Current = Current->Blink; @@ -441,10 +451,10 @@ { if (Current->dmPelsHeight == dmNewPelsHeight && Current->dmPelsWidth == dmNewPelsWidth - && Current->dmBitsPerPel == CurrentDisplayDevice->CurrentSettings->dmBitsPerPel) - { - CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg); + && Current->dmBitsPerPel == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel) + { + pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pGlobalData); return; } Current = Current->Flink; @@ -452,26 +462,26 @@ } /* search bigger color depth compatible with current resolution */ - Current = CurrentDisplayDevice->CurrentSettings->Flink; + Current = pGlobalData->CurrentDisplayDevice->CurrentSettings->Flink; while (Current != NULL) { if (dmNewPelsHeight == Current->dmPelsHeight && dmNewPelsWidth == Current->dmPelsWidth) { - CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg); + pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pGlobalData); return; } Current = Current->Flink; } /* search smaller color depth compatible with current resolution */ - Current = CurrentDisplayDevice->CurrentSettings->Blink; + Current = pGlobalData->CurrentDisplayDevice->CurrentSettings->Blink; while (Current != NULL) { if (dmNewPelsHeight == Current->dmPelsHeight && dmNewPelsWidth == Current->dmPelsWidth) { - CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg); + pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pGlobalData); return; } Current = Current->Blink; @@ -490,6 +500,10 @@ INT_PTR CALLBACK SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) { + PGLOBAL_DATA pGlobalData; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch(uMsg) { case WM_INITDIALOG: @@ -503,7 +517,7 @@ if (controlId == IDC_SETTINGS_ADVANCED && command == BN_CLICKED) OnAdvancedButton(); else if (controlId == IDC_SETTINGS_BPP && command == CBN_SELCHANGE) - OnBPPChanged(hwndDlg); + OnBPPChanged(hwndDlg, pGlobalData); break; } case WM_HSCROLL: @@ -519,7 +533,7 @@ case TB_ENDTRACK: { DWORD newPosition = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_GETPOS, 0, 0); - OnResolutionChanged(hwndDlg, newPosition); + OnResolutionChanged(hwndDlg, pGlobalData, newPosition); } } break; @@ -529,9 +543,9 @@ LPNMHDR lpnm = (LPNMHDR)lParam; if (lpnm->code == (UINT)PSN_APPLY) { - if (CurrentDisplayDevice->CurrentSettings->dmPelsWidth != CurrentDisplayDevice->InitialSettings.dmPelsWidth - || CurrentDisplayDevice->CurrentSettings->dmPelsHeight != CurrentDisplayDevice->InitialSettings.dmPelsHeight - || CurrentDisplayDevice->CurrentSettings->dmBitsPerPel != CurrentDisplayDevice->InitialSettings.dmBitsPerPel) + if (pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth != pGlobalData->CurrentDisplayDevice->InitialSettings.dmPelsWidth + || pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight != pGlobalData->CurrentDisplayDevice->InitialSettings.dmPelsHeight + || pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel != pGlobalData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel) { /* FIXME: Need to test changes */ /* Apply new settings */ @@ -539,12 +553,12 @@ DEVMODE devmode; RtlZeroMemory(&devmode, sizeof(DEVMODE)); devmode.dmSize = (WORD)sizeof(DEVMODE); - devmode.dmPelsWidth = CurrentDisplayDevice->CurrentSettings->dmPelsWidth; - devmode.dmPelsHeight = CurrentDisplayDevice->CurrentSettings->dmPelsHeight; - devmode.dmBitsPerPel = CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; + devmode.dmPelsWidth = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; + devmode.dmPelsHeight = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; + devmode.dmBitsPerPel = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL; rc = ChangeDisplaySettingsEx( - CurrentDisplayDevice->DeviceName, + pGlobalData->CurrentDisplayDevice->DeviceName, &devmode, NULL, CDS_UPDATEREGISTRY, @@ -552,9 +566,9 @@ switch (rc) { case DISP_CHANGE_SUCCESSFUL: - CurrentDisplayDevice->InitialSettings.dmPelsWidth = CurrentDisplayDevice->CurrentSettings->dmPelsWidth; - CurrentDisplayDevice->InitialSettings.dmPelsHeight = CurrentDisplayDevice->CurrentSettings->dmPelsHeight; - CurrentDisplayDevice->InitialSettings.dmBitsPerPel = CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; + pGlobalData->CurrentDisplayDevice->InitialSettings.dmPelsWidth = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; + pGlobalData->CurrentDisplayDevice->InitialSettings.dmPelsHeight = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; + pGlobalData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; break; case DISP_CHANGE_FAILED: MessageBox(NULL, TEXT("Failed to apply new settings..."), TEXT("Display settings"), MB_OK | MB_ICONSTOP); @@ -579,9 +593,13 @@ hdc = BeginPaint(hwndDlg, &ps); hdcMem = CreateCompatibleDC(hdc); - SelectObject(hdcMem, hBitmap); - - TransparentBlt(hdc, 98, 0, cxSource, cySource, hdcMem, 0, 0, cxSource, cySource, 0xFF80FF); + SelectObject(hdcMem, pGlobalData->hBitmap); + + TransparentBlt(hdc, 98, 0, + pGlobalData->cxSource, + pGlobalData->cySource, hdcMem, 0, 0, + pGlobalData->cxSource, + pGlobalData->cySource, 0xFF80FF); DeleteDC(hdcMem); EndPaint(hwndDlg, &ps); @@ -591,7 +609,7 @@ case WM_DESTROY: { - PDISPLAY_DEVICE_ENTRY Current = DisplayDeviceList; + PDISPLAY_DEVICE_ENTRY Current = pGlobalData->DisplayDeviceList; while (Current != NULL) { PDISPLAY_DEVICE_ENTRY Next = Current->Flink; @@ -606,7 +624,9 @@ Current = Next; } - DeleteObject(hBitmap); + DeleteObject(pGlobalData->hBitmap); + + HeapFree(GetProcessHeap(), 0, pGlobalData); } } return FALSE;

1 0

[janderwald] 24978: - implement a basic scanning dection algorithm - please review :P
by janderwald＠svn.reactos.org 29 Nov '06

29 Nov '06

Author: janderwald Date: Thu Nov 30 01:49:16 2006 New Revision: 24978 URL: http://svn.reactos.org/svn/reactos?rev=24978&view=rev Log: - implement a basic scanning dection algorithm - please review :P Modified: trunk/reactos/tools/fixdef/fixdef.cpp Modified: trunk/reactos/tools/fixdef/fixdef.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/fixdef/fixdef.cpp?re… ============================================================================== --- trunk/reactos/tools/fixdef/fixdef.cpp (original) +++ trunk/reactos/tools/fixdef/fixdef.cpp Thu Nov 30 01:49:16 2006 @@ -5,6 +5,7 @@ #include <tchar.h> #include <stdio.h> #include <stdlib.h> +#include <assert.h> #define _FINDDATA_T_DEFINED #include <io.h> #include <time.h> @@ -141,10 +142,80 @@ return true; } +bool has_cdecl_convention(string & line) +{ + if (line[0] == _T('_')) + { + return true; + } + return false; +} + +bool has_fastcall_convention(string & line) +{ + if (line[0] == _T('@')) + { + return true; + } + return false; +} + +bool has_stdcall_convention(string & line) +{ + if (!has_cdecl_convention(line) && !has_fastcall_convention(line)) + { + size_t pos = line.find (_T("@")); + if (pos == string::npos) + { + /// + /// the stdcall decorate is removed + /// + return false; + } + assert(pos > 1); + if (line[pos-1] == _T(' ')) + { + /// + /// its an export ordinal + /// + return false; + } + + return true; + } + else + { + return false; + } +} + + +bool has_export_ordinal(string & line) +{ + if (line.find_last_of (_T(" @")) != string::npos) + { + return true; + } + return false; +} + +void remove_stdcall_convention(string & line) +{ + size_t pos = line.find (_T("@")); + assert(pos != string::npos); + line.erase (pos, 1); + + while(_istdigit(line[pos])) + line.erase (pos, 1); +} + + + bool convertFile(string filename, vector<string> & file) { bool modified = false; + cerr << "entered with: "<< filename << " size: " << file.size () << endl; for(size_t i = 0; i < file.size(); i++) { @@ -156,19 +227,33 @@ /// continue; } - if (line.find(_T("@")) == string::npos) - { - // file has no @ - continue; - } - - /// - /// TODO implement algorithm - /// - - //cout << ">" << line; - } - + size_t pos = line.find (_T("=")); + if (pos != string::npos) + { + string part1 = line.substr (0, pos); + string part2 = line.substr (pos+1, line.length () - pos - 1); + if (has_stdcall_convention(part1)) + { + modified = true; + remove_stdcall_convention(part1); + } + if (has_stdcall_convention(part2)) + { + modified = true; + remove_stdcall_convention(part2); + } + line = part1; + line.insert (line.length (), _T("=")); + line.insert (line.length (), part2); + } + else if (has_stdcall_convention(line)) + { + modified = true; + remove_stdcall_convention(line); + } + cout << line; + } + exit(0); return modified; } @@ -186,8 +271,6 @@ string & line = file[i]; _fputts(line.c_str (), fd); } - - fclose(fd); return true; }

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