Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70862: [GDIPLUS] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 02 Mar '16

02 Mar '16

Author: akhaldi Date: Wed Mar 2 10:34:40 2016 New Revision: 70862 URL: http://svn.reactos.org/svn/reactos?rev=70862&view=rev Log: [GDIPLUS] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/pen.c trunk/reactos/media/doc/README.WINE 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] Wed Mar 2 10:34:40 2016 @@ -205,6 +205,7 @@ REAL offset; /* dash offset */ GpBrush *brush; GpPenAlignment align; + GpMatrix transform; }; struct GpGraphics{ 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] Wed Mar 2 10:34:40 2016 @@ -2060,7 +2060,7 @@ status = GdipClonePath(path, &flat_path); if (status == Ok) - status = GdipFlattenPath(flat_path, matrix, flatness); + status = GdipFlattenPath(flat_path, pen->unit == UnitPixel ? matrix : NULL, flatness); if (status == Ok && !init_path_list(&points, 314.0, 22.0)) status = OutOfMemory; @@ -2133,6 +2133,9 @@ GdipDeletePath(flat_path); + if (status == Ok && pen->unit != UnitPixel) + status = GdipTransformPath(path, matrix); + return status; } 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] Wed Mar 2 10:34:40 2016 @@ -159,6 +159,7 @@ gp_pen->offset = 0.0; gp_pen->customstart = NULL; gp_pen->customend = NULL; + GdipSetMatrixElements(&gp_pen->transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); if(!((gp_pen->unit == UnitWorld) || (gp_pen->unit == UnitPixel))) { FIXME("UnitWorld, UnitPixel only supported units\n"); @@ -406,47 +407,43 @@ GpStatus WINGDIPAPI GdipResetPenTransform(GpPen *pen) { + TRACE("(%p)\n", pen); + + if(!pen) + return InvalidParameter; + + GdipSetMatrixElements(&pen->transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + + return Ok; +} + +GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix) +{ static int calls; - TRACE("(%p)\n", pen); - - if(!pen) + TRACE("(%p,%p)\n", pen, matrix); + + if(!pen || !matrix) return InvalidParameter; if(!(calls++)) - FIXME("(%p) stub\n", pen); - - return NotImplemented; -} - -GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix) -{ - static int calls; - + FIXME("(%p,%p) Semi-stub\n", pen, matrix); + + pen->transform = *matrix; + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *pen, GpMatrix *matrix) +{ TRACE("(%p,%p)\n", pen, matrix); if(!pen || !matrix) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; -} - -GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *pen, GpMatrix *matrix) -{ - static int calls; - - TRACE("(%p,%p)\n", pen, matrix); - - if(!pen || !matrix) - return InvalidParameter; - - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + *matrix = pen->transform; + + return Ok; } GpStatus WINGDIPAPI GdipTranslatePenTransform(GpPen *pen, REAL dx, REAL dy, GpMatrixOrder order) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Mar 2 10:34:40 2016 @@ -68,7 +68,7 @@ reactos/dll/win32/faultrep # Synced to WineStaging-1.7.55 reactos/dll/win32/fltlib # Synced to WineStaging-1.7.55 reactos/dll/win32/fusion # Synced to WineStaging-1.9.4 -reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.55 +reactos/dll/win32/gdiplus # Synced to WineStaging-1.9.4 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.55 reactos/dll/win32/hlink # Synced to WineStaging-1.7.55 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70861: [PSDK] Update gdiplusflat.h. CORE-10912
by akhaldi＠svn.reactos.org 02 Mar '16

02 Mar '16

Author: akhaldi Date: Wed Mar 2 10:17:31 2016 New Revision: 70861 URL: http://svn.reactos.org/svn/reactos?rev=70861&view=rev Log: [PSDK] Update gdiplusflat.h. CORE-10912 Modified: trunk/reactos/include/psdk/gdiplusflat.h 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] Wed Mar 2 10:17:31 2016 @@ -619,6 +619,7 @@ GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen*,REAL*); GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*); +GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *, GpMatrix *); GpStatus WINGDIPAPI GdipResetPenTransform(GpPen*); GpStatus WINGDIPAPI GdipScalePenTransform(GpPen*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); @@ -637,6 +638,7 @@ GpStatus WINGDIPAPI GdipSetPenMode(GpPen*,GpPenAlignment); GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen*,REAL); GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap); +GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *, GpMatrix *); GpStatus WINGDIPAPI GdipSetPenWidth(GpPen*,REAL); GpStatus WINGDIPAPI GdipGetPenDashCap197819(GpPen*,GpDashCap*); GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen*,GpLineCap*);

1 0

[akhaldi] 70860: [FUSION][FUSION_1_1][FUSION_2_0] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 02 Mar '16

02 Mar '16

