Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 26007: - Implement KdpQueryMemory (KdQueryMemoryApi). - Setting and clearing breakpoints now works! (At least the simple ones with F9/bp/bc). And they actually get hit properly.
by ion＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: ion Date: Mon Mar 5 23:10:26 2007 New Revision: 26007 URL: http://svn.reactos.org/svn/reactos?rev=26007&view=rev Log: - Implement KdpQueryMemory (KdQueryMemoryApi). - Setting and clearing breakpoints now works! (At least the simple ones with F9/bp/bc). And they actually get hit properly. Modified: trunk/reactos/include/reactos/windbgkd.h trunk/reactos/ntoskrnl/kd64/kdapi.c Modified: trunk/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/windbgkd.h… ============================================================================== --- trunk/reactos/include/reactos/windbgkd.h (original) +++ trunk/reactos/include/reactos/windbgkd.h Mon Mar 5 23:10:26 2007 @@ -126,6 +126,22 @@ #define DBGKD_64BIT_PROTOCOL_VERSION2 6 // +// Query Memory Address Spaces +// +#define DBGKD_QUERY_MEMORY_VIRTUAL 0 +#define DBGKD_QUERY_MEMORY_PROCESS 0 +#define DBGKD_QUERY_MEMORY_SESSION 1 +#define DBGKD_QUERY_MEMORY_KERNEL 2 + +// +// Query Memory Flags +// +#define DBGKD_QUERY_MEMORY_READ 0x01 +#define DBGKD_QUERY_MEMORY_WRITE 0x02 +#define DBGKD_QUERY_MEMORY_EXECUTE 0x04 +#define DBGKD_QUERY_MEMORY_FIXED 0x08 + +// // KD Packet Structure // typedef struct _KD_PACKET Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c Mon Mar 5 23:10:26 2007 @@ -16,13 +16,62 @@ VOID NTAPI +KdpQueryMemory(IN PDBGKD_MANIPULATE_STATE64 State, + IN PCONTEXT Context) +{ + PDBGKD_QUERY_MEMORY Memory = &State->u.QueryMemory; + STRING Header; + NTSTATUS Status = STATUS_SUCCESS; + + /* Validate the address space */ + if (Memory->AddressSpace == DBGKD_QUERY_MEMORY_VIRTUAL) + { + /* Check if this is process memory */ + if ((PVOID)(LONG_PTR)Memory->Address < MmHighestUserAddress) + { + /* It is */ + Memory->AddressSpace = DBGKD_QUERY_MEMORY_PROCESS; + } + else + { + /* FIXME: Check if it's session space */ + Memory->AddressSpace = DBGKD_QUERY_MEMORY_KERNEL; + } + + /* Set flags */ + Memory->Flags = DBGKD_QUERY_MEMORY_READ | + DBGKD_QUERY_MEMORY_WRITE | + DBGKD_QUERY_MEMORY_EXECUTE; + } + else + { + /* Invalid */ + Status = STATUS_INVALID_PARAMETER; + } + + /* Return structure */ + State->ReturnStatus = Status; + Memory->Reserved = 0; + + /* Build header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + + /* Send the packet */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, + &KdpContext); +} + +VOID +NTAPI KdpWriteBreakpoint(IN PDBGKD_MANIPULATE_STATE64 State, IN PSTRING Data, IN PCONTEXT Context) { PDBGKD_WRITE_BREAKPOINT64 Breakpoint = &State->u.WriteBreakPoint; STRING Header; - NTSTATUS Status; /* Build header */ Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); @@ -35,7 +84,12 @@ if (!Breakpoint->BreakPointHandle) { /* We failed */ - Status = STATUS_UNSUCCESSFUL; + State->ReturnStatus = STATUS_UNSUCCESSFUL; + } + else + { + /* Success! */ + State->ReturnStatus = STATUS_SUCCESS; } /* Send the packet */ @@ -816,9 +870,8 @@ case DbgKdQueryMemoryApi: - /* FIXME: TODO */ - Ke386SetCr2(DbgKdQueryMemoryApi); - while (TRUE); + /* Query memory */ + KdpQueryMemory(&ManipulateState, Context); break; case DbgKdSwitchPartition:

1 0

