Ros-diffs October 2012

ros-diffs@reactos.org

14 participants
211 discussions

[tkreuzer] 57460: [LIBCNTPR] Add atan2 [WIN32K] Remove duplicated floating point math functions [CPORTLIB] Fix an MSVC warning

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Oct 2 21:43:47 2012 New Revision: 57460 URL: http://svn.reactos.org/svn/reactos?rev=57460&view=rev Log: [LIBCNTPR] Add atan2 [WIN32K] Remove duplicated floating point math functions [CPORTLIB] Fix an MSVC warning Removed: trunk/reactos/win32ss/user/ntuser/misc/i386/ Modified: trunk/reactos/lib/cportlib/cport.c trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/win32ss/CMakeLists.txt Modified: trunk/reactos/lib/cportlib/cport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cportlib/cport.c?rev=5… ============================================================================== --- trunk/reactos/lib/cportlib/cport.c [iso-8859-1] (original) +++ trunk/reactos/lib/cportlib/cport.c [iso-8859-1] Tue Oct 2 21:43:47 2012 @@ -23,7 +23,7 @@ - Make this serial-port specific (NS16550 vs other serial port types) - Get x64 KDCOM, KDBG, FREELDR, and other current code to use this */ - + /* INCLUDES *******************************************************************/ #include <cportlib/cportlib.h> @@ -76,18 +76,18 @@ /* * See "Building Hardware and Firmware to Complement Microsoft Windows Headless Operation" * Out-of-Band Management Port Device Requirements: - * The device must act as a 16550 or 16450 UART. + * The device must act as a 16550 or 16450 UART. * Windows Server 2003 will test this device using the following process. * 1. Save off the current modem status register. * 2. Place the UART into diagnostic mode (The UART is placed into loopback mode * by writing SERIAL_MCR_LOOP to the modem control register). * 3. The modem status register is read and the high bits are checked. This means - * SERIAL_MSR_CTS, SERIAL_MSR_DSR, SERIAL_MSR_RI and SERIAL_MSR_DCD should + * SERIAL_MSR_CTS, SERIAL_MSR_DSR, SERIAL_MSR_RI and SERIAL_MSR_DCD should * all be clear. * 4. Place the UART in diagnostic mode and turn on OUTPUT (Loopback Mode and * OUTPUT are both turned on by writing (SERIAL_MCR_LOOP | SERIAL_MCR_OUT1) * to the modem control register). - * 5. The modem status register is read and the ring indicator is checked. + * 5. The modem status register is read and the ring indicator is checked. * This means SERIAL_MSR_RI should be set. * 6. Restore original modem status register. */ @@ -144,7 +144,7 @@ WRITE_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER, Lcr | SERIAL_LCR_DLAB); /* Set baud rate */ - Mode = 115200 / Rate; + Mode = (USHORT)(115200 / Rate); WRITE_PORT_UCHAR(Port->Address + DIVISOR_LATCH_MSB, (UCHAR)((Mode >> 8) & 0xff)); WRITE_PORT_UCHAR(Port->Address + DIVISOR_LATCH_LSB, (UCHAR)(Mode & 0xff)); @@ -168,7 +168,7 @@ /* Handle early read-before-init */ if (!Port->Address) return CP_GET_NODATA; - + /* If "wait" mode enabled, spin many times, otherwise attempt just once */ i = Wait ? 204800 : 1; while (i--) Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Tue Oct 2 21:43:47 2012 @@ -80,6 +80,7 @@ math/i386/allshl_asm.s math/i386/allshr_asm.s math/i386/atan_asm.s + math/i386/atan2_asm.s math/i386/aulldiv_asm.s math/i386/aulldvrm_asm.s math/i386/aullrem_asm.s Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Tue Oct 2 21:43:47 2012 @@ -194,12 +194,7 @@ gdi/dib/i386/dib24bpp_hline.s gdi/dib/i386/dib32bpp_hline.s gdi/dib/i386/dib32bpp_colorfill.s - gdi/eng/i386/floatobj.S - user/ntuser/misc/i386/cos_asm.s - user/ntuser/misc/i386/sin_asm.s - user/ntuser/misc/i386/atan2_asm.s - user/ntuser/misc/i386/floor_asm.s - user/ntuser/misc/i386/ceil_asm.s) + gdi/eng/i386/floatobj.S) else() list(APPEND SOURCE gdi/dib/dib24bppc.c

12 years, 2 months

