Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 31452: fix definition of FindFileInPath
by tkreuzer＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: tkreuzer Date: Thu Dec 27 03:47:39 2007 New Revision: 31452 URL: http://svn.reactos.org/svn/reactos?rev=31452&view=rev Log: fix definition of FindFileInPath Modified: trunk/reactos/include/psdk/dbghelp.h Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dbghelp.h (original) +++ trunk/reactos/include/psdk/dbghelp.h Thu Dec 27 03:47:39 2007 @@ -1124,8 +1124,7 @@ HANDLE WINAPI SymFindDebugInfoFileW(HANDLE, PCWSTR, PWSTR, PFIND_DEBUG_FILE_CALLBACKW, PVOID); typedef BOOL (CALLBACK *PFINDFILEINPATHCALLBACK)(PCSTR, PVOID); typedef BOOL (CALLBACK *PFINDFILEINPATHCALLBACKW)(PCWSTR, PVOID); -BOOL WINAPI FindFileInPath(HANDLE, PCSTR, PCSTR, PVOID, DWORD, DWORD, DWORD, - PSTR, PFINDFILEINPATHCALLBACK, PVOID); +BOOL WINAPI FindFileInPath(HANDLE, LPSTR, LPSTR, PVOID, DWORD, DWORD, DWORD, LPSTR); BOOL WINAPI SymFindFileInPath(HANDLE, PCSTR, PCSTR, PVOID, DWORD, DWORD, DWORD, PSTR, PFINDFILEINPATHCALLBACK, PVOID); BOOL WINAPI SymFindFileInPathW(HANDLE, PCWSTR, PCWSTR, PVOID, DWORD, DWORD, DWORD,

1 0

[fireball] 31451: - Silence debug messages.
by fireball＠svn.reactos.org 26 Dec '07

26 Dec '07

Author: fireball Date: Wed Dec 26 21:09:37 2007 New Revision: 31451 URL: http://svn.reactos.org/svn/reactos?rev=31451&view=rev Log: - Silence debug messages. Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c Wed Dec 26 21:09:37 2007 @@ -454,7 +454,7 @@ if (!NT_SUCCESS(result)) return result; - DPRINT1("Registry key succesfully opened\n"); + DPRINT("Registry key succesfully opened\n"); length = sizeof(KEY_VALUE_FULL_INFORMATION) + 255*2;//MAX_PATH*sizeof(WCHAR); pFullInfo = (PKEY_VALUE_FULL_INFORMATION)&fullInfo; @@ -469,7 +469,7 @@ length, &length); - DPRINT1("First enumerate call result=%x\n", result); + DPRINT("First enumerate call result=%x\n", result); while (result != STATUS_NO_MORE_ENTRIES) { int i; @@ -484,7 +484,7 @@ lpLocale[8]=0; - DPRINT1("Locale=%S\n", lpLocale); + DPRINT("Locale=%S\n", lpLocale); // Call Enum func if (!lpLocaleEnumProc((LPWSTR)lpLocale))

1 0

[tkreuzer] 31450: - fix section pointer calculation - print parameter byte count from W32pArgumentTable - use value of W32pServiceLimit for the loop
by tkreuzer＠svn.reactos.org 26 Dec '07

26 Dec '07