[ion] 26006: - Fixed up KdComPortInUse so that we don't crash when using TinyKRNL/Windows kdcom.dll anymore (due to serial.sys). WinDBG should work a lot better now. - Implemented hack so that NT-style sprintf can work. - Implement MiCacheImageSymbols and upgrade MmLoadSystemImage to load symbols for drivers/images which have a debug section. - Implemented a case in MiResolveImageReferences which was getting hit. - Don't leak a section object reference each time we load a driver. - Set the Loade
by ion＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: ion Date: Mon Mar 5 22:24:54 2007 New Revision: 26006 URL: http://svn.reactos.org/svn/reactos?rev=26006&view=rev Log: - Fixed up KdComPortInUse so that we don't crash when using TinyKRNL/Windows kdcom.dll anymore (due to serial.sys). WinDBG should work a lot better now. - Implemented hack so that NT-style sprintf can work. - Implement MiCacheImageSymbols and upgrade MmLoadSystemImage to load symbols for drivers/images which have a debug section. - Implemented a case in MiResolveImageReferences which was getting hit. - Don't leak a section object reference each time we load a driver. - Set the LoadedImports pointer in the loader entry, and set the proper flags after loading a driver. - Do image notifications after loading a driver, if they're enabled. Modified: trunk/reactos/drivers/base/kdcom/kdbg.c trunk/reactos/drivers/base/serial/pnp.c trunk/reactos/include/ndk/haltypes.h trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/drivers/base/kdcom/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdbg.c?… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdbg.c (original) +++ trunk/reactos/drivers/base/kdcom/kdbg.c Mon Mar 5 22:24:54 2007 @@ -78,10 +78,6 @@ /* GLOBAL VARIABLES *********************************************************/ -#define KdComPortInUse _KdComPortInUse - -ULONG KdComPortInUse = 0; - /* STATIC VARIABLES *********************************************************/ @@ -272,7 +268,7 @@ /* * set global info */ - KdComPortInUse = (ULONG)PortBase; + *KdComPortInUse = PortBase; /* * print message to blue screen Modified: trunk/reactos/drivers/base/serial/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/pnp.c?… ============================================================================== --- trunk/reactos/drivers/base/serial/pnp.c (original) +++ trunk/reactos/drivers/base/serial/pnp.c Mon Mar 5 22:24:54 2007 @@ -219,7 +219,8 @@ ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; /* Test if we are trying to start the serial port used for debugging */ - if (KdComPortInUse && *KdComPortInUse == ULongToPtr(DeviceExtension->BaseAddress)) + DPRINT1("KdComPort: %p\n", KdComPortInUse); + if (KdComPortInUse == ULongToPtr(DeviceExtension->BaseAddress)) { DPRINT("Failing IRP_MN_START_DEVICE as this serial port is used for debugging\n"); return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/include/ndk/haltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/haltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/haltypes.h (original) +++ trunk/reactos/include/ndk/haltypes.h Mon Mar 5 22:24:54 2007 @@ -224,10 +224,10 @@ // HAL Exports // #ifndef _NTHAL_ -extern PUCHAR NTSYSAPI *KdComPortInUse; -#endif - -#endif -#endif - - +extern PUCHAR *KdComPortInUse; +#endif + +#endif +#endif + + Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Mon Mar 5 22:24:54 2007 @@ -12,6 +12,19 @@ #define NDEBUG #include <debug.h> +/* GCC's incompetence strikes again */ +FORCEINLINE +VOID +sprintf_nt(IN PCHAR Buffer, + IN PCHAR Format, + IN ...) +{ + va_list ap; + va_start(ap, Format); + sprintf(Buffer, Format, ap); + va_end(ap); +} + /* GLOBALS *******************************************************************/ LIST_ENTRY PsLoadedModuleList; @@ -21,6 +34,33 @@ extern ULONG NtGlobalFlag; /* FUNCTIONS *****************************************************************/ + +PVOID +NTAPI +MiCacheImageSymbols(IN PVOID BaseAddress) +{ + ULONG DebugSize; + PVOID DebugDirectory = NULL; + PAGED_CODE(); + + /* Make sure it's safe to access the image */ + _SEH_TRY + { + /* Get the debug directory */ + DebugDirectory = RtlImageDirectoryEntryToData(BaseAddress, + TRUE, + IMAGE_DIRECTORY_ENTRY_DEBUG, + &DebugSize); + } + _SEH_HANDLE + { + /* Nothing */ + } + _SEH_END; + + /* Return the directory */ + return DebugDirectory; +} VOID NTAPI @@ -729,7 +769,7 @@ PCHAR MissingApiBuffer = *MissingApi, ImportName; PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor, CurrentImport; ULONG ImportSize, ImportCount = 0, LoadedImportsSize, ExportSize; - PLOAD_IMPORTS LoadedImports; + PLOAD_IMPORTS LoadedImports, NewImports; ULONG GdiLink, NormalLink, i; BOOLEAN ReferenceNeeded, Loaded; ANSI_STRING TempString; @@ -1056,9 +1096,32 @@ } else if (ImportCount != LoadedImports->Count) { - /* FIXME: Can this happen? */ - DPRINT1("Unhandled scenario\n"); - while (TRUE); + /* Allocate a new list */ + LoadedImportsSize = ImportCount * sizeof(PVOID) + sizeof(SIZE_T); + NewImports = ExAllocatePoolWithTag(PagedPool, + LoadedImportsSize, + TAG_LDR_WSTR); + if (NewImports) + { + /* Set count */ + NewImports->Count = ImportCount; + + /* Loop all the imports */ + for (i = 0, ImportCount = 0; i < LoadedImports->Count; i++) + { + /* Make sure it's valid */ + if (LoadedImports->Entry[i]) + { + /* Copy it */ + NewImports->Entry[i] = LoadedImports->Entry[i]; + ImportCount++; + } + } + + /* Free the old copy */ + ExFreePool(LoadedImports); + LoadedImports = NewImports; + } } /* Return the list */ @@ -1400,9 +1463,9 @@ OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; PIMAGE_NT_HEADERS NtHeader; - UNICODE_STRING BaseName, BaseDirectory, PrefixName; + UNICODE_STRING BaseName, BaseDirectory, PrefixName, UnicodeTemp; PLDR_DATA_TABLE_ENTRY LdrEntry = NULL; - ULONG EntrySize; + ULONG EntrySize, DriverSize; PLOAD_IMPORTS LoadedImports = (PVOID)-2; PCHAR MissingApiName, Buffer; PWCHAR MissingDriverName; @@ -1411,6 +1474,8 @@ PVOID Section = NULL; BOOLEAN LockOwned = FALSE; PLIST_ENTRY NextEntry; + IMAGE_INFO ImageInfo; + ANSI_STRING AnsiTemp; PAGED_CODE(); /* Detect session-load */ @@ -1637,6 +1702,23 @@ NULL); ASSERT(Status != STATUS_ALREADY_COMMITTED); + /* Get the size of the driver */ + DriverSize = ((PROS_SECTION_OBJECT)Section)->ImageSection->ImageSize; + + /* Make sure we're not being loaded into session space */ + if (!Flags) + { + /* Check for success */ + if (NT_SUCCESS(Status)) + { + /* FIXME: Support large pages for drivers */ + } + + /* Dereference the section */ + ObDereferenceObject(Section); + Section = NULL; + } + /* Get the NT Header */ NtHeader = RtlImageNtHeader(ModuleLoadBase); @@ -1681,7 +1763,7 @@ LdrEntry->DllBase = ModuleLoadBase; LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)ModuleLoadBase + NtHeader->OptionalHeader.AddressOfEntryPoint); - LdrEntry->SizeOfImage = ((PROS_SECTION_OBJECT)Section)->ImageSection->ImageSize; + LdrEntry->SizeOfImage = DriverSize; LdrEntry->CheckSum = NtHeader->OptionalHeader.CheckSum; LdrEntry->SectionPointer = LdrEntry; @@ -1749,6 +1831,66 @@ goto Quickie; } + /* Update the loader entry */ + LdrEntry->Flags |= (LDRP_SYSTEM_MAPPED | + LDRP_ENTRY_PROCESSED | + LDRP_MM_LOADED); + LdrEntry->Flags &= ~LDRP_LOAD_IN_PROGRESS; + LdrEntry->LoadedImports = LoadedImports; + + /* FIXME: Apply driver verifier */ + + /* FIXME: Write-protect the system image */ + + /* Check if notifications are enabled */ + if (PsImageNotifyEnabled) + { + /* Fill out the notification data */ + ImageInfo.Properties = 0; + ImageInfo.ImageAddressingMode = IMAGE_ADDRESSING_MODE_32BIT; + ImageInfo.SystemModeImage = TRUE; + ImageInfo.ImageSize = LdrEntry->SizeOfImage; + ImageInfo.ImageBase = LdrEntry->DllBase; + ImageInfo.ImageSectionNumber = ImageInfo.ImageSelector = 0; + + /* Send the notification */ + PspRunLoadImageNotifyRoutines(FileName, NULL, &ImageInfo); + } + + /* Check if there's symbols */ + if (MiCacheImageSymbols(LdrEntry->DllBase)) + { + /* Check if the system root is present */ + if ((PrefixName.Length > (11 * sizeof(WCHAR))) && + !(_wcsnicmp(PrefixName.Buffer, L"\\SystemRoot", 11))) + { + /* Add the system root */ + UnicodeTemp = PrefixName; + UnicodeTemp.Buffer += 11; + UnicodeTemp.Length -= (11 * sizeof(WCHAR)); + sprintf_nt(Buffer, + "%ws%wZ", + &SharedUserData->NtSystemRoot[2], + &UnicodeTemp); + } + else + { + /* Build the name */ + sprintf_nt(Buffer, "%wZ", &BaseName); + } + + /* Setup the ansi string */ + RtlInitString(&AnsiTemp, Buffer); + + /* Notify the debugger */ + DbgLoadImageSymbols(&AnsiTemp, LdrEntry->DllBase, -1); + LdrEntry->Flags |= LDRP_DEBUG_SYMBOLS_LOADED; + } + + /* FIXME: Page the driver */ + ASSERT(Section == NULL); + + /* Return pointers */ if (ModuleObject) *ModuleObject = LdrEntry; if (ImageBaseAddress) *ImageBaseAddress = LdrEntry->DllBase;

