Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[fireball] 20016: DPRINT->DPRINT1 in key places (when something fails we shouldn't keep silence).

by fireball＠svn.reactos.com

DPRINT->DPRINT1 in key places (when something fails we shouldn't keep silence). Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-12-09 19:00:13 UTC (rev 20015) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-12-09 19:28:04 UTC (rev 20016) @@ -246,7 +246,7 @@ &ObjectName); if (!NT_SUCCESS(Status)) { - DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); + DPRINT1("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); goto Cleanup; } @@ -271,7 +271,7 @@ PostCreateKeyInfo.Status = Status; CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - DPRINT("CmpFindObject failed, Status: 0x%x\n", Status); + DPRINT1("CmpFindObject failed, Status: 0x%x\n", Status); goto Cleanup; } @@ -286,7 +286,7 @@ PostCreateKeyInfo.Status = STATUS_UNSUCCESSFUL; CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - DPRINT("Object marked for delete!\n"); + DPRINT1("Object marked for delete!\n"); Status = STATUS_UNSUCCESSFUL; goto Cleanup; } @@ -297,7 +297,8 @@ TRUE, &hKey); - DPRINT("ObpCreateHandle failed Status 0x%x\n", Status); + if (!NT_SUCCESS(Status)) + DPRINT1("ObpCreateHandle failed Status 0x%x\n", Status); PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = Status; @@ -395,7 +396,7 @@ CreateOptions); if (!NT_SUCCESS(Status)) { - DPRINT("CmiAddSubKey() failed (Status %lx)\n", Status); + DPRINT1("CmiAddSubKey() failed (Status %lx)\n", Status); /* Release hive lock */ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion();

18 years, 9 months

[navaraf] 20015: Do not revoke the display ownership until the bootvid thread is terminated.

by navaraf＠svn.reactos.com

Do not revoke the display ownership until the bootvid thread is terminated. Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c _____ Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c --- trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-12-09 18:42:27 UTC (rev 20014) +++ trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-12-09 19:00:13 UTC (rev 20015) @@ -45,7 +45,7 @@ * Set to Write Mode 2 and Read Mode 0. */ -static VGA_REGISTERS Mode12Regs = +static const VGA_REGISTERS Mode12Regs = { /* CRT Controller Registers */ {0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0x0B, 0x3E, 0x00, 0x40, 0x00, 0x00, @@ -69,6 +69,9 @@ static CLIENT_ID BitmapThreadId; static PUCHAR BootimageBitmap; +static ULONG ShutdownNotify; +static KEVENT ShutdownCompleteEvent; + /* DATA **********************************************************************/ static PDRIVER_OBJECT BootVidDriverObject = NULL; @@ -156,7 +159,7 @@ STATIC VOID FASTCALL -vgaSetRegisters(PVGA_REGISTERS Registers) +vgaSetRegisters(const VGA_REGISTERS *Registers) { UINT i; @@ -237,6 +240,9 @@ VidCleanUp(VOID) { InbvUnmapVideoMemory(); + InterlockedIncrement(&ShutdownNotify); + KeWaitForSingleObject(&ShutdownCompleteEvent, Executive, KernelMode, + FALSE, NULL); } @@ -495,7 +501,7 @@ FaderPaletteDelta[i].b = ((Palette[i].rgbBlue << 8) / PALETTE_FADE_STEPS); } - for (i = 0; i < PALETTE_FADE_STEPS; i++) + for (i = 0; i < PALETTE_FADE_STEPS && !ShutdownNotify; i++) { /* Disable screen and enable palette access. */ READ_PORT_UCHAR(STATUS); @@ -548,6 +554,7 @@ { DbgPrint("Warning: Cannot find boot image\n"); } + KeSetEvent(&ShutdownCompleteEvent, 0, FALSE); } @@ -639,6 +646,9 @@ BootVidDriverObject = DriverObject; + ShutdownNotify = 0; + KeInitializeEvent(&ShutdownCompleteEvent, NotificationEvent, FALSE); + /* Register driver routines */ DriverObject->MajorFunction[IRP_MJ_CLOSE] = VidDispatch; DriverObject->MajorFunction[IRP_MJ_CREATE] = VidDispatch;

18 years, 9 months

[cwittich] 20014: move declaration of IntGdiExtSelectClipRgn to a win32k header

by cwittich＠svn.reactos.com

move declaration of IntGdiExtSelectClipRgn to a win32k header fix compile problem with path.c Modified: trunk/reactos/include/win32k/cliprgn.h Modified: trunk/reactos/subsys/win32k/include/intgdi.h Modified: trunk/reactos/subsys/win32k/objects/path.c _____ Modified: trunk/reactos/include/win32k/cliprgn.h --- trunk/reactos/include/win32k/cliprgn.h 2005-12-09 18:36:53 UTC (rev 20013) +++ trunk/reactos/include/win32k/cliprgn.h 2005-12-09 18:42:27 UTC (rev 20014) @@ -6,14 +6,6 @@ int STDCALL -IntGdiExtSelectClipRgn ( - PDC dc, - HRGN hrgn, - int fnMode - ); - -int -STDCALL NtGdiExcludeClipRect ( HDC hDC, int LeftRect, _____ Modified: trunk/reactos/subsys/win32k/include/intgdi.h --- trunk/reactos/subsys/win32k/include/intgdi.h 2005-12-09 18:36:53 UTC (rev 20013) +++ trunk/reactos/subsys/win32k/include/intgdi.h 2005-12-09 18:42:27 UTC (rev 20014) @@ -9,7 +9,6 @@ VOID FASTCALL IntGdiInitBrushInstance(GDIBRUSHINST *BrushInst, PGDIBRUSHOBJ BrushObj, XLATEOBJ *XlateObj); - HBRUSH STDCALL IntGdiCreateDIBBrush( CONST BITMAPINFO *BitmapInfo, @@ -198,6 +197,8 @@ INT FASTCALL IntGdiGetDeviceCaps(PDC dc, INT Index); +int STDCALL IntGdiExtSelectClipRgn (PDC dc, HRGN hrgn, int fnMode); + INT FASTCALL IntGdiEscape(PDC dc, _____ Modified: trunk/reactos/subsys/win32k/objects/path.c --- trunk/reactos/subsys/win32k/objects/path.c 2005-12-09 18:36:53 UTC (rev 20013) +++ trunk/reactos/subsys/win32k/objects/path.c 2005-12-09 18:42:27 UTC (rev 20014) @@ -249,8 +249,10 @@ /* Check that path is closed */ if( pPath->state != PATH_Closed ) + { SetLastWin32Error(ERROR_CAN_NOT_COMPLETE); return FALSE; + } /* Construct a region from the path */ else if( PATH_PathToRegion( pPath, dc->w.polyFillMode, &hrgnPath ) ) {

18 years, 9 months

[sgasiorek] 20013: convert strings to lower case in CharLowerA.

by sgasiorek＠svn.reactos.com

convert strings to lower case in CharLowerA. fixes loading of plugins in FAR. Modified: trunk/reactos/lib/user32/windows/text.c _____ Modified: trunk/reactos/lib/user32/windows/text.c --- trunk/reactos/lib/user32/windows/text.c 2005-12-09 18:06:19 UTC (rev 20012) +++ trunk/reactos/lib/user32/windows/text.c 2005-12-09 18:36:53 UTC (rev 20013) @@ -53,6 +53,7 @@ CharLowerA(LPSTR x) { if (!HIWORD(x)) return (LPSTR)tolower((char)(int)x); + CharLowerBuffA(x, strlen(x)); /* __TRY {

18 years, 9 months

[cwittich] 20012: implemented NtGdiSelectClipPath and PATH_FillPath

by cwittich＠svn.reactos.com

implemented NtGdiSelectClipPath and PATH_FillPath Modified: trunk/reactos/include/win32k/cliprgn.h Modified: trunk/reactos/subsys/win32k/include/path.h Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c Modified: trunk/reactos/subsys/win32k/objects/path.c _____ Modified: trunk/reactos/include/win32k/cliprgn.h --- trunk/reactos/include/win32k/cliprgn.h 2005-12-09 17:57:58 UTC (rev 20011) +++ trunk/reactos/include/win32k/cliprgn.h 2005-12-09 18:06:19 UTC (rev 20012) @@ -6,6 +6,14 @@ int STDCALL +IntGdiExtSelectClipRgn ( + PDC dc, + HRGN hrgn, + int fnMode + ); + +int +STDCALL NtGdiExcludeClipRect ( HDC hDC, int LeftRect, _____ Modified: trunk/reactos/subsys/win32k/include/path.h --- trunk/reactos/subsys/win32k/include/path.h 2005-12-09 17:57:58 UTC (rev 20011) +++ trunk/reactos/subsys/win32k/include/path.h 2005-12-09 18:06:19 UTC (rev 20012) @@ -18,6 +18,6 @@ BOOL FASTCALL PATH_PolyPolyline( PDC dc, const POINT* pts, const DWORD* counts, DWORD polylines); BOOL FASTCALL PATH_Rectangle (PDC dc, INT x1, INT y1, INT x2, INT y2); BOOL FASTCALL PATH_RoundRect (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xradius, INT yradius); -BOOL FASTCALL PATH_PathToRegion (const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn); +BOOL FASTCALL PATH_PathToRegion (GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn); #endif /* _WIN32K_PATH_H */ _____ Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c --- trunk/reactos/subsys/win32k/objects/cliprgn.c 2005-12-09 17:57:58 UTC (rev 20011) +++ trunk/reactos/subsys/win32k/objects/cliprgn.c 2005-12-09 18:06:19 UTC (rev 20012) @@ -99,21 +99,14 @@ return retval; } -int STDCALL NtGdiExtSelectClipRgn(HDC hDC, - HRGN hrgn, - int fnMode) + +int STDCALL IntGdiExtSelectClipRgn(PDC dc, + HRGN hrgn, + int fnMode) { int retval; - DC *dc; + // dc->w.flags &= ~DC_DIRTY; - if (!(dc = DC_LockDc(hDC))) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return ERROR; - } - -// dc->w.flags &= ~DC_DIRTY; - if (!hrgn) { if (fnMode == RGN_COPY) @@ -127,7 +120,6 @@ } else { - DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_PARAMETER); return ERROR; } @@ -158,8 +150,26 @@ } retval = CLIPPING_UpdateGCRegion(dc); + return retval; +} + + +int STDCALL NtGdiExtSelectClipRgn(HDC hDC, + HRGN hrgn, + int fnMode) +{ + int retval; + DC *dc; + + if (!(dc = DC_LockDc(hDC))) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return ERROR; + } + + retval = IntGdiExtSelectClipRgn ( dc, hrgn, fnMode ); + DC_UnlockDc(dc); - return retval; } @@ -427,13 +437,6 @@ return Result; } -BOOL STDCALL NtGdiSelectClipPath(HDC hDC, - int Mode) -{ - UNIMPLEMENTED; - return FALSE; -} - INT STDCALL NtGdiSelectClipRgn(HDC hDC, HRGN hRgn) { _____ Modified: trunk/reactos/subsys/win32k/objects/path.c --- trunk/reactos/subsys/win32k/objects/path.c 2005-12-09 17:57:58 UTC (rev 20011) +++ trunk/reactos/subsys/win32k/objects/path.c 2005-12-09 18:06:19 UTC (rev 20012) @@ -35,7 +35,7 @@ BOOL FASTCALL PATH_FlattenPath (GdiPath *pPath); VOID FASTCALL PATH_GetPathFromDC (PDC dc, GdiPath **ppPath); VOID FASTCALL PATH_NormalizePoint (FLOAT_POINT corners[], const FLOAT_POINT *pPoint, double *pX, double *pY); -BOOL FASTCALL PATH_PathToRegion(const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn); +BOOL FASTCALL PATH_PathToRegion (GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn); BOOL FASTCALL PATH_ReserveEntries (GdiPath *pPath, INT numEntries); VOID FASTCALL PATH_ScaleNormalizedPoint (FLOAT_POINT corners[], double x, double y, POINT *pPoint); @@ -235,27 +235,114 @@ return FALSE; } +BOOL STDCALL NtGdiSelectClipPath(HDC hDC, + int Mode) +{ + GdiPath *pPath; + HRGN hrgnPath; + BOOL success = FALSE; + PDC dc = DC_LockDc ( hDC ); + if( !dc ) return FALSE; + PATH_GetPathFromDC ( dc, &pPath ); + + /* Check that path is closed */ + if( pPath->state != PATH_Closed ) + SetLastWin32Error(ERROR_CAN_NOT_COMPLETE); + return FALSE; + /* Construct a region from the path */ + else if( PATH_PathToRegion( pPath, dc->w.polyFillMode, &hrgnPath ) ) + { + success = IntGdiExtSelectClipRgn( dc, hrgnPath, Mode ) != ERROR; + NtGdiDeleteObject( hrgnPath ); + + /* Empty the path */ + if( success ) + PATH_EmptyPath( pPath ); + /* FIXME: Should this function delete the path even if it failed? */ + } + + DC_UnlockDc ( dc ); + return success; +} + /*********************************************************************** * Exported functions */ /* PATH_FillPath - * unimplemented * + * */ BOOL FASTCALL PATH_FillPath( PDC dc, GdiPath *pPath ) { + INT mapMode, graphicsMode; + SIZE ptViewportExt, ptWindowExt; + POINT ptViewportOrg, ptWindowOrg; + XFORM xform; + HRGN hrgn; + if( pPath->state != PATH_Closed ) { + SetLastWin32Error(ERROR_CAN_NOT_COMPLETE); return FALSE; } - UNIMPLEMENTED; + if( PATH_PathToRegion( pPath, dc->w.polyFillMode, &hrgn )) + { + /* Since PaintRgn interprets the region as being in logical coordinates + * but the points we store for the path are already in device + * coordinates, we have to set the mapping mode to MM_TEXT temporarily. + * Using SaveDC to save information about the mapping mode / world + * transform would be easier but would require more overhead, especially + * now that SaveDC saves the current path. + */ + + /* Save the information about the old mapping mode */ + mapMode = NtGdiGetMapMode( dc->hSelf ); + NtGdiGetViewportExtEx( dc->hSelf, &ptViewportExt ); + NtGdiGetViewportOrgEx( dc->hSelf, &ptViewportOrg ); + NtGdiGetWindowExtEx( dc->hSelf, &ptWindowExt ); + NtGdiGetWindowOrgEx( dc->hSelf, &ptWindowOrg ); + + /* Save world transform + * NB: The Windows documentation on world transforms would lead one to + * believe that this has to be done only in GM_ADVANCED; however, my + * tests show that resetting the graphics mode to GM_COMPATIBLE does + * not reset the world transform. + */ + NtGdiGetWorldTransform( dc->hSelf, &xform ); + + /* Set MM_TEXT */ + NtGdiSetMapMode( dc->hSelf, MM_TEXT ); + NtGdiSetViewportOrgEx( dc->hSelf, 0, 0, NULL ); + NtGdiSetWindowOrgEx( dc->hSelf, 0, 0, NULL ); + graphicsMode = NtGdiGetGraphicsMode( dc->hSelf ); + NtGdiSetGraphicsMode( dc->hSelf, GM_ADVANCED ); + NtGdiModifyWorldTransform( dc->hSelf, &xform, MWT_IDENTITY ); + NtGdiSetGraphicsMode( dc->hSelf, graphicsMode ); + + /* Paint the region */ + NtGdiPaintRgn( dc->hSelf, hrgn ); + NtGdiDeleteObject( hrgn ); + /* Restore the old mapping mode */ + NtGdiSetMapMode( dc->hSelf, mapMode ); + NtGdiSetViewportExtEx( dc->hSelf, ptViewportExt.cx, ptViewportExt.cy, NULL ); + NtGdiSetViewportOrgEx( dc->hSelf, ptViewportOrg.x, ptViewportOrg.y, NULL ); + NtGdiSetWindowExtEx( dc->hSelf, ptWindowExt.cx, ptWindowExt.cy, NULL ); + NtGdiSetWindowOrgEx( dc->hSelf, ptWindowOrg.x, ptWindowOrg.y, NULL ); + + /* Go to GM_ADVANCED temporarily to restore the world transform */ + graphicsMode = NtGdiGetGraphicsMode( dc->hSelf ); + NtGdiSetGraphicsMode( dc->hSelf, GM_ADVANCED ); + NtGdiSetWorldTransform( dc->hSelf, &xform ); + NtGdiSetGraphicsMode( dc->hSelf, graphicsMode ); + return TRUE; + } return FALSE; } @@ -924,15 +1011,11 @@ * error occurs, SetLastError is called with the appropriate value and * FALSE is returned. */ -#if 0 -// FIXME - don't reenable this function until you deal with the -// const pPath being given to PATH_FlattenPath() - which is -// expecting a non-const*. Since this function isn't being called -// at the moment, I'm commenting it out until the issue needs to -// be addressed. + + BOOL FASTCALL -PATH_PathToRegion ( const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn ) +PATH_PathToRegion ( GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn ) { int numStrokes, iStroke, i; INT *pNumPointsInStroke; @@ -990,7 +1073,6 @@ *pHrgn=hrgn; return TRUE; } -#endif /* PATH_EmptyPath *

18 years, 9 months

[gvg] 20011: Merge from trunk:

by gvg＠svn.reactos.com

Merge from trunk: Never allocate 0 bytes. Fixes bug 1082. Modified: branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/region.c _____ Modified: branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/region.c --- branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/region.c 2005-12-09 17:56:26 UTC (rev 20010) +++ branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/region.c 2005-12-09 17:57:58 UTC (rev 20011) @@ -405,7 +405,11 @@ static __inline int xmemcheck(ROSRGNDATA *reg, PRECT *rect, PRECT *firstrect ) { if ( (reg->rdh.nCount+1)*sizeof( RECT ) >= reg->rdh.nRgnSize ) { PRECT temp; - temp = ExAllocatePoolWithTag( PagedPool, (2 * (reg->rdh.nRgnSize)), TAG_REGION); + DWORD NewSize = 2 * reg->rdh.nRgnSize; + if (NewSize < (reg->rdh.nCount + 1) * sizeof(RECT)) { + NewSize = (reg->rdh.nCount + 1) * sizeof(RECT); + } + temp = ExAllocatePoolWithTag( PagedPool, NewSize, TAG_REGION); if (temp == 0) return 0; @@ -413,7 +417,7 @@ /* copy the rectangles */ COPY_RECTS(temp, *firstrect, reg->rdh.nCount); - reg->rdh.nRgnSize *= 2; + reg->rdh.nRgnSize = NewSize; if (*firstrect != &reg->rdh.rcBound) ExFreePool( *firstrect ); *firstrect = temp;

18 years, 9 months

[gvg] 20010: Never allocate 0 bytes. Fixes bug 1082.

by gvg＠svn.reactos.com

Never allocate 0 bytes. Fixes bug 1082. Modified: trunk/reactos/subsys/win32k/objects/region.c _____ Modified: trunk/reactos/subsys/win32k/objects/region.c --- trunk/reactos/subsys/win32k/objects/region.c 2005-12-09 17:11:20 UTC (rev 20009) +++ trunk/reactos/subsys/win32k/objects/region.c 2005-12-09 17:56:26 UTC (rev 20010) @@ -405,7 +405,11 @@ static __inline int xmemcheck(ROSRGNDATA *reg, PRECT *rect, PRECT *firstrect ) { if ( (reg->rdh.nCount+1)*sizeof( RECT ) >= reg->rdh.nRgnSize ) { PRECT temp; - temp = ExAllocatePoolWithTag( PagedPool, (2 * (reg->rdh.nRgnSize)), TAG_REGION); + DWORD NewSize = 2 * reg->rdh.nRgnSize; + if (NewSize < (reg->rdh.nCount + 1) * sizeof(RECT)) { + NewSize = (reg->rdh.nCount + 1) * sizeof(RECT); + } + temp = ExAllocatePoolWithTag( PagedPool, NewSize, TAG_REGION); if (temp == 0) return 0; @@ -413,7 +417,7 @@ /* copy the rectangles */ COPY_RECTS(temp, *firstrect, reg->rdh.nCount); - reg->rdh.nRgnSize *= 2; + reg->rdh.nRgnSize = NewSize; if (*firstrect != &reg->rdh.rcBound) ExFreePool( *firstrect ); *firstrect = temp;

18 years, 9 months

[navaraf] 20009: Fix a Mach-O magic check. Spotted by mbealby@gmail.com.

by navaraf＠svn.reactos.com

Fix a Mach-O magic check. Spotted by mbealby(a)gmail.com. Modified: trunk/reactos/lib/kernel32/file/bintype.c _____ Modified: trunk/reactos/lib/kernel32/file/bintype.c --- trunk/reactos/lib/kernel32/file/bintype.c 2005-12-09 17:06:02 UTC (rev 20008) +++ trunk/reactos/lib/kernel32/file/bintype.c 2005-12-09 17:11:20 UTC (rev 20009) @@ -122,7 +122,7 @@ /* Mach-o File with Endian set to Big Endian or Little Endian*/ if(Header.macho.magic == 0xFEEDFACE || - Header.macho.magic == 0xECAFDEEF) + Header.macho.magic == 0xCEFAEDFE) { switch(Header.macho.filetype) {

18 years, 9 months

[navaraf] 20008: Fix a buffer overflow in OutputDebugStringA. Spotted by mbealby@gmail.com.

by navaraf＠svn.reactos.com

Fix a buffer overflow in OutputDebugStringA. Spotted by mbealby(a)gmail.com. Modified: trunk/reactos/lib/kernel32/debug/output.c _____ Modified: trunk/reactos/lib/kernel32/debug/output.c --- trunk/reactos/lib/kernel32/debug/output.c 2005-12-09 14:59:10 UTC (rev 20007) +++ trunk/reactos/lib/kernel32/debug/output.c 2005-12-09 17:06:02 UTC (rev 20008) @@ -397,10 +397,10 @@ nRoundLen = nOutputStringLen; /* copy the current block into the buffer */ - memcpy(pDBMonBuffer->Buffer, _OutputString, nOutputStringLen); + memcpy(pDBMonBuffer->Buffer, _OutputString, nRoundLen); /* null-terminate the current block */ - pDBMonBuffer->Buffer[nOutputStringLen] = 0; + pDBMonBuffer->Buffer[nRoundLen] = 0; /* signal that the data contains meaningful data and can be read */ SetEvent(hDBMonDataReady);

18 years, 9 months

[weiden] 20007: Patch by FRy2oo5 <fRy2oo5@gmail.com>:

by weiden＠svn.reactos.com

Patch by FRy2oo5 <fRy2oo5(a)gmail.com>: - Updated German translation of devmgr.dll Modified: trunk/reactos/lib/devmgr/De.rc Modified: trunk/reactos/lib/devmgr/En.rc _____ Modified: trunk/reactos/lib/devmgr/De.rc --- trunk/reactos/lib/devmgr/De.rc 2005-12-09 13:24:00 UTC (rev 20006) +++ trunk/reactos/lib/devmgr/De.rc 2005-12-09 14:59:10 UTC (rev 20007) @@ -12,6 +12,7 @@ IDS_UNKNOWN "Unbekannt" IDS_LOCATIONSTR "Ort %1!u! (%2)" IDS_DEVCODE " (Code %1!u!)" + IDS_DEVCODE2 " (Code %2!u!)" IDS_ENABLEDEVICE "Benutze dieses Gerõt (aktivieren)" IDS_DISABLEDEVICE "Benutze dieses Gerõt nicht (deaktivieren)" IDS_UNKNOWNDEVICE "Unbekanntes Gerõt" @@ -20,59 +21,74 @@ IDS_TROUBLESHOOTDEV "Problem &l÷sen..." IDS_ENABLEDEV "Gerõt &aktivieren" IDS_REINSTALLDRV "Treiber neu&installieren" + IDS_PROPERTIES "&Eigenschaften" + IDS_UPDATEDRV "Treiber &aktualisieren..." + IDS_REBOOT "Computer neusta&rten..." END +/* error messages, source: http://www.z123.org/techsupport/medm.htm */ STRINGTABLE BEGIN IDS_DEV_NO_PROBLEM "Dieses Gerõt funktioniert einwandfrei." - IDS_DEV_NOT_CONFIGURED "CM_PROB_NOT_CONFIGURED" - IDS_DEV_OUT_OF_MEMORY "CM_PROB_DEVLOADER_FAILED" - IDS_DEV_ENTRY_IS_WRONG_TYPE "CM_PROB_ENTRY_IS_WRONG_TYPE" - IDS_DEV_LACKED_ARBITRATOR "CM_PROB_LACKED_ARBITRATOR" - IDS_DEV_BOOT_CONFIG_CONFLICT "CM_PROB_BOOT_CONFIG_CONFLICT" - IDS_DEV_FAILED_FILTER "CM_PROB_FAILED_FILTER" - IDS_DEV_DEVLOADER_NOT_FOUND "CM_PROB_DEVLOADER_NOT_FOUND" - IDS_DEV_INVALID_DATA "CM_PROB_INVALID_DATA" - IDS_DEV_FAILED_START "CM_PROB_FAILED_START" - IDS_DEV_LIAR "CM_PROB_LIAR" - IDS_DEV_NORMAL_CONFLICT "CM_PROB_NORMAL_CONFLICT" - IDS_DEV_NOT_VERIFIED "CM_PROB_NOT_VERIFIED" - IDS_DEV_NEED_RESTART "CM_PROB_NEED_RESTART" - IDS_DEV_REENUMERATION "CM_PROB_REENUMERATION" - IDS_DEV_PARTIAL_LOG_CONF "CM_PROB_PARTIAL_LOG_CONF" - IDS_DEV_UNKNOWN_RESOURCE "CM_PROB_UNKNOWN_RESOURCE" - IDS_DEV_REINSTALL "CM_PROB_REINSTALL" - IDS_DEV_REGISTRY "CM_PROB_REGISTRY" - IDS_DEV_WILL_BE_REMOVED "CM_PROB_WILL_BE_REMOVED" - IDS_DEV_DISABLED "CM_PROB_DISABLED" - IDS_DEV_DEVLOADER_NOT_READY "CM_PROB_DEVLOADER_NOT_READY" - IDS_DEV_DEVICE_NOT_THERE "CM_PROB_DEVICE_NOT_THERE" - IDS_DEV_MOVED "CM_PROB_MOVED" - IDS_DEV_TOO_EARLY "CM_PROB_TOO_EARLY" - IDS_DEV_NO_VALID_LOG_CONF "CM_PROB_NO_VALID_LOG_CONF" - IDS_DEV_FAILED_INSTALL "CM_PROB_FAILED_INSTALL" - IDS_DEV_HARDWARE_DISABLED "CM_PROB_HARDWARE_DISABLED" - IDS_DEV_CANT_SHARE_IRQ "CM_PROB_CANT_SHARE_IRQ" - IDS_DEV_FAILED_ADD "CM_PROB_FAILED_ADD" - IDS_DEV_DISABLED_SERVICE "CM_PROB_DISABLED_SERVICE" - IDS_DEV_TRANSLATION_FAILED "CM_PROB_TRANSLATION_FAILED" - IDS_DEV_NO_SOFTCONFIG "CM_PROB_NO_SOFTCONFIG" - IDS_DEV_BIOS_TABLE "CM_PROB_BIOS_TABLE" - IDS_DEV_IRQ_TRANSLATION_FAILED "CM_PROB_IRQ_TRANSLATION_FAILED" - IDS_DEV_FAILED_DRIVER_ENTRY "CM_PROB_FAILED_DRIVER_ENTRY" - IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "CM_PROB_DRIVER_FAILED_PRIOR_UNLOAD" - IDS_DEV_DRIVER_FAILED_LOAD "CM_PROB_DRIVER_FAILED_LOAD" - IDS_DEV_DRIVER_SERVICE_KEY_INVALID "CM_PROB_DRIVER_SERVICE_KEY_INVALID" - IDS_DEV_LEGACY_SERVICE_NO_DEVICES "CM_PROB_LEGACY_SERVICE_NO_DEVICES" - IDS_DEV_DUPLICATE_DEVICE "CM_PROB_DUPLICATE_DEVICE" - IDS_DEV_FAILED_POST_START "CM_PROB_FAILED_POST_START" - IDS_DEV_HALTED "CM_PROB_HALTED" - IDS_DEV_PHANTOM "CM_PROB_PHANTOM" - IDS_DEV_SYSTEM_SHUTDOWN "CM_PROB_SYSTEM_SHUTDOWN" - IDS_DEV_HELD_FOR_EJECT "CM_PROB_HELD_FOR_EJECT" - IDS_DEV_DRIVER_BLOCKED "CM_PROB_DRIVER_BLOCKED" - IDS_DEV_REGISTRY_TOO_LARGE "CM_PROB_REGISTRY_TOO_LARGE" - IDS_DEV_SETPROPERTIES_FAILED "CM_PROB_SETPROPERTIES_FAILED" + IDS_DEV_NOT_CONFIGURED "Dieses Gerõt ist nicht richtig konfiguriert." + IDS_DEV_DEVLOADER_FAILED "ReactOS konnte den Treiber f³r dieses Gerõt nicht laden, weil der Computer zwei $1 Bustypen meldet." + IDS_DEV_DEVLOADER_FAILED2 "Der/die $1 Gerõtelader f³r dieses Gerõt konnte den Gerõtetreiber nicht laden." + IDS_DEV_OUT_OF_MEMORY "Der Treiber f³r dieses Gerõt k÷nnte beschõdigt sein, oder ihr System verf³gt ³ber zu wenig Speicher oder andere Ressourcen." + IDS_DEV_ENTRY_IS_WRONG_TYPE "Dieses Gerõt arbeitet nicht korrekt, weil einer seiner Treiber oder die Registry beschõdigt ist." + IDS_DEV_LACKED_ARBITRATOR "Der Treiber dieses Gerõtes hat eine Ressource angefragt, die ReactOS nicht behandeln kann." + IDS_DEV_BOOT_CONFIG_CONFLICT "Ein anderes Gerõt benutzt bereits die Ressourcen, die dieses Gerõt ben÷tigt." + IDS_DEV_FAILED_FILTER "Die Treiber f³r dieses Gerõt m³ssen neuinstalliert werden." + IDS_DEV_DEVLOADER_NOT_FOUND "Dieses Gerõt arbeitet nicht korrekt, weil ReactOS die Datei $1 nicht laden kann, die die Treiber f³r dieses Gerõt lõdt." + IDS_DEV_DEVLOADER_NOT_FOUND2 "Dieses Gerõt arbeitet nicht korrekt, weil die Datei $1, die die Treiber f³r dieses Gerõt lõdt, kaputt ist." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Gerõtefehler: Versuchen sie, den Treiber f³r dieses Gerõt auszutauschen. Wenn das nicht hilft, schauen sie in die Gerõtedokumentation." + IDS_DEV_INVALID_DATA "Dieses Gerõt arbeitet nicht korrekt, weil das BIOS ihres Computer die Ressourcen f³r dieses Gerõt falsch angibt." + IDS_DEV_INVALID_DATA2 "Dieses Gerõt arbeitet nicht korrekt, weil das BIOS dieses Gerõtes die Ressourcen f³r dieses Gerõt falsch angibt. " + IDS_DEV_FAILED_START "Dieses Gerõt ist entweder nicht vorhanen, funktioniert nicht korrekt, oder es sind nicht nicht alle Treiber installiert." + IDS_DEV_LIAR "ReactOS h÷rte wõhrend des Versuchs dieses Gerõt zu starten auf zu reagieren und wird deshalb nie wieder versuchen, dieses Gerõt zu starten.." + IDS_DEV_NORMAL_CONFLICT "Dieses Gerõt kann keine freien $1 Ressourcen zur Benutzung finden." + IDS_DEV_NOT_VERIFIED "Dieses Gerõt ist entweder nicht vorhanen, funktioniert nicht korrekt, oder es sind nicht nicht alle Treiber installiert." + IDS_DEV_NEED_RESTART "Dieses Gerõt wird erst korrekt funktionieren, wenn sie den Computer neugestartet haben." + IDS_DEV_REENUMERATION "Dieses Gerõt verursacht einen Ressourcenkonflikt." + IDS_DEV_PARTIAL_LOG_CONF "ReactOS konnte nicht alle Ressourcen identifizieren, die dieses Gerõt benutzt." + IDS_DEV_UNKNOWN_RESOURCE "The driver information file $1 is telling this child device to use a resource that the parent device does not have or recognize." + IDS_DEV_REINSTALL "Die Treiber f³r dieses Gerõt m³ssen neuinstalliert werden." + IDS_DEV_REGISTRY "Die Registry k÷nnte beschõdigt sein." + IDS_DEV_WILL_BE_REMOVED "ReactOS wird dieses Gerõt entfernen." + IDS_DEV_DISABLED "Dieses Gerõt ist nicht gestartet." + IDS_DEV_DISABLED2 "Dieses Gerõt ist deaktiviert." + IDS_DEV_DEVLOADER_NOT_READY "Der Lader f³r dieses Gerõt kann die ben÷tigten Treiber nicht laden." + IDS_DEV_DEVLOADER_NOT_READY2 "Dieses Grafikkarte funktioniert einwandfrei." + IDS_DEV_DEVLOADER_NOT_READY3 "Die Lader f³r dieses Gerõt k÷nnen die ben÷tigten Treiber nicht laden." + IDS_DEV_DEVICE_NOT_THERE "Dieses Gerõt ist entweder nicht vorhanen, funktioniert nicht korrekt, oder es sind nicht nicht alle Treiber installiert." + IDS_DEV_MOVED "ReactOS ist dabei dieses Gerõt zu aktivieren." + IDS_DEV_TOO_EARLY "ReactOS ist dabei dieses Gerõt zu aktivieren." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS kann die Ressourcen f³r dieses Gerõt nicht feststellen." + IDS_DEV_FAILED_INSTALL "Die Treiber f³r dieses Gerõt sind nicht installiert." + IDS_DEV_HARDWARE_DISABLED "Dieses Gerõt ist deaktiviert, weil das BIOS f³r dieses Gerõt ihm keine Ressourcen zugeteilt hat." + IDS_DEV_CANT_SHARE_IRQ "Dieses Gerõt benutzt einen Interrupt (IRQ), der bereits von einem anderen Gerõt benutzt wird und nicht geteilt werden kann. "\ + "Sie m³ssen die kollidierenden Einstellungen õndern, oder den real-mode Treiber entfernen, der den Konflikt verursacht." + IDS_DEV_FAILED_ADD "Dieses Gerõt arbeitet nicht korrekt, weil $1 nicht korrekt funktioniert." + IDS_DEV_DISABLED_SERVICE "ReactOS kann die Treiber f³r dieses Gerõt nicht installieren, weil auf das (Netz-)Laufwerk, auf dem die Installationsdateien abgelegt sind, nicht zugegriffen werden kann." + IDS_DEV_TRANSLATION_FAILED "Dieses Gerõt reagiert nicht auf seinen Treiber." + IDS_DEV_NO_SOFTCONFIG "ReactOS kann die Einstellungen f³r dieses Gerõt nicht feststellen. Lesen sie die Dokumentation, die mit diesem Gerõt kam und benutzen sie den Reiter \"Ressourcen\" umd die Konfiguration vorzunehmen." + IDS_DEV_BIOS_TABLE "Die System-Firmware ihres Computers beinhaltet nicht genug Information um dieses Gerõt korrekt konfigurieren und benutzen zu k÷nnen. "\ + "Um dieses Gerõt benutzen zu k÷nnen, kontaktieren sie bitte ihren Computerhersteller um ein Firmware oder BIOS update zu erhalten." + IDS_DEV_IRQ_TRANSLATION_FAILED "Dieses Gerõt beantragt einen PCI-Interrupt, ist aber f³r einen ISA-Interrupt konfiguriert (oder andersherum). "\ + "Bitte benutzen sie das System-Setup Programm dieses Computers, um den Interrupt f³r dieses Gerõt neu zu konfigurieren." + IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS kann den Gerõtetreiber f³r dieses Gerõt nicht initialisieren." + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS kann den Gerõtetreiber f³r dieses Gerõt nicht laden, weil eine noch fr³here Instanz des Gerõtetreibers im Speicher ist." + IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS kann dieses Gerõt nicht ansprechen, weil seine Serviceschl³ssel Information nicht in der Registry ist oder weil sie falsch ist." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS hat den Gerõtetreiber f³r dieses Gerõt erfolgreich geladen, kann aber das Gerõt nicht finden." + IDS_DEV_DUPLICATE_DEVICE "ReactOS kann den Gerõtetreiber f³r dieses Gerõt nicht laden, weil bereits ein identisches Gerõt installiert ist." + IDS_DEV_FAILED_POST_START "ReactOS hat dieses Gerõt angehalten, weil es Probleme berichtet hat." + IDS_DEV_HALTED "Eine Anwendung oder ein Dienst hat dieses Gerõt heruntergefahren." + IDS_DEV_PHANTOM "Dieses Gerõt ist momentan nicht mit dem Computer verbunden." + IDS_DEV_SYSTEM_SHUTDOWN "ReactOS kann auf dieses Gerõt nicht zugreifen, weil das Betriebssystem heruntergefahren wird." + IDS_DEV_HELD_FOR_EJECT "ReactOS kann dieses Gerõt nicht benutzen, weil es f³r \"Sicheres Entfernen\" vorbereitet wurde, aber es wurde bisher nicht vom Computer entfernt." + IDS_DEV_DRIVER_BLOCKED "Die Ausf³hrung der Software f³r dieses Gerõt wurde blockiert, weil bekannt ist, dass sie Probleme mit ReactOS hat. Kontaktieren sie den Hersteller f³r einen neuen Treiber." + IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS konnte die Einstellungen f³r dieses Gerõt nicht verõndern." END IDD_HARDWARE DIALOG DISCARDABLE 0, 0, 300, 400 @@ -80,8 +96,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Gerõte:",IDC_DEVICES,7,6,196,10 - CONTROL "",IDC_LV_DEVICES,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + CONTROL "",IDC_LV_DEVICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,16,196,50 GROUPBOX "Gerõteeigenschaften",IDC_PROPERTIESGROUP,7,76,196,105 LTEXT "",IDC_MANUFACTURER,14,88,183,10,SS_ENDELLIPSIS @@ -111,4 +127,3 @@ LTEXT "Gerõte&benutzung:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED END - _____ Modified: trunk/reactos/lib/devmgr/En.rc --- trunk/reactos/lib/devmgr/En.rc 2005-12-09 13:24:00 UTC (rev 20006) +++ trunk/reactos/lib/devmgr/En.rc 2005-12-09 14:59:10 UTC (rev 20007) @@ -49,7 +49,7 @@ IDS_DEV_NOT_VERIFIED "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_NEED_RESTART "This device cannot work properly until you restart your computer." IDS_DEV_REENUMERATION "This device is causing a resource conflict." - IDS_DEV_PARTIAL_LOG_CONF "Windows could not identify all the resources this device uses." + IDS_DEV_PARTIAL_LOG_CONF "ReactOS could not identify all the resources this device uses." IDS_DEV_UNKNOWN_RESOURCE "The driver information file $1 is telling this child device to use a resource that the parent device does not have or recognize." IDS_DEV_REINSTALL "The drivers for this device need to be reinstalled." IDS_DEV_REGISTRY "Your registry may be bad."

18 years, 9 months

← Newer
1
...
46
47
48
49
50
51
52
...
71
Older →

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 December 2005