Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[dreimer] 68655: [RAPPS] Adding New Apps for rapps and Removing Some Unneedful Spaces in aklepad.txt by Henry Tang Ih CORE-9953 #comment, Patch committed incl. German translation and some fixes. St...

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Aug 10 09:02:36 2015 New Revision: 68655 URL: http://svn.reactos.org/svn/reactos?rev=68655&view=rev Log: [RAPPS] Adding New Apps for rapps and Removing Some Unneedful Spaces in aklepad.txt by Henry Tang Ih CORE-9953 #comment, Patch committed incl. German translation and some fixes. Still missing: Unlocker and GNU Octave Added: trunk/reactos/media/rapps/burnawarefree.txt (with props) trunk/reactos/media/rapps/kompozer.txt (with props) trunk/reactos/media/rapps/openarena.txt (with props) trunk/reactos/media/rapps/pidgin.txt (with props) Modified: trunk/reactos/media/rapps/agatemulator.txt trunk/reactos/media/rapps/audacity.txt trunk/reactos/media/rapps/ultraiso.txt trunk/reactos/media/rapps/vbasdl.txt trunk/reactos/media/rapps/watercolor.txt Modified: trunk/reactos/media/rapps/agatemulator.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/agatemulator.t… ============================================================================== --- trunk/reactos/media/rapps/agatemulator.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/agatemulator.txt [iso-8859-1] Mon Aug 10 09:02:36 2015 @@ -1,5 +1,6 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) +; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) [Section] Name = Agat Emulator @@ -19,3 +20,6 @@ Name = Agat ÃykÃ¼nÃ¼cÃ¼ Description = Win32 iÃ§in Apple ][ ve Agat 7/9 yazÄ±lÄ±m benzetim izlencesi. Size = 6,06 MB + +[Section.0804] +Description = è¹æ][å Win32 ç Agat 7/9 è½¯ä»¶ä»¿çç¨åºã Modified: trunk/reactos/media/rapps/audacity.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/audacity.txt?r… ============================================================================== --- trunk/reactos/media/rapps/audacity.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/audacity.txt [iso-8859-1] Mon Aug 10 09:02:36 2015 @@ -1,5 +1,6 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) +; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) [Section] Name = Audacity @@ -18,3 +19,6 @@ [Section.041f] Description = Sesleri kaydetme ve dÃ¼zenleme iÃ§in Ã¶zgÃ¼r, aÃ§Ä±k kaynak ve Ã§apraz platform yazÄ±lÄ±mdÄ±r. Size = 24,0 MB + +[Section.0804] +Description = åè´¹ã å¼æºçã è·¨å¹³å°è½¯ä»¶çå½å¶åç¼è¾å£°é³ã Added: trunk/reactos/media/rapps/burnawarefree.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/burnawarefree.… ============================================================================== --- trunk/reactos/media/rapps/burnawarefree.txt (added) +++ trunk/reactos/media/rapps/burnawarefree.txt [iso-8859-1] Mon Aug 10 09:02:36 2015 @@ -0,0 +1,26 @@ +; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) +; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) + +[Section] +Name = BurnAware Free +Version = 8.3 +License = Freeware for non-commercial uses +Description = Full-featured and free burning software to create CD, DVD and Blu-ray discs of all types. +Size = 8.03 MB +Category = 12 +URLSite = http://www.burnaware.com/ +URLDownload = http://download.betanews.com/download/1212419334-2/burnaware_free.exe +CDPath = none + +[Section.0407] +Description = Freie Brennsoftware mit vollem Funktionsumfang, um CDs, DVDs und Blu-Ray Disks aller Arten zu erstellen. + +[Section.041f] +Name = BurnAware Ãcretsiz +License = Tecimlik olmayan kullanÄ±mlar iÃ§in Ã¼cretsiz +Description = CD, DVD ve Blu-ray disklerinin tÃ¼m tÃ¼rlerini oluÅturmak iÃ§in eksiksiz husÃ»siyetli ve Ã¼cretsiz bir CD, DVD ve Blu-ray yazma yazÄ±lÄ±mÄ±dÄ±r. +Size = 8,03 MB + +[Section.0804] +Description = BurnAware æ¯å¨åè½ååè´¹çå»å½è½¯ä»¶æ¥åå»º CDã DVD åèååççææç±»åã Propchange: trunk/reactos/media/rapps/burnawarefree.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/media/rapps/kompozer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kompozer.txt?r… ============================================================================== --- trunk/reactos/media/rapps/kompozer.txt (added) +++ trunk/reactos/media/rapps/kompozer.txt [iso-8859-1] Mon Aug 10 09:02:36 2015 @@ -0,0 +1,24 @@ +; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) +; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) + +[Section] +Name = KompoZer +Version = 0.7.10 +License = MPL +Description = A complete web authoring system that combines web file management and easy-to-use WYSIWYG web page editing. You will need a ZIP decompression program to run it. +Size = 7.58 MB +Category = 5 +URLSite = http://www.kompozer.net/ +URLDownload = http://downloads.sourceforge.net/project/kompozer/current/0.7.10/kompozer-0… +CDPath = none + +[Section.0407] +Description = Ein vollstÃ¤ndiges Web-Authoring-System, welches Web-Datei-Management und leicht zu bedienende WYSIWYG Web-Seite Bearbeitung verbindet. Ein Werkzeug wie 7-Zip ist zum extrahieren notwendig. + +[Section.041f] +Description = UmÃ»mÃ® AÄ kÃ¼tÃ¼k yÃ¶netimiyle kullanÄ±mÄ± kolay WYSIWYG UmÃ»mÃ® AÄ sayfasÄ± dÃ¼zenlemesini birleÅtiren eksiksiz bir UmÃ»mÃ® AÄ yazarlÄ±k dizgesidir. ÃalÄ±ÅtÄ±rmak iÃ§in bir ZIP Ã§Ä±kartma izlencesi gerekir. +Size = 7,58 MB + +[Section.0804] +Description = KompoZer æ¯ä¸ä¸ªå®æ´çç½ç«åä½ç»åç½ç«æä»¶ç®¡çåå®¹æä½¿ç¨æè§å³æå¾çç½ç«é¡µé¢ç¼è¾çç³»ç»ãä½ å°éè¦ä¸ä¸ª ZIP ååç¨åºæ¥è¿è¡å®ã Propchange: trunk/reactos/media/rapps/kompozer.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/media/rapps/openarena.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/openarena.txt?… ============================================================================== --- trunk/reactos/media/rapps/openarena.txt (added) +++ trunk/reactos/media/rapps/openarena.txt [iso-8859-1] Mon Aug 10 09:02:36 2015 @@ -0,0 +1,23 @@ +; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) +; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) + +[Section] +Name = OpenArena +Version = 0.8.8 +License = GPL +Description = A community-produced deathmatch FPS game based on GPL idTech3 technology. You will need a ZIP decompression program to run it. +Size = 405 MB +Category = 4 +URLSite = http://www.openarena.ws/ +URLDownload = http://download.tuxfamily.org/openarena/rel/088/openarena-0.8.8.zip +CDPath = none + +[Section.0407] +Description = Ein Community-produziertes Deathmatch-FPS-Spiel basierend auf GPL idTech3 Technologie. Ein Werkzeug wie 7-Zip ist zum extrahieren notwendig. + +[Section.041f] +Description = GPL idTech3 uygulayÄ±m bilimi tabanlÄ±, topluluk Ã¼retimi, Ã¶lÃ¼m karÅÄ±laÅmalÄ± bir FPS oyunudur. ÃalÄ±ÅtÄ±rmak iÃ§in bir ZIP Ã§Ä±kartma izlencesi gerekir. + +[Section.0804] +Description = OpenArenaæ¯åºäº GPL idTech3 ææ¯ç¤¾åºäº§çæ»äº¡ç«èµ FPS æ¸¸æãä½ å°éè¦ä¸ä¸ª ZIP ååç¨åºæ¥è¿è¡å®ã Propchange: trunk/reactos/media/rapps/openarena.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/media/rapps/pidgin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pidgin.txt?rev… ============================================================================== --- trunk/reactos/media/rapps/pidgin.txt (added) +++ trunk/reactos/media/rapps/pidgin.txt [iso-8859-1] Mon Aug 10 09:02:36 2015 @@ -0,0 +1,19 @@ +; UTF-8 +; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) + +[Section] +Name = Pidgin +Version = 2.10.11 +License = GPLv2 +Description = An instant messaging program which lets you log in to accounts on multiple chat networks simultaneously. +Size = 9.22 MB +Category = 5 +URLSite = https://pidgin.im/ +URLDownload = http://downloads.sourceforge.net/project/pidgin/Pidgin/2.10.11/pidgin-2.10.… +CDPath = none + +[Section.0407] +Description = Ein instant messaging-Programm, welches lÃ¤Ãt Sie zu Konten auf mehreren Chat-Netzwerken gleichzeitig anmelden. + +[Section.0804] +Description = è¯¥å¯¹è¯æ¡åè®¸æ¨ç»å½å°å¸æ·å¤ä¸ªèå¤©ç½ç»ä¸åæ¶å³æ¶æ¶æ¯ç¨åºã Propchange: trunk/reactos/media/rapps/pidgin.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/rapps/ultraiso.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ultraiso.txt?r… ============================================================================== --- trunk/reactos/media/rapps/ultraiso.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/ultraiso.txt [iso-8859-1] Mon Aug 10 09:02:36 2015 @@ -1,21 +1,23 @@ ; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) +; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) [Section] Name = UltraISO Version = 9.6.5.3237 License = Trial verison -Description = An ISO CD/DVD image file creating/editing/converting tool and a bootable CD/DVD maker. It can directly edit the CD/DVD image file and extract files and folders from it, as well as directly make ISO files from your CD/DVD-ROM or hard disk. +Description = An ISO CD/DVD image file creating/editing/converting tool and a bootable CD/DVD maker, it can directly edit the CD/DVD image file and extract files and folders from it, as well as directly make ISO files from your CD/DVD-ROM or hard disk. Size = 4.19 MB Category = 12 URLSite = https://www.ezbsystems.com/ultraiso/ URLDownload = http://dw.ezbsys.net/uiso9_pe.exe CDPath = none -[Section.0407] -Description = Ein ISO-CD/DVD-Image-Datei Erstellungs/Bearbeitungs/Konvertierungs-Tool und ein Boot-CD/DVD-Ersteller. Es kann direkt die CD/DVD-Image-Datei bearbeiten und Dateien und Ordner extrahieren, als auch direkt ISO-Dateien von Ihrer CD/DVD-ROM oder Festplatte erstellen. - [Section.041f] License = Deneme sÃ¼rÃ¼mÃ¼ Description = CD/DVD kalÄ±p kÃ¼tÃ¼ÄÃ¼nÃ¼ doÄrudan dÃ¼zenleyebilmekle ve ondan kÃ¼tÃ¼kleri ve dizinleri Ã§Ä±kartabilmekle birlikte CD/DVD-ROM diskinizden ya da sÃ¢bit diskinizden doÄrudan ISO kÃ¼tÃ¼kleri oluÅturabilen bir ISO CD/DVD kalÄ±p kÃ¼tÃ¼ÄÃ¼ oluÅturma, dÃ¼zenleme, dÃ¶nÃ¼ÅtÃ¼rme uygulamasÄ± ve bir Ã¶n yÃ¼klenebilir CD/DVD oluÅturucusudur. Size = 4,19 MB + +[Section.0804] +License = è¯ç¨çæ¬ +Description = UltraISO æ¯ä¸ç§ ISO CD/DVD å¾åæä»¶åå»º/ç¼è¾/è½¬æ¢å·¥å·åä¸ä¸ªå¯å¯å¨ç CD/DVD å¶é åï¼å®å¯ä»¥ç´æ¥ç¼è¾ç CD/DVD å¾åæä»¶åæåçæä»¶åæä»¶å¤¹ï¼ä»¥åç´æ¥ä»æ¨ç CD ç DVD-ROM æç¡¬çä½¿ ISO æä»¶ã Modified: trunk/reactos/media/rapps/vbasdl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vbasdl.txt?rev… ============================================================================== --- trunk/reactos/media/rapps/vbasdl.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/vbasdl.txt [iso-8859-1] Mon Aug 10 09:02:36 2015 @@ -1,5 +1,6 @@ ; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) +; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) [Section] Name = VisualBoyAdvance (SDL version) @@ -19,3 +20,6 @@ Name = VisualBoyAdvance (SDL sÃ¼rÃ¼mÃ¼) Description = Gameboy ve GameboyAdvance dizgeleri iÃ§in bir Ã¶ykÃ¼nÃ¼cÃ¼. ÃalÄ±ÅtÄ±rmak iÃ§in bir ZIP Ã§Ä±kartma izlencesi gerekir. Size = 438 KB + +[Section.0804] +Description = ä¸ä¸ª Gameboy å GameboyAdvance ç³»ç»çæ¨¡æå¨ãä½ å°éè¦ä¸ä¸ª ZIP ååç¨åºæ¥è¿è¡å®ã Modified: trunk/reactos/media/rapps/watercolor.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/watercolor.txt… ============================================================================== --- trunk/reactos/media/rapps/watercolor.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/watercolor.txt [iso-8859-1] Mon Aug 10 09:02:36 2015 @@ -1,4 +1,5 @@ ; UTF-8 +; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) [Section] Name = Watercolor @@ -13,3 +14,6 @@ [Section.0407] Description = Ein Windows Design basierend auf dem Aussehenvon Windows Codename Whistler. + +[Section.0804] +Description = åºäº Windows ä»£å· Whistler çå¤è§ç Windows ä¸»é¢ã