1 0

[jimtabor] 26005: Fix RosBE build
by jimtabor＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: jimtabor Date: Mon Mar 5 20:35:37 2007 New Revision: 26005 URL: http://svn.reactos.org/svn/reactos?rev=26005&view=rev Log: Fix RosBE build Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2600… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Mon Mar 5 20:35:37 2007 @@ -1154,7 +1154,7 @@ _disable(); /* Check the bugcheck count */ - if (!InterlockedDecrement(&KeBugCheckCount)) + if (!InterlockedDecrement((PLONG)&KeBugCheckCount)) { /* There was only one, is the debugger disabled? */ if (!(KdDebuggerEnabled) && !(KdPitchDebugger))

1 0

[ion] 26004: - Implement simple breakpoints (KdWriteBreakPointApi, KdpWriteBreakpoint, KdpAddBreakpoint). - Stepping out with WinDBG now works, but not adding breakpoints (that's KdWriteBreakpointExApi, coming up soon). - This was supposed to be 26000 but oh well, back porting features to a locked branch seems to have won out :)
by ion＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: ion Date: Mon Mar 5 20:09:44 2007 New Revision: 26004 URL: http://svn.reactos.org/svn/reactos?rev=26004&view=rev Log: - Implement simple breakpoints (KdWriteBreakPointApi, KdpWriteBreakpoint, KdpAddBreakpoint). - Stepping out with WinDBG now works, but not adding breakpoints (that's KdWriteBreakpointExApi, coming up soon). - This was supposed to be 26000 but oh well, back porting features to a locked branch seems to have won out :) Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/kd64/kdbreak.c Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd64.h (original) +++ trunk/reactos/ntoskrnl/include/internal/kd64.h Mon Mar 5 20:09:44 2007 @@ -226,6 +226,12 @@ KdpDeleteBreakpointRange( IN PVOID Base, IN PVOID Limit +); + +ULONG +NTAPI +KdpAddBreakpoint( + IN PVOID Address ); // Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c Mon Mar 5 20:09:44 2007 @@ -16,6 +16,37 @@ VOID NTAPI +KdpWriteBreakpoint(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + PDBGKD_WRITE_BREAKPOINT64 Breakpoint = &State->u.WriteBreakPoint; + STRING Header; + NTSTATUS Status; + + /* Build header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* Create the breakpoint */ + Breakpoint->BreakPointHandle = + KdpAddBreakpoint((PVOID)(LONG_PTR)Breakpoint->BreakPointAddress); + if (!Breakpoint->BreakPointHandle) + { + /* We failed */ + Status = STATUS_UNSUCCESSFUL; + } + + /* Send the packet */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, + &KdpContext); +} + +VOID +NTAPI DumpTraceData(IN PSTRING TraceData) { /* Update the buffer */ @@ -545,9 +576,8 @@ case DbgKdWriteBreakPointApi: - /* FIXME: TODO */ - Ke386SetCr2(DbgKdWriteBreakPointApi); - while (TRUE); + /* Write the breakpoint */ + KdpWriteBreakpoint(&ManipulateState, &Data, Context); break; case DbgKdRestoreBreakPointApi: Modified: trunk/reactos/ntoskrnl/kd64/kdbreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdbreak.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdbreak.c (original) +++ trunk/reactos/ntoskrnl/kd64/kdbreak.c Mon Mar 5 20:09:44 2007 @@ -13,6 +13,54 @@ #include <debug.h> /* FUNCTIONS *****************************************************************/ + +ULONG +NTAPI +KdpAddBreakpoint(IN PVOID Address) +{ + UCHAR Content; + ULONG i; + + /* Loop current breakpoints */ + for (i = 0; i < 20; i++) + { + /* Check if the breakpoint is valid */ + if ((KdpBreakpointTable[i].Flags & KdpBreakpointActive) && + (KdpBreakpointTable[i].Address == Address)) + { + /* Check if it's pending */ + if ((KdpBreakpointTable[i].Flags & KdpBreakpointPending)) + { + /* It's not pending anymore now */ + KdpBreakpointTable[i].Flags &= ~KdpBreakpointPending; + return i + 1; + } + else + { + /* Fail */ + return 0; + } + } + } + + /* Find a free entry */ + for (i = 0; i < 20; i++) if (!(KdpBreakpointTable[i].Flags)) break; + + /* Fail if no free entry was found */ + if (i == 20) return 0; + + /* Save the old instruction */ + RtlCopyMemory(&Content, Address, sizeof(UCHAR)); + + /* Write the entry */ + KdpBreakpointTable[i].Address = Address; + KdpBreakpointTable[i].Content = Content; + KdpBreakpointTable[i].Flags = KdpBreakpointActive; + + /* Write the INT3 and return the handle */ + RtlCopyMemory(Address, &KdpBreakpointInstruction, sizeof(UCHAR)); + return i + 1; +} BOOLEAN NTAPI

1 0

[fireball] 26003: - Merge 25991 and 25992 by hpoussin
by fireball＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: fireball Date: Mon Mar 5 19:13:31 2007 New Revision: 26003 URL: http://svn.reactos.org/svn/reactos?rev=26003&view=rev Log: - Merge 25991 and 25992 by hpoussin Modified: branches/ros-branch-0_3_1/reactos/base/shell/cmd/console.c Modified: branches/ros-branch-0_3_1/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/shell/cmd/console.c (original) +++ branches/ros-branch-0_3_1/reactos/base/shell/cmd/console.c Mon Mar 5 19:13:31 2007 @@ -89,7 +89,6 @@ } - VOID ConInString (LPTSTR lpInput, DWORD dwLength) { DWORD dwOldMode; @@ -238,7 +237,7 @@ INT ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) { INT len; - PTCHAR pBuf; + PCHAR pBuf; CONSOLE_SCREEN_BUFFER_INFO csbi; TCHAR szOut[OUTPUT_BUFFER_SIZE]; DWORD dwWritten; @@ -261,30 +260,35 @@ LineCount = 0; /* rest LineCount and return if no string have been given */ - if (szFormat == NULL) - return 0; + if (szFormat == NULL) + return 0; //get the size of the visual screen that can be printed too if (!GetConsoleScreenBufferInfo(hConsole, &csbi)) - { - // we assuming its a file handle - ConPrintf(szFormat, arg_ptr, nStdHandle); - return 0; - } + { + // we assuming its a file handle + ConPrintf(szFormat, arg_ptr, nStdHandle); + return 0; + } //subtract 2 to account for "press any key..." and for the blank line at the end of PagePrompt() ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; ScreenCol = (csbi.srWindow.Right - csbi.srWindow.Left) + 1; //make sure they didnt make the screen to small if(ScreenLines<4) - { - ConPrintf(szFormat, arg_ptr, nStdHandle); - return 0; - } + { + ConPrintf(szFormat, arg_ptr, nStdHandle); + return 0; + } len = _vstprintf (szOut, szFormat, arg_ptr); +#ifdef _UNICODE + pBuf = malloc(len + 1); + len = WideCharToMultiByte( OutputCodePage, 0, szOut, len + 1, pBuf, len + 1, NULL, NULL) - 1; +#else pBuf = szOut; +#endif for(i = 0; i < len; i++) { @@ -309,19 +313,22 @@ /* FIXME : write more that one char at time */ WriteFile (GetStdHandle (nStdHandle),&pBuf[i],sizeof(CHAR),&dwWritten,NULL); - if(LineCount >= ScreenLines) - { - if(_tcsnicmp(&pBuf[i], _T("\n"), 2)!=0) + if(LineCount >= ScreenLines) + { + if(_strnicmp(&pBuf[i], "\n", 2)!=0) WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(CHAR),&dwWritten,NULL); - if(PagePrompt() != PROMPT_YES) - { - return 1; - } - //reset the number of lines being printed - LineCount = 0; + if(PagePrompt() != PROMPT_YES) + { +#ifdef _UNICODE + free(pBuf); +#endif + return 1; + } + //reset the number of lines being printed + LineCount = 0; CharEL=0; - } + } }

1 0

[greatlrd] 26002: fixed dprint1 to dprint
by greatlrd＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: greatlrd Date: Mon Mar 5 18:18:10 2007 New Revision: 26002 URL: http://svn.reactos.org/svn/reactos?rev=26002&view=rev Log: fixed dprint1 to dprint Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dc.c Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dc.c Mon Mar 5 18:18:10 2007 @@ -813,21 +813,21 @@ if (Driver != NULL) { - DPRINT1("NAME Driver: %wZ\n", Driver); + DPRINT("NAME Driver: %wZ\n", Driver); } else { - DPRINT1("NAME Driver: NULL\n", Driver); + DPRINT("NAME Driver: NULL\n", Driver); } if (Driver != NULL) { - DPRINT1("NAME Device: %wZ\n", Device); + DPRINT("NAME Device: %wZ\n", Device); } else { - DPRINT1("NAME Device: NULL\n", Device); + DPRINT("NAME Device: NULL\n", Device); }

1 0

[greatlrd] 26001: fixed dprint1 to dprint
by greatlrd＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: greatlrd Date: Mon Mar 5 18:17:53 2007 New Revision: 26001 URL: http://svn.reactos.org/svn/reactos?rev=26001&view=rev Log: fixed dprint1 to dprint Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Mar 5 18:17:53 2007 @@ -813,21 +813,21 @@ if (Driver != NULL) { - DPRINT1("NAME Driver: %wZ\n", Driver); + DPRINT("NAME Driver: %wZ\n", Driver); } else { - DPRINT1("NAME Driver: NULL\n", Driver); + DPRINT("NAME Driver: NULL\n", Driver); } if (Driver != NULL) { - DPRINT1("NAME Device: %wZ\n", Device); + DPRINT("NAME Device: %wZ\n", Device); } else { - DPRINT1("NAME Device: NULL\n", Device); + DPRINT("NAME Device: NULL\n", Device); }

1 0

[greatlrd] 26000: merge down 25977. I got r26000 :)
by greatlrd＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: greatlrd Date: Mon Mar 5 18:14:12 2007 New Revision: 26000 URL: http://svn.reactos.org/svn/reactos?rev=26000&view=rev Log: merge down 25977. I got r26000 :) Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/ddraw.c branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/stubs.c Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Mon Mar 5 18:14:12 2007 @@ -462,7 +462,7 @@ return Ret; } - /* + /* * Get puD3dBufferCallbacks */ if (puD3dBufferCallbacks != NULL) @@ -540,6 +540,58 @@ return Ret; } +BOOL STDCALL NtGdiDdReenableDirectDrawObject( + HANDLE hDirectDrawLocal, + BOOL *pubNewMode +) +{ + BOOL Ret=FALSE; + NTSTATUS Status = FALSE; + PDD_DIRECTDRAW pDirectDraw; + + if (hDirectDrawLocal == NULL) + { + return Ret; + } + + pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, + GDI_OBJECT_TYPE_DIRECTDRAW); + + if (!pDirectDraw) + { + return Ret; + } + + /* + * FIXME detect mode change thic code maybe are not correct + * if we call on intEnableDriver it will cause some memory leak + * we need free the alloc memory before we call on it + */ + Ret = intEnableDriver(pDirectDraw); + + _SEH_TRY + { + ProbeForWrite(pubNewMode, sizeof(BOOL), 1); + *pubNewMode = Ret; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return Ret; + } + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + + return Ret; + +} + + DWORD STDCALL NtGdiDdGetDriverInfo( HANDLE hDirectDrawLocal, Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/stubs.c (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/stubs.c Mon Mar 5 18:14:12 2007 @@ -304,15 +304,6 @@ return 0; } -BOOL STDCALL NtGdiDdReenableDirectDrawObject( - HANDLE hDirectDrawLocal, - BOOL *pubNewMode -) -{ - UNIMPLEMENTED - - return FALSE; -} BOOL STDCALL NtGdiDdReleaseDC( HANDLE hSurface

1 0

[greatlrd] 25999: merge 25998
by greatlrd＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: greatlrd Date: Mon Mar 5 18:11:23 2007 New Revision: 25999 URL: http://svn.reactos.org/svn/reactos?rev=25999&view=rev Log: merge 25998 Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dc.c Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dc.c Mon Mar 5 18:11:23 2007 @@ -811,6 +811,26 @@ RtlInitUnicodeString(&StdDriver, L"DISPLAY"); + if (Driver != NULL) + { + DPRINT1("NAME Driver: %wZ\n", Driver); + } + else + { + DPRINT1("NAME Driver: NULL\n", Driver); + } + + + if (Driver != NULL) + { + DPRINT1("NAME Device: %wZ\n", Device); + } + else + { + DPRINT1("NAME Device: NULL\n", Device); + } + + if (NULL == Driver || 0 == RtlCompareUnicodeString(Driver, &StdDriver, TRUE)) { if (CreateAsIC) @@ -853,7 +873,8 @@ if (Driver != NULL && Driver->Buffer != NULL) { - DPRINT("NAME: %wZ\n", Driver); // FIXME: Should not crash if NULL + if (Driver!=NULL) + DPRINT1("NAME: %wZ\n", Driver); } /* Allocate a DC object */ @@ -962,9 +983,12 @@ Status = IntSafeCopyUnicodeString(&SafeDevice, Device); if(!NT_SUCCESS(Status)) { - RtlFreeUnicodeString(&SafeDriver); - SetLastNtError(Status); - return NULL; + /* FIXME workaround for a real bug */ + // RtlFreeUnicodeString(&SafeDriver); + // SetLastNtError(Status); + // DPRINT1("fail3\n"); + // return NULL; + Device = NULL; } } @@ -1780,6 +1804,7 @@ } GDIOBJ_UnlockObjByPtr(GdiHandleTable, GdiObject); + return Result; }