Author: tkreuzer Date: Wed Dec 26 20:57:53 2007 New Revision: 31450 URL: http://svn.reactos.org/svn/reactos?rev=31450&view=rev Log: - fix section pointer calculation - print parameter byte count from W32pArgumentTable - use value of W32pServiceLimit for the loop Modified: trunk/rosapps/devutils/syscalldump/syscalldump.c Modified: trunk/rosapps/devutils/syscalldump/syscalldump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/syscalldump/sysca… ============================================================================== --- trunk/rosapps/devutils/syscalldump/syscalldump.c (original) +++ trunk/rosapps/devutils/syscalldump/syscalldump.c Wed Dec 26 20:57:53 2007 @@ -27,7 +27,7 @@ PIMAGE_DOS_HEADER pDosHdr; PIMAGE_NT_HEADERS32 pNtHdr32; WORD NumberOfSections; - INT i; + INT i, nSection; DWORD64 dwOffset = 0; pDosHdr = (PIMAGE_DOS_HEADER)pModule; @@ -46,14 +46,16 @@ NumberOfSections = pNtHdr32->FileHeader.NumberOfSections; pSectionHdr = (PIMAGE_SECTION_HEADER)(pNtHdr32 + 1); + nSection = 0; for (i = 0; i < NumberOfSections; i++) { if (dwAdress >= pSectionHdr[i].VirtualAddress && - pSectionHdr[i].PointerToRawData > dwOffset) + pSectionHdr[i].PointerToRawData > pSectionHdr[nSection].PointerToRawData) { - dwOffset = pSectionHdr[i].PointerToRawData; + nSection = i; } } + dwOffset = pSectionHdr[nSection].PointerToRawData + dwAdress - pSectionHdr[nSection].VirtualAddress; return dwOffset; } else @@ -64,16 +66,32 @@ } } +DWORD64 +GetOffsetFromName(HANDLE hProcess, PSYMBOL_INFO pSym, PBYTE pModule, PCSTR Name, PBOOL pbX64) +{ + pSym->SizeOfStruct = sizeof(SYMBOL_INFO); + pSym->MaxNameLen = MAX_SYMBOL_NAME-1; + + if (!SymFromName(hProcess, Name, pSym)) + { + printf("SymGetSymFromName64() failed: %ld\n", GetLastError()); + return 0; + } + return GetOffsetFromAdress64(pModule, pSym->Address - pSym->ModBase, pbX64); +} + int main(int argc, char* argv[]) { HANDLE hProcess; CHAR szModuleFileName[MAX_PATH+1]; DWORD64 dwModuleBase; - DWORD64 dwFileOffset; HANDLE hFile = 0, hMap = 0; PBYTE pModule = NULL; UINT i; BOOL bX64; + DWORD64 dwW32pServiceTable, dwW32pServiceLimit, dwW32pArgumentTable; + DWORD dwServiceLimit; + BYTE *pdwArgs; struct { @@ -124,18 +142,6 @@ goto cleanup; } - Sym.Symbol.SizeOfStruct = sizeof(SYMBOL_INFO); - Sym.Symbol.MaxNameLen = MAX_SYMBOL_NAME-1; - - if (!SymFromName(hProcess, "W32pServiceTable", &Sym.Symbol)) - { - printf("SymGetSymFromName64() failed: %ld\n", GetLastError()); - goto cleanup; - } - - printf("Address for W32pServiceTable = %llx\n", Sym.Symbol.Address); - printf("Module base = %llx\n", dwModuleBase); - hMap = CreateFileMappingA(hFile, NULL, PAGE_READONLY, 0, 0, NULL); if (!hMap) { @@ -150,31 +156,40 @@ goto cleanup; } - dwFileOffset = GetOffsetFromAdress64(pModule, Sym.Symbol.Address - dwModuleBase, &bX64); - if (!dwFileOffset) - { - printf("PE file is invalid!\n"); - goto cleanup; - } + dwW32pServiceTable = GetOffsetFromName(hProcess, &Sym.Symbol, pModule, "W32pServiceTable", &bX64); + dwW32pServiceLimit = GetOffsetFromName(hProcess, &Sym.Symbol, pModule, "W32pServiceLimit", &bX64); + dwW32pArgumentTable = GetOffsetFromName(hProcess, &Sym.Symbol, pModule, "W32pArgumentTable", &bX64); + if (!dwW32pServiceTable || !dwW32pServiceLimit || !dwW32pArgumentTable) + { + printf("Couldn't find adress!\n"); + goto cleanup; + } + + printf("dwW32pServiceTable = %llx\n", dwW32pServiceTable); + printf("dwW32pServiceLimit = %llx\n", dwW32pServiceLimit); + printf("dwW32pArgumentTable = %llx\n", dwW32pArgumentTable); + + dwServiceLimit = *((DWORD*)(pModule + dwW32pServiceLimit)); + pdwArgs = (BYTE*)(pModule + dwW32pArgumentTable); if (!bX64) { - DWORD *pdwEntries32 = (DWORD*)(pModule + dwFileOffset); - - for (i = 0; pdwEntries32[i] > dwModuleBase; i++) + DWORD *pdwEntries32 = (DWORD*)(pModule + dwW32pServiceTable); + + for (i = 0; i <= dwServiceLimit; i++) { SymFromAddr(hProcess, (DWORD64)pdwEntries32[i], 0, &Sym.Symbol); - printf("0x%x:%s\n", i+0x1000, Sym.Symbol.Name); + printf("0x%x:%s@%d\n", i+0x1000, Sym.Symbol.Name, pdwArgs[i]); } } else { - DWORD64 *pdwEntries64 = (DWORD64*)(pModule + dwFileOffset); - - for (i = 0; pdwEntries64[i] > dwModuleBase; i++) + DWORD64 *pdwEntries64 = (DWORD64*)(pModule + dwW32pServiceTable); + + for (i = 0; i <= dwServiceLimit; i++) { SymFromAddr(hProcess, (DWORD64)pdwEntries64[i], 0, &Sym.Symbol); - printf("0x%x:%s\n", i+0x1000, Sym.Symbol.Name); + printf("0x%x:%s@%d\n", i+0x1000, Sym.Symbol.Name, pdwArgs[i]); } }

1 0

[hpoussin] 31449: Add support for REG_EXPAND_SZ variables Display the string value only if it is a string
by hpoussin＠svn.reactos.org 26 Dec '07