9 years, 4 months

[fireball] 68654: [LDR] - Use newer implementation of RtlActivateActivationContextUnsafeFast(): its time finally has come (see r52615 and r52612). It returns proper return value instead of pushing ...

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 9 14:54:45 2015 New Revision: 68654 URL: http://svn.reactos.org/svn/reactos?rev=68654&view=rev Log: [LDR] - Use newer implementation of RtlActivateActivationContextUnsafeFast(): its time finally has come (see r52615 and r52612). It returns proper return value instead of pushing STATUS_SUCCESS into PRTL_ACTIVATION_CONTEXT_STACK_FRAME type and its "Trying to activate improper activation context" warning pops up all the time (its disabled in trunk to prevent debug log spam). Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=68654… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sun Aug 9 14:54:45 2015 @@ -5404,13 +5404,14 @@ RtlActivateActivationContextUnsafeFast(IN PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame, IN PVOID Context) { -#if NEW_NTDLL_LOADER RTL_ACTIVATION_CONTEXT_STACK_FRAME *ActiveFrame; /* Get the curren active frame */ ActiveFrame = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame; - DPRINT1("ActiveFrame %p, &Frame->Frame %p, Context %p\n", ActiveFrame, &Frame->Frame, Context); + DPRINT("ActiveSP %p, ActiveFrame %p, &Frame->Frame %p, Context %p\n", + NtCurrentTeb()->ActivationContextStackPointer, ActiveFrame, + &Frame->Frame, Context); /* Actually activate it */ Frame->Frame.Previous = ActiveFrame; @@ -5427,7 +5428,7 @@ } /* We can get here only one way: it was already activated */ - DPRINT1("Trying to activate improper activation context\n"); + DPRINT("Trying to activate improper activation context\n"); /* Activate only if we are allowing multiple activation */ if (!RtlpNotAllowingMultipleActivation) @@ -5442,22 +5443,6 @@ /* Return pointer to the activation frame */ return &Frame->Frame; -#else - - RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame = &Frame->Frame; - - frame->Previous = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame; - frame->ActivationContext = Context; - frame->Flags = 0; - - NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = frame; - //RtlAddRefActivationContext( handle ); - - DPRINT("Activated actctx sp %p, active frame %p\n", NtCurrentTeb()->ActivationContextStackPointer, frame); - - return STATUS_SUCCESS; - -#endif } PRTL_ACTIVATION_CONTEXT_STACK_FRAME

9 years, 4 months