Author: akhaldi Date: Wed Mar 2 10:11:41 2016 New Revision: 70860 URL: http://svn.reactos.org/svn/reactos?rev=70860&view=rev Log: [FUSION][FUSION_1_1][FUSION_2_0] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/fusion/fusion.c trunk/reactos/dll/win32/fusion/fusion.spec trunk/reactos/dll/win32/fusion/fusion_1_1/fusion.spec trunk/reactos/dll/win32/fusion/fusion_2_0/fusion.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/fusion/fusion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion.c?… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion.c [iso-8859-1] Wed Mar 2 10:11:41 2016 @@ -35,6 +35,15 @@ HRESULT WINAPI ClearDownloadCache(void) { FIXME("stub!\n"); + return E_NOTIMPL; +} + +/****************************************************************** + * CopyPDBs (FUSION.@) + */ +HRESULT WINAPI CopyPDBs(void *unknown) +{ + FIXME("(%p) stub!\n", unknown); return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/fusion/fusion.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion.sp… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion.spec [iso-8859-1] Wed Mar 2 10:11:41 2016 @@ -1,4 +1,4 @@ -@ stub CopyPDBs +@ stdcall CopyPDBs(ptr) @ stdcall ClearDownloadCache() @ stdcall CreateApplicationContext(ptr ptr) @ stdcall CreateAssemblyCache(ptr long) Modified: trunk/reactos/dll/win32/fusion/fusion_1_1/fusion.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_1_… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion_1_1/fusion.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion_1_1/fusion.spec [iso-8859-1] Wed Mar 2 10:11:41 2016 @@ -1,4 +1,4 @@ -@ stub CopyPDBs +@ stdcall CopyPDBs(ptr) @ stdcall ClearDownloadCache() @ stdcall CreateApplicationContext(ptr ptr) @ stdcall CreateAssemblyCache(ptr long) Modified: trunk/reactos/dll/win32/fusion/fusion_2_0/fusion.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_2_… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion_2_0/fusion.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion_2_0/fusion.spec [iso-8859-1] Wed Mar 2 10:11:41 2016 @@ -1,4 +1,4 @@ -@ stub CopyPDBs +@ stdcall CopyPDBs(ptr) @ stdcall ClearDownloadCache() @ stdcall CreateApplicationContext(ptr ptr) @ stdcall CreateAssemblyCache(ptr long) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Mar 2 10:11:41 2016 @@ -67,7 +67,7 @@ reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.55 reactos/dll/win32/faultrep # Synced to WineStaging-1.7.55 reactos/dll/win32/fltlib # Synced to WineStaging-1.7.55 -reactos/dll/win32/fusion # Synced to WineStaging-1.7.55 +reactos/dll/win32/fusion # Synced to WineStaging-1.9.4 reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.55 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.55 reactos/dll/win32/hlink # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70859: [DNSAPI] Correct and improve DnsFlushResolverCacheEntry_A() stub. CORE-10912
by akhaldi＠svn.reactos.org 02 Mar '16

02 Mar '16

Author: akhaldi Date: Wed Mar 2 09:58:46 2016 New Revision: 70859 URL: http://svn.reactos.org/svn/reactos?rev=70859&view=rev Log: [DNSAPI] Correct and improve DnsFlushResolverCacheEntry_A() stub. CORE-10912 Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.spec trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.sp… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi.spec [iso-8859-1] Wed Mar 2 09:58:46 2016 @@ -34,7 +34,7 @@ @ stdcall DnsExtractRecordsFromMessage_W(ptr long ptr) @ stdcall DnsFindAuthoritativeZone() @ stdcall DnsFlushResolverCache() -@ stdcall DnsFlushResolverCacheEntry_A() +@ stdcall DnsFlushResolverCacheEntry_A(str) @ stdcall DnsFlushResolverCacheEntry_UTF8() @ stdcall DnsFlushResolverCacheEntry_W() @ stdcall DnsFreeAdapterInformation() Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/st… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c [iso-8859-1] Wed Mar 2 09:58:46 2016 @@ -223,11 +223,12 @@ return ERROR_OUTOFMEMORY; } -DNS_STATUS WINAPI -DnsFlushResolverCacheEntry_A() -{ - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; +BOOL WINAPI +DnsFlushResolverCacheEntry_A(PCSTR entry) +{ + DPRINT1("DnsFlushResolverCacheEntry_A(%s) is stubplemented.\n", entry); + if (!entry) return FALSE; + return TRUE; } DNS_STATUS WINAPI

1 0

[hbelusca] 70858: [VFATLIB]: Sync the FAT checker with dosfstools' fsck.vfat, from https://github.com/dosfstools/dosfstools . Synced with master branch, commit ed4e47b6757c05d4c23a9075b8b68003aa5dbfb8
by hbelusca＠svn.reactos.org 02 Mar '16

02 Mar '16