1 0

[greatlrd] 25998: tempary fix for CreateDC("DISPLAY", "DISPLAY", ....) until I figout some thing better
by greatlrd＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: greatlrd Date: Mon Mar 5 18:10:26 2007 New Revision: 25998 URL: http://svn.reactos.org/svn/reactos?rev=25998&view=rev Log: tempary fix for CreateDC("DISPLAY","DISPLAY",....) until I figout some thing better Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Mar 5 18:10:26 2007 @@ -811,6 +811,26 @@ RtlInitUnicodeString(&StdDriver, L"DISPLAY"); + if (Driver != NULL) + { + DPRINT1("NAME Driver: %wZ\n", Driver); + } + else + { + DPRINT1("NAME Driver: NULL\n", Driver); + } + + + if (Driver != NULL) + { + DPRINT1("NAME Device: %wZ\n", Device); + } + else + { + DPRINT1("NAME Device: NULL\n", Device); + } + + if (NULL == Driver || 0 == RtlCompareUnicodeString(Driver, &StdDriver, TRUE)) { if (CreateAsIC) @@ -853,7 +873,8 @@ if (Driver != NULL && Driver->Buffer != NULL) { - DPRINT("NAME: %wZ\n", Driver); // FIXME: Should not crash if NULL + if (Driver!=NULL) + DPRINT1("NAME: %wZ\n", Driver); } /* Allocate a DC object */ @@ -962,9 +983,12 @@ Status = IntSafeCopyUnicodeString(&SafeDevice, Device); if(!NT_SUCCESS(Status)) { - RtlFreeUnicodeString(&SafeDriver); - SetLastNtError(Status); - return NULL; + /* FIXME workaround for a real bug */ + // RtlFreeUnicodeString(&SafeDriver); + // SetLastNtError(Status); + // DPRINT1("fail3\n"); + // return NULL; + Device = NULL; } }

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