[fireball] 68653: [LDR] - Add debug prints to aid tracing the activation context stuff problems. Turned off by default.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 9 14:20:40 2015 New Revision: 68653 URL: http://svn.reactos.org/svn/reactos?rev=68653&view=rev Log: [LDR] - Add debug prints to aid tracing the activation context stuff problems. Turned off by default. Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=68653… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sun Aug 9 14:20:40 2015 @@ -772,6 +772,8 @@ { struct assembly *assembly; + DPRINT("add_assembly() actctx %p, activeframe ??\n", actctx); + if (actctx->num_assemblies == actctx->allocated_assemblies) { void *ptr; @@ -799,6 +801,8 @@ static struct dll_redirect* add_dll_redirect(struct assembly* assembly) { + DPRINT("add_dll_redirect() to assembly %p, num_dlls %d\n", assembly, assembly->allocated_dlls); + if (assembly->num_dlls == assembly->allocated_dlls) { void *ptr; @@ -3120,6 +3124,8 @@ struct string_index *index; ULONG name_offset; + DPRINT("actctx %p, num_assemblies %d\n", actctx, actctx->num_assemblies); + /* compute section length */ for (i = 0; i < actctx->num_assemblies; i++) { @@ -3132,6 +3138,8 @@ total_len += sizeof(*index); total_len += sizeof(*data); total_len += aligned_string_len((strlenW(dll->name)+1)*sizeof(WCHAR)); + + DPRINT("assembly %d, dll %d: dll name %S\n", i, j, dll->name); } dll_count += assembly->num_dlls; @@ -3153,12 +3161,16 @@ for (i = 0; i < actctx->num_assemblies; i++) { struct assembly *assembly = &actctx->assemblies[i]; + + DPRINT("assembly->num_dlls %d\n", assembly->num_dlls); + for (j = 0; j < assembly->num_dlls; j++) { struct dll_redirect *dll = &assembly->dlls[j]; UNICODE_STRING str; WCHAR *ptrW; + DPRINT("%d: dll name %S\n", j, dll->name); /* setup new index entry */ str.Buffer = dll->name; str.Length = strlenW(dll->name)*sizeof(WCHAR); @@ -3199,11 +3211,14 @@ struct string_index *iter, *index = NULL; ULONG hash = 0, i; + DPRINT("section %p, name %wZ\n", section, name); RtlHashUnicodeString(name, TRUE, HASH_STRING_ALGORITHM_X65599, &hash); iter = (struct string_index*)((BYTE*)section + section->index_offset); for (i = 0; i < section->count; i++) { + DPRINT("iter->hash 0x%x ?= 0x%x\n", iter->hash, hash); + DPRINT("iter->name %S\n", (WCHAR*)((BYTE*)section + iter->name_offset)); if (iter->hash == hash) { const WCHAR *nameW = (WCHAR*)((BYTE*)section + iter->name_offset); @@ -3253,8 +3268,10 @@ struct dllredirect_data *dll; struct string_index *index; + DPRINT("sections: 0x%08X\n", actctx->sections); if (!(actctx->sections & DLLREDIRECT_SECTION)) return STATUS_SXS_KEY_NOT_FOUND; + DPRINT("actctx->dllredirect_section: %p\n", actctx->dllredirect_section); if (!actctx->dllredirect_section) { struct strsection_header *section; @@ -3267,6 +3284,7 @@ } index = find_string_index(actctx->dllredirect_section, name); + DPRINT("index: %d\n", index); if (!index) return STATUS_SXS_KEY_NOT_FOUND; dll = get_dllredirect_data(actctx, index); @@ -5276,27 +5294,39 @@ PACTCTX_SECTION_KEYED_DATA data = ptr; NTSTATUS status; + DPRINT("RtlFindActivationContextSectionString(%x %p %x %wZ %p)\n", flags, guid, section_kind, section_name, ptr); status = RtlpFindActivationContextSection_CheckParameters(flags, guid, section_kind, section_name, data); - if (!NT_SUCCESS(status)) return status; + if (!NT_SUCCESS(status)) + { + DPRINT1("RtlFindActivationContextSectionString() failed with status %x\n", status); + return status; + } status = STATUS_SXS_KEY_NOT_FOUND; /* if there is no data, but params are valid, we return that sxs key is not found to be at least somehow compatible */ - if (!data) return status; + if (!data) + { + DPRINT("RtlFindActivationContextSectionString() failed with status %x\n", status); + return status; + } ASSERT(NtCurrentTeb()); ASSERT(NtCurrentTeb()->ActivationContextStackPointer); + DPRINT("ActiveFrame: %p\n",NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame); if (NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame) { ACTIVATION_CONTEXT *actctx = check_actctx(NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame->ActivationContext); if (actctx) status = find_string( actctx, section_kind, section_name, flags, data ); } + DPRINT("status %x\n", status); if (status != STATUS_SUCCESS) status = find_string( process_actctx, section_kind, section_name, flags, data ); + DPRINT("RtlFindActivationContextSectionString() returns status %x\n", status); return status; } @@ -5421,8 +5451,12 @@ frame->Flags = 0; NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = frame; + //RtlAddRefActivationContext( handle ); + + DPRINT("Activated actctx sp %p, active frame %p\n", NtCurrentTeb()->ActivationContextStackPointer, frame); return STATUS_SUCCESS; + #endif } @@ -5443,6 +5477,7 @@ RtlRaiseStatus( STATUS_SXS_INVALID_DEACTIVATION ); } + DPRINT("Deactivated actctx %p, active frame %p, new active frame %p\n", NtCurrentTeb()->ActivationContextStackPointer, frame, frame->Previous); /* pop everything up to and including frame */ NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = frame->Previous;

9 years, 4 months