Author: hbelusca Date: Wed Mar 2 01:08:54 2016 New Revision: 70858 URL: http://svn.reactos.org/svn/reactos?rev=70858&view=rev Log: [VFATLIB]: Sync the FAT checker with dosfstools' fsck.vfat, from https://github.com/dosfstools/dosfstools . Synced with master branch, commit ed4e47b6757c05d4c23a9075b8b68003aa5dbfb8 Added: trunk/reactos/lib/fslib/vfatlib/README.txt (with props) trunk/reactos/lib/fslib/vfatlib/check/COPYING (with props) trunk/reactos/lib/fslib/vfatlib/check/ChangeLog (with props) trunk/reactos/lib/fslib/vfatlib/check/README (with props) trunk/reactos/lib/fslib/vfatlib/check/fsck.fat.h - copied, changed from r70815, trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h trunk/reactos/lib/fslib/vfatlib/check/rosglue.h (with props) Removed: trunk/reactos/lib/fslib/vfatlib/check/version.h trunk/reactos/lib/fslib/vfatlib/check/vfat.h Modified: trunk/reactos/lib/fslib/vfatlib/check/boot.c trunk/reactos/lib/fslib/vfatlib/check/boot.h trunk/reactos/lib/fslib/vfatlib/check/check.c trunk/reactos/lib/fslib/vfatlib/check/check.h trunk/reactos/lib/fslib/vfatlib/check/common.c trunk/reactos/lib/fslib/vfatlib/check/common.h trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h trunk/reactos/lib/fslib/vfatlib/check/fat.c trunk/reactos/lib/fslib/vfatlib/check/fat.h trunk/reactos/lib/fslib/vfatlib/check/file.c trunk/reactos/lib/fslib/vfatlib/check/file.h trunk/reactos/lib/fslib/vfatlib/check/io.c trunk/reactos/lib/fslib/vfatlib/check/io.h trunk/reactos/lib/fslib/vfatlib/check/lfn.c trunk/reactos/lib/fslib/vfatlib/check/lfn.h trunk/reactos/lib/fslib/vfatlib/check/msdos_fs.h trunk/reactos/lib/fslib/vfatlib/common.c trunk/reactos/lib/fslib/vfatlib/common.h trunk/reactos/lib/fslib/vfatlib/vfatlib.c trunk/reactos/lib/fslib/vfatlib/vfatlib.h [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/lib/fslib/vfatlib/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/README.t… Added: trunk/reactos/lib/fslib/vfatlib/check/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/CO… Added: trunk/reactos/lib/fslib/vfatlib/check/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/Ch… Added: trunk/reactos/lib/fslib/vfatlib/check/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/RE… Modified: trunk/reactos/lib/fslib/vfatlib/check/boot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/bo… Modified: trunk/reactos/lib/fslib/vfatlib/check/boot.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/bo… Modified: trunk/reactos/lib/fslib/vfatlib/check/check.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ch… Modified: trunk/reactos/lib/fslib/vfatlib/check/check.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ch… Modified: trunk/reactos/lib/fslib/vfatlib/check/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/co… Modified: trunk/reactos/lib/fslib/vfatlib/check/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/co… Modified: trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/do… Modified: trunk/reactos/lib/fslib/vfatlib/check/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fa… Modified: trunk/reactos/lib/fslib/vfatlib/check/fat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fa… Modified: trunk/reactos/lib/fslib/vfatlib/check/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fi… Modified: trunk/reactos/lib/fslib/vfatlib/check/file.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fi… Copied: trunk/reactos/lib/fslib/vfatlib/check/fsck.fat.h (from r70815, trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fs… Modified: trunk/reactos/lib/fslib/vfatlib/check/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/io… Modified: trunk/reactos/lib/fslib/vfatlib/check/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/io… Modified: trunk/reactos/lib/fslib/vfatlib/check/lfn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/lf… Modified: trunk/reactos/lib/fslib/vfatlib/check/lfn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/lf… Modified: trunk/reactos/lib/fslib/vfatlib/check/msdos_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ms… Added: trunk/reactos/lib/fslib/vfatlib/check/rosglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ro… Removed: trunk/reactos/lib/fslib/vfatlib/check/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ve… Removed: trunk/reactos/lib/fslib/vfatlib/check/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/vf… Modified: trunk/reactos/lib/fslib/vfatlib/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/common.c… Modified: trunk/reactos/lib/fslib/vfatlib/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/common.h… Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.…

1 0