[tkreuzer] 57459: [WIN32K] Move gdi kdbg extension into a separate file, prefix names with ! to match WinDbg extensions more closely (e.g. "!gdi.help"), imlement help, dumpht, handle, entry and eve...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Oct 2 21:20:28 2012 New Revision: 57459 URL: http://svn.reactos.org/svn/reactos?rev=57459&view=rev Log: [WIN32K] Move gdi kdbg extension into a separate file, prefix names with ! to match WinDbg extensions more closely (e.g. "!gdi.help"), imlement help, dumpht, handle, entry and eventlist commands. Added: trunk/reactos/win32ss/gdi/ntgdi/gdikdbgext.c (with props) Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Tue Oct 2 21:20:28 2012 @@ -206,6 +206,11 @@ gdi/dib/dib32bppc.c) endif() +if(KDBG) + list(APPEND SOURCE + gdi/ntgdi/gdikdbgext.c) +endif() + add_library(win32k SHARED ${CMAKE_CURRENT_BINARY_DIR}/win32k.def ${SOURCE}) Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] Tue Oct 2 21:20:28 2012 @@ -423,6 +423,7 @@ #define REL_ADDR(va) ((ULONG_PTR)va - (ULONG_PTR)&__ImageBase) VOID +NTAPI DbgPrintEvent(PLOGENTRY pLogEntry) { PSTR pstr; @@ -465,7 +466,6 @@ pLogEntry = CONTAINING_RECORD(psle, LOGENTRY, sleLink); DbgPrintEvent(pLogEntry); } - } VOID @@ -730,35 +730,6 @@ } -#if KDBG - -BOOLEAN -NTAPI -DbgGdiKdbgCliCallback( - IN PCHAR pszCommand, - IN ULONG argc, - IN PCH argv[]) -{ - - if (stricmp(argv[0], "gdi!dumpht") == 0) - { - DbgDumpGdiHandleTable(argc - 1, argv + 1); - } - else if (stricmp(argv[0], "gdi!handle") == 0) - { - DbgDumpHandleInfo(argv[1]); - } - else - { - /* Not handled */ - return FALSE; - } - - return TRUE; -} - -#endif // KDBG - #endif // DBG /* EOF */ Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidebug… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] Tue Oct 2 21:20:28 2012 @@ -41,6 +41,7 @@ VOID NTAPI DbgDumpEventList(PSLIST_HEADER pslh); VOID NTAPI DbgLogEvent(PSLIST_HEADER pslh, LOG_EVENT_TYPE nEventType, LPARAM lParam); VOID NTAPI DbgCleanupEventList(PSLIST_HEADER pslh); +VOID NTAPI DbgPrintEvent(PLOGENTRY pLogEntry); #define DBG_LOGEVENT(pslh, type, val) DbgLogEvent(pslh, type, (ULONG_PTR)val) #define DBG_INITLOG(pslh) InitializeSListHead(pslh) #define DBG_DUMP_EVENT_LIST(pslh) DbgDumpEventList(pslh) Added: trunk/reactos/win32ss/gdi/ntgdi/gdikdbgext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdikdbge… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdikdbgext.c (added) +++ trunk/reactos/win32ss/gdi/ntgdi/gdikdbgext.c [iso-8859-1] Tue Oct 2 21:20:28 2012 @@ -1,0 +1,369 @@ +/* + * PROJECT: ReactOS win32 kernel mode subsystem + * LICENSE: GPL - See COPYING in the top level directory + * FILE: win32ss/gdi/ntgdi/gdikdbgext.x + * PURPOSE: KDBG extension for GDI + * PROGRAMMERS: Timo Kreuzer + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +//#define NDEBUG +//#include <debug.h> + +extern PENTRY gpentHmgr; +extern PULONG gpaulRefCount; +extern PEPROCESS gpepCSRSS; +extern ULONG gulFirstUnused; + + +static const char * gpszObjectTypes[] = +{ + "FREE", "DC", "UNUSED1", "UNUSED2", "RGN", "SURF", "CLIENTOBJ", "PATH", + "PAL", "ICMLCS", "LFONT", "RFONT", "PFE", "PFT", "ICMCXF", "SPRITE", + "BRUSH", "UMPD", "UNUSED4", "SPACE", "UNUSED5", "META", "EFSTATE", + "BMFD", "VTFD", "TTFD", "RC", "TEMP", "DRVOBJ", "DCIOBJ", "SPOOL", + "RESERVED", "ALL" +}; + + +BOOLEAN +KdbIsMemoryValid(PVOID pvBase, ULONG cjSize) +{ + PUCHAR pjAddress; + + pjAddress = ALIGN_DOWN_POINTER_BY(pvBase, PAGE_SIZE); + + while (pjAddress < (PUCHAR)pvBase + cjSize) + { + if (!MmIsAddressValid(pjAddress)) return FALSE; + pjAddress += PAGE_SIZE; + } + + return TRUE; +} + +static +BOOL +KdbGetHexNumber(char *pszNum, ULONG_PTR *pulValue) +{ + char *endptr; + + /* Skip optional '0x' prefix */ + if ((pszNum[0] == '0') && ((pszNum[1] == 'x') || (pszNum[1] == 'X'))) + pszNum += 2; + + /* Make a number from the string (hex) */ + *pulValue = strtoul(pszNum, &endptr, 16); + + return (*endptr == '\0'); +} + +static +VOID +KdbCommand_Gdi_help(VOID) +{ + DbgPrint("GDI KDBG extension.\nAvailable commands:\n" + "- help - Displays this screen.\n" + "- dumpht [<type>] - Dumps all handles of <type> or lists all types\n" + "- handle <handle> - Displays information about a handle\n" + "- entry <entry> - Displays an ENTRY, <entry> can be a pointer or index\n" + "- baseobject <object> - Displays a BASEOBJECT\n" +#if DBG_ENABLE_EVENT_LOGGING + "- eventlist <object> - Displays the eventlist for an object\n" +#endif + ); +} + +static +VOID +KdbCommand_Gdi_dumpht(ULONG argc, char *argv[]) +{ + ULONG i; + UCHAR Objt, jReqestedType; + PENTRY pentry; + POBJ pobj; + KAPC_STATE ApcState; + ULONG_PTR ulArg; + + /* No CSRSS, no handle table */ + if (!gpepCSRSS) return; + KeStackAttachProcess(&gpepCSRSS->Pcb, &ApcState); + + if (argc == 0) + { + USHORT Counts[GDIObjType_MAX_TYPE + 2] = {0}; + + /* Loop all possibly used entries in the handle table */ + for (i = RESERVE_ENTRIES_COUNT; i < gulFirstUnused; i++) + { + if (KdbIsMemoryValid(&gpentHmgr[i], sizeof(ENTRY))) + { + Objt = gpentHmgr[i].Objt & 0x1F; + Counts[Objt]++; + } + } + + DbgPrint("Type Count\n"); + DbgPrint("-------------------\n"); + for (i = 0; i <= GDIObjType_MAX_TYPE; i++) + { + DbgPrint("%02x %-9s %d\n", + i, gpszObjectTypes[i], Counts[i]); + } + DbgPrint("\n"); + } + else + { + /* Loop all object types */ + for (i = 0; i <= GDIObjType_MAX_TYPE + 1; i++) + { + /* Check if this object type was requested */ + if (stricmp(argv[0], gpszObjectTypes[i]) == 0) break; + } + + /* Check if we didn't find it yet */ + if (i > GDIObjType_MAX_TYPE + 1) + { + /* Try if it's a number */ + if (!KdbGetHexNumber(argv[0], &ulArg)) + { + DbgPrint("Invalid parameter: %s\n", argv[0]); + return; + } + + /* Check if it's inside the allowed range */ + if (i > GDIObjType_MAX_TYPE) + { + DbgPrint("Unknown object type: %s\n", argv[0]); + goto leave; + } + } + + jReqestedType = i; + + /* Print header */ + DbgPrint("Index Handle Type pObject ThreadId cLocks ulRefCount\n"); + DbgPrint("---------------------------------------------------------------\n"); + + /* Loop all possibly used entries in the handle table */ + for (i = RESERVE_ENTRIES_COUNT; i < gulFirstUnused; i++) + { + /* Get the entry and the object */ + pentry = &gpentHmgr[i]; + + if (!MmIsAddressValid(pentry)) continue; + + pobj = pentry->einfo.pobj; + Objt = pentry->Objt & 0x1F; + + /* Check if ALL objects are requested, or the object type matches */ + if ((jReqestedType == GDIObjType_MAX_TYPE + 1) || + (Objt == jReqestedType)) + { + DbgPrint("%04lx %p %-9s 0x%p 0x%06lx %-6ld ", + i, pobj->hHmgr, gpszObjectTypes[Objt], pobj, + pobj->dwThreadId, pobj->cExclusiveLock); + if (MmIsAddressValid(&gpaulRefCount[i])) + DbgPrint("0x%08lx\n", gpaulRefCount[i]); + else + DbgPrint("??????????\n"); + } + } + } + +leave: + KeUnstackDetachProcess(&ApcState); +} + +static +VOID +KdbCommand_Gdi_handle(char *argv) +{ + ULONG_PTR ulObject; + BASEOBJECT *pobj; + ENTRY *pentry; + USHORT usIndex; + KAPC_STATE ApcState; + + /* Convert the parameter into a number */ + if (!KdbGetHexNumber(argv, &ulObject)) + { + DbgPrint("Invalid parameter: %s\n", argv); + return; + } + + /* No CSRSS, no handle table */ + if (!gpepCSRSS) return; + KeStackAttachProcess(&gpepCSRSS->Pcb, &ApcState); + + usIndex = ulObject & 0xFFFF; + pentry = &gpentHmgr[usIndex]; + + if (MmIsAddressValid(pentry)) + { + pobj = pentry->einfo.pobj; + + DbgPrint("GDI handle=%p, type=%s, index=0x%lx, pentry=%p.\n", + ulObject, gpszObjectTypes[(ulObject >> 16) & 0x1f], + usIndex, pentry); + DbgPrint(" ENTRY = {.pobj = %p, ObjectOwner = 0x%lx, FullUnique = 0x%04x,\n" + " Objt=0x%02x, Flags = 0x%02x, pUser = 0x%p}\n", + pentry->einfo.pobj, pentry->ObjectOwner.ulObj, pentry->FullUnique, + pentry->Objt, pentry->Flags, pentry->pUser); + DbgPrint(" BASEOBJECT = {hHmgr = %p, dwThreadId = 0x%lx,\n" + " cExclusiveLock = %ld, BaseFlags = 0x%lx}\n", + pobj->hHmgr, pobj->dwThreadId, + pobj->cExclusiveLock, pobj->BaseFlags); + if (MmIsAddressValid(&gpaulRefCount[usIndex])) + DbgPrint(" gpaulRefCount[idx] = %ld\n", gpaulRefCount[usIndex]); + } + else + { + DbgPrint("Coudn't access ENTRY. Probably paged out.\n"); + } + + KeUnstackDetachProcess(&ApcState); +} + +static +VOID +KdbCommand_Gdi_entry(char *argv) +{ + ULONG_PTR ulValue; + PENTRY pentry; + KAPC_STATE ApcState; + + /* Convert the parameter into a number */ + if (!KdbGetHexNumber(argv, &ulValue)) + { + DbgPrint("Invalid parameter: %s\n", argv); + return; + } + + /* No CSRSS, no handle table */ + if (!gpepCSRSS) return; + KeStackAttachProcess(&gpepCSRSS->Pcb, &ApcState); + + /* If the parameter is smaller than 0x10000, it's an index */ + pentry = (ulValue <= 0xFFFF) ? &gpentHmgr[ulValue] : (PENTRY)ulValue; + + /* Check if the address is readable */ + if (!MmIsAddressValid(pentry)) + { + DbgPrint("Cannot access entry at %p\n", pentry); + goto cleanup; + } + + /* print the entry */ + DbgPrint("Dumping ENTRY #%ld, @%p:\n", (pentry - gpentHmgr), pentry); + if (pentry->Objt != 0) + DbgPrint(" pobj = 0x%p\n", pentry->einfo.pobj); + else + DbgPrint(" hFree = 0x%p\n", pentry->einfo.hFree); + DbgPrint(" ObjectOwner = 0x%p\n", pentry->ObjectOwner.ulObj); + DbgPrint(" FullUnique = 0x%x\n", pentry->FullUnique); + DbgPrint(" Objt = 0x%x (%s)\n", pentry->Objt, + pentry->Objt <= 0x1E ? gpszObjectTypes[pentry->Objt] : "invalid"); + DbgPrint(" Flags = 0x%x\n", pentry->Flags); + DbgPrint(" pUser = 0x%p\n", pentry->pUser); + +cleanup: + KeUnstackDetachProcess(&ApcState); +} + +static +VOID +KdbCommand_Gdi_baseobject(char *argv) +{ +} + +#if DBG_ENABLE_EVENT_LOGGING +static +VOID +KdbCommand_Gdi_eventlist(char *argv) +{ + ULONG_PTR ulValue; + POBJ pobj; + PSLIST_ENTRY psle, psleFirst; + PLOGENTRY pLogEntry; + + /* Convert the parameter into a number */ + if (!KdbGetHexNumber(argv, &ulValue)) + { + DbgPrint("Invalid parameter: %s\n", argv); + return; + } + + pobj = (POBJ)ulValue; + + /* Check if the address is readable */ + if (!KdbIsMemoryValid(pobj, sizeof(BASEOBJECT))) + { + DbgPrint("Cannot access BASEOBJECT at %p\n", pobj); + return; + } + + /* The kernel doesn't export RtlFirstEntrySList :( */ + psleFirst = InterlockedFlushSList(&pobj->slhLog); + + /* Loop all events, but don't remove them */ + for (psle = psleFirst; psle != NULL; psle = psle->Next) + { + pLogEntry = CONTAINING_RECORD(psle, LOGENTRY, sleLink); + DbgPrintEvent(pLogEntry); + } + + /* Put the log back in place */ + InterlockedPushEntrySList(&pobj->slhLog, psleFirst); +} +#endif + +BOOLEAN +NTAPI +DbgGdiKdbgCliCallback( + IN PCHAR pszCommand, + IN ULONG argc, + IN PCH argv[]) +{ + + if (stricmp(argv[0], "!gdi.help") == 0) + { + KdbCommand_Gdi_help(); + } + else if (stricmp(argv[0], "!gdi.dumpht") == 0) + { + KdbCommand_Gdi_dumpht(argc - 1, argv + 1); + } + else if (stricmp(argv[0], "!gdi.handle") == 0) + { + KdbCommand_Gdi_handle(argv[1]); + } + else if (stricmp(argv[0], "!gdi.entry") == 0) + { + KdbCommand_Gdi_entry(argv[1]); + } + else if (stricmp(argv[0], "!gdi.baseobject") == 0) + { + KdbCommand_Gdi_baseobject(argv[1]); + } +#if DBG_ENABLE_EVENT_LOGGING + else if (stricmp(argv[0], "!gdi.eventlist") == 0) + { + KdbCommand_Gdi_eventlist(argv[1]); + } +#endif + else + { + /* Not handled */ + return FALSE; + } + + return TRUE; +} + + + + + Propchange: trunk/reactos/win32ss/gdi/ntgdi/gdikdbgext.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Tue Oct 2 21:20:28 2012 @@ -79,8 +79,8 @@ /* Per session handle table globals */ static PVOID gpvGdiHdlTblSection = NULL; -static PENTRY gpentHmgr; -static PULONG gpaulRefCount; +PENTRY gpentHmgr; +PULONG gpaulRefCount; ULONG gulFirstFree; ULONG gulFirstUnused; static PPAGED_LOOKASIDE_LIST gpaLookasideList; @@ -1341,170 +1341,5 @@ return TRUE; } -#if DBG && KDBG -static const char * gpszObjectTypes[] = -{ - "FREE", "DC", "UNUSED1", "UNUSED2", "RGN", "SURF", "CLIENTOBJ", "PATH", - "PAL", "ICMLCS", "LFONT", "RFONT", "PFE", "PFT", "ICMCXF", "SPRITE", - "BRUSH", "UMPD", "UNUSED4", "SPACE", "UNUSED5", "META", "EFSTATE", - "BMFD", "VTFD", "TTFD", "RC", "TEMP", "DRVOBJ", "DCIOBJ", "SPOOL", - "RESERVED", "ALL" -}; - -extern PEPROCESS gpepCSRSS;; - -VOID -NTAPI -DbgDumpGdiHandleTable(ULONG argc, char *argv[]) -{ - ULONG i; - UCHAR Objt, jReqestedType; - PENTRY pentry; - POBJ pobj; - KAPC_STATE ApcState; - - /* No CSRSS, no handle table */ - if (!gpepCSRSS) return; - KeStackAttachProcess(&gpepCSRSS->Pcb, &ApcState); - - if (argc == 0) - { - USHORT Counts[GDIObjType_MAX_TYPE + 2] = {0}; - - /* Loop all possibly used entries in the handle table */ - for (i = RESERVE_ENTRIES_COUNT; i < gulFirstUnused; i++) - { - if (MmIsAddressValid(&gpentHmgr[i])) - { - Objt = gpentHmgr[i].Objt & 0x1F; - Counts[Objt]++; - } - } - - DbgPrint("Type Count\n"); - DbgPrint("-------------------\n"); - for (i = 0; i <= GDIObjType_MAX_TYPE; i++) - { - DbgPrint("%02x %-9s %d\n", - i, gpszObjectTypes[i], Counts[i]); - } - DbgPrint("\n"); - } - else - { - /* Loop all object types */ - for (i = 0; i <= GDIObjType_MAX_TYPE + 1; i++) - { - /* Check if this object type was requested */ - if (stricmp(argv[0], gpszObjectTypes[i]) == 0) - { - jReqestedType = i; - break; - } - } - - /* Check if we didn't find it yet */ - if (i > GDIObjType_MAX_TYPE) - { - /* Try if it's a number */ - i = atoi(argv[0]); - - /* Check for "0" */ - if ((i > GDIObjType_MAX_TYPE) || - ((i == 0) && (stricmp(argv[0], "0") == 0))) - { - DbgPrint("Unknown object type: %s\n", argv[0]); - goto leave; - } - - jReqestedType = i; - } - - /* Print header */ - DbgPrint("Index Handle Type ThreadId cLocks ulRefCount\n"); - DbgPrint("----------------------------------------------------\n"); - - /* Loop all possibly used entries in the handle table */ - for (i = RESERVE_ENTRIES_COUNT; i < gulFirstUnused; i++) - { - /* Get the entry and the object */ - pentry = &gpentHmgr[i]; - - if (!MmIsAddressValid(pentry)) continue; - - pobj = pentry->einfo.pobj; - Objt = pentry->Objt & 0x1F; - - if ((jReqestedType == GDIObjType_MAX_TYPE + 1) || - (Objt == jReqestedType)) - { - DbgPrint("%04lx %p %-9s 0x%06lx %-7ld ", - i, pobj->hHmgr, gpszObjectTypes[Objt], - pobj->dwThreadId, pobj->cExclusiveLock); - if (MmIsAddressValid(&gpaulRefCount[i])) - DbgPrint("0x%06lx\n", gpaulRefCount[i]); - else - DbgPrint("????????\n"); - } - } - } - -leave: - KeUnstackDetachProcess(&ApcState); -} - -VOID -NTAPI -DbgDumpHandleInfo(char *argv) -{ - ULONG_PTR ulObject; - BASEOBJECT *pobj; - ENTRY *pentry; - USHORT usIndex; - char *endptr; - KAPC_STATE ApcState; - - /* Skip optional '0x' prefix */ - if ((argv[0] == '0') && ((argv[1] == 'x') || (argv[1] == 'X'))) - argv += 2; - - /* Make a number from the string (hex) */ - ulObject = strtol(argv, &endptr, 16); - if (*endptr != '\0') - return; - - /* No CSRSS, no handle table */ - if (!gpepCSRSS) return; - KeStackAttachProcess(&gpepCSRSS->Pcb, &ApcState); - - usIndex = ulObject & 0xFFFF; - pentry = &gpentHmgr[usIndex]; - - if (MmIsAddressValid(pentry)) - { - pobj = pentry->einfo.pobj; - - DbgPrint("GDI handle=%p, type=%s, index=0x%lx, pentry=%p.\n", - ulObject, gpszObjectTypes[(ulObject >> 16) & 0x1f], - usIndex, pentry); - DbgPrint(" ENTRY = {.pobj = %p, ObjectOwner = 0x%lx, FullUnique = 0x%04x,\n" - " Objt=0x%02x, Flags = 0x%02x, pUser = 0x%p}\n", - pentry->einfo.pobj, pentry->ObjectOwner.ulObj, pentry->FullUnique, - pentry->Objt, pentry->Flags, pentry->pUser); - DbgPrint(" BASEOBJECT = {hHmgr = %p, dwThreadId = 0x%lx,\n" - " cExclusiveLock = %ld, BaseFlags = 0x%lx}\n", - pobj->hHmgr, pobj->dwThreadId, - pobj->cExclusiveLock, pobj->BaseFlags); - if (MmIsAddressValid(&gpaulRefCount[usIndex])) - DbgPrint(" gpaulRefCount[idx] = %ld\n", gpaulRefCount[usIndex]); - } - else - { - DbgPrint("Coudn't access ENTRY. Probably paged out.\n"); - } - - KeUnstackDetachProcess(&ApcState); -} -#endif // DBG && KDBG /* EOF */ Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] Tue Oct 2 21:20:28 2012 @@ -179,16 +179,3 @@ POBJ NTAPI GDIOBJ_AllocObjWithHandle(ULONG ObjectType, ULONG cjSize); PGDIOBJ NTAPI GDIOBJ_ShareLockObj(HGDIOBJ hObj, DWORD ObjectType); PVOID NTAPI GDI_MapHandleTable(PEPROCESS Process); - -#if DBG && KDBG -VOID -NTAPI -DbgDumpGdiHandleTable( - ULONG argc, - char *argv[]); - -VOID -NTAPI -DbgDumpHandleInfo( - char *argv); -#endif

12 years, 2 months

[ion] 57458: [RTL]: Fix bugs in SD rewrite, bringing tests back to 73 failures instead of 117 (back to their normal).

by ion＠svn.reactos.org

Author: ion Date: Tue Oct 2 16:05:26 2012 New Revision: 57458 URL: http://svn.reactos.org/svn/reactos?rev=57458&view=rev Log: [RTL]: Fix bugs in SD rewrite, bringing tests back to 73 failures instead of 117 (back to their normal). Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=57458&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sd.c [iso-8859-1] Tue Oct 2 16:05:26 2012 @@ -147,6 +147,7 @@ /* Setup an empty SD */ RtlZeroMemory(SecurityDescriptor, sizeof(*SecurityDescriptor)); SecurityDescriptor->Revision = SECURITY_DESCRIPTOR_REVISION; + SecurityDescriptor->Control = SE_SELF_RELATIVE; /* All good */ return STATUS_SUCCESS; @@ -560,14 +561,14 @@ if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; /* Mask out flags which are not attributes */ - Control &= ~SE_DACL_UNTRUSTED | - SE_SERVER_SECURITY | - SE_DACL_AUTO_INHERIT_REQ | - SE_SACL_AUTO_INHERIT_REQ | - SE_DACL_AUTO_INHERITED | - SE_SACL_AUTO_INHERITED | - SE_DACL_PROTECTED | - SE_SACL_PROTECTED; + Control &= SE_DACL_UNTRUSTED | + SE_SERVER_SECURITY | + SE_DACL_AUTO_INHERIT_REQ | + SE_SACL_AUTO_INHERIT_REQ | + SE_DACL_AUTO_INHERITED | + SE_SACL_AUTO_INHERITED | + SE_DACL_PROTECTED | + SE_SACL_PROTECTED; /* Call the newer API */ return RtlSetControlSecurityDescriptor(SecurityDescriptor, Control, Control); @@ -1153,7 +1154,7 @@ } /* Read the group, check if it's valid and if the buffer contains it */ - Group = (PSID)((ULONG_PTR)Sd->Owner + (ULONG_PTR)Sd); + Group = (PSID)((ULONG_PTR)Sd->Group + (ULONG_PTR)Sd); if (!RtlValidSid(Group) || (Length < RtlLengthSid(Group))) return FALSE; } else if (RequiredInformation & GROUP_SECURITY_INFORMATION)