[ekohl] 68652: Show a warning page, when a user tries to delete an active partition. CORE-9996 #resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 9 13:14:00 2015 New Revision: 68652 URL: http://svn.reactos.org/svn/reactos?rev=68652&view=rev Log: Show a warning page, when a user tries to delete an active partition. CORE-9996 #resolve 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/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/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/partlist.c trunk/reactos/base/setup/usetup/partlist.h trunk/reactos/base/setup/usetup/usetup.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] Sun Aug 9 13:14:00 2015 @@ -1663,6 +1663,9 @@ return SELECT_PARTITION_PAGE; } + if (PartitionList->CurrentPartition->BootIndicator) + return CONFIRM_DELETE_SYSTEM_PARTITION_PAGE; + return DELETE_PARTITION_PAGE; } } @@ -2229,6 +2232,39 @@ } return CREATE_LOGICAL_PARTITION_PAGE; +} + + +static PAGE_NUMBER +ConfirmDeleteSystemPartitionPage(PINPUT_RECORD Ir) +{ + MUIDisplayPage(CONFIRM_DELETE_SYSTEM_PARTITION_PAGE); + + while (TRUE) + { + CONSOLE_ConInKey(Ir); + + if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ + { + if (ConfirmQuit(Ir) == TRUE) + { + return QUIT_PAGE; + } + + break; + } + else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ + { + return DELETE_PARTITION_PAGE; + } + else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */ + { + return SELECT_PARTITION_PAGE; + } + } + + return SELECT_PARTITION_PAGE; } @@ -4417,6 +4453,10 @@ Page = CreateLogicalPartitionPage(&Ir); break; + case CONFIRM_DELETE_SYSTEM_PARTITION_PAGE: + Page = ConfirmDeleteSystemPartitionPage(&Ir); + break; + case DELETE_PARTITION_PAGE: Page = DeletePartitionPage(&Ir); break; 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 Aug 9 13:14:00 2015 @@ -825,6 +825,100 @@ 0, " ®ç ª ©â¥...", /* ¥¤êâ ¤ ¥ á¥ ¯à¥¢¥¦¤ , § é®â® á¯¨áêªêâ á ¤ï«®¢¥â¥ é¥ á¥ à §¬¥áâ¨ */ TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bgBGConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1563,6 +1657,10 @@ { SELECT_PARTITION_PAGE, bgBGSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + bgBGConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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] Sun Aug 9 13:14:00 2015 @@ -814,6 +814,100 @@ 0, 0, "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1549,6 +1643,10 @@ { SELECT_PARTITION_PAGE, bnBDSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + bnBDConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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 Aug 9 13:14:00 2015 @@ -822,6 +822,100 @@ 0, 0, "Cekejte, prosim...", //MUSI ZUSTAT BEZ DIAKRITIKY! + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY csCZConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1558,6 +1652,10 @@ { SELECT_PARTITION_PAGE, csCZSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + csCZConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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 Aug 9 13:14:00 2015 @@ -809,6 +809,100 @@ 0, 0, "Bitte warten...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY deDEConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1554,6 +1648,10 @@ { SELECT_PARTITION_PAGE, deDESelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + deDEConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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 Aug 9 13:14:00 2015 @@ -828,6 +828,100 @@ 0, " ¨¡¢é §¨ £â¤«...", TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY elGRConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1567,6 +1661,10 @@ { SELECT_PARTITION_PAGE, elGRSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + elGRConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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 Aug 9 13:14:00 2015 @@ -823,6 +823,101 @@ 0 } }; + +static MUI_ENTRY enUSConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY enUSFormatPartitionEntries[] = { @@ -1549,6 +1644,10 @@ { SELECT_PARTITION_PAGE, enUSSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + enUSConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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 Aug 9 13:14:00 2015 @@ -822,6 +822,100 @@ 0, 0, "Espere un momento...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1557,6 +1651,10 @@ { SELECT_PARTITION_PAGE, esESSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + esESConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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] Sun Aug 9 13:14:00 2015 @@ -815,6 +815,100 @@ 0, 0, "Palun oota...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEEConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1548,6 +1642,10 @@ { SELECT_PARTITION_PAGE, etEESelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + etEEConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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 Aug 9 13:14:00 2015 @@ -827,6 +827,100 @@ 0, 0, "Patienter...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1563,6 +1657,10 @@ { SELECT_PARTITION_PAGE, frFRSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + frFRConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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] Sun Aug 9 13:14:00 2015 @@ -815,6 +815,100 @@ 0, 0, " ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1550,6 +1644,10 @@ { SELECT_PARTITION_PAGE, heILSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + heILConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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 Aug 9 13:14:00 2015 @@ -823,6 +823,100 @@ 0, " Attendere...", TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY itITConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1558,6 +1652,10 @@ { SELECT_PARTITION_PAGE, itITSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + itITConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -816,6 +816,100 @@ 0, 0, "µÏÁ ¸ÀÞ»²...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1551,6 +1645,10 @@ { SELECT_PARTITION_PAGE, jaJPSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + jaJPConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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 Aug 9 13:14:00 2015 @@ -824,6 +824,100 @@ 0, 0, "PraÕome palaukti...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1560,6 +1654,10 @@ { SELECT_PARTITION_PAGE, ltLTSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + ltLTConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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] Sun Aug 9 13:14:00 2015 @@ -844,6 +844,100 @@ 0, 0, "Een ogenblik geduld...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY nlNLConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1590,6 +1684,10 @@ { SELECT_PARTITION_PAGE, nlNLSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + nlNLConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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 Aug 9 13:14:00 2015 @@ -825,6 +825,100 @@ 0, 0, "Prosz© czeka...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1560,6 +1654,10 @@ { SELECT_PARTITION_PAGE, plPLSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + plPLConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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] Sun Aug 9 13:14:00 2015 @@ -834,6 +834,100 @@ 0, 0, "Por favor, aguarde...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1587,6 +1681,10 @@ { SELECT_PARTITION_PAGE, ptBRSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + ptBRConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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] Sun Aug 9 13:14:00 2015 @@ -870,6 +870,100 @@ 0, 0, "Ateptaîi...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roROConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1620,6 +1714,10 @@ { SELECT_PARTITION_PAGE, roROSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + roROConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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 Aug 9 13:14:00 2015 @@ -815,6 +815,100 @@ 0, 0, "®¦ «ã©áâ , ¯®¤®¦¤¨â¥...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ruRUConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1551,6 +1645,10 @@ { SELECT_PARTITION_PAGE, ruRUSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + ruRUConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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 Aug 9 13:14:00 2015 @@ -823,6 +823,100 @@ 0, 0, "Pokajte, pros¡m ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1562,6 +1656,10 @@ { SELECT_PARTITION_PAGE, skSKSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + skSKConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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] Sun Aug 9 13:14:00 2015 @@ -819,6 +819,100 @@ 0, 0, "Ju luttem prisni...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY sqALConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1554,6 +1648,10 @@ { SELECT_PARTITION_PAGE, sqALSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + sqALConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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 Aug 9 13:14:00 2015 @@ -823,6 +823,100 @@ 0, " Var Vnlig Vnta...", TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSEConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1557,6 +1651,10 @@ { SELECT_PARTITION_PAGE, svSESelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + svSEConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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] Sun Aug 9 13:14:00 2015 @@ -808,6 +808,100 @@ 0, 0, "Ltfen bekleyiniz...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1537,6 +1631,10 @@ { SELECT_PARTITION_PAGE, trTRSelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + trTRConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, 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 Aug 9 13:14:00 2015 @@ -821,6 +821,100 @@ 0, 0, "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUAConfirmDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You asked Setup to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnose programs, hardware configuration", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "programs, programs to start an operating system (like ReactOS) or other", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "programs provided by the hardware manufacturer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Delete a system partition only when you are sure that there are no such", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "programs on the partiton, or when you are sure you want to delete them.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "When you delete the partition, you might not be able to boot the", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "computer from the harddisk until you finished the ReactOS Setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "\x07 Press ENTER to delete the system partition. You will be asked", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " to confirm the deletion of the partition again later.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 Press ESC to return to the previous page. The partition will", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + " not be deleted.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continue ESC=Cancel", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1557,6 +1651,10 @@ { SELECT_PARTITION_PAGE, ukUASelectPartitionEntries + }, + { + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, + ukUAConfirmDeletePartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -68,7 +68,7 @@ ULONGLONG -Align( +AlignDown( IN ULONGLONG Value, IN ULONG Alignment) { @@ -79,6 +79,22 @@ return Temp * Alignment; } + +ULONGLONG +AlignUp( + IN ULONGLONG Value, + IN ULONG Alignment) +{ + ULONGLONG Temp, Result; + + Temp = Value / Alignment; + + Result = Temp * Alignment; + if (Value % Alignment) + Result += Alignment; + + return Result; +} ULONGLONG RoundingDivide( @@ -608,7 +624,7 @@ NewPartEntry->IsPartitioned = FALSE; NewPartEntry->StartSector.QuadPart = (ULONGLONG)DiskEntry->SectorAlignment; - NewPartEntry->SectorCount.QuadPart = Align(DiskEntry->SectorCount.QuadPart, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(DiskEntry->SectorCount.QuadPart, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); @@ -654,7 +670,7 @@ NewPartEntry->IsPartitioned = FALSE; NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; - NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); @@ -678,7 +694,7 @@ /* Check for trailing unpartitioned disk space */ if ((LastStartSector + LastSectorCount) < DiskEntry->SectorCount.QuadPart) { - LastUnusedSectorCount = Align(DiskEntry->SectorCount.QuadPart - (LastStartSector + LastSectorCount), DiskEntry->SectorAlignment); + LastUnusedSectorCount = AlignDown(DiskEntry->SectorCount.QuadPart - (LastStartSector + LastSectorCount), DiskEntry->SectorAlignment); if (LastUnusedSectorCount >= (ULONGLONG)DiskEntry->SectorAlignment) { @@ -694,7 +710,7 @@ NewPartEntry->IsPartitioned = FALSE; NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; - NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); @@ -773,7 +789,7 @@ NewPartEntry->IsPartitioned = FALSE; NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; - NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); @@ -797,7 +813,7 @@ /* Check for trailing unpartitioned disk space */ if ((LastStartSector + LastSectorCount) < DiskEntry->ExtendedPartition->StartSector.QuadPart + DiskEntry->ExtendedPartition->SectorCount.QuadPart) { - LastUnusedSectorCount = Align(DiskEntry->ExtendedPartition->StartSector.QuadPart + DiskEntry->ExtendedPartition->SectorCount.QuadPart - (LastStartSector + LastSectorCount), DiskEntry->SectorAlignment); + LastUnusedSectorCount = AlignDown(DiskEntry->ExtendedPartition->StartSector.QuadPart + DiskEntry->ExtendedPartition->SectorCount.QuadPart - (LastStartSector + LastSectorCount), DiskEntry->SectorAlignment); if (LastUnusedSectorCount >= (ULONGLONG)DiskEntry->SectorAlignment) { @@ -814,7 +830,7 @@ NewPartEntry->IsPartitioned = FALSE; NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; - NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); @@ -1090,6 +1106,8 @@ (ULONGLONG)DiskGeometry.SectorsPerTrack; DiskEntry->SectorAlignment = DiskGeometry.SectorsPerTrack; + DiskEntry->CylinderAlignment = DiskGeometry.TracksPerCylinder * + DiskGeometry.SectorsPerTrack; DPRINT("SectorCount %I64u\n", DiskEntry->SectorCount); DPRINT("SectorAlignment %lu\n", DiskEntry->SectorAlignment); @@ -2559,7 +2577,7 @@ DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart); if (AutoCreate == TRUE || - Align(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) + AlignDown(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) { DPRINT1("Convert existing partition entry\n"); @@ -2594,7 +2612,7 @@ NewPartEntry->IsPartitioned = TRUE; NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; - NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; NewPartEntry->PartitionType = PARTITION_ENTRY_UNUSED; @@ -2676,7 +2694,7 @@ DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart); - if (Align(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) + if (AlignDown(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) { DPRINT1("Convert existing partition entry\n"); @@ -2723,7 +2741,7 @@ NewPartEntry->IsPartitioned = TRUE; NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; - NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; NewPartEntry->New = FALSE; @@ -2787,7 +2805,7 @@ DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart); if (AutoCreate == TRUE || - Align(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) + AlignDown(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) { DPRINT1("Convert existing partition entry\n"); @@ -2823,7 +2841,7 @@ NewPartEntry->IsPartitioned = TRUE; NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; - NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; NewPartEntry->PartitionType = PARTITION_ENTRY_UNUSED; Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -112,6 +112,7 @@ ULARGE_INTEGER SectorCount; ULONG SectorAlignment; + ULONG CylinderAlignment; BOOLEAN BiosFound; ULONG BiosDiskNumber; Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sun Aug 9 13:14:00 2015 @@ -132,6 +132,7 @@ CREATE_PRIMARY_PARTITION_PAGE, CREATE_EXTENDED_PARTITION_PAGE, CREATE_LOGICAL_PARTITION_PAGE, + CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, DELETE_PARTITION_PAGE, SELECT_FILE_SYSTEM_PAGE,

9 years, 4 months

[cwittich] 68651: [FUSION] store the PDB files in a different directory to avoid name collisions. Patch by Amine

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Aug 9 13:10:17 2015 New Revision: 68651 URL: http://svn.reactos.org/svn/reactos?rev=68651&view=rev Log: [FUSION] store the PDB files in a different directory to avoid name collisions. Patch by Amine Modified: trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt Modified: trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_1_… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt [iso-8859-1] Sun Aug 9 13:10:17 2015 @@ -8,6 +8,6 @@ set_module_type(fusion_1_1 win32dll) target_link_libraries(fusion_1_1 fusion_common uuid wine) -set_target_properties(fusion_1_1 PROPERTIES OUTPUT_NAME "fusion") +set_target_properties(fusion_1_1 PROPERTIES OUTPUT_NAME "fusion" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") add_importlibs(fusion_1_1 advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET fusion_1_1 DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) Modified: trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_2_… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt [iso-8859-1] Sun Aug 9 13:10:17 2015 @@ -8,6 +8,6 @@ set_module_type(fusion_2_0 win32dll) target_link_libraries(fusion_2_0 fusion_common uuid wine) -set_target_properties(fusion_2_0 PROPERTIES OUTPUT_NAME "fusion") +set_target_properties(fusion_2_0 PROPERTIES OUTPUT_NAME "fusion" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") add_importlibs(fusion_2_0 advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET fusion_2_0 DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all)

9 years, 4 months

[dreimer] 68650: [FUSION] Use a static library instead of an objects one. Fix MSVC build. Brought to you by Amine!

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Aug 9 10:24:37 2015 New Revision: 68650 URL: http://svn.reactos.org/svn/reactos?rev=68650&view=rev Log: [FUSION] Use a static library instead of an objects one. Fix MSVC build. Brought to you by Amine! Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Sun Aug 9 10:24:37 2015 @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(fusion.dll fusion.spec) -list(APPEND SOURCE +list(APPEND COMMON_SOURCE asmcache.c asmenum.c asmname.c @@ -12,17 +12,16 @@ fusionpriv.h ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c) -add_library(fusion_lib OBJECT ${SOURCE}) +add_library(fusion_common STATIC ${COMMON_SOURCE}) add_library(fusion SHARED - $<TARGET_OBJECTS:fusion_lib> version.rc ${CMAKE_CURRENT_BINARY_DIR}/fusion.def) set_module_type(fusion win32dll) -target_link_libraries(fusion uuid wine) +target_link_libraries(fusion fusion_common uuid wine) add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) -add_pch(fusion fusionpriv.h SOURCE) +add_pch(fusion_common fusionpriv.h COMMON_SOURCE) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_1_… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt [iso-8859-1] Sun Aug 9 10:24:37 2015 @@ -3,12 +3,11 @@ spec2def(fusion.dll fusion.spec) add_library(fusion_1_1 SHARED - $<TARGET_OBJECTS:fusion_lib> ${fusion_folder}/version.rc ${CMAKE_CURRENT_BINARY_DIR}/fusion.def) set_module_type(fusion_1_1 win32dll) -target_link_libraries(fusion_1_1 uuid wine) +target_link_libraries(fusion_1_1 fusion_common uuid wine) set_target_properties(fusion_1_1 PROPERTIES OUTPUT_NAME "fusion") add_importlibs(fusion_1_1 advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET fusion_1_1 DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) Modified: trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_2_… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt [iso-8859-1] Sun Aug 9 10:24:37 2015 @@ -3,12 +3,11 @@ spec2def(fusion.dll fusion.spec) add_library(fusion_2_0 SHARED - $<TARGET_OBJECTS:fusion_lib> ${fusion_folder}/version.rc ${CMAKE_CURRENT_BINARY_DIR}/fusion.def) set_module_type(fusion_2_0 win32dll) -target_link_libraries(fusion_2_0 uuid wine) +target_link_libraries(fusion_2_0 fusion_common uuid wine) set_target_properties(fusion_2_0 PROPERTIES OUTPUT_NAME "fusion") add_importlibs(fusion_2_0 advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET fusion_2_0 DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all)

9 years, 4 months

[dreimer] 68649: [CMAKE] Include TARGET_OBJECTS expressions in SOURCES target property output. Patch by Amine Khaldi

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Aug 9 09:50:46 2015 New Revision: 68649 URL: http://svn.reactos.org/svn/reactos?rev=68649&view=rev Log: [CMAKE] Include TARGET_OBJECTS expressions in SOURCES target property output. Patch by Amine Khaldi Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=68649&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sun Aug 9 09:50:46 2015 @@ -9,6 +9,11 @@ if(POLICY CMP0026) # Allow use of the LOCATION property cmake_policy(SET CMP0026 OLD) +endif() + +if(POLICY CMP0051) + # List TARGET_OBJECTS in SOURCES target property + cmake_policy(SET CMP0051 NEW) endif() project(REACTOS)

9 years, 4 months

[dreimer] 68648: [RAPPS] Adding New Apps for rapps and Removing Some Unneedful Spaces in aklepad.txt by Erdem Ersoy CORE-9953 #comment Added Agat, Audacity, Gens, HexEdit, Shed, UltraISO and VBA-SD...

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Aug 9 09:31:12 2015 New Revision: 68648 URL: http://svn.reactos.org/svn/reactos?rev=68648&view=rev Log: [RAPPS] Adding New Apps for rapps and Removing Some Unneedful Spaces in aklepad.txt by Erdem Ersoy CORE-9953 #comment Added Agat, Audacity, Gens, HexEdit, Shed, UltraISO and VBA-SDL because of the prove in image form that it works. Rest ist still not committed. + Removed the UTF BOMs again! + Added German Translations + Corrected the Coding to UTF-8 Added: trunk/reactos/media/rapps/agatemulator.txt (with props) trunk/reactos/media/rapps/audacity.txt (with props) trunk/reactos/media/rapps/gensemulator.txt (with props) trunk/reactos/media/rapps/hexedit.txt (with props) trunk/reactos/media/rapps/shed.txt (with props) trunk/reactos/media/rapps/ultraiso.txt (with props) trunk/reactos/media/rapps/vbasdl.txt (with props) Modified: trunk/reactos/media/rapps/7zip.txt trunk/reactos/media/rapps/abiword.txt trunk/reactos/media/rapps/abiword26.txt trunk/reactos/media/rapps/abyss.txt trunk/reactos/media/rapps/ac97forvirtualbox.txt trunk/reactos/media/rapps/akelpad.txt trunk/reactos/media/rapps/alreader.txt trunk/reactos/media/rapps/audiograbber.txt trunk/reactos/media/rapps/bittorrent.txt trunk/reactos/media/rapps/bochs.txt trunk/reactos/media/rapps/boswars.txt trunk/reactos/media/rapps/boundaround.txt trunk/reactos/media/rapps/ccleaner.txt trunk/reactos/media/rapps/christmasbound.txt trunk/reactos/media/rapps/chromium.txt trunk/reactos/media/rapps/cnt.txt trunk/reactos/media/rapps/codeblocks.txt trunk/reactos/media/rapps/codeblocks_gcc.txt trunk/reactos/media/rapps/codeblocks_gcc_2.txt trunk/reactos/media/rapps/comctl32ocx.txt trunk/reactos/media/rapps/devcpp_tdm_gcc_x64.txt trunk/reactos/media/rapps/diablo2.txt trunk/reactos/media/rapps/dosblaster.txt trunk/reactos/media/rapps/dosbox.txt trunk/reactos/media/rapps/doublecommander.txt trunk/reactos/media/rapps/dplus.txt trunk/reactos/media/rapps/dvdwritenow.txt trunk/reactos/media/rapps/efserch.txt trunk/reactos/media/rapps/excelview.txt trunk/reactos/media/rapps/fall.txt trunk/reactos/media/rapps/famitracker.txt trunk/reactos/media/rapps/fap.txt trunk/reactos/media/rapps/fira.txt trunk/reactos/media/rapps/firefox.txt trunk/reactos/media/rapps/firefox28.txt trunk/reactos/media/rapps/firefox36.txt trunk/reactos/media/rapps/foxit.txt trunk/reactos/media/rapps/freebasic.txt trunk/reactos/media/rapps/ghostscript.txt trunk/reactos/media/rapps/ghostview.txt trunk/reactos/media/rapps/gimp.txt trunk/reactos/media/rapps/glidewrapzbag.txt trunk/reactos/media/rapps/globulation2.txt trunk/reactos/media/rapps/gnucash.txt trunk/reactos/media/rapps/hover.txt trunk/reactos/media/rapps/hxd.txt trunk/reactos/media/rapps/indiftpd.txt trunk/reactos/media/rapps/inkscape.txt trunk/reactos/media/rapps/irfanview.txt trunk/reactos/media/rapps/irfanviewplugins.txt trunk/reactos/media/rapps/jre.txt trunk/reactos/media/rapps/kdewin.txt trunk/reactos/media/rapps/kindlepc.txt trunk/reactos/media/rapps/kmeleon.txt trunk/reactos/media/rapps/kyodai.txt trunk/reactos/media/rapps/lazaruside.txt trunk/reactos/media/rapps/lbreakout2.txt trunk/reactos/media/rapps/lgeneral.txt trunk/reactos/media/rapps/librecad.txt trunk/reactos/media/rapps/libreoffice.txt trunk/reactos/media/rapps/libreofficehelp.txt trunk/reactos/media/rapps/lmarbles.txt trunk/reactos/media/rapps/mcwin32.txt trunk/reactos/media/rapps/md5summer.txt trunk/reactos/media/rapps/mfc40.txt trunk/reactos/media/rapps/miktex.txt trunk/reactos/media/rapps/mirandaim.txt trunk/reactos/media/rapps/mirc.txt trunk/reactos/media/rapps/mirc6.txt trunk/reactos/media/rapps/mono2.txt trunk/reactos/media/rapps/mpc.txt trunk/reactos/media/rapps/mpxplay.txt trunk/reactos/media/rapps/msxml3.txt trunk/reactos/media/rapps/net11.txt trunk/reactos/media/rapps/net20.txt trunk/reactos/media/rapps/net20sp2.txt trunk/reactos/media/rapps/neverball.txt trunk/reactos/media/rapps/nginx.txt trunk/reactos/media/rapps/nirlauncher.txt trunk/reactos/media/rapps/npp.txt trunk/reactos/media/rapps/nvdisp.txt trunk/reactos/media/rapps/offbyone.txt trunk/reactos/media/rapps/officeformatpack.txt trunk/reactos/media/rapps/opencodecs.txt trunk/reactos/media/rapps/openoffice.txt trunk/reactos/media/rapps/openoffice2.4.txt trunk/reactos/media/rapps/opera.txt trunk/reactos/media/rapps/opera9.txt trunk/reactos/media/rapps/pdfsam.txt trunk/reactos/media/rapps/peazip.txt trunk/reactos/media/rapps/pengupop.txt trunk/reactos/media/rapps/photofiltre.txt trunk/reactos/media/rapps/pingus.txt trunk/reactos/media/rapps/pptview.txt trunk/reactos/media/rapps/precisecalc.txt trunk/reactos/media/rapps/pspad.txt trunk/reactos/media/rapps/ptanks.txt trunk/reactos/media/rapps/putty.txt trunk/reactos/media/rapps/python.txt trunk/reactos/media/rapps/qb64sdl.txt trunk/reactos/media/rapps/qmmp.txt trunk/reactos/media/rapps/remood.txt trunk/reactos/media/rapps/reshack.txt trunk/reactos/media/rapps/revo.txt trunk/reactos/media/rapps/rfstools.txt trunk/reactos/media/rapps/rocks.txt trunk/reactos/media/rapps/rosbe.txt trunk/reactos/media/rapps/sambatng.txt trunk/reactos/media/rapps/sbforvmware.txt trunk/reactos/media/rapps/scite.txt trunk/reactos/media/rapps/scummvm.txt trunk/reactos/media/rapps/sdl_mixer.txt trunk/reactos/media/rapps/sdl_runtime.txt trunk/reactos/media/rapps/seamonkey.txt trunk/reactos/media/rapps/smplayer.txt trunk/reactos/media/rapps/snoopy.txt trunk/reactos/media/rapps/stamina.txt trunk/reactos/media/rapps/steam.txt trunk/reactos/media/rapps/sumatrapdf.txt trunk/reactos/media/rapps/summerbound.txt trunk/reactos/media/rapps/superdxb.txt trunk/reactos/media/rapps/superfinder.txt trunk/reactos/media/rapps/supertux.txt trunk/reactos/media/rapps/tahoma.txt trunk/reactos/media/rapps/thunderbird.txt trunk/reactos/media/rapps/thunderbird3.txt trunk/reactos/media/rapps/tightvnc.txt trunk/reactos/media/rapps/tileworld.txt trunk/reactos/media/rapps/totalcommander.txt trunk/reactos/media/rapps/tuxpaint.txt trunk/reactos/media/rapps/ultravnc.txt trunk/reactos/media/rapps/utorrent.txt trunk/reactos/media/rapps/vb5run.txt trunk/reactos/media/rapps/vb6run.txt trunk/reactos/media/rapps/vc2005sp1run.txt trunk/reactos/media/rapps/vc2008sp1run.txt trunk/reactos/media/rapps/vc2010sp1run.txt trunk/reactos/media/rapps/vc2012run.txt trunk/reactos/media/rapps/vc2013run.txt trunk/reactos/media/rapps/vc6run.txt trunk/reactos/media/rapps/vlc.txt trunk/reactos/media/rapps/winamp.txt trunk/reactos/media/rapps/winboard.txt trunk/reactos/media/rapps/winemono.txt trunk/reactos/media/rapps/wme9.txt trunk/reactos/media/rapps/wordview.txt trunk/reactos/media/rapps/zaz.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/7zip.txt?rev=6… Modified: trunk/reactos/media/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/abiword.txt?re… Modified: trunk/reactos/media/rapps/abiword26.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/abiword26.txt?… Modified: trunk/reactos/media/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/abyss.txt?rev=… Modified: trunk/reactos/media/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ac97forvirtual… Added: trunk/reactos/media/rapps/agatemulator.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/agatemulator.t… Modified: trunk/reactos/media/rapps/akelpad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/akelpad.txt?re… Modified: trunk/reactos/media/rapps/alreader.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/alreader.txt?r… Added: trunk/reactos/media/rapps/audacity.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/audacity.txt?r… Modified: trunk/reactos/media/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/audiograbber.t… Modified: trunk/reactos/media/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/bittorrent.txt… Modified: trunk/reactos/media/rapps/bochs.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/bochs.txt?rev=… Modified: trunk/reactos/media/rapps/boswars.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/boswars.txt?re… Modified: trunk/reactos/media/rapps/boundaround.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/boundaround.tx… Modified: trunk/reactos/media/rapps/ccleaner.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ccleaner.txt?r… Modified: trunk/reactos/media/rapps/christmasbound.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/christmasbound… Modified: trunk/reactos/media/rapps/chromium.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/chromium.txt?r… Modified: trunk/reactos/media/rapps/cnt.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/cnt.txt?rev=68… Modified: trunk/reactos/media/rapps/codeblocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks.txt… Modified: trunk/reactos/media/rapps/codeblocks_gcc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks_gcc… Modified: trunk/reactos/media/rapps/codeblocks_gcc_2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks_gcc… Modified: trunk/reactos/media/rapps/comctl32ocx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/comctl32ocx.tx… Modified: trunk/reactos/media/rapps/devcpp_tdm_gcc_x64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/devcpp_tdm_gcc… Modified: trunk/reactos/media/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/diablo2.txt?re… Modified: trunk/reactos/media/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dosblaster.txt… Modified: trunk/reactos/media/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dosbox.txt?rev… Modified: trunk/reactos/media/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/doublecommande… Modified: trunk/reactos/media/rapps/dplus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dplus.txt?rev=… Modified: trunk/reactos/media/rapps/dvdwritenow.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dvdwritenow.tx… Modified: trunk/reactos/media/rapps/efserch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/efserch.txt?re… Modified: trunk/reactos/media/rapps/excelview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/excelview.txt?… Modified: trunk/reactos/media/rapps/fall.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/fall.txt?rev=6… Modified: trunk/reactos/media/rapps/famitracker.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/famitracker.tx… Modified: trunk/reactos/media/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/fap.txt?rev=68… Modified: trunk/reactos/media/rapps/fira.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/fira.txt?rev=6… Modified: trunk/reactos/media/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/firefox.txt?re… Modified: trunk/reactos/media/rapps/firefox28.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/firefox28.txt?… Modified: trunk/reactos/media/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/firefox36.txt?… Modified: trunk/reactos/media/rapps/foxit.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/foxit.txt?rev=… Modified: trunk/reactos/media/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/freebasic.txt?… Added: trunk/reactos/media/rapps/gensemulator.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gensemulator.t… Modified: trunk/reactos/media/rapps/ghostscript.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ghostscript.tx… Modified: trunk/reactos/media/rapps/ghostview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ghostview.txt?… Modified: trunk/reactos/media/rapps/gimp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gimp.txt?rev=6… Modified: trunk/reactos/media/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/glidewrapzbag.… Modified: trunk/reactos/media/rapps/globulation2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/globulation2.t… Modified: trunk/reactos/media/rapps/gnucash.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gnucash.txt?re… Added: trunk/reactos/media/rapps/hexedit.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hexedit.txt?re… Modified: trunk/reactos/media/rapps/hover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hover.txt?rev=… Modified: trunk/reactos/media/rapps/hxd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hxd.txt?rev=68… Modified: trunk/reactos/media/rapps/indiftpd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/indiftpd.txt?r… Modified: trunk/reactos/media/rapps/inkscape.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/inkscape.txt?r… Modified: trunk/reactos/media/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/irfanview.txt?… Modified: trunk/reactos/media/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/irfanviewplugi… Modified: trunk/reactos/media/rapps/jre.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/jre.txt?rev=68… Modified: trunk/reactos/media/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kdewin.txt?rev… Modified: trunk/reactos/media/rapps/kindlepc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kindlepc.txt?r… Modified: trunk/reactos/media/rapps/kmeleon.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kmeleon.txt?re… Modified: trunk/reactos/media/rapps/kyodai.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kyodai.txt?rev… Modified: trunk/reactos/media/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lazaruside.txt… Modified: trunk/reactos/media/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lbreakout2.txt… Modified: trunk/reactos/media/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lgeneral.txt?r… Modified: trunk/reactos/media/rapps/librecad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/librecad.txt?r… Modified: trunk/reactos/media/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreoffice.tx… Modified: trunk/reactos/media/rapps/libreofficehelp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreofficehel… Modified: trunk/reactos/media/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lmarbles.txt?r… Modified: trunk/reactos/media/rapps/mcwin32.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mcwin32.txt?re… Modified: trunk/reactos/media/rapps/md5summer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/md5summer.txt?… Modified: trunk/reactos/media/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mfc40.txt?rev=… Modified: trunk/reactos/media/rapps/miktex.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/miktex.txt?rev… Modified: trunk/reactos/media/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mirandaim.txt?… Modified: trunk/reactos/media/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mirc.txt?rev=6… Modified: trunk/reactos/media/rapps/mirc6.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mirc6.txt?rev=… Modified: trunk/reactos/media/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mono2.txt?rev=… Modified: trunk/reactos/media/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mpc.txt?rev=68… Modified: trunk/reactos/media/rapps/mpxplay.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mpxplay.txt?re… Modified: trunk/reactos/media/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/msxml3.txt?rev… Modified: trunk/reactos/media/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/net11.txt?rev=… Modified: trunk/reactos/media/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/net20.txt?rev=… Modified: trunk/reactos/media/rapps/net20sp2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/net20sp2.txt?r… Modified: trunk/reactos/media/rapps/neverball.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/neverball.txt?… Modified: trunk/reactos/media/rapps/nginx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nginx.txt?rev=… Modified: trunk/reactos/media/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nirlauncher.tx… Modified: trunk/reactos/media/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/npp.txt?rev=68… Modified: trunk/reactos/media/rapps/nvdisp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nvdisp.txt?rev… Modified: trunk/reactos/media/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/offbyone.txt?r… Modified: trunk/reactos/media/rapps/officeformatpack.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/officeformatpa… Modified: trunk/reactos/media/rapps/opencodecs.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/opencodecs.txt… Modified: trunk/reactos/media/rapps/openoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/openoffice.txt… Modified: trunk/reactos/media/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/openoffice2.4.… Modified: trunk/reactos/media/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/opera.txt?rev=… Modified: trunk/reactos/media/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/opera9.txt?rev… Modified: trunk/reactos/media/rapps/pdfsam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pdfsam.txt?rev… Modified: trunk/reactos/media/rapps/peazip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/peazip.txt?rev… Modified: trunk/reactos/media/rapps/pengupop.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pengupop.txt?r… Modified: trunk/reactos/media/rapps/photofiltre.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/photofiltre.tx… Modified: trunk/reactos/media/rapps/pingus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pingus.txt?rev… Modified: trunk/reactos/media/rapps/pptview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pptview.txt?re… Modified: trunk/reactos/media/rapps/precisecalc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/precisecalc.tx… Modified: trunk/reactos/media/rapps/pspad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pspad.txt?rev=… Modified: trunk/reactos/media/rapps/ptanks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ptanks.txt?rev… Modified: trunk/reactos/media/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/putty.txt?rev=… Modified: trunk/reactos/media/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/python.txt?rev… Modified: trunk/reactos/media/rapps/qb64sdl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/qb64sdl.txt?re… Modified: trunk/reactos/media/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/qmmp.txt?rev=6… Modified: trunk/reactos/media/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/remood.txt?rev… Modified: trunk/reactos/media/rapps/reshack.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/reshack.txt?re… Modified: trunk/reactos/media/rapps/revo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/revo.txt?rev=6… Modified: trunk/reactos/media/rapps/rfstools.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/rfstools.txt?r… Modified: trunk/reactos/media/rapps/rocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/rocks.txt?rev=… Modified: trunk/reactos/media/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/rosbe.txt?rev=… Modified: trunk/reactos/media/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sambatng.txt?r… Modified: trunk/reactos/media/rapps/sbforvmware.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sbforvmware.tx… Modified: trunk/reactos/media/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scite.txt?rev=… Modified: trunk/reactos/media/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scummvm.txt?re… Modified: trunk/reactos/media/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sdl_mixer.txt?… Modified: trunk/reactos/media/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sdl_runtime.tx… Modified: trunk/reactos/media/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/seamonkey.txt?… Added: trunk/reactos/media/rapps/shed.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/shed.txt?rev=6… Modified: trunk/reactos/media/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/smplayer.txt?r… Modified: trunk/reactos/media/rapps/snoopy.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/snoopy.txt?rev… Modified: trunk/reactos/media/rapps/stamina.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/stamina.txt?re… Modified: trunk/reactos/media/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/steam.txt?rev=… Modified: trunk/reactos/media/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sumatrapdf.txt… Modified: trunk/reactos/media/rapps/summerbound.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/summerbound.tx… Modified: trunk/reactos/media/rapps/superdxb.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/superdxb.txt?r… Modified: trunk/reactos/media/rapps/superfinder.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/superfinder.tx… Modified: trunk/reactos/media/rapps/supertux.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/supertux.txt?r… Modified: trunk/reactos/media/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tahoma.txt?rev… Modified: trunk/reactos/media/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/thunderbird.tx… Modified: trunk/reactos/media/rapps/thunderbird3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/thunderbird3.t… Modified: trunk/reactos/media/rapps/tightvnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tightvnc.txt?r… Modified: trunk/reactos/media/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tileworld.txt?… Modified: trunk/reactos/media/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/totalcommander… Modified: trunk/reactos/media/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tuxpaint.txt?r… Added: trunk/reactos/media/rapps/ultraiso.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ultraiso.txt?r… Modified: trunk/reactos/media/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ultravnc.txt?r… Modified: trunk/reactos/media/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/utorrent.txt?r… Modified: trunk/reactos/media/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vb5run.txt?rev… Modified: trunk/reactos/media/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vb6run.txt?rev… Added: trunk/reactos/media/rapps/vbasdl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vbasdl.txt?rev… Modified: trunk/reactos/media/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2005sp1run.t… Modified: trunk/reactos/media/rapps/vc2008sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2008sp1run.t… Modified: trunk/reactos/media/rapps/vc2010sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2010sp1run.t… Modified: trunk/reactos/media/rapps/vc2012run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2012run.txt?… Modified: trunk/reactos/media/rapps/vc2013run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2013run.txt?… Modified: trunk/reactos/media/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc6run.txt?rev… Modified: trunk/reactos/media/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vlc.txt?rev=68… Modified: trunk/reactos/media/rapps/winamp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winamp.txt?rev… Modified: trunk/reactos/media/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winboard.txt?r… Modified: trunk/reactos/media/rapps/winemono.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winemono.txt?r… Modified: trunk/reactos/media/rapps/wme9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/wme9.txt?rev=6… Modified: trunk/reactos/media/rapps/wordview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/wordview.txt?r… Modified: trunk/reactos/media/rapps/zaz.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/zaz.txt?rev=68…

9 years, 4 months

[cwittich] 68647: [FUSION] Use different base addresses for the fusion dlls to prevent relocations. Brought to you by Amine! CORE-9992

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Aug 9 09:27:30 2015 New Revision: 68647 URL: http://svn.reactos.org/svn/reactos?rev=68647&view=rev Log: [FUSION] Use different base addresses for the fusion dlls to prevent relocations. Brought to you by Amine! CORE-9992 Added: trunk/reactos/dll/win32/fusion/fusion_1_1/ (with props) trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt (with props) trunk/reactos/dll/win32/fusion/fusion_1_1/fusion.spec (with props) trunk/reactos/dll/win32/fusion/fusion_2_0/ (with props) trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt (with props) trunk/reactos/dll/win32/fusion/fusion_2_0/fusion.spec (with props) Modified: trunk/reactos/cmake/baseaddress.cmake trunk/reactos/dll/win32/fusion/CMakeLists.txt Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Sun Aug 9 09:27:30 2015 @@ -318,3 +318,6 @@ set(baseaddress_wdmaud.drv 0x6fad0000) set(baseaddress_wined3dcfg 0x6faa0000) set(baseaddress_winemp3.acm 0x6fa20000) +set(baseaddress_fusion 0x6fa10000) +set(baseaddress_fusion_1_1 0x6f9f0000) +set(baseaddress_fusion_2_0 0x6f9c0000) Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Sun Aug 9 09:27:30 2015 @@ -12,8 +12,10 @@ fusionpriv.h ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c) +add_library(fusion_lib OBJECT ${SOURCE}) + add_library(fusion SHARED - ${SOURCE} + $<TARGET_OBJECTS:fusion_lib> version.rc ${CMAKE_CURRENT_BINARY_DIR}/fusion.def) @@ -22,6 +24,7 @@ add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) add_pch(fusion fusionpriv.h SOURCE) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all) -add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) -add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/system32 FOR all) + +add_subdirectory(fusion_1_1) +add_subdirectory(fusion_2_0) Propchange: trunk/reactos/dll/win32/fusion/fusion_1_1/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Aug 9 09:27:30 2015 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/fusion/fusion_1_1/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/fusion/fusion_1_1/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/fusion/fusion_1_1/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_1_… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt [iso-8859-1] Sun Aug 9 09:27:30 2015 @@ -0,0 +1,14 @@ + +set(fusion_folder "${CMAKE_CURRENT_SOURCE_DIR}/..") +spec2def(fusion.dll fusion.spec) + +add_library(fusion_1_1 SHARED + $<TARGET_OBJECTS:fusion_lib> + ${fusion_folder}/version.rc + ${CMAKE_CURRENT_BINARY_DIR}/fusion.def) + +set_module_type(fusion_1_1 win32dll) +target_link_libraries(fusion_1_1 uuid wine) +set_target_properties(fusion_1_1 PROPERTIES OUTPUT_NAME "fusion") +add_importlibs(fusion_1_1 advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) +add_cd_file(TARGET fusion_1_1 DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) Propchange: trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/dll/win32/fusion/fusion_1_1/fusion.spec [iso-8859-1] Sun Aug 9 09:27:30 2015 @@ -0,0 +1,17 @@ +@ stub CopyPDBs +@ stdcall ClearDownloadCache() +@ stdcall CreateApplicationContext(ptr ptr) +@ stdcall CreateAssemblyCache(ptr long) +@ stdcall CreateAssemblyEnum(ptr ptr ptr long ptr) +@ stdcall CreateAssemblyNameObject(ptr wstr long ptr) +@ stub CreateHistoryReader +@ stdcall CreateInstallReferenceEnum(ptr ptr long ptr) +@ stdcall GetCachePath(long wstr ptr) +@ stub GetHistoryFileDirectory +@ stdcall InitializeFusion() +@ stub InstallCustomAssembly +@ stub InstallCustomModule +@ stub LookupHistoryAssembly +@ stub NukeDownloadedCache +@ stub PreBindAssembly +@ stub PreBindAssemblyEx Propchange: trunk/reactos/dll/win32/fusion/fusion_1_1/fusion.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/fusion/fusion_2_0/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Aug 9 09:27:30 2015 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/fusion/fusion_2_0/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/fusion/fusion_2_0/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/fusion/fusion_2_0/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_2_… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt [iso-8859-1] Sun Aug 9 09:27:30 2015 @@ -0,0 +1,14 @@ + +set(fusion_folder "${CMAKE_CURRENT_SOURCE_DIR}/..") +spec2def(fusion.dll fusion.spec) + +add_library(fusion_2_0 SHARED + $<TARGET_OBJECTS:fusion_lib> + ${fusion_folder}/version.rc + ${CMAKE_CURRENT_BINARY_DIR}/fusion.def) + +set_module_type(fusion_2_0 win32dll) +target_link_libraries(fusion_2_0 uuid wine) +set_target_properties(fusion_2_0 PROPERTIES OUTPUT_NAME "fusion") +add_importlibs(fusion_2_0 advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) +add_cd_file(TARGET fusion_2_0 DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all) Propchange: trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/dll/win32/fusion/fusion_2_0/fusion.spec [iso-8859-1] Sun Aug 9 09:27:30 2015 @@ -0,0 +1,17 @@ +@ stub CopyPDBs +@ stdcall ClearDownloadCache() +@ stdcall CreateApplicationContext(ptr ptr) +@ stdcall CreateAssemblyCache(ptr long) +@ stdcall CreateAssemblyEnum(ptr ptr ptr long ptr) +@ stdcall CreateAssemblyNameObject(ptr wstr long ptr) +@ stub CreateHistoryReader +@ stdcall CreateInstallReferenceEnum(ptr ptr long ptr) +@ stdcall GetCachePath(long wstr ptr) +@ stub GetHistoryFileDirectory +@ stdcall InitializeFusion() +@ stub InstallCustomAssembly +@ stub InstallCustomModule +@ stub LookupHistoryAssembly +@ stub NukeDownloadedCache +@ stub PreBindAssembly +@ stub PreBindAssemblyEx Propchange: trunk/reactos/dll/win32/fusion/fusion_2_0/fusion.spec ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 4 months

[dreimer] 68646: [RAPPS] Add pack of themes Watercolor 4.3 by Alexander Rechitskiy CORE-9814 #resolve #comment Added to RAPPS

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Aug 9 08:27:45 2015 New Revision: 68646 URL: http://svn.reactos.org/svn/reactos?rev=68646&view=rev Log: [RAPPS] Add pack of themes Watercolor 4.3 by Alexander Rechitskiy CORE-9814 #resolve #comment Added to RAPPS Added: trunk/reactos/media/rapps/watercolor.txt (with props) Added: trunk/reactos/media/rapps/watercolor.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/watercolor.txt… ============================================================================== --- trunk/reactos/media/rapps/watercolor.txt (added) +++ trunk/reactos/media/rapps/watercolor.txt [iso-8859-1] Sun Aug 9 08:27:45 2015 @@ -0,0 +1,15 @@ +; UTF-8 + +[Section] +Name = Watercolor +Version = 4.3 +License = Freeware +Description = A Windows theme based on the look of Windows Codename Whistler. +Size = 861 kB +Category = 15 +URLSite = http://www.neowin.net/forum/topic/32604-watercolor-v43/ +URLDownload = http://homepage.ntlworld.com/sherry.ponting/Junk/Watercolor43.exe +CDPath = none + +[Section.0407] +Description = Ein Windows Design basierend auf dem Aussehenvon Windows Codename Whistler. Propchange: trunk/reactos/media/rapps/watercolor.txt ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 4 months

← Newer
1
...
21
22
23
24
25
26
27
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2015