26 Dec '07

Author: hpoussin Date: Wed Dec 26 19:18:15 2007 New Revision: 31449 URL: http://svn.reactos.org/svn/reactos?rev=31449&view=rev Log: Add support for REG_EXPAND_SZ variables Display the string value only if it is a string Modified: trunk/reactos/base/system/smss/initenv.c Modified: trunk/reactos/base/system/smss/initenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initenv.c… ============================================================================== --- trunk/reactos/base/system/smss/initenv.c (original) +++ trunk/reactos/base/system/smss/initenv.c Wed Dec 26 19:18:15 2007 @@ -71,12 +71,11 @@ IN PVOID EntryContext) { DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName, ValueType, ValueLength); - DPRINT("ValueData '%S'\n", (PWSTR)ValueData); - if (ValueType != REG_SZ) + if (ValueType != REG_SZ && ValueType != REG_EXPAND_SZ) return STATUS_SUCCESS; - + DPRINT("ValueData '%S'\n", (PWSTR)ValueData); return SmpSetEnvironmentVariable(Context,ValueName,ValueData); }

1 0

[hpoussin] 31448: [FORMATTING] Fix tabs/spaces mess
by hpoussin＠svn.reactos.org 26 Dec '07

26 Dec '07

Author: hpoussin Date: Wed Dec 26 19:16:45 2007 New Revision: 31448 URL: http://svn.reactos.org/svn/reactos?rev=31448&view=rev Log: [FORMATTING] Fix tabs/spaces mess Modified: trunk/reactos/base/system/smss/initenv.c Modified: trunk/reactos/base/system/smss/initenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initenv.c… ============================================================================== --- trunk/reactos/base/system/smss/initenv.c (original) +++ trunk/reactos/base/system/smss/initenv.c Wed Dec 26 19:16:45 2007 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * initenv.c - Environment initialization * * ReactOS Operating System @@ -39,91 +38,91 @@ NTSTATUS SmCreateEnvironment(VOID) { - return RtlCreateEnvironment(FALSE, &SmSystemEnvironment); + return RtlCreateEnvironment(FALSE, &SmSystemEnvironment); } static NTSTATUS -SmpSetEnvironmentVariable(PVOID Context, - PWSTR ValueName, - PVOID ValueData) +SmpSetEnvironmentVariable(IN PVOID Context, + IN PWSTR ValueName, + IN PVOID ValueData) { - UNICODE_STRING EnvVariable; - UNICODE_STRING EnvValue; + UNICODE_STRING EnvVariable; + UNICODE_STRING EnvValue; - RtlInitUnicodeString(&EnvVariable, - ValueName); - RtlInitUnicodeString(&EnvValue, - (PWSTR)ValueData); - RtlSetEnvironmentVariable(Context, - &EnvVariable, - &EnvValue); + RtlInitUnicodeString(&EnvVariable, + ValueName); + RtlInitUnicodeString(&EnvValue, + (PWSTR)ValueData); + RtlSetEnvironmentVariable(Context, + &EnvVariable, + &EnvValue); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } static NTSTATUS STDCALL -SmpEnvironmentQueryRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) +SmpEnvironmentQueryRoutine(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) { - DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName, ValueType, ValueLength); - DPRINT("ValueData '%S'\n", (PWSTR)ValueData); + DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName, ValueType, ValueLength); + DPRINT("ValueData '%S'\n", (PWSTR)ValueData); - if (ValueType != REG_SZ) - { - return(STATUS_SUCCESS); - } - return SmpSetEnvironmentVariable(Context,ValueName,ValueData); + if (ValueType != REG_SZ) + return STATUS_SUCCESS; + + + return SmpSetEnvironmentVariable(Context,ValueName,ValueData); } NTSTATUS SmSetEnvironmentVariables(VOID) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - WCHAR ValueBuffer[MAX_PATH]; - NTSTATUS Status; + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + WCHAR ValueBuffer[MAX_PATH]; + NTSTATUS Status; - /* - * The following environment variables must be set prior to reading - * other variables from the registry. - * - * Variables (example): - * SystemRoot = "C:\reactos" - * SystemDrive = "C:" - */ + /* + * The following environment variables must be set prior to reading + * other variables from the registry. + * + * Variables (example): + * SystemRoot = "C:\reactos" + * SystemDrive = "C:" + */ - /* Copy system root into value buffer */ - wcscpy(ValueBuffer, - SharedUserData->NtSystemRoot); + /* Copy system root into value buffer */ + wcscpy(ValueBuffer, + SharedUserData->NtSystemRoot); - /* Set SystemRoot = "C:\reactos" */ - SmpSetEnvironmentVariable(&SmSystemEnvironment,L"SystemRoot",ValueBuffer); + /* Set SystemRoot = "C:\reactos" */ + SmpSetEnvironmentVariable(&SmSystemEnvironment, L"SystemRoot", ValueBuffer); - /* Cut off trailing path */ - ValueBuffer[2] = 0; + /* Cut off trailing path */ + ValueBuffer[2] = 0; - /* Set SystemDrive = "C:" */ - SmpSetEnvironmentVariable(&SmSystemEnvironment,L"SystemDrive",ValueBuffer); + /* Set SystemDrive = "C:" */ + SmpSetEnvironmentVariable(&SmSystemEnvironment, L"SystemDrive", ValueBuffer); - /* Read system environment from the registry. */ - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); + /* Read system environment from the registry. */ + RtlZeroMemory(&QueryTable, + sizeof(QueryTable)); - QueryTable[0].QueryRoutine = SmpEnvironmentQueryRoutine; + QueryTable[0].QueryRoutine = SmpEnvironmentQueryRoutine; - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"\\Session Manager\\Environment", - QueryTable, - &SmSystemEnvironment, - SmSystemEnvironment); + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"Session Manager\\Environment", + QueryTable, + &SmSystemEnvironment, + SmSystemEnvironment); - return(Status); + return Status; } /********************************************************************** @@ -132,8 +131,8 @@ NTSTATUS SmUpdateEnvironment(VOID) { - /* TODO */ - return STATUS_SUCCESS; + /* TODO */ + return STATUS_SUCCESS; } /* EOF */