12 years, 2 months

[ekohl] 57457: [ADVAPI32] - Implement LsaQueryForestTrustInformation and LsaSetForestTrustInformation.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Oct 2 11:43:50 2012 New Revision: 57457 URL: http://svn.reactos.org/svn/reactos?rev=57457&view=rev Log: [ADVAPI32] - Implement LsaQueryForestTrustInformation and LsaSetForestTrustInformation. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Tue Oct 2 11:43:50 2012 @@ -1292,7 +1292,7 @@ /* - * @unimplemented + * @implemented */ NTSTATUS WINAPI @@ -1300,9 +1300,25 @@ IN PLSA_UNICODE_STRING TrustedDomainName, OUT PLSA_FOREST_TRUST_INFORMATION *ForestTrustInfo) { - FIXME("LsaQueryForestTrustInformation(%p %p %p) stub\n", + NTSTATUS Status; + + TRACE("LsaQueryForestTrustInformation(%p %p %p)\n", PolicyHandle, TrustedDomainName, ForestTrustInfo); - return STATUS_NOT_IMPLEMENTED; + + RpcTryExcept + { + Status = LsarQueryForestTrustInformation((LSAPR_HANDLE)PolicyHandle, + TrustedDomainName, + ForestTrustDomainInfo, + ForestTrustInfo); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } @@ -1701,7 +1717,7 @@ /* - * @unimplemented + * @implemented */ NTSTATUS WINAPI @@ -1711,9 +1727,27 @@ IN BOOL CheckOnly, OUT PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo) { - FIXME("LsaSetForestTrustInformation(%p %p %p %d %p) stub\n", + NTSTATUS Status; + + TRACE("LsaSetForestTrustInformation(%p %p %p %d %p)\n", PolicyHandle, TrustedDomainName, ForestTrustInfo, CheckOnly, CollisionInfo); - return STATUS_NOT_IMPLEMENTED; + + RpcTryExcept + { + Status = LsarSetForestTrustInformation((LSAPR_HANDLE)PolicyHandle, + TrustedDomainName, + ForestTrustDomainInfo, + ForestTrustInfo, + CheckOnly, + CollisionInfo); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; }

12 years, 2 months

