Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[tfaber] 64660: [MPLAY32] - Fix broken casts
by tfaber＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: tfaber Date: Sat Oct 11 11:14:33 2014 New Revision: 64660 URL: http://svn.reactos.org/svn/reactos?rev=64660&view=rev Log: [MPLAY32] - Fix broken casts Modified: trunk/reactos/base/applications/mplay32/mplay32.c Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sat Oct 11 11:14:33 2014 @@ -54,10 +54,10 @@ mciVideoWindow.hWnd = hwnd; - dwError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD)(LPSTR)&mciVideoWindow); + dwError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD_PTR)&mciVideoWindow); if (!dwError) { - dwError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD)(LPSTR)&mciVideoRect); + dwError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD_PTR)&mciVideoRect); if (!dwError) { EnableMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_ENABLED); @@ -260,13 +260,13 @@ mciVideoWindow.hWnd = hwnd; - mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD)(LPSTR)&mciVideoWindow); + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD_PTR)&mciVideoWindow); if (mciError) { return; } - mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD)(LPSTR)&mciVideoRect); + mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD_PTR)&mciVideoRect); if (mciError) { return; @@ -278,7 +278,7 @@ SetParent(hTrackBar, hToolBar); - mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE, (DWORD)(LPSTR)&mciVideoRect); + mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE, (DWORD_PTR)&mciVideoRect); if (mciError) { ShowMCIError(hwnd, mciError); @@ -288,7 +288,7 @@ GetWindowRect(hToolBar, &rcToolbarRect); ResizeClientArea(hwnd, mciVideoRect.rc.right, mciVideoRect.rc.bottom + (rcToolbarRect.bottom - rcToolbarRect.top)); - mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD)(LPSTR)&mciVideoWindow); + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&mciVideoWindow); if (mciError) { ShowMCIError(hwnd, mciError); @@ -307,7 +307,7 @@ CheckMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_UNCHECKED); mciVideoWindow.hWnd = MCI_DGV_WINDOW_DEFAULT; - mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD)(LPSTR)&mciVideoWindow); + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&mciVideoWindow); if (mciError) { ShowMCIError(hwnd, mciError); @@ -780,7 +780,7 @@ mciPut.rc.right = Rect.right; mciPut.rc.bottom = Rect.bottom - (ToolbarRect.bottom - ToolbarRect.top) - 2; - mciSendCommand(wDeviceId, MCI_PUT, MCI_DGV_PUT_DESTINATION | MCI_DGV_RECT | MCI_WAIT, (DWORD)&mciPut); + mciSendCommand(wDeviceId, MCI_PUT, MCI_DGV_PUT_DESTINATION | MCI_DGV_RECT | MCI_WAIT, (DWORD_PTR)&mciPut); } } return 0L;

1 0

[tkreuzer] 64659: [WSHTCPIP] Fix a bug that manifests in an ASSERT on MSVC builds
by tkreuzer＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: tkreuzer Date: Sat Oct 11 10:26:45 2014 New Revision: 64659 URL: http://svn.reactos.org/svn/reactos?rev=64659&view=rev Log: [WSHTCPIP] Fix a bug that manifests in an ASSERT on MSVC builds Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/wshtcpi… ============================================================================== --- trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] Sat Oct 11 10:26:45 2014 @@ -207,9 +207,9 @@ break; case IPPROTO_TCP: + *TdiType = INFO_TYPE_CONNECTION; switch (OptionName) { - *TdiType = INFO_TYPE_CONNECTION; case TCP_NODELAY: *TdiId = TCP_SOCKET_NODELAY; return;

1 0

[tkreuzer] 64658: [NTDLL] Don't assert that the caller of exported APIs passes correct parameters.
by tkreuzer＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: tkreuzer Date: Sat Oct 11 08:52:33 2014 New Revision: 64658 URL: http://svn.reactos.org/svn/reactos?rev=64658&view=rev Log: [NTDLL] Don't assert that the caller of exported APIs passes correct parameters. Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sat Oct 11 08:52:33 2014 @@ -209,9 +209,6 @@ /* A normal failure */ return STATUS_INVALID_PARAMETER_3; } - - /* Do or Do Not. There is no Try */ - ASSERT((Disposition != NULL) || !(Flags & LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY)); /* If the flag is set, make sure we have a valid pointer to use */ if ((Flags & LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY) && !(Disposition))

1 0

[jimtabor] 64657: [Win32k] - Patch by Matteo Bruni : Don't overflow the buffer in GetGlyphOutline.
by jimtabor＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: jimtabor Date: Sat Oct 11 05:34:30 2014 New Revision: 64657 URL: http://svn.reactos.org/svn/reactos?rev=64657&view=rev Log: [Win32k] - Patch by Matteo Bruni : Don't overflow the buffer in GetGlyphOutline. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat Oct 11 05:34:30 2014 @@ -1497,6 +1497,203 @@ return (FT_Fixed)((long)f.value << 16 | (unsigned long)f.fract); } +static unsigned int get_native_glyph_outline(FT_Outline *outline, unsigned int buflen, char *buf) +{ + TTPOLYGONHEADER *pph; + TTPOLYCURVE *ppc; + unsigned int needed = 0, point = 0, contour, first_pt; + unsigned int pph_start, cpfx; + DWORD type; + + for (contour = 0; contour < outline->n_contours; contour++) + { + /* Ignore contours containing one point */ + if (point == outline->contours[contour]) + { + point++; + continue; + } + + pph_start = needed; + pph = (TTPOLYGONHEADER *)(buf + needed); + first_pt = point; + if (buf) + { + pph->dwType = TT_POLYGON_TYPE; + FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart); + } + needed += sizeof(*pph); + point++; + while (point <= outline->contours[contour]) + { + ppc = (TTPOLYCURVE *)(buf + needed); + type = outline->tags[point] & FT_Curve_Tag_On ? + TT_PRIM_LINE : TT_PRIM_QSPLINE; + cpfx = 0; + do + { + if (buf) + FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); + cpfx++; + point++; + } while (point <= outline->contours[contour] && + (outline->tags[point] & FT_Curve_Tag_On) == + (outline->tags[point-1] & FT_Curve_Tag_On)); + /* At the end of a contour Windows adds the start point, but + only for Beziers */ + if (point > outline->contours[contour] && + !(outline->tags[point-1] & FT_Curve_Tag_On)) + { + if (buf) + FTVectorToPOINTFX(&outline->points[first_pt], &ppc->apfx[cpfx]); + cpfx++; + } + else if (point <= outline->contours[contour] && + outline->tags[point] & FT_Curve_Tag_On) + { + /* add closing pt for bezier */ + if (buf) + FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); + cpfx++; + point++; + } + if (buf) + { + ppc->wType = type; + ppc->cpfx = cpfx; + } + needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX); + } + if (buf) + pph->cb = needed - pph_start; + } + return needed; +} + +static unsigned int get_bezier_glyph_outline(FT_Outline *outline, unsigned int buflen, char *buf) +{ + /* Convert the quadratic Beziers to cubic Beziers. + The parametric eqn for a cubic Bezier is, from PLRM: + r(t) = at^3 + bt^2 + ct + r0 + with the control points: + r1 = r0 + c/3 + r2 = r1 + (c + b)/3 + r3 = r0 + c + b + a + + A quadratic Bezier has the form: + p(t) = (1-t)^2 p0 + 2(1-t)t p1 + t^2 p2 + + So equating powers of t leads to: + r1 = 2/3 p1 + 1/3 p0 + r2 = 2/3 p1 + 1/3 p2 + and of course r0 = p0, r3 = p2 + */ + int contour, point = 0, first_pt; + TTPOLYGONHEADER *pph; + TTPOLYCURVE *ppc; + DWORD pph_start, cpfx, type; + FT_Vector cubic_control[4]; + unsigned int needed = 0; + + for (contour = 0; contour < outline->n_contours; contour++) + { + pph_start = needed; + pph = (TTPOLYGONHEADER *)(buf + needed); + first_pt = point; + if (buf) + { + pph->dwType = TT_POLYGON_TYPE; + FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart); + } + needed += sizeof(*pph); + point++; + while (point <= outline->contours[contour]) + { + ppc = (TTPOLYCURVE *)(buf + needed); + type = outline->tags[point] & FT_Curve_Tag_On ? + TT_PRIM_LINE : TT_PRIM_CSPLINE; + cpfx = 0; + do + { + if (type == TT_PRIM_LINE) + { + if (buf) + FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); + cpfx++; + point++; + } + else + { + /* Unlike QSPLINEs, CSPLINEs always have their endpoint + so cpfx = 3n */ + + /* FIXME: Possible optimization in endpoint calculation + if there are two consecutive curves */ + cubic_control[0] = outline->points[point-1]; + if (!(outline->tags[point-1] & FT_Curve_Tag_On)) + { + cubic_control[0].x += outline->points[point].x + 1; + cubic_control[0].y += outline->points[point].y + 1; + cubic_control[0].x >>= 1; + cubic_control[0].y >>= 1; + } + if (point+1 > outline->contours[contour]) + cubic_control[3] = outline->points[first_pt]; + else + { + cubic_control[3] = outline->points[point+1]; + if (!(outline->tags[point+1] & FT_Curve_Tag_On)) + { + cubic_control[3].x += outline->points[point].x + 1; + cubic_control[3].y += outline->points[point].y + 1; + cubic_control[3].x >>= 1; + cubic_control[3].y >>= 1; + } + } + /* r1 = 1/3 p0 + 2/3 p1 + r2 = 1/3 p2 + 2/3 p1 */ + cubic_control[1].x = (2 * outline->points[point].x + 1) / 3; + cubic_control[1].y = (2 * outline->points[point].y + 1) / 3; + cubic_control[2] = cubic_control[1]; + cubic_control[1].x += (cubic_control[0].x + 1) / 3; + cubic_control[1].y += (cubic_control[0].y + 1) / 3; + cubic_control[2].x += (cubic_control[3].x + 1) / 3; + cubic_control[2].y += (cubic_control[3].y + 1) / 3; + if (buf) + { + FTVectorToPOINTFX(&cubic_control[1], &ppc->apfx[cpfx]); + FTVectorToPOINTFX(&cubic_control[2], &ppc->apfx[cpfx+1]); + FTVectorToPOINTFX(&cubic_control[3], &ppc->apfx[cpfx+2]); + } + cpfx += 3; + point++; + } + } while (point <= outline->contours[contour] && + (outline->tags[point] & FT_Curve_Tag_On) == + (outline->tags[point-1] & FT_Curve_Tag_On)); + /* At the end of a contour Windows adds the start point, + but only for Beziers and we've already done that. + */ + if (point <= outline->contours[contour] && + outline->tags[point] & FT_Curve_Tag_On) + { + /* This is the closing pt of a bezier, but we've already + added it, so just inc point and carry on */ + point++; + } + if (buf) + { + ppc->wType = type; + ppc->cpfx = cpfx; + } + needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX); + } + if (buf) + pph->cb = needed - pph_start; + } + return needed; +} + /* * Based on WineEngGetGlyphOutline * @@ -1936,101 +2133,32 @@ case GGO_NATIVE: { - int contour, point = 0, first_pt; FT_Outline *outline = &ft_face->glyph->outline; - TTPOLYGONHEADER *pph; - TTPOLYCURVE *ppc; - DWORD pph_start, cpfx, type; if (cjBuf == 0) pvBuf = NULL; /* This is okay, need cjBuf to allocate. */ IntLockFreeType; if (needsTransform && pvBuf) FT_Outline_Transform(outline, &transMat); - for (contour = 0; contour < outline->n_contours; contour++) - { - pph_start = needed; - pph = (TTPOLYGONHEADER *)((char *)pvBuf + needed); - first_pt = point; - if (pvBuf) - { - pph->dwType = TT_POLYGON_TYPE; - FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart); - } - needed += sizeof(*pph); - point++; - while (point <= outline->contours[contour]) - { - ppc = (TTPOLYCURVE *)((char *)pvBuf + needed); - type = (outline->tags[point] & FT_Curve_Tag_On) ? - TT_PRIM_LINE : TT_PRIM_QSPLINE; - cpfx = 0; - do - { - if (pvBuf) - FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); - cpfx++; - point++; - } - while (point <= outline->contours[contour] && - (outline->tags[point] & FT_Curve_Tag_On) == - (outline->tags[point-1] & FT_Curve_Tag_On)); - - /* At the end of a contour Windows adds the start point, but - only for Beziers */ - if (point > outline->contours[contour] && - !(outline->tags[point-1] & FT_Curve_Tag_On)) - { - if (pvBuf) - FTVectorToPOINTFX(&outline->points[first_pt], &ppc->apfx[cpfx]); - cpfx++; - } - else if (point <= outline->contours[contour] && - outline->tags[point] & FT_Curve_Tag_On) - { - /* Add closing pt for bezier */ - if (pvBuf) - FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); - cpfx++; - point++; - } - if (pvBuf) - { - ppc->wType = type; - ppc->cpfx = cpfx; - } - needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX); - } - if (pvBuf) pph->cb = needed - pph_start; - } + needed = get_native_glyph_outline(outline, cjBuf, NULL); + + if (!pvBuf || !cjBuf) + { + IntUnLockFreeType; + break; + } + if (needed > cjBuf) + { + IntUnLockFreeType; + return GDI_ERROR; + } + get_native_glyph_outline(outline, cjBuf, pvBuf); IntUnLockFreeType; break; } case GGO_BEZIER: { - /* Convert the quadratic Beziers to cubic Beziers. - The parametric eqn for a cubic Bezier is, from PLRM: - r(t) = at^3 + bt^2 + ct + r0 - with the control points: - r1 = r0 + c/3 - r2 = r1 + (c + b)/3 - r3 = r0 + c + b + a - - A quadratic Beizer has the form: - p(t) = (1-t)^2 p0 + 2(1-t)t p1 + t^2 p2 - - So equating powers of t leads to: - r1 = 2/3 p1 + 1/3 p0 - r2 = 2/3 p1 + 1/3 p2 - and of course r0 = p0, r3 = p2 - */ - - int contour, point = 0, first_pt; FT_Outline *outline = &ft_face->glyph->outline; - TTPOLYGONHEADER *pph; - TTPOLYCURVE *ppc; - DWORD pph_start, cpfx, type; - FT_Vector cubic_control[4]; if (cjBuf == 0) pvBuf = NULL; if (needsTransform && pvBuf) @@ -2039,102 +2167,14 @@ FT_Outline_Transform(outline, &transMat); IntUnLockFreeType; } - - for (contour = 0; contour < outline->n_contours; contour++) - { - pph_start = needed; - pph = (TTPOLYGONHEADER *)((char *)pvBuf + needed); - first_pt = point; - if (pvBuf) - { - pph->dwType = TT_POLYGON_TYPE; - FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart); - } - needed += sizeof(*pph); - point++; - while (point <= outline->contours[contour]) - { - ppc = (TTPOLYCURVE *)((char *)pvBuf + needed); - type = (outline->tags[point] & FT_Curve_Tag_On) ? - TT_PRIM_LINE : TT_PRIM_CSPLINE; - cpfx = 0; - do - { - if (type == TT_PRIM_LINE) - { - if (pvBuf) - FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); - cpfx++; - point++; - } - else - { - /* Unlike QSPLINEs, CSPLINEs always have their endpoint - so cpfx = 3n */ - - /* FIXME: Possible optimization in endpoint calculation - if there are two consecutive curves */ - cubic_control[0] = outline->points[point-1]; - if (!(outline->tags[point-1] & FT_Curve_Tag_On)) - { - cubic_control[0].x += outline->points[point].x + 1; - cubic_control[0].y += outline->points[point].y + 1; - cubic_control[0].x >>= 1; - cubic_control[0].y >>= 1; - } - if (point+1 > outline->contours[contour]) - cubic_control[3] = outline->points[first_pt]; - else - { - cubic_control[3] = outline->points[point+1]; - if (!(outline->tags[point+1] & FT_Curve_Tag_On)) - { - cubic_control[3].x += outline->points[point].x + 1; - cubic_control[3].y += outline->points[point].y + 1; - cubic_control[3].x >>= 1; - cubic_control[3].y >>= 1; - } - } - /* r1 = 1/3 p0 + 2/3 p1 - r2 = 1/3 p2 + 2/3 p1 */ - cubic_control[1].x = (2 * outline->points[point].x + 1) / 3; - cubic_control[1].y = (2 * outline->points[point].y + 1) / 3; - cubic_control[2] = cubic_control[1]; - cubic_control[1].x += (cubic_control[0].x + 1) / 3; - cubic_control[1].y += (cubic_control[0].y + 1) / 3; - cubic_control[2].x += (cubic_control[3].x + 1) / 3; - cubic_control[2].y += (cubic_control[3].y + 1) / 3; - if (pvBuf) - { - FTVectorToPOINTFX(&cubic_control[1], &ppc->apfx[cpfx]); - FTVectorToPOINTFX(&cubic_control[2], &ppc->apfx[cpfx+1]); - FTVectorToPOINTFX(&cubic_control[3], &ppc->apfx[cpfx+2]); - } - cpfx += 3; - point++; - } - } - while (point <= outline->contours[contour] && - (outline->tags[point] & FT_Curve_Tag_On) == - (outline->tags[point-1] & FT_Curve_Tag_On)); - /* At the end of a contour Windows adds the start point, - but only for Beziers and we've already done that. */ - if (point <= outline->contours[contour] && - outline->tags[point] & FT_Curve_Tag_On) - { - /* This is the closing pt of a bezier, but we've already - added it, so just inc point and carry on */ - point++; - } - if (pvBuf) - { - ppc->wType = type; - ppc->cpfx = cpfx; - } - needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX); - } - if (pvBuf) pph->cb = needed - pph_start; - } + needed = get_bezier_glyph_outline(outline, cjBuf, NULL); + + if (!pvBuf || !cjBuf) + break; + if (needed > cjBuf) + return GDI_ERROR; + + get_bezier_glyph_outline(outline, cjBuf, pvBuf); break; }