[hbelusca] 70857: [USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation.
by hbelusca＠svn.reactos.org 02 Mar '16

02 Mar '16

Author: hbelusca Date: Wed Mar 2 00:51:48 2016 New Revision: 70857 URL: http://svn.reactos.org/svn/reactos?rev=70857&view=rev Log: [USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/da-DK.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/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/ms-MY.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.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/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -3154,13 +3154,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status); - sprintf(Buffer, "Setup failed to verify the selected partition.\n" + // sprintf(Buffer, "Setup failed to verify the selected partition.\n" + sprintf(Buffer, "ChkDsk detected some disk errors.\n" "(Status 0x%08lx).\n", Status); PopupError(Buffer, - MUIGetString(STRING_REBOOTCOMPUTER), + // MUIGetString(STRING_REBOOTCOMPUTER), + MUIGetString(STRING_CONTINUE), Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; + // return QUIT_PAGE; } PartEntry->NeedsCheck = FALSE; 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] Wed Mar 2 00:51:48 2016 @@ -1758,6 +1758,8 @@ "« £ ¥ ¥ ªâ ¢êàåã ¤ï«"}, {STRING_CHECKINGPART, "¥ç¥ ¯à®¢¥àª ¨§¡à ¨ï ¤ï«."}, + {STRING_CONTINUE, + "ENTER = à®¤ê«¦ ¢ ¥"}, {STRING_QUITCONTINUE, "F3 = §å®¤ ENTER = à®¤ê«¦ ¢ ¥"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, + {STRING_CONTINUE, + "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, 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] Wed Mar 2 00:51:48 2016 @@ -1751,6 +1751,8 @@ "Instalace nakop¡ruje ReactOS na odd¡l"}, {STRING_CHECKINGPART, "Instalace nyn¡ kontroluje zvolenì odd¡l."}, + {STRING_CONTINUE, + "ENTER = Pokraovat"}, {STRING_QUITCONTINUE, "F3 = Ukonit ENTER = Pokraovat"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/da-DK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/da-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1763,6 +1763,8 @@ "Installationen installere ReactOS p partitionen"}, {STRING_CHECKINGPART, "Installationen tjekker den valgte partition."}, + {STRING_CONTINUE, + "ENTER = Fortst"}, {STRING_QUITCONTINUE, "F3 = Afslut ENTER = Fortst"}, {STRING_REBOOTCOMPUTER, 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] Wed Mar 2 00:51:48 2016 @@ -1747,6 +1747,8 @@ "ReactOS wird auf dieser Partition installiert."}, {STRING_CHECKINGPART, "Die ausgewhlte Partition wird berprft."}, + {STRING_CONTINUE, + "EINGABETASTE = Fortsetzen"}, {STRING_QUITCONTINUE, "F3 = Beenden EINGABETASTE = Fortsetzen"}, {STRING_REBOOTCOMPUTER, 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] Wed Mar 2 00:51:48 2016 @@ -1762,6 +1762,8 @@ "Setup install ReactOS onto Partition"}, {STRING_CHECKINGPART, " ¡«á©«© ¢â® «é¨ «¦ § ¢£â¤¦ partition."}, + {STRING_CONTINUE, + "ENTER = ¬¤â® "}, {STRING_QUITCONTINUE, "F3 = §¦®é¨© ENTER = ¬¤â® "}, {STRING_REBOOTCOMPUTER, 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] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, + {STRING_CONTINUE, + "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, 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] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "El instalador est instalando ReactOS en la partici¢n"}, {STRING_CHECKINGPART, "El instalador est comprobando la partici¢n seleccionada."}, + {STRING_CONTINUE, + "INTRO = Continuar"}, {STRING_QUITCONTINUE, "F3 = Salir INTRO = Continuar"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "ReactOS paigaldatakse partitsioonile"}, {STRING_CHECKINGPART, "Valitud partitsiooni kontrollitakse."}, + {STRING_CONTINUE, + "ENTER = Jtka"}, {STRING_QUITCONTINUE, "F3 = Vlju ENTER = Jtka"}, {STRING_REBOOTCOMPUTER, 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] Wed Mar 2 00:51:48 2016 @@ -1768,6 +1768,8 @@ "Setup installe ReactOS sur la partition"}, {STRING_CHECKINGPART, "Setup vrifie la partition slectionne."}, + {STRING_CONTINUE, + "ENTRE = Continuer"}, {STRING_QUITCONTINUE, "F3 = Quitter ENTRE = Continuer"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1745,6 +1745,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, + {STRING_CONTINUE, + "ENTER = "}, {STRING_QUITCONTINUE, "F3 = ENTER = "}, {STRING_REBOOTCOMPUTER, 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] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installer ReactOS sulla partitione"}, {STRING_CHECKINGPART, "Setup sta controllando la partizione selezionata."}, + {STRING_CONTINUE, + "INVIO = Continua"}, {STRING_QUITCONTINUE, "F3 = Esci INVIO = Continua"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1747,6 +1747,8 @@ "¾¯Ä±¯ÌßÊ ReactOS¦ Êß°Ã¨¼®Ý ¼Þ®³Æ ²Ý½Ä°Ù¼Ï½¡"}, {STRING_CHECKINGPART, "¾¯Ä±¯ÌßÊ ¾ÝÀ¸ »ÚÀ Êß°Ã¨¼®Ý¦ ¹Ý» ¼Ã²Ï½¡"}, + {STRING_CONTINUE, + "ENTER = ¿Þ¯º³"}, {STRING_QUITCONTINUE, "F3 = Á³¼ ENTER = ¿Þ¯º³"}, {STRING_REBOOTCOMPUTER, 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] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, + {STRING_CONTINUE, + "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/ms-MY.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ms-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1632,6 +1632,8 @@ "Persediaan memasang ReactOS ke Partition"}, {STRING_CHECKINGPART, "Persediaan kini sedang menyemak sekatan yang dipilih."}, + {STRING_CONTINUE, + "ENTER = Teruskan"}, {STRING_QUITCONTINUE, "F3 = Keluar ENTER = Teruskan"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1785,6 +1785,8 @@ "Setup installeert ReactOS op Partitie"}, {STRING_CHECKINGPART, "Setup controleert nu de geselecteerde partitie."}, + {STRING_CONTINUE, + "ENTER = Doorgaan"}, {STRING_QUITCONTINUE, "F3 = Afsluiten ENTER = Doorgaan"}, {STRING_REBOOTCOMPUTER, 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] Wed Mar 2 00:51:48 2016 @@ -1754,6 +1754,8 @@ "Instalator kopiuje pliki systemu na wybran¥ partycj©."}, {STRING_CHECKINGPART, "Instalator sprawdza wybran¥ partycj©."}, + {STRING_CONTINUE, + "ENTER = Kontynuacja"}, {STRING_QUITCONTINUE, "F3 = Wyjcie ENTER = Kontynuacja"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1783,6 +1783,8 @@ "O instalador instala o ReactOS na partiÆo"}, {STRING_CHECKINGPART, "O instalador est verificando a partiÆo selecionada."}, + {STRING_CONTINUE, + "ENTER=Continuar"}, {STRING_QUITCONTINUE, "F3=Sair ENTER=Continuar"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1814,6 +1814,8 @@ "ReactOS va fi instalat pe partiþia"}, {STRING_CHECKINGPART, "Programul de instalare verificã acum partiþia aleasã."}, + {STRING_CONTINUE, + "ENTER = Continuare"}, {STRING_QUITCONTINUE, "F3 = Ieºire ENTER = Continuare"}, {STRING_REBOOTCOMPUTER, 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] Wed Mar 2 00:51:48 2016 @@ -1744,6 +1744,8 @@ "ReactOS ãáâ ¢«¨¢ ¥âáï à §¤¥«:"}, {STRING_CHECKINGPART, "à®£à ¬¬ ãáâ ®¢ª¨ ¯à®¢¥àï¥â ¢ë¡à ë© à §¤¥«."}, + {STRING_CONTINUE, + "ENTER = à®¤®«¦¨âì"}, {STRING_QUITCONTINUE, "F3 = ëå®¤ ENTER = à®¤®«¦¨âì"}, {STRING_REBOOTCOMPUTER, 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] Wed Mar 2 00:51:48 2016 @@ -1757,6 +1757,8 @@ "Inçtal tor nainçtaluje systm ReactOS na oblas"}, {STRING_CHECKINGPART, "Inçtal tor teraz skontroluje vybran£ oblas."}, + {STRING_CONTINUE, + "ENTER = Pokraova"}, {STRING_QUITCONTINUE, "F3 = Skoni ENTER = Pokraova"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1750,6 +1750,8 @@ "Instalimi i ReactOS ne Particion"}, {STRING_CHECKINGPART, "Instalimi tani sht duke kontrolluar particionin e przgjedhur."}, + {STRING_CONTINUE, + "ENTER = Vazhdo"}, {STRING_QUITCONTINUE, "F3 = Dil ENTER = Vazhdo"}, {STRING_REBOOTCOMPUTER, 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] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installerar ReactOS till Partitionen"}, {STRING_CHECKINGPART, "Setup undersker nu den valda partitionen."}, + {STRING_CONTINUE, + "ENTER = Fortstt"}, {STRING_QUITCONTINUE, "F3 = Avsluta ENTER = Fortstt"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1724,6 +1724,8 @@ "Kur, ReactOS'u blm zerine kurar."}, {STRING_CHECKINGPART, "Kur, imdi seili blm gzden geiriyor."}, + {STRING_CONTINUE, + "Giri = Srdr"}, {STRING_QUITCONTINUE, "3 = k Giri = Srdr"}, {STRING_REBOOTCOMPUTER, 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] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "ReactOS ¢áâ ®¢«îóâìáï à®§¤i«"}, {STRING_CHECKINGPART, "áâ ®¢«î¢ ç ¯¥à¥¢iàïó ¢¨¡à ¨© à®§¤i«."}, + {STRING_CONTINUE, + "ENTER = à®¤®¢¦¨â¨"}, {STRING_QUITCONTINUE, "F3 = ¨©â¨ ENTER = à®¤®¢¦¨â¨"}, {STRING_REBOOTCOMPUTER, 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] Wed Mar 2 00:51:48 2016 @@ -115,11 +115,12 @@ #define STRING_NONFORMATTEDOTHERPART 63 #define STRING_INSTALLONPART 10 #define STRING_CHECKINGPART 11 -#define STRING_QUITCONTINUE 12 -#define STRING_REBOOTCOMPUTER 13 -#define STRING_TXTSETUPFAILED 14 -#define STRING_COPYING 15 -#define STRING_SETUPCOPYINGFILES 16 +#define STRING_CONTINUE 12 +#define STRING_QUITCONTINUE 13 +#define STRING_REBOOTCOMPUTER 14 +#define STRING_TXTSETUPFAILED 15 +#define STRING_COPYING 16 +#define STRING_SETUPCOPYINGFILES 17 #define STRING_REGHIVEUPDATE 20 #define STRING_IMPORTFILE 21 #define STRING_DISPLAYETTINGSUPDATE 22

1 0

[akhaldi] 70856: [ADVPACK_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 19:31:48 2016 New Revision: 70856 URL: http://svn.reactos.org/svn/reactos?rev=70856&view=rev Log: [ADVPACK_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/advpack/advpack.c Modified: trunk/rostests/winetests/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/advpack… ============================================================================== --- trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] Tue Mar 1 19:31:48 2016 @@ -667,7 +667,7 @@ return; /* Make sure we create the temporary file in a directory - * were we have enough rights + * where we have adequate rights */ GetTempPathA(MAX_PATH, inf_file); lstrcatA(inf_file,"test.inf");

1 0

[akhaldi] 70855: [CREDUI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 19:30:48 2016 New Revision: 70855 URL: http://svn.reactos.org/svn/reactos?rev=70855&view=rev Log: [CREDUI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/credui/credui.c Modified: trunk/rostests/winetests/credui/credui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/credui/credui.c… ============================================================================== --- trunk/rostests/winetests/credui/credui.c [iso-8859-1] (original) +++ trunk/rostests/winetests/credui/credui.c [iso-8859-1] Tue Mar 1 19:30:48 2016 @@ -73,7 +73,7 @@ sizeof(username)/sizeof(username[0]), password, sizeof(password)/sizeof(password[0]), NULL, CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX); - ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_FLAGS instead of %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); if (winetest_interactive) {

1 0

[akhaldi] 70854: [DINPUT_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 19:29:57 2016 New Revision: 70854 URL: http://svn.reactos.org/svn/reactos?rev=70854&view=rev Log: [DINPUT_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/dinput/keyboard.c trunk/rostests/winetests/dinput/mouse.c Modified: trunk/rostests/winetests/dinput/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/keyboard… ============================================================================== --- trunk/rostests/winetests/dinput/keyboard.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dinput/keyboard.c [iso-8859-1] Tue Mar 1 19:29:57 2016 @@ -125,6 +125,12 @@ E_INVALIDARG, E_HANDLE, S_OK, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; +static const HRESULT SetCoop_invalid_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + static const HRESULT SetCoop_real_window[16] = { E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, S_OK, S_OK, E_INVALIDARG, @@ -152,6 +158,11 @@ { hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, NULL, i); ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %08x\n", i, hr); + } + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, (HWND)0x400000, i); + ok(hr == SetCoop_invalid_window[i], "SetCooperativeLevel(invalid, %d): %08x\n", i, hr); } for (i=0; i<16; i++) { Modified: trunk/rostests/winetests/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/mouse.c?… ============================================================================== --- trunk/rostests/winetests/dinput/mouse.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dinput/mouse.c [iso-8859-1] Tue Mar 1 19:29:57 2016 @@ -132,7 +132,7 @@ /* Foreground coop level requires window to have focus */ /* Create a temporary window, this should make dinput - * loose mouse input */ + * lose mouse input */ hwnd2 = CreateWindowA("static", "Temporary", WS_VISIBLE, 10, 210, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd2 != NULL, "CreateWindowA failed with %u\n", GetLastError());

1 0

[akhaldi] 70853: [DBGHELP] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 19:28:06 2016 New Revision: 70853 URL: http://svn.reactos.org/svn/reactos?rev=70853&view=rev Log: [DBGHELP] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.spec [iso-8859-1] Tue Mar 1 19:28:06 2016 @@ -38,33 +38,33 @@ @ stdcall SymAddSourceStream(ptr double str ptr ptr) @ stdcall SymAddSourceStreamA(ptr double str ptr ptr) @ stdcall SymAddSourceStreamW(ptr double str ptr ptr) -@ stdcall SymAddSymbol(ptr double str double long long) -@ stdcall SymAddSymbolW(ptr double wstr double long long) +@ stdcall SymAddSymbol(ptr int64 str int64 long long) +@ stdcall SymAddSymbolW(ptr int64 wstr int64 long long) @ stdcall SymCleanup(long) @ stdcall SymDeleteSymbol(ptr double str double long) @ stdcall SymDeleteSymbolW(ptr double str double long) -@ stdcall SymEnumLines(ptr double str str ptr ptr) +@ stdcall SymEnumLines(ptr int64 str str ptr ptr) @ stdcall SymEnumLinesW(ptr double str str ptr ptr) @ stdcall SymEnumProcesses(ptr ptr) @ stdcall SymEnumSourceFileTokens(ptr double ptr) -@ stdcall SymEnumSourceFiles(ptr double str ptr ptr) -@ stdcall SymEnumSourceFilesW(ptr double str ptr ptr) -@ stdcall SymEnumSourceLines(ptr double str str long long ptr ptr) -@ stdcall SymEnumSourceLinesW(ptr double str str long long ptr ptr) +@ stdcall SymEnumSourceFiles(ptr int64 str ptr ptr) +@ stdcall SymEnumSourceFilesW(ptr int64 wstr ptr ptr) +@ stdcall SymEnumSourceLines(ptr int64 str str long long ptr ptr) +@ stdcall SymEnumSourceLinesW(ptr int64 wstr wstr long long ptr ptr) @ stdcall SymEnumSym(ptr double ptr ptr) -@ stdcall SymEnumSymbols(ptr double str ptr ptr) +@ stdcall SymEnumSymbols(ptr int64 str ptr ptr) @ stdcall SymEnumSymbolsForAddr(ptr double ptr ptr) @ stdcall SymEnumSymbolsForAddrW(ptr double ptr ptr) -@ stdcall SymEnumSymbolsW(ptr double wstr ptr ptr) -@ stdcall SymEnumTypes(ptr double ptr ptr) +@ stdcall SymEnumSymbolsW(ptr int64 wstr ptr ptr) +@ stdcall SymEnumTypes(ptr int64 ptr ptr) @ stdcall SymEnumTypesByName(ptr double str ptr ptr) @ stdcall SymEnumTypesByNameW(ptr double str ptr ptr) -@ stdcall SymEnumTypesW(ptr double ptr ptr) +@ stdcall SymEnumTypesW(ptr int64 ptr ptr) @ stdcall SymEnumerateModules(long ptr ptr) @ stdcall SymEnumerateModules64(long ptr ptr) @ stdcall SymEnumerateModulesW64(long ptr ptr) @ stdcall SymEnumerateSymbols(long long ptr ptr) -@ stdcall SymEnumerateSymbols64(long double ptr ptr) +@ stdcall SymEnumerateSymbols64(long int64 ptr ptr) @ stdcall SymEnumerateSymbolsW(ptr long ptr ptr) @ stdcall SymEnumerateSymbolsW64(ptr double ptr ptr) @ stdcall SymFindDebugInfoFile(ptr str str ptr ptr) @@ -73,22 +73,22 @@ @ stdcall SymFindExecutableImageW(ptr str str ptr ptr) @ stdcall SymFindFileInPath(long str str ptr long long long ptr ptr ptr) @ stdcall SymFindFileInPathW(long wstr wstr ptr long long long ptr ptr ptr) -@ stdcall SymFromAddr(ptr double ptr ptr) -@ stdcall SymFromAddrW(ptr double ptr ptr) -@ stdcall SymFromIndex(ptr double long ptr) -@ stdcall SymFromIndexW(ptr double long ptr) +@ stdcall SymFromAddr(ptr int64 ptr ptr) +@ stdcall SymFromAddrW(ptr int64 ptr ptr) +@ stdcall SymFromIndex(long int64 long ptr) +@ stdcall SymFromIndexW(long int64 long ptr) @ stdcall SymFromName(long str ptr) @ stdcall SymFromNameW(long str ptr) @ stdcall SymFromToken(ptr double long ptr) @ stdcall SymFromTokenW(ptr double long ptr) @ stdcall SymFunctionTableAccess(long long) -@ stdcall SymFunctionTableAccess64(long double) +@ stdcall SymFunctionTableAccess64(long int64) @ stdcall SymGetFileLineOffsets64(ptr str str ptr long) @ stdcall SymGetHomeDirectory(long str ptr) @ stdcall SymGetHomeDirectoryW(long str ptr) @ stdcall SymGetLineFromAddr(long long ptr ptr) -@ stdcall SymGetLineFromAddr64(long double ptr ptr) -@ stdcall SymGetLineFromAddrW64(long double ptr ptr) +@ stdcall SymGetLineFromAddr64(long int64 ptr ptr) +@ stdcall SymGetLineFromAddrW64(long int64 ptr ptr) @ stdcall SymGetLineFromName(long str str long ptr ptr) @ stdcall SymGetLineFromName64(long str str long ptr ptr) @ stdcall SymGetLineFromNameW64(long wstr wstr long ptr ptr) @@ -99,11 +99,11 @@ @ stdcall SymGetLinePrev64(long ptr) @ stdcall SymGetLinePrevW64(ptr ptr) @ stdcall SymGetModuleBase(long long) -@ stdcall SymGetModuleBase64(long double) +@ stdcall SymGetModuleBase64(long int64) @ stdcall SymGetModuleInfo(long long ptr) -@ stdcall SymGetModuleInfo64(long double ptr) +@ stdcall SymGetModuleInfo64(long int64 ptr) @ stdcall SymGetModuleInfoW(long long ptr) -@ stdcall SymGetModuleInfoW64(long double ptr) +@ stdcall SymGetModuleInfoW64(long int64 ptr) @ stub SymGetOmapBlockBase @ stdcall SymGetOptions() @ stdcall SymGetScope(ptr double long ptr) @@ -113,13 +113,13 @@ @ stdcall SymGetSourceFile(ptr double str str str long) @ stdcall SymGetSourceFileFromToken(ptr ptr str str long) @ stdcall SymGetSourceFileFromTokenW(ptr ptr str str long) -@ stdcall SymGetSourceFileToken(ptr double str ptr ptr) -@ stdcall SymGetSourceFileTokenW(ptr double wstr ptr ptr) +@ stdcall SymGetSourceFileToken(ptr int64 str ptr ptr) +@ stdcall SymGetSourceFileTokenW(ptr int64 wstr ptr ptr) @ stdcall SymGetSourceFileW(ptr double str str str long) @ stdcall SymGetSourceVarFromToken(ptr ptr str str str long) @ stdcall SymGetSourceVarFromTokenW(ptr ptr str str str long) @ stdcall SymGetSymFromAddr(long long ptr ptr) -@ stdcall SymGetSymFromAddr64(long double ptr ptr) +@ stdcall SymGetSymFromAddr64(long int64 ptr ptr) @ stdcall SymGetSymFromName(long str ptr) @ stdcall SymGetSymFromName64(long str ptr) @ stdcall SymGetSymNext(long ptr) @@ -128,40 +128,40 @@ @ stdcall SymGetSymPrev64(long ptr) @ stdcall SymGetSymbolFile(ptr str str long str ptr str ptr) @ stdcall SymGetSymbolFileW(ptr str str long str ptr str ptr) -@ stdcall SymGetTypeFromName(ptr double str ptr) +@ stdcall SymGetTypeFromName(ptr int64 str ptr) @ stdcall SymGetTypeFromNameW(ptr double str ptr) -@ stdcall SymGetTypeInfo(ptr double long long ptr) +@ stdcall SymGetTypeInfo(ptr int64 long long ptr) @ stdcall SymGetTypeInfoEx(ptr double ptr) @ stdcall SymGetUnwindInfo(ptr double ptr ptr) @ stdcall SymInitialize(long str long) @ stdcall SymInitializeW(long wstr long) @ stdcall SymLoadModule(long long str str long long) -@ stdcall SymLoadModule64(long long str str double long) -@ stdcall SymLoadModuleEx(long long str str double long ptr long) -@ stdcall SymLoadModuleExW(long long wstr wstr double long ptr long) +@ stdcall SymLoadModule64(long long str str int64 long) +@ stdcall SymLoadModuleEx(long long str str int64 long ptr long) +@ stdcall SymLoadModuleExW(long long wstr wstr int64 long ptr long) @ stdcall SymMatchFileName(str str ptr ptr) @ stdcall SymMatchFileNameW(wstr wstr ptr ptr) @ stdcall SymMatchString(str str long) SymMatchStringA @ stdcall SymMatchStringA(str str long) -@ stdcall SymMatchStringW(str str long) +@ stdcall SymMatchStringW(wstr wstr long) @ stdcall SymNext(ptr ptr) @ stdcall SymNextW(ptr ptr) @ stdcall SymPrev(ptr ptr) @ stdcall SymPrevW(ptr ptr) @ stdcall SymRefreshModuleList(long) @ stdcall SymRegisterCallback(long ptr ptr) -@ stdcall SymRegisterCallback64(long ptr double) -@ stdcall SymRegisterCallbackW64(long ptr double) +@ stdcall SymRegisterCallback64(long ptr int64) +@ stdcall SymRegisterCallbackW64(long ptr int64) @ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) -@ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) -@ stdcall SymSearch(long double long long str double ptr ptr long) -@ stdcall SymSearchW(long double long long wstr double ptr ptr long) +@ stdcall SymRegisterFunctionEntryCallback64(ptr ptr int64) +@ stdcall SymSearch(long int64 long long str int64 ptr ptr long) +@ stdcall SymSearchW(long int64 long long wstr int64 ptr ptr long) @ stdcall SymSetContext(long ptr ptr) -@ stdcall SymSetHomeDirectory(ptr str) -@ stdcall SymSetHomeDirectoryW(ptr str) +@ stdcall SymSetHomeDirectory(long str) +@ stdcall SymSetHomeDirectoryW(long wstr) @ stdcall SymSetOptions(long) @ stdcall SymSetParentWindow(long) -@ stdcall SymSetScopeFromAddr(ptr double) +@ stdcall SymSetScopeFromAddr(ptr int64) @ stdcall SymSetScopeFromIndex(ptr double long) @ stdcall SymSetSearchPath(long str) @ stdcall SymSetSearchPathW(long wstr) @@ -185,8 +185,8 @@ @ stdcall SymUnDName(ptr str long) @ stdcall SymUnDName64(ptr str long) @ stdcall SymUnloadModule(long long) -@ stdcall SymUnloadModule64(long double) -@ stdcall UnDecorateSymbolName(str str long long) +@ stdcall SymUnloadModule64(long int64) +@ stdcall UnDecorateSymbolName(str ptr long long) @ stdcall UnDecorateSymbolNameW(wstr ptr long long) @ stdcall UnmapDebugInformation(ptr) @ stdcall WinDbgExtensionDllInit(ptr long long) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Mar 1 19:28:06 2016 @@ -63,7 +63,7 @@ reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.55 reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.55 reactos/dll/win32/cryptui # Synced to WineStaging-1.7.55 -reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.55 +reactos/dll/win32/dbghelp # Synced to WineStaging-1.9.4 reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.55 reactos/dll/win32/faultrep # Synced to WineStaging-1.7.55 reactos/dll/win32/fltlib # Synced to WineStaging-1.7.55

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs