Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[fireball] 44924: Daniel Zimmermann <netzimme@aim.com> - Fix missing arguments for the call KdbpPrint() in differents places in kdbg_cli.c. See issue #5089 for more details.
by fireball＠svn.reactos.org 04 Jan '10

04 Jan '10

Author: fireball Date: Mon Jan 4 12:03:23 2010 New Revision: 44924 URL: http://svn.reactos.org/svn/reactos?rev=44924&view=rev Log: Daniel Zimmermann <netzimme(a)aim.com> - Fix missing arguments for the call KdbpPrint() in differents places in kdbg_cli.c. See issue #5089 for more details. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Mon Jan 4 12:03:23 2010 @@ -527,7 +527,7 @@ return TRUE; if (Result > (ULONGLONG)(~((ULONG_PTR)0))) - KdbpPrint("Warning: Address %I64x is beeing truncated\n"); + KdbpPrint("Warning: Address %I64x is beeing truncated\n",Result); Address = (ULONG_PTR)Result; } @@ -790,7 +790,7 @@ return TRUE; if (Result > (ULONGLONG)(~((ULONG_PTR)0))) - KdbpPrint("Warning: Address %I64x is beeing truncated\n"); + KdbpPrint("Warning: Address %I64x is beeing truncated\n",Result); Frame = (ULONG_PTR)Result; } @@ -1133,7 +1133,7 @@ } if (Result > (ULONGLONG)(~((ULONG_PTR)0))) - KdbpPrint("%s: Warning: Address %I64x is beeing truncated\n", Argv[0]); + KdbpPrint("%s: Warning: Address %I64x is beeing truncated\n", Argv[0],Result); Address = (ULONG_PTR)Result; @@ -1491,7 +1491,7 @@ } if (Result > (ULONGLONG)(~((ULONG_PTR)0))) - KdbpPrint("%s: Warning: Address %I64x is beeing truncated\n", Argv[0]); + KdbpPrint("%s: Warning: Address %I64x is beeing truncated\n", Argv[0],Result); Address = (ULONG_PTR)Result;

1 0

[jimtabor] 44923: - Another attempt to fix RGNOBJAPI_Un/Lock SEH issue. Resort code.
by jimtabor＠svn.reactos.org 04 Jan '10

04 Jan '10