1 0

[dreimer] 31447: Show more than 'make' or 'makex' in the title. Now it Shows 'make bootcd' as an example.
by dreimer＠svn.reactos.org 26 Dec '07

26 Dec '07

Author: dreimer Date: Wed Dec 26 17:08:29 2007 New Revision: 31447 URL: http://svn.reactos.org/svn/reactos?rev=31447&view=rev Log: Show more than 'make' or 'makex' in the title. Now it Shows 'make bootcd' as an example. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Wed Dec 26 17:08:29 2007 @@ -95,10 +95,18 @@ :: Check if we are using -j or not. :: if "%1" == "multi" ( - title 'makex' parallel build started: %TIMERAW% + if not "%2" == "" ( + title 'makex %2' parallel build started: %TIMERAW% + ) else ( + title 'makex' parallel build started: %TIMERAW% + ) call :BUILDMULTI %* ) else ( - title 'make' build started: %TIMERAW% + if not "%1" == "" ( + title 'make %1' build started: %TIMERAW% + ) else ( + title 'make' build started: %TIMERAW% + ) call :BUILD %* ) goto :EOC

1 0

[hpoussin] 31446: In filter command, use component names instead of components ids
by hpoussin＠svn.reactos.org 26 Dec '07

26 Dec '07

Author: hpoussin Date: Wed Dec 26 16:58:41 2007 New Revision: 31446 URL: http://svn.reactos.org/svn/reactos?rev=31446&view=rev Log: In filter command, use component names instead of components ids Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Wed Dec 26 16:58:41 2007 @@ -21,6 +21,7 @@ * FILE: ntoskrnl/dbg/kdb_cli.c * PURPOSE: Kernel debugger command line interface * PROGRAMMER: Gregor Anich (blight(a)blight.eu.org) + * Hervé Poussineau * UPDATE HISTORY: * Created 16/01/2005 */ @@ -146,12 +147,137 @@ /* Others */ { NULL, NULL, "Others", NULL }, { "bugcheck", "bugcheck", "Bugchecks the system.", KdbpCmdBugCheck }, - { "filter", "filter [componentid] [error|warning|trace|info|level] [on|off]", "Enable/disable debug channels", KdbpCmdFilter }, + { "filter", "filter componentname [error|warning|trace|info|level] [on|off]", "Enable/disable debug channels", KdbpCmdFilter }, { "set", "set [var] [value]", "Sets var to value or displays value of var.", KdbpCmdSet }, { "help", "help", "Display help screen.", KdbpCmdHelp } }; /* FUNCTIONS *****************************************************************/ + +/*!\brief Transform a component name to an integer + * + * \param ComponentName The name of the component. + * \param ComponentId Receives the component id on success. + * + * \retval TRUE Success. + * \retval FALSE Failure. + */ +STATIC BOOLEAN +KdbpGetComponentId( + IN PCCH ComponentName, + OUT PULONG ComponentId) +{ + ULONG i; + + static struct { + PCCH Name; + ULONG Id; + } ComponentTable[] = { + { "SYSTEM", DPFLTR_SYSTEM_ID }, + { "SMSS", DPFLTR_SMSS_ID }, + { "SETUP", DPFLTR_SETUP_ID }, + { "NTFS", DPFLTR_NTFS_ID }, + { "FSTUB", DPFLTR_FSTUB_ID }, + { "CRASHDUMP", DPFLTR_CRASHDUMP_ID }, + { "CDAUDIO", DPFLTR_CDAUDIO_ID }, + { "CDROM", DPFLTR_CDROM_ID }, + { "CLASSPNP", DPFLTR_CLASSPNP_ID }, + { "DISK", DPFLTR_DISK_ID }, + { "REDBOOK", DPFLTR_REDBOOK_ID }, + { "STORPROP", DPFLTR_STORPROP_ID }, + { "SCSIPORT", DPFLTR_SCSIPORT_ID }, + { "SCSIMINIPORT", DPFLTR_SCSIMINIPORT_ID }, + { "CONFIG", DPFLTR_CONFIG_ID }, + { "I8042PRT", DPFLTR_I8042PRT_ID }, + { "SERMOUSE", DPFLTR_SERMOUSE_ID }, + { "LSERMOUS", DPFLTR_LSERMOUS_ID }, + { "KBDHID", DPFLTR_KBDHID_ID }, + { "MOUHID", DPFLTR_MOUHID_ID }, + { "KBDCLASS", DPFLTR_KBDCLASS_ID }, + { "MOUCLASS", DPFLTR_MOUCLASS_ID }, + { "TWOTRACK", DPFLTR_TWOTRACK_ID }, + { "WMILIB", DPFLTR_WMILIB_ID }, + { "ACPI", DPFLTR_ACPI_ID }, + { "AMLI", DPFLTR_AMLI_ID }, + { "HALIA64", DPFLTR_HALIA64_ID }, + { "VIDEO", DPFLTR_VIDEO_ID }, + { "SVCHOST", DPFLTR_SVCHOST_ID }, + { "VIDEOPRT", DPFLTR_VIDEOPRT_ID }, + { "TCPIP", DPFLTR_TCPIP_ID }, + { "DMSYNTH", DPFLTR_DMSYNTH_ID }, + { "NTOSPNP", DPFLTR_NTOSPNP_ID }, + { "FASTFAT", DPFLTR_FASTFAT_ID }, + { "SAMSS", DPFLTR_SAMSS_ID }, + { "PNPMGR", DPFLTR_PNPMGR_ID }, + { "NETAPI", DPFLTR_NETAPI_ID }, + { "SCSERVER", DPFLTR_SCSERVER_ID }, + { "SCCLIENT", DPFLTR_SCCLIENT_ID }, + { "SERIAL", DPFLTR_SERIAL_ID }, + { "SERENUM", DPFLTR_SERENUM_ID }, + { "UHCD", DPFLTR_UHCD_ID }, + { "BOOTOK", DPFLTR_BOOTOK_ID }, + { "BOOTVRFY", DPFLTR_BOOTVRFY_ID }, + { "RPCPROXY", DPFLTR_RPCPROXY_ID }, + { "AUTOCHK", DPFLTR_AUTOCHK_ID }, + { "DCOMSS", DPFLTR_DCOMSS_ID }, + { "UNIMODEM", DPFLTR_UNIMODEM_ID }, + { "SIS", DPFLTR_SIS_ID }, + { "FLTMGR", DPFLTR_FLTMGR_ID }, + { "WMICORE", DPFLTR_WMICORE_ID }, + { "BURNENG", DPFLTR_BURNENG_ID }, + { "IMAPI", DPFLTR_IMAPI_ID }, + { "SXS", DPFLTR_SXS_ID }, + { "FUSION", DPFLTR_FUSION_ID }, + { "IDLETASK", DPFLTR_IDLETASK_ID }, + { "SOFTPCI", DPFLTR_SOFTPCI_ID }, + { "TAPE", DPFLTR_TAPE_ID }, + { "MCHGR", DPFLTR_MCHGR_ID }, + { "IDEP", DPFLTR_IDEP_ID }, + { "PCIIDE", DPFLTR_PCIIDE_ID }, + { "FLOPPY", DPFLTR_FLOPPY_ID }, + { "FDC", DPFLTR_FDC_ID }, + { "TERMSRV", DPFLTR_TERMSRV_ID }, + { "W32TIME", DPFLTR_W32TIME_ID }, + { "PREFETCHER", DPFLTR_PREFETCHER_ID }, + { "RSFILTER", DPFLTR_RSFILTER_ID }, + { "FCPORT", DPFLTR_FCPORT_ID }, + { "PCI", DPFLTR_PCI_ID }, + { "DMIO", DPFLTR_DMIO_ID }, + { "DMCONFIG", DPFLTR_DMCONFIG_ID }, + { "DMADMIN", DPFLTR_DMADMIN_ID }, + { "WSOCKTRANSPORT", DPFLTR_WSOCKTRANSPORT_ID }, + { "VSS", DPFLTR_VSS_ID }, + { "PNPMEM", DPFLTR_PNPMEM_ID }, + { "PROCESSOR", DPFLTR_PROCESSOR_ID }, + { "DMSERVER", DPFLTR_DMSERVER_ID }, + { "SR", DPFLTR_SR_ID }, + { "INFINIBAND", DPFLTR_INFINIBAND_ID }, + { "IHVDRIVER", DPFLTR_IHVDRIVER_ID }, + { "IHVVIDEO", DPFLTR_IHVVIDEO_ID }, + { "IHVAUDIO", DPFLTR_IHVAUDIO_ID }, + { "IHVNETWORK", DPFLTR_IHVNETWORK_ID }, + { "IHVSTREAMING", DPFLTR_IHVSTREAMING_ID }, + { "IHVBUS", DPFLTR_IHVBUS_ID }, + { "HPS", DPFLTR_HPS_ID }, + { "RTLTHREADPOOL", DPFLTR_RTLTHREADPOOL_ID }, + { "LDR", DPFLTR_LDR_ID }, + { "TCPIP6", DPFLTR_TCPIP6_ID }, + { "ISAPNP", DPFLTR_ISAPNP_ID }, + { "SHPC", DPFLTR_SHPC_ID }, + { "STORPORT", DPFLTR_STORPORT_ID }, + { "STORMINIPORT", DPFLTR_STORMINIPORT_ID }, + { "PRINTSPOOLER", DPFLTR_PRINTSPOOLER_ID }, + }; + + for (i = 0; i < sizeof(ComponentTable) / sizeof(ComponentTable[0]); i++) + if (_stricmp(ComponentName, ComponentTable[i].Name) == 0) + { + *ComponentId = ComponentTable[i].Id; + return TRUE; + } + + return FALSE; +} /*!\brief Evaluates an expression... * @@ -259,10 +385,9 @@ KdbpPrint("filter: component id argument required!\n"); return TRUE; } - ComponentId = strtoul(Argv[1], &pend, 0); - if (Argv[1] == pend) - { - KdbpPrint("filter: '%s' is not a valid component id!\n", Argv[1]); + if (!KdbpGetComponentId(Argv[1], &ComponentId)) + { + KdbpPrint("filter: '%s' is not a valid component name!\n", Argv[1]); return TRUE; } @@ -282,16 +407,11 @@ else { Level = strtoul(Argv[2], &pend, 0); - if (Argv[2] == pend) + if (Argv[2] == pend || *pend != '\0') { KdbpPrint("filter: '%s' is not a valid level!\n", Argv[2]); return TRUE; } - } - if (Level < 31) - { - /* Interpret it as a bit shift */ - Level = 1 << Level; } if (Argc < 4) @@ -1290,7 +1410,7 @@ STATIC BOOLEAN KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[]) { - KDESCRIPTOR Reg = {0}; + KDESCRIPTOR Reg = {0}; ULONG SegDesc[2]; ULONG SegBase; ULONG SegLimit;