1 0

[aandrejevic] 64656: [FAST486] Update the copyright year. Implement the first batch of FPU instructions. These are still experimental.
by aandrejevic＠svn.reactos.org 10 Oct '14

10 Oct '14

Author: aandrejevic Date: Fri Oct 10 23:07:14 2014 New Revision: 64656 URL: http://svn.reactos.org/svn/reactos?rev=64656&view=rev Log: [FAST486] Update the copyright year. Implement the first batch of FPU instructions. These are still experimental. Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/common.h trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/extraops.c trunk/reactos/lib/fast486/extraops.h trunk/reactos/lib/fast486/fast486.c trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h trunk/reactos/lib/fast486/opcodes.c trunk/reactos/lib/fast486/opcodes.h trunk/reactos/lib/fast486/opgroups.c trunk/reactos/lib/fast486/opgroups.h Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * fast486.h * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -90,6 +90,8 @@ #define FAST486_PREFIX_LOCK (1 << 3) #define FAST486_PREFIX_REPNZ (1 << 4) #define FAST486_PREFIX_REP (1 << 5) + +#define FAST486_FPU_DEFAULT_CONTROL 0x037F struct _FAST486_STATE; typedef struct _FAST486_STATE FAST486_STATE, *PFAST486_STATE; @@ -420,6 +422,7 @@ { ULONGLONG Mantissa; USHORT Exponent; + UCHAR Sign; } FAST486_FPU_DATA_REG, *PFAST486_FPU_DATA_REG; typedef union _FAST486_FPU_STATUS_REG @@ -490,10 +493,12 @@ FAST486_INT_STATUS IntStatus; UCHAR PendingIntNum; PULONG Tlb; +#ifndef FAST486_NO_FPU FAST486_FPU_DATA_REG FpuRegisters[FAST486_NUM_FPU_REGS]; FAST486_FPU_STATUS_REG FpuStatus; FAST486_FPU_CONTROL_REG FpuControl; USHORT FpuTag; +#endif }; /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * common.c * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/reactos/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.h?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.h [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * common.h * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * common.inl * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,6 +20,7 @@ */ #include "common.h" +#include "fpu.h" /* PUBLIC FUNCTIONS ***********************************************************/ @@ -1330,4 +1331,76 @@ return TRUE; } +#ifndef FAST486_NO_FPU + +FORCEINLINE +VOID +Fast486FpuNormalize(PFAST486_STATE State, PFAST486_FPU_DATA_REG Data) +{ + UINT LeadingZeros = 0; + + if (FPU_IS_NORMALIZED(Data)) return; + if (FPU_IS_ZERO(Data)) + { + Data->Exponent = 0; + return; + } + + /* Count the leading zeros */ + while (!(Data->Mantissa & (1 << (63 - LeadingZeros)))) LeadingZeros++; + + if (LeadingZeros < Data->Exponent) + { + Data->Mantissa <<= LeadingZeros; + Data->Exponent -= LeadingZeros; + } + else + { + /* Make it denormalized */ + Data->Mantissa <<= Data->Exponent - 1; + Data->Exponent = 1; + + /* Underflow */ + State->FpuStatus.Ue = TRUE; + } +} + +FORCEINLINE +USHORT +Fast486GetValueTag(PFAST486_FPU_DATA_REG Data) +{ + if (FPU_IS_ZERO(Data)) return FPU_TAG_ZERO; + else if (FPU_IS_NAN(Data)) return FPU_TAG_SPECIAL; + else return FPU_TAG_VALID; +} + +FORCEINLINE +VOID +Fast486FpuPush(PFAST486_STATE State, + PFAST486_FPU_DATA_REG Data) +{ + State->FpuStatus.Top--; + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + FPU_ST(0) = *Data; + FPU_SET_TAG(0, Fast486GetValueTag(Data)); + } + else State->FpuStatus.Ie = TRUE; +} + +FORCEINLINE +VOID +Fast486FpuPop(PFAST486_STATE State) +{ + if (FPU_GET_TAG(0) != FPU_TAG_EMPTY) + { + FPU_SET_TAG(0, FPU_TAG_EMPTY); + State->FpuStatus.Top++; + } + else State->FpuStatus.Ie = TRUE; +} + +#endif + /* EOF */ Modified: trunk/reactos/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/extraops.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/extraops.c [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * extraops.c * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/reactos/lib/fast486/extraops.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.h?rev… ============================================================================== --- trunk/reactos/lib/fast486/extraops.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/extraops.h [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * extraops.h * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * fast486.c * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -282,6 +282,11 @@ #ifndef FAST486_NO_FPU /* Initialize CR0 */ State->ControlRegisters[FAST486_REG_CR0] |= FAST486_CR0_ET; + + /* Initialize the FPU control and tag registers */ + State->FpuControl.Value = FAST486_FPU_DEFAULT_CONTROL; + State->FpuStatus.Value = 0; + State->FpuTag = 0xFFFF; #endif /* Restore the callbacks and TLB */ Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6465… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * fpu.c * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -28,12 +28,416 @@ #include <fast486.h> #include "common.h" -#include "opcodes.h" #include "fpu.h" +/* PRIVATE FUNCTIONS **********************************************************/ + +static ULONGLONG UnsignedMult128(ULONGLONG Multiplicand, + ULONGLONG Multiplier, + ULONGLONG *HighProduct) +{ + ULONG MultiplicandLow, MultiplicandHigh, MultiplierLow, MultiplierHigh; + ULONG IntermediateLow, IntermediateHigh; + ULONGLONG LowProduct, Intermediate, Intermediate1, Intermediate2; + + MultiplicandLow = (ULONG)(Multiplicand & 0xFFFFFFFFULL); + MultiplicandHigh = (ULONG)(Multiplicand >> 32); + MultiplierLow = (ULONG)(Multiplier & 0xFFFFFFFFULL); + MultiplierHigh = (ULONG)(Multiplier >> 32); + + LowProduct = (ULONGLONG)MultiplicandLow * (ULONGLONG)MultiplierLow; + Intermediate1 = (ULONGLONG)MultiplicandLow * (ULONGLONG)MultiplierHigh; + Intermediate2 = (ULONGLONG)MultiplicandHigh * (ULONGLONG)MultiplierLow; + *HighProduct = (ULONGLONG)MultiplicandHigh * (ULONGLONG)MultiplierHigh; + + Intermediate = Intermediate1 + Intermediate2; + if (Intermediate < Intermediate1) *HighProduct += 1ULL << 32; + + IntermediateLow = (ULONG)(Intermediate & 0xFFFFFFFFULL); + IntermediateHigh = (ULONG)(Intermediate >> 32); + + LowProduct += (ULONGLONG)IntermediateLow << 32; + if ((ULONG)(LowProduct >> 32) < IntermediateLow) (*HighProduct)++; + + *HighProduct += IntermediateHigh; + return LowProduct; +} + +static VOID Fast486FpuGetSingleReal(PFAST486_STATE State, + ULONG Value, + PFAST486_FPU_DATA_REG Result) +{ + /* Extract the sign, exponent and mantissa */ + Result->Sign = (UCHAR)(Value >> 31); + Result->Exponent = (USHORT)((Value >> 23) & 0xFF); + Result->Mantissa = (((ULONGLONG)Value & 0x7FFFFFULL) | 0x800000ULL) << 40; + + /* If this is a zero, we're done */ + if (Value == 0) return; + + if (Result->Exponent == 0xFF) Result->Exponent = FPU_MAX_EXPONENT + 1; + else + { + /* Adjust the exponent bias */ + Result->Exponent += (FPU_REAL10_BIAS - FPU_REAL4_BIAS); + } +} + +static VOID Fast486FpuGetDoubleReal(PFAST486_STATE State, + ULONGLONG Value, + PFAST486_FPU_DATA_REG Result) +{ + /* Extract the sign, exponent and mantissa */ + Result->Sign = (UCHAR)(Value >> 63); + Result->Exponent = (USHORT)((Value >> 52) & 0x7FF); + Result->Mantissa = (((ULONGLONG)Value & 0xFFFFFFFFFFFFFULL) | 0x10000000000000ULL) << 11; + + /* If this is a zero, we're done */ + if (Value == 0) return; + + if (Result->Exponent == 0x3FF) Result->Exponent = FPU_MAX_EXPONENT + 1; + else + { + /* Adjust the exponent bias */ + Result->Exponent += (FPU_REAL10_BIAS - FPU_REAL8_BIAS); + } +} + +static VOID Fast486FpuAdd(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) +{ + FAST486_FPU_DATA_REG FirstAdjusted = *FirstOperand; + FAST486_FPU_DATA_REG SecondAdjusted = *SecondOperand; + FAST486_FPU_DATA_REG TempResult; + + if (!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand)) + { + /* Denormalized */ + State->FpuStatus.De = TRUE; + } + + /* Find the largest exponent */ + TempResult.Exponent = max(FirstOperand->Exponent, SecondOperand->Exponent); + + /* Adjust the first operand to it */ + if (FirstAdjusted.Exponent < TempResult.Exponent) + { + FirstAdjusted.Mantissa >>= (TempResult.Exponent - FirstAdjusted.Exponent); + FirstAdjusted.Exponent = TempResult.Exponent; + } + + /* ... and the second one too */ + if (SecondAdjusted.Exponent < TempResult.Exponent) + { + SecondAdjusted.Mantissa >>= (TempResult.Exponent - SecondAdjusted.Exponent); + SecondAdjusted.Exponent = TempResult.Exponent; + } + + if (FirstAdjusted.Sign == SecondAdjusted.Sign) + { + /* Calculate the mantissa and sign of the result */ + TempResult.Mantissa = FirstAdjusted.Mantissa + SecondAdjusted.Mantissa; + TempResult.Sign = FirstAdjusted.Sign; + } + else + { + /* Calculate the sign of the result */ + if (FirstAdjusted.Mantissa > SecondAdjusted.Mantissa) TempResult.Sign = FirstAdjusted.Sign; + else if (FirstAdjusted.Mantissa < SecondAdjusted.Mantissa) TempResult.Sign = SecondAdjusted.Sign; + else TempResult.Sign = FALSE; + + /* Invert the negative mantissa */ + if (FirstAdjusted.Sign) FirstAdjusted.Mantissa = -FirstAdjusted.Mantissa; + if (SecondAdjusted.Sign) SecondAdjusted.Mantissa = -SecondAdjusted.Mantissa; + + /* Calculate the mantissa of the result */ + TempResult.Mantissa = FirstAdjusted.Mantissa + SecondAdjusted.Mantissa; + } + + /* Did it overflow? */ + if (FPU_IS_NORMALIZED(&FirstAdjusted) && FPU_IS_NORMALIZED(&SecondAdjusted)) + { + if (TempResult.Exponent == FPU_MAX_EXPONENT) + { + /* Total overflow, return infinity */ + TempResult.Mantissa = FPU_MANTISSA_HIGH_BIT; + TempResult.Exponent = FPU_MAX_EXPONENT + 1; + + /* Update flags */ + State->FpuStatus.Oe = TRUE; + } + else + { + /* Lose the LSB in favor of the carry */ + TempResult.Mantissa >>= 1; + TempResult.Mantissa |= FPU_MANTISSA_HIGH_BIT; + TempResult.Exponent++; + } + } + + /* Normalize the result and return it */ + Fast486FpuNormalize(State, &TempResult); + *Result = TempResult; +} + +static VOID Fast486FpuSubtract(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) +{ + FAST486_FPU_DATA_REG NegativeSecondOperand = *SecondOperand; + + /* Invert the sign */ + NegativeSecondOperand.Sign = !NegativeSecondOperand.Sign; + + /* And perform an addition instead */ + Fast486FpuAdd(State, Result, FirstOperand, &NegativeSecondOperand); +} + +static VOID Fast486FpuCompare(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand) +{ + if (FPU_IS_NAN(FirstOperand) || FPU_IS_NAN(SecondOperand)) + { + if (FPU_IS_POS_INF(FirstOperand) && FPU_IS_NEG_INF(SecondOperand)) + { + State->FpuStatus.Code0 = FALSE; + State->FpuStatus.Code2 = FALSE; + State->FpuStatus.Code3 = FALSE; + } + else if (FPU_IS_NEG_INF(FirstOperand) && FPU_IS_POS_INF(SecondOperand)) + { + State->FpuStatus.Code0 = TRUE; + State->FpuStatus.Code2 = FALSE; + State->FpuStatus.Code3 = FALSE; + } + else + { + State->FpuStatus.Code0 = TRUE; + State->FpuStatus.Code2 = TRUE; + State->FpuStatus.Code3 = TRUE; + } + } + else + { + FAST486_FPU_DATA_REG TempResult; + + Fast486FpuSubtract(State, FirstOperand, SecondOperand, &TempResult); + + if (FPU_IS_ZERO(&TempResult)) + { + State->FpuStatus.Code0 = FALSE; + State->FpuStatus.Code2 = FALSE; + State->FpuStatus.Code3 = TRUE; + } + else if (TempResult.Sign) + { + State->FpuStatus.Code0 = TRUE; + State->FpuStatus.Code2 = FALSE; + State->FpuStatus.Code3 = FALSE; + } + else + { + State->FpuStatus.Code0 = FALSE; + State->FpuStatus.Code2 = FALSE; + State->FpuStatus.Code3 = FALSE; + } + } +} + +static VOID Fast486FpuMultiply(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) +{ + FAST486_FPU_DATA_REG TempResult; + + if (!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand)) + { + /* Denormalized */ + State->FpuStatus.De = TRUE; + } + + UnsignedMult128(FirstOperand->Mantissa, + SecondOperand->Mantissa, + &TempResult.Mantissa); + + TempResult.Exponent = FirstOperand->Exponent + SecondOperand->Exponent; + TempResult.Sign = FirstOperand->Sign ^ SecondOperand->Sign; + + /* Normalize the result */ + Fast486FpuNormalize(State, &TempResult); + *Result = TempResult; +} + +static VOID Fast486FpuDivide(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) +{ + FAST486_FPU_DATA_REG TempResult; + + if (FPU_IS_ZERO(SecondOperand)) + { + /* Division by zero */ + State->FpuStatus.Ze = TRUE; + return; + } + + TempResult.Exponent = FirstOperand->Exponent - SecondOperand->Exponent; + TempResult.Sign = FirstOperand->Sign ^ SecondOperand->Sign; + + // TODO: NOT IMPLEMENTED + UNREFERENCED_PARAMETER(TempResult); + UNIMPLEMENTED; +} + /* PUBLIC FUNCTIONS ***********************************************************/ -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD8) +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD8DC) +{ + FAST486_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + PFAST486_FPU_DATA_REG SourceOperand, DestOperand; + FAST486_FPU_DATA_REG MemoryData; + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + FPU_CHECK(); + +#ifndef FAST486_NO_FPU + + if (ModRegRm.Memory) + { + /* Load the source operand from memory */ + + if (Opcode == 0xDC) + { + ULONGLONG Value; + + if (!Fast486ReadMemory(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? State->SegmentOverride : FAST486_REG_DS, + ModRegRm.MemoryAddress, + FALSE, + &Value, + sizeof(ULONGLONG))) + { + /* Exception occurred */ + return FALSE; + } + + Fast486FpuGetDoubleReal(State, Value, &MemoryData); + } + else + { + ULONG Value; + + if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, NULL, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + Fast486FpuGetSingleReal(State, Value, &MemoryData); + } + + SourceOperand = &MemoryData; + } + else + { + /* Load the source operand from an FPU register */ + SourceOperand = &FPU_ST(ModRegRm.SecondRegister); + + if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) + { + /* Invalid operation */ + State->FpuStatus.Ie = TRUE; + return FALSE; + } + } + + /* The destination operand is always ST0 */ + DestOperand = &FPU_ST(0); + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + /* Invalid operation */ + State->FpuStatus.Ie = TRUE; + return FALSE; + } + + /* Check the operation */ + switch (ModRegRm.Register) + { + /* FADD */ + case 0: + { + Fast486FpuAdd(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FMUL */ + case 1: + { + Fast486FpuMultiply(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FCOM */ + case 2: + /* FCOMP */ + case 3: + { + Fast486FpuCompare(State, DestOperand, SourceOperand); + if (ModRegRm.Register == 3) Fast486FpuPop(State); + + break; + } + + /* FSUB */ + case 4: + { + Fast486FpuSubtract(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FSUBR */ + case 5: + { + Fast486FpuSubtract(State, SourceOperand, DestOperand, DestOperand); + break; + } + + /* FDIV */ + case 6: + { + Fast486FpuDivide(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FDIVR */ + case 7: + { + Fast486FpuDivide(State, SourceOperand, DestOperand, DestOperand); + break; + } + } + +#endif + + return TRUE; +} + +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD9) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; @@ -58,7 +462,7 @@ #endif } -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD9) +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDA) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; @@ -83,7 +487,84 @@ #endif } -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDA) +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDB) +{ + FAST486_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + FPU_CHECK(); + +#ifndef FAST486_NO_FPU + + if (ModRegRm.Memory) + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + } + else + { + /* Only a few of these instructions have any meaning on a 487 */ + switch ((ModRegRm.SecondRegister << 3) | ModRegRm.Register) + { + /* FCLEX */ + case 0x22: + { + /* Clear exception data */ + State->FpuStatus.Ie = + State->FpuStatus.De = + State->FpuStatus.Ze = + State->FpuStatus.Oe = + State->FpuStatus.Ue = + State->FpuStatus.Pe = + State->FpuStatus.Sf = + State->FpuStatus.Es = + State->FpuStatus.Busy = FALSE; + + break; + } + + /* FINIT */ + case 0x23: + { + /* Restore the state */ + State->FpuControl.Value = FAST486_FPU_DEFAULT_CONTROL; + State->FpuStatus.Value = 0; + State->FpuTag = 0xFFFF; + + break; + } + + /* FENI */ + case 0x20: + /* FDISI */ + case 0x21: + { + /* These do nothing */ + break; + } + + /* Invalid */ + default: + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; + } + } + } + +#endif + + return TRUE; +} + +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDD) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; @@ -108,7 +589,7 @@ #endif } -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDB) +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDE) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; @@ -133,7 +614,7 @@ #endif } -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDC) +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDF) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; @@ -158,79 +639,4 @@ #endif } -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDD) -{ - FAST486_MOD_REG_RM ModRegRm; - BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; - - /* Get the operands */ - if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) - { - /* Exception occurred */ - return FALSE; - } - - FPU_CHECK(); - -#ifndef FAST486_NO_FPU - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -#else - /* Do nothing */ - return TRUE; -#endif -} - -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDE) -{ - FAST486_MOD_REG_RM ModRegRm; - BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; - - /* Get the operands */ - if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) - { - /* Exception occurred */ - return FALSE; - } - - FPU_CHECK(); - -#ifndef FAST486_NO_FPU - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -#else - /* Do nothing */ - return TRUE; -#endif -} - -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDF) -{ - FAST486_MOD_REG_RM ModRegRm; - BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; - - /* Get the operands */ - if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) - { - /* Exception occurred */ - return FALSE; - } - - FPU_CHECK(); - -#ifndef FAST486_NO_FPU - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -#else - /* Do nothing */ - return TRUE; -#endif -} - /* EOF */ Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6465… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * fpu.h * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,6 +24,8 @@ #pragma once +#include "opcodes.h" + /* DEFINES ********************************************************************/ #define FPU_CHECK() if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_EM) \ @@ -32,6 +34,24 @@ return FALSE; \ } #define FPU_ST(i) State->FpuRegisters[(State->FpuStatus.Top + (i)) % FAST486_NUM_FPU_REGS] +#define FPU_GET_TAG(i) ((State->FpuTag >> ((i) * 2)) & 3) +#define FPU_SET_TAG(i, t) { \ + State->FpuTag &= ~((1 << ((i) * 2)) | (1 << (((i) * 2) + 1))); \ + State->FpuTag |= ((t) & 3) << ((i) * 2); \ + } + +#define FPU_REAL4_BIAS 0x7F +#define FPU_REAL8_BIAS 0x3FF +#define FPU_REAL10_BIAS 0x3FFF +#define FPU_MAX_EXPONENT 0x7FFE +#define FPU_MANTISSA_HIGH_BIT 0x8000000000000000ULL + +#define FPU_IS_NORMALIZED(x) (!FPU_IS_ZERO(x) && (((x)->Mantissa & FPU_MANTISSA_HIGH_BIT) != 0ULL)) +#define FPU_IS_ZERO(x) ((x)->Mantissa == 0ULL) +#define FPU_IS_NAN(x) ((x)->Exponent == (FPU_MAX_EXPONENT + 1)) +#define FPU_IS_INFINITY(x) (FPU_IS_NAN(x) && (x)->Mantissa & FPU_MANTISSA_HIGH_BIT) +#define FPU_IS_POS_INF(x) (FPU_IS_INFINITY(x) && !(x)->Sign) +#define FPU_IS_NEG_INF(x) (FPU_IS_INFINITY(x) && (x)->Sign) enum { @@ -48,11 +68,10 @@ FPU_TAG_EMPTY = 3 }; -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD8); +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD8DC); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD9); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDA); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDB); -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDC); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDD); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDE); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDF); Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * opcodes.c * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -254,11 +254,11 @@ Fast486OpcodeAad, Fast486OpcodeSalc, Fast486OpcodeXlat, - Fast486FpuOpcodeD8, + Fast486FpuOpcodeD8DC, Fast486FpuOpcodeD9, Fast486FpuOpcodeDA, Fast486FpuOpcodeDB, - Fast486FpuOpcodeDC, + Fast486FpuOpcodeD8DC, Fast486FpuOpcodeDD, Fast486FpuOpcodeDE, Fast486FpuOpcodeDF, Modified: trunk/reactos/lib/fast486/opcodes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.h?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.h [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * opcodes.h * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/reactos/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * opgroups.c * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/reactos/lib/fast486/opgroups.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.h?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.h [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * opgroups.h * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License

1 0

[akhaldi] 64655: [MSIEXEC] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 10 Oct '14

10 Oct '14

Author: akhaldi Date: Fri Oct 10 11:41:31 2014 New Revision: 64655 URL: http://svn.reactos.org/svn/reactos?rev=64655&view=rev Log: [MSIEXEC] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/base/system/msiexec/msiexec.c trunk/reactos/base/system/msiexec/service.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/system/msiexec/msiexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== --- trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] Fri Oct 10 11:41:31 2014 @@ -418,11 +418,12 @@ { enum chomp_state state = cs_token; WCHAR *p, *out; - int count = 1, ignore; + int count = 1; + BOOL ignore; for( p = str, out = str; *p; p++ ) { - ignore = 1; + ignore = TRUE; switch( state ) { case cs_whitespace: @@ -436,7 +437,7 @@ break; default: count++; - ignore = 0; + ignore = FALSE; state = cs_token; } break; @@ -452,7 +453,7 @@ *out++ = 0; break; default: - ignore = 0; + ignore = FALSE; } break; @@ -463,7 +464,7 @@ state = cs_token; break; default: - ignore = 0; + ignore = FALSE; } break; } @@ -626,6 +627,7 @@ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; StringListAppend(&property_list, ActionAdmin); + WINE_FIXME("Administrative installs are not currently supported\n"); } else if(msi_option_prefix(argvW[i], "f")) { @@ -906,13 +908,18 @@ } else if(msi_strequal(argvW[i]+2, "b+!")) { - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; - WINE_FIXME("Unknown modifier: !\n"); + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG|INSTALLUILEVEL_HIDECANCEL; + } + else if(msi_strequal(argvW[i]+2, "b-!")) + { + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL; } else if(msi_strequal(argvW[i]+2, "b!")) { - InstallUILevel = INSTALLUILEVEL_BASIC; - WINE_FIXME("Unknown modifier: !\n"); + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_HIDECANCEL; } else { Modified: trunk/reactos/base/system/msiexec/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/servic… ============================================================================== --- trunk/reactos/base/system/msiexec/service.c [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/service.c [iso-8859-1] Fri Oct 10 11:41:31 2014 @@ -73,6 +73,8 @@ static void WINAPI ServiceCtrlHandler(DWORD code) { + DWORD state = SERVICE_RUNNING; + WINE_TRACE("%u\n", code); switch (code) @@ -81,21 +83,19 @@ case SERVICE_CONTROL_STOP: UpdateSCMStatus(SERVICE_STOP_PENDING, NO_ERROR, 0); KillService(); - return; + state = SERVICE_STOPPED; + break; default: fprintf(stderr, "Unhandled service control code: %u\n", code); break; } - UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); + UpdateSCMStatus(state, NO_ERROR, 0); } static DWORD WINAPI ServiceExecutionThread(LPVOID param) { - while (TRUE) - { - /* do nothing */ - } + WaitForSingleObject(kill_event, INFINITE); return 0; } @@ -130,12 +130,14 @@ { fprintf(stderr, "Failed to create event\n"); KillService(); + UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); return; } if (!StartServiceThread()) { KillService(); + UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); return; } @@ -143,6 +145,8 @@ WaitForSingleObject(kill_event, INFINITE); KillService(); + + UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); } DWORD DoService(void) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Oct 10 11:41:31 2014 @@ -246,7 +246,7 @@ reactos/base/applications/wordpad # Synced to Wine-1.7.9 reactos/base/services/rpcss # Synced to Wine-1.7.27 reactos/base/system/expand # Synced to Wine-1.7.1 -reactos/base/system/msiexec # Synced to Wine-1.7.1 +reactos/base/system/msiexec # Synced to Wine-1.7.27 reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported

1 0

[akhaldi] 64654: [RPCSS] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 10 Oct '14

10 Oct '14

Author: akhaldi Date: Fri Oct 10 11:38:00 2014 New Revision: 64654 URL: http://svn.reactos.org/svn/reactos?rev=64654&view=rev Log: [RPCSS] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/base/services/rpcss/epm.idl trunk/reactos/base/services/rpcss/irot.idl trunk/reactos/base/services/rpcss/rpcss_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/services/rpcss/epm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/epm.id… ============================================================================== --- trunk/reactos/base/services/rpcss/epm.idl [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/epm.idl [iso-8859-1] Fri Oct 10 11:38:00 2014 @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep server + #include "wine/epm.idl" Modified: trunk/reactos/base/services/rpcss/irot.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irot.i… ============================================================================== --- trunk/reactos/base/services/rpcss/irot.idl [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/irot.idl [iso-8859-1] Fri Oct 10 11:38:00 2014 @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep server + #include "wine/irot.idl" Modified: trunk/reactos/base/services/rpcss/rpcss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] Fri Oct 10 11:38:00 2014 @@ -94,8 +94,11 @@ if (status != RPC_S_OK) goto fail; - //exit_event = __wine_make_process_system(); +#ifndef __REACTOS__ + exit_event = __wine_make_process_system(); +#else exit_event = CreateEventW(NULL, FALSE, FALSE, NULL); // never fires +#endif return TRUE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Oct 10 11:38:00 2014 @@ -244,7 +244,7 @@ reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to Wine-1.7.27 reactos/base/applications/wordpad # Synced to Wine-1.7.9 -reactos/base/services/rpcss # Synced to Wine-1.7.1 +reactos/base/services/rpcss # Synced to Wine-1.7.27 reactos/base/system/expand # Synced to Wine-1.7.1 reactos/base/system/msiexec # Synced to Wine-1.7.1 reactos/modules/rosapps/winfile # Autosync

1 0

[akhaldi] 64653: [WINHLP32] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 10 Oct '14

10 Oct '14

Author: akhaldi Date: Fri Oct 10 11:18:49 2014 New Revision: 64653 URL: http://svn.reactos.org/svn/reactos?rev=64653&view=rev Log: [WINHLP32] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/base/applications/winhlp32/hlpfile.c trunk/reactos/base/applications/winhlp32/hlpfile.h trunk/reactos/base/applications/winhlp32/lang/Bg.rc trunk/reactos/base/applications/winhlp32/lang/Cs.rc trunk/reactos/base/applications/winhlp32/lang/Da.rc trunk/reactos/base/applications/winhlp32/lang/De.rc trunk/reactos/base/applications/winhlp32/lang/En.rc trunk/reactos/base/applications/winhlp32/lang/Es.rc trunk/reactos/base/applications/winhlp32/lang/Fi.rc trunk/reactos/base/applications/winhlp32/lang/Fr.rc trunk/reactos/base/applications/winhlp32/lang/He.rc trunk/reactos/base/applications/winhlp32/lang/Hu.rc trunk/reactos/base/applications/winhlp32/lang/It.rc trunk/reactos/base/applications/winhlp32/lang/Ja.rc trunk/reactos/base/applications/winhlp32/lang/Ko.rc trunk/reactos/base/applications/winhlp32/lang/Lt.rc trunk/reactos/base/applications/winhlp32/lang/Nl.rc trunk/reactos/base/applications/winhlp32/lang/No.rc trunk/reactos/base/applications/winhlp32/lang/Pl.rc trunk/reactos/base/applications/winhlp32/lang/Pt.rc trunk/reactos/base/applications/winhlp32/lang/Rm.rc trunk/reactos/base/applications/winhlp32/lang/Ro.rc trunk/reactos/base/applications/winhlp32/lang/Ru.rc trunk/reactos/base/applications/winhlp32/lang/Si.rc trunk/reactos/base/applications/winhlp32/lang/Sk.rc trunk/reactos/base/applications/winhlp32/lang/Sq.rc trunk/reactos/base/applications/winhlp32/lang/Sr.rc trunk/reactos/base/applications/winhlp32/lang/Sv.rc trunk/reactos/base/applications/winhlp32/lang/Tr.rc trunk/reactos/base/applications/winhlp32/lang/Uk.rc trunk/reactos/base/applications/winhlp32/lang/Zh.rc trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/applications/winhlp32/rsrc.rc trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/winhlp32/winhelp_res.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/winhlp32/hlpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/hlpfile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Rm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/winhelp_res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 64652: [XCOPY] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 10 Oct '14