Author: jimtabor Date: Mon Jan 4 02:36:24 2010 New Revision: 44923 URL: http://svn.reactos.org/svn/reactos?rev=44923&view=rev Log: - Another attempt to fix RGNOBJAPI_Un/Lock SEH issue. Resort code. Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Mon Jan 4 02:36:24 2010 @@ -2084,7 +2084,8 @@ INT Index; PGDI_TABLE_ENTRY Entry; PROSRGNDATA pRgn; - PRGN_ATTR pRgn_Attr; + PRGN_ATTR pRgn_Attr; + BOOL Hit = FALSE; pRgn = REGION_LockRgn(hRgn); @@ -2124,6 +2125,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + Hit = TRUE; } _SEH2_END; @@ -2146,6 +2148,7 @@ INT Index; PGDI_TABLE_ENTRY Entry; PRGN_ATTR pRgn_Attr; + BOOL Hit = FALSE; if (pRgn) { @@ -2172,6 +2175,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + Hit = TRUE; } _SEH2_END; } @@ -2315,65 +2319,6 @@ return result; } - -// NtGdi Exported Functions -INT -APIENTRY -NtGdiCombineRgn(HRGN hDest, - HRGN hSrc1, - HRGN hSrc2, - INT CombineMode) -{ - INT result = ERROR; - PROSRGNDATA destRgn, src1Rgn, src2Rgn = NULL; - - if ( CombineMode > RGN_COPY && CombineMode < RGN_AND) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return ERROR; - } - - destRgn = RGNOBJAPI_Lock(hDest, NULL); - if (!destRgn) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return ERROR; - } - - src1Rgn = RGNOBJAPI_Lock(hSrc1, NULL); - if (!src1Rgn) - { - RGNOBJAPI_Unlock(destRgn); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return ERROR; - } - - if (hSrc2) - src2Rgn = RGNOBJAPI_Lock(hSrc2, NULL); - - result = IntGdiCombineRgn( destRgn, src1Rgn, src2Rgn, CombineMode); - - if (src2Rgn) - RGNOBJAPI_Unlock(src2Rgn); - RGNOBJAPI_Unlock(src1Rgn); - RGNOBJAPI_Unlock(destRgn); - - return result; -} - -HRGN -APIENTRY -NtGdiCreateEllipticRgn( - INT Left, - INT Top, - INT Right, - INT Bottom -) -{ - return NtGdiCreateRoundRectRgn(Left, Top, Right, Bottom, - Right - Left, Bottom - Top); -} - PROSRGNDATA FASTCALL IntGdiCreateRectRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect) @@ -2388,362 +2333,6 @@ pRgn = GDIOBJ_ShareLockObj(pRgn->BaseObject.hHmgr, GDI_OBJECT_TYPE_REGION); return pRgn; -} - - -HRGN APIENTRY -NtGdiCreateRectRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect) -{ - PROSRGNDATA pRgn; - HRGN hRgn; - - /* Allocate region data structure with space for 1 RECTL */ - if (!(pRgn = REGION_AllocRgnWithHandle(1))) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - hRgn = pRgn->BaseObject.hHmgr; - - REGION_SetRectRgn(pRgn, LeftRect, TopRect, RightRect, BottomRect); - RGNOBJAPI_Unlock(pRgn); - - return hRgn; -} - - -HRGN -APIENTRY -NtGdiCreateRoundRectRgn( - INT left, - INT top, - INT right, - INT bottom, - INT ellipse_width, - INT ellipse_height -) -{ - PROSRGNDATA obj; - HRGN hrgn; - int asq, bsq, d, xd, yd; - RECTL rect; - - /* Make the dimensions sensible */ - - if (left > right) - { - INT tmp = left; - left = right; - right = tmp; - } - if (top > bottom) - { - INT tmp = top; - top = bottom; - bottom = tmp; - } - - ellipse_width = abs(ellipse_width); - ellipse_height = abs(ellipse_height); - - /* Check parameters */ - - if (ellipse_width > right-left) ellipse_width = right-left; - if (ellipse_height > bottom-top) ellipse_height = bottom-top; - - /* Check if we can do a normal rectangle instead */ - - if ((ellipse_width < 2) || (ellipse_height < 2)) - return NtGdiCreateRectRgn(left, top, right, bottom); - - /* Create region */ - - d = (ellipse_height < 128) ? ((3 * ellipse_height) >> 2) : 64; - if (!(obj = REGION_AllocRgnWithHandle(d))) return 0; - hrgn = obj->BaseObject.hHmgr; - - /* Ellipse algorithm, based on an article by K. Porter */ - /* in DDJ Graphics Programming Column, 8/89 */ - - asq = ellipse_width * ellipse_width / 4; /* a^2 */ - bsq = ellipse_height * ellipse_height / 4; /* b^2 */ - d = bsq - asq * ellipse_height / 2 + asq / 4; /* b^2 - a^2b + a^2/4 */ - xd = 0; - yd = asq * ellipse_height; /* 2a^2b */ - - rect.left = left + ellipse_width / 2; - rect.right = right - ellipse_width / 2; - - /* Loop to draw first half of quadrant */ - - while (xd < yd) - { - if (d > 0) /* if nearest pixel is toward the center */ - { - /* move toward center */ - rect.top = top++; - rect.bottom = rect.top + 1; - REGION_UnionRectWithRgn(obj, &rect); - rect.top = --bottom; - rect.bottom = rect.top + 1; - REGION_UnionRectWithRgn(obj, &rect); - yd -= 2*asq; - d -= yd; - } - rect.left--; /* next horiz point */ - rect.right++; - xd += 2*bsq; - d += bsq + xd; - } - /* Loop to draw second half of quadrant */ - - d += (3 * (asq-bsq) / 2 - (xd+yd)) / 2; - while (yd >= 0) - { - /* next vertical point */ - rect.top = top++; - rect.bottom = rect.top + 1; - REGION_UnionRectWithRgn(obj, &rect); - rect.top = --bottom; - rect.bottom = rect.top + 1; - REGION_UnionRectWithRgn(obj, &rect); - if (d < 0) /* if nearest pixel is outside ellipse */ - { - rect.left--; /* move away from center */ - rect.right++; - xd += 2*bsq; - d += xd; - } - yd -= 2*asq; - d += asq - yd; - } - /* Add the inside rectangle */ - - if (top <= bottom) - { - rect.top = top; - rect.bottom = bottom; - REGION_UnionRectWithRgn(obj, &rect); - } - - RGNOBJAPI_Unlock(obj); - return hrgn; -} - -BOOL -APIENTRY -NtGdiEqualRgn( - HRGN hSrcRgn1, - HRGN hSrcRgn2 -) -{ - PROSRGNDATA rgn1, rgn2; - PRECTL tRect1, tRect2; - ULONG i; - BOOL bRet = FALSE; - - if ( !(rgn1 = RGNOBJAPI_Lock(hSrcRgn1, NULL)) ) - return ERROR; - - if ( !(rgn2 = RGNOBJAPI_Lock(hSrcRgn2, NULL)) ) - { - RGNOBJAPI_Unlock(rgn1); - return ERROR; - } - - if (rgn1->rdh.nCount != rgn2->rdh.nCount || - rgn1->rdh.nCount == 0 || - rgn1->rdh.rcBound.left != rgn2->rdh.rcBound.left || - rgn1->rdh.rcBound.right != rgn2->rdh.rcBound.right || - rgn1->rdh.rcBound.top != rgn2->rdh.rcBound.top || - rgn1->rdh.rcBound.bottom != rgn2->rdh.rcBound.bottom) - goto exit; - - tRect1 = rgn1->Buffer; - tRect2 = rgn2->Buffer; - - if (!tRect1 || !tRect2) - goto exit; - - for (i=0; i < rgn1->rdh.nCount; i++) - { - if (tRect1[i].left != tRect2[i].left || - tRect1[i].right != tRect2[i].right || - tRect1[i].top != tRect2[i].top || - tRect1[i].bottom != tRect2[i].bottom) - goto exit; - } - bRet = TRUE; - -exit: - RGNOBJAPI_Unlock(rgn1); - RGNOBJAPI_Unlock(rgn2); - return bRet; -} - -HRGN -APIENTRY -NtGdiExtCreateRegion( - OPTIONAL LPXFORM Xform, - DWORD Count, - LPRGNDATA RgnData -) -{ - HRGN hRgn; - PROSRGNDATA Region; - DWORD nCount = 0; - DWORD iType = 0; - DWORD dwSize = 0; - NTSTATUS Status = STATUS_SUCCESS; - MATRIX matrix; - - DPRINT("NtGdiExtCreateRegion\n"); - _SEH2_TRY - { - ProbeForRead(RgnData, Count, 1); - nCount = RgnData->rdh.nCount; - iType = RgnData->rdh.iType; - dwSize = RgnData->rdh.dwSize; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return NULL; - } - - /* Check parameters, but don't set last error here */ - if (Count < sizeof(RGNDATAHEADER) + nCount * sizeof(RECT) || - iType != RDH_RECTANGLES || - dwSize != sizeof(RGNDATAHEADER)) - { - return NULL; - } - - Region = REGION_AllocRgnWithHandle(nCount); - - if (Region == NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - hRgn = Region->BaseObject.hHmgr; - - _SEH2_TRY - { - if (Xform) - { - ULONG ret; - - /* Init the XFORMOBJ from the Xform struct */ - Status = STATUS_INVALID_PARAMETER; - ret = XFORMOBJ_iSetXform((XFORMOBJ*)&matrix, (XFORML*)Xform); - - /* Check for error, also no scale and shear allowed */ - if (ret != DDI_ERROR && ret != GX_GENERAL) - { - /* Apply the coordinate transformation on the rects */ - if (XFORMOBJ_bApplyXform((XFORMOBJ*)&matrix, - XF_LTOL, - nCount * 2, - RgnData->Buffer, - Region->Buffer)) - { - Status = STATUS_SUCCESS; - } - } - } - else - { - /* Copy rect coordinates */ - RtlCopyMemory(Region->Buffer, - RgnData->Buffer, - nCount * sizeof(RECT)); - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - if (!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RGNOBJAPI_Unlock(Region); - GreDeleteObject(hRgn); - return NULL; - } - - RGNOBJAPI_Unlock(Region); - - return hRgn; -} - -BOOL -APIENTRY -NtGdiFillRgn( - HDC hDC, - HRGN hRgn, - HBRUSH hBrush -) -{ - HBRUSH oldhBrush; - PROSRGNDATA rgn; - PRECTL r; - - if (NULL == (rgn = RGNOBJAPI_Lock(hRgn, NULL))) - { - return FALSE; - } - - if (NULL == (oldhBrush = NtGdiSelectBrush(hDC, hBrush))) - { - RGNOBJAPI_Unlock(rgn); - return FALSE; - } - - for (r = rgn->Buffer; r < rgn->Buffer + rgn->rdh.nCount; r++) - { - NtGdiPatBlt(hDC, r->left, r->top, r->right - r->left, r->bottom - r->top, PATCOPY); - } - - RGNOBJAPI_Unlock(rgn); - NtGdiSelectBrush(hDC, oldhBrush); - - return TRUE; -} - -BOOL -APIENTRY -NtGdiFrameRgn( - HDC hDC, - HRGN hRgn, - HBRUSH hBrush, - INT Width, - INT Height -) -{ - HRGN FrameRgn; - BOOL Ret; - - if (!(FrameRgn = NtGdiCreateRectRgn(0, 0, 0, 0))) - { - return FALSE; - } - if (!REGION_CreateFrameRgn(FrameRgn, hRgn, Width, Height)) - { - GreDeleteObject(FrameRgn); - return FALSE; - } - - Ret = NtGdiFillRgn(hDC, FrameRgn, hBrush); - - GreDeleteObject(FrameRgn); - return Ret; } INT FASTCALL @@ -2764,85 +2353,6 @@ return 0; //if invalid region return zero } - -/* See wine, msdn, osr and Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw - - 1st: http://www.codeproject.com/gdi/cliprgnguide.asp is wrong! - - The intersection of the clip with the meta region is not Rao it's API! - Go back and read 7.2 Clipping pages 418-19: - Rao = API & Vis: - 1) The Rao region is the intersection of the API region and the system region, - named after the Microsoft engineer who initially proposed it. - 2) The Rao region can be calculated from the API region and the system region. - - API: - API region is the intersection of the meta region and the clipping region, - clearly named after the fact that it is controlled by GDI API calls. -*/ -INT APIENTRY -NtGdiGetRandomRgn( - HDC hDC, - HRGN hDest, - INT iCode -) -{ - INT ret = 0; - PDC pDC; - HRGN hSrc = NULL; - POINT org; - - pDC = DC_LockDc(hDC); - if (pDC == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return -1; - } - - switch (iCode) - { - case CLIPRGN: - hSrc = pDC->rosdc.hClipRgn; -// if (pDC->dclevel.prgnClip) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnClip)->BaseObject.hHmgr; - break; - case METARGN: - if (pDC->dclevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnMeta)->BaseObject.hHmgr; - break; - case APIRGN: - hSrc = pDC->rosdc.hClipRgn; -// if (pDC->prgnAPI) hSrc = ((PROSRGNDATA)pDC->prgnAPI)->BaseObject.hHmgr; -// else if (pDC->dclevel.prgnClip) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnClip)->BaseObject.hHmgr; -// else if (pDC->dclevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnMeta)->BaseObject.hHmgr; - break; - case SYSRGN: - hSrc = pDC->rosdc.hVisRgn; -// if (pDC->prgnVis) hSrc = ((PROSRGNDATA)pDC->prgnVis)->BaseObject.hHmgr; - break; - default: - hSrc = 0; - } - if (hSrc) - { - if (NtGdiCombineRgn(hDest, hSrc, 0, RGN_COPY) == ERROR) - { - ret = -1; - } - else - { - ret = 1; - } - } - if (iCode == SYSRGN) - { - IntGdiGetDCOrg(pDC, &org); - NtGdiOffsetRgn(hDest, org.x, org.y ); - } - - DC_UnlockDc(pDC); - - return ret; -} - INT APIENTRY IntGdiGetRgnBox( HRGN hRgn, @@ -2860,129 +2370,6 @@ ret = REGION_GetRgnBox(Rgn, pRect); RGNOBJAPI_Unlock(Rgn); - return ret; -} - - -INT APIENTRY -NtGdiGetRgnBox( - HRGN hRgn, - PRECTL pRect -) -{ - PROSRGNDATA Rgn; - RECTL SafeRect; - DWORD ret; - NTSTATUS Status = STATUS_SUCCESS; - - if (!(Rgn = RGNOBJAPI_Lock(hRgn, NULL))) - { - return ERROR; - } - - ret = REGION_GetRgnBox(Rgn, &SafeRect); - RGNOBJAPI_Unlock(Rgn); - if (ERROR == ret) - { - return ret; - } - - _SEH2_TRY - { - ProbeForWrite(pRect, sizeof(RECT), 1); - *pRect = SafeRect; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - if (!NT_SUCCESS(Status)) - { - return ERROR; - } - - return ret; -} - -BOOL -APIENTRY -NtGdiInvertRgn( - HDC hDC, - HRGN hRgn -) -{ - PROSRGNDATA RgnData; - ULONG i; - PRECTL rc; - - if (!(RgnData = RGNOBJAPI_Lock(hRgn, NULL))) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - - rc = RgnData->Buffer; - for (i = 0; i < RgnData->rdh.nCount; i++) - { - - if (!NtGdiPatBlt(hDC, rc->left, rc->top, rc->right - rc->left, rc->bottom - rc->top, DSTINVERT)) - { - RGNOBJAPI_Unlock(RgnData); - return FALSE; - } - rc++; - } - - RGNOBJAPI_Unlock(RgnData); - return TRUE; -} - -INT -APIENTRY -NtGdiOffsetRgn( - HRGN hRgn, - INT XOffset, - INT YOffset -) -{ - PROSRGNDATA rgn = RGNOBJAPI_Lock(hRgn, NULL); - INT ret; - - DPRINT("NtGdiOffsetRgn: hRgn %d Xoffs %d Yoffs %d rgn %x\n", hRgn, XOffset, YOffset, rgn ); - - if (!rgn) - { - DPRINT("NtGdiOffsetRgn: hRgn error\n"); - return ERROR; - } - - if (XOffset || YOffset) - { - int nbox = rgn->rdh.nCount; - PRECTL pbox = rgn->Buffer; - - if (nbox && pbox) - { - while (nbox--) - { - pbox->left += XOffset; - pbox->right += XOffset; - pbox->top += YOffset; - pbox->bottom += YOffset; - pbox++; - } - if (rgn->Buffer != &rgn->rdh.rcBound) - { - rgn->rdh.rcBound.left += XOffset; - rgn->rdh.rcBound.right += XOffset; - rgn->rdh.rcBound.top += YOffset; - rgn->rdh.rcBound.bottom += YOffset; - } - } - } - ret = REGION_Complexity(rgn); - RGNOBJAPI_Unlock(rgn); return ret; } @@ -3046,38 +2433,6 @@ // Fill the region return TRUE; -} - -BOOL -APIENTRY -NtGdiPtInRegion( - HRGN hRgn, - INT X, - INT Y -) -{ - PROSRGNDATA rgn; - ULONG i; - PRECTL r; - - if (!(rgn = RGNOBJAPI_Lock(hRgn, NULL) ) ) - return FALSE; - - if (rgn->rdh.nCount > 0 && INRECT(rgn->rdh.rcBound, X, Y)) - { - r = rgn->Buffer; - for (i = 0; i < rgn->rdh.nCount; i++) - { - if (INRECT(*r, X, Y)) - { - RGNOBJAPI_Unlock(rgn); - return TRUE; - } - r++; - } - } - RGNOBJAPI_Unlock(rgn); - return FALSE; } BOOL @@ -3130,47 +2485,6 @@ } } return FALSE; -} - -BOOL -APIENTRY -NtGdiRectInRegion( - HRGN hRgn, - LPRECTL unsaferc -) -{ - PROSRGNDATA Rgn; - RECTL rc = {0}; - BOOL Ret; - NTSTATUS Status = STATUS_SUCCESS; - - if (!(Rgn = RGNOBJAPI_Lock(hRgn, NULL))) - { - return ERROR; - } - - _SEH2_TRY - { - ProbeForRead(unsaferc, sizeof(RECT), 1); - rc = *unsaferc; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - RGNOBJAPI_Unlock(Rgn); - SetLastNtError(Status); - DPRINT1("NtGdiRectInRegion: bogus rc\n"); - return ERROR; - } - - Ret = REGION_RectInRegion(Rgn, &rc); - RGNOBJAPI_Unlock(Rgn); - return Ret; } VOID @@ -3210,128 +2524,11 @@ rgn->rdh.iType = RDH_RECTANGLES; } else + { + DPRINT1("SetRectRgn NULL Count: %d \n", rgn->rdh.nCount); EMPTY_REGION(rgn); -} - -BOOL -APIENTRY -NtGdiSetRectRgn( - HRGN hRgn, - INT LeftRect, - INT TopRect, - INT RightRect, - INT BottomRect -) -{ - PROSRGNDATA rgn; - - if ( !(rgn = RGNOBJAPI_Lock(hRgn, NULL)) ) - { - return 0; //per documentation - } - - REGION_SetRectRgn(rgn, LeftRect, TopRect, RightRect, BottomRect); - - RGNOBJAPI_Unlock(rgn); - return TRUE; -} - -HRGN APIENTRY -NtGdiUnionRectWithRgn( - HRGN hDest, - const RECTL *UnsafeRect -) -{ - RECTL SafeRect = {0}; - PROSRGNDATA Rgn; - NTSTATUS Status = STATUS_SUCCESS; - - if (!(Rgn = RGNOBJAPI_Lock(hDest, NULL))) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return NULL; - } - - _SEH2_TRY - { - ProbeForRead(UnsafeRect, sizeof(RECT), 1); - SafeRect = *UnsafeRect; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (! NT_SUCCESS(Status)) - { - RGNOBJAPI_Unlock(Rgn); - SetLastNtError(Status); - return NULL; - } - - REGION_UnionRectWithRgn(Rgn, &SafeRect); - RGNOBJAPI_Unlock(Rgn); - return hDest; -} - -/*! - * MSDN: GetRegionData, Return Values: - * - * "If the function succeeds and dwCount specifies an adequate number of bytes, - * the return value is always dwCount. If dwCount is too small or the function - * fails, the return value is 0. If lpRgnData is NULL, the return value is the - * required number of bytes. - * - * If the function fails, the return value is zero." - */ -DWORD APIENTRY -NtGdiGetRegionData( - HRGN hrgn, - DWORD count, - LPRGNDATA rgndata -) -{ - DWORD size; - PROSRGNDATA obj = RGNOBJAPI_Lock(hrgn, NULL); - NTSTATUS Status = STATUS_SUCCESS; - - if (!obj) - return 0; - - size = obj->rdh.nCount * sizeof(RECT); - if (count < (size + sizeof(RGNDATAHEADER)) || rgndata == NULL) - { - RGNOBJAPI_Unlock(obj); - if (rgndata) /* buffer is too small, signal it by return 0 */ - return 0; - else /* user requested buffer size with rgndata NULL */ - return size + sizeof(RGNDATAHEADER); - } - - _SEH2_TRY - { - ProbeForWrite(rgndata, count, 1); - RtlCopyMemory(rgndata, &obj->rdh, sizeof(RGNDATAHEADER)); - RtlCopyMemory(rgndata->Buffer, obj->Buffer, size); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RGNOBJAPI_Unlock(obj); - return 0; - } - - RGNOBJAPI_Unlock(obj); - return size + sizeof(RGNDATAHEADER); -} - + } +} /*********************************************************************** * REGION_InsertEdgeInET @@ -3967,4 +3164,811 @@ return hrgn; } +// +// NtGdi Exported Functions +// +INT +APIENTRY +NtGdiCombineRgn(HRGN hDest, + HRGN hSrc1, + HRGN hSrc2, + INT CombineMode) +{ + INT result = ERROR; + PROSRGNDATA destRgn, src1Rgn, src2Rgn = NULL; + + if ( CombineMode > RGN_COPY && CombineMode < RGN_AND) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return ERROR; + } + + destRgn = RGNOBJAPI_Lock(hDest, NULL); + if (!destRgn) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return ERROR; + } + + src1Rgn = RGNOBJAPI_Lock(hSrc1, NULL); + if (!src1Rgn) + { + RGNOBJAPI_Unlock(destRgn); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return ERROR; + } + + if (hSrc2) + src2Rgn = RGNOBJAPI_Lock(hSrc2, NULL); + + result = IntGdiCombineRgn( destRgn, src1Rgn, src2Rgn, CombineMode); + + if (src2Rgn) + RGNOBJAPI_Unlock(src2Rgn); + RGNOBJAPI_Unlock(src1Rgn); + RGNOBJAPI_Unlock(destRgn); + + return result; +} + +HRGN +APIENTRY +NtGdiCreateEllipticRgn( + INT Left, + INT Top, + INT Right, + INT Bottom +) +{ + return NtGdiCreateRoundRectRgn(Left, Top, Right, Bottom, + Right - Left, Bottom - Top); +} + +HRGN APIENTRY +NtGdiCreateRectRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect) +{ + PROSRGNDATA pRgn; + HRGN hRgn; + + /* Allocate region data structure with space for 1 RECTL */ + if (!(pRgn = REGION_AllocRgnWithHandle(1))) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + hRgn = pRgn->BaseObject.hHmgr; + + REGION_SetRectRgn(pRgn, LeftRect, TopRect, RightRect, BottomRect); + RGNOBJAPI_Unlock(pRgn); + + return hRgn; +} + +HRGN +APIENTRY +NtGdiCreateRoundRectRgn( + INT left, + INT top, + INT right, + INT bottom, + INT ellipse_width, + INT ellipse_height +) +{ + PROSRGNDATA obj; + HRGN hrgn; + int asq, bsq, d, xd, yd; + RECTL rect; + + /* Make the dimensions sensible */ + + if (left > right) + { + INT tmp = left; + left = right; + right = tmp; + } + if (top > bottom) + { + INT tmp = top; + top = bottom; + bottom = tmp; + } + + ellipse_width = abs(ellipse_width); + ellipse_height = abs(ellipse_height); + + /* Check parameters */ + + if (ellipse_width > right-left) ellipse_width = right-left; + if (ellipse_height > bottom-top) ellipse_height = bottom-top; + + /* Check if we can do a normal rectangle instead */ + + if ((ellipse_width < 2) || (ellipse_height < 2)) + return NtGdiCreateRectRgn(left, top, right, bottom); + + /* Create region */ + + d = (ellipse_height < 128) ? ((3 * ellipse_height) >> 2) : 64; + if (!(obj = REGION_AllocRgnWithHandle(d))) return 0; + hrgn = obj->BaseObject.hHmgr; + + /* Ellipse algorithm, based on an article by K. Porter */ + /* in DDJ Graphics Programming Column, 8/89 */ + + asq = ellipse_width * ellipse_width / 4; /* a^2 */ + bsq = ellipse_height * ellipse_height / 4; /* b^2 */ + d = bsq - asq * ellipse_height / 2 + asq / 4; /* b^2 - a^2b + a^2/4 */ + xd = 0; + yd = asq * ellipse_height; /* 2a^2b */ + + rect.left = left + ellipse_width / 2; + rect.right = right - ellipse_width / 2; + + /* Loop to draw first half of quadrant */ + + while (xd < yd) + { + if (d > 0) /* if nearest pixel is toward the center */ + { + /* move toward center */ + rect.top = top++; + rect.bottom = rect.top + 1; + REGION_UnionRectWithRgn(obj, &rect); + rect.top = --bottom; + rect.bottom = rect.top + 1; + REGION_UnionRectWithRgn(obj, &rect); + yd -= 2*asq; + d -= yd; + } + rect.left--; /* next horiz point */ + rect.right++; + xd += 2*bsq; + d += bsq + xd; + } + /* Loop to draw second half of quadrant */ + + d += (3 * (asq-bsq) / 2 - (xd+yd)) / 2; + while (yd >= 0) + { + /* next vertical point */ + rect.top = top++; + rect.bottom = rect.top + 1; + REGION_UnionRectWithRgn(obj, &rect); + rect.top = --bottom; + rect.bottom = rect.top + 1; + REGION_UnionRectWithRgn(obj, &rect); + if (d < 0) /* if nearest pixel is outside ellipse */ + { + rect.left--; /* move away from center */ + rect.right++; + xd += 2*bsq; + d += xd; + } + yd -= 2*asq; + d += asq - yd; + } + /* Add the inside rectangle */ + + if (top <= bottom) + { + rect.top = top; + rect.bottom = bottom; + REGION_UnionRectWithRgn(obj, &rect); + } + + RGNOBJAPI_Unlock(obj); + return hrgn; +} + +BOOL +APIENTRY +NtGdiEqualRgn( + HRGN hSrcRgn1, + HRGN hSrcRgn2 +) +{ + PROSRGNDATA rgn1, rgn2; + PRECTL tRect1, tRect2; + ULONG i; + BOOL bRet = FALSE; + + if ( !(rgn1 = RGNOBJAPI_Lock(hSrcRgn1, NULL)) ) + return ERROR; + + if ( !(rgn2 = RGNOBJAPI_Lock(hSrcRgn2, NULL)) ) + { + RGNOBJAPI_Unlock(rgn1); + return ERROR; + } + + if (rgn1->rdh.nCount != rgn2->rdh.nCount || + rgn1->rdh.nCount == 0 || + rgn1->rdh.rcBound.left != rgn2->rdh.rcBound.left || + rgn1->rdh.rcBound.right != rgn2->rdh.rcBound.right || + rgn1->rdh.rcBound.top != rgn2->rdh.rcBound.top || + rgn1->rdh.rcBound.bottom != rgn2->rdh.rcBound.bottom) + goto exit; + + tRect1 = rgn1->Buffer; + tRect2 = rgn2->Buffer; + + if (!tRect1 || !tRect2) + goto exit; + + for (i=0; i < rgn1->rdh.nCount; i++) + { + if (tRect1[i].left != tRect2[i].left || + tRect1[i].right != tRect2[i].right || + tRect1[i].top != tRect2[i].top || + tRect1[i].bottom != tRect2[i].bottom) + goto exit; + } + bRet = TRUE; + +exit: + RGNOBJAPI_Unlock(rgn1); + RGNOBJAPI_Unlock(rgn2); + return bRet; +} + +HRGN +APIENTRY +NtGdiExtCreateRegion( + OPTIONAL LPXFORM Xform, + DWORD Count, + LPRGNDATA RgnData +) +{ + HRGN hRgn; + PROSRGNDATA Region; + DWORD nCount = 0; + DWORD iType = 0; + DWORD dwSize = 0; + NTSTATUS Status = STATUS_SUCCESS; + MATRIX matrix; + + DPRINT("NtGdiExtCreateRegion\n"); + _SEH2_TRY + { + ProbeForRead(RgnData, Count, 1); + nCount = RgnData->rdh.nCount; + iType = RgnData->rdh.iType; + dwSize = RgnData->rdh.dwSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return NULL; + } + + /* Check parameters, but don't set last error here */ + if (Count < sizeof(RGNDATAHEADER) + nCount * sizeof(RECT) || + iType != RDH_RECTANGLES || + dwSize != sizeof(RGNDATAHEADER)) + { + return NULL; + } + + Region = REGION_AllocRgnWithHandle(nCount); + + if (Region == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + hRgn = Region->BaseObject.hHmgr; + + _SEH2_TRY + { + if (Xform) + { + ULONG ret; + + /* Init the XFORMOBJ from the Xform struct */ + Status = STATUS_INVALID_PARAMETER; + ret = XFORMOBJ_iSetXform((XFORMOBJ*)&matrix, (XFORML*)Xform); + + /* Check for error, also no scale and shear allowed */ + if (ret != DDI_ERROR && ret != GX_GENERAL) + { + /* Apply the coordinate transformation on the rects */ + if (XFORMOBJ_bApplyXform((XFORMOBJ*)&matrix, + XF_LTOL, + nCount * 2, + RgnData->Buffer, + Region->Buffer)) + { + Status = STATUS_SUCCESS; + } + } + } + else + { + /* Copy rect coordinates */ + RtlCopyMemory(Region->Buffer, + RgnData->Buffer, + nCount * sizeof(RECT)); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if (!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RGNOBJAPI_Unlock(Region); + GreDeleteObject(hRgn); + return NULL; + } + + RGNOBJAPI_Unlock(Region); + + return hRgn; +} + +BOOL +APIENTRY +NtGdiFillRgn( + HDC hDC, + HRGN hRgn, + HBRUSH hBrush +) +{ + HBRUSH oldhBrush; + PROSRGNDATA rgn; + PRECTL r; + + if (NULL == (rgn = RGNOBJAPI_Lock(hRgn, NULL))) + { + return FALSE; + } + + if (NULL == (oldhBrush = NtGdiSelectBrush(hDC, hBrush))) + { + RGNOBJAPI_Unlock(rgn); + return FALSE; + } + + for (r = rgn->Buffer; r < rgn->Buffer + rgn->rdh.nCount; r++) + { + NtGdiPatBlt(hDC, r->left, r->top, r->right - r->left, r->bottom - r->top, PATCOPY); + } + + RGNOBJAPI_Unlock(rgn); + NtGdiSelectBrush(hDC, oldhBrush); + + return TRUE; +} + +BOOL +APIENTRY +NtGdiFrameRgn( + HDC hDC, + HRGN hRgn, + HBRUSH hBrush, + INT Width, + INT Height +) +{ + HRGN FrameRgn; + BOOL Ret; + + if (!(FrameRgn = NtGdiCreateRectRgn(0, 0, 0, 0))) + { + return FALSE; + } + if (!REGION_CreateFrameRgn(FrameRgn, hRgn, Width, Height)) + { + GreDeleteObject(FrameRgn); + return FALSE; + } + + Ret = NtGdiFillRgn(hDC, FrameRgn, hBrush); + + GreDeleteObject(FrameRgn); + return Ret; +} + + +/* See wine, msdn, osr and Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw + + 1st: http://www.codeproject.com/gdi/cliprgnguide.asp is wrong! + + The intersection of the clip with the meta region is not Rao it's API! + Go back and read 7.2 Clipping pages 418-19: + Rao = API & Vis: + 1) The Rao region is the intersection of the API region and the system region, + named after the Microsoft engineer who initially proposed it. + 2) The Rao region can be calculated from the API region and the system region. + + API: + API region is the intersection of the meta region and the clipping region, + clearly named after the fact that it is controlled by GDI API calls. +*/ +INT APIENTRY +NtGdiGetRandomRgn( + HDC hDC, + HRGN hDest, + INT iCode +) +{ + INT ret = 0; + PDC pDC; + HRGN hSrc = NULL; + POINT org; + + pDC = DC_LockDc(hDC); + if (pDC == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return -1; + } + + switch (iCode) + { + case CLIPRGN: + hSrc = pDC->rosdc.hClipRgn; +// if (pDC->dclevel.prgnClip) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnClip)->BaseObject.hHmgr; + break; + case METARGN: + if (pDC->dclevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnMeta)->BaseObject.hHmgr; + break; + case APIRGN: + hSrc = pDC->rosdc.hClipRgn; +// if (pDC->prgnAPI) hSrc = ((PROSRGNDATA)pDC->prgnAPI)->BaseObject.hHmgr; +// else if (pDC->dclevel.prgnClip) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnClip)->BaseObject.hHmgr; +// else if (pDC->dclevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnMeta)->BaseObject.hHmgr; + break; + case SYSRGN: + hSrc = pDC->rosdc.hVisRgn; +// if (pDC->prgnVis) hSrc = ((PROSRGNDATA)pDC->prgnVis)->BaseObject.hHmgr; + break; + default: + hSrc = 0; + } + if (hSrc) + { + if (NtGdiCombineRgn(hDest, hSrc, 0, RGN_COPY) == ERROR) + { + ret = -1; + } + else + { + ret = 1; + } + } + if (iCode == SYSRGN) + { + IntGdiGetDCOrg(pDC, &org); + NtGdiOffsetRgn(hDest, org.x, org.y ); + } + + DC_UnlockDc(pDC); + + return ret; +} + +INT APIENTRY +NtGdiGetRgnBox( + HRGN hRgn, + PRECTL pRect +) +{ + PROSRGNDATA Rgn; + RECTL SafeRect; + DWORD ret; + NTSTATUS Status = STATUS_SUCCESS; + + if (!(Rgn = RGNOBJAPI_Lock(hRgn, NULL))) + { + return ERROR; + } + + ret = REGION_GetRgnBox(Rgn, &SafeRect); + RGNOBJAPI_Unlock(Rgn); + if (ERROR == ret) + { + return ret; + } + + _SEH2_TRY + { + ProbeForWrite(pRect, sizeof(RECT), 1); + *pRect = SafeRect; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if (!NT_SUCCESS(Status)) + { + return ERROR; + } + + return ret; +} + +BOOL +APIENTRY +NtGdiInvertRgn( + HDC hDC, + HRGN hRgn +) +{ + PROSRGNDATA RgnData; + ULONG i; + PRECTL rc; + + if (!(RgnData = RGNOBJAPI_Lock(hRgn, NULL))) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + rc = RgnData->Buffer; + for (i = 0; i < RgnData->rdh.nCount; i++) + { + + if (!NtGdiPatBlt(hDC, rc->left, rc->top, rc->right - rc->left, rc->bottom - rc->top, DSTINVERT)) + { + RGNOBJAPI_Unlock(RgnData); + return FALSE; + } + rc++; + } + + RGNOBJAPI_Unlock(RgnData); + return TRUE; +} + +INT +APIENTRY +NtGdiOffsetRgn( + HRGN hRgn, + INT XOffset, + INT YOffset +) +{ + PROSRGNDATA rgn = RGNOBJAPI_Lock(hRgn, NULL); + INT ret; + + DPRINT("NtGdiOffsetRgn: hRgn %d Xoffs %d Yoffs %d rgn %x\n", hRgn, XOffset, YOffset, rgn ); + + if (!rgn) + { + DPRINT("NtGdiOffsetRgn: hRgn error\n"); + return ERROR; + } + + if (XOffset || YOffset) + { + int nbox = rgn->rdh.nCount; + PRECTL pbox = rgn->Buffer; + + if (nbox && pbox) + { + while (nbox--) + { + pbox->left += XOffset; + pbox->right += XOffset; + pbox->top += YOffset; + pbox->bottom += YOffset; + pbox++; + } + if (rgn->Buffer != &rgn->rdh.rcBound) + { + rgn->rdh.rcBound.left += XOffset; + rgn->rdh.rcBound.right += XOffset; + rgn->rdh.rcBound.top += YOffset; + rgn->rdh.rcBound.bottom += YOffset; + } + } + } + ret = REGION_Complexity(rgn); + RGNOBJAPI_Unlock(rgn); + return ret; +} + +BOOL +APIENTRY +NtGdiPtInRegion( + HRGN hRgn, + INT X, + INT Y +) +{ + PROSRGNDATA rgn; + ULONG i; + PRECTL r; + + if (!(rgn = RGNOBJAPI_Lock(hRgn, NULL) ) ) + return FALSE; + + if (rgn->rdh.nCount > 0 && INRECT(rgn->rdh.rcBound, X, Y)) + { + r = rgn->Buffer; + for (i = 0; i < rgn->rdh.nCount; i++) + { + if (INRECT(*r, X, Y)) + { + RGNOBJAPI_Unlock(rgn); + return TRUE; + } + r++; + } + } + RGNOBJAPI_Unlock(rgn); + return FALSE; +} + +BOOL +APIENTRY +NtGdiRectInRegion( + HRGN hRgn, + LPRECTL unsaferc +) +{ + PROSRGNDATA Rgn; + RECTL rc = {0}; + BOOL Ret; + NTSTATUS Status = STATUS_SUCCESS; + + if (!(Rgn = RGNOBJAPI_Lock(hRgn, NULL))) + { + return ERROR; + } + + _SEH2_TRY + { + ProbeForRead(unsaferc, sizeof(RECT), 1); + rc = *unsaferc; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + RGNOBJAPI_Unlock(Rgn); + SetLastNtError(Status); + DPRINT1("NtGdiRectInRegion: bogus rc\n"); + return ERROR; + } + + Ret = REGION_RectInRegion(Rgn, &rc); + RGNOBJAPI_Unlock(Rgn); + return Ret; +} + +BOOL +APIENTRY +NtGdiSetRectRgn( + HRGN hRgn, + INT LeftRect, + INT TopRect, + INT RightRect, + INT BottomRect +) +{ + PROSRGNDATA rgn; + + if ( !(rgn = RGNOBJAPI_Lock(hRgn, NULL)) ) + { + return 0; //per documentation + } + + REGION_SetRectRgn(rgn, LeftRect, TopRect, RightRect, BottomRect); + + RGNOBJAPI_Unlock(rgn); + return TRUE; +} + +HRGN APIENTRY +NtGdiUnionRectWithRgn( + HRGN hDest, + const RECTL *UnsafeRect +) +{ + RECTL SafeRect = {0}; + PROSRGNDATA Rgn; + NTSTATUS Status = STATUS_SUCCESS; + + if (!(Rgn = RGNOBJAPI_Lock(hDest, NULL))) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + + _SEH2_TRY + { + ProbeForRead(UnsafeRect, sizeof(RECT), 1); + SafeRect = *UnsafeRect; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (! NT_SUCCESS(Status)) + { + RGNOBJAPI_Unlock(Rgn); + SetLastNtError(Status); + return NULL; + } + + REGION_UnionRectWithRgn(Rgn, &SafeRect); + RGNOBJAPI_Unlock(Rgn); + return hDest; +} + +/*! + * MSDN: GetRegionData, Return Values: + * + * "If the function succeeds and dwCount specifies an adequate number of bytes, + * the return value is always dwCount. If dwCount is too small or the function + * fails, the return value is 0. If lpRgnData is NULL, the return value is the + * required number of bytes. + * + * If the function fails, the return value is zero." + */ +DWORD APIENTRY +NtGdiGetRegionData( + HRGN hrgn, + DWORD count, + LPRGNDATA rgndata +) +{ + DWORD size; + PROSRGNDATA obj = RGNOBJAPI_Lock(hrgn, NULL); + NTSTATUS Status = STATUS_SUCCESS; + + if (!obj) + return 0; + + size = obj->rdh.nCount * sizeof(RECT); + if (count < (size + sizeof(RGNDATAHEADER)) || rgndata == NULL) + { + RGNOBJAPI_Unlock(obj); + if (rgndata) /* buffer is too small, signal it by return 0 */ + return 0; + else /* user requested buffer size with rgndata NULL */ + return size + sizeof(RGNDATAHEADER); + } + + _SEH2_TRY + { + ProbeForWrite(rgndata, count, 1); + RtlCopyMemory(rgndata, &obj->rdh, sizeof(RGNDATAHEADER)); + RtlCopyMemory(rgndata->Buffer, obj->Buffer, size); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RGNOBJAPI_Unlock(obj); + return 0; + } + + RGNOBJAPI_Unlock(obj); + return size + sizeof(RGNDATAHEADER); +} + /* EOF */

1 0

[ekohl] 44922: Coding-style fixes. No code changes.
by ekohl＠svn.reactos.org 03 Jan '10

03 Jan '10

Author: ekohl Date: Sun Jan 3 23:44:10 2010 New Revision: 44922 URL: http://svn.reactos.org/svn/reactos?rev=44922&view=rev Log: Coding-style fixes. No code changes. Modified: trunk/reactos/drivers/filesystems/mup/create.c trunk/reactos/drivers/filesystems/mup/mup.c Modified: trunk/reactos/drivers/filesystems/mup/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/cr… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/create.c [iso-8859-1] Sun Jan 3 23:44:10 2010 @@ -39,33 +39,33 @@ NTSTATUS NTAPI MupCreate(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { - PDEVICE_EXTENSION DeviceExt; - PIO_STACK_LOCATION Stack; - PFILE_OBJECT FileObject; - NTSTATUS Status; + PDEVICE_EXTENSION DeviceExt; + PIO_STACK_LOCATION Stack; + PFILE_OBJECT FileObject; + NTSTATUS Status; - DPRINT("MupCreate() called\n"); + DPRINT("MupCreate() called\n"); - DeviceExt = DeviceObject->DeviceExtension; - ASSERT(DeviceExt); - Stack = IoGetCurrentIrpStackLocation (Irp); - ASSERT(Stack); + DeviceExt = DeviceObject->DeviceExtension; + ASSERT(DeviceExt); + Stack = IoGetCurrentIrpStackLocation (Irp); + ASSERT(Stack); - FileObject = Stack->FileObject; + FileObject = Stack->FileObject; - DPRINT("FileName: '%wZ'\n", &FileObject->FileName); + DPRINT("FileName: '%wZ'\n", &FileObject->FileName); - Status = STATUS_ACCESS_DENIED; + Status = STATUS_ACCESS_DENIED; - Irp->IoStatus.Information = (NT_SUCCESS(Status)) ? FILE_OPENED : 0; - Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = (NT_SUCCESS(Status)) ? FILE_OPENED : 0; + Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); + IoCompleteRequest(Irp, + IO_NO_INCREMENT); - return(Status); + return Status; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] Sun Jan 3 23:44:10 2010 @@ -40,9 +40,6 @@ /* FUNCTIONS ****************************************************************/ -NTSTATUS NTAPI -DriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) /* * FUNCTION: Called by the system to initalize the driver * ARGUMENTS: @@ -50,56 +47,59 @@ * RegistryPath = path to our configuration entries * RETURNS: Success or failure */ +NTSTATUS NTAPI +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) { - PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; - UNICODE_STRING DeviceName; + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status; + UNICODE_STRING DeviceName; - DPRINT("MUP 0.0.1\n"); + DPRINT("MUP 0.0.1\n"); - RtlInitUnicodeString(&DeviceName, - L"\\Device\\Mup"); - Status = IoCreateDevice(DriverObject, - sizeof(DEVICE_EXTENSION), - &DeviceName, - FILE_DEVICE_MULTI_UNC_PROVIDER, - 0, - FALSE, - &DeviceObject); - if (!NT_SUCCESS(Status)) + RtlInitUnicodeString(&DeviceName, + L"\\Device\\Mup"); + Status = IoCreateDevice(DriverObject, + sizeof(DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_MULTI_UNC_PROVIDER, + 0, + FALSE, + &DeviceObject); + if (!NT_SUCCESS(Status)) { - return(Status); + return Status; } - /* Initialize driver data */ - DeviceObject->Flags |= DO_DIRECT_IO; -// DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsClose; - DriverObject->MajorFunction[IRP_MJ_CREATE] = MupCreate; - DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = MupCreate; - DriverObject->MajorFunction[IRP_MJ_CREATE_MAILSLOT] = MupCreate; -// DriverObject->MajorFunction[IRP_MJ_READ] = NtfsRead; -// DriverObject->MajorFunction[IRP_MJ_WRITE] = NtfsWrite; -// DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = -// NtfsFileSystemControl; -// DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = -// NtfsDirectoryControl; -// DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = -// NtfsQueryInformation; -// DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = -// NtfsQueryVolumeInformation; -// DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = -// NtfsSetVolumeInformation; + /* Initialize driver data */ + DeviceObject->Flags |= DO_DIRECT_IO; +// DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsClose; + DriverObject->MajorFunction[IRP_MJ_CREATE] = MupCreate; + DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = MupCreate; + DriverObject->MajorFunction[IRP_MJ_CREATE_MAILSLOT] = MupCreate; +// DriverObject->MajorFunction[IRP_MJ_READ] = NtfsRead; +// DriverObject->MajorFunction[IRP_MJ_WRITE] = NtfsWrite; +// DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = +// NtfsFileSystemControl; +// DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = +// NtfsDirectoryControl; +// DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = +// NtfsQueryInformation; +// DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = +// NtfsQueryVolumeInformation; +// DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = +// NtfsSetVolumeInformation; - DriverObject->DriverUnload = NULL; + DriverObject->DriverUnload = NULL; - /* Initialize global data */ -// DeviceExtensionNtfsGlobalData = DeviceObject->DeviceExtension; -// RtlZeroMemory(NtfsGlobalData, -// sizeof(NTFS_GLOBAL_DATA)); -// NtfsGlobalData->DriverObject = DriverObject; -// NtfsGlobalData->DeviceObject = DeviceObject; + /* Initialize global data */ +// DeviceExtensionNtfsGlobalData = DeviceObject->DeviceExtension; +// RtlZeroMemory(NtfsGlobalData, +// sizeof(NTFS_GLOBAL_DATA)); +// NtfsGlobalData->DriverObject = DriverObject; +// NtfsGlobalData->DeviceObject = DeviceObject; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; }

1 0

[ekohl] 44921: [devmgr] - Display the 'Enumerator' property.
by ekohl＠svn.reactos.org 03 Jan '10

03 Jan '10

Author: ekohl Date: Sun Jan 3 23:41:13 2010 New Revision: 44921 URL: http://svn.reactos.org/svn/reactos?rev=44921&view=rev Log: [devmgr] - Display the 'Enumerator' property. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/devmgr/advprop.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sun Jan 3 23:41:13 2010 @@ -667,11 +667,11 @@ case CM_DRP_BUSNUMBER: PlugPlayData.Property = DevicePropertyBusNumber; break; +#endif case CM_DRP_ENUMERATOR_NAME: - PlugPlayData.Property = DevicePropertyEnumeratorName; + PlugPlayData.Property = 15; //DevicePropertyEnumeratorName; break; -#endif default: return CR_INVALID_PROPERTY; Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Sun Jan 3 23:41:13 2010 @@ -791,6 +791,39 @@ // SetListViewText(hwndListView, 0, dap->szTemp); } +static VOID +DisplayDevNodeEnumerator(IN PDEVADVPROP_INFO dap, + IN HWND hwndListView) +{ + HDEVINFO DeviceInfoSet; + PSP_DEVINFO_DATA DeviceInfoData; + + DWORD dwType = 0; + WCHAR szBuffer[256]; + DWORD dwSize = 256 * sizeof(WCHAR); + + if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) + { + DeviceInfoSet = dap->CurrentDeviceInfoSet; + DeviceInfoData = &dap->CurrentDeviceInfoData; + } + else + { + DeviceInfoSet = dap->DeviceInfoSet; + DeviceInfoData = &dap->DeviceInfoData; + } + + CM_Get_DevNode_Registry_Property_ExW(DeviceInfoData->DevInst, + CM_DRP_ENUMERATOR_NAME, + &dwType, + &szBuffer, + &dwSize, + 0, + dap->hMachine); + + SetListViewText(hwndListView, 0, szBuffer); +} + static VOID @@ -840,9 +873,11 @@ break; case 5: /* Enumerator */ - DisplayDevicePropertyText(dap, - hwndListView, - SPDRP_ENUMERATOR_NAME); + DisplayDevNodeEnumerator(dap, + hwndListView); +// DisplayDevicePropertyText(dap, +// hwndListView, +// SPDRP_ENUMERATOR_NAME); break; case 6: /* Capabilities */

1 0

[dgorbachev] 44920: - Remove duplicate definitions of context flags (which are already present in NDK); - combine them using bitwise or (as in CreateFiberEx and ConvertThreadToFiberEx).
by dgorbachev＠svn.reactos.org 03 Jan '10

03 Jan '10

Author: dgorbachev Date: Sun Jan 3 21:12:56 2010 New Revision: 44920 URL: http://svn.reactos.org/svn/reactos?rev=44920&view=rev Log: - Remove duplicate definitions of context flags (which are already present in NDK); - combine them using bitwise or (as in CreateFiberEx and ConvertThreadToFiberEx). Modified: trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S Modified: trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] Sun Jan 3 21:12:56 2010 @@ -8,9 +8,6 @@ */ #include <ndk/asm.h> - -#define CONTEXT_FULL 0x10007 -#define CONTEXT_FLOATING_POINT 0xF .globl _SwitchToFiber@4 .intel_syntax noprefix @@ -29,7 +26,7 @@ mov [eax+FIBER_CONTEXT_EBP], ebp /* Check if we're to save FPU State */ - cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL + CONTEXT_FLOATING_POINT + cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL | CONTEXT_FLOATING_POINT jnz NoFpuStateSave /* Save the FPU State (Status and Control)*/ @@ -79,7 +76,7 @@ mov [edx+TEB_ACTIVATION_CONTEXT_STACK_POINTER], esi /* Restore FPU State */ - cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL + CONTEXT_FLOATING_POINT + cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL | CONTEXT_FLOATING_POINT jnz NoFpuStateRestore /* Check if the Status Word Changed */

1 0

[dgorbachev] 44919: Fix GCC 4.5.0 "operation may be undefined" warning.
by dgorbachev＠svn.reactos.org 03 Jan '10

03 Jan '10

Author: dgorbachev Date: Sun Jan 3 21:12:43 2010 New Revision: 44919 URL: http://svn.reactos.org/svn/reactos?rev=44919&view=rev Log: Fix GCC 4.5.0 "operation may be undefined" warning. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Jan 3 21:12:43 2010 @@ -1256,7 +1256,7 @@ if (Wnd->spwndParent && Wnd->spwndParent->spwndChild == Wnd) Wnd->spwndParent->spwndChild = Wnd->spwndNext; - Wnd->spwndParent = Wnd->spwndPrev = Wnd->spwndNext = Wnd->spwndParent = NULL; + Wnd->spwndPrev = Wnd->spwndNext = Wnd->spwndParent = NULL; }

1 0

[fireball] 44918: Samuel Serapion - Implement ExSetTimerResolution, tested with a VirtualBox driver. - Rewrite comments in TimeRefresh lock/unlock functions.
by fireball＠svn.reactos.org 03 Jan '10

03 Jan '10

Author: fireball Date: Sun Jan 3 19:29:30 2010 New Revision: 44918 URL: http://svn.reactos.org/svn/reactos?rev=44918&view=rev Log: Samuel Serapion - Implement ExSetTimerResolution, tested with a VirtualBox driver. - Rewrite comments in TimeRefresh lock/unlock functions. Modified: trunk/reactos/ntoskrnl/ex/time.c Modified: trunk/reactos/ntoskrnl/ex/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/time.c?rev=449… ============================================================================== --- trunk/reactos/ntoskrnl/ex/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/time.c [iso-8859-1] Sun Jan 3 19:29:30 2010 @@ -25,33 +25,195 @@ ULONG ExpTimeZoneId; ULONG ExpTickCountMultiplier; ERESOURCE ExpTimeRefreshLock; +ULONG ExpKernelResolutionCount = 0; +ULONG ExpTimerResolutionCount = 0; /* FUNCTIONS ****************************************************************/ +/*++ + * @name ExAcquireTimeRefreshLock + * + * The ExReleaseTimeRefreshLock routine acquires the system-wide lock used + * to synchronize clock interrupt frequency changes. + * + * @param Wait + * If TRUE, the system will block the caller thread waiting for the lock + * to become available. If FALSE, the routine will fail if the lock has + * already been acquired. + * + * @return Boolean value indicating success or failure of the lock acquisition. + * + * @remarks None. + * + *--*/ BOOLEAN NTAPI -ExAcquireTimeRefreshLock(BOOLEAN Wait) -{ - /* Simply acquire the Resource */ +ExAcquireTimeRefreshLock( + IN BOOLEAN Wait + ) +{ + /* Block APCs */ KeEnterCriticalRegion(); + + /* Attempt lock acquisition */ if (!(ExAcquireResourceExclusiveLite(&ExpTimeRefreshLock, Wait))) { - /* We failed! */ + /* Lock was not acquired, enable APCs and fail */ KeLeaveCriticalRegion(); return FALSE; } - /* Success */ + /* Lock has been acquired */ return TRUE; } +/*++ + * @name ExReleaseTimeRefreshLock + * + * The ExReleaseTimeRefreshLock routine releases the system-wide lock used + * to synchronize clock interrupt frequency changes. + * + * @param None. + * + * @return None. + * + * @remarks None. + * + *--*/ VOID NTAPI -ExReleaseTimeRefreshLock(VOID) -{ - /* Simply release the Resource */ +ExReleaseTimeRefreshLock( + VOID + ) +{ + /* Release the lock and re-enable APCs */ ExReleaseResourceLite(&ExpTimeRefreshLock); KeLeaveCriticalRegion(); +} + +/*++ + * @name ExSetTimerResolution + * @exported + * + * The KiInsertQueueApc routine modifies the frequency at which the system + * clock interrupts. + * + * @param DesiredTime + * Specifies the amount of time that should elapse between each timer + * interrupt, in 100-nanosecond units. + * + * This parameter is ignored if SetResolution is FALSE. + * + * @param SetResolution + * If TRUE, the call is a request to set the clock interrupt frequency to + * the value specified by DesiredTime. If FALSE, the call is a request to + * restore the clock interrupt frequency to the system's default value. + * + * @return New timer resolution, in 100-nanosecond ticks. + * + * @remarks (1) The clock frequency is changed only if the DesiredTime value is + * less than the current setting. + * + * (2) The routine just returns the current setting if the DesiredTime + * value is greater than what is currently set. + * + * (3) If the DesiredTime value is less than the system clock can + * support, the routine uses the smallest resolution the system can + * support, and returns that value. + * + * (4) If multiple drivers have attempted to change the clock interrupt + * frequency, the system will only restore the default frequency + * once ALL drivers have called the routine with SetResolution set + * to FALSE. + * + * NB. This routine synchronizes with IRP_MJ_POWER requests through the + * TimeRefreshLock. + * + *--*/ +ULONG +NTAPI +ExSetTimerResolution(IN ULONG DesiredTime, + IN BOOLEAN SetResolution) +{ + ULONG CurrentIncrement; + + /* Wait for clock interrupt frequency and power requests to synchronize */ + ExAcquireTimeRefreshLock(TRUE); + + /* Obey remark 2*/ + CurrentIncrement = KeTimeIncrement; + + /* Check the type of operation this is */ + if (SetResolution) + { + /* + * If this is the first kernel change, bump the timer resolution change + * count, then bump the kernel change count as well. + * + * These two variables are tracked differently since user-mode processes + * can also change the timer resolution through the NtSetTimerResolution + * system call. A per-process flag in the EPROCESS then stores the per- + * process change state. + * + */ + if (!ExpKernelResolutionCount++) ExpTimerResolutionCount++; + + /* Obey remark 3 */ + if (DesiredTime < KeMinimumIncrement) DesiredTime = KeMinimumIncrement; + + /* Obey remark 1 */ + if (DesiredTime < KeTimeIncrement) + { + /* Force this thread on CPU zero, since we don't want it to drift */ + KeSetSystemAffinityThread(1); + + /* Now call the platform driver (HAL) to make the change */ + CurrentIncrement = HalSetTimeIncrement(DesiredTime); + + /* Put the thread back to its original affinity */ + KeRevertToUserAffinityThread(); + + /* Finally, keep track of the new value in the kernel */ + KeTimeIncrement = CurrentIncrement; + } + } + else + { + /* First, make sure that a driver has actually changed the resolution */ + if (ExpKernelResolutionCount) + { + /* Obey remark 4 */ + if (--ExpKernelResolutionCount) + { + /* + * All kernel drivers have requested the original frequency to + * be restored, but there might still be user processes with an + * ongoing clock interrupt frequency change, so make sure that + * this isn't the case. + */ + if (--ExpTimerResolutionCount) + { + /* Force this thread on one CPU so that it doesn't drift */ + KeSetSystemAffinityThread(1); + + /* Call the HAL to restore the frequency to its default */ + CurrentIncrement = HalSetTimeIncrement(KeMaximumIncrement); + + /* Put the thread back to its original affinity */ + KeRevertToUserAffinityThread(); + + /* Finally, keep track of the new value in the kernel */ + KeTimeIncrement = CurrentIncrement; + } + } + } + } + + /* Release the clock interrupt frequency lock since changes are done */ + ExReleaseTimeRefreshLock(); + + /* And return the current value -- which could reflect the new frequency */ + return CurrentIncrement; } VOID @@ -306,18 +468,6 @@ } /* - * @unimplemented - */ -ULONG -NTAPI -ExSetTimerResolution(IN ULONG DesiredTime, - IN BOOLEAN SetResolution) -{ - UNIMPLEMENTED; - return 0; -} - -/* * @implemented */ VOID

1 0

[fireball] 44917: [NDK] - Add forgotten HalSetTimeIncrement prototype to NDK.
by fireball＠svn.reactos.org 03 Jan '10

03 Jan '10

Author: fireball Date: Sun Jan 3 19:17:21 2010 New Revision: 44917 URL: http://svn.reactos.org/svn/reactos?rev=44917&view=rev Log: [NDK] - Add forgotten HalSetTimeIncrement prototype to NDK. Modified: trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] Sun Jan 3 19:17:21 2010 @@ -274,5 +274,12 @@ IN PTIME_FIELDS RtcTime ); -#endif -#endif +NTHALAPI +ULONG +NTAPI +HalSetTimeIncrement( + IN ULONG Increment +); + +#endif +#endif

1 0

[fireball] 44916: [ntoskrnl/cm] - advapi32 winetest registry tries to create a non-volatile child of a volatile parent. Comment out the warning ASSERT to let testman pass through this condition.
by fireball＠svn.reactos.org 03 Jan '10

03 Jan '10

Author: fireball Date: Sun Jan 3 19:14:34 2010 New Revision: 44916 URL: http://svn.reactos.org/svn/reactos?rev=44916&view=rev Log: [ntoskrnl/cm] - advapi32 winetest registry tries to create a non-volatile child of a volatile parent. Comment out the warning ASSERT to let testman pass through this condition. Modified: trunk/reactos/ntoskrnl/config/cmparse.c Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Sun Jan 3 19:14:34 2010 @@ -460,7 +460,7 @@ !(ParseContext->CreateOptions & REG_OPTION_VOLATILE)) { /* Children of volatile parents must also be volatile */ - ASSERT(FALSE); + //ASSERT(FALSE); Status = STATUS_CHILD_MUST_BE_VOLATILE; goto Exit; }

1 0

[dgorbachev] 44915: Add / update Japanese translations. Patch by Tomoya Kitagawa. Bug #5024.
by dgorbachev＠svn.reactos.org 03 Jan '10

03 Jan '10