1 0

[dreimer] 31445: Fixed two more lines which are too long and look a bit crappy in USetup.
by dreimer＠svn.reactos.org 26 Dec '07

26 Dec '07

Author: dreimer Date: Wed Dec 26 16:25:13 2007 New Revision: 31445 URL: http://svn.reactos.org/svn/reactos?rev=31445&view=rev Log: Fixed two more lines which are too long and look a bit crappy in USetup. Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Wed Dec 26 16:25:13 2007 @@ -518,7 +518,7 @@ { 10, 6, - "Das System vergewissert sich nun, dass alle Daten gespeichert sind.", + "Das System vergewissert sich, dass alle Daten gespeichert sind.", TEXT_NORMAL }, { @@ -530,7 +530,7 @@ { 10, 9, - "Der Computer wird automatisch neustarten, wenn der Vorgang beendet ist.", + "Der PC wird automatisch neustarten, wenn der Vorgang beendet ist.", TEXT_NORMAL }, {

1 0

[hpoussin] 31444: Add more DPFLTR_*_ID constants
by hpoussin＠svn.reactos.org 26 Dec '07

26 Dec '07

Author: hpoussin Date: Wed Dec 26 14:08:41 2007 New Revision: 31444 URL: http://svn.reactos.org/svn/reactos?rev=31444&view=rev Log: Add more DPFLTR_*_ID constants Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Wed Dec 26 14:08:41 2007 @@ -242,9 +242,101 @@ typedef enum _DPFLTR_TYPE { + DPFLTR_SYSTEM_ID = 0, + DPFLTR_SMSS_ID = 1, + DPFLTR_SETUP_ID = 2, + DPFLTR_NTFS_ID = 3, + DPFLTR_FSTUB_ID = 4, + DPFLTR_CRASHDUMP_ID = 5, + DPFLTR_CDAUDIO_ID = 6, + DPFLTR_CDROM_ID = 7, + DPFLTR_CLASSPNP_ID = 8, + DPFLTR_DISK_ID = 9, + DPFLTR_REDBOOK_ID = 10, + DPFLTR_STORPROP_ID = 11, + DPFLTR_SCSIPORT_ID = 12, + DPFLTR_SCSIMINIPORT_ID = 13, + DPFLTR_CONFIG_ID = 14, DPFLTR_I8042PRT_ID = 15, + DPFLTR_SERMOUSE_ID = 16, + DPFLTR_LSERMOUS_ID = 17, + DPFLTR_KBDHID_ID = 18, + DPFLTR_MOUHID_ID = 19, + DPFLTR_KBDCLASS_ID = 20, + DPFLTR_MOUCLASS_ID = 21, + DPFLTR_TWOTRACK_ID = 22, + DPFLTR_WMILIB_ID = 23, + DPFLTR_ACPI_ID = 24, + DPFLTR_AMLI_ID = 25, + DPFLTR_HALIA64_ID = 26, + DPFLTR_VIDEO_ID = 27, + DPFLTR_SVCHOST_ID = 28, + DPFLTR_VIDEOPRT_ID = 29, DPFLTR_TCPIP_ID = 30, + DPFLTR_DMSYNTH_ID = 31, + DPFLTR_NTOSPNP_ID = 32, + DPFLTR_FASTFAT_ID = 33, + DPFLTR_SAMSS_ID = 34, + DPFLTR_PNPMGR_ID = 35, + DPFLTR_NETAPI_ID = 36, + DPFLTR_SCSERVER_ID = 37, + DPFLTR_SCCLIENT_ID = 38, + DPFLTR_SERIAL_ID = 39, + DPFLTR_SERENUM_ID = 40, + DPFLTR_UHCD_ID = 41, + DPFLTR_BOOTOK_ID = 42, + DPFLTR_BOOTVRFY_ID = 43, + DPFLTR_RPCPROXY_ID = 44, + DPFLTR_AUTOCHK_ID = 45, + DPFLTR_DCOMSS_ID = 46, + DPFLTR_UNIMODEM_ID = 47, + DPFLTR_SIS_ID = 48, + DPFLTR_FLTMGR_ID = 49, + DPFLTR_WMICORE_ID = 50, + DPFLTR_BURNENG_ID = 51, + DPFLTR_IMAPI_ID = 52, + DPFLTR_SXS_ID = 53, + DPFLTR_FUSION_ID = 54, + DPFLTR_IDLETASK_ID = 55, + DPFLTR_SOFTPCI_ID = 56, + DPFLTR_TAPE_ID = 57, + DPFLTR_MCHGR_ID = 58, + DPFLTR_IDEP_ID = 59, + DPFLTR_PCIIDE_ID = 60, + DPFLTR_FLOPPY_ID = 61, + DPFLTR_FDC_ID = 62, + DPFLTR_TERMSRV_ID = 63, + DPFLTR_W32TIME_ID = 64, DPFLTR_PREFETCHER_ID = 65, + DPFLTR_RSFILTER_ID = 66, + DPFLTR_FCPORT_ID = 67, + DPFLTR_PCI_ID = 68, + DPFLTR_DMIO_ID = 69, + DPFLTR_DMCONFIG_ID = 70, + DPFLTR_DMADMIN_ID = 71, + DPFLTR_WSOCKTRANSPORT_ID = 72, + DPFLTR_VSS_ID = 73, + DPFLTR_PNPMEM_ID = 74, + DPFLTR_PROCESSOR_ID = 75, + DPFLTR_DMSERVER_ID = 76, + DPFLTR_SR_ID = 77, + DPFLTR_INFINIBAND_ID = 78, + DPFLTR_IHVDRIVER_ID = 79, + DPFLTR_IHVVIDEO_ID = 80, + DPFLTR_IHVAUDIO_ID = 81, + DPFLTR_IHVNETWORK_ID = 82, + DPFLTR_IHVSTREAMING_ID = 83, + DPFLTR_IHVBUS_ID = 84, + DPFLTR_HPS_ID = 85, + DPFLTR_RTLTHREADPOOL_ID = 86, + DPFLTR_LDR_ID = 87, + DPFLTR_TCPIP6_ID = 88, + DPFLTR_ISAPNP_ID = 89, + DPFLTR_SHPC_ID = 90, + DPFLTR_STORPORT_ID = 91, + DPFLTR_STORMINIPORT_ID = 92, + DPFLTR_PRINTSPOOLER_ID = 93, + DPFLTR_ENDOFTABLE_ID } DPFLTR_TYPE; #define MAXIMUM_PROCESSORS 32 @@ -5441,6 +5533,35 @@ return Number; } +#elif defined(_MIPS_) + +typedef ULONG PFN_NUMBER, *PPFN_NUMBER; + +#define PASSIVE_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define PROFILE_LEVEL 27 +#define IPI_LEVEL 29 +#define HIGH_LEVEL 31 + +typedef struct _KPCR { + struct _KPRCB *Prcb; /* 20 */ + KIRQL Irql; /* 24 */ + ULONG IRR; /* 28 */ + ULONG IDR; /* 30 */ +} KPCR, *PKPCR; + +typedef struct _KFLOATING_SAVE { +} KFLOATING_SAVE, *PKFLOATING_SAVE; + +static __inline +ULONG +DDKAPI +KeGetCurrentProcessorNumber(VOID) +{ + return 0; +} + #else #error Unknown architecture #endif @@ -9400,6 +9521,35 @@ #define KeLowerIrql(a) KfLowerIrql(a) #define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) +#elif defined(_M_MIPS) + +#define KeLowerIrql(a) KfLowerIrql(a) +#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) + +NTKERNELAPI +VOID +NTAPI +KfLowerIrql( + IN KIRQL NewIrql); + +NTKERNELAPI +KIRQL +NTAPI +KfRaiseIrql( + IN KIRQL NewIrql); + +NTKERNELAPI +KIRQL +NTAPI +KeRaiseIrqlToDpcLevel( + VOID); + +NTKERNELAPI +KIRQL +DDKAPI +KeRaiseIrqlToSynchLevel( + VOID); + #else NTKERNELAPI

