Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 75834: [NTOSKRNL] Don't call MmBuildMdlForNonPagedPool in CcWriteVirtualAddress(): - BaseAddress comes from PagedPood - Windows returns a locked MDL from paged pool - See tests from r...
by pschweitzer＠svn.reactos.org 13 Sep '17

13 Sep '17

Author: pschweitzer Date: Wed Sep 13 16:13:21 2017 New Revision: 75834 URL: http://svn.reactos.org/svn/reactos?rev=75834&view=rev Log: [NTOSKRNL] Don't call MmBuildMdlForNonPagedPool in CcWriteVirtualAddress(): - BaseAddress comes from PagedPood - Windows returns a locked MDL from paged pool - See tests from r75833 that are getting fixed with that revision This fixes assertions failures on BtrFS write. CORE-13763 CORE-13769 Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=758… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Wed Sep 13 16:13:21 2017 @@ -147,14 +147,30 @@ { return STATUS_INSUFFICIENT_RESOURCES; } - MmBuildMdlForNonPagedPool(Mdl); - Mdl->MdlFlags |= MDL_IO_PAGE_READ; - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoSynchronousPageWrite(Vacb->SharedCacheMap->FileObject, Mdl, &Vacb->FileOffset, &Event, &IoStatus); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatus.Status; + + Status = STATUS_SUCCESS; + _SEH2_TRY + { + MmProbeAndLockPages(Mdl, KernelMode, IoReadAccess); + } + _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + KeBugCheck(CACHE_MANAGER); + } _SEH2_END; + + if (NT_SUCCESS(Status)) + { + Mdl->MdlFlags |= MDL_IO_PAGE_READ; + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = IoSynchronousPageWrite(Vacb->SharedCacheMap->FileObject, Mdl, &Vacb->FileOffset, &Event, &IoStatus); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + MmUnlockPages(Mdl); } IoFreeMdl(Mdl); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE))

1 0

[pschweitzer] 75833: [KMTESTS:MM] Add a test that shows that MDLs issued by Cc for paging IOs are not in the correct state (nor correctly allocated) CORE-13769
by pschweitzer＠svn.reactos.org 13 Sep '17

13 Sep '17

Author: pschweitzer Date: Wed Sep 13 11:53:56 2017 New Revision: 75833 URL: http://svn.reactos.org/svn/reactos?rev=75833&view=rev Log: [KMTESTS:MM] Add a test that shows that MDLs issued by Cc for paging IOs are not in the correct state (nor correctly allocated) CORE-13769 Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/NtCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c [iso-8859-1] Wed Sep 13 11:53:56 2017 @@ -381,6 +381,14 @@ } else { + PMDL Mdl; + + Mdl = Irp->MdlAddress; + ok(Mdl != NULL, "Null pointer for MDL!\n"); + ok((Mdl->MdlFlags & MDL_PAGES_LOCKED) != 0, "MDL not locked\n"); + ok((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0, "MDL from non paged\n"); + ok((Irp->Flags & IRP_PAGING_IO) != 0, "Non paging IO\n"); + Status = STATUS_SUCCESS; }

1 0

[spetreolle] 75832: Stub CoGetInterceptorFromTypeInfo for Firefox. (lets xul.dll to load) CORE-12828
by spetreolle＠svn.reactos.org 12 Sep '17

12 Sep '17

Author: spetreolle Date: Tue Sep 12 20:25:59 2017 New Revision: 75832 URL: http://svn.reactos.org/svn/reactos?rev=75832&view=rev Log: Stub CoGetInterceptorFromTypeInfo for Firefox. (lets xul.dll to load) CORE-12828 Modified: trunk/reactos/dll/win32/ole32/ole32.spec Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Tue Sep 12 20:25:59 2017 @@ -46,7 +46,7 @@ @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) @ stdcall -stub CoGetInterceptor(ptr ptr ptr ptr) -# CoGetInterceptorFromTypeInfo +@ stdcall -stub CoGetInterceptorFromTypeInfo(ptr ptr ptr ptr ptr) @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long)

1 0

[dreimer] 75831: [RAPPS] ENOUGH! CORE-13666 #resolve #comment Fixed forever!
by dreimer＠svn.reactos.org 11 Sep '17

11 Sep '17

Author: dreimer Date: Mon Sep 11 19:20:32 2017 New Revision: 75831 URL: http://svn.reactos.org/svn/reactos?rev=75831&view=rev Log: [RAPPS] ENOUGH! CORE-13666 #resolve #comment Fixed forever! Removed: trunk/reactos/media/rapps/utorrent.txt Removed: trunk/reactos/media/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/utorrent.txt?r… ============================================================================== --- trunk/reactos/media/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/utorrent.txt (removed) @@ -1,65 +0,0 @@ -[Section] -Name = ÂµTorrent -Version = CURRENT -License = Freeware for non-commercial uses -Description = Small and fast BitTorrent Client. -Size = 1.7 MiB -Category = 5 -URLSite = http://www.utorrent.com/ -URLDownload = http://download-new.utorrent.com/endpoint/utorrent/os/windows/track/stable/… -SHA1 = 8bbf8a007365253a75c1262720750b3379f4121f -CDPath = none - -[Section.0407] -License = Freeware fÃ¼r nichtkommerzielle Nutzung -Description = Kleiner und schneller BitTorrent Client. -Size = 1,7 MiB - -[Section.0a] -License = Gratuito para uso no comercial -Description = Un cliente BitTorrent pequeÃ±o y rÃ¡pido. - -[Section.040c] -License = Gratuit pour une utilisation non-commerciale -Description = Client BitTorrent petit et rapide. -Size = 1,7 Mio - -[Section.0410] -License = Gratuita per un uso non-commerciale -Description = Piccolo e rapido Client BitTorrent. - -[Section.0413] -License = Freeware voor niet-commerciÃ«el gebruik -Description = Kleine en snelle BitTorrent afnemer. - -[Section.0415] -License = Freeware (do uÅ¼ytku domowego) -Description = MaÅy i szybki klient BitTorrent. - -[Section.0418] -License = GratuitÄ pentru uz necomercial -Description = Client BitTorrent, mic Èi rapid. -Size = 1,7 Mio - -[Section.0419] -License = ÐÐµÑÐ¿Ð»Ð°ÑÐ½Ð°Ñ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ð¼Ð¼ÐµÑÑÐµÑÐºÐ¾Ð³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ -Description = ÐÐ°Ð»ÐµÐ½ÑÐºÐ¸Ð¹ Ð¸ Ð±ÑÑÑÑÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ BitTorrent. -Size = 1,7 ÐÐ¸Ð - -[Section.041f] -License = Tecimlik olmayan kullanÄ±mlar iÃ§in Ã¼cretsiz. -Description = KÃ¼Ã§Ã¼k ve hÄ±zlÄ± BitTorrent istemcisi. -Size = 1,7 MiB - -[Section.0422] -License = ÐÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð° Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ð¼ÐµÑÑÑÐ¹Ð½Ð¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ -Description = ÐÐ°Ð»ÐµÐ½ÑÐºÐ¸Ð¹ Ñ ÑÐ²Ð¸Ð´ÐºÐ¸Ð¹ ÐºÐ»ÑÑÐ½Ñ BitTorrent. - -[Section.0804] -License = éåä¸ç¨éçåè´¹è½¯ä»¶ -Description = å°èå¿«ç BitTorrent å®¢æ·ç«¯ã - -[Section.0813] -License = Freeware voor niet-commerciÃ«el gebruik -Description = Kleine en snelle BitTorrent afnemer. -

1 0

[spetreolle] 75830: [RAPPS] Include cleanup. Patch by sanchaez+small changes by me.
by spetreolle＠svn.reactos.org 10 Sep '17

10 Sep '17

Author: spetreolle Date: Sun Sep 10 23:44:22 2017 New Revision: 75830 URL: http://svn.reactos.org/svn/reactos?rev=75830&view=rev Log: [RAPPS] Include cleanup. Patch by sanchaez+small changes by me. Modified: trunk/reactos/base/applications/rapps/aboutdlg.cpp trunk/reactos/base/applications/rapps/available.cpp trunk/reactos/base/applications/rapps/gui.cpp trunk/reactos/base/applications/rapps/installed.cpp trunk/reactos/base/applications/rapps/integrity.cpp trunk/reactos/base/applications/rapps/loaddlg.cpp trunk/reactos/base/applications/rapps/misc.cpp trunk/reactos/base/applications/rapps/settingsdlg.cpp trunk/reactos/base/applications/rapps/unattended.cpp trunk/reactos/base/applications/rapps/winmain.cpp Modified: trunk/reactos/base/applications/rapps/aboutdlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ab… ============================================================================== --- trunk/reactos/base/applications/rapps/aboutdlg.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/aboutdlg.cpp [iso-8859-1] Sun Sep 10 23:44:22 2017 @@ -6,7 +6,7 @@ * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2017 Alexander Shaposhikov (sanchaez(a)reactos.org) */ -#include "defines.h" +#include "rapps.h" static INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) { Modified: trunk/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/av… ============================================================================== --- trunk/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/available.cpp [iso-8859-1] Sun Sep 10 23:44:22 2017 @@ -7,7 +7,7 @@ * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ -#include "defines.h" +#include "rapps.h" #include "available.h" #include "misc.h" Modified: trunk/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/gu… ============================================================================== --- trunk/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Sun Sep 10 23:44:22 2017 @@ -6,7 +6,7 @@ * COPYRIGHT: Copyright 2015 David Quintana (gigaherz(a)gmail.com) * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ -#include "defines.h" +#include "rapps.h" #include "rapps.h" #include "rosui.h" Modified: trunk/reactos/base/applications/rapps/installed.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… ============================================================================== --- trunk/reactos/base/applications/rapps/installed.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/installed.cpp [iso-8859-1] Sun Sep 10 23:44:22 2017 @@ -6,7 +6,7 @@ * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ -#include "defines.h" +#include "rapps.h" #include "installed.h" Modified: trunk/reactos/base/applications/rapps/integrity.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… ============================================================================== --- trunk/reactos/base/applications/rapps/integrity.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/integrity.cpp [iso-8859-1] Sun Sep 10 23:44:22 2017 @@ -6,7 +6,7 @@ * COPYRIGHT: Copyright Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) * Copyright Mark Jansen */ -#include "defines.h" +#include "rapps.h" #include <sha1.h> Modified: trunk/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Sun Sep 10 23:44:22 2017 @@ -28,7 +28,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "defines.h" +#include "rapps.h" #include <shlobj_undoc.h> #include <shlguid_undoc.h> Modified: trunk/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/mi… ============================================================================== --- trunk/reactos/base/applications/rapps/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/misc.cpp [iso-8859-1] Sun Sep 10 23:44:22 2017 @@ -7,7 +7,7 @@ * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ -#include "defines.h" +#include "rapps.h" #include "gui.h" #include "misc.h" Modified: trunk/reactos/base/applications/rapps/settingsdlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/se… ============================================================================== --- trunk/reactos/base/applications/rapps/settingsdlg.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/settingsdlg.cpp [iso-8859-1] Sun Sep 10 23:44:22 2017 @@ -6,9 +6,7 @@ * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ -#include "defines.h" - -#include "dialogs.h" +#include "rapps.h" SETTINGS_INFO NewSettingsInfo; Modified: trunk/reactos/base/applications/rapps/unattended.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/un… ============================================================================== --- trunk/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] Sun Sep 10 23:44:22 2017 @@ -6,12 +6,10 @@ * COPYRIGHT: Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ #include "rapps.h" + #include "unattended.h" -#include "defines.h" -#include "available.h" -#include "dialogs.h" -#include "setupapi.h" +#include <setupapi.h> #define MIN_ARGS 2 Modified: trunk/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Sun Sep 10 23:44:22 2017 @@ -7,8 +7,8 @@ * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ -#include "defines.h" #include "rapps.h" + #include "unattended.h" #include <atlcom.h>

1 0

[spetreolle] 75829: [RAPPS] Better place for a pch inclusion. Spotted by gigaherz
by spetreolle＠svn.reactos.org 10 Sep '17

10 Sep '17

Author: spetreolle Date: Sun Sep 10 22:57:01 2017 New Revision: 75829 URL: http://svn.reactos.org/svn/reactos?rev=75829&view=rev Log: [RAPPS] Better place for a pch inclusion. Spotted by gigaherz Modified: trunk/reactos/base/applications/rapps/include/unattended.h trunk/reactos/base/applications/rapps/unattended.cpp Modified: trunk/reactos/base/applications/rapps/include/unattended.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… ============================================================================== --- trunk/reactos/base/applications/rapps/include/unattended.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/include/unattended.h [iso-8859-1] Sun Sep 10 22:57:01 2017 @@ -1,5 +1,5 @@ #pragma once -#include "rapps.h" + #define CMD_KEY_INSTALL L"/INSTALL" #define CMD_KEY_SETUP L"/SETUP" Modified: trunk/reactos/base/applications/rapps/unattended.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/un… ============================================================================== --- trunk/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] Sun Sep 10 22:57:01 2017 @@ -5,6 +5,7 @@ * PURPOSE: Functions to parse command-line flags and process them * COPYRIGHT: Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ +#include "rapps.h" #include "unattended.h" #include "defines.h" #include "available.h"

1 0

[spetreolle] 75828: [RAPPS] Include rapps.h(pch) in unattended.h Fixes GCC build.
by spetreolle＠svn.reactos.org 10 Sep '17

10 Sep '17

Author: spetreolle Date: Sun Sep 10 22:50:52 2017 New Revision: 75828 URL: http://svn.reactos.org/svn/reactos?rev=75828&view=rev Log: [RAPPS] Include rapps.h(pch) in unattended.h Fixes GCC build. Modified: trunk/reactos/base/applications/rapps/include/unattended.h Modified: trunk/reactos/base/applications/rapps/include/unattended.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… ============================================================================== --- trunk/reactos/base/applications/rapps/include/unattended.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/include/unattended.h [iso-8859-1] Sun Sep 10 22:50:52 2017 @@ -1,5 +1,5 @@ #pragma once - +#include "rapps.h" #define CMD_KEY_INSTALL L"/INSTALL" #define CMD_KEY_SETUP L"/SETUP"

1 0

[dquintana] 75827: [RAPPS] * Fix linux build? maybe? please?
by dquintana＠svn.reactos.org 10 Sep '17

10 Sep '17

Author: dquintana Date: Sun Sep 10 22:31:08 2017 New Revision: 75827 URL: http://svn.reactos.org/svn/reactos?rev=75827&view=rev Log: [RAPPS] * Fix linux build? maybe? please? Modified: trunk/reactos/base/applications/rapps/include/unattended.h Modified: trunk/reactos/base/applications/rapps/include/unattended.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… ============================================================================== --- trunk/reactos/base/applications/rapps/include/unattended.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/include/unattended.h [iso-8859-1] Sun Sep 10 22:31:08 2017 @@ -1,5 +1,4 @@ #pragma once -#include "windef.h" #define CMD_KEY_INSTALL L"/INSTALL" #define CMD_KEY_SETUP L"/SETUP"

1 0

[dquintana] 75826: Merge RAPPS improvements branch into trunk. Contains the work done by sanchaez (Alexander Shaposhnikov) during GSoC 2017: * Better information in the application details view. * ...
by dquintana＠svn.reactos.org 10 Sep '17

10 Sep '17

Author: dquintana Date: Sun Sep 10 22:07:29 2017 New Revision: 75826 URL: http://svn.reactos.org/svn/reactos?rev=75826&view=rev Log: Merge RAPPS improvements branch into trunk. Contains the work done by sanchaez (Alexander Shaposhnikov) during GSoC 2017: * Better information in the application details view. * Bulk installation of multiple applications at once. * Command-line automation of installation (single and bulk). (for more details, see the related blog posts) TRANSLATORS: Many resources have been changed, and they are in need of review! Added: trunk/reactos/base/applications/rapps/include/ - copied from r75825, branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/ trunk/reactos/base/applications/rapps/res/select.ico - copied unchanged from r75825, branches/GSoC_2017/rapps/reactos/base/applications/rapps/res/select.ico trunk/reactos/base/applications/rapps/unattended.cpp - copied unchanged from r75825, branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp Removed: trunk/reactos/base/applications/rapps/crichedit.h trunk/reactos/base/applications/rapps/installdlg.cpp trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/applications/rapps/resource.h trunk/reactos/base/applications/rapps/rosui.h Modified: trunk/ (props changed) trunk/reactos/ (props changed) trunk/reactos/base/applications/rapps/ (props changed) trunk/reactos/base/applications/rapps/CMakeLists.txt trunk/reactos/base/applications/rapps/aboutdlg.cpp trunk/reactos/base/applications/rapps/available.cpp trunk/reactos/base/applications/rapps/gui.cpp trunk/reactos/base/applications/rapps/installed.cpp trunk/reactos/base/applications/rapps/integrity.cpp trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/cs-CZ.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/fr-FR.rc trunk/reactos/base/applications/rapps/lang/he-IL.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/no-NO.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pt-BR.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/rapps/lang/sq-AL.rc trunk/reactos/base/applications/rapps/lang/sv-SE.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/rapps/lang/zh-CN.rc trunk/reactos/base/applications/rapps/lang/zh-TW.rc trunk/reactos/base/applications/rapps/loaddlg.cpp trunk/reactos/base/applications/rapps/misc.cpp trunk/reactos/base/applications/rapps/rapps.rc trunk/reactos/base/applications/rapps/settingsdlg.cpp trunk/reactos/base/applications/rapps/winmain.cpp trunk/reactos/media/rapps/utorrent.txt (props changed) trunk/reactos/sdk/lib/atl/atlcoll.h trunk/reactos/sdk/lib/atl/cstringt.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM… Modified: trunk/reactos/base/applications/rapps/aboutdlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ab… Modified: trunk/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/av… Removed: trunk/reactos/base/applications/rapps/crichedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/cr… Modified: trunk/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/gu… Removed: trunk/reactos/base/applications/rapps/installdlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… Modified: trunk/reactos/base/applications/rapps/installed.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… Modified: trunk/reactos/base/applications/rapps/integrity.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… Modified: trunk/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/mi… Removed: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Removed: trunk/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Removed: trunk/reactos/base/applications/rapps/rosui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ro… Modified: trunk/reactos/base/applications/rapps/settingsdlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/se… Modified: trunk/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… Modified: trunk/reactos/sdk/lib/atl/atlcoll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlcoll.h?rev=… Modified: trunk/reactos/sdk/lib/atl/cstringt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/cstringt.h?rev…

1 0

[dquintana] 75825: * Fix svn merge-info confusion regarding this file.
by dquintana＠svn.reactos.org 10 Sep '17

10 Sep '17

Author: dquintana Date: Sun Sep 10 21:26:00 2017 New Revision: 75825 URL: http://svn.reactos.org/svn/reactos?rev=75825&view=rev Log: * Fix svn merge-info confusion regarding this file. Modified: branches/GSoC_2017/rapps/reactos/media/rapps/utorrent.txt (props changed) Propchange: branches/GSoC_2017/rapps/reactos/media/rapps/utorrent.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 10 21:26:00 2017 @@ -23,4 +23,4 @@ /branches/usb-bringup/media/rapps/utorrent.txt:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk/media/rapps/utorrent.txt:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup/media/rapps/utorrent.txt:54809-54998 -/trunk/reactos/media/rapps/utorrent.txt:74646-75520,75691-75820 +/trunk/reactos/media/rapps/utorrent.txt:74646-75820

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