Author: dgorbachev Date: Sun Jan 3 16:53:21 2010 New Revision: 44915 URL: http://svn.reactos.org/svn/reactos?rev=44915&view=rev Log: Add / update Japanese translations. Patch by Tomoya Kitagawa. Bug #5024. Added: trunk/reactos/base/applications/magnify/lang/ja-JP.rc (with props) trunk/reactos/base/applications/shutdown/lang/ja-JP.rc (with props) trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc (with props) trunk/reactos/base/system/runonce/lang/ja-JP.rc (with props) trunk/reactos/subsystems/win32/csrss/win32csr/lang/ja-JP.rc (with props) Modified: trunk/reactos/base/applications/charmap/lang/ja-JP.rc trunk/reactos/base/applications/magnify/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc trunk/reactos/base/applications/paint/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/shutdown/rsrc.rc trunk/reactos/base/applications/sndrec32/rsrc.rc trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/system/runonce/rsrc.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Modified: trunk/reactos/base/applications/charmap/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/ja-JP.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -1,7 +1,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 -CAPTION "LN^[ }bv" +CAPTION "¶R[h\\" FONT 9,"MS UI Gothic",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN @@ -18,11 +18,11 @@ END IDD_ABOUTBOX DIALOGEX 22,16,210,182 -CAPTION "LN^[ }bvÉÂ¢Ä" +CAPTION "¶R[h\\ÉÂ¢Ä" FONT 9,"MS UI Gothic",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "LN^[ }bv v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "¶R[h\\ v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Â¶é", IDOK, 75, 162, 44, 15 ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Added: trunk/reactos/base/applications/magnify/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/magnify/lang/ja-JP.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -1,0 +1,64 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDC_MAGNIFIER MENU +BEGIN + POPUP "t@C(&F)" + BEGIN + MENUITEM "I¹(&X)", IDM_EXIT + MENUITEM "IvV(&O)", IDM_OPTIONS + MENUITEM SEPARATOR + MENUITEM "o[Wîñ(&A) ...", IDM_ABOUT + END +END + +IDC_MAGNIFIER ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "gå¾ÉÂ¢Ä" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_MYICON,14,9,20,20 + LTEXT "gå¾ o[W 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,125,22 + PUSHBUTTON "OK",IDOK,162,48,50,14 +END + +IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "gå¾ÌÝè" +FONT 9, "MS UI Gothic", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "I¹",IDOK,96,161,50,14 + PUSHBUTTON "wv",IDC_BUTTON_HELP,38,161,50,14 + LTEXT "gå¦:",IDC_STATIC,6,8,68,8 + COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "gåÌÎÛ",IDC_STATIC,7,25,139,59 + GROUPBOX "\\¦",IDC_STATIC,7,87,139,57 + CONTROL "}EX J[\\Ì®«ðÇ¤",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 + CONTROL "L[{[hÌtH[JXðÇ¤",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 + CONTROL "ÒWÌeLXgðÇ¤",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 + CONTROL "Fð½]·é",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 + CONTROL "Å¬»µÄJn·é",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 + CONTROL "gå¾ð\\¦·é",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 +END + +IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "ReactOS gå¾" +FONT 9, "MS UI Gothic", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,193,76,50,14 + ICON IDI_ICON,IDC_STATIC,7,17,20,20 + LTEXT "gå¾Íy¢oáQª éûÉÅáÀÌ@\\ðñ·éæ¤ÉÝv³êÄ¢Ü·BÙÆñÇÌoáQÒÌûÌêAúíp·éÉÍæè@\\Ègå[eBeBªKvÆÈèÜ·B",IDC_STATIC,36,7,207,33 + CONTROL "¡ãA±ÌbZ[Wð\\¦µÈ¢",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "gå¾" +END Propchange: trunk/reactos/base/applications/magnify/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/rsrc.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -7,6 +7,7 @@ #include "lang/de-DE.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc" Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -51,7 +51,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "±ÌvOÍt[\\tgEFAÅ·B È½Í±êðAt[\\tgEFAàcÉæÁÄs³ê½ GNUêÊöOpø_ñ(o[W2©Aó]ÉæÁÄÍ»êÈ~Ìo[WÌ¤¿Çê©)ÌèßéðÌºÅÄÐzÜ½ÍüÏ·é±ÆªÅ«Ü·B\r\n\r\n±ÌvOÍLpÅ é±ÆðèÁÄzz³êÜ·ªA*SÌ³ÛØ* Å·B*¤ÆÂ\\«ÌÛØ*â*ÁèÌÚIÖÌK«*ÍA¾OÉ¦³ê½àÌàÜßS¶ÝµÜ¹ñBÚµÍGNUêÊöOpø_ñð²¾³¢B\r\n\r\n È½Í±ÌvOÆ¤ÉAGNUêÊöOpø_ñÌ¡»ðêó¯æÁ½Í¸Å·Bàµó¯æÁÄ¢È¯êÎAt[\\tgEFAàcÜÅ¿µÄ¾³¢(¶æÍ the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA)B" + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -206,7 +206,7 @@ IDS_NUM_SERVICES "T[rXÌ: %d" IDS_STOP_DEPENDS "%s ðâ~·éêA±êçÌT[rXàâ~µÜ·" IDS_NO_DEPENDS "<Ë¶ÖWÈµ>" - IDS_LICENSE "±ÌvOÍt[\\tgEFAÅ·B È½Í±êðAt[\\tgEFAàcÉæÁÄs³ê½ GNUêÊöOpø_ñ(o[W2©Aó]ÉæÁÄÍ»êÈ~Ìo[WÌ¤¿Çê©)ÌèßéðÌºÅÄÐzÜ½ÍüÏ·é±ÆªÅ«Ü·B\r\n\r\n±ÌvOÍLpÅ é±ÆðèÁÄzz³êÜ·ªA*SÌ³ÛØ* Å·B*¤ÆÂ\\«ÌÛØ*â*ÁèÌÚIÖÌK«*ÍA¾OÉ¦³ê½àÌàÜßS¶ÝµÜ¹ñBÚµÍGNUêÊöOpø_ñð²¾³¢B\r\n\r\n È½Í±ÌvOÆ¤ÉAGNUêÊöOpø_ñÌ¡»ðêó¯æÁ½Í¸Å·Bàµó¯æÁÄ¢È¯êÎAt[\\tgEFAàcÜÅ¿µÄ¾³¢(¶æÍ the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA)B" + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/paint/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/ja-JP.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -201,6 +201,6 @@ IDS_TOOLTIP16, "pÛlp`" IDS_OPENFILTER, "rbg}bv t@C (*.bmp;*.dib)\1*.bmp;*.dib\1·×ÄÌt@C (*.*)\1*.*\1" IDS_SAVEFILTER, "24 rbg rbg}bv (*.bmp;*.dib)\1*.bmp;*.dib\1" - IDS_FILESIZE, "%d bytes" - IDS_PRINTRES, "%d x %d pixels per meter" -END + IDS_FILESIZE, "%d oCg" + IDS_PRINTRES, "%d x %d sNZ/[g" +END Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -98,7 +98,7 @@ CAPTION "o[Wîñ" FONT 9, "MS UI Gothic" BEGIN - LTEXT "ReactOS AvP[V }l[W[\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + LTEXT "ReactOS AvP[V }l[W\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 PUSHBUTTON "Â¶é", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 END @@ -171,13 +171,13 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_APPTITLE "ReactOS AvP[V }l[W[" + IDS_APPTITLE "ReactOS AvP[V }l[W" IDS_SEARCH_TEXT "õ..." IDS_INSTALL "CXg[" IDS_UNINSTALL "ACXg[" IDS_MODIFY "ÏX" IDS_APPS_COUNT "AvP[V: %d" - IDS_WELCOME_TITLE "ReactOS AvP[V }l[W[Öæ¤±»!\n\n" + IDS_WELCOME_TITLE "ReactOS AvP[V }l[WÖæ¤±»!\n\n" IDS_WELCOME_TEXT "¶¤©çJeSðIðµACXg[ÍACXg[·éAvP[VðIñÅ¾³¢B\nReactOS EFu TCg: " IDS_WELCOME_URL "http://www.reactos.org" IDS_INSTALLED "CXg[ÏÝ" @@ -186,7 +186,7 @@ IDS_APPLICATIONS "AvP[V" IDS_CHOOSE_FOLDER_TEXT "vOÌ_E[hÉgp·étH_ðIðµÄ¾³¢:" IDS_CHOOSE_FOLDER_ERROR "wè³ê½tH_Í¶ÝµÜ¹ñ!" - IDS_USER_NOT_ADMIN """ReactOS AvP[V }l[W["" ðN®·éÉÍÇÒ ÀÅ éKvª èÜ·!" + IDS_USER_NOT_ADMIN """ReactOS AvP[V }l[W"" ðN®·éÉÍÇÒ ÀÅ éKvª èÜ·!" IDS_APP_REG_REMOVE "WXg©çCXg[³ê½vOÉÖ·éf[^ðíµÄàæëµ¢Å·©?" IDS_INFORMATION "îñ" IDS_UNABLE_TO_REMOVE "WXg©ç±ÌvOÉÖ·éf[^ðíÅ«Ü¹ñ!" Added: trunk/reactos/base/applications/shutdown/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/shutdown/lang/ja-JP.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -1,0 +1,14 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "gp@: shutdown [-?] [-l | -s | -r] [-f]\n\n\ + øÈµàµÍ -?\t±ÌbZ[Wð\\¦µÜ·\n\ + -l\t\t\tOIt\n\ + -s\t\t\tRs[^ðVbg_EµÜ·\n\ + -r\t\t\tRs[^ðVbg_EµÄÄN®µÜ·\n\ + -f\t\t\tÀsÌAvP[VðxÈµÉÂ¶Ü·\n\ + \t\t\t¼Ìp[^ðwèµÈ¢êAOItn\n\ + \t\t\tµÜ·" +END Propchange: trunk/reactos/base/applications/shutdown/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/rsrc.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -7,6 +7,7 @@ #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" @@ -15,3 +16,4 @@ #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" + Added: trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -1,0 +1,54 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDC_REACTOS_SNDREC32 ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "reactOS_sndrec32 ÉÖ·éîñ" +FONT 9, "MS UI Gothic", 0, 0, 0x1 +BEGIN + ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + LTEXT "reactOS_sndrec32, o[W 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX + LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 + DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP +END + +IDR_MENU1 MENU +BEGIN + POPUP "t@C" + BEGIN + MENUITEM "VKì¬", ID_NEW + MENUITEM "J...", ID_FILE_OPEN + MENUITEM "ã«Û¶", ID_FILE_SAVE, GRAYED + MENUITEM "¼OðÂ¯ÄÛ¶...", ID_FILE_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "I¹", ID_EXIT + END + MENUITEM "todo1", 0 + MENUITEM "todo2", 0 + POPUP "?" + BEGIN + MENUITEM "o[Wîñ...", ID__ABOUT + END +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "TEh R[_" + IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" +END + +STRINGTABLE +BEGIN + IDS_STRPOS "Êu: %.2f b" + IDS_STRDUR "·³: %.2f b" + IDS_STRBUF "obt@: %.2f kb" + IDS_STRFMT "%.1f kHz %u rbg" + IDS_STRMONO "m" + IDS_STRSTEREO "XeI" + IDS_STRCHAN "%s" +END Propchange: trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -20,5 +20,6 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/sk-SK.rc" Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -83,31 +83,31 @@ { 8, 15, - "\x07 ReactOS¦ ²Ý½Ä°Ù ½ÙÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 ReactOS ¦ ²Ý½Ä°Ù ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 ReactOS¦ ¼³Ì¸ Ó¼¸Ê º³¼Ý ½ÙÆÊ R·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 ReactOS ¦ ¼³Ì¸ Ó¼¸Ê º³¼Ý ½ÙÆÊ R ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 ReactOSÉ ×²¾Ý½¼Þ®³¹Ý ¦Ë®³¼Þ ½ÙÆÊ L·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 ReactOS É ×²¾Ý½¼Þ®³¹Ý¦ Ë®³¼Þ ½ÙÆÊ L ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 ReactOS¦ ²Ý½Ä°Ù¾½ÞÆ Á³¼½Ù ÊÞ±²Ê F3·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 ReactOS ¦ ²Ý½Ä°Ù ¾½ÞÆ Á³¼½Ù ÊÞ±²Ê F3 ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 6, 23, - "ReactOSÉ ¼®³»²Å ¼Þ®³Î³Æ ¶Ý¼ÃÊ ¶·¦ ºÞ×Ý¸ÀÞ»²:", + "ReactOS É ¼®³»²Å ¼Þ®³Î³Æ ¶Ý¼ÃÊ ²¶¦ ºÞ×Ý ¸ÀÞ»²:", TEXT_STYLE_NORMAL }, { @@ -141,13 +141,13 @@ { 6, 8, - "ReactOS ¾¯Ä±¯ÌßÊ ¼®· ¶²ÊÂ ÀÞÝ¶²Æ ±ØÏ½¡ ¿ÉÀÒ¤ ÏÀÞ", + "ReactOS ¾¯Ä±¯ÌßÊ ¼®·¶²ÊÂÀÞÝ¶²Æ ±ØÏ½¡ ¿ÉÀÒ¤ ÏÀÞ", TEXT_STYLE_NORMAL }, { 6, 9, - "¼Þ³ÌÞÝÆ ØÖ³ÃÞ·Ù ¾¯Ä±¯Ìß±ÌßØ¹°¼®Ý É ½ÍÞÃÉ·É³Ê »Îß°Ä »ÚÏ¾Ý¡", + "¼Þ³ÌÞÝÆ ØÖ³ÃÞ·Ù ¾¯Ä±¯Ìß ±ÌßØ¹°¼®ÝÉ ½ÍÞÃÉ ·É³Ê »Îß°Ä »ÚÏ¾Ý¡", TEXT_STYLE_NORMAL }, { @@ -159,13 +159,13 @@ { 8, 13, - "- ¾¯Ä±¯ÌßÊ 1ÂÉ ÃÞ¨½¸Æ Â· 1Â²¼Þ®³É Ìß×²ÏØ Êß°Ã¨¼®Ý¦ ±Â¶³ºÄÊ ÃÞ·Ï¾Ý¡", + "- ¾¯Ä±¯ÌßÊ 1ÂÉ ÃÞ¨½¸Æ Â· 1Â²¼Þ®³É Ìß×²ÏØ Êß°Ã¨¼®Ý¦ ±Â¶³ºÄ¶Þ ÃÞ·Ï¾Ý¡", TEXT_STYLE_NORMAL }, { 8, 14, - "- ¶¸Á®³ Êß°Ã¨¼®Ý ¶Þ ºÉÃÞ¨½¸¼Þ®³Æ ¿Ý»Þ²½Ù ÊÞ±²¤ ¾¯Ä±¯ÌßÊ", + "- ¶¸Á®³ Êß°Ã¨¼®Ý¶Þ ºÉ ÃÞ¨½¸¼Þ®³Æ ¿Ý»Þ²½Ù ÊÞ±²¤ ¾¯Ä±¯ÌßÊ", TEXT_STYLE_NORMAL }, { @@ -201,13 +201,13 @@ { 8, 23, - "\x07 ReactOS¦ ²Ý½Ä°Ù ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 ReactOS ¦ ²Ý½Ä°Ù ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 25, - "\x07 ReactOS¦ ²Ý½Ä°Ù¾½ÞÆ Á³¼ ½Ù ÊÞ±²Ê F3·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 ReactOS ¦ ²Ý½Ä°Ù¾½ÞÆ Á³¼ ½Ù ÊÞ±²Ê F3 ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { @@ -241,31 +241,31 @@ { 8, 8, - "ºÉ ReactOS ¼½ÃÑÊ ¸Ð±Ü¾ ¶É³Å ×²¾Ý½(X11Ô¤BSD µÖËÞ", + "ºÉ ReactOS ¼½ÃÑÊ ¸Ð±Ü¾ ¶É³Å ×²¾Ý½(X11 Ô¤BSD µÖËÞ", TEXT_STYLE_NORMAL }, { 8, 9, - "GNU LGPL×²¾Ý½ ÅÄÞ) É º°ÄÞ¦ Ì¸Ñ Êß°ÂÄ ÄÓÆ GNU GPLÉ", - TEXT_STYLE_NORMAL - }, - { - 8, - 10, - "¼Þ®³¹Ý É ÓÄÆ ×²¾Ý½ »ÚÃ²Ï½¡", + "GNU LGPL ×²¾Ý½ ÅÄÞ)É º°ÄÞ¦ Ì¸Ñ Êß°ÂÄ ÄÓÆ GNU GPL É", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "¼Þ®³¹ÝÉ ÓÄÆ ×²¾Ý½ »ÚÃ²Ï½¡", TEXT_STYLE_NORMAL }, { 8, 11, - "ReactOS ¼½ÃÑÉ ²ÁÌÞÉ ½ÍÞÃÉ ¿ÌÄ³ª±Ê ReactOS ¼½ÃÑÉ ²ÁÌÞÃÞ", + "ReactOS ¼½ÃÑÉ ²ÁÌÞÉ ¿ÌÄ³ª±É ½ÍÞÃÊ ReactOS ¼½ÃÑÉ ²ÁÌÞÃÞ", TEXT_STYLE_NORMAL }, { 8, 12, - "±ÙÕ´Æ GNU GPLÀÞ¹ÃÞÅ¸¤ ¿É ¿ÌÄ³ª±É µØ¼ÞÅÙ×²¾Ý½É ÓÄÆÓ", + "±ÙÕ´Æ GNU GPL ÀÞ¹ÃÞÅ¸¤ ¿É ¿ÌÄ³ª±É µØ¼ÞÅÙ ×²¾Ý½É ÓÄÆÓ", TEXT_STYLE_NORMAL }, { @@ -277,25 +277,25 @@ { 8, 15, - "ºÉ ¿ÌÄ³ª±Ê 'ÑÎ¼®³' ÃÞ Ã³·®³ »Ú¤ Á²·Î³Ô º¸»²Î³¶Þ Ã·µ³»ÚÙ", + "ºÉ ¿ÌÄ³ª±Ê 'ÑÎ¼®³'ÃÞ Ã³·®³ »Ú¤ Á²·Î³Ô º¸»²Î³¶Þ Ã·µ³»ÚÙ", TEXT_STYLE_NORMAL }, { 8, 16, - "ÊÞ±²¦ É¿Þ²Ã¤ ØÖ³ ¾²¹ÞÝ¦ ³¹Ï½¡ ReactOSÉ ×²¾Ý½ ·®³ÖÊ", + "ÊÞ±²¦ É¿Þ²Ã¤ ØÖ³ ¾²¹ÞÝ¦ ³¹Ï½¡ ReactOS É ×²¾Ý½ ·®³ÖÊ", TEXT_STYLE_NORMAL }, { 8, 17, - "ÀÞ²»Ý¼¬ÍÉ ÊÝÊÞ²¦ Ì¾¸Þ ÀÞ¹ ÃÞ½¡", + "ÀÞ²»Ý¼¬ÍÉ ÊÝÊÞ²¦ Ì¾¸Þ ÀÞ¹ÃÞ½¡", TEXT_STYLE_NORMAL }, { 8, 18, - "GNU General Public License¦ ReactOSÄ ÄÓÆ ³¹Ä×Å¶¯À", + "GNU General Public License ¦ ReactOS Ä ÄÓÆ ³¹Ä×Å¶¯À", TEXT_STYLE_NORMAL }, { @@ -319,7 +319,7 @@ { 8, 24, - "ºÚÊ ÌØ°¿ÌÄ³ª± ÃÞ½¡ ¼®³»²Ê ¿°½É ºËß°¼Þ®³¹Ý¦ ºÞ×Ý ¸ÀÞ»²¡", + "ºÚÊ ÌØ° ¿ÌÄ³ª±ÃÞ½¡ ¼®³»²Ê ¿°½É ºËß°¼Þ®³¹Ý¦ ºÞ×Ý ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { @@ -331,7 +331,7 @@ { 8, 26, - "Æµ²ÃÓ ÄÞ³Ö³ ÃÞ½¡", + "Æµ²ÃÓ ÄÞ³Ö³ÃÞ½¡", TEXT_STYLE_NORMAL }, { @@ -394,19 +394,19 @@ }, { 25, - 16, "ºÚ×É ÃÞÊÞ²½ ¾¯Ã²¦ ¼ÞÀÞ¸ ½Ù", + 16, "ºÚ×É ÃÞÊÞ²½É ¾¯Ã²¦ ¼ÞÀÞ¸ ½Ù", TEXT_STYLE_NORMAL }, { 6, 19, - "UP Ó¼¸Ê DOWN·°¦ µ¼Ã ´ÝÄØ°¦ ¾ÝÀ¸ ½Ù ºÄÆÖØ", + "UP Ó¼¸Ê DOWN ·°¦ µ¼Ã ´ÝÄØ°¦ ¾ÝÀ¸ ½Ù ºÄÆÖØ", TEXT_STYLE_NORMAL }, { 6, 20, - "Ê°ÄÞ³ª±É ¾¯Ã²¦ ÍÝº³ ÃÞ·Ï½¡ ¾ÝÀ¸ ¼À×¤ ENTER·°¦ µ¼Ã Ã·¾ÂÅ ¾¯Ã²¦", + "Ê°ÄÞ³ª±É ¾¯Ã²¦ ÍÝº³ ÃÞ·Ï½¡ ¾ÝÀ¸ ¼À×¤ ENTER ·°¦ µ¼Ã Ã·¾ÂÅ ¾¯Ã²¦", TEXT_STYLE_NORMAL }, { @@ -418,13 +418,13 @@ { 6, 23, - "ºÚ×É ¾¯Ã²¶Þ ½ÍÞÃ ÀÀÞ¼² ÊÞ±²Ê¤ \"ºÚ×É ÃÞÊÞ²½ ¾¯Ã²¦ ¼ÞÀÞ¸ ½Ù\" ¦ ¾ÝÀ¸ ¼Ã¤", + "ºÚ×É ¾¯Ã²¶Þ ½ÍÞÃ ÀÀÞ¼² ÊÞ±²Ê¤ \"ºÚ×É ÃÞÊÞ²½É ¾¯Ã²¦ ¼ÞÀÞ¸ ½Ù\" ¦ ¾ÝÀ¸ ¼Ã¤", TEXT_STYLE_NORMAL }, { 6, 24, - "ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + "ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { @@ -470,25 +470,25 @@ { 8, 15, - "\x07 OS¦ º³¼Ý ½Ù ÆÊ U·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 OS ¦ º³¼Ý ½ÙÆÊ U ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 ¶²Ì¸ ºÝ¿°Ù¦ Ë×¸ÆÊ R·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 ¶²Ì¸ ºÝ¿°Ù¦ Ë×¸ÆÊ R ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Ò²ÝÍß°¼ÞÆ ÓÄÞÙ ÆÊ ESC·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 Ò²ÝÍß°¼ÞÆ ÓÄÞÙÆÊ ESC ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 ºÝËß°À¦ »²·ÄÞ³ ½ÙÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 ºÝËß°À¦ »²·ÄÞ³ ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { @@ -521,19 +521,19 @@ { 8, 10, - "\x07 UP Ó¼¸Ê DOWN·°¦ µ¼Ã Ã·½Ù ºÝËß°ÀÉ ¼Ù²¦ ¾ÝÀ¸ ¼Ã ¸ÀÞ»²¡", + "\x07 UP Ó¼¸Ê DOWN ·°¦ µ¼Ã Ã·½Ù ºÝËß°ÀÉ ¼Ù²¦ ¾ÝÀ¸ ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 11, - " Â·ÞÆ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + " Â·ÞÆ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 ºÝËß°ÀÉ ¼Ù²¦ ÍÝº³¾½ÞÆ Ï´É Íß°¼ÞÆ ÓÄÞÙ ÊÞ±²Ê ESC·°¦", + "\x07 ºÝËß°ÀÉ ¼Ù²¦ ÍÝº³¾½ÞÆ Ï´É Íß°¼ÞÆ ÓÄÞÙ ÊÞ±²Ê ESC ·°¦", TEXT_STYLE_NORMAL }, { @@ -567,7 +567,7 @@ { 10, 6, - "¼½ÃÑÊ ¶¸¼ÞÂÆ ½ÍÞÃÉ ½ÍÞÃÉ ÃÞ°À¶Þ ÃÞ¨½¸¼Þ®³Æ Î¿ÞÝ »ÚÙ Ö³Æ ¼Ã²Ï½", + "¼½ÃÑÊ ¶¸¼ÞÂÆ ½ÍÞÃÉ ÃÞ°À¶Þ ÃÞ¨½¸¼Þ®³Æ Î¿ÞÝ »ÚÙ Ö³Æ ¼Ã²Ï½", TEXT_STYLE_NORMAL }, { @@ -607,31 +607,31 @@ { 10, 6, - "ReactOSÊ Ï¯À¸ ²Ý½Ä°Ù »ÚÏ¾Ý", - TEXT_STYLE_NORMAL - }, - { - 10, - 8, - "ÄÞ×²ÌÞ A: ¶× ÌÛ¯Ëß° ÃÞ¨½¸¤ CD ÄÞ×²ÌÞ ¶×", + "ReactOS Ê ¶Ý¾ÞÝÆ ²Ý½Ä°Ù »ÚÏ¾ÝÃÞ¼À", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "ÄÞ×²ÌÞ A: ¶× ÌÛ¯Ëß° ÃÞ¨½¸¤ CD ÄÞ×²ÌÞ¶×", TEXT_STYLE_NORMAL }, { 10, 9, - "½ÍÞÃÉ CD-ROM¦ ÄØÀÞ¼Ã ¸ÀÞ»²¡", + "½ÍÞÃÉ CD-ROM ¦ ÄØÀÞ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 10, 11, - "ºÝËß°À¦ »²·ÄÞ³ ½ÙÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "µÏÁ¸ÀÞ»² ...", + "ºÝËß°À¦ »²·ÄÞ³ ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "µÏÁ ¸ÀÞ»² ...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { @@ -658,19 +658,19 @@ }, { 8, 10, - "\x07 UP Ó¼¸Ê DOWN·°¦ µ¼Ã Ã·½Ù ÃÞ¨½ÌßÚ²É ¼Ù²¦ ¾ÝÀ¸ ¼Ã ¸ÀÞ»²¡", + "\x07 UP Ó¼¸Ê DOWN ·°¦ µ¼Ã Ã·½Ù ÃÞ¨½ÌßÚ²É ¼Ù²¦ ¾ÝÀ¸ ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 11, - " Â·ÞÆ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + " Â·ÞÆ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 ÃÞ¨½ÌßÚ²É ¼Ù²¦ ÍÝº³¾½ÞÆ Ï´É Íß°¼ÞÆ ÓÄÞÙÆÊ ESC·°¦", + "\x07 ÃÞ¨½ÌßÚ²É ¼Ù²¦ ÍÝº³¾½ÞÆ Ï´É Íß°¼ÞÆ ÓÄÞÙÆÊ ESC ·°¦", TEXT_STYLE_NORMAL }, { @@ -704,25 +704,25 @@ { 10, 6, - "ReactOSÉ ·ÎÝÌÞÌÞÝÉ ²Ý½Ä°ÙÊ ¾²º³ ¼Ï¼À¡", - TEXT_STYLE_NORMAL - }, - { - 10, - 8, - "ÄÞ×²ÌÞ A: ¶× ÌÛ¯Ëß° ÃÞ¨½¸¤ CD ÄÞ×²ÌÞ ¶×", + "ReactOS É ·ÎÝÌÞÌÞÝÉ ²Ý½Ä°ÙÊ ¾²º³ ¼Ï¼À¡", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "ÄÞ×²ÌÞ A: ¶× ÌÛ¯Ëß° ÃÞ¨½¸¤ CD ÄÞ×²ÌÞ¶×", TEXT_STYLE_NORMAL }, { 10, 9, - "½ÍÞÃÉ CD-ROM¦ ÄØÀÞ¼Ã ¸ÀÞ»²¡", + "½ÍÞÃÉ CD-ROM ¦ ÄØÀÞ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 10, 11, - "ºÝËß°À¦ »²·ÄÞ³ ½Ù ÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + "ºÝËß°À¦ »²·ÄÞ³ ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { @@ -750,7 +750,7 @@ { 6, 8, - "¾¯Ä±¯ÌßÊ ÌÞ°ÄÛ°ÀÞ¦ ºÝËß°ÀÉ Ê°ÄÞÃÞ¨½¸ ¼Þ®³ Æ ²Ý½Ä°Ù", + "¾¯Ä±¯ÌßÊ ÌÞ°ÄÛ°ÀÞ¦ ºÝËß°ÀÉ Ê°ÄÞÃÞ¨½¸¼Þ®³Æ ²Ý½Ä°Ù", TEXT_STYLE_NORMAL }, { @@ -762,13 +762,13 @@ { 6, 13, - "ÄÞ×²ÌÞ A: Æ Ì«°Ï¯Ä»ÚÀ ÌÛ¯Ëß° ÃÞ¨½¸¦ ²ÚÃ¤", + "ÄÞ×²ÌÞ A: Æ Ì«°Ï¯Ä »ÚÀ ÌÛ¯Ëß° ÃÞ¨½¸¦ ²ÚÃ¤", TEXT_STYLE_NORMAL }, { 6, 14, - "ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + "ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL, }, { @@ -803,37 +803,37 @@ { 6, 9, - "ÃÞ²½¸ ½Íß°½É ²Á×Ý ÃÞ½¡", + "ÃÞ¨½¸ ½Íß°½É ²Á×ÝÃÞ½¡", TEXT_STYLE_NORMAL }, { 8, 11, - "\x07 UP Ó¼¸Ê DOWN·°¦ µ¼Ã Ø½Ä´ÝÄØ°¦ ¾ÝÀ¸ ¼Ã ¸ÀÞ»²¡", + "\x07 UP Ó¼¸Ê DOWN ·°¦ µ¼Ã Ø½Ä ´ÝÄØ°¦ ¾ÝÀ¸ ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 ¾ÝÀ¸»ÚÀ Êß°Ã¨¼®ÝÆ ReactOS¦ ²Ý½Ä°Ù½Ù ÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 ¾ÝÀ¸»ÚÀ Êß°Ã¨¼®ÝÆ ReactOS ¦ ²Ý½Ä°Ù ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 ±À×¼² Êß°Ã¨¼®Ý ¦ »¸¾²½Ù ÆÊ C·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 ±À×¼² Êß°Ã¨¼®Ý ¦ »¸¾² ½ÙÆÊ C ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 ·¿ÝÉ Êß°Ã¨¼®Ý¦ »¸¼Þ®½Ù ÆÊ D·°¦ µ¼Ã ¸ÀÞ»²¡", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "µÏÁ¸ÀÞ»²...", + "\x07 ·¿ÝÉ Êß°Ã¨¼®Ý¦ »¸¼Þ® ½ÙÆÊ D ·°¦ µ¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "µÏÁ ¸ÀÞ»²...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -861,7 +861,7 @@ { 6, 10, - "¾¯Ä±¯ÌßÊ Êß°Ã¨¼®Ý¦ Ì«°Ï¯Ä ¼Ï½¡ ¿Þ¯º³ ½ÙÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + "¾¯Ä±¯ÌßÊ Êß°Ã¨¼®Ý¦ Ì«°Ï¯Ä ¼Ï½¡ ¿Þ¯º³ ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { @@ -889,7 +889,7 @@ { 6, 8, - "¾¯Ä±¯ÌßÊ ReactOSÉ Ì§²Ù¦ ¾ÝÀ¸ »ÚÀ Êß°Ã¨¼®Ý ¼Þ®³Æ ²Ý½Ä°Ù¼Ï½¡ ReactOS¦", + "¾¯Ä±¯ÌßÊ ReactOS É Ì§²Ù¦ ¾ÝÀ¸ »ÚÀ Êß°Ã¨¼®Ý¼Þ®³Æ ²Ý½Ä°Ù ¼Ï½¡ ReactOS ¦", TEXT_STYLE_NORMAL }, { @@ -901,13 +901,13 @@ { 6, 14, - "½²¼®³ ÃÞ¨Ú¸ÄØ¦ ÍÝº³½ÙÆÊABACKSPACE·°ÃÞ »¸¼Þ®¼À ±ÄÆ¤", + "½²¼®³ ÃÞ¨Ú¸ÄØ¦ ÍÝº³½ÙÆÊ¤ BACKSPACE ·°ÃÞ Ó¼Þ¦ »¸¼Þ® ¼À ±ÄÆ¤", TEXT_STYLE_NORMAL }, { 6, 15, - "ReactOS¦ ²Ý½Ä°Ù ½Ù ÃÞ¨Ú¸ÄØ¦ Æ³Ø®¸", + "ReactOS ¦ ²Ý½Ä°Ù ½Ù ÃÞ¨Ú¸ÄØ¦ Æ³Ø®¸", TEXT_STYLE_NORMAL }, { @@ -947,7 +947,7 @@ { 0, 13, - "ºËß°½Ù ±²ÀÞ ¼ÊÞ×¸ µÏÁ ¸ÀÞ»²¡", + "ºËß° ½Ù ±²ÀÞ ¼ÊÞ×¸ µÏÁ ¸ÀÞ»²¡", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { @@ -981,13 +981,13 @@ { 6, 8, - "¾¯Ä±¯ÌßÊ ÌÞ°ÄÛ°ÀÞ¦ ²Ý½Ä°Ù ¼Ï½", + "¾¯Ä±¯ÌßÊ ÌÞ°Ä Û°ÀÞ¦ ²Ý½Ä°Ù ¼Ï½", TEXT_STYLE_NORMAL }, { 8, 12, - "ÌÞ°ÄÛ°ÀÞ¦ Ê°ÄÞÃÞ¨½¸ (MBR) Æ ²Ý½Ä°Ù ½Ù¡", + "ÌÞ°ÄÛ°ÀÞ¦ Ê°ÄÞÃÞ¨½¸ (ÌÞ°Ä¾¸À)Æ ²Ý½Ä°Ù ½Ù¡", TEXT_STYLE_NORMAL }, { @@ -1027,19 +1027,19 @@ { 6, 8, - "²Ý½Ä°Ù »ÚÙ ·°ÎÞ°ÄÞÉ ¼Ù²¦ ÍÝº³½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À¡", - TEXT_STYLE_NORMAL - }, - { - 8, - 10, - "\x07 UP Ó¼¸Ê DOWN·°¦ µ¼Ã Ã·½Ù ·°ÎÞ°ÄÞÉ ¼Ù²¦ ¾ÝÀ¸¼Ã ¸ÀÞ»²¡", + "²Ý½Ä°Ù »ÚÙ ·°ÎÞ°ÄÞÉ ¼Ù²¦ ÍÝº³ ½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À¡", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 UP Ó¼¸Ê DOWN ·°¦ µ¼Ã Ã·½Ù ·°ÎÞ°ÄÞÉ ¼Ù²¦ ¾ÝÀ¸ ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 11, - " Â·ÞÆ ENTER·°¦ µ¼Ã¸ÀÞ»²¡", + " Â·ÞÆ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { @@ -1079,25 +1079,25 @@ { 6, 8, - "²Ý½Ä°Ù»ÚÙ ·ÄÃ²É Ú²±³Ä¦ ¾ÝÀ¸¼Ã ¸ÀÞ»²¡", - TEXT_STYLE_NORMAL - }, - { - 8, - 10, - "\x07 UP Ó¼¸Ê DOWN·°¦ µ¼Ã Ã·½Ù ·°ÎÞ°ÄÞ Ú²±³Ä¦ ¾ÝÀ¸¼Ã¤", + "·Ã²É Ú²±³ÄÄ¼Ã ²Ý½Ä°Ù »ÚÙ Ú²±³Ä¦ ¾ÝÀ¸ ¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 UP Ó¼¸Ê DOWN ·°¦ µ¼Ã Ã·½Ù ·°ÎÞ°ÄÞ Ú²±³Ä¦ ¾ÝÀ¸ ¼Ã¤", TEXT_STYLE_NORMAL }, { 8, 11, - " Â·ÞÆ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + " Â·ÞÆ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 ·°ÎÞ°ÄÞ Ú²±³Ä¦ ÍÝº³ ¾½ÞÆ Ï´É Íß°¼ÞÆ ÓÄÞÙÆÊ ESC·°¦", + "\x07 ·°ÎÞ°ÄÞ Ú²±³Ä¦ ÍÝº³ ¾½ÞÆ Ï´É Íß°¼ÞÆ ÓÄÞÙÆÊ ESC ·°¦", TEXT_STYLE_NORMAL }, { @@ -1132,13 +1132,13 @@ { 6, 8, - "¾¯Ä±¯ÌßÊ ReactOSÉÌ§²Ù¦ ºÝËß°ÀÆ ºËß°½Ù ¼ÞÝËÞ¦ ¼Ã ²Ï½¡ ", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ºËß°½Ù Ì§²Ù Ø½Ä¦ »¸¾² Á³...", + "¾¯Ä±¯ÌßÊ ReactOS ÉÌ§²Ù¦ ºÝËß°ÀÆ ºËß° ½Ù ¼ÞÝËÞ¦ ¼Ã ²Ï½¡ ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ºËß° ½Ù Ì§²ÙÉØ½Ä¦ »¸¾² Á³...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1167,19 +1167,19 @@ { 8, 19, - "\x07 UP Ó¼¸Ê DOWN·°¦ µ¼Ã Ì§²Ù ¼½ÃÑ¦ ¾ÝÀ¸¼Ã ¸ÀÞ»²¡", + "\x07 UP Ó¼¸Ê DOWN ·°¦ µ¼Ã Ì§²Ù ¼½ÃÑ¦ ¾ÝÀ¸ ¼Ã ¸ÀÞ»²¡", 0 }, { 8, 21, - "\x07 Êß°Ã¨¼®Ý¦ Ì«°Ï¯Ä½ÙÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 Êß°Ã¨¼®Ý¦ Ì«°Ï¯Ä ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", 0 }, { 8, 23, - "\x07 ÍÞÂÉ Êß°Ã¨¼®Ý¦ ¾ÝÀ¸½Ù ÊÞ±²¤ ESC·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 ÍÞÂÉ Êß°Ã¨¼®Ý¦ ¾ÝÀ¸ ½Ù ÊÞ±²¤ ESC ·°¦ µ¼Ã ¸ÀÞ»²¡", 0 }, { @@ -1208,25 +1208,25 @@ { 6, 8, - "ºÉ Êß°Ã¨¼®Ý¦ »¸¼Þ®½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À", + "ºÉ Êß°Ã¨¼®Ý¦ »¸¼Þ® ½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À", TEXT_STYLE_NORMAL }, { 8, 18, - "\x07 ºÉ Êß°Ã¨¼®Ý¦ »¸¼Þ® ½ÙÆÊ D·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 ºÉ Êß°Ã¨¼®Ý¦ »¸¼Þ® ½ÙÆÊ D ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 11, 19, - "¹²º¸(WARNING): ºÉ Êß°Ã¨¼®Ý ¼Þ®³É ½ÍÞÃÉ ÃÞ°ÀÊ ³¼ÅÜÚ Ï½!", + "¹²º¸(WARNING): ºÉ Êß°Ã¨¼®Ý¼Þ®³É ½ÍÞÃÉ ÃÞ°ÀÊ ³¼ÅÜÚÏ½!", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 ·¬Ý¾Ù½Ù ÆÊ ESC·° ¦ µ¼Ã¸ÀÞ»²¡", + "\x07 ·¬Ý¾Ù ½ÙÆÊ ESC ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { @@ -1276,12 +1276,12 @@ { { //ERROR_NOT_INSTALLED - "ReactOSÊ ºÝËß°ÀÆ Ï¯À¸ ²Ý½Ä°Ù\n" - "»ÚÏ¾Ý¡ ¾¯Ä±¯Ìß¦ Á³¼ ½Ù ÊÞ±²¤ ReactOS¦ ²Ý½Ä°Ù½Ù ÆÊ ¾¯Ä±¯Ìß¦\n" + "ReactOS Ê ºÝËß°ÀÆ ¶Ý¾ÞÝÆ ²Ý½Ä°Ù\n" + "»ÚÏ¾Ý¡ ¾¯Ä±¯Ìß¦ Á³¼ ½Ù ÊÞ±²¤ ReactOS ¦ ²Ý½Ä°Ù ½ÙÆÊ ¾¯Ä±¯Ìß¦\n" "Ó³²ÁÄÞ ¼Þ¯º³ ½Ù ËÂÖ³¶Þ ±ØÏ½¡\n" "\n" - " \x07 ¾¯Ä±¯Ìß¦ ¿Þ¯º³½ÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡\n" - " \x07 ¾¯Ä±¯Ìß¦ Á³¼½ÙÆÊ F3·°¦ µ¼Ã ¸ÀÞ»²¡", + " \x07 ¾¯Ä±¯Ìß¦ ¿Þ¯º³ ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡\n" + " \x07 ¾¯Ä±¯Ìß¦ Á³¼ ½ÙÆÊ F3 ·°¦ µ¼Ã ¸ÀÞ»²¡", "F3 = Á³¼ ENTER = ¿Þ¯º³" }, { @@ -1291,7 +1291,7 @@ }, { //ERROR_NO_SOURCE_DRIVE - "¾¯Ä±¯ÌßÊ ¿°½ ÄÞ×²ÌÞ ¦ ¹Ý¼Â ÃÞ·Ï¾Ý ÃÞ¼À¡\n", + "¾¯Ä±¯ÌßÊ ¿°½ ÄÞ×²ÌÞ¦ ¹Ý¼Â ÃÞ·Ï¾Ý ÃÞ¼À¡\n", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { @@ -1321,38 +1321,38 @@ }, { //ERROR_LOAD_COMPUTER, - "¾¯Ä±¯ÌßÊ ºÝËß°ÀÉ ¼Ù² Ø½Ä É ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", + "¾¯Ä±¯ÌßÊ ºÝËß°ÀÉ ¼Ù² Ø½ÄÉ ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_LOAD_DISPLAY, - "¾¯Ä±¯ÌßÊ ÃÞ¨½ÌßÚ²É ¾¯Ã² Ø½Ä É ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", + "¾¯Ä±¯ÌßÊ ÃÞ¨½ÌßÚ²É ¾¯Ã² Ø½ÄÉ ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_LOAD_KEYBOARD, - "¾¯Ä±¯ÌßÊ ·°ÎÞ°ÄÞÉ ¼Ù² Ø½Ä É ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", + "¾¯Ä±¯ÌßÊ ·°ÎÞ°ÄÞÉ ¼Ù² Ø½ÄÉ ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_LOAD_KBLAYOUT, - "¾¯Ä±¯ÌßÊ ·°ÎÞ°ÄÞ Ú²±³Ä Ø½Ä É ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", + "¾¯Ä±¯ÌßÊ ·°ÎÞ°ÄÞ Ú²±³Ä Ø½ÄÉ ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_WARN_PARTITION, "¾¯Ä±¯ÌßÊ ½¸Å¸ÄÓ 1ÂÉ Ê°ÄÞÃÞ¨½¸¶Þ Ã·¾ÂÆ ±Â¶´Å² ºÞ¶Ý¾²É Å²\n" - "Êß°Ã¨¼®Ý Ã°ÌÞÙ¦ Ì¸Ñ ºÄ¦ Ê¯¹Ý ¼Ï¼À!\n" + "Êß°Ã¨¼®Ý Ã°ÌÞÙ¦ Ì¸Ñ ºÄ¦ ¹Ý¼Â ¼Ï¼À!\n" "\n" - "Êß°Ã¨¼®Ý¦ »¸¾² ÏÀÊ »¸¼Þ®¼Ã¤ ºÉ Êß°Ã¨¼®Ý Ã°ÌÞÙ¦ Ê¶² ÃÞ·Ï½\n" + "Êß°Ã¨¼®Ý¦ »¸¾² ÏÀÊ »¸¼Þ® ¼Ã¤ ºÉ Êß°Ã¨¼®Ý Ã°ÌÞÙ¦ Ê¶² ÃÞ·Ï½\n" "\n" - " \x07 ¾¯Ä±¯Ìß¦ Á³¼ ½ÙÆÊ F3·°¦ µ¼Ã ¸ÀÞ»²¡" - " \x07 ¿Þ¯º³ ½ÙÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + " \x07 ¾¯Ä±¯Ìß¦ Á³¼ ½ÙÆÊ F3 ·°¦ µ¼Ã ¸ÀÞ»²¡\n" + " \x07 ¿Þ¯º³ ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", "F3= Á³¼ ENTER = ¿Þ¯º³" }, { //ERROR_NEW_PARTITION, - "±À×¼² Êß°Ã¨¼®Ý ¦ ½ÃÞÆ ¿Ý»Þ²½Ù\n" + "±À×¼² Êß°Ã¨¼®Ý¦ ½ÃÞÆ ¿Ý»Þ²½Ù\n" "Êß°Ã¨¼®ÝÉ Å²ÌÞÆ »¸¾² ½ÙºÄÊ ÃÞ·Ï¾Ý!\n" "\n" " * ¿Þ¯º³ ½ÙÆÊ ÅÆ¶ ·°¦ µ¼Ã ¸ÀÞ»²¡", @@ -1382,27 +1382,27 @@ }, { //ERROR_UPDATE_DISPLAY_SETTINGS, - "¾¯Ä±¯ÌßÊ ÃÞ¨½ÌßÚ²É Ú¼Þ½ÄØ ¾¯Ã² É º³¼ÝÆ ¼¯Êß² ¼Ï¼À¡", + "¾¯Ä±¯ÌßÊ ÃÞ¨½ÌßÚ²É Ú¼Þ½ÄØ ¾¯Ã²É º³¼ÝÆ ¼¯Êß² ¼Ï¼À¡", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_IMPORT_HIVE, - "¾¯Ä±¯ÌßÊ Ê²ÌÞ Ì§²Ù É ²ÝÎß°ÄÆ ¼¯Êß² ¼Ï¼À¡", + "¾¯Ä±¯ÌßÊ Ê²ÌÞ Ì§²ÙÉ ²ÝÎß°ÄÆ ¼¯Êß² ¼Ï¼À¡", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_FIND_REGISTRY - "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØ ÃÞ°À Ì§²Ù É ¹Ý¼ÂÆ ¼¯Êß² ¼Ï¼À¡", + "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØ ÃÞ°À Ì§²ÙÉ ¹Ý¼ÂÆ ¼¯Êß² ¼Ï¼À¡", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_CREATE_HIVE, - "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØ Ê²ÌÞ É »¸¾²Æ ¼¯Êß² ¼Ï¼À¡", + "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØ Ê²ÌÞÉ »¸¾²Æ ¼¯Êß² ¼Ï¼À¡", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_INITIALIZE_REGISTRY, - "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØ É ¼®·¶Æ ¼¯Êß² ¼Ï¼À¡", + "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØÉ ¼®·¶Æ ¼¯Êß² ¼Ï¼À¡", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { @@ -1412,50 +1412,50 @@ }, { //ERROR_CABINET_MISSING, - "·¬ËÞÈ¯Ä ¶Þ ÐÂ¶ØÏ¾Ý¡\n", + "·¬ËÞÈ¯Ä¶Þ ÐÂ¶ØÏ¾Ý¡\n", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_CABINET_SCRIPT, - "·¬ËÞÈ¯ÄÅ²Æ ¾¯Ä±¯Ìß ½¸ØÌßÄ ¶Þ ÐÂ¶ØÏ¾Ý¡\n", + "·¬ËÞÈ¯ÄÅ²Æ ¾¯Ä±¯Ìß ½¸ØÌßÄ¶Þ ÐÂ¶ØÏ¾Ý¡\n", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_COPY_QUEUE, - "¾¯Ä±¯ÌßÊ ºËß° Ì§²Ù ·° É µ°ÌßÝÆ ¼¯Êß² ¼Ï¼À¡\n", + "¾¯Ä±¯ÌßÊ ºËß° Ì§²Ù ·°É µ°ÌßÝÆ ¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_CREATE_DIR, - "¾¯Ä±¯ÌßÊ ²Ý½Ä°Ù ÃÞ¨Ú¸ÄØ ¦ »¸¾² ÃÞ·Ï¾Ý ÃÞ¼À¡", + "¾¯Ä±¯ÌßÊ ²Ý½Ä°Ù ÃÞ¨Ú¸ÄØ¦ »¸¾² ÃÞ·Ï¾Ý ÃÞ¼À¡", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_TXTSETUP_SECTION, - "¾¯Ä±¯ÌßÊ TXTSETUP.SIF Å²É 'Directories' ¾¸¼®Ý É¹Ý»¸Æ\n" + "¾¯Ä±¯ÌßÊ TXTSETUP.SIF Å²É 'Directories' ¾¸¼®ÝÉ ¹Ý»¸Æ\n" "¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_CABINET_SECTION, - "¾¯Ä±¯ÌßÊ ·¬ËÞÈ¯Ä Å²É 'Directories' ¾¸¼®Ý É¹Ý»¸Æ\n" + "¾¯Ä±¯ÌßÊ ·¬ËÞÈ¯ÄÅ²É 'Directories' ¾¸¼®ÝÉ ¹Ý»¸Æ\n" "¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_CREATE_INSTALL_DIR - "¾¯Ä±¯ÌßÊ ²Ý½Ä°Ù ÃÞ¨Ú¸ÄØ ¦ »¸¾² ÃÞ·Ï¾Ý ÃÞ¼À¡", + "¾¯Ä±¯ÌßÊ ²Ý½Ä°Ù ÃÞ¨Ú¸ÄØ¦ »¸¾² ÃÞ·Ï¾Ý ÃÞ¼À¡", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_FIND_SETUPDATA, - "¾¯Ä±¯ÌßÊ TXTSETUP.SIF Å²É 'SetupData' ¾¸¼®Ý É¹Ý»¸Æ\n" + "¾¯Ä±¯ÌßÊ TXTSETUP.SIF Å²É 'SetupData' ¾¸¼®ÝÉ ¹Ý»¸Æ\n" "¼¯Êß² ¼Ï¼À¡\n", "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_WRITE_PTABLE, - "¾¯Ä±¯ÌßÊ Êß°Ã¨¼®Ý Ã°ÌÞÙ É ¶·ºÐ Æ ¼¯Êß² ¼Ï¼À¡\n" + "¾¯Ä±¯ÌßÊ Êß°Ã¨¼®Ý Ã°ÌÞÙÉ ¶·ºÐÆ ¼¯Êß² ¼Ï¼À¡\n" "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { @@ -1465,7 +1465,7 @@ }, { //ERROR_UPDATE_LOCALESETTINGS, - "¾¯Ä±¯ÌßÊ ¼½ÃÑ Û¹°Ù ¦ ¾¯Ã² ÃÞ·Ï¾Ý ÃÞ¼À¡\n" + "¾¯Ä±¯ÌßÊ ¼½ÃÑ Û¹°Ù¦ ¾¯Ã² ÃÞ·Ï¾Ý ÃÞ¼À¡\n" "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { @@ -1483,7 +1483,6 @@ NULL } }; - MUI_PAGE jaJPPages[] = { @@ -1596,13 +1595,13 @@ {STRING_PARTITIONSIZE, "±À×¼² Êß°Ã¨¼®ÝÉ »²½Þ:"}, {STRING_CHOOSENEWPARTITION, - "±À×¼² Êß°Ã¨¼®Ý ¦ Â·ÞÆ »¸¾²½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À:"}, + "±À×¼² Êß°Ã¨¼®Ý¦ Â·ÞÆ »¸¾²½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À:"}, {STRING_HDDSIZE, "±À×¼² Êß°Ã¨¼®ÝÉ »²½Þ¦ Ò¶ÞÊÞ²Ä ÀÝ²ÃÞ Æ³Ø®¸ ¼Ã¸ÀÞ»²¡"}, {STRING_CREATEPARTITION, " ENTER = Êß°Ã¨¼®Ý »¸¾² ESC = ·¬Ý¾Ù F3 = Á³¼"}, {STRING_PARTFORMAT, - "ºÉ Êß°Ã¨¼®ÝÊ Â·ÞÆ Ì«°Ï¯Ä »ÚÏ½¡"}, + "ºÉ Êß°Ã¨¼®ÝÊ Â·ÞÉ Ã¼ÞÝÃÞ Ì«°Ï¯Ä »ÚÏ½¡"}, {STRING_NONFORMATTEDPART, "ReactOS¦ ¼Ý· ÏÀÊ ÐÌ«°Ï¯ÄÉ Êß°Ã¨¼®ÝÆ ²Ý½Ä°Ù½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À¡"}, {STRING_INSTALLONPART, @@ -1620,7 +1619,7 @@ {STRING_SETUPCOPYINGFILES, "¾¯Ä±¯ÌßÊ Ì§²Ù¦ ºËß° ¼Ã ²Ï½..."}, {STRING_REGHIVEUPDATE, - " Ú¼Þ½ÄØ Ê²ÌÞ É º³¼Ý Á³..."}, + " Ú¼Þ½ÄØ Ê²ÌÞÉ º³¼Ý Á³..."}, {STRING_IMPORTFILE, " %S ¦ ²ÝÎß°Ä Á³..."}, {STRING_DISPLAYETTINGSUPDATE, @@ -1628,7 +1627,7 @@ {STRING_LOCALESETTINGSUPDATE, " Á²· ¾¯Ã²É º³¼Ý Á³..."}, {STRING_KEYBOARDSETTINGSUPDATE, - " ·°ÎÞ°ÄÞ Ú²±³ÄÉ ¾¯Ã² º³¼Ý Á³..."}, + " ·°ÎÞ°ÄÞ Ú²±³ÄÉ ¾¯Ã²¦ º³¼Ý Á³..."}, {STRING_CODEPAGEINFOUPDATE, " º°ÄÞ Íß°¼Þ É ¼Þ®³Î³¦ Ú¼Þ½ÄØÆ Â²¶ Á³..."}, {STRING_DONE, @@ -1680,9 +1679,9 @@ {STRING_MAXSIZE, "MB (»²ÀÞ². %lu MB)"}, {STRING_UNFORMATTED, - "¼Ý· (Ð Ì«°Ï¯Ä)"}, + "¼Ý· (ÐÌ«°Ï¯Ä)"}, {STRING_FORMATUNUSED, - "Ð ¼Ö³"}, + "Ð¼Ö³"}, {STRING_FORMATUNKNOWN, "ÌÒ²"}, {STRING_KB, @@ -1692,7 +1691,7 @@ {STRING_GB, "GB"}, {STRING_ADDKBLAYOUTS, - "·°ÎÞ°ÄÞ Ú²±³Ä É Â²¶ Á³"}, + "·°ÎÞ°ÄÞ Ú²±³ÄÉ Â²¶ Á³"}, {0, 0} }; Added: trunk/reactos/base/system/runonce/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/j… ============================================================================== --- trunk/reactos/base/system/runonce/lang/ja-JP.rc (added) +++ trunk/reactos/base/system/runonce/lang/ja-JP.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -1,0 +1,11 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_RUNONCE_DLG DIALOG DISCARDABLE 0, 0, 239, 170 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS ZbgAbv" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ReactOS ÍÌÚðÝèµÄ¢Ü·:", -1, 38, 8, 196, 18 + LISTBOX IDC_COMP_LIST, 36, 32, 197, 131, LBS_OWNERDRAWVARIABLE | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + ICON IDI_ICON, -1, 5, 6, 21, 20 +END Propchange: trunk/reactos/base/system/runonce/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/runonce/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/rsrc.r… ============================================================================== --- trunk/reactos/base/system/runonce/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/runonce/rsrc.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -1,5 +1,6 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/ja-JP.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -43,16 +43,6 @@ PUSHBUTTON "n[hEFA vt@C(&W)...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 END -IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "System Settings" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 - PUSHBUTTON "OK",IDOK,166,83,50,14 -END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -72,8 +62,20 @@ LTEXT "N®ÆñIvVÅÍRs[^ÌN®û@ÆARs[^ªâ~·éG[ª ¶µ½êAÇ¤·é©ðÝèµÜ·B", IDC_STATIC, 16, 144, 228, 19 PUSHBUTTON "Ýè", IDC_STAREC, 194, 162, 50, 15 - PUSHBUTTON "Â«Ï", IDC_ENVVAR, 84, 192, 80, 15 + PUSHBUTTON "VXeÌÝè", IDC_SYSSETTINGS, 2, 192, 80, 15 + PUSHBUTTON "Â«Ï", IDC_ENVVAR, 85, 192, 80, 15 PUSHBUTTON "G[ñ", IDC_ERRORREPORT, 170, 192, 80, 15 +END + +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "VXeÌÝè" +FONT 9, "MS UI Gothic", 0, 0, 0x1 +BEGIN + GROUPBOX "o[Wîñ",IDC_STATIC,6,3,210,73 + CONTROL "[NXe[VÆµÄÓéÜ¤",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS ÍT[o OS ÆµÄrh³êÄ¢é½ßAT[oÆµÄÓéÜ¢Ü·B±êðÏX·éÉÍ±Ì{bNXÉ`FbNµÄ¾³¢B½¾µAvP[VÉÎµÄÌÝLøÅ·B",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END @@ -88,7 +90,8 @@ LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "vpeB(&P)", IDC_HRDPROFPROP, 8, 106, 50, 14 PUSHBUTTON "Rs[(&C)", IDC_HRDPROFCOPY, 63, 106, 50, 14 + PUSHBUTTON "vpeB(&P)", IDC_HRDPROFPROP, 8, 106, 50, 14 + PUSHBUTTON "Rs[(&C)", IDC_HRDPROFCOPY, 63, 106, 50, 14 PUSHBUTTON "¼OÌÏX(&R)", IDC_HRDPROFRENAME, 118, 106, 50, 14 PUSHBUTTON "í(&D)", IDC_HRDPROFDEL, 173, 106, 50, 14 @@ -280,5 +283,5 @@ IDS_USERPROFILE_SIZE "TCY" IDS_USERPROFILE_TYPE "íÞ" IDS_USERPROFILE_STATUS "óÔ" - IDS_USERPROFILE_MODIFIED "C³Ï" -END + IDS_USERPROFILE_MODIFIED "ÏXú" +END Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -210,7 +210,7 @@ IDS_CMT_MSCONFIG "VXeÌ\\¬vOðJ«Ü·" IDS_CMT_NOTEPAD "eLXgGfB^ðN®µÜ·" IDS_CMT_RDESKTOP "[g fXNgbvðN®µÜ·" - IDS_CMT_REGEDIT "WXgGfB^ðN®µÜ·" + IDS_CMT_REGEDIT "WXg GfB^ðN®µÜ·" IDS_CMT_SCREENSHOT "XN[VbgðBèÜ·" IDS_CMT_SERVMAN "T[rX }l[WðN®µÜ·" IDS_CMT_WORDPAD "hLgGfB^ðN®µÜ·" @@ -228,24 +228,23 @@ STRINGTABLE BEGIN IDS_SYS_TOOLS "VXec[" - IDS_CMT_CHARMAP "LN^[}bv" - IDS_CMT_DXDIAG "ReactXff vOðN®µÜ·" + IDS_CMT_CHARMAP "¶R[h\\" + IDS_CMT_DXDIAG "ReactX ff vOðN®µÜ·" IDS_CMT_KBSWITCH "L[{[hCAEgØÖí" END STRINGTABLE BEGIN - IDS_SYS_ACCESSIBILITY "ANZVreB" - IDS_CMT_MAGNIFY "gå¾" -END - -STRINGTABLE -BEGIN - IDS_SYS_ENTERTAINMENT "G^[eCg" - IDS_CMT_MPLAY32 "}`fBA v[[ðN®µÜ·" - IDS_CMT_SNDVOL32 "{[ Rg[ðN®µÜ·" - IDS_CMT_SNDREC32 "Launch Sound Recorder" - + IDS_SYS_ACCESSIBILITY "ANZVreB" + IDS_CMT_MAGNIFY "gå¾" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "G^[eCg" + IDS_CMT_MPLAY32 "}`fBA v[[ðN®µÜ·" + IDS_CMT_SNDVOL32 "{[ Rg[ðN®µÜ·" + IDS_CMT_SNDREC32 "TEh R[_ðN®µÜ·" END STRINGTABLE @@ -264,10 +263,10 @@ STRINGTABLE BEGIN IDS_SHORT_CALC "dì.lnk" - IDS_SHORT_CHARMAP "LN^[ }bv.lnk" + IDS_SHORT_CHARMAP "¶R[h\\.lnk" IDS_SHORT_CMD "R}h vvg.lnk" IDS_SHORT_DEVICE "foCX }l[W.lnk" - IDS_SHORT_DOWNLOADER "ReactOS AvP[V }l[W[.lnk" + IDS_SHORT_DOWNLOADER "ReactOS AvP[V }l[W.lnk" IDS_SHORT_DXDIAG "ReactX ff.lnk" IDS_SHORT_EVENTVIEW "Cxg r[A.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" @@ -281,7 +280,7 @@ IDS_SHORT_SERVICE "T[rX }l[W.lnk" IDS_SHORT_SNAP "XibvVbg.lnk" IDS_SHORT_SNDVOL32 "{[ Rg[.lnk" - IDS_SHORT_SNDREC32 "Audiorecorder.lnk" + IDS_SHORT_SNDREC32 "I[fBIR[_.lnk" IDS_SHORT_SOLITAIRE "\\eBA.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "[hpbh.lnk" Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/ja-JP.rc (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/ja-JP.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -1,0 +1,56 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "vOÌI¹ - " +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "vOðI¹µÄ¢Ü·... µÎç¨Ò¿¾³¢",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "vOð·®ÉI¹³¹éæ¤Iðµ½êAÛ¶³êÄ¢È¢f[^Í·×Ä¸íêÜ·BvOðI¹·éÉÍ[·®ÉI¹]ðNbNµÄ¾³¢B", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "·®ÉI¹(&E)",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "vOÌI¹ - " +FONT 9, "MS UI Gothic" +BEGIN + DEFPUSHBUTTON "LZ",IDCANCEL,142,98,43,17 + PUSHBUTTON "·®ÉI¹(&E)",IDC_END_NOW,78,98,43,17 + LTEXT "±ÌvOÍµÄ¢Ü¹ñ",IDC_STATIC,7,7,178,8 + LTEXT "ReactOS ÉßÁÄvOÌóÔðmF·éÉÍ[LZ]ðNbNµÄ¾³¢", + IDC_STATIC,7,26,178,16 + LTEXT "vOð·®ÉI¹³¹éæ¤Iðµ½êAÛ¶³êÄ¢È¢f[^Í·×Ä¸íêÜ·BvOð¼¿ÉI¹·éÉÍ[·®ÉI¹]ðNbNµÄ¾³¢", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 9, "MS UI Gothic", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END + +STRINGTABLE +BEGIN + IDS_EDIT "ÒW" + IDS_MARK "ÍÍwè" + IDS_COPY "Rs[\tEnter" + IDS_PASTE "\\èt¯" + IDS_SELECTALL "·×ÄIð" + IDS_SCROLL "XN[" + IDS_FIND "õ..." + IDS_DEFAULTS "Kèl" + IDS_PROPERTIES "vpeB" + IDS_SCROLLHERE "±±ÉXN[" + IDS_SCROLLTOP "êÔãÉXN[" + IDS_SCROLLBOTTOM "êÔºÉXN[" + IDS_SCROLLPAGE_UP "Page up" + IDS_SCROLLPAGE_DOWN "Page down" + IDS_SCROLLUP "ãÉXN[" + IDS_SCROLLDOWN "ºÉXN[" +END Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] Sun Jan 3 16:53:21 2010 @@ -13,6 +13,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc"

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010