10 Oct '14

Author: akhaldi Date: Fri Oct 10 11:17:12 2014 New Revision: 64652 URL: http://svn.reactos.org/svn/reactos?rev=64652&view=rev Log: [XCOPY] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/De.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/En.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Es.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Fr.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/It.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ja.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ko.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Lt.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Nl.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ro.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ru.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Si.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Sq.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Sr.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Sv.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Uk.rc trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,26 +1,27 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE -BEGIN - STRING_INVPARMS "Ugyldigt antal parametere; brug «xcopy /?» for hjelp\n" - STRING_INVPARM "Ugyldigt parameter «%1»; brug «xcopy /?» for hjelp\n" - STRING_PAUSE "Tryk Enter for at begynde at kopiere\n" - STRING_SIMCOPY "%1!d! fil(er) vil blive kopieret\n" - STRING_COPY "%1!d! fil(er) kopieret\n" - STRING_QISDIR "Er «%1» et filnavn eller katalog\n\ +{ + STRING_INVPARMS, "Ugyldigt antal parametere; brug «xcopy /?» for hjelp\n" + STRING_INVPARM, "Ugyldigt parameter «%1»; brug «xcopy /?» for hjelp\n" + STRING_PAUSE, "Tryk Enter for at begynde at kopiere\n" + STRING_SIMCOPY, "%1!d! fil(er) vil blive kopieret\n" + STRING_COPY, "%1!d! fil(er) kopieret\n" + STRING_QISDIR, "Er «%1» et filnavn eller katalog\n\ på destinationen?\n\ (F - Fil, K - Katalog)\n" - STRING_SRCPROMPT "%1? (Ja|Nei)\n" - STRING_OVERWRITE "Overskrive «%1»? (Ja|Nei|Alle)\n" - STRING_COPYFAIL "Kunne ikke kopiere «%1» til «%2»; fejlet med r/c %3!d!\n" - STRING_OPENFAIL "Kunne ikke åbne «%1»\n" - STRING_READFAIL "Kunne ikke læse «%1»\n" - STRING_YES_CHAR "J" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "A" - STRING_FILE_CHAR "F" - STRING_DIR_CHAR "K" - STRING_HELP + STRING_SRCPROMPT, "%1? (Ja|Nei)\n" + STRING_OVERWRITE, "Overskrive «%1»? (Ja|Nei|Alle)\n" + STRING_COPYFAIL, "Kunne ikke kopiere «%1» til «%2»; fejlet med r/c %3!d!\n" + STRING_OPENFAIL, "Kunne ikke åbne «%1»\n" + STRING_READFAIL, "Kunne ikke læse «%1»\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "K" + + STRING_HELP, "XCOPY - Kopierer filer eller katalogtre til en målplassering\n\ \n\ Syntaks:\n\ @@ -28,8 +29,9 @@ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ hvor:\n\ +\n\ [/I] Antag at destinationen er et katalog hvis destinationen ikke\n\ - \tfindes og 2 eller flere filer bliver kopieret\n\ +\tfindes og 2 eller flere filer bliver kopieret\n\ [/S] Kopier kataloger og underkataloger\n\ [/E] Kopier kataloger og underkataloger, også tomme kataloger\n\ [/Q] Vær stille : vis ikke filnavne under kopiering\n\ @@ -48,7 +50,8 @@ [/A] Kopier ikke filer som er markeret som arkiv\n\ [/M] Kopier kun filer som er markeret som akriv; fjerner denne markering\n\ [/D | /D:m-d-å] Kopier kun nye filer eller dem som er ændret efter\n\ - \t\tden opgivne dato.\n\ - \t\tHvis ingen dato opgives kopieres kun de filer hvor\n\ - \t\tdestinationen er ældre end kilden\n\n" -END +\t\tden opgivne dato.\n\ +\t\tHvis ingen dato opgives kopieres kun de filer hvor\n\ +\t\tdestinationen er ældre end kilden\n\n" + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/De.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,26 +1,27 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE -BEGIN - STRING_INVPARMS "Falsche Parameteranzahl - xcopy /? zeigt Hilfe an\n" - STRING_INVPARM "Unbekannter Parameter '%1' - xcopy /? zeigt Hilfe an\n" - STRING_PAUSE "Eingabetaste betÃ¤tigen, um mit dem Kopieren zu beginnen\n" - STRING_SIMCOPY "%1!d! Datei(en) wÃ¼rden kopiert\n" - STRING_COPY "%1!d! Datei(en) kopiert\n" - STRING_QISDIR "Ist '%1' eine Datei oder ein Verzeichnis\n\ +{ + STRING_INVPARMS, "Falsche Parameteranzahl - xcopy /? zeigt Hilfe an\n" + STRING_INVPARM, "Unbekannter Parameter '%1' - xcopy /? zeigt Hilfe an\n" + STRING_PAUSE, "Eingabetaste betÃ¤tigen, um mit dem Kopieren zu beginnen\n" + STRING_SIMCOPY, "%1!d! Datei(en) wÃ¼rden kopiert\n" + STRING_COPY, "%1!d! Datei(en) kopiert\n" + STRING_QISDIR, "Ist '%1' eine Datei oder ein Verzeichnis\n\ am Zielsort?\n\ (D - Datei, V - Verzeichnis)\n" - STRING_SRCPROMPT "%1? (Ja|Nein)\n" - STRING_OVERWRITE "%1 Ã¼berschreiben? (Ja|Nein|Alle)\n" - STRING_COPYFAIL "Kopieren von '%1' nach '%2' fehlgeschlagen. Fehlernummer: %3!d!\n" - STRING_OPENFAIL "Fehler beim Ãffnen von '%1'\n" - STRING_READFAIL "Fehler beim Lesen von '%1'\n" - STRING_YES_CHAR "J" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "A" - STRING_FILE_CHAR "D" - STRING_DIR_CHAR "V" - STRING_HELP + STRING_SRCPROMPT,"%1? (Ja|Nein)\n" + STRING_OVERWRITE,"%1 Ã¼berschreiben? (Ja|Nein|Alle)\n" + STRING_COPYFAIL, "Kopieren von '%1' nach '%2' fehlgeschlagen. Fehlernummer: %3!d!\n" + STRING_OPENFAIL, "Fehler beim Ãffnen von '%1'\n" + STRING_READFAIL, "Fehler beim Lesen von '%1'\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"D" + STRING_DIR_CHAR, "V" + + STRING_HELP, "XCOPY - Kopiert Dateien oder Verzeichnisse an einen Zielort\n\ \n\ Syntax:\n\ @@ -51,4 +52,5 @@ [/D | /D:M-T-J] Kopiere neue Dateien und Dateien, die neuer als das\n\ \t\tangegebene Datum sind. Wird kein Datum angegegebn, werden nur\n\ \t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/En.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,27 +1,28 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE -BEGIN - STRING_INVPARMS "Invalid number of parameters - Use xcopy /? for help\n" - STRING_INVPARM "Invalid parameter '%1' - Use xcopy /? for help\n" - STRING_PAUSE "Press <Enter> to begin copying\n" - STRING_SIMCOPY "%1!d! file(s) would be copied\n" - STRING_COPY "%1!d! file(s) copied\n" - STRING_QISDIR "Is '%1' a filename or directory\n\ +{ + STRING_INVPARMS, "Invalid number of parameters - Use xcopy /? for help\n" + STRING_INVPARM, "Invalid parameter '%1' - Use xcopy /? for help\n" + STRING_PAUSE, "Press <Enter> to begin copying\n" + STRING_SIMCOPY, "%1!d! file(s) would be copied\n" + STRING_COPY, "%1!d! file(s) copied\n" + STRING_QISDIR, "Is '%1' a filename or directory\n\ on the target?\n\ (F - File, D - Directory)\n" - STRING_SRCPROMPT "%1? (Yes|No)\n" - STRING_OVERWRITE "Overwrite %1? (Yes|No|All)\n" - STRING_COPYFAIL "Copying of '%1' to '%2' failed with r/c %3!d!\n" - STRING_OPENFAIL "Failed to open '%1'\n" - STRING_READFAIL "Failed during reading of '%1'\n" - STRING_YES_CHAR "Y" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "A" - STRING_FILE_CHAR "F" - STRING_DIR_CHAR "D" - STRING_HELP -"XCOPY - Copies source files or directory trees to a destination\n\ + STRING_SRCPROMPT,"%1? (Yes|No)\n" + STRING_OVERWRITE,"Overwrite %1? (Yes|No|All)\n" + STRING_COPYFAIL, "Copying of '%1' to '%2' failed with r/c %3!d!\n" + STRING_OPENFAIL, "Failed to open '%1'\n" + STRING_READFAIL, "Failed during reading of '%1'\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - Copies source files or directory trees to a destination.\n\ \n\ Syntax:\n\ XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ @@ -30,26 +31,27 @@ Where:\n\ \n\ [/I] Assume directory if destination does not exist and copying two or\n\ -\tmore files\n\ -[/S] Copy directories and subdirectories\n\ -[/E] Copy directories and subdirectories, including any empty ones\n\ +\tmore files.\n\ +[/S] Copy directories and subdirectories.\n\ +[/E] Copy directories and subdirectories, including any empty ones.\n\ [/Q] Do not list names during copy, that is be quiet.\n\ -[/F] Show full source and destination names during copy\n\ -[/L] Simulate operation, showing names which would be copied\n\ -[/W] Prompts before beginning the copy operation\n\ -[/T] Creates empty directory structure but does not copy files\n\ -[/Y] Suppress prompting when overwriting files\n\ -[/-Y] Enable prompting when overwriting files\n\ -[/P] Prompts on each source file before copying\n\ -[/N] Copy using short names\n\ -[/U] Copy only files which already exist in destination\n\ -[/R] Overwrite any read only files\n\ -[/H] Include hidden and system files in the copy\n\ -[/C] Continue even if an error occurs during the copy\n\ -[/A] Only copy files with archive attribute set\n\ +[/F] Show full source and destination names during copy.\n\ +[/L] Simulate operation, showing names which would be copied.\n\ +[/W] Prompts before beginning the copy operation.\n\ +[/T] Creates empty directory structure but does not copy files.\n\ +[/Y] Suppress prompting when overwriting files.\n\ +[/-Y] Enable prompting when overwriting files.\n\ +[/P] Prompts on each source file before copying.\n\ +[/N] Copy using short names.\n\ +[/U] Copy only files which already exist in destination.\n\ +[/R] Overwrite any read only files.\n\ +[/H] Include hidden and system files in the copy.\n\ +[/C] Continue even if an error occurs during the copy.\n\ +[/A] Only copy files with archive attribute set.\n\ [/M] Only copy files with archive attribute set, removes the\n\ \tarchive attribute.\n\ [/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\ \t\tIf no date is supplied, only copy if destination is older\n\ -\t\tthan source\n\n" -END +\t\tthan source.\n\n" + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Es.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Es.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,26 +1,27 @@ LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT STRINGTABLE -BEGIN - STRING_INVPARMS "Cantidad invalido de parametros - Use xcopy /? para obtener ayuda\n" - STRING_INVPARM "Parametro invalido '%1' - Use xcopy /? para obtener ayuda\n" - STRING_PAUSE "Unde <enter> para iniciar la copia\n" - STRING_SIMCOPY "%1!d! archivo(s) seran copiado(s)\n" - STRING_COPY "%1!d! archivo(s) copiado(s)\n" - STRING_QISDIR "Es '%1' un nombre de archivo o de directorio\n\ +{ + STRING_INVPARMS, "Cantidad invalido de parametros - Use xcopy /? para obtener ayuda\n" + STRING_INVPARM, "Parametro invalido '%1' - Use xcopy /? para obtener ayuda\n" + STRING_PAUSE, "Unde <enter> para iniciar la copia\n" + STRING_SIMCOPY, "%1!d! archivo(s) seran copiado(s)\n" + STRING_COPY, "%1!d! archivo(s) copiado(s)\n" + STRING_QISDIR, "Es '%1' un nombre de archivo o de directorio\n\ en el punto de destino?\n\ (F - Archivo, D - Directorio)\n" - STRING_SRCPROMPT "%1? (Si|No)\n" - STRING_OVERWRITE "Destruir y escribir encima %1? (Si|No|Todo)\n" - STRING_COPYFAIL "La copia de '%1' a '%2' ha faillecido con r/c %3!d!\n" - STRING_OPENFAIL "Impossible de abrir '%1'\n" - STRING_READFAIL "Hubo un error durante la lectura de '%1'\n" - STRING_YES_CHAR "S" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "T" - STRING_FILE_CHAR "A" - STRING_DIR_CHAR "D" - STRING_HELP + STRING_SRCPROMPT,"%1? (Si|No)\n" + STRING_OVERWRITE,"Destruir y escribir encima %1? (Si|No|Todo)\n" + STRING_COPYFAIL, "La copia de '%1' a '%2' ha faillecido con r/c %3!d!\n" + STRING_OPENFAIL, "Impossible de abrir '%1'\n" + STRING_READFAIL, "Hubo un error durante la lectura de '%1'\n" + STRING_YES_CHAR, "S" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "T" + STRING_FILE_CHAR,"A" + STRING_DIR_CHAR, "D" + + STRING_HELP, "XCOPY - Copia los archivos o directorios fuentes a un destino\n\ \n\ Sintaxis:\n\ @@ -52,4 +53,5 @@ [/D | /D:m-d-y] Copia los nuevos archivos or los que fueront modificado despues la fecha especificada.\n\ \t\tSi la fecha no esta especificada, copia unicamente cuando el archivo de destino est mas viejo\n\ \t\tque el archivo fuente\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Fr.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,26 +1,27 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE -BEGIN - STRING_INVPARMS "Nombre invalide de paramÃ¨tres - Utilisez xcopy /? pour obtenir de l'aide\n" - STRING_INVPARM "ParamÃ¨tre invalide Â«Â %1Â Â» - Utilisez xcopy /? pour obtenir de l'aide\n" - STRING_PAUSE "Appuyez sur ENTRÃE pour dÃ©marrer la copie\n" - STRING_SIMCOPY "%1!d! fichier(s) seront copiÃ©s\n" - STRING_COPY "%1!d! fichier(s) copiÃ©s\n" - STRING_QISDIR "Â«Â %1Â Â» est-il un fichier ou un rÃ©pertoire\n\ +{ + STRING_INVPARMS, "Nombre invalide de paramÃ¨tres - Utilisez xcopy /? pour obtenir de l'aide\n" + STRING_INVPARM, "ParamÃ¨tre invalide Â«Â %1Â Â» - Utilisez xcopy /? pour obtenir de l'aide\n" + STRING_PAUSE, "Appuyez sur ENTRÃE pour dÃ©marrer la copie\n" + STRING_SIMCOPY, "%1!d! fichier(s) seront copiÃ©s\n" + STRING_COPY, "%1!d! fichier(s) copiÃ©s\n" + STRING_QISDIR, "Â«Â %1Â Â» est-il un fichier ou un rÃ©pertoire\n\ dans la destinationÂ ?\n\ (F - Fichier, R - RÃ©pertoire)\n" - STRING_SRCPROMPT "%1Â ? (Oui|Non)\n" - STRING_OVERWRITE "Ãcraser %1Â ? (Oui|Non|Tous)\n" - STRING_COPYFAIL "La copie de Â«Â %1Â Â» vers Â«Â %2Â Â» a Ã©chouÃ© avec le code de retour %3!d!\n" - STRING_OPENFAIL "Impossible d'ouvrir Â«Â %1Â Â»\n" - STRING_READFAIL "Impossible de lire Â«Â %1Â Â»\n" - STRING_YES_CHAR "O" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "T" - STRING_FILE_CHAR "F" - STRING_DIR_CHAR "R" - STRING_HELP + STRING_SRCPROMPT,"%1Â ? (Oui|Non)\n" + STRING_OVERWRITE,"Ãcraser %1Â ? (Oui|Non|Tous)\n" + STRING_COPYFAIL, "La copie de Â«Â %1Â Â» vers Â«Â %2Â Â» a Ã©chouÃ© avec le code de retour %3!d!\n" + STRING_OPENFAIL, "Impossible d'ouvrir Â«Â %1Â Â»\n" + STRING_READFAIL, "Impossible de lire Â«Â %1Â Â»\n" + STRING_YES_CHAR, "O" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "T" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "R" + + STRING_HELP, "XCOPY - Copie les fichiers ou rÃ©pertoires sources vers une destination\n\ \n\ SyntaxeÂ :\n\ @@ -52,4 +53,5 @@ [/D | /D:m-d-y] Copie uniquement les nouveaux fichiers, ou ceux modifiÃ©s aprÃ¨s la date spÃ©cifiÃ©e.\n\ \t\tSi aucune date n'est spÃ©cifiÃ©e, copie uniquement lorsque le fichier de destination est plus ancien\n\ \t\tque le fichier source\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/It.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,26 +1,27 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE -BEGIN - STRING_INVPARMS "Numero non valido di parametri - Digita xcopy /? per l'aiuto\n" - STRING_INVPARM "Parametro '%1' non valido - Digita xcopy /? per l'aiuto\n" - STRING_PAUSE "Premi Invio per iniziare a copiare\n" - STRING_SIMCOPY "%1!d! file saranno copiati\n" - STRING_COPY "%1!d! file copiato/i\n" - STRING_QISDIR "'%1' Ã¨ il nome di un file o una cartella\n\ +{ + STRING_INVPARMS, "Numero non valido di parametri - Digita xcopy /? per l'aiuto\n" + STRING_INVPARM, "Parametro '%1' non valido - Digita xcopy /? per l'aiuto\n" + STRING_PAUSE, "Premi Invio per iniziare a copiare\n" + STRING_SIMCOPY, "%1!d! file saranno copiati\n" + STRING_COPY, "%1!d! file copiato/i\n" + STRING_QISDIR, "'%1' Ã¨ il nome di un file o una cartella\n\ nella destinazione?\n\ (F - File, C - Cartella)\n" - STRING_SRCPROMPT "%1? (SÃ¬|No)\n" - STRING_OVERWRITE "Sovrascrivere %1? (SÃ¬|No|Tutti)\n" - STRING_COPYFAIL "La copia di '%1' in '%2' Ã¨ fallita con r/c %3!d!\n" - STRING_OPENFAIL "Impossibile aprire '%1'\n" - STRING_READFAIL "Errore durante la lettura di '%1'\n" - STRING_YES_CHAR "S" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "T" - STRING_FILE_CHAR "F" - STRING_DIR_CHAR "C" - STRING_HELP + STRING_SRCPROMPT,"%1? (SÃ¬|No)\n" + STRING_OVERWRITE,"Sovrascrivere %1? (SÃ¬|No|Tutti)\n" + STRING_COPYFAIL, "La copia di '%1' in '%2' Ã¨ fallita con r/c %3!d!\n" + STRING_OPENFAIL, "Impossibile aprire '%1'\n" + STRING_READFAIL, "Errore durante la lettura di '%1'\n" + STRING_YES_CHAR, "S" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "T" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "C" + + STRING_HELP, "XCOPY - Copia file e alberi di cartelle sorgenti in una destinazione\n\ \n\ Sintassi:\n\ @@ -52,4 +53,5 @@ [/D | /D:m-g-a] Copia i nuovi file o quelli modificati dopo la data fornita.\n\ \t\tSe nessuna data Ã¨ stata fornita, copia solo se la destinazione Ã¨ piÃ¹ vecchia\n\ \t\tdella sorgente\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Ja.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,26 +1,27 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE -BEGIN - STRING_INVPARMS "ãã©ã¡ã¼ã¿ã®æ°ãéãã¾ããxcopy /? ã§ä½¿ãæ¹ãè¡¨ç¤ºãã¾ã\n" - STRING_INVPARM "ç¡å¹ãªãã©ã¡ã¼ã¿ '%1' ã§ããxcopy /? ã§ä½¿ãæ¹ãè¡¨ç¤ºãã¾ã\n" - STRING_PAUSE "ã³ãã¼ãéå§ããã«ã¯ <enter> ãæ¼ãã¦ãã ãã\n" - STRING_SIMCOPY "%1!d! ãã¡ã¤ã«ãã³ãã¼ãããè¦è¾¼ã¿ã§ãã\n" - STRING_COPY "%1!d! ãã¡ã¤ã«ãã³ãã¼ãã¾ãã\n" - STRING_QISDIR "éãåã® '%1' ã¯ãã¡ã¤ã«åã§ããã\n\ +{ + STRING_INVPARMS, "ãã©ã¡ã¼ã¿ã®æ°ãéãã¾ããxcopy /? ã§ä½¿ãæ¹ãè¡¨ç¤ºãã¾ã\n" + STRING_INVPARM, "ç¡å¹ãªãã©ã¡ã¼ã¿ '%1' ã§ããxcopy /? ã§ä½¿ãæ¹ãè¡¨ç¤ºãã¾ã\n" + STRING_PAUSE, "ã³ãã¼ãéå§ããã«ã¯ <enter> ãæ¼ãã¦ãã ãã\n" + STRING_SIMCOPY, "%1!d! ãã¡ã¤ã«ãã³ãã¼ãããè¦è¾¼ã¿ã§ãã\n" + STRING_COPY, "%1!d! ãã¡ã¤ã«ãã³ãã¼ãã¾ãã\n" + STRING_QISDIR, "éãåã® '%1' ã¯ãã¡ã¤ã«åã§ããã\n\ ãã£ã¬ã¯ããªã§ãã?\n\ (F - ãã¡ã¤ã«ãD - ãã£ã¬ã¯ããª)\n" - STRING_SRCPROMPT "%1? (Yes|No)\n" - STRING_OVERWRITE "%1 ãä¸æ¸ããã¾ãã? (Yes|No|All)\n" - STRING_COPYFAIL "'%1' ãã '%2' ã¸ã®ã³ãã¼ã¯å¤±æãã¾ãããæ»ãå¤ %3!d!\n" - STRING_OPENFAIL "'%1' ãéãã¾ãã\n" - STRING_READFAIL "'%1' ã®èªã¿è¾¼ã¿ä¸ã«å¤±æãã¾ãã\n" - STRING_YES_CHAR "Y" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "A" - STRING_FILE_CHAR "F" - STRING_DIR_CHAR "D" - STRING_HELP + STRING_SRCPROMPT,"%1? (Yes|No)\n" + STRING_OVERWRITE,"%1 ãä¸æ¸ããã¾ãã? (Yes|No|All)\n" + STRING_COPYFAIL, "'%1' ãã '%2' ã¸ã®ã³ãã¼ã¯å¤±æãã¾ãããæ»ãå¤ %3!d!\n" + STRING_OPENFAIL, "'%1' ãéãã¾ãã\n" + STRING_READFAIL, "'%1' ã®èªã¿è¾¼ã¿ä¸ã«å¤±æãã¾ãã\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, "XCOPY - éãåã®ãã¡ã¤ã«ããã£ã¬ã¯ããªãéãåã«ã³ãã¼ãã¾ã\n\ \n\ æ§æ:\n\ @@ -52,4 +53,5 @@ [/D | /D:æ-æ¥-å¹´] æ°ãããã¡ã¤ã«ãæå®ãããæ¥ä»ä»¥éã«å¤æ´ããã\n\ \t\tãã¡ã¤ã«ãã³ãã¼ãã¾ããæ¥ä»ãæå®ãããªãå ´åã¯ã\n\ \t\tã³ãã¼åãã³ãã¼åããå¤ããã¡ã¤ã«ã ãã³ãã¼ãã¾ãã\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Ko.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,26 +1,27 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE -BEGIN - STRING_INVPARMS "ì¬ë°ë¥´ì§ ìì ë§¤ê°ë³ìì ê°¯ì - xcopy /?ë¡ ëìë§ì ë³´ìì¤\n" - STRING_INVPARM "ì¬ë°ë¥´ì§ ìì ë§¤ê°ë³ì '%1' - xcopy /?ë¡ ëìë§ì ë³´ìì¤\n" - STRING_PAUSE "<enter> ë¥¼ ëë¥´ë©´ ë³µì¬ê° ììë ê²ìëë¤\n" - STRING_SIMCOPY "%1!d! íì¼ì´ ë³µì¬ë ê²ìëë¤\n" - STRING_COPY "%1!d! íì¼ì´ ë³µì¬ëììµëë¤\n" - STRING_QISDIR "'%1'ì´ ë³µì¬í íì¼ì´ë ëë í ë¦¬?\n\ +{ + STRING_INVPARMS, "ì¬ë°ë¥´ì§ ìì ë§¤ê°ë³ìì ê°¯ì - xcopy /?ë¡ ëìë§ì ë³´ìì¤\n" + STRING_INVPARM, "ì¬ë°ë¥´ì§ ìì ë§¤ê°ë³ì '%1' - xcopy /?ë¡ ëìë§ì ë³´ìì¤\n" + STRING_PAUSE, "<enter> ë¥¼ ëë¥´ë©´ ë³µì¬ê° ììë ê²ìëë¤\n" + STRING_SIMCOPY, "%1!d! íì¼ì´ ë³µì¬ë ê²ìëë¤\n" + STRING_COPY, "%1!d! íì¼ì´ ë³µì¬ëììµëë¤\n" + STRING_QISDIR, "'%1'ì´ ë³µì¬í íì¼ì´ë ëë í ë¦¬?\n\ ìëê¹?\n\ (F - íì¼, D - ëë í ë¦¬)\n" - STRING_SRCPROMPT "%1? (ì|ìëì¤)\n" - STRING_OVERWRITE "%1ë¥¼ ë®ì´ì°ê² ìµëê¹? (ì|ìëì¤|ëª¨ë)\n" - STRING_COPYFAIL "Copying of '%1' to '%2' failed with r/c %3!d!\n" - STRING_OPENFAIL "'%1' ì´ê¸° ì¤í¨\n" - STRING_READFAIL "'%1ë¥¼ ì½ì§ ëª»íìµëë¤'\n" - STRING_YES_CHAR "Y" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "A" - STRING_FILE_CHAR "F" - STRING_DIR_CHAR "D" - STRING_HELP + STRING_SRCPROMPT,"%1? (ì|ìëì¤)\n" + STRING_OVERWRITE,"%1ë¥¼ ë®ì´ì°ê² ìµëê¹? (ì|ìëì¤|ëª¨ë)\n" + STRING_COPYFAIL, "Copying of '%1' to '%2' failed with r/c %3!d!\n" + STRING_OPENFAIL, "'%1' ì´ê¸° ì¤í¨\n" + STRING_READFAIL, "'%1ë¥¼ ì½ì§ ëª»íìµëë¤'\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, "XCOPY - ìë³¸ íì¼ì´ë ëë í ë¦¬ êµ¬ì¡°ë¥¼ ëª©ì ì§ë¡ ë³µì¬\n\ \n\ ë¬¸ë²:\n\ @@ -52,4 +53,5 @@ [/D | /D:m-d-y] ì§ì ë ë ì§ íì ìì ëê±°ë ìë¡ì´ íì¼ ë³µì¬.\n\ \t\tIë§ì½ ì´ë í ë ì§ë ì§ì ëì§ ìì¼ë©´,ì¤ì§ ìë³¸ë³´ë¤\n\ \t\tëìì´ ì¤ëë ê²ë§ ë³µì¬\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Lt.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,25 +1,26 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL STRINGTABLE -BEGIN - STRING_INVPARMS "Neteisingas parametrÅ³ skaiÄius - pagalba: xcopy /?\n" - STRING_INVPARM "Neteisingas parametras â%1â - pagalba: xcopy /?\n" - STRING_PAUSE "Spauskite <enter> kopijavimui pradÄti\n" - STRING_SIMCOPY "bus nukopijuota failÅ³: %1!d!\n" - STRING_COPY "nukopijuota failÅ³: %1!d!\n" - STRING_QISDIR "Ar â%1â yra failas, ar katalogas,\n\ +{ + STRING_INVPARMS, "Neteisingas parametrÅ³ skaiÄius - pagalba: xcopy /?\n" + STRING_INVPARM, "Neteisingas parametras â%1â - pagalba: xcopy /?\n" + STRING_PAUSE, "Spauskite <enter> kopijavimui pradÄti\n" + STRING_SIMCOPY, "bus nukopijuota failÅ³: %1!d!\n" + STRING_COPY, "nukopijuota failÅ³: %1!d!\n" + STRING_QISDIR, "Ar â%1â yra failas, ar katalogas,\n\ ar paskirtis?\n\ (F - failas, K - katalogas)\n" - STRING_SRCPROMPT "%1? (Taip|Ne)\n" - STRING_OVERWRITE "PerraÅ¡yti %1? (Taip|Ne|Visus)\n" - STRING_COPYFAIL "â%1â kopijavimas Ä¯ â%2â nepavyko su r/c %3!d!\n" - STRING_OPENFAIL "Nepavyko atverti â%1â\n" - STRING_READFAIL "Klaida skaitant â%1â\n" - STRING_YES_CHAR "T" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "V" - STRING_FILE_CHAR "F" - STRING_DIR_CHAR "K" + STRING_SRCPROMPT,"%1? (Taip|Ne)\n" + STRING_OVERWRITE,"PerraÅ¡yti %1? (Taip|Ne|Visus)\n" + STRING_COPYFAIL, "â%1â kopijavimas Ä¯ â%2â nepavyko su r/c %3!d!\n" + STRING_OPENFAIL, "Nepavyko atverti â%1â\n" + STRING_READFAIL, "Klaida skaitant â%1â\n" + STRING_YES_CHAR, "T" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "V" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "K" + STRING_HELP "XCOPY - Kopijuoja Å¡altinio failus ir katalogÅ³ medÅ¾ius Ä¯ paskirties vietÄ\n\ \n\ @@ -52,4 +53,5 @@ [/D | /D:m-d-y] Kopijuoti naujus failus arba modifikuotos po nurodytos datos.\n\ \t\tJei data nenurodyta, kopijuoti tik jei paskirties failas yra\n\ \t\tsenesnis uÅ¾ Å¡altinio failÄ\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Nl.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,26 +1,27 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE -BEGIN - STRING_INVPARMS "Onjuist aantal parameters - Gebruik xcopy /? om hulp te krijgen\n" - STRING_INVPARM "Onjuiste parameter '%1' - Gebruik xcopy /? om hulp te krijgen\n" - STRING_PAUSE "Druk op <enter> om te beginnen met kopiÃ«ren\n" - STRING_SIMCOPY "%1!d! bestand(en) zouden worden gekopieerd\n" - STRING_COPY "%1!d! bestand(en) gekopieerd\n" - STRING_QISDIR "Is '%1' een bestand of een map\n\ +{ + STRING_INVPARMS, "Onjuist aantal parameters - Gebruik xcopy /? om hulp te krijgen\n" + STRING_INVPARM, "Onjuiste parameter '%1' - Gebruik xcopy /? om hulp te krijgen\n" + STRING_PAUSE, "Druk op <enter> om te beginnen met kopiÃ«ren\n" + STRING_SIMCOPY, "%1!d! bestand(en) zouden worden gekopieerd\n" + STRING_COPY, "%1!d! bestand(en) gekopieerd\n" + STRING_QISDIR, "Is '%1' een bestand of een map\n\ op de bestemming?\n\ (B - Bestand, D - Directory)\n" - STRING_SRCPROMPT "%1? (Ja|Nee)\n" - STRING_OVERWRITE "Overschrijven %1? (Ja|Nee|Alles)\n" - STRING_COPYFAIL "KopiÃ«ren van '%1' naar '%2' mislukt met r/c %3!d!\n" - STRING_OPENFAIL "Fout tijdens openen van '%1'\n" - STRING_READFAIL "Fout tijdens lezen van '%1'\n" - STRING_YES_CHAR "J" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "A" - STRING_FILE_CHAR "B" - STRING_DIR_CHAR "D" - STRING_HELP + STRING_SRCPROMPT,"%1? (Ja|Nee)\n" + STRING_OVERWRITE,"Overschrijven %1? (Ja|Nee|Alles)\n" + STRING_COPYFAIL, "KopiÃ«ren van '%1' naar '%2' mislukt met r/c %3!d!\n" + STRING_OPENFAIL, "Fout tijdens openen van '%1'\n" + STRING_READFAIL, "Fout tijdens lezen van '%1'\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"B" + STRING_DIR_CHAR, "D" + + STRING_HELP, "XCOPY - Kopieert bronbestanden of -mappen naar een bestemming\n\ \n\ Gebruik:\n\ @@ -51,4 +52,5 @@ \tdit archiveringsattribuut\n\ [/D | /D:m-d-y] Kopieer bestanden die nieuw zijn of gewijzigd zijn na de opgegeven\n\ \t\tdatum. Als geen datum wordt gegeven, kopieer alleen als bron nieuwer is.\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,26 +1,27 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE -BEGIN - STRING_INVPARMS "Ugyldig antall parametere; bruk «xcopy /?» for hjelp\n" - STRING_INVPARM "Ugyldig parameter «%1»; bruk «xcopy /?» for hjelp\n" - STRING_PAUSE "Trykk Enter for å begynne å kopiere\n" - STRING_SIMCOPY "%1!d! fil(er) ville blitt kopiert\n" - STRING_COPY "%1!d! fil(er) kopiert\n" - STRING_QISDIR "Eer «%1» et filnevn eller katalog\n\ +{ + STRING_INVPARMS, "Ugyldig antall parametere; bruk «xcopy /?» for hjelp\n" + STRING_INVPARM, "Ugyldig parameter «%1»; bruk «xcopy /?» for hjelp\n" + STRING_PAUSE, "Trykk Enter for å begynne å kopiere\n" + STRING_SIMCOPY, "%1!d! fil(er) ville blitt kopiert\n" + STRING_COPY, "%1!d! fil(er) kopiert\n" + STRING_QISDIR, "Eer «%1» et filnevn eller katalog\n\ i målet?\n\ (F - Fil, K - Katalog)\n" - STRING_SRCPROMPT "%1? (Ja|Nei)\n" - STRING_OVERWRITE "Skrive over «%1»? (Ja|Nei|Alle)\n" - STRING_COPYFAIL "Klarte ikke kopiere «%1» til «%2»; feilet med r/c %3!d!\n" - STRING_OPENFAIL "Klarte ikke åpne «%1»\n" - STRING_READFAIL "Klarte ikke lese «%1»\n" - STRING_YES_CHAR "J" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "A" - STRING_FILE_CHAR "F" - STRING_DIR_CHAR "K" - STRING_HELP + STRING_SRCPROMPT,"%1? (Ja|Nei)\n" + STRING_OVERWRITE,"Skrive over «%1»? (Ja|Nei|Alle)\n" + STRING_COPYFAIL, "Klarte ikke kopiere «%1» til «%2»; feilet med r/c %3!d!\n" + STRING_OPENFAIL, "Klarte ikke åpne «%1»\n" + STRING_READFAIL, "Klarte ikke lese «%1»\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "K" + + STRING_HELP, "XCOPY - Kopierer filer eller katalogtre til en målplassering\n\ \n\ Syntax:\n\ @@ -30,7 +31,7 @@ Where:\n\ \n\ [/I] Anta at målet er en katalog hvis målet ikke finnes og 2 eller\n\ - \tflere filer blir kopiert\n\ +\tflere filer blir kopiert\n\ [/S] Kopier kataloger og underkataloger\n\ [/E] Kopier kataloger og underkataloger, ta med tomme kataloger\n\ [/Q] Stille modus: ikke vis filnavn under kopiering\n\ @@ -49,7 +50,8 @@ [/A] Ikke kopier filer som er markert som arkiv\n\ [/M] Bare kopier filer som er markert som akriv; fjerner denne merkingen\n\ [/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n\ - \t\tden oppgitte datoen.\n\ - \t\tHvis ingen dato oppgis kopieres bare de filene som er\n\ - \t\teldre i målet enn i kilden\n\n" -END +\t\tden oppgitte datoen.\n\ +\t\tHvis ingen dato oppgis kopieres bare de filene som er\n\ +\t\teldre i målet enn i kilden\n\n" + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,26 +1,27 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE -BEGIN - STRING_INVPARMS "Niew³aciwa liczba parametrów - uruchom xcopy /? aby wywietliæ pomoc\n" - STRING_INVPARM "Nieznany parameter '%1' - uruchom xcopy /? aby wywietliæ pomoc\n" - STRING_PAUSE "Nacinij <enter> aby rozpocz¹æ kopiowanie\n" - STRING_SIMCOPY "%1!d! plik(ów) zosta³oby skopiowanych\n" - STRING_COPY "%1!d! plik(ów) skopiowanych\n" - STRING_QISDIR "Czy '%1' jest nazw¹ pliku czy katalogu\n\ +{ + STRING_INVPARMS, "Niew³aciwa liczba parametrów - uruchom xcopy /? aby wywietliæ pomoc\n" + STRING_INVPARM, "Nieznany parameter '%1' - uruchom xcopy /? aby wywietliæ pomoc\n" + STRING_PAUSE, "Nacinij <enter> aby rozpocz¹æ kopiowanie\n" + STRING_SIMCOPY, "%1!d! plik(ów) zosta³oby skopiowanych\n" + STRING_COPY, "%1!d! plik(ów) skopiowanych\n" + STRING_QISDIR, "Czy '%1' jest nazw¹ pliku czy katalogu\n\ docelowego?\n\ (P - plik, K - katalog)\n" - STRING_SRCPROMPT "%1? (Tak|Nie)\n" - STRING_OVERWRITE "Zast¹piæ %1? (Tak|Nie|Wszystkie)\n" - STRING_COPYFAIL "Kopiowanie '%1' do '%2' nie powiod³o siê - kod b³êdu %3!d!\n" - STRING_OPENFAIL "Nie uda³o siê otworzyæ '%1'\n" - STRING_READFAIL "B³¹d podczas czytania '%1'\n" - STRING_YES_CHAR "T" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "W" - STRING_FILE_CHAR "P" - STRING_DIR_CHAR "K" - STRING_HELP + STRING_SRCPROMPT,"%1? (Tak|Nie)\n" + STRING_OVERWRITE,"Zast¹piæ %1? (Tak|Nie|Wszystkie)\n" + STRING_COPYFAIL, "Kopiowanie '%1' do '%2' nie powiod³o siê - kod b³êdu %3!d!\n" + STRING_OPENFAIL, "Nie uda³o siê otworzyæ '%1'\n" + STRING_READFAIL, "B³¹d podczas czytania '%1'\n" + STRING_YES_CHAR, "T" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "W" + STRING_FILE_CHAR,"P" + STRING_DIR_CHAR, "K" + + STRING_HELP, "XCOPY - kopiuje pliki lub drzewa katalogów\n\ \n\ Sk³adnia:\n\ @@ -51,4 +52,5 @@ [/D | /D:m-d-y] Kopiuje tylko nowe pliki lub te zmodifikowane po podanej dacie.\n\ \t\tJe¿eli nie podano ¿adnej daty, to kopiowane s¹ pliki, które s¹\n\ \t\tnowsze ni¿ w katalogu docelowym\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,26 +1,27 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE -BEGIN - STRING_INVPARMS "NÃºmero de parÃ¢metros invÃ¡lido - Use xcopy /? para ajuda\n" - STRING_INVPARM "ParÃ¢metro invÃ¡lido '%1' - Use xcopy /? para ajuda\n" - STRING_PAUSE "Pressione <Enter> para iniciar a cÃ³pia\n" - STRING_SIMCOPY "%1!d! arquivo(s) seriam copiado(s)\n" - STRING_COPY "%1!d! arquivo(s) copiado(s)\n" - STRING_QISDIR "'%1' Ã© um arquivo ou diretÃ³rio\n\ +{ + STRING_INVPARMS, "NÃºmero de parÃ¢metros invÃ¡lido - Use xcopy /? para ajuda\n" + STRING_INVPARM, "ParÃ¢metro invÃ¡lido '%1' - Use xcopy /? para ajuda\n" + STRING_PAUSE, "Pressione <Enter> para iniciar a cÃ³pia\n" + STRING_SIMCOPY, "%1!d! arquivo(s) seriam copiado(s)\n" + STRING_COPY, "%1!d! arquivo(s) copiado(s)\n" + STRING_QISDIR, "'%1' Ã© um arquivo ou diretÃ³rio\n\ no alvo?\n\ (A - Arquivo, D - DirectÃ³rio)\n" - STRING_SRCPROMPT "%1? (Sim|NÃ£o)\n" - STRING_OVERWRITE "Reescrever %1? (Sim|NÃ£o|Tudo)\n" - STRING_COPYFAIL "Falha ao copiar '%1' para '%2' com r/c %3!d!\n" - STRING_OPENFAIL "Falha ao abrir '%1'\n" - STRING_READFAIL "Falha a ler '%1'\n" - STRING_YES_CHAR "S" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "T" - STRING_FILE_CHAR "A" - STRING_DIR_CHAR "D" - STRING_HELP + STRING_SRCPROMPT,"%1? (Sim|NÃ£o)\n" + STRING_OVERWRITE,"Reescrever %1? (Sim|NÃ£o|Tudo)\n" + STRING_COPYFAIL, "Falha ao copiar '%1' para '%2' com r/c %3!d!\n" + STRING_OPENFAIL, "Falha ao abrir '%1'\n" + STRING_READFAIL, "Falha a ler '%1'\n" + STRING_YES_CHAR, "S" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "T" + STRING_FILE_CHAR,"A" + STRING_DIR_CHAR, "D" + + STRING_HELP, "XCOPY - Copia arquivos ou diretÃ³rios para um destino\n\ \n\ Sintaxe:\n\ @@ -59,25 +60,26 @@ STRINGTABLE { - STRING_INVPARMS "NÃºmero de parÃ¢metros invÃ¡lido - Use xcopy /? para ajuda\n" - STRING_INVPARM "ParÃ¢metro invÃ¡lido '%1' - Use xcopy /? para ajuda\n" - STRING_PAUSE "Carregue <Enter> para iniciar cÃ³pia\n" - STRING_SIMCOPY "%1!d! ficheiro(s) seriam copiado(s)\n" - STRING_COPY "%1!d! ficheiro(s) copiado(s)\n" - STRING_QISDIR "'%1' Ã© um ficheiro ou directÃ³rio\n\ + STRING_INVPARMS, "NÃºmero de parÃ¢metros invÃ¡lido - Use xcopy /? para ajuda\n" + STRING_INVPARM, "ParÃ¢metro invÃ¡lido '%1' - Use xcopy /? para ajuda\n" + STRING_PAUSE, "Carregue <Enter> para iniciar cÃ³pia\n" + STRING_SIMCOPY, "%1!d! ficheiro(s) seriam copiado(s)\n" + STRING_COPY, "%1!d! ficheiro(s) copiado(s)\n" + STRING_QISDIR, "'%1' Ã© um ficheiro ou directÃ³rio\n\ no alvo?\n\ (F - Ficheiro, D - DirectÃ³rio)\n" - STRING_SRCPROMPT "%1? (Yes|No)\n" - STRING_OVERWRITE "Reescrever %1? (Yes|No|All)\n" - STRING_COPYFAIL "CÃ³pia de '%1' para '%2' falhou com r/c %3!d!\n" - STRING_OPENFAIL "Falhou ao abrir '%1'\n" - STRING_READFAIL "Falhou a ler '%1'\n" - STRING_YES_CHAR "Y" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "A" - STRING_FILE_CHAR "F" - STRING_DIR_CHAR "D" - STRING_HELP + STRING_SRCPROMPT,"%1? (Yes|No)\n" + STRING_OVERWRITE,"Reescrever %1? (Yes|No|All)\n" + STRING_COPYFAIL, "CÃ³pia de '%1' para '%2' falhou com r/c %3!d!\n" + STRING_OPENFAIL, "Falhou ao abrir '%1'\n" + STRING_READFAIL, "Falhou a ler '%1'\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, "XCOPY - Copia ficheiros ou directÃ³rios para um destino\n\ \n\ Sintaxe:\n\ @@ -109,4 +111,5 @@ [/D | /D:m-d-y] Copiar novos ficheiros ou os alterados apÃ³s a data fornecida\n\ \t\tSe nenhuma data for fornecida, apenas copiar se o destino\n\ \t\tfor mais antigo que a fonte\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Ro.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -2,24 +2,25 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE -BEGIN - STRING_INVPARMS "NumÄr de parametri nevalid - UtilizaÈi xcopy /? pentru manual\n" - STRING_INVPARM "Parametru nevalid Â«%1Â» - UtilizaÈi xcopy /? pentru manual\n" - STRING_PAUSE "ApÄsaÈi pe Â«EnterÂ» pentru a Ã®ncepe copierea\n" - STRING_SIMCOPY "%1!d! fiÈier(e) ar fi copiat(e)\n" - STRING_COPY "%1!d! fiÈier(e) copiat(e)\n" - STRING_QISDIR "Â«%1Â» este un nume de fiÈier sau un director\ndin destinaÈie?\n(F - FiÈier, D - Director)\n" - STRING_SRCPROMPT "%1? (Da|Nu)\n" - STRING_OVERWRITE "Se suprascrie %1? (Da|Nu|Toate)\n" - STRING_COPYFAIL "Copierea Â«%1Â» Ã®n Â«%2Â» a eÈuat cu cod de retur %3!d!\n" - STRING_OPENFAIL "Deschiderea Â«%1Â» a eÈuat\n" - STRING_READFAIL "Citirea Â«%1Â» a eÈuat\n" - STRING_YES_CHAR "D" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "T" - STRING_FILE_CHAR "F" - STRING_DIR_CHAR "D" - STRING_HELP +{ + STRING_INVPARMS, "NumÄr de parametri nevalid - UtilizaÈi xcopy /? pentru manual\n" + STRING_INVPARM, "Parametru nevalid Â«%1Â» - UtilizaÈi xcopy /? pentru manual\n" + STRING_PAUSE, "ApÄsaÈi pe Â«EnterÂ» pentru a Ã®ncepe copierea\n" + STRING_SIMCOPY, "%1!d! fiÈier(e) ar fi copiat(e)\n" + STRING_COPY, "%1!d! fiÈier(e) copiat(e)\n" + STRING_QISDIR, "Â«%1Â» este un nume de fiÈier sau un director\ndin destinaÈie?\n(F - FiÈier, D - Director)\n" + STRING_SRCPROMPT,"%1? (Da|Nu)\n" + STRING_OVERWRITE,"Se suprascrie %1? (Da|Nu|Toate)\n" + STRING_COPYFAIL, "Copierea Â«%1Â» Ã®n Â«%2Â» a eÈuat cu cod de retur %3!d!\n" + STRING_OPENFAIL, "Deschiderea Â«%1Â» a eÈuat\n" + STRING_READFAIL, "Citirea Â«%1Â» a eÈuat\n" + STRING_YES_CHAR, "D" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "T" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, "XCOPY - CopiazÄ fiÈiere sau arbori de directoare sursÄ Ã®ntr-o destinaÈie.\n\ \n\ SintaxÄ:\n\ @@ -51,4 +52,5 @@ \t\tspecificatÄ. DacÄ nu este specificatÄ nici o datÄ, copiazÄ\n\ \t\tnumai dacÄ fiÈierul destinaÈie este mai vechi decÃ¢t fiÈierul\n\ \t\tsursÄ.\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Ru.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,27 +1,28 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE -BEGIN - STRING_INVPARMS "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ ÑÐ¸ÑÐ»Ð¾ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² - Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ 'xcopy /?' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ\n\ +{ + STRING_INVPARMS, "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ ÑÐ¸ÑÐ»Ð¾ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² - Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ 'xcopy /?' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ\n\ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾Ð³Ð¾ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ.\n" - STRING_INVPARM "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '%1' - Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ 'xcopy /?' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾Ð³Ð¾\n\ + STRING_INVPARM, "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '%1' - Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ 'xcopy /?' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾Ð³Ð¾\n\ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ.\n" - STRING_PAUSE "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° ÐºÐ»Ð°Ð²Ð¸ÑÑ <Enter>, ÑÑÐ¾Ð±Ñ Ð½Ð°ÑÐ°ÑÑ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ.\n" - STRING_SIMCOPY "%1!d! ÑÐ°Ð¹Ð»(Ð¾Ð²) Ð±ÑÐ»Ð¾ Ð±Ñ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" - STRING_COPY "%1!d! ÑÐ°Ð¹Ð»(Ð¾Ð²) ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" - STRING_QISDIR "'%1' ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°Ð¹Ð»Ð¾Ð¼ Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ¾Ð¹?\n\ + STRING_PAUSE, "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° ÐºÐ»Ð°Ð²Ð¸ÑÑ <Enter>, ÑÑÐ¾Ð±Ñ Ð½Ð°ÑÐ°ÑÑ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ.\n" + STRING_SIMCOPY, "%1!d! ÑÐ°Ð¹Ð»(Ð¾Ð²) Ð±ÑÐ»Ð¾ Ð±Ñ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" + STRING_COPY, "%1!d! ÑÐ°Ð¹Ð»(Ð¾Ð²) ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" + STRING_QISDIR, "'%1' ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°Ð¹Ð»Ð¾Ð¼ Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ¾Ð¹?\n\ (F - Ð¤Ð°Ð¹Ð», D - ÐÐ°Ð¿ÐºÐ°)\n" - STRING_SRCPROMPT "%1? (Yes|No)\n" - STRING_OVERWRITE "ÐÐµÑÐµÐ¿Ð¸ÑÐ°ÑÑ %1? (Yes|No|All)\n" - STRING_COPYFAIL "ÐÑÐ¸ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ð¸ '%1' Ð² '%2' Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°: %3!d!\n" - STRING_OPENFAIL "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐºÑÑÑÑ '%1'\n" - STRING_READFAIL "ÐÑÐ¸ ÑÑÐµÐ½Ð¸Ð¸ '%1' Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°\n" - STRING_YES_CHAR "Y" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "A" - STRING_FILE_CHAR "F" - STRING_DIR_CHAR "D" - STRING_HELP + STRING_SRCPROMPT,"%1? (Yes|No)\n" + STRING_OVERWRITE,"ÐÐµÑÐµÐ¿Ð¸ÑÐ°ÑÑ %1? (Yes|No|All)\n" + STRING_COPYFAIL, "ÐÑÐ¸ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ð¸ '%1' Ð² '%2' Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°: %3!d!\n" + STRING_OPENFAIL, "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐºÑÑÑÑ '%1'\n" + STRING_READFAIL, "ÐÑÐ¸ ÑÑÐµÐ½Ð¸Ð¸ '%1' Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð¾Ð² Ð¸ ÑÑÑÑÐºÑÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð².\n\ \n\ Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ:\n\ @@ -54,4 +55,5 @@ /D | /D:m-d-y ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð¾Ð², Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð½ÑÑ Ð½Ðµ ÑÐ°Ð½ÐµÐµ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð´Ð°ÑÑ.\n\ ÐÑÐ»Ð¸ Ð´Ð°ÑÐ° Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð°, Ð·Ð°Ð¼ÐµÐ½ÑÑÑÑÑ ÑÐ¾Ð»ÑÐºÐ¾ ÐºÐ¾Ð½ÐµÑÐ½ÑÐµ ÑÐ°Ð¹Ð»Ñ,\n\ Ð±Ð¾Ð»ÐµÐµ ÑÑÐ°ÑÑÐµ, ÑÐµÐ¼ Ð¸ÑÑÐ¾Ð´Ð½ÑÐµ.\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Si.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,26 +1,27 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT STRINGTABLE -BEGIN - STRING_INVPARMS "Neveljavno Å¡tevilo parametrov - za pomoÄ uporabite xcopy /?\n" - STRING_INVPARM "Neveljaven parameter '%1' - za pomoÄ uporabite xcopy /?\n" - STRING_PAUSE "Za zaÄetek kopiranja pritisnite <enter>\n" - STRING_SIMCOPY "Prekopiral bom %1!d! datotek\n" - STRING_COPY "Prekopiral sem %1!d! datotek\n" - STRING_QISDIR "Ali je '%1' ime ciljne datoteke\n\ +{ + STRING_INVPARMS, "Neveljavno Å¡tevilo parametrov - za pomoÄ uporabite xcopy /?\n" + STRING_INVPARM, "Neveljaven parameter '%1' - za pomoÄ uporabite xcopy /?\n" + STRING_PAUSE, "Za zaÄetek kopiranja pritisnite <enter>\n" + STRING_SIMCOPY, "Prekopiral bom %1!d! datotek\n" + STRING_COPY, "Prekopiral sem %1!d! datotek\n" + STRING_QISDIR, "Ali je '%1' ime ciljne datoteke\n\ ali mape?\n\ (D - Datoteka, M - Mapa)\n" - STRING_SRCPROMPT "%1? (Da|Ne)\n" - STRING_OVERWRITE "Ali naj prepiÅ¡em %1? (Da|Ne|Vse)\n" - STRING_COPYFAIL "Kopiranje '%1' v '%2' ni uspelo (koda napake: %3!d!)\n" - STRING_OPENFAIL "Napaka pri odpiranju '%1'\n" - STRING_READFAIL "Napaka pri branju '%1'\n" - STRING_YES_CHAR "D" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "V" - STRING_FILE_CHAR "D" - STRING_DIR_CHAR "M" - STRING_HELP + STRING_SRCPROMPT,"%1? (Da|Ne)\n" + STRING_OVERWRITE,"Ali naj prepiÅ¡em %1? (Da|Ne|Vse)\n" + STRING_COPYFAIL, "Kopiranje '%1' v '%2' ni uspelo (koda napake: %3!d!)\n" + STRING_OPENFAIL, "Napaka pri odpiranju '%1'\n" + STRING_READFAIL, "Napaka pri branju '%1'\n" + STRING_YES_CHAR, "D" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "V" + STRING_FILE_CHAR,"D" + STRING_DIR_CHAR, "M" + + STRING_HELP, "XCOPY - kopira navedene izvorne datoteke oz. mape v naveden cilj\n\ \n\ Sintaksa:\n\ @@ -52,4 +53,5 @@ [/D | /D:m-d-y] Kopiraj datoteke, ustvarjene ali spremenjene po navedenem datumu.\n\ \t\tÄe datum ni podan, gre za kopiranje datotek, katerih obstojeÄi cilj je\n\ \t\tod izvora\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Sq.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Sq.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -5,26 +5,27 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE -BEGIN - STRING_INVPARMS "I pavlershem numri i parametrave - perdor xcopy /? per ndihmÃ«\n" - STRING_INVPARM "Parametra te pavlershme '%1' - perdor xcopy /? per ndihmÃ«\n" - STRING_PAUSE "Shtyp <enter> per tÃ« kopjuar\n" - STRING_SIMCOPY "%1!d! dokumenta(t) do tÃ« kopjohen\n" - STRING_COPY "%1!d! dokumenta(t) u kopjuan\n" - STRING_QISDIR "Ã«shtÃ« '%1' njÃ« dokument ose skedare\n\ +{ + STRING_INVPARMS, "I pavlershem numri i parametrave - perdor xcopy /? per ndihmÃ«\n" + STRING_INVPARM, "Parametra te pavlershme '%1' - perdor xcopy /? per ndihmÃ«\n" + STRING_PAUSE, "Shtyp <enter> per tÃ« kopjuar\n" + STRING_SIMCOPY, "%1!d! dokumenta(t) do tÃ« kopjohen\n" + STRING_COPY, "%1!d! dokumenta(t) u kopjuan\n" + STRING_QISDIR, "Ã«shtÃ« '%1' njÃ« dokument ose skedare\n\ nÃ« ogjekt?\n\ (F - Dokument, D - SkedÃ«)\n" - STRING_SRCPROMPT "%1? (Po|Jo)\n" - STRING_OVERWRITE "Overwrite %1? (Po|Jo|TÃ« gjith)\n" - STRING_COPYFAIL "Kopje e '%1' nÃ« '%2' dÃ«shtuar me r/c %3!d!\n" - STRING_OPENFAIL "DÃ«shtuar per tu hapur '%1'\n" - STRING_READFAIL "DÃ«shtuar duke lexuar nÃ« '%1'\n" - STRING_YES_CHAR "P" - STRING_NO_CHAR "J" - STRING_ALL_CHAR "T" - STRING_FILE_CHAR "D" - STRING_DIR_CHAR "S" - STRING_HELP + STRING_SRCPROMPT,"%1? (Po|Jo)\n" + STRING_OVERWRITE,"Overwrite %1? (Po|Jo|TÃ« gjith)\n" + STRING_COPYFAIL, "Kopje e '%1' nÃ« '%2' dÃ«shtuar me r/c %3!d!\n" + STRING_OPENFAIL, "DÃ«shtuar per tu hapur '%1'\n" + STRING_READFAIL, "DÃ«shtuar duke lexuar nÃ« '%1'\n" + STRING_YES_CHAR, "P" + STRING_NO_CHAR, "J" + STRING_ALL_CHAR, "T" + STRING_FILE_CHAR,"D" + STRING_DIR_CHAR, "S" + + STRING_HELP, "XCOPY - Copies source files or directory trees to a destination\n\ \n\ Syntax:\n\ @@ -56,4 +57,5 @@ [/D | /D:m-d-y] Kopjo dokumentÃ«t e ri ose modifiko ato pas datÃ«s sÃ« furnizuar.\n\ \t\tNÃ«se asnjÃ« datÃ« Ã«shtÃ« paraqitur, vetÃ«m kopjoni nÃ«se destinacioni Ã«shtÃ« i vjetÃ«r\n\ \t\tse burimi\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Sr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Sr.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,26 +1,27 @@ LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC STRINGTABLE -BEGIN - STRING_INVPARMS "ÐÐµÐ¸ÑÐ¿ÑÐ°Ð²Ð°Ð½ Ð±ÑÐ¾Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°ÑÐ°. ÐÐ¾ÑÐ¸ÑÑÐ¸ÑÐµ xcopy /? Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ\n" - STRING_INVPARM "ÐÐµÐ¸ÑÐ¿ÑÐ°Ð²Ð°Ð½ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°Ñ â%1â. ÐÐ¾ÑÐ¸ÑÑÐ¸ÑÐµ xcopy /? Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ\n" - STRING_PAUSE "ÐÑÐ¸ÑÐ¸ÑÐ½Ð¸ÑÐµ <enter> Ð´Ð° Ð·Ð°Ð¿Ð¾ÑÐ½ÐµÑÐµ ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐµ\n" - STRING_SIMCOPY "%1!d! Ð´Ð°ÑÐ¾ÑÐµÐºÐ°/Ðµ ÑÐµ Ð±Ð¸ÑÐ¸ ÑÐ¼Ð¾Ð¶ÐµÐ½Ð¾\n" - STRING_COPY "%1!d! Ð´Ð°ÑÐ¾ÑÐµÐºÐ°/Ðµ ÑÐµ ÑÐ¼Ð½Ð¾Ð¶ÐµÐ½Ð¾\n" - STRING_QISDIR "ÐÐ° Ð»Ð¸ ÑÐµ â%1â Ð½Ð°Ð·Ð¸Ð² Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð¸Ð»Ð¸ ÑÐ°ÑÑÐ¸ÐºÐ»Ð°\n\ +{ + STRING_INVPARMS, "ÐÐµÐ¸ÑÐ¿ÑÐ°Ð²Ð°Ð½ Ð±ÑÐ¾Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°ÑÐ°. ÐÐ¾ÑÐ¸ÑÑÐ¸ÑÐµ xcopy /? Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ\n" + STRING_INVPARM, "ÐÐµÐ¸ÑÐ¿ÑÐ°Ð²Ð°Ð½ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°Ñ â%1â. ÐÐ¾ÑÐ¸ÑÑÐ¸ÑÐµ xcopy /? Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ\n" + STRING_PAUSE, "ÐÑÐ¸ÑÐ¸ÑÐ½Ð¸ÑÐµ <enter> Ð´Ð° Ð·Ð°Ð¿Ð¾ÑÐ½ÐµÑÐµ ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐµ\n" + STRING_SIMCOPY, "%1!d! Ð´Ð°ÑÐ¾ÑÐµÐºÐ°/Ðµ ÑÐµ Ð±Ð¸ÑÐ¸ ÑÐ¼Ð¾Ð¶ÐµÐ½Ð¾\n" + STRING_COPY, "%1!d! Ð´Ð°ÑÐ¾ÑÐµÐºÐ°/Ðµ ÑÐµ ÑÐ¼Ð½Ð¾Ð¶ÐµÐ½Ð¾\n" + STRING_QISDIR, "ÐÐ° Ð»Ð¸ ÑÐµ â%1â Ð½Ð°Ð·Ð¸Ð² Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð¸Ð»Ð¸ ÑÐ°ÑÑÐ¸ÐºÐ»Ð°\n\ Ð½Ð° Ð¾Ð´ÑÐµÐ´Ð¸ÑÑÑ?\n\ (Ð - Ð´Ð°ÑÐ¾ÑÐµÐºÐ°, Ð¤ - ÑÐ°ÑÑÐ¸ÐºÐ»Ð°)\n" - STRING_SRCPROMPT "%1? (ÐÐ°|ÐÐµ)\n" - STRING_OVERWRITE "ÐÐ°Ð¼ÐµÐ½Ð¸ÑÐ¸ %1? (ÐÐ°|ÐÐµ|Ð¡Ð²Ðµ)\n" - STRING_COPYFAIL "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐµ â%1â Ñ â%2â Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾ ÑÐ° r/c %3!d!\n" - STRING_OPENFAIL "ÐÑÐ²Ð°ÑÐ°ÑÐµ â%1â Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾\n" - STRING_READFAIL "Ð§Ð¸ÑÐ°ÑÐµ â%1â Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾\n" - STRING_YES_CHAR "Ð" - STRING_NO_CHAR "Ð" - STRING_ALL_CHAR "Ð¡" - STRING_FILE_CHAR "Ð" - STRING_DIR_CHAR "Ð¤" - STRING_HELP + STRING_SRCPROMPT,"%1? (ÐÐ°|ÐÐµ)\n" + STRING_OVERWRITE,"ÐÐ°Ð¼ÐµÐ½Ð¸ÑÐ¸ %1? (ÐÐ°|ÐÐµ|Ð¡Ð²Ðµ)\n" + STRING_COPYFAIL, "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐµ â%1â Ñ â%2â Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾ ÑÐ° r/c %3!d!\n" + STRING_OPENFAIL, "ÐÑÐ²Ð°ÑÐ°ÑÐµ â%1â Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾\n" + STRING_READFAIL, "Ð§Ð¸ÑÐ°ÑÐµ â%1â Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾\n" + STRING_YES_CHAR, "Ð" + STRING_NO_CHAR, "Ð" + STRING_ALL_CHAR, "Ð¡" + STRING_FILE_CHAR,"Ð" + STRING_DIR_CHAR, "Ð¤" + + STRING_HELP, "XCOPY â ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸Ð·Ð²Ð¾ÑÐ½Ðµ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð¸Ð»Ð¸ Ð³ÑÐ°Ð½Ðµ ÑÐ°ÑÑÐ¸ÐºÐ»Ð¸ Ñ Ð¾Ð´ÑÐµÐ´Ð¸ÑÑÐµ\n\ \n\ Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ°:\n\ @@ -52,31 +53,33 @@ [/D | /D:m-d-y] Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð½Ð¾Ð²Ðµ Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÑÐµÐ½Ðµ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð½Ð°ÐºÐ¾Ð½ Ð¾Ð´ÑÐµÑÐµÐ½Ð¾Ð³ Ð´Ð°ÑÑÐ¼Ð°.\n\ \t\tÐÐºÐ¾ Ð´Ð°ÑÑÐ¼ Ð½Ð¸ÑÐµ ÑÐ½ÐµÑÐµÐ½, ÑÐ¼Ð½Ð¾Ð¶Ð¸ ÑÐ°Ð¼Ð¾ Ð°ÐºÐ¾ ÑÐµ Ð¾Ð´ÑÐµÐ´Ð¸ÑÑÐµ ÑÑÐ°ÑÐ¸ÑÐµ\n\ \t\tÐ¾Ð´ Ð¸Ð·Ð²Ð¾ÑÐ°\n\n" -END + +} LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN STRINGTABLE -BEGIN - STRING_INVPARMS "Neispravan broj parametara. Koristite xcopy /? za pomoÄ\n" - STRING_INVPARM "Neispravan parametar â%1â. Koristite xcopy /? za pomoÄ\n" - STRING_PAUSE "Pritisnite <enter> da zapoÄnete umnoÅ¾avanje\n" - STRING_SIMCOPY "%1!d! datoteka/e Äe biti umoÅ¾eno\n" - STRING_COPY "%1!d! datoteka/e je umnoÅ¾eno\n" - STRING_QISDIR "Da li je â%1â naziv datoteke ili fascikla\n\ +{ + STRING_INVPARMS, "Neispravan broj parametara. Koristite xcopy /? za pomoÄ\n" + STRING_INVPARM, "Neispravan parametar â%1â. Koristite xcopy /? za pomoÄ\n" + STRING_PAUSE, "Pritisnite <enter> da zapoÄnete umnoÅ¾avanje\n" + STRING_SIMCOPY, "%1!d! datoteka/e Äe biti umoÅ¾eno\n" + STRING_COPY, "%1!d! datoteka/e je umnoÅ¾eno\n" + STRING_QISDIR, "Da li je â%1â naziv datoteke ili fascikla\n\ na odrediÅ¡tu?\n\ (D - datoteka, F - fascikla)\n" - STRING_SRCPROMPT "%1? (Da|Ne)\n" - STRING_OVERWRITE "Zameniti %1? (Da|Ne|Sve)\n" - STRING_COPYFAIL "UmnoÅ¾avanje â%1â u â%2â nije uspelo sa r/c %3!d!\n" - STRING_OPENFAIL "Otvaranje â%1â datoteke nije uspelo\n" - STRING_READFAIL "Äitanje â%1â datoteke nije uspelo\n" - STRING_YES_CHAR "D" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "S" - STRING_FILE_CHAR "D" - STRING_DIR_CHAR "F" - STRING_HELP + STRING_SRCPROMPT,"%1? (Da|Ne)\n" + STRING_OVERWRITE,"Zameniti %1? (Da|Ne|Sve)\n" + STRING_COPYFAIL, "UmnoÅ¾avanje â%1â u â%2â nije uspelo sa r/c %3!d!\n" + STRING_OPENFAIL, "Otvaranje â%1â datoteke nije uspelo\n" + STRING_READFAIL, "Äitanje â%1â datoteke nije uspelo\n" + STRING_YES_CHAR, "D" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "S" + STRING_FILE_CHAR,"D" + STRING_DIR_CHAR, "F" + + STRING_HELP, "XCOPY â umnoÅ¾ava izvorne datoteke ili grane fascikli u odrediÅ¡te\n\ \n\ Sintaksa:\n\ @@ -108,4 +111,5 @@ [/D | /D:m-d-y] UmnoÅ¾i nove ili izmenjene datoteke nakon odreÄenog datuma.\n\ \t\tAko datum nije unesen, umnoÅ¾i samo ako je odrediÅ¡te starije\n\ \t\tod izvora\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Sv.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,24 +1,25 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE -BEGIN - STRING_INVPARMS "Ogiltigt antal parametrar - AnvÃ¤nd xcopy /? fÃ¶r hjÃ¤lp\n" - STRING_INVPARM "Ogiltig parameter '%1' - AnvÃ¤nd xcopy /? fÃ¶r hjÃ¤lp\n" - STRING_PAUSE "Tryck <enter> fÃ¶r att bÃ¶rja kopiera\n" - STRING_SIMCOPY "%1!d! fil(er) skulle kopieras\n" - STRING_COPY "%1!d! fil(er) kopierade\n" - STRING_QISDIR "Ãr '%1' ett filnamn eller en katalog\npÃ¥ mÃ¥let?\n(F - Fil, K - Katalog)\n" - STRING_SRCPROMPT "%1? (Ja|Nej)\n" - STRING_OVERWRITE "Skriv Ã¶ver %1? (Ja|Nej|Alla)\n" - STRING_COPYFAIL "Kunde inte kopiera '%1' till '%2'; misslyckades med r/c %3!d!\n" - STRING_OPENFAIL "Kunde inte Ã¶ppna '%1'\n" - STRING_READFAIL "Kunde inte lÃ¤sa '%1'\n" - STRING_YES_CHAR "J" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "A" - STRING_FILE_CHAR "F" - STRING_DIR_CHAR "K" - STRING_HELP +{ + STRING_INVPARMS, "Ogiltigt antal parametrar - AnvÃ¤nd xcopy /? fÃ¶r hjÃ¤lp\n" + STRING_INVPARM, "Ogiltig parameter '%1' - AnvÃ¤nd xcopy /? fÃ¶r hjÃ¤lp\n" + STRING_PAUSE, "Tryck <enter> fÃ¶r att bÃ¶rja kopiera\n" + STRING_SIMCOPY, "%1!d! fil(er) skulle kopieras\n" + STRING_COPY, "%1!d! fil(er) kopierade\n" + STRING_QISDIR, "Ãr '%1' ett filnamn eller en katalog\npÃ¥ mÃ¥let?\n(F - Fil, K - Katalog)\n" + STRING_SRCPROMPT,"%1? (Ja|Nej)\n" + STRING_OVERWRITE,"Skriv Ã¶ver %1? (Ja|Nej|Alla)\n" + STRING_COPYFAIL, "Kunde inte kopiera '%1' till '%2'; misslyckades med r/c %3!d!\n" + STRING_OPENFAIL, "Kunde inte Ã¶ppna '%1'\n" + STRING_READFAIL, "Kunde inte lÃ¤sa '%1'\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "K" + + STRING_HELP, "XCOPY - Kopierar kÃ¤llfiler eller katalogtrÃ¤d till ett mÃ¥l\n\ \n\ Syntax:\n\ @@ -50,4 +51,5 @@ [/D | /D:m-d-y] Kopiera nya filer eller de Ã¤ndrade efter angivet datum.\n\ \t\tOm inget datum angivits utfÃ¶rs endast kopiering om mÃ¥let Ã¤r\n\ \t\tÃ¤ldre Ã¤n kÃ¤llan\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Uk.rc [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -1,25 +1,26 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE -BEGIN - STRING_INVPARMS "ÐÐµÐ²ÑÑÐ½Ð° ÐºÑÐ»ÑÐºÑÑÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ² - ÐÐ²ÐµÐ´ÑÑÑ xcopy /? Ð´Ð»Ñ Ð´Ð¾Ð²ÑÐ´ÐºÐ¸\n" - STRING_INVPARM "ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '%1' - ÐÐ²ÐµÐ´ÑÑÑ xcopy /? Ð´Ð»Ñ Ð´Ð¾Ð²ÑÐ´ÐºÐ¸\n" - STRING_PAUSE "ÐÐ°ÑÐ¸ÑÐ½ÑÑÑ <enter> ÑÐ¾Ð± Ð¿Ð¾ÑÐ°ÑÐ¸ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ\n" - STRING_SIMCOPY "%1!d! ÑÐ°Ð¹Ð»(ÑÐ²) Ð±ÑÐ´Ðµ ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" - STRING_COPY "%1!d! ÑÐ°Ð¹Ð»(ÑÐ²) ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" - STRING_QISDIR "'%1' Ñ ÑÐ°Ð¹Ð»Ð¾Ð¼ ÑÐ¸ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑÑ?\n\ +{ + STRING_INVPARMS, "ÐÐµÐ²ÑÑÐ½Ð° ÐºÑÐ»ÑÐºÑÑÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ² - ÐÐ²ÐµÐ´ÑÑÑ xcopy /? Ð´Ð»Ñ Ð´Ð¾Ð²ÑÐ´ÐºÐ¸\n" + STRING_INVPARM, "ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '%1' - ÐÐ²ÐµÐ´ÑÑÑ xcopy /? Ð´Ð»Ñ Ð´Ð¾Ð²ÑÐ´ÐºÐ¸\n" + STRING_PAUSE, "ÐÐ°ÑÐ¸ÑÐ½ÑÑÑ <enter> ÑÐ¾Ð± Ð¿Ð¾ÑÐ°ÑÐ¸ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ\n" + STRING_SIMCOPY, "%1!d! ÑÐ°Ð¹Ð»(ÑÐ²) Ð±ÑÐ´Ðµ ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" + STRING_COPY, "%1!d! ÑÐ°Ð¹Ð»(ÑÐ²) ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" + STRING_QISDIR, "'%1' Ñ ÑÐ°Ð¹Ð»Ð¾Ð¼ ÑÐ¸ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑÑ?\n\ (F - Ð¤Ð°Ð¹Ð», D - ÐÐ¸ÑÐµÐºÑÐ¾ÑÑÑ)\n" - STRING_SRCPROMPT "%1? (Yes|No)\n" - STRING_OVERWRITE "ÐÐµÑÐµÐ¿Ð¸ÑÐ°ÑÐ¸ %1? (Yes|No|All)\n" - STRING_COPYFAIL "ÐÑÐ´ ÑÐ°Ñ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ '%1' Ð² '%2' ÑÑÐ°Ð»Ð°ÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° r/c %3!d!\n" - STRING_OPENFAIL "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸ '%1'\n" - STRING_READFAIL "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° ÑÐ¸ÑÐ°Ð½Ð½Ñ '%1'\n" - STRING_YES_CHAR "Y" - STRING_NO_CHAR "N" - STRING_ALL_CHAR "A" - STRING_FILE_CHAR "F" - STRING_DIR_CHAR "D" - STRING_HELP + STRING_SRCPROMPT,"%1? (Yes|No)\n" + STRING_OVERWRITE,"ÐÐµÑÐµÐ¿Ð¸ÑÐ°ÑÐ¸ %1? (Yes|No|All)\n" + STRING_COPYFAIL, "ÐÑÐ´ ÑÐ°Ñ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ '%1' Ð² '%2' ÑÑÐ°Ð»Ð°ÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° r/c %3!d!\n" + STRING_OPENFAIL, "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸ '%1'\n" + STRING_READFAIL, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° ÑÐ¸ÑÐ°Ð½Ð½Ñ '%1'\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, "XCOPY - ÐÐ¾Ð¿ÑÑÑ ÑÐ°Ð¹Ð»Ð¸ ÑÐ° Ð´ÐµÑÐµÐ²Ð° Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÐ¹ Ð·Ð° Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐµÐ½Ð½ÑÐ¼\n\ \n\ Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ:\n\ @@ -51,4 +52,5 @@ [/D | /D:m-d-y] ÐÐ¾Ð¿ÑÑÑ Ð»Ð¸ÑÐµ Ð½Ð¾Ð²Ñ ÑÐ°Ð¹Ð»Ð¸ Ð°Ð±Ð¾ ÑÑ, ÑÐºÑ Ð±ÑÐ»Ð¸ Ð·Ð¼ÑÐ½ÐµÐ½Ñ Ð¿ÑÑÐ»Ñ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ñ\n\ Ð´Ð°ÑÐ¸. Ð¯ÐºÑÐ¾ Ð´Ð°ÑÐ° Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð°, ÐºÐ¾Ð¿ÑÑÑ Ð»Ð¸ÑÐµ ÑÑ ÑÐ°Ð¹Ð»Ð¸, ÑÐºÑ Ð½Ð¾Ð²ÑÑÑ\n\ Ð² Ð¿Ð¾ÑÐ°ÑÐºÐ¾Ð²ÑÐ¹ Ð¿Ð°Ð¿ÑÑ\n\n" -END + +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -119,7 +119,7 @@ */ if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0, - MAX_WRITECONSOLE_SIZE); + MAX_WRITECONSOLE_SIZE*sizeof(WCHAR)); if (!output_bufW) { WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n"); return 0; @@ -667,7 +667,7 @@ Example: 'XCOPY "c:\DIR A" "c:DIR B\"' is OK. */ static int find_end_of_word(const WCHAR *word, WCHAR **end) { - BOOL in_quotes = 0; + BOOL in_quotes = FALSE; const WCHAR *ptr = word; for (;;) { for (; *ptr != '\0' && *ptr != '"' && @@ -783,19 +783,20 @@ BOOL isError = FALSE; memset(&st, 0x00, sizeof(st)); - /* Parse the arg : Month */ + /* Microsoft xcopy's usage message implies that the date + * format depends on the locale, but that is false. + * It is hardcoded to month-day-year. + */ st.wMonth = _wtol(pos); while (*pos && isdigit(*pos)) pos++; if (*pos++ != '-') isError = TRUE; - /* Parse the arg : Day */ if (!isError) { st.wDay = _wtol(pos); while (*pos && isdigit(*pos)) pos++; if (*pos++ != '-') isError = TRUE; } - /* Parse the arg : Year */ if (!isError) { st.wYear = _wtol(pos); while (*pos && isdigit(*pos)) pos++; Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -54,20 +54,20 @@ #define MAXSTRING 8192 /* Translation ids */ -#define STRING_INVPARMS 101 -#define STRING_INVPARM 102 -#define STRING_PAUSE 103 -#define STRING_SIMCOPY 104 -#define STRING_COPY 105 -#define STRING_QISDIR 106 -#define STRING_SRCPROMPT 107 -#define STRING_OVERWRITE 108 -#define STRING_COPYFAIL 109 -#define STRING_OPENFAIL 110 -#define STRING_READFAIL 111 -#define STRING_YES_CHAR 112 -#define STRING_NO_CHAR 113 -#define STRING_ALL_CHAR 114 -#define STRING_FILE_CHAR 115 -#define STRING_DIR_CHAR 116 -#define STRING_HELP 117 +#define STRING_INVPARMS 101 +#define STRING_INVPARM 102 +#define STRING_PAUSE 103 +#define STRING_SIMCOPY 104 +#define STRING_COPY 105 +#define STRING_QISDIR 106 +#define STRING_SRCPROMPT 107 +#define STRING_OVERWRITE 108 +#define STRING_COPYFAIL 109 +#define STRING_OPENFAIL 110 +#define STRING_READFAIL 111 +#define STRING_YES_CHAR 112 +#define STRING_NO_CHAR 113 +#define STRING_ALL_CHAR 114 +#define STRING_FILE_CHAR 115 +#define STRING_DIR_CHAR 116 +#define STRING_HELP 117 Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Oct 10 11:17:12 2014 @@ -236,7 +236,7 @@ reactos/base/applications/cmdutils/reg # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.27 -reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.7.1 +reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.7.27 reactos/base/applications/games/winmine # Forked at Wine-1_3_5 reactos/base/applications/extrac32 # Synced to Wine-1.7.1 reactos/base/applications/iexplore # Synced to Wine-1.7.27

1 0

[akhaldi] 64651: [README.WINE] * Forgot to mark wmic in my previous commit. CORE-8540
by akhaldi＠svn.reactos.org 10 Oct '14

10 Oct '14

Author: akhaldi Date: Fri Oct 10 11:16:02 2014 New Revision: 64651 URL: http://svn.reactos.org/svn/reactos?rev=64651&view=rev Log: [README.WINE] * Forgot to mark wmic in my previous commit. CORE-8540 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Oct 10 11:16:02 2014 @@ -235,7 +235,7 @@ reactos/base/applications/cmdutils/reg # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.7.27 -reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.1 +reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.7.1 reactos/base/applications/games/winmine # Forked at Wine-1_3_5 reactos/base/applications/extrac32 # Synced to Wine-1.7.1

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
73
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 October 2014