[hbelusca] 57456: [REGEDIT - Fix comment headers. - Improve error-displaying function and add another one (to be used later on). - Clear a part of code.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 1 23:16:43 2012 New Revision: 57456 URL: http://svn.reactos.org/svn/reactos?rev=57456&view=rev Log: [REGEDIT - Fix comment headers. - Improve error-displaying function and add another one (to be used later on). - Clear a part of code. Modified: trunk/reactos/base/applications/regedit/error.c trunk/reactos/base/applications/regedit/main.h trunk/reactos/base/applications/regedit/regedit.c trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/settings.c Modified: trunk/reactos/base/applications/regedit/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/error.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/error.c [iso-8859-1] Mon Oct 1 23:16:43 2012 @@ -1,14 +1,76 @@ +/* + * Regedit errors, warnings, informations displaying + * + * Copyright (C) 2010 Adam Kachwalla <geekdundee(a)gmail.com> + * Copyright (C) 2012 HermÃ¨s BÃ©lusca - MaÃ¯to <hermes.belusca(a)sfr.fr> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include <regedit.h> -void ErrorMessageBox(HWND hWnd, LPCTSTR title, DWORD code) + +int ErrorMessageBox(HWND hWnd, LPCTSTR lpTitle, DWORD dwErrorCode, ...) { - LPTSTR lpMsgBuf; - DWORD status; - static const TCHAR fallback[] = TEXT("Error displaying error message.\n"); - status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, code, 0, (LPTSTR)&lpMsgBuf, 0, NULL); - if (!status) - lpMsgBuf = (LPTSTR)fallback; - MessageBox(hWnd, lpMsgBuf, title, MB_OK | MB_ICONERROR); - if (lpMsgBuf != fallback) - LocalFree(lpMsgBuf); + int iRet = 0; + LPTSTR lpMsgBuf = NULL; + DWORD Status = 0; + + va_list args = NULL; + va_start(args, dwErrorCode); + + Status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + dwErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpMsgBuf, + 0, + &args); + + va_end(args); + + iRet = MessageBox(hWnd, (Status && lpMsgBuf ? lpMsgBuf : TEXT("Error displaying error message.\n")), lpTitle, MB_OK | MB_ICONERROR); + + if (lpMsgBuf) LocalFree(lpMsgBuf); + + /* Return the MessageBox information */ + return iRet; } + +int InfoMessageBox(HWND hWnd, UINT uType, LPCTSTR lpTitle, LPCTSTR lpMessage, ...) +{ + int iRet = 0; + LPTSTR lpMsgBuf = NULL; + DWORD Status = 0; + + va_list args = NULL; + va_start(args, lpMessage); + + Status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + lpMessage, + 0, + 0, + (LPTSTR)&lpMsgBuf, + 0, + &args); + + va_end(args); + + iRet = MessageBox(hWnd, (Status && lpMsgBuf ? lpMsgBuf : TEXT("Error displaying error message.\n")), lpTitle, uType); + + if (lpMsgBuf) LocalFree(lpMsgBuf); + + /* Return the MessageBox information */ + return iRet; +} Modified: trunk/reactos/base/applications/regedit/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/main.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/main.h [iso-8859-1] Mon Oct 1 23:16:43 2012 @@ -94,7 +94,8 @@ extern LPCTSTR get_root_key_name(HKEY hRootKey); /* error.c */ -extern void ErrorMessageBox(HWND hWnd, LPCTSTR title, DWORD code); +extern int ErrorMessageBox(HWND hWnd, LPCTSTR lpTitle, DWORD dwErrorCode, ...); +extern int InfoMessageBox(HWND hWnd, UINT uType, LPCTSTR lpTitle, LPCTSTR lpMessage, ...); /* find.c */ extern void FindDialog(HWND hWnd); Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Mon Oct 1 23:16:43 2012 @@ -1,7 +1,7 @@ /* * Windows regedit.exe registry editor implementation. * - * Copyright 2002 Andriy Palamarchuk + * Copyright (C) 2002 Andriy Palamarchuk * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -258,11 +258,12 @@ { if (chu == L'S') { + /* Silence dialogs */ silent = TRUE; } else if (chu == L'V') { - /* ignore these switches */ + /* Ignore this switch */ } else { @@ -323,14 +324,21 @@ if (*s && action == ACTION_UNDEF) { - TCHAR szTitle[256], szText[256]; - LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); - LoadString(hInst, IDS_IMPORT_PROMPT, szText, COUNT_OF(szText)); - /* request import confirmation */ - if (silent || MessageBox(NULL, szText, szTitle, MB_YESNO) == IDYES) + if (!silent) + { + TCHAR szTitle[256], szText[256]; + LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); + LoadString(hInst, IDS_IMPORT_PROMPT, szText, COUNT_OF(szText)); + /* request import confirmation */ + if (MessageBox(NULL, szText, szTitle, MB_YESNO) == IDYES) + action = ACTION_ADD; + else + return TRUE; + } + else + { action = ACTION_ADD; - else - return TRUE; + } } if (action == ACTION_UNDEF) return FALSE; Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] Mon Oct 1 23:16:43 2012 @@ -2,9 +2,9 @@ * Registry processing routines. Routines, common for registry * processing frontends. * - * Copyright 1999 Sylvain St-Germain - * Copyright 2002 Andriy Palamarchuk - * Copyright 2008 Alexander N. S?rnes <alex(a)thehandofagony.com> + * Copyright (C) 1999 Sylvain St-Germain + * Copyright (C) 2002 Andriy Palamarchuk + * Copyright (C) 2008 Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/reactos/base/applications/regedit/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] Mon Oct 1 23:16:43 2012 @@ -1,23 +1,23 @@ /* -* regedit (settings.c) -* -* Copyright 2012 Edijs Kolesnikovics <terminedijs(a)yahoo.com> -* Copyright 2012 Grégori Macário Harbs <mysoft64bits at gmail dot com> -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2.1 of the License, or (at your option) any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ + * Regedit settings + * + * Copyright (C) 2012 Edijs Kolesnikovics <terminedijs(a)yahoo.com> + * Copyright (C) 2012 Grégori Macário Harbs <mysoft64bits at gmail dot com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ #include <regedit.h>

12 years, 2 months

[tkreuzer] 57455: [WIN32K] Sorry forgot to commit this file

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Oct 1 23:10:10 2012 New Revision: 57455 URL: http://svn.reactos.org/svn/reactos?rev=57455&view=rev Log: [WIN32K] Sorry forgot to commit this file Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Mon Oct 1 23:10:10 2012 @@ -20,6 +20,7 @@ BOOL gbInitialized; HINSTANCE hModClient = NULL; BOOL ClientPfnInit = FALSE; +PEPROCESS gpepCSRSS; /* PRIVATE FUNCTIONS *********************************************************/ @@ -46,7 +47,7 @@ gpsi->atomIconProp = IntAddGlobalAtom(L"SysIC", TRUE); gpsi->atomFrostedWindowProp = IntAddGlobalAtom(L"SysFrostedWindow", TRUE); - + AtomWndObj = IntAddGlobalAtom(L"SysWNDO", TRUE); AtomLayer = IntAddGlobalAtom(L"SysLayer", TRUE); AtomFlashWndState = IntAddGlobalAtom(L"FlashWState", TRUE); @@ -176,6 +177,9 @@ return STATUS_UNSUCCESSFUL; } + /* Save EPROCESS of CSRSS */ + gpepCSRSS = PsGetCurrentProcess(); + // Initialize Power Request List. // Initialize Media Change. // InitializeGreCSRSS();

12 years, 2 months

[tkreuzer] 57454: [NTOSKRNL] Implement Kdbg CLI callbacks. These callbacks can be registered from external modules and allow to process kdbg commands. [WIN32K] Implement kdbg callbacks for gdi: "gd...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Oct 1 23:06:32 2012 New Revision: 57454 URL: http://svn.reactos.org/svn/reactos?rev=57454&view=rev Log: [NTOSKRNL] Implement Kdbg CLI callbacks. These callbacks can be registered from external modules and allow to process kdbg commands. [WIN32K] Implement kdbg callbacks for gdi: "gdi!dumpht <type>" dumps the handle table, "gdi!handle <x>" dumps information about a handle. CORE-6650 #resolve Added: trunk/reactos/include/reactos/kdros.h (with props) Modified: trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h trunk/reactos/win32ss/user/ntuser/main.c Added: trunk/reactos/include/reactos/kdros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/kdros.h?re… ============================================================================== --- trunk/reactos/include/reactos/kdros.h (added) +++ trunk/reactos/include/reactos/kdros.h [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -1,0 +1,65 @@ + + + +#pragma once + +#if 0 + +VOID +FORCEINLINE +KdRosDumpAllThreads(VOID) +{ + KdSystemDebugControl(' soR', (PVOID)DumpAllThreads, 0, 0, 0, 0, 0); +} + +VOID +FORCEINLINE +KdRosDumpUserThreads(VOID) +{ + KdSystemDebugControl(' soR', (PVOID)DumpUserThreads, 0, 0, 0, 0, 0); +} + +VOID +FORCEINLINE +KdRosDumpArmPfnDatabase(VOID) +{ + KdSystemDebugControl(' soR', (PVOID)KdSpare3, 0, 0, 0, 0, 0); +} +#endif + +VOID +FORCEINLINE +KdRosSetDebugCallback( + ULONG Id, + PVOID Callback) +{ + KdSystemDebugControl('CsoR', Callback, Id, 0, 0, 0, 0); +} + +VOID +FORCEINLINE +KdRosDumpStackFrames( + ULONG Count, + PULONG_PTR Backtrace) +{ + KdSystemDebugControl('DsoR', Backtrace, Count, 0, 0, 0, 0); +} + +#if KDBG +VOID +FORCEINLINE +KdRosRegisterCliCallback( + PVOID Callback) +{ + KdSystemDebugControl('RbdK', Callback, FALSE, 0, 0, 0, 0); +} + +VOID +FORCEINLINE +KdRosDeregisterCliCallback( + PVOID Callback) +{ + KdSystemDebugControl('RbdK', Callback, TRUE, 0, 0, 0, 0); +} +#endif + Propchange: trunk/reactos/include/reactos/kdros.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -67,6 +67,21 @@ #ifdef __NTOSKRNL__ #if defined(KDBG) || DBG + +#if KDBG +typedef +BOOLEAN +(NTAPI *PKDBG_CLI_ROUTINE)( + IN PCHAR Command, + IN ULONG Argc, + IN PCH Argv[]); + +BOOLEAN +NTAPI +KdbRegisterCliCallback( + PVOID Callback, + BOOLEAN Deregister); +#endif VOID KdbSymProcessSymbols( Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -97,7 +97,15 @@ KeRosDumpStackFrames((PULONG)Buffer1, Buffer1Length); break; } -#endif + +#if KDBG + /* Register KDBG CLI callback */ + case 'RbdK': + { + Result = KdbRegisterCliCallback(Buffer1, Buffer1Length); + } +#endif /* KDBG */ +#endif /* DBG */ default: HalDisplayString ("Invalid debug service call!\n"); break; 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -96,6 +96,7 @@ /* GLOBALS *******************************************************************/ +static PKDBG_CLI_ROUTINE KdbCliCallbacks[10]; static BOOLEAN KdbUseIntelSyntax = FALSE; /* Set to TRUE for intel syntax */ static BOOLEAN KdbBreakOnModuleLoad = FALSE; /* Set to TRUE to break into KDB when a module is loaded */ @@ -3266,6 +3267,82 @@ } } + +BOOLEAN +NTAPI +KdbRegisterCliCallback( + PVOID Callback, + BOOLEAN Deregister) +{ + ULONG i; + + /* Loop all entries */ + for (i = 0; i < _countof(KdbCliCallbacks); i++) + { + /* Check if deregistering was requested */ + if (Deregister) + { + /* Check if this entry is the one that was registered */ + if (KdbCliCallbacks[i] == Callback) + { + /* Delete it and report success */ + KdbCliCallbacks[i] = NULL; + return TRUE; + } + } + else + { + /* Check if this entry is free */ + if (KdbCliCallbacks[i] == NULL) + { + /* Set it and and report success */ + KdbCliCallbacks[i] = Callback; + return TRUE; + } + } + } + + /* Unsuccessful */ + return FALSE; +} + +/*! \brief Invokes registered CLI callbacks until one of them handled the + * Command. + * + * \param Command - Command line to parse and execute if possible. + * \param Argc - Number of arguments in Argv + * \param Argv - Array of strings, each of them containing one argument. + * + * \return TRUE, if the command was handled, FALSE if it was not handled. + */ +static +BOOLEAN +KdbpInvokeCliCallbacks( + IN PCHAR Command, + IN ULONG Argc, + IN PCH Argv[]) +{ + ULONG i; + + /* Loop all entries */ + for (i = 0; i < _countof(KdbCliCallbacks); i++) + { + /* Check if this entry is registered */ + if (KdbCliCallbacks[i]) + { + /* Invoke the callback and check if it handled the command */ + if (KdbCliCallbacks[i](Command, Argc, Argv)) + { + return TRUE; + } + } + } + + /* None of the callbacks handled the command */ + return FALSE; +} + + /*!\brief Parses command line and executes command if found * * \param Command Command line to parse and execute if possible. @@ -3280,6 +3357,7 @@ ULONG i; PCHAR p; ULONG Argc; + // FIXME: for what do we need a 1024 characters command line and 256 tokens? static PCH Argv[256]; static CHAR OrigCommand[1024]; @@ -3318,6 +3396,12 @@ { return KdbDebuggerCommands[i].Fn(Argc, Argv); } + } + + /* Now invoke the registered callbacks */ + if (KdbpInvokeCliCallbacks(Command, Argc, Argv)) + { + return TRUE; } KdbpPrint("Command '%s' is unknown.\n", OrigCommand); Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -118,7 +118,7 @@ VOID NTAPI -DbgDumpGdiHandleTable(void) +DbgDumpGdiHandleTableWithBT(void) { static int leak_reported = 0; int i, j, idx, nTraces = 0; @@ -729,6 +729,36 @@ return ret; } -#endif + +#if KDBG + +BOOLEAN +NTAPI +DbgGdiKdbgCliCallback( + IN PCHAR pszCommand, + IN ULONG argc, + IN PCH argv[]) +{ + + if (stricmp(argv[0], "gdi!dumpht") == 0) + { + DbgDumpGdiHandleTable(argc - 1, argv + 1); + } + else if (stricmp(argv[0], "gdi!handle") == 0) + { + DbgDumpHandleInfo(argv[1]); + } + else + { + /* Not handled */ + return FALSE; + } + + return TRUE; +} + +#endif // KDBG + +#endif // DBG /* EOF */ Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidebug… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -28,6 +28,15 @@ } data; } LOGENTRY, *PLOGENTRY; +#if KDBG +BOOLEAN +NTAPI +DbgGdiKdbgCliCallback( + IN PCHAR Command, + IN ULONG Argc, + IN PCH Argv[]); +#endif + #if DBG_ENABLE_EVENT_LOGGING VOID NTAPI DbgDumpEventList(PSLIST_HEADER pslh); VOID NTAPI DbgLogEvent(PSLIST_HEADER pslh, LOG_EVENT_TYPE nEventType, LPARAM lParam); @@ -44,7 +53,7 @@ #endif -VOID NTAPI DbgDumpGdiHandleTable(VOID); +VOID NTAPI DbgDumpGdiHandleTableWithBT(VOID); ULONG NTAPI DbgCaptureStackBackTace(PVOID* pFrames, ULONG nFramesToCapture); BOOL NTAPI DbgGdiHTIntegrityCheck(VOID); VOID NTAPI DbgDumpLockedGdiHandles(VOID); Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -1341,4 +1341,170 @@ return TRUE; } +#if DBG && KDBG +static const char * gpszObjectTypes[] = +{ + "FREE", "DC", "UNUSED1", "UNUSED2", "RGN", "SURF", "CLIENTOBJ", "PATH", + "PAL", "ICMLCS", "LFONT", "RFONT", "PFE", "PFT", "ICMCXF", "SPRITE", + "BRUSH", "UMPD", "UNUSED4", "SPACE", "UNUSED5", "META", "EFSTATE", + "BMFD", "VTFD", "TTFD", "RC", "TEMP", "DRVOBJ", "DCIOBJ", "SPOOL", + "RESERVED", "ALL" +}; + +extern PEPROCESS gpepCSRSS;; + +VOID +NTAPI +DbgDumpGdiHandleTable(ULONG argc, char *argv[]) +{ + ULONG i; + UCHAR Objt, jReqestedType; + PENTRY pentry; + POBJ pobj; + KAPC_STATE ApcState; + + /* No CSRSS, no handle table */ + if (!gpepCSRSS) return; + KeStackAttachProcess(&gpepCSRSS->Pcb, &ApcState); + + if (argc == 0) + { + USHORT Counts[GDIObjType_MAX_TYPE + 2] = {0}; + + /* Loop all possibly used entries in the handle table */ + for (i = RESERVE_ENTRIES_COUNT; i < gulFirstUnused; i++) + { + if (MmIsAddressValid(&gpentHmgr[i])) + { + Objt = gpentHmgr[i].Objt & 0x1F; + Counts[Objt]++; + } + } + + DbgPrint("Type Count\n"); + DbgPrint("-------------------\n"); + for (i = 0; i <= GDIObjType_MAX_TYPE; i++) + { + DbgPrint("%02x %-9s %d\n", + i, gpszObjectTypes[i], Counts[i]); + } + DbgPrint("\n"); + } + else + { + /* Loop all object types */ + for (i = 0; i <= GDIObjType_MAX_TYPE + 1; i++) + { + /* Check if this object type was requested */ + if (stricmp(argv[0], gpszObjectTypes[i]) == 0) + { + jReqestedType = i; + break; + } + } + + /* Check if we didn't find it yet */ + if (i > GDIObjType_MAX_TYPE) + { + /* Try if it's a number */ + i = atoi(argv[0]); + + /* Check for "0" */ + if ((i > GDIObjType_MAX_TYPE) || + ((i == 0) && (stricmp(argv[0], "0") == 0))) + { + DbgPrint("Unknown object type: %s\n", argv[0]); + goto leave; + } + + jReqestedType = i; + } + + /* Print header */ + DbgPrint("Index Handle Type ThreadId cLocks ulRefCount\n"); + DbgPrint("----------------------------------------------------\n"); + + /* Loop all possibly used entries in the handle table */ + for (i = RESERVE_ENTRIES_COUNT; i < gulFirstUnused; i++) + { + /* Get the entry and the object */ + pentry = &gpentHmgr[i]; + + if (!MmIsAddressValid(pentry)) continue; + + pobj = pentry->einfo.pobj; + Objt = pentry->Objt & 0x1F; + + if ((jReqestedType == GDIObjType_MAX_TYPE + 1) || + (Objt == jReqestedType)) + { + DbgPrint("%04lx %p %-9s 0x%06lx %-7ld ", + i, pobj->hHmgr, gpszObjectTypes[Objt], + pobj->dwThreadId, pobj->cExclusiveLock); + if (MmIsAddressValid(&gpaulRefCount[i])) + DbgPrint("0x%06lx\n", gpaulRefCount[i]); + else + DbgPrint("????????\n"); + } + } + } + +leave: + KeUnstackDetachProcess(&ApcState); +} + +VOID +NTAPI +DbgDumpHandleInfo(char *argv) +{ + ULONG_PTR ulObject; + BASEOBJECT *pobj; + ENTRY *pentry; + USHORT usIndex; + char *endptr; + KAPC_STATE ApcState; + + /* Skip optional '0x' prefix */ + if ((argv[0] == '0') && ((argv[1] == 'x') || (argv[1] == 'X'))) + argv += 2; + + /* Make a number from the string (hex) */ + ulObject = strtol(argv, &endptr, 16); + if (*endptr != '\0') + return; + + /* No CSRSS, no handle table */ + if (!gpepCSRSS) return; + KeStackAttachProcess(&gpepCSRSS->Pcb, &ApcState); + + usIndex = ulObject & 0xFFFF; + pentry = &gpentHmgr[usIndex]; + + if (MmIsAddressValid(pentry)) + { + pobj = pentry->einfo.pobj; + + DbgPrint("GDI handle=%p, type=%s, index=0x%lx, pentry=%p.\n", + ulObject, gpszObjectTypes[(ulObject >> 16) & 0x1f], + usIndex, pentry); + DbgPrint(" ENTRY = {.pobj = %p, ObjectOwner = 0x%lx, FullUnique = 0x%04x,\n" + " Objt=0x%02x, Flags = 0x%02x, pUser = 0x%p}\n", + pentry->einfo.pobj, pentry->ObjectOwner.ulObj, pentry->FullUnique, + pentry->Objt, pentry->Flags, pentry->pUser); + DbgPrint(" BASEOBJECT = {hHmgr = %p, dwThreadId = 0x%lx,\n" + " cExclusiveLock = %ld, BaseFlags = 0x%lx}\n", + pobj->hHmgr, pobj->dwThreadId, + pobj->cExclusiveLock, pobj->BaseFlags); + if (MmIsAddressValid(&gpaulRefCount[usIndex])) + DbgPrint(" gpaulRefCount[idx] = %ld\n", gpaulRefCount[usIndex]); + } + else + { + DbgPrint("Coudn't access ENTRY. Probably paged out.\n"); + } + + KeUnstackDetachProcess(&ApcState); +} +#endif // DBG && KDBG + /* EOF */ Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -180,3 +180,15 @@ PGDIOBJ NTAPI GDIOBJ_ShareLockObj(HGDIOBJ hObj, DWORD ObjectType); PVOID NTAPI GDI_MapHandleTable(PEPROCESS Process); +#if DBG && KDBG +VOID +NTAPI +DbgDumpGdiHandleTable( + ULONG argc, + char *argv[]); + +VOID +NTAPI +DbgDumpHandleInfo( + char *argv); +#endif Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -11,6 +11,7 @@ #define NDEBUG #include <debug.h> +#include <kdros.h> HANDLE hModuleWin; @@ -87,6 +88,9 @@ #if DBG DbgInitDebugChannels(); +#if KDBG + KdRosRegisterCliCallback(DbgGdiKdbgCliCallback); +#endif #endif TRACE_CH(UserProcess,"Allocated ppi 0x%p for PID:0x%lx\n", ppiCurrent, HandleToUlong(Process->UniqueProcessId)); @@ -408,7 +412,7 @@ TRACE_CH(UserThread,"Attached Thread ptiTo is getting switched!\n"); UserAttachThreadInput(ptiFrom, ptiCurrent, FALSE); } - + // ptiFrom if (ptiCurrent->pqAttach && ptiCurrent->MessageQueue) {

12 years, 2 months

[hbelusca] 57453: [REGEDIT] - Update informative messages CORE-6239 Patch by Edijs Kolesnikovičs (1/2)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 1 22:00:38 2012 New Revision: 57453 URL: http://svn.reactos.org/svn/reactos?rev=57453&view=rev Log: [REGEDIT] - Update informative messages CORE-6239 Patch by Edijs Kolesnikovičs (1/2) Modified: trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/lang/bg-BG.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/regedit/lang/de-DE.rc trunk/reactos/base/applications/regedit/lang/el-GR.rc trunk/reactos/base/applications/regedit/lang/en-US.rc trunk/reactos/base/applications/regedit/lang/es-ES.rc trunk/reactos/base/applications/regedit/lang/fr-FR.rc trunk/reactos/base/applications/regedit/lang/hu-HU.rc trunk/reactos/base/applications/regedit/lang/id-ID.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ko-KR.rc trunk/reactos/base/applications/regedit/lang/nl-NL.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pt-BR.rc trunk/reactos/base/applications/regedit/lang/pt-PT.rc trunk/reactos/base/applications/regedit/lang/ro-RO.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc trunk/reactos/base/applications/regedit/lang/sk-SK.rc trunk/reactos/base/applications/regedit/lang/sl-SI.rc trunk/reactos/base/applications/regedit/lang/sv-SE.rc trunk/reactos/base/applications/regedit/lang/th-TH.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/zh-CN.rc trunk/reactos/base/applications/regedit/lang/zh-TW.rc trunk/reactos/base/applications/regedit/regedit.c trunk/reactos/base/applications/regedit/resource.h Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -469,7 +469,7 @@ { /* Show successful import */ LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); - LoadString(hInst, IDS_IMPORTED_OK, szText, COUNT_OF(szText)); + LoadString(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText)); MessageBox(NULL, szText, szTitle, MB_OK); bRet = TRUE; } Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -449,8 +449,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "ÐÐ° Ð±ÑÐ´Ð°Ñ Ð»Ð¸ Ð´Ð¾Ð±Ð°Ð²ÐµÐ½Ð¸ Ð´Ð°Ð½Ð½Ð¸ÑÐµ Ð² ÑÐµÐ³Ð¸ÑÑÑÑÐ°?" - IDS_IMPORTED_OK "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸ÑÑÐ° ÑÐ° Ð´Ð¾Ð±Ð°Ð²ÐµÐ½Ð¸ Ð² ÑÐµÐ³Ð¸ÑÑÑÑÐ°" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "PÅidat data do registru?" - IDS_IMPORTED_OK "Data pÅidÃ¡na do registru." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -437,8 +437,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Agregar los datos al registro?" - IDS_IMPORTED_OK "La informaciÃ³n ha sido agregada al registro" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -430,8 +430,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Voulez-vous ajouter des informations dans le Registre ?" - IDS_IMPORTED_OK "Les informations ont bien Ã©tÃ© ajoutÃ©es dans le Registre." + IDS_IMPORT_PROMPT "L'ajout d'informations peut involontairement modifier ou supprimer des valeurs et endommager le fonctionnement de composants. Si vous n'Ãªtes pas sÃ»r de la source de ces informations dans '%1', ne les ajoutez pas au Registre.\n\nÃtes-vous sÃ»r de vouloir continuer ?" + IDS_IMPORT_OK "Les clÃ©s et valeurs contenues dans '%1' ont Ã©tÃ© correctement ajoutÃ©es au Registre." + IDS_IMPORT_ERROR "Impossible dâimporter '%1' Ã la suite dâune erreur lors de la lecture de ce fichier. Il sâagit dâune erreur disque, ou le fichier est endommagÃ©." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -435,8 +435,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -433,8 +433,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -436,8 +436,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Aggiungere l'informazione al registro?" - IDS_IMPORTED_OK "L'informazione Ã¨ stata aggiunta al registro" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -419,8 +419,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -441,8 +441,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Czy dodaÄ dane do rejestru?" - IDS_IMPORTED_OK "Dane dopisane do rejestru" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -435,8 +435,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -436,8 +436,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -432,8 +432,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "AdÄugaÈi data Ã®n registru?" - IDS_IMPORTED_OK "InformaÈia adÄugatÄ Ã®n registru" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -431,8 +431,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð² ÑÐµÐµÑÑÑ?" - IDS_IMPORTED_OK "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð° Ð² ÑÐµÐµÑÑÑ" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -419,8 +419,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -435,8 +435,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "ÐÐ¾Ð´Ð°ÑÐ¸ Ð´Ð°Ð½Ñ Ð´Ð¾ ÑÐµÑÑÑÑÑ?" - IDS_IMPORTED_OK "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ Ð±ÑÐ»Ð° Ð´Ð¾Ð´Ð°Ð½Ð° Ð´Ð¾ ÑÐµÑÑÑÑÑ" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "å¢å èµæå°æ³¨åè¡¨?" - IDS_IMPORTED_OK "èµæå·²è¢«å å°æ³¨åè¡¨" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-TW.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -435,8 +435,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "æ°å¢è³æè³ç»éï¼" - IDS_IMPORTED_OK "è³æå·²è¢«æ°å¢è³ç»é" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -164,7 +164,7 @@ import_registry_file(fp); get_file_name(&s, filename); LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); - LoadString(hInst, IDS_IMPORTED_OK, szText, COUNT_OF(szText)); + LoadString(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText)); /* show successful import */ if (!silent) MessageBox(NULL, szText, szTitle, MB_OK); Modified: trunk/reactos/base/applications/regedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -190,55 +190,56 @@ #define IDS_GOTO_SUGGESTED_KEY 31128 #define IDS_IMPORT_PROMPT 31129 -#define IDS_IMPORTED_OK 31130 - -#define IDS_FINISHEDFIND 31131 - -#define IDS_BUSNUMBER 31132 -#define IDS_INTERFACE 31133 - -#define IDS_DMA_CHANNEL 31134 -#define IDS_DMA_PORT 31135 -#define IDS_INTERRUPT_VECTOR 31136 -#define IDS_INTERRUPT_LEVEL 31137 -#define IDS_INTERRUPT_AFFINITY 31138 -#define IDS_INTERRUPT_TYPE 31139 -#define IDS_MEMORY_ADDRESS 31140 -#define IDS_MEMORY_LENGTH 31141 -#define IDS_MEMORY_ACCESS 31142 -#define IDS_PORT_ADDRESS 31143 -#define IDS_PORT_LENGTH 31144 -#define IDS_PORT_ACCESS 31145 -#define IDS_SPECIFIC_RESERVED1 31146 -#define IDS_SPECIFIC_RESERVED2 31147 -#define IDS_SPECIFIC_DATASIZE 31148 - -#define IDS_PORT_PORT_IO 31149 -#define IDS_PORT_MEMORY_IO 31150 -#define IDS_INTERRUPT_EDGE_SENSITIVE 31151 -#define IDS_INTERRUPT_LEVEL_SENSITIVE 31152 -#define IDS_MEMORY_READ_ONLY 31153 -#define IDS_MEMORY_WRITE_ONLY 31154 -#define IDS_MEMORY_READ_WRITE 31155 - -#define IDS_BUS_UNDEFINED 31156 -#define IDS_BUS_INTERNAL 31157 -#define IDS_BUS_ISA 31158 -#define IDS_BUS_EISA 31159 -#define IDS_BUS_MICROCHANNEL 31160 -#define IDS_BUS_TURBOCHANNEL 31161 -#define IDS_BUS_PCIBUS 31162 -#define IDS_BUS_VMEBUS 31163 -#define IDS_BUS_NUBUS 31164 -#define IDS_BUS_PCMCIABUS 31165 -#define IDS_BUS_CBUS 31166 -#define IDS_BUS_MPIBUS 31167 -#define IDS_BUS_MPSABUS 31168 -#define IDS_BUS_PROCESSORINTERNAL 31169 -#define IDS_BUS_INTERNALPOWERBUS 31170 -#define IDS_BUS_PNPISABUS 31171 -#define IDS_BUS_PNPBUS 31172 -#define IDS_BUS_UNKNOWNTYPE 31173 +#define IDS_IMPORT_OK 31130 +#define IDS_IMPORT_ERROR 31131 + +#define IDS_FINISHEDFIND 31132 + +#define IDS_BUSNUMBER 31133 +#define IDS_INTERFACE 31134 + +#define IDS_DMA_CHANNEL 31135 +#define IDS_DMA_PORT 31136 +#define IDS_INTERRUPT_VECTOR 31137 +#define IDS_INTERRUPT_LEVEL 31138 +#define IDS_INTERRUPT_AFFINITY 31139 +#define IDS_INTERRUPT_TYPE 31140 +#define IDS_MEMORY_ADDRESS 31141 +#define IDS_MEMORY_LENGTH 31142 +#define IDS_MEMORY_ACCESS 31143 +#define IDS_PORT_ADDRESS 31144 +#define IDS_PORT_LENGTH 31145 +#define IDS_PORT_ACCESS 31146 +#define IDS_SPECIFIC_RESERVED1 31147 +#define IDS_SPECIFIC_RESERVED2 31148 +#define IDS_SPECIFIC_DATASIZE 31149 + +#define IDS_PORT_PORT_IO 31150 +#define IDS_PORT_MEMORY_IO 31151 +#define IDS_INTERRUPT_EDGE_SENSITIVE 31152 +#define IDS_INTERRUPT_LEVEL_SENSITIVE 31153 +#define IDS_MEMORY_READ_ONLY 31154 +#define IDS_MEMORY_WRITE_ONLY 31155 +#define IDS_MEMORY_READ_WRITE 31156 + +#define IDS_BUS_UNDEFINED 31157 +#define IDS_BUS_INTERNAL 31158 +#define IDS_BUS_ISA 31159 +#define IDS_BUS_EISA 31160 +#define IDS_BUS_MICROCHANNEL 31161 +#define IDS_BUS_TURBOCHANNEL 31162 +#define IDS_BUS_PCIBUS 31163 +#define IDS_BUS_VMEBUS 31164 +#define IDS_BUS_NUBUS 31165 +#define IDS_BUS_PCMCIABUS 31166 +#define IDS_BUS_CBUS 31167 +#define IDS_BUS_MPIBUS 31168 +#define IDS_BUS_MPSABUS 31169 +#define IDS_BUS_PROCESSORINTERNAL 31170 +#define IDS_BUS_INTERNALPOWERBUS 31171 +#define IDS_BUS_PNPISABUS 31172 +#define IDS_BUS_PNPBUS 31173 +#define IDS_BUS_UNKNOWNTYPE 31174 #define IDD_EDIT_STRING 2000 #define IDC_VALUE_NAME 2001

12 years, 2 months

[hpoussin] 57452: [LSASRV] Add missing breaks (addendum to r57391)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Oct 1 19:24:07 2012 New Revision: 57452 URL: http://svn.reactos.org/svn/reactos?rev=57452&view=rev Log: [LSASRV] Add missing breaks (addendum to r57391) Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Mon Oct 1 19:24:07 2012 @@ -259,6 +259,7 @@ case PolicyAuditLogInformation: /* 1 */ Status = LsarQueryAuditLog(PolicyHandle, PolicyInformation); + break; case PolicyAuditEventsInformation: /* 2 */ Status = LsarQueryAuditEvents(PolicyHandle, @@ -273,6 +274,7 @@ case PolicyPdAccountInformation: /* 4 */ Status = LsarQueryPdAccount(PolicyHandle, PolicyInformation); + break; case PolicyAccountDomainInformation: /* 5 */ Status = LsarQueryAccountDomain(PolicyHandle, @@ -287,6 +289,7 @@ case PolicyReplicaSourceInformation: /* 7 */ Status = LsarQueryReplicaSource(PolicyHandle, PolicyInformation); + break; case PolicyDefaultQuotaInformation: /* 8 */ Status = LsarQueryDefaultQuota(PolicyHandle,

12 years, 2 months

[ekohl] 57451: [LSASRV] LsarOpenSecret: Do not check the granted access of the policy handle and return the proper status code.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Oct 1 10:24:19 2012 New Revision: 57451 URL: http://svn.reactos.org/svn/reactos?rev=57451&view=rev Log: [LSASRV] LsarOpenSecret: Do not check the granted access of the policy handle and return the proper status code. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Mon Oct 1 10:24:19 2012 @@ -1219,7 +1219,7 @@ /* Validate the PolicyHandle */ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, - POLICY_CREATE_SECRET, + 0, &PolicyObject); if (!NT_SUCCESS(Status)) { @@ -1251,7 +1251,7 @@ *SecretHandle = (LSAPR_HANDLE)SecretObject; } - return STATUS_SUCCESS; + return Status; }

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2012