ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
June 2008
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
23 participants
435 discussions
Start a n
N
ew thread
[greatlrd] 33807: add Test for EngDeleteSemaphore, it only test if it been create or not
by greatlrd@svn.reactos.org
Author: greatlrd Date: Sun Jun 1 09:38:02 2008 New Revision: 33807 URL:
http://svn.reactos.org/svn/reactos?rev=33807&view=rev
Log: add Test for EngDeleteSemaphore, it only test if it been create or not Added: trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c (with props) Modified: trunk/rostests/apitests/gdi32api/testlist.c Modified: trunk/rostests/apitests/gdi32api/testlist.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis…
============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Sun Jun 1 09:38:02 2008 @@ -11,6 +11,7 @@ #include "tests/CreateFont.c" #include "tests/CreatePen.c" #include "tests/CreateRectRgn.c" +#include "tests/EngCreateSemaphore.c" #include "tests/ExtCreatePen.c" #include "tests/GdiConvertBitmap.c" #include "tests/GdiConvertBrush.c" @@ -51,6 +52,7 @@ { L"CreateCompatibleDC", Test_CreateCompatibleDC }, { L"CreateFont", Test_CreateFont }, { L"CreatePen", Test_CreatePen }, + { L"EngCreateSemaphore", Test_EngCreateSemaphore }, { L"CreateRectRgn", Test_CreateRectRgn }, { L"ExtCreatePen", Test_ExtCreatePen }, { L"GdiConvertBitmap", Test_GdiConvertBitmap }, Added: trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/E…
============================================================================== --- trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c (added) +++ trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c [iso-8859-1] Sun Jun 1 09:38:02 2008 @@ -1,0 +1,15 @@ +/* Simple test of EngAcquireSemaphore only check if we got a lock or not */ +INT +Test_EngCreateSemaphore(PTESTINFO pti) +{ + + HSEMAPHORE hsem; + hsem = EngCreateSemaphore(); + + RTEST ( hsem != NULL ); + + EngDeleteSemaphore(hsem); + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c ------------------------------------------------------------------------------ svn:eol-style = native
16 years, 6 months
1
0
0
0
[mpiulachs] 33806: set 'installname' attribute for halup to 'hal.dll'
by mpiulachs@svn.reactos.org
Author: mpiulachs Date: Sun Jun 1 08:24:25 2008 New Revision: 33806 URL:
http://svn.reactos.org/svn/reactos?rev=33806&view=rev
Log: set 'installname' attribute for halup to 'hal.dll' Modified: trunk/reactos/hal/halx86/halup.rbuild Modified: trunk/reactos/hal/halx86/halup.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halup.rbuild?re…
============================================================================== --- trunk/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halup.rbuild [iso-8859-1] Sun Jun 1 08:24:25 2008 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="
http://www.w3.org/2001/XInclude
"> - <module name="halup" type="kernelmodedll" entrypoint="0"> + <module name="halup" type="kernelmodedll" entrypoint="0" installname="hal.dll"> <importlibrary base="hal" definition="hal_i386.def" /> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include>include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" />
16 years, 6 months
1
0
0
0
[mpiulachs] 33805: 'base' is not a valid attribute of element 'installfile'
by mpiulachs@svn.reactos.org
Author: mpiulachs Date: Sun Jun 1 08:21:12 2008 New Revision: 33805 URL:
http://svn.reactos.org/svn/reactos?rev=33805&view=rev
Log: 'base' is not a valid attribute of element 'installfile' Modified: trunk/rosapps/downloader/downloader.rbuild Modified: trunk/rosapps/downloader/downloader.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.rbui…
============================================================================== --- trunk/rosapps/downloader/downloader.rbuild [iso-8859-1] (original) +++ trunk/rosapps/downloader/downloader.rbuild [iso-8859-1] Sun Jun 1 08:21:12 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <group xmlns:xi="
http://www.w3.org/2001/XInclude
"> - <installfile base="system32">downloader.xml</installfile> + <installfile installbase="system32">downloader.xml</installfile> <module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe" unicode="yes"> <include base="downloader">.</include> <include base="expat">.</include>
16 years, 6 months
1
0
0
0
[dchapyshev] 33804: - Sync with Wine HEAD
by dchapyshev@svn.reactos.org
Author: dchapyshev Date: Sun Jun 1 08:14:02 2008 New Revision: 33804 URL:
http://svn.reactos.org/svn/reactos?rev=33804&view=rev
Log: - Sync with Wine HEAD Modified: trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/matrix.c trunk/reactos/dll/win32/gdiplus/pen.c trunk/reactos/dll/win32/gdiplus/region.c Modified: trunk/reactos/dll/win32/gdiplus/font.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r…
============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Sun Jun 1 08:14:02 2008 @@ -68,7 +68,7 @@ if(!lfa || !font) return InvalidParameter; - memcpy(&lfw, lfa, sizeof(LOGFONTA)); + memcpy(&lfw, lfa, FIELD_OFFSET(LOGFONTA,lfFaceName) ); if(!MultiByteToWideChar(CP_ACP, 0, lfa->lfFaceName, -1, lfw.lfFaceName, LF_FACESIZE)) return GenericError; Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.…
============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Sun Jun 1 08:14:02 2008 @@ -25,8 +25,8 @@ @ stub GdipAddPathPieI @ stub GdipAddPathPolygon @ stub GdipAddPathPolygonI -@ stub GdipAddPathRectangle -@ stub GdipAddPathRectangleI +@ stdcall GdipAddPathRectangle(ptr long long long long) +@ stdcall GdipAddPathRectangleI(ptr long long long long) @ stub GdipAddPathRectangles @ stub GdipAddPathRectanglesI @ stub GdipAddPathString @@ -92,7 +92,7 @@ @ stdcall GdipCreateFromHDC2(long long ptr) @ stdcall GdipCreateFromHDC(long ptr) @ stdcall GdipCreateFromHWND(long ptr) -@ stub GdipCreateFromHWNDICM +@ stdcall GdipCreateFromHWNDICM(long ptr) @ stdcall GdipCreateHBITMAPFromBitmap(ptr ptr long) @ stub GdipCreateHICONFromBitmap @ stub GdipCreateHalftonePalette @@ -122,9 +122,9 @@ @ stdcall GdipCreatePathIter(ptr ptr) @ stdcall GdipCreatePen1(long long long ptr) @ stdcall GdipCreatePen2(ptr long long ptr) -@ stub GdipCreateRegion +@ stdcall GdipCreateRegion(ptr) @ stub GdipCreateRegionHrgn -@ stub GdipCreateRegionPath +@ stdcall GdipCreateRegionPath(ptr ptr) @ stub GdipCreateRegionRect @ stub GdipCreateRegionRectI @ stub GdipCreateRegionRgnData @@ -148,7 +148,7 @@ @ stdcall GdipDeletePathIter(ptr) @ stdcall GdipDeletePen(ptr) @ stub GdipDeletePrivateFontCollection -@ stub GdipDeleteRegion +@ stdcall GdipDeleteRegion(ptr) @ stdcall GdipDeleteStringFormat(ptr) @ stdcall GdipDisposeImage(ptr) @ stdcall GdipDisposeImageAttributes(ptr) @@ -244,7 +244,7 @@ @ stdcall GdipGetBrushType(ptr ptr) @ stub GdipGetCellAscent @ stub GdipGetCellDescent -@ stub GdipGetClip +@ stdcall GdipGetClip(ptr ptr) @ stub GdipGetClipBounds @ stub GdipGetClipBoundsI @ stdcall GdipGetCompositingMode(ptr ptr) @@ -255,7 +255,7 @@ @ stub GdipGetCustomLineCapStrokeJoin @ stub GdipGetCustomLineCapType @ stub GdipGetCustomLineCapWidthScale -@ stub GdipGetDC +@ stdcall GdipGetDC(ptr ptr) @ stdcall GdipGetDpiX(ptr ptr) @ stdcall GdipGetDpiY(ptr ptr) @ stub GdipGetEffectParameterSize @@ -286,7 +286,7 @@ @ stdcall GdipGetImageDimension(ptr ptr ptr) @ stdcall GdipGetImageEncoders(long long ptr) @ stdcall GdipGetImageEncodersSize(ptr ptr) -@ stub GdipGetImageFlags +@ stdcall GdipGetImageFlags(ptr ptr) @ stdcall GdipGetImageGraphicsContext(ptr ptr) @ stdcall GdipGetImageHeight(ptr ptr) @ stdcall GdipGetImageHorizontalResolution(ptr ptr) @@ -379,7 +379,7 @@ @ stub GdipGetRegionBoundsI @ stub GdipGetRegionData @ stub GdipGetRegionDataSize -@ stub GdipGetRegionHRgn +@ stdcall GdipGetRegionHRgn(ptr ptr ptr) @ stub GdipGetRegionScans @ stub GdipGetRegionScansCount @ stub GdipGetRegionScansI @@ -436,7 +436,7 @@ @ stub GdipIsVisibleRegionRect @ stub GdipIsVisibleRegionRectI @ stdcall GdipLoadImageFromFile(wstr ptr) -@ stub GdipLoadImageFromFileICM +@ stdcall GdipLoadImageFromFileICM(wstr ptr) @ stdcall GdipLoadImageFromStream(ptr ptr) @ stdcall GdipLoadImageFromStreamICM(ptr ptr) @ stub GdipMeasureCharacterRanges @@ -472,7 +472,7 @@ @ stub GdipRecordMetafileI @ stub GdipRecordMetafileStream @ stub GdipRecordMetafileStreamI -@ stub GdipReleaseDC +@ stdcall GdipReleaseDC(ptr ptr) @ stdcall GdipRemovePropertyItem(ptr long) @ stub GdipResetClip @ stub GdipResetImageAttributes Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_…
============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] Sun Jun 1 08:14:02 2008 @@ -149,6 +149,7 @@ struct GpImage{ IPicture* picture; ImageType type; + UINT flags; }; struct GpMetafile{ Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics…
============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sun Jun 1 08:14:02 2008 @@ -797,6 +797,12 @@ return Ok; } +/* FIXME: no icm handling */ +GpStatus WINGDIPAPI GdipCreateFromHWNDICM(HWND hwnd, GpGraphics **graphics) +{ + return GdipCreateFromHWND(hwnd, graphics); +} + GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, GpMetafile **metafile) { @@ -932,22 +938,7 @@ GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics *graphics, GpPen *pen, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) { - INT save_state, num_pts; - GpPointF points[MAX_ARC_PTS]; - GpStatus retval; - - if(!graphics || !pen || width <= 0 || height <= 0) - return InvalidParameter; - - num_pts = arc2polybezier(points, x, y, width, height, startAngle, sweepAngle); - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, points, num_pts, TRUE); - - restore_dc(graphics, save_state); - - return retval; + return GdipDrawArc(graphics,pen,(REAL)x,(REAL)y,(REAL)width,(REAL)height,startAngle,sweepAngle); } GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, @@ -2436,3 +2427,25 @@ return ret; } + +GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) +{ + FIXME("(%p, %p): stub\n", graphics, hdc); + + *hdc = NULL; + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics *graphics, HDC hdc) +{ + FIXME("(%p, %p): stub\n", graphics, hdc); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) +{ + FIXME("(%p, %p): stub\n", graphics, region); + + return NotImplemented; +} Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics…
============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Sun Jun 1 08:14:02 2008 @@ -708,3 +708,53 @@ return GdipTransformMatrixPoints(matrix, path->pathdata.Points, path->pathdata.Count); } + +GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath *path, REAL x, REAL y, + REAL width, REAL height) +{ + GpPath *backup; + GpPointF ptf[2]; + GpStatus retstat; + BOOL old_new; + + if(!path || width < 0.0 || height < 0.0) + return InvalidParameter; + + /* make a backup copy of path data */ + if((retstat = GdipClonePath(path, &backup)) != Ok) + return retstat; + + /* rectangle should start as new path */ + old_new = path->newfigure; + path->newfigure = TRUE; + if((retstat = GdipAddPathLine(path,x,y,x+width,y)) != Ok){ + path->newfigure = old_new; + goto fail; + } + + ptf[0].X = x+width; + ptf[0].Y = y+height; + ptf[1].X = x; + ptf[1].Y = y+height; + + if((retstat = GdipAddPathLine2(path,(GDIPCONST GpPointF*)&ptf,2)) != Ok) goto fail; + path->pathdata.Types[path->pathdata.Count-1] |= PathPointTypeCloseSubpath; + + /* free backup */ + GdipDeletePath(backup); + return Ok; + +fail: + /* reverting */ + GdipDeletePath(path); + GdipClonePath(backup, &path); + GdipDeletePath(backup); + + return retstat; +} + +GpStatus WINGDIPAPI GdipAddPathRectangleI(GpPath *path, INT x, INT y, + INT width, INT height) +{ + return GdipAddPathRectangle(path,(REAL)x,(REAL)y,(REAL)width,(REAL)height); +} Modified: trunk/reactos/dll/win32/gdiplus/image.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?…
============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sun Jun 1 08:14:02 2008 @@ -384,6 +384,7 @@ } (*bitmap)->image.type = ImageTypeBitmap; + (*bitmap)->image.flags = ImageFlagsNone; (*bitmap)->width = width; (*bitmap)->height = height; (*bitmap)->format = format; @@ -724,6 +725,12 @@ IStream_Release(stream); return stat; +} + +/* FIXME: no icm handling */ +GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage **image) +{ + return GdipLoadImageFromFile(filename, image); } GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) @@ -789,6 +796,7 @@ } (*image)->picture = pic; + (*image)->flags = ImageFlagsNone; return Ok; } @@ -1108,3 +1116,13 @@ return NotImplemented; } + +GpStatus WINGDIPAPI GdipGetImageFlags(GpImage *image, UINT *flags) +{ + if(!image || !flags) + return InvalidParameter; + + *flags = image->flags; + + return Ok; +} Modified: trunk/reactos/dll/win32/gdiplus/matrix.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/matrix.c…
============================================================================== --- trunk/reactos/dll/win32/gdiplus/matrix.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/matrix.c [iso-8859-1] Sun Jun 1 08:14:02 2008 @@ -244,7 +244,7 @@ REAL x, y; INT i; - if(!matrix || !pts) + if(!matrix || !pts || count <= 0) return InvalidParameter; for(i = 0; i < count; i++) @@ -264,6 +264,9 @@ GpPointF *ptsF; GpStatus ret; INT i; + + if(count <= 0) + return InvalidParameter; ptsF = GdipAlloc(sizeof(GpPointF) * count); if(!ptsF) @@ -314,7 +317,7 @@ REAL x, y; INT i; - if(!matrix || !pts) + if(!matrix || !pts || count <= 0) return InvalidParameter; for(i = 0; i < count; i++) @@ -334,6 +337,9 @@ GpPointF *ptsF; GpStatus ret; INT i; + + if(count <= 0) + return InvalidParameter; ptsF = GdipAlloc(sizeof(GpPointF) * count); if(!ptsF) Modified: trunk/reactos/dll/win32/gdiplus/pen.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/pen.c?re…
============================================================================== --- trunk/reactos/dll/win32/gdiplus/pen.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/pen.c [iso-8859-1] Sun Jun 1 08:14:02 2008 @@ -251,6 +251,9 @@ if(!pen || !dash) return InvalidParameter; + if(count <= 0) + return OutOfMemory; + for(i = 0; i < count; i++){ sum += dash[i]; if(dash[i] < 0.0) Modified: trunk/reactos/dll/win32/gdiplus/region.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c…
============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Sun Jun 1 08:14:02 2008 @@ -30,6 +30,73 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +/********************************************************** + * + * Data returned by GdipGetRegionData (for rectangle based regions) + * looks something like this: + * + * struct region_data_header + * { + * DWORD size; size in bytes of the data - 8. + * DWORD magic1; probably a checksum. + * DWORD magic2; always seems to be 0xdbc01001 - version? + * DWORD num_ops; number of combining ops * 2 + * }; + * + * Then follows a sequence of combining ops and RECTFs. + * + * Combining ops are just stored as their CombineMode value. + * + * Each RECTF is preceded by the DWORD 0x10000000. An empty rect is + * stored as 0x10000002 (with no following RECTF) and an infinite rect + * is stored as 0x10000003 (again with no following RECTF). + * + * The combining ops are stored in the reverse order to the RECTFs and in the + * reverse order to which the region was constructed. + * + * When two or more complex regions (ie those with more than one rect) + * are combined, the combining op for the two regions comes first, + * then the combining ops for the rects in region 1, followed by the + * rects for region 1, then follows the combining ops for region 2 and + * finally region 2's rects. Presumably you're supposed to use the + * 0x10000000 rect header to find the end of the op list (the count of + * the rects in each region is not stored). + * + * When a simple region (1 rect) is combined, it's treated as if a single rect + * is being combined. + * + */ + +GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **region) +{ + FIXME("(%p): stub\n", region); + + *region = NULL; + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) +{ + FIXME("(%p, %p): stub\n", path, region); + + *region = NULL; + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *region) +{ + FIXME("(%p): stub\n", region); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *region, GpGraphics *graphics, HRGN *hrgn) +{ + FIXME("(%p, %p, %p): stub\n", region, graphics, hrgn); + + *hrgn = NULL; + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *region) { static int calls;
16 years, 6 months
1
0
0
0
[dchapyshev] 33803: - Update headers
by dchapyshev@svn.reactos.org
Author: dchapyshev Date: Sun Jun 1 08:13:10 2008 New Revision: 33803 URL:
http://svn.reactos.org/svn/reactos?rev=33803&view=rev
Log: - Update headers Modified: trunk/reactos/include/psdk/gdiplusenums.h trunk/reactos/include/psdk/gdiplusflat.h trunk/reactos/include/psdk/winioctl.h Modified: trunk/reactos/include/psdk/gdiplusenums.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusenums.…
============================================================================== --- trunk/reactos/include/psdk/gdiplusenums.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusenums.h [iso-8859-1] Sun Jun 1 08:13:10 2008 @@ -259,15 +259,33 @@ enum ImageCodecFlags { - ImageCodecFlagsEncoder = 1, - ImageCodecFlagsDecoder = 2, - ImageCodecFlagsSupportBitmap = 4, - ImageCodecFlagsSupportVector = 8, - ImageCodecFlagsSeekableEncode = 16, - ImageCodecFlagsBlockingDecode = 32, - ImageCodecFlagsBuiltin = 65536, - ImageCodecFlagsSystem = 131072, - ImageCodecFlagsUser = 262144 + ImageCodecFlagsEncoder = 1, + ImageCodecFlagsDecoder = 2, + ImageCodecFlagsSupportBitmap = 4, + ImageCodecFlagsSupportVector = 8, + ImageCodecFlagsSeekableEncode = 16, + ImageCodecFlagsBlockingDecode = 32, + ImageCodecFlagsBuiltin = 65536, + ImageCodecFlagsSystem = 131072, + ImageCodecFlagsUser = 262144 +}; + +enum ImageFlags +{ + ImageFlagsNone = 0, + ImageFlagsScalable = 0x0001, + ImageFlagsHasAlpha = 0x0002, + ImageFlagsHasTranslucent = 0x0004, + ImageFlagsPartiallyScalable = 0x0008, + ImageFlagsColorSpaceRGB = 0x0010, + ImageFlagsColorSpaceCMYK = 0x0020, + ImageFlagsColorSpaceGRAY = 0x0040, + ImageFlagsColorSpaceYCBCR = 0x0080, + ImageFlagsColorSpaceYCCK = 0x0100, + ImageFlagsHasRealDPI = 0x1000, + ImageFlagsHasRealPixelSize = 0x2000, + ImageFlagsReadOnly = 0x00010000, + ImageFlagsCaching = 0x00020000 }; enum CombineMode @@ -297,6 +315,7 @@ typedef enum DashStyle DashStyle; typedef enum MatrixOrder MatrixOrder; typedef enum ImageType ImageType; +typedef enum ImageFlags ImageFlags; typedef enum WrapMode WrapMode; typedef enum MetafileType MetafileType; typedef enum LinearGradientMode LinearGradientMode; Modified: trunk/reactos/include/psdk/gdiplusflat.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusflat.h…
============================================================================== --- trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] Sun Jun 1 08:13:10 2008 @@ -53,6 +53,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**); +GpStatus WINGDIPAPI GdipCreateFromHWNDICM(HWND,GpGraphics**); GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF*,GDIPCONST GpPointF*, ARGB,ARGB,GpWrapMode,GpLineGradient**); GpStatus WINGDIPAPI GdipCreateLineBrushI(GDIPCONST GpPoint*,GDIPCONST GpPoint*, @@ -122,7 +123,9 @@ GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics*,GpBrush*,GDIPCONST GpRectF*,INT); GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics*,GpBrush*,GDIPCONST GpRect*,INT); GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics*,CompositingMode*); +GpStatus WINGDIPAPI GdipGetClip(GpGraphics*,GpRegion*); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); +GpStatus WINGDIPAPI GdipGetDC(GpGraphics*,HDC*); GpStatus WINGDIPAPI GdipGetImageDimension(GpImage*,REAL*,REAL*); GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*); GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*); @@ -133,6 +136,7 @@ GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipMeasureString(GpGraphics*,GDIPCONST WCHAR*,INT, GDIPCONST GpFont*,GDIPCONST RectF*,GDIPCONST GpStringFormat*,RectF*,INT*,INT*); +GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics*,HDC); GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState); GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*); @@ -209,6 +213,8 @@ GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathLineI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL); +GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath*,REAL,REAL,REAL,REAL); +GpStatus WINGDIPAPI GdipAddPathRectangleI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipClonePath(GpPath*,GpPath**); GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*); GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*); @@ -301,6 +307,7 @@ GpStatus WINGDIPAPI GdipGetImageType(GpImage*,ImageType*); GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage*,REAL*); GpStatus WINGDIPAPI GdipGetImageWidth(GpImage*,UINT*); +GpStatus WINGDIPAPI GdipGetImageFlags(GpImage*,UINT*); GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE,MetafileHeader*); GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR*,MetafileHeader*); GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile*,MetafileHeader*); @@ -352,6 +359,14 @@ GpStatus WINGDIPAPI GdipGetDpiX(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetDpiY(GpGraphics*,REAL*); +GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **); +GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *, GpRegion **); +GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *); +GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *, GpGraphics *, HRGN *); +GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *); +GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *); + + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/winioctl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winioctl.h?re…
============================================================================== --- trunk/reactos/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winioctl.h [iso-8859-1] Sun Jun 1 08:13:10 2008 @@ -7,171 +7,171 @@ #ifdef __cplusplus extern "C" { #endif -#define HIST_NO_OF_BUCKETS 24 -#define HISTOGRAM_BUCKET_SIZE sizeof(HISTOGRAM_BUCKET) -#define DISK_HISTOGRAM_SIZE sizeof(DISK_HISTOGRAM) -#define CTL_CODE(t,f,m,a) (((t)<<16)|((a)<<14)|((f)<<2)|(m)) -#define DEVICE_TYPE_FROM_CTL_CODE(c) (((DWORD)((c)&0xffff0000))>>16) -#define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE -#define IOCTL_STORAGE_CHECK_VERIFY CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_STORAGE_CHECK_VERIFY2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_STORAGE_MEDIA_REMOVAL CTL_CODE(IOCTL_STORAGE_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_STORAGE_EJECT_MEDIA CTL_CODE(IOCTL_STORAGE_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_STORAGE_LOAD_MEDIA CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_STORAGE_LOAD_MEDIA2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_STORAGE_RESERVE CTL_CODE(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_STORAGE_RELEASE CTL_CODE(IOCTL_STORAGE_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_STORAGE_FIND_NEW_DEVICES CTL_CODE(IOCTL_STORAGE_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_STORAGE_EJECTION_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0250, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_STORAGE_MCN_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0251, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_STORAGE_GET_MEDIA_TYPES CTL_CODE(IOCTL_STORAGE_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define HIST_NO_OF_BUCKETS 24 +#define HISTOGRAM_BUCKET_SIZE sizeof(HISTOGRAM_BUCKET) +#define DISK_HISTOGRAM_SIZE sizeof(DISK_HISTOGRAM) +#define CTL_CODE(t,f,m,a) (((t)<<16)|((a)<<14)|((f)<<2)|(m)) +#define DEVICE_TYPE_FROM_CTL_CODE(c) (((DWORD)((c)&0xffff0000))>>16) +#define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE +#define IOCTL_STORAGE_CHECK_VERIFY CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_CHECK_VERIFY2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_MEDIA_REMOVAL CTL_CODE(IOCTL_STORAGE_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_EJECT_MEDIA CTL_CODE(IOCTL_STORAGE_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_LOAD_MEDIA CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_LOAD_MEDIA2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_RESERVE CTL_CODE(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_RELEASE CTL_CODE(IOCTL_STORAGE_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_FIND_NEW_DEVICES CTL_CODE(IOCTL_STORAGE_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_EJECTION_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0250, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_MCN_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0251, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_MEDIA_TYPES CTL_CODE(IOCTL_STORAGE_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_GET_MEDIA_TYPES_EX CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_STORAGE_RESET_BUS CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_STORAGE_RESET_DEVICE CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_STORAGE_GET_DEVICE_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_STORAGE_PREDICT_FAILURE CTL_CODE(IOCTL_STORAGE_BASE, 0x0440, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_DISK_BASE FILE_DEVICE_DISK -#define IOCTL_DISK_GET_DRIVE_GEOMETRY CTL_CODE(IOCTL_DISK_BASE,0,METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_DISK_GET_PARTITION_INFO CTL_CODE(IOCTL_DISK_BASE,1,METHOD_BUFFERED,FILE_READ_ACCESS) -#define IOCTL_DISK_SET_PARTITION_INFO CTL_CODE(IOCTL_DISK_BASE,2,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS) -#define IOCTL_DISK_GET_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE,3,METHOD_BUFFERED,FILE_READ_ACCESS) -#define IOCTL_DISK_SET_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE,4,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS) -#define IOCTL_DISK_VERIFY CTL_CODE(IOCTL_DISK_BASE,5,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define IOCTL_DISK_FORMAT_TRACKS CTL_CODE(IOCTL_DISK_BASE,6,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS) -#define IOCTL_DISK_REASSIGN_BLOCKS CTL_CODE(IOCTL_DISK_BASE,7,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS) -#define IOCTL_DISK_PERFORMANCE CTL_CODE(IOCTL_DISK_BASE,8,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define IOCTL_DISK_IS_WRITABLE CTL_CODE(IOCTL_DISK_BASE,9,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define IOCTL_DISK_LOGGING CTL_CODE(IOCTL_DISK_BASE,10,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define IOCTL_DISK_FORMAT_TRACKS_EX CTL_CODE(IOCTL_DISK_BASE,11,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS) -#define IOCTL_DISK_HISTOGRAM_STRUCTURE CTL_CODE(IOCTL_DISK_BASE,12,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define IOCTL_DISK_HISTOGRAM_DATA CTL_CODE(IOCTL_DISK_BASE,13,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define IOCTL_DISK_HISTOGRAM_RESET CTL_CODE(IOCTL_DISK_BASE,14,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define IOCTL_DISK_REQUEST_STRUCTURE CTL_CODE(IOCTL_DISK_BASE,15,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define IOCTL_DISK_REQUEST_DATA CTL_CODE(IOCTL_DISK_BASE,16,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define IOCTL_STORAGE_RESET_BUS CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_RESET_DEVICE CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_GET_DEVICE_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_PREDICT_FAILURE CTL_CODE(IOCTL_STORAGE_BASE, 0x0440, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_BASE FILE_DEVICE_DISK +#define IOCTL_DISK_GET_DRIVE_GEOMETRY CTL_CODE(IOCTL_DISK_BASE,0,METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_GET_PARTITION_INFO CTL_CODE(IOCTL_DISK_BASE,1,METHOD_BUFFERED,FILE_READ_ACCESS) +#define IOCTL_DISK_SET_PARTITION_INFO CTL_CODE(IOCTL_DISK_BASE,2,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS) +#define IOCTL_DISK_GET_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE,3,METHOD_BUFFERED,FILE_READ_ACCESS) +#define IOCTL_DISK_SET_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE,4,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS) +#define IOCTL_DISK_VERIFY CTL_CODE(IOCTL_DISK_BASE,5,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define IOCTL_DISK_FORMAT_TRACKS CTL_CODE(IOCTL_DISK_BASE,6,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS) +#define IOCTL_DISK_REASSIGN_BLOCKS CTL_CODE(IOCTL_DISK_BASE,7,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS) +#define IOCTL_DISK_PERFORMANCE CTL_CODE(IOCTL_DISK_BASE,8,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define IOCTL_DISK_IS_WRITABLE CTL_CODE(IOCTL_DISK_BASE,9,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define IOCTL_DISK_LOGGING CTL_CODE(IOCTL_DISK_BASE,10,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define IOCTL_DISK_FORMAT_TRACKS_EX CTL_CODE(IOCTL_DISK_BASE,11,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS) +#define IOCTL_DISK_HISTOGRAM_STRUCTURE CTL_CODE(IOCTL_DISK_BASE,12,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define IOCTL_DISK_HISTOGRAM_DATA CTL_CODE(IOCTL_DISK_BASE,13,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define IOCTL_DISK_HISTOGRAM_RESET CTL_CODE(IOCTL_DISK_BASE,14,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define IOCTL_DISK_REQUEST_STRUCTURE CTL_CODE(IOCTL_DISK_BASE,15,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define IOCTL_DISK_REQUEST_DATA CTL_CODE(IOCTL_DISK_BASE,16,METHOD_BUFFERED,FILE_ANY_ACCESS) #define IOCTL_DISK_GET_PARTITION_INFO_EX CTL_CODE(IOCTL_DISK_BASE,0x12,METHOD_BUFFERED,FILE_ANY_ACCESS) #define IOCTL_DISK_SET_PARTITION_INFO_EX CTL_CODE(IOCTL_DISK_BASE,0x13,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_DISK_GET_DRIVE_LAYOUT_EX CTL_CODE(IOCTL_DISK_BASE,0x14,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define IOCTL_DISK_SET_DRIVE_LAYOUT_EX CTL_CODE(IOCTL_DISK_BASE,0x15,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_DISK_CREATE_DISK CTL_CODE(IOCTL_DISK_BASE,0x16,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_DISK_GET_LENGTH_INFO CTL_CODE(IOCTL_DISK_BASE,0x17,METHOD_BUFFERED,FILE_READ_ACCESS) -#define IOCTL_DISK_PERFORMANCE_OFF CTL_CODE(IOCTL_DISK_BASE,0x18,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define IOCTL_DISK_GET_DRIVE_LAYOUT_EX CTL_CODE(IOCTL_DISK_BASE,0x14,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define IOCTL_DISK_SET_DRIVE_LAYOUT_EX CTL_CODE(IOCTL_DISK_BASE,0x15,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_CREATE_DISK CTL_CODE(IOCTL_DISK_BASE,0x16,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_GET_LENGTH_INFO CTL_CODE(IOCTL_DISK_BASE,0x17,METHOD_BUFFERED,FILE_READ_ACCESS) +#define IOCTL_DISK_PERFORMANCE_OFF CTL_CODE(IOCTL_DISK_BASE,0x18,METHOD_BUFFERED,FILE_ANY_ACCESS) #define IOCTL_DISK_GET_DRIVE_GEOMETRY_EX CTL_CODE(IOCTL_DISK_BASE,0x28,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define IOCTL_DISK_GROW_PARTITION CTL_CODE(IOCTL_DISK_BASE,0x34,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_GROW_PARTITION CTL_CODE(IOCTL_DISK_BASE,0x34,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_DISK_GET_CACHE_INFORMATION CTL_CODE(IOCTL_DISK_BASE,0x35,METHOD_BUFFERED,FILE_READ_ACCESS) #define IOCTL_DISK_SET_CACHE_INFORMATION CTL_CODE(IOCTL_DISK_BASE,0x36,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_DISK_DELETE_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE,0x40,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_DELETE_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE,0x40,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_DISK_UPDATE_PROPERTIES CTL_CODE(IOCTL_DISK_BASE,0x50,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define IOCTL_DISK_CHECK_VERIFY CTL_CODE(IOCTL_DISK_BASE,0x200,METHOD_BUFFERED,FILE_READ_ACCESS) -#define IOCTL_DISK_MEDIA_REMOVAL CTL_CODE(IOCTL_DISK_BASE,0x201,METHOD_BUFFERED,FILE_READ_ACCESS) -#define IOCTL_DISK_EJECT_MEDIA CTL_CODE(IOCTL_DISK_BASE,0x202,METHOD_BUFFERED,FILE_READ_ACCESS) -#define IOCTL_DISK_LOAD_MEDIA CTL_CODE(IOCTL_DISK_BASE,0x203,METHOD_BUFFERED,FILE_READ_ACCESS) -#define IOCTL_DISK_RESERVE CTL_CODE(IOCTL_DISK_BASE,0x204,METHOD_BUFFERED,FILE_READ_ACCESS) -#define IOCTL_DISK_RELEASE CTL_CODE(IOCTL_DISK_BASE,0x205,METHOD_BUFFERED,FILE_READ_ACCESS) -#define IOCTL_DISK_FIND_NEW_DEVICES CTL_CODE(IOCTL_DISK_BASE,0x206,METHOD_BUFFERED,FILE_READ_ACCESS) -#define IOCTL_DISK_REMOVE_DEVICE CTL_CODE(IOCTL_DISK_BASE,0x207,METHOD_BUFFERED,FILE_READ_ACCESS) -#define IOCTL_DISK_GET_MEDIA_TYPES CTL_CODE(IOCTL_DISK_BASE,0x300,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define IOCTL_DISK_CHECK_VERIFY CTL_CODE(IOCTL_DISK_BASE,0x200,METHOD_BUFFERED,FILE_READ_ACCESS) +#define IOCTL_DISK_MEDIA_REMOVAL CTL_CODE(IOCTL_DISK_BASE,0x201,METHOD_BUFFERED,FILE_READ_ACCESS) +#define IOCTL_DISK_EJECT_MEDIA CTL_CODE(IOCTL_DISK_BASE,0x202,METHOD_BUFFERED,FILE_READ_ACCESS) +#define IOCTL_DISK_LOAD_MEDIA CTL_CODE(IOCTL_DISK_BASE,0x203,METHOD_BUFFERED,FILE_READ_ACCESS) +#define IOCTL_DISK_RESERVE CTL_CODE(IOCTL_DISK_BASE,0x204,METHOD_BUFFERED,FILE_READ_ACCESS) +#define IOCTL_DISK_RELEASE CTL_CODE(IOCTL_DISK_BASE,0x205,METHOD_BUFFERED,FILE_READ_ACCESS) +#define IOCTL_DISK_FIND_NEW_DEVICES CTL_CODE(IOCTL_DISK_BASE,0x206,METHOD_BUFFERED,FILE_READ_ACCESS) +#define IOCTL_DISK_REMOVE_DEVICE CTL_CODE(IOCTL_DISK_BASE,0x207,METHOD_BUFFERED,FILE_READ_ACCESS) +#define IOCTL_DISK_GET_MEDIA_TYPES CTL_CODE(IOCTL_DISK_BASE,0x300,METHOD_BUFFERED,FILE_ANY_ACCESS) #define IOCTL_DISK_UPDATE_DRIVE_SIZE CTL_CODE(IOCTL_DISK_BASE, 0x0032, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_SERIAL_LSRMST_INSERT CTL_CODE(FILE_DEVICE_SERIAL_PORT,31,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define FSCTL_LOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,6,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define FSCTL_UNLOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,7,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define FSCTL_PIPE_IMPERSONATE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 7, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_DISMOUNT_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,8,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define FSCTL_MOUNT_DBLS_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,13,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define FSCTL_GET_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM,15,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define FSCTL_SET_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM,16,METHOD_BUFFERED,FILE_READ_DATA|FILE_WRITE_DATA) -#define FSCTL_READ_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM,17,METHOD_NEITHER,FILE_READ_DATA) -#define FSCTL_WRITE_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM,18,METHOD_NEITHER,FILE_WRITE_DATA) -#define FSCTL_GET_NTFS_VOLUME_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM,25,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define FSCTL_GET_VOLUME_BITMAP CTL_CODE(FILE_DEVICE_FILE_SYSTEM,27,METHOD_NEITHER,FILE_ANY_ACCESS) +#define IOCTL_SERIAL_LSRMST_INSERT CTL_CODE(FILE_DEVICE_SERIAL_PORT,31,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define FSCTL_LOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,6,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define FSCTL_UNLOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,7,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define FSCTL_PIPE_IMPERSONATE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 7, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_DISMOUNT_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,8,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define FSCTL_MOUNT_DBLS_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,13,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define FSCTL_GET_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM,15,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define FSCTL_SET_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM,16,METHOD_BUFFERED,FILE_READ_DATA|FILE_WRITE_DATA) +#define FSCTL_READ_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM,17,METHOD_NEITHER,FILE_READ_DATA) +#define FSCTL_WRITE_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM,18,METHOD_NEITHER,FILE_WRITE_DATA) +#define FSCTL_GET_NTFS_VOLUME_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM,25,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define FSCTL_GET_VOLUME_BITMAP CTL_CODE(FILE_DEVICE_FILE_SYSTEM,27,METHOD_NEITHER,FILE_ANY_ACCESS) #define FSCTL_GET_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM,28,METHOD_NEITHER,FILE_ANY_ACCESS) -#define FSCTL_MOVE_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM,29,METHOD_BUFFERED,FILE_ANY_ACCESS) -#define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_SET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_DELETE_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 43, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_SET_SPARSE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_MOVE_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM,29,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_SET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_DELETE_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 43, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_SET_SPARSE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) #define DEVICE_TYPE DWORD -#define FILE_DEVICE_BEEP 1 -#define FILE_DEVICE_CD_ROM 2 -#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 3 -#define FILE_DEVICE_CONTROLLER 4 -#define FILE_DEVICE_DATALINK 5 -#define FILE_DEVICE_DFS 6 -#define FILE_DEVICE_DISK 7 -#define FILE_DEVICE_DISK_FILE_SYSTEM 8 -#define FILE_DEVICE_FILE_SYSTEM 9 -#define FILE_DEVICE_INPORT_PORT 10 -#define FILE_DEVICE_KEYBOARD 11 -#define FILE_DEVICE_MAILSLOT 12 -#define FILE_DEVICE_MIDI_IN 13 -#define FILE_DEVICE_MIDI_OUT 14 -#define FILE_DEVICE_MOUSE 15 +#define FILE_DEVICE_BEEP 1 +#define FILE_DEVICE_CD_ROM 2 +#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 3 +#define FILE_DEVICE_CONTROLLER 4 +#define FILE_DEVICE_DATALINK 5 +#define FILE_DEVICE_DFS 6 +#define FILE_DEVICE_DISK 7 +#define FILE_DEVICE_DISK_FILE_SYSTEM 8 +#define FILE_DEVICE_FILE_SYSTEM 9 +#define FILE_DEVICE_INPORT_PORT 10 +#define FILE_DEVICE_KEYBOARD 11 +#define FILE_DEVICE_MAILSLOT 12 +#define FILE_DEVICE_MIDI_IN 13 +#define FILE_DEVICE_MIDI_OUT 14 +#define FILE_DEVICE_MOUSE 15 #define FILE_DEVICE_MULTI_UNC_PROVIDER 16 -#define FILE_DEVICE_NAMED_PIPE 17 -#define FILE_DEVICE_NETWORK 18 -#define FILE_DEVICE_NETWORK_BROWSER 19 -#define FILE_DEVICE_NETWORK_FILE_SYSTEM 20 -#define FILE_DEVICE_NULL 21 -#define FILE_DEVICE_PARALLEL_PORT 22 -#define FILE_DEVICE_PHYSICAL_NETCARD 23 -#define FILE_DEVICE_PRINTER 24 -#define FILE_DEVICE_SCANNER 25 -#define FILE_DEVICE_SERIAL_MOUSE_PORT 26 -#define FILE_DEVICE_SERIAL_PORT 27 -#define FILE_DEVICE_SCREEN 28 -#define FILE_DEVICE_SOUND 29 -#define FILE_DEVICE_STREAMS 30 -#define FILE_DEVICE_TAPE 31 -#define FILE_DEVICE_TAPE_FILE_SYSTEM 32 -#define FILE_DEVICE_TRANSPORT 33 -#define FILE_DEVICE_UNKNOWN 34 -#define FILE_DEVICE_VIDEO 35 -#define FILE_DEVICE_VIRTUAL_DISK 36 -#define FILE_DEVICE_WAVE_IN 37 -#define FILE_DEVICE_WAVE_OUT 38 -#define FILE_DEVICE_8042_PORT 39 -#define FILE_DEVICE_NETWORK_REDIRECTOR 40 -#define FILE_DEVICE_BATTERY 41 -#define FILE_DEVICE_BUS_EXTENDER 42 -#define FILE_DEVICE_MODEM 43 -#define FILE_DEVICE_VDM 44 -#define FILE_DEVICE_MASS_STORAGE 45 -#define FILE_DEVICE_SMB 46 -#define FILE_DEVICE_KS 47 -#define FILE_DEVICE_CHANGER 48 -#define FILE_DEVICE_SMARTCARD 49 -#define FILE_DEVICE_ACPI 50 -#define FILE_DEVICE_DVD 51 -#define FILE_DEVICE_FULLSCREEN_VIDEO 52 -#define FILE_DEVICE_DFS_FILE_SYSTEM 53 -#define FILE_DEVICE_DFS_VOLUME 54 -#define FILE_DEVICE_SERENUM 55 -#define FILE_DEVICE_TERMSRV 56 -#define FILE_DEVICE_KSEC 57 -#define PARTITION_ENTRY_UNUSED 0 -#define PARTITION_FAT_12 1 -#define PARTITION_XENIX_1 2 -#define PARTITION_XENIX_2 3 -#define PARTITION_FAT_16 4 -#define PARTITION_EXTENDED 5 -#define PARTITION_HUGE 6 -#define PARTITION_IFS 7 -#define PARTITION_FAT32 0x0B -#define PARTITION_FAT32_XINT13 0x0C -#define PARTITION_XINT13 0x0E -#define PARTITION_XINT13_EXTENDED 0x0F -#define PARTITION_PREP 0x41 -#define PARTITION_LDM 0x42 -#define PARTITION_UNIX 0x63 -#define PARTITION_NTFT 128 -#define VALID_NTFT 0xC0 -#define METHOD_BUFFERED 0 -#define METHOD_IN_DIRECT 1 -#define METHOD_OUT_DIRECT 2 -#define METHOD_NEITHER 3 -#define SERIAL_LSRMST_ESCAPE 0 -#define SERIAL_LSRMST_LSR_DATA 1 -#define SERIAL_LSRMST_LSR_NODATA 2 -#define SERIAL_LSRMST_MST 3 +#define FILE_DEVICE_NAMED_PIPE 17 +#define FILE_DEVICE_NETWORK 18 +#define FILE_DEVICE_NETWORK_BROWSER 19 +#define FILE_DEVICE_NETWORK_FILE_SYSTEM 20 +#define FILE_DEVICE_NULL 21 +#define FILE_DEVICE_PARALLEL_PORT 22 +#define FILE_DEVICE_PHYSICAL_NETCARD 23 +#define FILE_DEVICE_PRINTER 24 +#define FILE_DEVICE_SCANNER 25 +#define FILE_DEVICE_SERIAL_MOUSE_PORT 26 +#define FILE_DEVICE_SERIAL_PORT 27 +#define FILE_DEVICE_SCREEN 28 +#define FILE_DEVICE_SOUND 29 +#define FILE_DEVICE_STREAMS 30 +#define FILE_DEVICE_TAPE 31 +#define FILE_DEVICE_TAPE_FILE_SYSTEM 32 +#define FILE_DEVICE_TRANSPORT 33 +#define FILE_DEVICE_UNKNOWN 34 +#define FILE_DEVICE_VIDEO 35 +#define FILE_DEVICE_VIRTUAL_DISK 36 +#define FILE_DEVICE_WAVE_IN 37 +#define FILE_DEVICE_WAVE_OUT 38 +#define FILE_DEVICE_8042_PORT 39 +#define FILE_DEVICE_NETWORK_REDIRECTOR 40 +#define FILE_DEVICE_BATTERY 41 +#define FILE_DEVICE_BUS_EXTENDER 42 +#define FILE_DEVICE_MODEM 43 +#define FILE_DEVICE_VDM 44 +#define FILE_DEVICE_MASS_STORAGE 45 +#define FILE_DEVICE_SMB 46 +#define FILE_DEVICE_KS 47 +#define FILE_DEVICE_CHANGER 48 +#define FILE_DEVICE_SMARTCARD 49 +#define FILE_DEVICE_ACPI 50 +#define FILE_DEVICE_DVD 51 +#define FILE_DEVICE_FULLSCREEN_VIDEO 52 +#define FILE_DEVICE_DFS_FILE_SYSTEM 53 +#define FILE_DEVICE_DFS_VOLUME 54 +#define FILE_DEVICE_SERENUM 55 +#define FILE_DEVICE_TERMSRV 56 +#define FILE_DEVICE_KSEC 57 +#define PARTITION_ENTRY_UNUSED 0 +#define PARTITION_FAT_12 1 +#define PARTITION_XENIX_1 2 +#define PARTITION_XENIX_2 3 +#define PARTITION_FAT_16 4 +#define PARTITION_EXTENDED 5 +#define PARTITION_HUGE 6 +#define PARTITION_IFS 7 +#define PARTITION_FAT32 0x0B +#define PARTITION_FAT32_XINT13 0x0C +#define PARTITION_XINT13 0x0E +#define PARTITION_XINT13_EXTENDED 0x0F +#define PARTITION_PREP 0x41 +#define PARTITION_LDM 0x42 +#define PARTITION_UNIX 0x63 +#define PARTITION_NTFT 128 +#define VALID_NTFT 0xC0 +#define METHOD_BUFFERED 0 +#define METHOD_IN_DIRECT 1 +#define METHOD_OUT_DIRECT 2 +#define METHOD_NEITHER 3 +#define SERIAL_LSRMST_ESCAPE 0 +#define SERIAL_LSRMST_LSR_DATA 1 +#define SERIAL_LSRMST_LSR_NODATA 2 +#define SERIAL_LSRMST_MST 3 /* Device GUIDs */ #ifdef DEFINE_GUID @@ -187,28 +187,28 @@ #endif /* DEFINE_GUID */ /* Also in ddk/winddk.h */ -#define FILE_ANY_ACCESS 0x00000000 -#define FILE_SPECIAL_ACCESS FILE_ANY_ACCESS -#define FILE_READ_ACCESS 0x00000001 -#define FILE_WRITE_ACCESS 0x00000002 - -#define DISK_LOGGING_START 0 -#define DISK_LOGGING_STOP 1 -#define DISK_LOGGING_DUMP 2 -#define DISK_BINNING 3 +#define FILE_ANY_ACCESS 0x00000000 +#define FILE_SPECIAL_ACCESS FILE_ANY_ACCESS +#define FILE_READ_ACCESS 0x00000001 +#define FILE_WRITE_ACCESS 0x00000002 + +#define DISK_LOGGING_START 0 +#define DISK_LOGGING_STOP 1 +#define DISK_LOGGING_DUMP 2 +#define DISK_BINNING 3 typedef WORD BAD_TRACK_NUMBER,*PBAD_TRACK_NUMBER; typedef enum _BIN_TYPES {RequestSize,RequestLocation} BIN_TYPES; typedef struct _BIN_RANGE { - LARGE_INTEGER StartValue; - LARGE_INTEGER Length; + LARGE_INTEGER StartValue; + LARGE_INTEGER Length; } BIN_RANGE,*PBIN_RANGE; typedef struct _BIN_COUNT { - BIN_RANGE BinRange; - DWORD BinCount; + BIN_RANGE BinRange; + DWORD BinCount; } BIN_COUNT,*PBIN_COUNT; typedef struct _BIN_RESULTS { - DWORD NumberOfBins; - BIN_COUNT BinCounts[1]; + DWORD NumberOfBins; + BIN_COUNT BinCounts[1]; } BIN_RESULTS,*PBIN_RESULTS; typedef enum _PARTITION_STYLE { PARTITION_STYLE_MBR, @@ -536,24 +536,24 @@ #define IsRecognizedPartition(t)\ (((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT_12))||\ - ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT_16))||\ - ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_IFS))||\ - ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_HUGE))||\ - ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32))||\ - ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32_XINT13))||\ - ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13))||\ - ((t&~PARTITION_NTFT)==PARTITION_FAT_12)||\ - ((t&~PARTITION_NTFT)==PARTITION_FAT_16)||\ - ((t&~PARTITION_NTFT)==PARTITION_IFS)||\ - ((t&~PARTITION_NTFT)==PARTITION_HUGE)||\ - ((t&~PARTITION_NTFT)==PARTITION_FAT32)||\ - ((t&~PARTITION_NTFT)==PARTITION_FAT32_XINT13)||\ - ((t&~PARTITION_NTFT)==PARTITION_XINT13)) + ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT_16))||\ + ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_IFS))||\ + ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_HUGE))||\ + ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32))||\ + ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32_XINT13))||\ + ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13))||\ + ((t&~PARTITION_NTFT)==PARTITION_FAT_12)||\ + ((t&~PARTITION_NTFT)==PARTITION_FAT_16)||\ + ((t&~PARTITION_NTFT)==PARTITION_IFS)||\ + ((t&~PARTITION_NTFT)==PARTITION_HUGE)||\ + ((t&~PARTITION_NTFT)==PARTITION_FAT32)||\ + ((t&~PARTITION_NTFT)==PARTITION_FAT32_XINT13)||\ + ((t&~PARTITION_NTFT)==PARTITION_XINT13)) #define IsContainerPartition(t)\ (((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_EXTENDED))||\ - ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13_EXTENDED))||\ - ((t&~PARTITION_NTFT)==PARTITION_EXTENDED)||\ - ((t&~PARTITION_NTFT)==PARTITION_XINT13_EXTENDED)) + ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13_EXTENDED))||\ + ((t&~PARTITION_NTFT)==PARTITION_EXTENDED)||\ + ((t&~PARTITION_NTFT)==PARTITION_XINT13_EXTENDED)) #ifdef __cplusplus } #endif
16 years, 6 months
1
0
0
0
[dchapyshev] 33802: - Add language groups
by dchapyshev@svn.reactos.org
Author: dchapyshev Date: Sun Jun 1 08:07:38 2008 New Revision: 33802 URL:
http://svn.reactos.org/svn/reactos?rev=33802&view=rev
Log: - Add language groups Modified: trunk/reactos/media/inf/intl.inf Modified: trunk/reactos/media/inf/intl.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/intl.inf?rev=338…
============================================================================== --- trunk/reactos/media/inf/intl.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/intl.inf [iso-8859-1] Sun Jun 1 08:07:38 2008 @@ -335,3 +335,90 @@ 52936 = "52936 (HZ-GB2312 Simplified Chinese)" 54936 = "54936 (GB18030 Simplified Chinese)" + +[LanguageGroups] +1 = "Western Europe and United States", +2 = "Central Europe", +3 = "Baltic", +4 = "Greek", +5 = "Cyrillic", +6 = "Turkic", +7 = "Japanese",lang +8 = "Korean",lang +9 = "Traditional Chinese",lang +10 = "Simplified Chinese",lang +11 = "Thai", +12 = "Hebrew", +13 = "Arabic", +14 = "Vietnamese", +15 = "Indic", +16 = "Georgian", +17 = "Armenian", + +[LG_INSTALL_1] + +[LG_REMOVE_1] + +[LG_INSTALL_2] + +[LG_REMOVE_2] + +[LG_INSTALL_3] + +[LG_REMOVE_3] + +[LG_INSTALL_4] + +[LG_REMOVE_4] + +[LG_INSTALL_5] + +[LG_REMOVE_5] + +[LG_INSTALL_6] + +[LG_REMOVE_6] + +[LG_INSTALL_7] + +[LG_REMOVE_7] + +[LG_INSTALL_8] + +[LG_REMOVE_8] + +[LG_INSTALL_9] + +[LG_REMOVE_9] + +[LG_INSTALL_10] + +[LG_REMOVE_10] + +[LG_INSTALL_11] + +[LG_REMOVE_11] + +[LG_INSTALL_12] + +[LG_REMOVE_12] + +[LG_INSTALL_13] + +[LG_REMOVE_13] + +[LG_INSTALL_14] + +[LG_REMOVE_14] + +[LG_INSTALL_15] + +[LG_REMOVE_15] + +[LG_INSTALL_16] + +[LG_REMOVE_16] + +[LG_INSTALL_17] + +[LG_REMOVE_17]
16 years, 6 months
1
0
0
0
[dchapyshev] 33801: - Remove SysFontSubstitutes values
by dchapyshev@svn.reactos.org
Author: dchapyshev Date: Sun Jun 1 08:05:55 2008 New Revision: 33801 URL:
http://svn.reactos.org/svn/reactos?rev=33801&view=rev
Log: - Remove SysFontSubstitutes values Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?…
============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Jun 1 08:05:55 2008 @@ -72,17 +72,7 @@ ; Font substitutes ; SysFontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"Liberation Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Bitstream Vera Sans",0x00000000,"DejaVu Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Bitstream Vera Sans Mono",0x00000000,"DejaVu Sans Mono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Bitstream Vera Serif",0x00000000,"DejaVu Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"DejaVu Sans Mono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"Liberation Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"DejaVu Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"DejaVu Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"Liberation Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes",,0x00000012 ; Time zone settings HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones",,0x00000012
16 years, 6 months
1
0
0
0
[dchapyshev] 33800: - Move layouts to lang headers - Other small changes
by dchapyshev@svn.reactos.org
Author: dchapyshev Date: Sun Jun 1 07:52:18 2008 New Revision: 33800 URL:
http://svn.reactos.org/svn/reactos?rev=33800&view=rev
Log: - Move layouts to lang headers - Other small changes Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/muilanguages.h trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-…
============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -1,5 +1,12 @@ #ifndef LANG_BG_BG_H__ #define LANG_BG_BG_H__ + +MUI_LAYOUTS bgBGLayouts[] = +{ + { L"0402", L"00000402" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; static MUI_ENTRY bgBGLanguagePageEntries[] = { @@ -1079,7 +1086,7 @@ { 6, 8, - "᪠⥠¤ ᬥ¨â¥ ª« ¢¨ âãà â ¯®¤à¥¤¡ .", + "Please select a layout to be installed by default.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-…
============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -7,6 +7,13 @@ #ifndef LANG_CS_CZ_H__ #define LANG_CS_CZ_H__ +MUI_LAYOUTS csCZLayouts[] = +{ + { L"0405", L"00000405" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + static MUI_ENTRY csCZLanguagePageEntries[] = { { @@ -1078,7 +1085,7 @@ { 6, 8, - "Chcete zmØnit rozlo§en¡ kl ves, kter bude nainstalov no.", + "Please select a layout to be installed by default.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-…
============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -1,5 +1,12 @@ #ifndef LANG_DE_DE_H__ #define LANG_DE_DE_H__ + +MUI_LAYOUTS deDELayouts[] = +{ + { L"0407", L"00000407" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; static MUI_ENTRY deDELanguagePageEntries[] = { @@ -1072,7 +1079,7 @@ { 6, 8, - "Sie wollen das Tastaturlayout ndern, der installiert wird.", + "Please select a layout to be installed by default.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-…
============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -1,5 +1,12 @@ #ifndef LANG_EL_GR_H__ #define LANG_EL_GR_H__ + +MUI_LAYOUTS elGRLayouts[] = +{ + { L"0408", L"00000408" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; static MUI_ENTRY elGRLanguagePageEntries[] = { @@ -1101,7 +1108,7 @@ { 6, 8, - "⢫ ¤ ¢¢á¥« «¤ á«¥ «¦¬ §¢¡«¨¦¢¦å¦¬ §¦¬ ¡«©«å.", + "Please select a layout to be installed by default.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-…
============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -1,5 +1,11 @@ #ifndef LANG_EN_US_H__ #define LANG_EN_US_H__ + +MUI_LAYOUTS enUSLayouts[] = +{ + { L"0409", L"00000409" }, + { NULL, NULL } +}; static MUI_ENTRY enUSLanguagePageEntries[] = { @@ -1072,7 +1078,7 @@ { 6, 8, - "You want to change the keyboard layout to be installed.", + "Please select a layout to be installed by default.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-…
============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -1,5 +1,12 @@ #ifndef LANG_ES_ES_H__ #define LANG_ES_ES_H__ + +MUI_LAYOUTS esESLayouts[] = +{ + { L"040A", L"0000040A" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; static MUI_ENTRY esESLanguagePageEntries[] = { @@ -1072,7 +1079,7 @@ { 6, 8, - "Desea cambiar la disposici¢n del teclado a instalar.", + "Please select a layout to be installed by default.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-…
============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -1,5 +1,12 @@ #ifndef LANG_FR_FR_H__ #define LANG_FR_FR_H__ + +MUI_LAYOUTS frFRLayouts[] = +{ + { L"040C", L"0000040C" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; static MUI_ENTRY frFRLanguagePageEntries[] = { @@ -1084,7 +1091,7 @@ { 6, 8, - "Vous voulez changer la disposition du clavier.", + "Please select a layout to be installed by default.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-…
============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -1,5 +1,12 @@ #ifndef LANG_IT_IT_H__ #define LANG_IT_IT_H__ + +MUI_LAYOUTS itITLayouts[] = +{ + { L"0410", L"00000410" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; static MUI_ENTRY itITLanguagePageEntries[] = { @@ -1072,7 +1079,7 @@ { 6, 8, - "Volete cambiare il tipo di layout di tastiera da installare.", + "Please select a layout to be installed by default.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-…
============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -10,6 +10,13 @@ #ifndef LANG_LT_LT_H__ #define LANG_LT_LT_H__ +MUI_LAYOUTS ltLTLayouts[] = +{ + { L"0427", L"00000427" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + static MUI_ENTRY ltLTLanguagePageEntries[] = { { @@ -1081,7 +1088,7 @@ { 6, 8, - "You want to change the keyboard layout to be installed.", + "Please select a layout to be installed by default.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-…
============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -8,6 +8,14 @@ #ifndef LANG_PL_PL_H__ #define LANG_PL_PL_H__ +MUI_LAYOUTS plPLLayouts[] = +{ + { L"0415", L"00000415" }, + { L"0415", L"00010415" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + static MUI_ENTRY plPLLanguagePageEntries[] = { { @@ -1079,7 +1087,7 @@ { 6, 8, - "Chcesz zmieni ukad klawiatury, jaki ma by zainstalowany.", + "Please select a layout to be installed by default.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-…
============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -1,5 +1,12 @@ #ifndef LANG_RU_RU_H__ #define LANG_RU_RU_H__ + +MUI_LAYOUTS ruRULayouts[] = +{ + { L"0419", L"00000419" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; static MUI_ENTRY ruRULanguagePageEntries[] = { @@ -1072,7 +1079,7 @@ { 6, 8, - "ë¡®à ãáâ ¢«¨¢ ¥¬®© à ᪫ ¤ª¨ ª« ¢¨ âãàë.", + "®¦ «ã©á⠢롥à¨â¥ à ᪫ ¤ªã, ª®â®à ï ¡ã¤¥â ãáâ ®¢«¥ ¯® 㬮«ç ¨î.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-…
============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -7,6 +7,13 @@ #ifndef LANG_SK_SK_H__ #define LANG_SK_SK_H__ +MUI_LAYOUTS skSKLayouts[] = +{ + { L"041B", L"0000041B" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + static MUI_ENTRY skSKLanguagePageEntries[] = { { @@ -1079,7 +1086,7 @@ { 6, 8, - "Chcete zmeni rozlo§enie kl vesnice, ktor m by nainçtalovan.", + "Please select a layout to be installed by default.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-…
============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -1,5 +1,12 @@ #ifndef LANG_SV_SE_H__ #define LANG_SV_SE_H__ + +MUI_LAYOUTS svSELayouts[] = +{ + { L"041D", L"0000041D" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; static MUI_ENTRY svSELanguagePageEntries[] = { @@ -1072,7 +1079,7 @@ { 6, 8, - "You want to change the keyboard layout to be installed.", + "Please select a layout to be installed by default.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-…
============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -1,5 +1,12 @@ #ifndef LANG_UK_UA_H__ #define LANG_UK_UA_H__ + +MUI_LAYOUTS ukUALayouts[] = +{ + { L"0422", L"00000422" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; static MUI_ENTRY ukUALanguagePageEntries[] = { Modified: trunk/reactos/base/setup/usetup/mui.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re…
============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -109,7 +109,14 @@ MUIDefaultKeyboardLayout(VOID) { ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].LanguageKeyboardLayoutID; + return LanguageList[lngIndex].MuiLayouts[0].LayoutID; +} + +const MUI_LAYOUTS * +MUIGetLayoutsList(VOID) +{ + ULONG lngIndex = max(FindLanguageIndex(), 0); + return LanguageList[lngIndex].MuiLayouts; } VOID @@ -286,16 +293,21 @@ return TRUE; } -static BOOLEAN -AddKbLayoutsToRegistry(IN LPCWSTR DefKbLayout, IN LPCWSTR SecKbLayout) +BOOLEAN +AddKbLayoutsToRegistry(IN const MUI_LAYOUTS * MuiLayouts) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; UNICODE_STRING ValueName; HANDLE KeyHandle; + HANDLE SubKeyHandle; NTSTATUS Status; ULONG Disposition; + ULONG uIndex = 0; + ULONG uCount = 0; WCHAR szKeyName[48] = L"\\Registry\\User\\.DEFAULT\\Keyboard Layout"; + WCHAR szValueName[3 + 1]; + WCHAR szLangID[8 + 1]; // Open the keyboard layout key RtlInitUnicodeString(&KeyName, @@ -352,50 +364,100 @@ return FALSE; } - /* Set def keyboard layout */ - RtlInitUnicodeString(&ValueName, - L"1"); - - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)DefKbLayout, - (8 + 1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - if (SecKbLayout != NULL) - { - /* Set second keyboard layout */ - RtlInitUnicodeString(&ValueName, - L"2"); - - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)SecKbLayout, - (8 + 1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - /* - Switching input languages - Ctrl + Shift - Switching keyboard layouts - Left Alt + Shift - */ + RtlInitUnicodeString(&KeyName, L"\\Registry\\User\\.DEFAULT\\Keyboard Layout\\Substitutes"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateKey(&SubKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); + NtClose(SubKeyHandle); + NtClose(KeyHandle); + return FALSE; + } + + do + { + if (uIndex > 19) break; + + swprintf(szValueName, L"%d", uIndex + 1); + RtlInitUnicodeString(&ValueName, szValueName); + + swprintf(szLangID, L"0000%s", MuiLayouts[uIndex].LangID); + + if (wcscmp(szLangID, MuiLayouts[uIndex].LayoutID) == 0) + { + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)MuiLayouts[uIndex].LayoutID, + wcslen(MuiLayouts[uIndex].LayoutID) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); + NtClose(SubKeyHandle); + NtClose(KeyHandle); + return FALSE; + } + } + else + { + swprintf(szLangID, L"d%03d%s", uCount, MuiLayouts[uIndex].LangID); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)szLangID, + wcslen(szLangID) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); + NtClose(SubKeyHandle); + NtClose(KeyHandle); + return FALSE; + } + + RtlInitUnicodeString(&ValueName, szLangID); + + Status = NtSetValueKey(SubKeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)MuiLayouts[uIndex].LayoutID, + wcslen(MuiLayouts[uIndex].LayoutID) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); + NtClose(SubKeyHandle); + NtClose(KeyHandle); + return FALSE; + } + + uCount++; + } + + uIndex++; + } + while (MuiLayouts[uIndex].LangID != NULL); + + if (uIndex > 1) AddHotkeySettings(L"2", L"2", L"1"); - } - else AddHotkeySettings(L"3", L"3", L"3"); // Off all hotkeys - + else + AddHotkeySettings(L"3", L"3", L"3"); + + NtClose(SubKeyHandle); NtClose(KeyHandle); return TRUE; } @@ -408,8 +470,7 @@ { if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) { - return AddKbLayoutsToRegistry(LanguageList[lngIndex].LanguageKeyboardLayoutID, - LanguageList[lngIndex].SecondLangKbLayoutID); + return AddKbLayoutsToRegistry(LanguageList[lngIndex].MuiLayouts); } lngIndex++; @@ -529,7 +590,7 @@ 0, REG_SZ, (PVOID)MuiSubFonts[uIndex].SubFontName, - wcslen(MuiSubFonts[uIndex].SubFontName) * sizeof(PWCHAR)); + (wcslen(MuiSubFonts[uIndex].SubFontName)+1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); Modified: trunk/reactos/base/setup/usetup/mui.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re…
============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -29,15 +29,19 @@ typedef struct { - LPCWSTR FontName; - LPCWSTR SubFontName; + PWCHAR FontName; + PWCHAR SubFontName; } MUI_SUBFONT; typedef struct { + PWCHAR LangID; // Language ID (like "0409") + PWCHAR LayoutID; // Layout ID (like "00000409") +} MUI_LAYOUTS; + +typedef struct +{ PWCHAR LanguageID; - PWCHAR LanguageKeyboardLayoutID; - PWCHAR SecondLangKbLayoutID; PWCHAR ACPage; PWCHAR OEMCPage; PWCHAR MACCPage; @@ -46,6 +50,7 @@ const MUI_ERROR * MuiErrors; const MUI_STRING * MuiStrings; const MUI_SUBFONT * MuiSubFonts; + const MUI_LAYOUTS * MuiLayouts; } MUI_LANGUAGE; VOID @@ -56,6 +61,12 @@ LPCWSTR MUIDefaultKeyboardLayout(VOID); + +const MUI_LAYOUTS * +MUIGetLayoutsList(VOID); + +BOOLEAN +AddKbLayoutsToRegistry(IN const MUI_LAYOUTS * MuiLayouts); BOOLEAN AddCodePage(VOID); Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu…
============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -18,59 +18,97 @@ const MUI_LANGUAGE LanguageList[] = { - /* Lang ID, DefKbdLayout, SecKbLayout, ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings */ - {L"00000409", L"00000409", NULL, L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, - {L"0000041C", L"0000041C", L"00000409", L"1250", L"852", L"10029", L"Albanian", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts }, - {L"00000401", L"00000401", L"00000409", L"1256", L"720", L"10004", L"Arabic", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts }, - {L"0000042B", L"0000042B", L"00000409", L"0", L"1", L"2", L"Armenian Eastern", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts}, - {L"0000082C", L"0000082C", L"00000409", L"1251", L"866", L"10007", L"Azeri Cyrillic", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts }, - {L"0000042C", L"0000042C", L"00000409", L"1254", L"857", L"10081", L"Azeri Latin", enUSPages, enUSErrorEntries, enUSStrings, CP1254Fonts }, - {L"00000423", L"00000423", L"00000409", L"1251", L"866", L"10007", L"Belarusian", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts }, - {L"00000813", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Belgian (Dutch)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, - {L"0000080C", L"0000080C", L"00000409", L"1252", L"850", L"10000", L"Belgian (French)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, - {L"00000416", L"00010416", L"00000409", L"1252", L"850", L"10000", L"Brazilian", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, - {L"00000402", L"00000402", L"00000409", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings, CP1251Fonts }, - {L"00000455", L"00000455", L"00000409", L"0", L"1", L"2", L"Burmese", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts}, - {L"00000C0C", L"00000C0C", L"00000409", L"1252", L"850", L"10000", L"Canadian (French)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, - {L"00000403", L"0000040A", L"00000409", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, - {L"00000804", L"00000804", L"00000409", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings, CP936Fonts }, - {L"00000405", L"00000405", L"00000409", L"1250", L"852", L"10029", L"Czech", csCZPages, csCZErrorEntries, csCZStrings, CP1250Fonts }, - {L"00000406", L"00000406", L"00000409", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, - {L"00000407", L"00000407", L"00000409", L"1252", L"850", L"10000", L"Deutsch", deDEPages, deDEErrorEntries, deDEStrings, CP1252Fonts }, - {L"00000413", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, - {L"00000425", L"00000425", L"00000409", L"1257", L"775", L"10029", L"Estonian", enUSPages, enUSErrorEntries, enUSStrings, CP1257Fonts }, - {L"0000040B", L"0000040B", L"00000409", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, - {L"0000040C", L"0000040C", L"00000409", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, frFRStrings, CP1252Fonts }, - {L"00000437", L"00000437", L"00000409", L"0", L"1", L"2", L"Georgian", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts}, - {L"00000408", L"00000408", L"00000409", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings, CP1253Fonts }, - {L"0000040D", L"0000040D", L"00000409", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings, CP1255Fonts }, - {L"0000040E", L"0000040E", L"00000409", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts }, - {L"0000040F", L"0000040F", L"00000409", L"1252", L"850", L"10079", L"Icelandic", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, - {L"00000410", L"00000410", L"00000409", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, itITStrings, CP1252Fonts }, - {L"00000411", L"00000411", L"00000409", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings, CP932Fonts }, - {L"0000043F", L"0000043F", L"00000409", L"1251", L"866", L"10007", L"Kazakh", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts }, - {L"00000412", L"00000412", L"00000409", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings, CP949Fonts }, - {L"00000426", L"00000426", L"00000409", L"1257", L"775", L"10029", L"Latvian", enUSPages, enUSErrorEntries, enUSStrings, CP1257Fonts }, - {L"00000427", L"00000427", L"00000409", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings, CP1257Fonts }, - {L"0000042F", L"0000042F", L"00000409", L"1251", L"866", L"10007", L"Macedonian", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts }, - {L"00000414", L"00000414", L"00000409", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, - {L"00000418", L"00000418", L"00000409", L"1250", L"852", L"10029", L"Romanian", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts }, - {L"00000419", L"00000419", L"00000409", L"1251", L"866", L"10007", L"Russkij", ruRUPages, ruRUErrorEntries, ruRUStrings, CP1251Fonts }, - {L"00000415", L"00000415", L"00000409", L"1250", L"852", L"10029", L"Polski", plPLPages, plPLErrorEntries, plPLStrings, CP1250Fonts }, - {L"00000816", L"00000816", L"00000409", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, - {L"00000C1A", L"00000C1A", L"00000409", L"1251", L"855", L"10007", L"Serbian (Cyrillic)",enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts }, - {L"0000081A", L"0000081A", L"00000409", L"1250", L"852", L"10029", L"Serbian (Latin)", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts }, - {L"0000041B", L"0000041B", L"00000409", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings, CP1250Fonts }, - {L"0000040A", L"0000040A", L"00000409", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, esESStrings, CP1252Fonts }, - {L"00000807", L"00000807", L"00000409", L"1252", L"850", L"10000", L"Swiss (German)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, - {L"0000041D", L"0000041D", L"00000409", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings, CP1252Fonts }, - {L"00000444", L"00000444", L"00000409", L"1251", L"866", L"10007", L"Tatar", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts }, - {L"0000041E", L"0000041E", L"00000409", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings, CP874Fonts }, - {L"0000041F", L"0000041F", L"00000409", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings, CP1254Fonts }, - {L"00000422", L"00000422", L"00000409", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings, CP1251Fonts }, - {L"00000809", L"00000809", L"00000409", L"1252", L"850", L"10000", L"United Kingdom", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, - {L"00000843", L"00000843", L"00000409", L"1251", L"866", L"10007", L"Uzbek", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts }, - {L"0000042A", L"0000042A", L"00000409", L"1258", L"1258",L"10000", L"Vietnamese", enUSPages, enUSErrorEntries, enUSStrings, CP1258Fonts }, + /* Lang ID, ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings, fonts, kb layouts */ + {L"0000041C", L"1250", L"852", L"10029", L"Albanian", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts, enUSLayouts }, + {L"00000401", L"1256", L"720", L"10004", L"Arabic (Saudi Arabia)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, enUSLayouts }, + {L"00000801", L"1256", L"720", L"10004", L"Arabic (Iraq)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, enUSLayouts }, + {L"00000C01", L"1256", L"720", L"10004", L"Arabic (Egypt)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, enUSLayouts }, + {L"00001001", L"1256", L"720", L"10004", L"Arabic (Libya)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, enUSLayouts }, + {L"00001401", L"1256", L"720", L"10004", L"Arabic (Algeria)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, enUSLayouts }, + {L"0000042B", L"0", L"1", L"2", L"Armenian Eastern", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,enUSLayouts }, + {L"0000082C", L"1251", L"866", L"10007", L"Azeri (Cyrillic)", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, enUSLayouts }, + {L"0000042C", L"1254", L"857", L"10081", L"Azeri (Latin)", enUSPages, enUSErrorEntries, enUSStrings, CP1254Fonts, enUSLayouts }, + {L"00000423", L"1251", L"866", L"10007", L"Belarusian", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, enUSLayouts }, + {L"00000813", L"1252", L"850", L"10000", L"Belgian (Dutch)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"0000080C", L"1252", L"850", L"10000", L"Belgian (French)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00000416", L"1252", L"850", L"10000", L"Brazilian", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings, CP1251Fonts, bgBGLayouts }, + {L"00000455", L"0", L"1", L"2", L"Burmese", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,enUSLayouts }, + {L"00000C0C", L"1252", L"850", L"10000", L"Canadian (French)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", enUSPages, enUSErrorEntries, enUSStrings, CP950Fonts, enUSLayouts }, + {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings, CP936Fonts, enUSLayouts }, + {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", enUSPages, enUSErrorEntries, enUSStrings, CP950Fonts, enUSLayouts }, + {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", enUSPages, enUSErrorEntries, enUSStrings, CP936Fonts, enUSLayouts }, + {L"00000405", L"1250", L"852", L"10029", L"Czech", csCZPages, csCZErrorEntries, csCZStrings, CP1250Fonts, csCZLayouts }, + {L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00000413", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00000409", L"1252", L"437", L"10000", L"English (United States)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00000809", L"1252", L"850", L"10000", L"English (United Kingdom)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00000C09", L"1252", L"850", L"10000", L"English (Australia)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00001009", L"1252", L"850", L"10000", L"English (Canada)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00001409", L"1252", L"850", L"10000", L"English (New Zealand)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00001809", L"1252", L"850", L"10000", L"English (Ireland)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00001C09", L"1252", L"437", L"10000", L"English (South Africa)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00002009", L"1252", L"850", L"10000", L"English (Jamaica)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00002409", L"1252", L"850", L"10000", L"English (Caribbean)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00002809", L"1252", L"850", L"10000", L"English (Belize)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00002C09", L"1252", L"850", L"10000", L"English (Trinidad)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00003009", L"1252", L"437", L"10000", L"English (Zimbabwe)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00003409", L"1252", L"437", L"10000", L"English (Philippines)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00000425", L"1257", L"775", L"10029", L"Estonian", enUSPages, enUSErrorEntries, enUSStrings, CP1257Fonts, enUSLayouts }, + {L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"0000040C", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, frFRStrings, CP1252Fonts, frFRLayouts }, + {L"00000437", L"0", L"1", L"2", L"Georgian", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,enUSLayouts }, + {L"00000407", L"1252", L"850", L"10000", L"German (Germany)", deDEPages, deDEErrorEntries, deDEStrings, CP1252Fonts, deDELayouts }, + {L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings, CP1253Fonts, elGRLayouts }, + {L"0000040D", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings, CP1255Fonts, enUSLayouts }, + {L"0000040E", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts, enUSLayouts }, + {L"0000040F", L"1252", L"850", L"10079", L"Icelandic", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)", itITPages, itITErrorEntries, itITStrings, CP1252Fonts, itITLayouts }, + {L"00000411", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings, CP932Fonts, enUSLayouts }, + {L"0000043F", L"1251", L"866", L"10007", L"Kazakh", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, enUSLayouts }, + {L"00000412", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings, CP949Fonts, enUSLayouts }, + {L"00000426", L"1257", L"775", L"10029", L"Latvian", enUSPages, enUSErrorEntries, enUSStrings, CP1257Fonts, enUSLayouts }, + {L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings, CP1257Fonts, ltLTLayouts }, + {L"0000042F", L"1251", L"866", L"10007", L"Macedonian", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, enUSLayouts }, + {L"00000414", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00000418", L"1250", L"852", L"10029", L"Romanian", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts, enUSLayouts }, + {L"00000419", L"1251", L"866", L"10007", L"Russkij", ruRUPages, ruRUErrorEntries, ruRUStrings, CP1251Fonts, ruRULayouts }, + {L"00000415", L"1250", L"852", L"10029", L"Polski", plPLPages, plPLErrorEntries, plPLStrings, CP1250Fonts, plPLLayouts }, + {L"00000816", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"00000C1A", L"1251", L"855", L"10007", L"Serbian (Cyrillic)", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, enUSLayouts }, + {L"0000081A", L"1250", L"852", L"10029", L"Serbian (Latin)", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts, enUSLayouts }, + {L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings, CP1250Fonts, skSKLayouts }, + {L"0000040A", L"1252", L"850", L"10000", L"Spanish (Traditional Sort)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esESLayouts }, + {L"0000080A", L"1252", L"850", L"10000", L"Spanish (Mexico)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"00000C0A", L"1252", L"850", L"10000", L"Spanish (International Sort)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"0000100A", L"1252", L"850", L"10000", L"Spanish (Guatemala)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"0000140A", L"1252", L"850", L"10000", L"Spanish (Costa Rica)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"0000180A", L"1252", L"850", L"10000", L"Spanish (Panama)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"00001C0A", L"1252", L"850", L"10000", L"Spanish (Dominican Republic)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"0000200A", L"1252", L"850", L"10000", L"Spanish (Venezuela)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"0000240A", L"1252", L"850", L"10000", L"Spanish (Colombia)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"0000280A", L"1252", L"850", L"10000", L"Spanish (Peru)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"00002C0A", L"1252", L"850", L"10000", L"Spanish (Argentina)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"0000300A", L"1252", L"850", L"10000", L"Spanish (Ecuador)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"0000340A", L"1252", L"850", L"10000", L"Spanish (Chile)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"0000380A", L"1252", L"850", L"10000", L"Spanish (Uruguay)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"00003C0A", L"1252", L"850", L"10000", L"Spanish (Paraguay)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"0000400A", L"1252", L"850", L"10000", L"Spanish (Bolivia)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"0000440A", L"1252", L"850", L"10000", L"Spanish (El Salvador)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"0000480A", L"1252", L"850", L"10000", L"Spanish (Honduras)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"00004C0A", L"1252", L"850", L"10000", L"Spanish (Nicaragua)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"0000500A", L"1252", L"850", L"10000", L"Spanish (Puerto Rico)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, enUSLayouts }, + {L"00000807", L"1252", L"850", L"10000", L"Swiss (German)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, + {L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings, CP1252Fonts, svSELayouts }, + {L"00000444", L"1251", L"866", L"10007", L"Tatar", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, enUSLayouts }, + {L"0000041E", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings, CP874Fonts, enUSLayouts }, + {L"0000041F", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings, CP1254Fonts, enUSLayouts }, + {L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings, CP1251Fonts, ukUALayouts }, + {L"00000843", L"1251", L"866", L"10007", L"Uzbek", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, enUSLayouts }, + {L"0000042A", L"1258", L"1258",L"10000", L"Vietnamese", enUSPages, enUSErrorEntries, enUSStrings, CP1258Fonts, enUSLayouts }, + {L"00000435", L"1252", L"850", L"10000", L"Zulu", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, {NULL, NULL, NULL, NULL, NULL, NULL} }; Modified: trunk/reactos/base/setup/usetup/settings.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings…
============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Sun Jun 1 07:52:18 2008 @@ -811,6 +811,8 @@ PWCHAR KeyName; PWCHAR KeyValue; PWCHAR UserData; + const MUI_LAYOUTS * LayoutsList; + ULONG uIndex = 0; /* Get default layout id */ if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLayout", &Context)) @@ -825,163 +827,97 @@ if (List == NULL) return NULL; - if (!SetupFindFirstLineW (InfFile, L"KeyboardLayout", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } + LayoutsList = MUIGetLayoutsList(); do { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); + if (!SetupFindFirstLineW(InfFile, L"KeyboardLayout", NULL, &Context)) + { DestroyGenericList(List, FALSE); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - _wcsicmp(KeyName, DefaultKBLayout) ? FALSE : TRUE); - } while (SetupFindNextLine(&Context, &Context)); + return NULL; + } + + do + { + if (!INF_GetData (&Context, &KeyName, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetData() failed\n"); + DestroyGenericList(List, FALSE); + break; + } + + if (_wcsicmp(LayoutsList[uIndex].LayoutID, KeyName) == 0) + { + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + + if (UserData == NULL) + { + /* FIXME: Handle error! */ + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, + Buffer, + UserData, + _wcsicmp(KeyName, DefaultKBLayout) ? FALSE : TRUE); + } + + } while (SetupFindNextLine(&Context, &Context)); + + uIndex++; + + } while (LayoutsList[uIndex].LangID != NULL); return List; } - BOOLEAN ProcessKeyboardLayoutRegistry(PGENERIC_LIST List) { PGENERIC_LIST_ENTRY Entry; - PWCHAR LanguageId; - WCHAR CurrentLangId[8 + 1]; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - ULONG ResLength, Length; - HANDLE KeyHandle; - NTSTATUS Status; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + PWCHAR LayoutId; + const MUI_LAYOUTS * LayoutsList; + MUI_LAYOUTS NewLayoutsList[20]; + ULONG uIndex = 0; + ULONG uOldPos = 0; Entry = GetCurrentListEntry(List); if (Entry == NULL) return FALSE; - LanguageId = (PWCHAR)GetListEntryUserData(Entry); - if (LanguageId == NULL) - return FALSE; - - RtlInitUnicodeString(&KeyName, L"\\Registry\\User\\.DEFAULT\\Keyboard Layout\\Preload"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtOpenKey(&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - /* Get current keyboard layout */ - RtlInitUnicodeString(&ValueName, - L"1"); - - Length = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + (8 + 1) * sizeof(WCHAR); - - ValueInfo = (KEY_VALUE_PARTIAL_INFORMATION*) RtlAllocateHeap(RtlGetProcessHeap(), - 0, - Length); - - if (ValueInfo == NULL) - { - DPRINT("RtlAllocateHeap() failed\n"); - NtClose(KeyHandle); - return FALSE; - } - - Status = NtQueryValueKey(KeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueInfo, - Length, - &ResLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtQueryValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - RtlCopyMemory(CurrentLangId, - ValueInfo->Data, - (8 + 1) * sizeof(WCHAR)); - - CurrentLangId[8 + 1] = 0; - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - ValueInfo); - - if (wcscmp(CurrentLangId, LanguageId) != 0) - { - RtlInitUnicodeString(&ValueName, - L"1"); - - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)LanguageId, - (8 + 1) * sizeof(WCHAR)); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - RtlInitUnicodeString(&ValueName, - L"2"); - - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)CurrentLangId, - (8 + 1) * sizeof(WCHAR)); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - } - - NtClose(KeyHandle); + LayoutId = (PWCHAR)GetListEntryUserData(Entry); + if (LayoutId == NULL) + return FALSE; + + LayoutsList = MUIGetLayoutsList(); + + if (_wcsicmp(LayoutsList[0].LayoutID, LayoutId) != 0) + { + do + { + if (_wcsicmp(LayoutsList[uIndex].LayoutID, LayoutId) == 0) + { + uOldPos = uIndex; + } + + uIndex++; + + } while (LayoutsList[uIndex].LangID != NULL); + + NewLayoutsList[uIndex].LangID = NULL; + NewLayoutsList[uIndex].LayoutID = NULL; + NewLayoutsList[uOldPos].LangID = LayoutsList[0].LangID; + NewLayoutsList[uOldPos].LayoutID = LayoutsList[0].LayoutID; + NewLayoutsList[0].LangID = LayoutsList[uOldPos].LangID; + NewLayoutsList[0].LayoutID = LayoutsList[uOldPos].LayoutID; + + return AddKbLayoutsToRegistry(NewLayoutsList); + } return TRUE; }
16 years, 6 months
1
0
0
0
[hpoussin] 33799: Start Rpc server listener thread before device installer thread See issue #3068 for more details.
by hpoussin@svn.reactos.org
Author: hpoussin Date: Sun Jun 1 05:49:28 2008 New Revision: 33799 URL:
http://svn.reactos.org/svn/reactos?rev=33799&view=rev
Log: Start Rpc server listener thread before device installer thread See issue #3068 for more details. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump…
============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sun Jun 1 05:49:28 2008 @@ -2170,6 +2170,15 @@ hThread = CreateThread(NULL, 0, + RpcServerThread, + NULL, + 0, + &dwThreadId); + if (hThread != NULL) + CloseHandle(hThread); + + hThread = CreateThread(NULL, + 0, DeviceInstallThread, NULL, 0, @@ -2177,15 +2186,6 @@ if (hThread != NULL) CloseHandle(hThread); - hThread = CreateThread(NULL, - 0, - RpcServerThread, - NULL, - 0, - &dwThreadId); - if (hThread != NULL) - CloseHandle(hThread); - DPRINT("ServiceMain() done\n"); }
16 years, 6 months
1
0
0
0
[dreimer] 33798: Bug 3299: czech translation from forum and some slovak translation by Stepan Gabriel - SGABA (sgaba@centrum.cz)
by dreimer@svn.reactos.org
Author: dreimer Date: Sun Jun 1 05:26:42 2008 New Revision: 33798 URL:
http://svn.reactos.org/svn/reactos?rev=33798&view=rev
Log: Bug 3299: czech translation from forum and some slovak translation by Stepan Gabriel - SGABA (sgaba(a)centrum.cz) Added: trunk/reactos/base/applications/games/winemine/lang/cs-CZ.rc (with props) trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc (with props) trunk/reactos/dll/win32/shimgvw/lang/sk-SK.rc (with props) trunk/reactos/dll/win32/userenv/lang/sk-SK.rc (with props) Modified: trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/applications/kbswitch/lang/bg-BG.rc trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc trunk/reactos/base/applications/kbswitch/lang/de-DE.rc trunk/reactos/base/applications/kbswitch/lang/en-US.rc trunk/reactos/base/applications/kbswitch/lang/es-ES.rc trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc trunk/reactos/base/applications/kbswitch/lang/lt-LT.rc trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc trunk/reactos/base/applications/kbswitch/lang/ru-RU.rc trunk/reactos/base/applications/kbswitch/lang/sk-SK.rc trunk/reactos/base/shell/explorer/explorer-sk.rc trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/shimgvw/rsrc.rc trunk/reactos/dll/win32/userenv/userenv.rc Modified: trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l…
============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 24-04-2008 - * LAST CHANGE: 25-05-2008 + * LAST CHANGE: 30-05-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -36,7 +36,7 @@ LTEXT "Procesor:", -1, 70, 140, 80, 10, SS_RIGHT LTEXT "Pamä:", -1, 70, 150, 80, 10, SS_RIGHT LTEXT "Stránkovací súbor:", -1, 70, 160, 80, 10, SS_RIGHT - LTEXT "ReactX - versia:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "ReactX - verzia:", -1, 70, 170, 80, 10, SS_RIGHT LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT Added: trunk/reactos/base/applications/games/winemine/lang/cs-CZ.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/games/winemine/lang/cs-CZ.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -1,0 +1,87 @@ +/* FILE: applications/games/winemine/lang/cs-CZ.rc + * PURPOSE: Czech Language File + * TRANSLATOR: Stepan Gabriel - SGABA (sgaba(a)centrum.cz) + * TRANSLATED FROM: Slovak translation by Kario (kario(a)szm.sk) + * UPDATED: 2008-04-07 + * + * Czech translation + * Copyleft 2007 Kario (kario(a)szm.sk),2008 SGABA (sgaba(a)centrum.cz) + */ + +#include "resource.h" + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_SECONDS, "sek." + IDS_NOBODY, "Nikdo" //windows = Anonym + IDS_ABOUT, "od Joshua Thielena a vývojáøù systému ReactOS" +END + +IDM_WINEMINE MENU DISCARDABLE +BEGIN + POPUP "&Hra" + BEGIN + MENUITEM "&Nová hra\tF2", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "Zn&aèky (?)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Zaèáteèník", IDM_BEGINNER + MENUITEM "&Pokroèilý", IDM_ADVANCED + MENUITEM "&Expert", IDM_EXPERT + MENUITEM "&Vlastní...", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Nejlepí èasy...", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "Sk&onèit", IDM_EXIT + END + POPUP "&Info" //windows = &Pomocník + BEGIN + MENUITEM "C&o je hra Miny...", IDM_ABOUT + END +END + +IDD_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "Nejrychlejí htedaèi min" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Nejlepí èasy", IDNONE, 10, 10, 182, 45 + LTEXT "Zaèáteèník:", IDNONE, 20, 20, 58, 8 + LTEXT "Pokroèilý:", IDNONE, 20, 30, 58, 8 + LTEXT "Expert:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Vynulovat výsledky", IDRESET, 18, 57, 67, 15 +END + +IDD_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "Blahopøeji!" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Zadejte prosím svoje jméno.", IDIGNORE, 25, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 +END + +IDD_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "Vlastní pole" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Výka:", IDNONE, 5, 15, 43, 10 + LTEXT "íøka:", IDNONE, 5, 35, 43, 10 + LTEXT "Miny:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Zruit", IDCANCEL, 86, 52, 45, 15 +END Propchange: trunk/reactos/base/applications/games/winemine/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
============================================================================== --- trunk/reactos/base/applications/games/winemine/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winemine/rsrc.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -18,6 +18,7 @@ /* include localised resources */ #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Modified: trunk/reactos/base/applications/kbswitch/lang/bg-BG.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch…
============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/bg-BG.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -6,6 +6,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Ïðåäïî÷èòàíèÿ...", ID_PREFERENCES + MENUITEM SEPARATOR MENUITEM "Èç&õîä", ID_EXIT END END Modified: trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch…
============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -11,6 +11,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Pøedvolby...", ID_PREFERENCES + MENUITEM SEPARATOR MENUITEM "&Ukonèit", ID_EXIT END END Modified: trunk/reactos/base/applications/kbswitch/lang/de-DE.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch…
============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/de-DE.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -6,6 +6,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Einstellungen...", ID_PREFERENCES + MENUITEM SEPARATOR MENUITEM "&Beenden", ID_EXIT END END Modified: trunk/reactos/base/applications/kbswitch/lang/en-US.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch…
============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/en-US.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -6,6 +6,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Preferences...", ID_PREFERENCES + MENUITEM SEPARATOR MENUITEM "&Exit", ID_EXIT END END Modified: trunk/reactos/base/applications/kbswitch/lang/es-ES.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch…
============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/es-ES.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -6,6 +6,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Preferencias...", ID_PREFERENCES + MENUITEM SEPARATOR MENUITEM "&Salir", ID_EXIT END END Modified: trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch…
============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -6,6 +6,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Préférences...", ID_PREFERENCES + MENUITEM SEPARATOR MENUITEM "Quitt&er", ID_EXIT END END Modified: trunk/reactos/base/applications/kbswitch/lang/lt-LT.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch…
============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/lt-LT.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -8,6 +8,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Nuostatos...", ID_PREFERENCES + MENUITEM SEPARATOR MENUITEM "&Baigti", ID_EXIT END END Modified: trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch…
============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -13,6 +13,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Ustawienia...", ID_PREFERENCES + MENUITEM SEPARATOR MENUITEM "&Wyjcie", ID_EXIT END END Modified: trunk/reactos/base/applications/kbswitch/lang/ru-RU.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch…
============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/ru-RU.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -6,6 +6,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Ïàðàìåòðû...", ID_PREFERENCES + MENUITEM SEPARATOR MENUITEM "&Âûõîä", ID_EXIT END END Modified: trunk/reactos/base/applications/kbswitch/lang/sk-SK.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch…
============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/sk-SK.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -8,6 +8,7 @@ BEGIN POPUP "popup" BEGIN + MENUITEM SEPARATOR MENUITEM "&Nastavenia...", ID_PREFERENCES MENUITEM SEPARATOR MENUITEM "&Zavrie", ID_EXIT Modified: trunk/reactos/base/shell/explorer/explorer-sk.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sk.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-sk.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -1,9 +1,9 @@ /* -* FILE: base/shell/explorer/explorer-sk.rc -* PURPOSE: Slovak Language File for explorer -* TRANSLATOR: Kario (kario(a)szm.sk) -* DATE OF TR: 08-08-2007 -* LAST CHANG: 22-01-2008 +* FILE : base/shell/explorer/explorer-sk.rc +* PURPOSE : Slovak Language File for explorer +* TRANSLATOR : Kario (kario(a)szm.sk) +* DATE OF TR.: 08-08-2007 +* LAST CHANGE: 30-05-2008 * _______________________________________________ * NOTE: this file need to be fixed */ @@ -185,23 +185,23 @@ BEGIN LTEXT "Vyberte si uprednostòovaný spôsob zarovnania ikôn:", IDC_STATIC,7,7,166,8 - CONTROL "z¾ava zhora\ndole",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + CONTROL "z¾ava zhora dole",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "z¾ava zhora\nvpravo",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + CONTROL "z¾ava zhora vpravo",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "zprava zhora\nv¾avo",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + CONTROL "zprava zhora v¾avo",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "zprava zhora\ndole",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + CONTROL "zprava zhora dole",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "z¾ava zdola\nhore",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + CONTROL "z¾ava zdola hore",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "z¾ava zdola\nvpravo",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + CONTROL "z¾ava zdola vpravo",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "zprava zdola\nv¾avo",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + CONTROL "zprava zdola v¾avo",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "zprava zdola\nhore",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + CONTROL "zprava zdola hore",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "po okrajoch\ndole",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + CONTROL "po okrajoch dole",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,121,46,44 CONTROL "po okrajoch H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,121,46,44 @@ -358,7 +358,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_STARTMENU "Ponuka tart" - IDS_MINIMIZE_ALL "minimalizova vetke okná" + IDS_MINIMIZE_ALL "Minimalizova vetke okná" IDS_DESKTOP_NUM "Pracovná plocha %d" IDS_VOLUME "Hlasitos" IDS_ITEMS_CUR "súèasné poloky" @@ -413,3 +413,4 @@ + Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc…
============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -23,4 +23,5 @@ #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/sk-S…
============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc (added) +++ trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -1,0 +1,173 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 30-05-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_NAME "Názov" + IDS_TYPE "Typ" + IDS_MANUFACTURER "Výrobca: %1" + IDS_LOCATION "Umiestnenie: %1" + IDS_STATUS "Stav zariadenia: %1" + IDS_UNKNOWN "Neznámy" + IDS_LOCATIONSTR "Umiestnenie %1!u! (%2)" + IDS_DEVCODE " (Kód %1!u!)" + IDS_DEVCODE2 " (Kód %2!u!)" + IDS_ENABLEDEVICE "Poui toto zariadenie (povolené)" + IDS_DISABLEDEVICE "Nepoui toto zariadenie (zakázané)" + IDS_UNKNOWNDEVICE "Neznáme zariadenie" + IDS_NODRIVERLOADED "Pre toto zariadenie nie sú naintalované iadne ovládaèe." + IDS_DEVONPARENT "na %1" + IDS_TROUBLESHOOTDEV "&Troubleshoot..." + IDS_ENABLEDEV "E&nable Device" + IDS_REINSTALLDRV "Re&install Driver" + IDS_PROPERTIES "P&roperties" + IDS_UPDATEDRV "U&pdate Driver..." + IDS_REBOOT "Restart &Computer..." + IDS_NOTAVAILABLE "Nie je k dispozícii" //Not available + IDS_NOTDIGITALLYSIGNED "Not digitally signed" + IDS_NODRIVERS "No driver files are required or have been loaded for this device." +END + +/* error messages, source:
http://www.z123.org/techsupport/medm.htm
*/ +STRINGTABLE +BEGIN + IDS_DEV_NO_PROBLEM "Toto zariadenie pracuje správne." + IDS_DEV_NOT_CONFIGURED "Toto zariadenie nie je správne nastavené." + IDS_DEV_DEVLOADER_FAILED "ReactOS could not load the driver for this device because the computer is reporting two $1 bus types." + IDS_DEV_DEVLOADER_FAILED2 "The $1 device loader(s) for this device could not load the device driver." + IDS_DEV_OUT_OF_MEMORY "The driver for this device may be bad, or your system may be running low on memory or other resources." + IDS_DEV_ENTRY_IS_WRONG_TYPE "This device is not working properly because one of its drivers may be bad, or your registry may be bad." + IDS_DEV_LACKED_ARBITRATOR "The driver for this device requested a resource that ReactOS does not know how to handle." + IDS_DEV_BOOT_CONFIG_CONFLICT "Iné zariadenie pouíva prostriedky, ktoré potrebuje toto zariadenie." + IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." + IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." + IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." + IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " + IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." + IDS_DEV_LIAR "ReactOS stopped responding while attempting to start this device, and therefore will never attempt to start this device again." + IDS_DEV_NORMAL_CONFLICT "This device cannot find any free $1 resources to use." + IDS_DEV_NOT_VERIFIED "This device is either not present, not working properly, or does not have all the drivers installed." + IDS_DEV_NEED_RESTART "Toto zariadenie nemoe správne pracova, kým neretartujete poèítaè." + IDS_DEV_REENUMERATION "This device is causing a resource conflict." + IDS_DEV_PARTIAL_LOG_CONF "ReactOS could not identify all the resources this device uses." + IDS_DEV_UNKNOWN_RESOURCE "The driver information file $1 is telling this child device to use a resource that the parent device does not have or recognize." + IDS_DEV_REINSTALL "Je potrebné preintalova ovládaèe pre toto zariadenie." + IDS_DEV_REGISTRY "Your registry may be bad." + IDS_DEV_WILL_BE_REMOVED "ReactOS is removing this device." + IDS_DEV_DISABLED "Toto zariadenie nie je spustené." + IDS_DEV_DISABLED2 "Toto zariadenie je zakázané." + IDS_DEV_DEVLOADER_NOT_READY "The loaders for this device cannot load the required drivers." + IDS_DEV_DEVLOADER_NOT_READY2 "This display adapter is functioning correctly." + IDS_DEV_DEVLOADER_NOT_READY3 "The loaders for this device cannot load the required drivers." + IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." + IDS_DEV_MOVED "ReactOS is in the process of setting up this device." + IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." + IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." + IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." + IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." + IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." + IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." + IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." + IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS cannot access this hardware because its service key information in the registry is missing or recorded incorrectly." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS successfully loaded the device driver for this hardware but cannot find the hardware device." + IDS_DEV_DUPLICATE_DEVICE "ReactOS cannot load the device driver for this hardware because there is a duplicate device already running in the system." + IDS_DEV_FAILED_POST_START "Systém ReactOS zastavil toto zariadenie lebo ohlásilo problémy." + IDS_DEV_HALTED "Aplikácia alebo sluba vypla toto hardvérové zariadenie." + IDS_DEV_PHANTOM "Currently, this hardware device is not connected to the computer." + IDS_DEV_SYSTEM_SHUTDOWN "ReactOS cannot gain access to this hardware device because the operating system is in the process of shutting down." + IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" + IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." + IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." +END + +IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 +STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Devices:",IDC_DEVICES,7,6,196,10 + CONTROL "",IDC_LV_DEVICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,16,196,50 + GROUPBOX "Vlastnosti zariadenia",IDC_PROPERTIESGROUP,7,76,196,105 + LTEXT "",IDC_MANUFACTURER,14,88,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_LOCATION,14,100,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_STATUS,14,112,183,30 + PUSHBUTTON "&Troubleshoot...",IDC_TROUBLESHOOT,85,140,54,14, + BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "Vl&astnosti",IDC_PROPERTIES,146,140,50,14 +END + +IDD_DEVICEGENERAL DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Veobecné" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Typ zariadenia:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVTYPE, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Výrobca:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVMANUFACTURER, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Umiestnenie:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + GROUPBOX "Stav zariadenia", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 + EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL + PUSHBUTTON "&Troubleshoot...", IDC_DEVPROBLEM, 148, 163, 90, 15 + LTEXT "&Device usage:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED +END + +IDD_DEVICEDRIVER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ovládaè" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Poskytovate¾ ovládaèa:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Dátum ovládaèa:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Verzia ovládaèa:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Digital Signer:", -1, 37, 81, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "&Driver Details...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX +END + +IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Detaily súboru ovládaèa" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "&Driver files:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LTEXT "Poskytovate¾:", -1, 14, 134, 50, 8 + LTEXT "", IDC_FILEPROVIDER, 66, 134, 155, 8 + LTEXT "Verzia súboru:", -1, 14, 150, 50, 8 + LTEXT "", IDC_FILEVERSION, 66, 150, 155, 8 + LTEXT "Copyright:", -1, 14, 166, 50, 8 + LTEXT "", IDC_FILECOPYRIGHT, 66, 166, 155, 8 + LTEXT "Digital Signer:", -1, 14, 182, 50, 8 + LTEXT "", IDC_DIGITALSIGNER, 66, 182, 155, 8 + PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 +END + Propchange: trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/lang/sk-SK.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/sk-…
============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/sk-SK.rc (added) +++ trunk/reactos/dll/win32/shimgvw/lang/sk-SK.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -1,0 +1,21 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 29-05-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_APPTITLE "Zobrazovaè obrázkov a faxov systému ReactOS" + IDS_SETASDESKBG "Nastavi ako pozadie pracovnej plochy" + + /* Tooltips */ + IDS_TOOLTIP_NEXT_PIC "Nasledujúci obrázok" + IDS_TOOLTIP_PREV_PIC "Predchádzajúci obrázok" + IDS_TOOLTIP_ZOOM_IN "Priblíi (+)" + IDS_TOOLTIP_ZOOM_OUT "Vzdiali (-)" + IDS_TOOLTIP_ROT_CLOCKW "Otoèi v smere hodinových ruèièiek (Ctrl+K)" //Otoèi vpravo + IDS_TOOLTIP_ROT_COUNCW "Otoèi proti smeru hodinových ruèièiek (Ctrl+L)" //Otoèi v¾avo + IDS_TOOLTIP_PRINT "Vytlaèi (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Uloi ako... (Ctrl+S)" +END Propchange: trunk/reactos/dll/win32/shimgvw/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?…
============================================================================== --- trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -3,3 +3,4 @@ #include "lang/en-US.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" Added: trunk/reactos/dll/win32/userenv/lang/sk-SK.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/sk-…
============================================================================== --- trunk/reactos/dll/win32/userenv/lang/sk-SK.rc (added) +++ trunk/reactos/dll/win32/userenv/lang/sk-SK.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -1,0 +1,51 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 29-05-2008 + */ + +/* + * Copyright (C) 2004 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" + IDS_APPDATA "Application Data" + IDS_DESKTOP "Desktop" + IDS_FAVORITES "Favorites" + IDS_STARTMENU "Ponuka tart" + IDS_PROGRAMS "Ponuka tart\\Programy" + IDS_ADMINTOOLS "Ponuka tart\\Programy\\Nástroje na správu" + IDS_STARTUP "Ponuka tart\\Programy\\Po spustení" + IDS_MYDOCUMENTS "My Documents" + IDS_MYPICTURES "My Documents\\My Pictures" + IDS_MYMUSIC "My Documents\\My Music" + IDS_MYVIDEOS "My Documents\\My Videos" + IDS_TEMPLATES "Templates" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_PRINTHOOD "PrintHood" + IDS_NETHOOD "NetHood" + IDS_LOCALSETTINGS "Local Settings" + IDS_LOCALAPPDATA "Local Settings\\Application Data" + IDS_TEMP "Local Settings\\Temp" + IDS_CACHE "Local Settings\\Temporary Internet Files" + IDS_HISTORY "Local Settings\\History" + IDS_COOKIES "Cookies" + IDS_PROGRAMFILES "%SystemDrive%\\Program Files" +END Propchange: trunk/reactos/dll/win32/userenv/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/userenv/userenv.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.…
============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/userenv.rc [iso-8859-1] Sun Jun 1 05:26:42 2008 @@ -51,6 +51,7 @@ #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc"
16 years, 6 months
1
0
0
0
← Newer
1
...
40
41
42
43
44
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
Results per page:
10
25
50
100
200