1 0

[hpoussin] 31443: Remove hack, as we can use 'filter' command in kdbg instead Fix debug level definitions
by hpoussin＠svn.reactos.org 26 Dec '07

26 Dec '07

Author: hpoussin Date: Wed Dec 26 13:24:31 2007 New Revision: 31443 URL: http://svn.reactos.org/svn/reactos?rev=31443&view=rev Log: Remove hack, as we can use 'filter' command in kdbg instead Fix debug level definitions Modified: trunk/reactos/drivers/network/tcpip/include/debug.h trunk/reactos/drivers/network/tcpip/tcpip/main.c Modified: trunk/reactos/drivers/network/tcpip/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/debug.h (original) +++ trunk/reactos/drivers/network/tcpip/include/debug.h Wed Dec 26 13:24:31 2007 @@ -9,9 +9,9 @@ #ifndef __DEBUG_H #define __DEBUG_H -#define MIN_TRACE DPFLTR_WARNING_LEVEL -#define MID_TRACE DPFLTR_WARNING_LEVEL | DPFLTR_TRACE_LEVEL -#define MAX_TRACE DPFLTR_WARNING_LEVEL | DPFLTR_TRACE_LEVEL | DPFLTR_INFO_LEVEL +#define MIN_TRACE ((1 << DPFLTR_WARNING_LEVEL)) +#define MID_TRACE ((1 << DPFLTR_WARNING_LEVEL) | (1 << DPFLTR_TRACE_LEVEL)) +#define MAX_TRACE ((1 << DPFLTR_WARNING_LEVEL) | (1 << DPFLTR_TRACE_LEVEL) | (1 << DPFLTR_INFO_LEVEL)) #define DEBUG_CHECK 0x00000100 #define DEBUG_MEMORY 0x00000200 @@ -37,8 +37,8 @@ #define REMOVE_PARENS(...) __VA_ARGS__ #define TI_DbgPrint(_t_, _x_) \ - DbgPrintEx(DPFLTR_TCPIP_ID, (_t_) & DPFLTR_MASK, "(%s:%d) ", __FILE__, __LINE__), \ - DbgPrintEx(DPFLTR_TCPIP_ID, (_t_) & DPFLTR_MASK, REMOVE_PARENS _x_) + DbgPrintEx(DPFLTR_TCPIP_ID, (_t_) | DPFLTR_MASK, "(%s:%d) ", __FILE__, __LINE__), \ + DbgPrintEx(DPFLTR_TCPIP_ID, (_t_) | DPFLTR_MASK, REMOVE_PARENS _x_) #else /* DBG */ Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c Wed Dec 26 13:24:31 2007 @@ -8,14 +8,6 @@ * CSH 01/08-2000 Created */ #include "precomp.h" - -#define NDEBUG - -#ifndef NDEBUG -DWORD DebugTraceLevel = DEBUG_ULTRA & ~(DEBUG_LOCK | DEBUG_PBUFFER); -#else -DWORD DebugTraceLevel = 0; -#endif /* NDEBUG */ PDEVICE_OBJECT TCPDeviceObject = NULL; PDEVICE_OBJECT UDPDeviceObject = NULL; @@ -861,9 +853,6 @@ DueTime.QuadPart = -(LONGLONG)IP_TIMEOUT * 10000; KeSetTimerEx(&IPTimer, DueTime, IP_TIMEOUT, &IPTimeoutDpc); - /* ROS Hack: ideally, DebugTraceLevel variable should be removed */ - DbgSetDebugFilterState(DPFLTR_TCPIP_ID, DebugTraceLevel, TRUE); - return STATUS_SUCCESS; }

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