Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[dchapyshev] 53540: - Remove unneeded ";"

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 3 04:55:54 2011 New Revision: 53540 URL: http://svn.reactos.org/svn/reactos?rev=53540&view=rev Log: - Remove unneeded ";" Modified: trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=535… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Sat Sep 3 04:55:54 2011 @@ -1195,7 +1195,7 @@ /* Traverse the list */ Current = RtlpDphDelayedFreeQueue.Flink; - while (Current != &RtlpDphDelayedFreeQueue); + while (Current != &RtlpDphDelayedFreeQueue) { /* Get the next entry pointer */ Next = Current->Flink;

13 years, 3 months

[osiejka] 53539: [TRANSLATION] - Romanian syssetup and usetup translation by Stefan Fulea <fulea.stefan> at <gmail.com>; - Fix ipconfig build under MSVC, use "" instead of \" as escape character;

by osiejka＠svn.reactos.org

Author: osiejka Date: Sat Sep 3 01:09:42 2011 New Revision: 53539 URL: http://svn.reactos.org/svn/reactos?rev=53539&view=rev Log: [TRANSLATION] - Romanian syssetup and usetup translation by Stefan Fulea <fulea.stefan> at <gmail.com>; - Fix ipconfig build under MSVC, use "" instead of \" as escape character; Modified: trunk/reactos/base/applications/network/ipconfig/lang/ro-RO.rc trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/muilanguages.h trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc Modified: trunk/reactos/base/applications/network/ipconfig/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/lang/ro-RO.rc [iso-8859-1] Sat Sep 3 01:09:42 2011 @@ -55,9 +55,9 @@ /setclassid Modificã identitatea de clasã (id_clasã) dhcp.\n \ \n \ În mod implicit sunt afiºate doar adresa IP, masca de subreþea ºi\n \ - ieºirea \"gateway\" implicitã pentru fiecare adaptor ce suportã TCP/IP.\n \ + ieºirea ""gateway"" implicitã pentru fiecare adaptor ce suportã TCP/IP.\n \ \n \ - Pentru \"Release\" ºi \"Renew\", dacã nu este specificat nici un adaptor,\n \ + Pentru ""Release"" ºi ""Renew"", dacã nu este specificat nici un adaptor,\n \ atunci vor fi detaºate sau reînnoite toate alocãrile de adrese IP pentru\n \ toate adaptoarele ce suportã TCP/IP.\n \ \n \ @@ -69,9 +69,9 @@ > ipconfig /all ... Afiºeazã informaþii detaliate.\n \ > ipconfig /renew ... Reînnoieºte toate adaptoarele.\n \ > ipconfig /renew EL* ... Reînnoieºte toate conexiunile care\n \ - au numele începând cu \"EL\".\n \ + au numele începând cu ""EL"".\n \ > ipconfig /release *Con* ... Detaºeazã conexiunile care conþin în\n \ - numele lor secvenþa \"Con\".\n \ + numele lor secvenþa ""Con"".\n \ ex. ""Local Area Connection 1"" sau\n \ ""Local Area Connection 2""\n" END 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] Sat Sep 3 01:09:42 2011 @@ -2,7 +2,1782 @@ MUI_LAYOUTS roROLayouts[] = { + { L"0409", L"00000409" }, { L"0418", L"00000418" }, - { L"0409", L"00000409" }, { NULL, NULL } }; + +static MUI_ENTRY roROLanguagePageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Selecîie limbÇ", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 VÇ rugÇm selectaîi limba pentru procesul de instalare.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Apoi apÇsaîi ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Aceasta va fi n final limba implicitÇ pentru tot sistemul.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continuare F3 = Ieire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roROWelcomePageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Bun venit la instalarea ReactOS", + TEXT_STYLE_HIGHLIGHT + }, + { + 6, + 11, + "AceastÇ primÇ parte din instalarea ReactOS va copia fiierele", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "necesare n calculatorul dumneavoastrÇ i-l va pregÇti pentru", + TEXT_STYLE_NORMAL + }, + { + 6, + 13, + "cea de-a doua parte a instalÇrii.", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "\x07 ApÇsaîi ENTER pentru a instala ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "\x07 Tastaîi R pentru a reface un sistem deteriorat sau pentru", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + " a actualiza ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Tastaîi L pentru Termenii i Condiîiile de Licenîiere", + TEXT_STYLE_NORMAL + }, + { + 8, + 23, + "\x07 ApÇsaîi F3 pentru a iei fÇrÇ a instala ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 6, + 26, + "Pentru mai multe informaîii despre ReactOS, vizitaîi:", + TEXT_STYLE_NORMAL + }, + { + 6, + 27, + "http://www.reactos.org", + TEXT_STYLE_HIGHLIGHT + }, + { + 0, + 0, + "ENTER = Continuare R = Refacere L = LicenîÇ F3 = Ieire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roROIntroPageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Instalatorul ReactOS curent este ncÇ ntr-un stadiu", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "primar de dezvoltare i nu conîine toate funcîionalitÇîile", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "unei aplicaîii complete de instalare.", + TEXT_STYLE_NORMAL + }, + { + 6, + 13, + "Sunt aplicabile urmÇtoarele limitÇri:", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "- Instalatorul curent nu e capabil de mai mult de", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + " o partiîie per disc.", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "- Instalatorul curent nu poate terge partiîia primarÇ", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + " a unui dispozitiv ct timp existÇ partiîii extinse.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "- Instalatorul curent nu poate terge prima partiîie", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + " extinsÇ, ct timp existÇ alte partiîii extinse.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "- Instalatorul curent poate opera doar cu sisteme", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + " de fiiere FAT.", + TEXT_STYLE_NORMAL + }, + { + 8, + 22, + "- VerificÇrile de integritate pentru fiiere nu sunt", + TEXT_STYLE_NORMAL + }, + { + 8, + 23, + " ncÇ implementate.", + TEXT_STYLE_NORMAL + }, + { + 8, + 26, + "\x07 ApÇsaîi ENTER pentru a instala ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 28, + "\x07 ApÇsaîi F3 pentru a iei fÇrÇ a instala ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continuare F3 = Ieire", + TEXT_TYPE_STATUS| TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roROLicensePageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 6, + "Licenîiere:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 8, + "Sistemul ReactOS este oferit n termenii GNU GPL, cu pÇrîi", + TEXT_STYLE_NORMAL + }, + { + 8, + 9, + "de cod din alte licenîe compatibile, cum ar fi licenîele", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "X11, BSD i GNU LGPL.", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "Toate softurile din componenîa sistemului ReactOS sunt prin", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "urmare oferite sub licenîa GNU GPL menîinndu-i n acelai", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "timp i licenîierea originalÇ.", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "Acest soft nu are ataatÇ nici restricîie de utilizare", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "cu aplicabilitate legislativÇ localÇ i internaîionalÇ.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "Licenîierea se referÇ doar la distribuîia ReactOS cÇtre", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "pÇrîi terîe.", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "DacÇ din vreun motiv careva nu aîi primit o copie a Licenîei", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "Publice Generale GNU mpreunÇ cu ReactOS, sunteîi rugaîi sÇ", + TEXT_STYLE_NORMAL + }, + { + 8, + 22, + "vizitaîi:", + TEXT_STYLE_NORMAL + }, + { + 8, + 23, + "http://www.gnu.org/licenses/licenses.html", + TEXT_STYLE_HIGHLIGHT + }, + { + 6, + 26, + "Garanîie:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 28, + "AcestÇ aplicaîie este distribuitÇ n speranîa cÇ va fi utilÇ,", + TEXT_STYLE_NORMAL + }, + { + 8, + 29, + "FÆRÆ nsÇ NICI O GARANõIE; nici mÇcar cu garanîia implicitÇ a", + TEXT_STYLE_NORMAL + }, + { + 8, + 30, + "VANDABILITÆõII sau a UTILITÆõII ×NTR-UN SCOP ANUME.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Revenire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roRODevicePageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Configurarea dispozitivelor de bazÇ.", + TEXT_STYLE_NORMAL + }, + { + 24, + 11, + "Arh. de calcul:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 12, + "Parametri grafici:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 13, + "Model tastaturÇ:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 14, + "Config. tastaturÇ:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 16, + "AcceptÇ:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 25, + 16, "Accept configuraîia dispozitivelor", + TEXT_STYLE_NORMAL + }, + { + 6, + 19, + "Puteîi modifica starea curentÇ. Utilizaîi tastele SUS/JOS pentru", + TEXT_STYLE_NORMAL + }, + { + 6, + 20, + "alegerea unui dispozitiv, apoi apÇsaîi ENTER pentru a-i modifica", + TEXT_STYLE_NORMAL + }, + { + 6, + 21, + "configuraîia ataatÇ.", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "Cnd configuraîia dispozitivele enumerate este cea corectÇ,", + TEXT_STYLE_NORMAL + }, + { + 6, + 24, + "selectaîi \"Accept configuraîia dispozitivelor\", apoi", + TEXT_STYLE_NORMAL + }, + { + 6, + 25, + "confirmaîi-o apÇsnd ENTER.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continuare F3 = Ieire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roRORepairPageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Instalatorul ReactOS este ncÇ ntr-o fazÇ incipientÇ de dezvoltare", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "i nu posedÇ toatÇ funcîionalitatea unui instalator complet.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "Funcîionalitatea de refacere ncÇ nu este implementatÇ.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Tastaîi U pentru actualizarea SO.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Tastaîi R pentru consola de Recuperare.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 ApÇsaîi ESC pentru a reveni la pagina principalÇ.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 ApÇsaîi ENTER pentru a reporni calculatorul.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ESC = Revenire U = Actualizare R = Recuperare ENTER = Repornire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY roROComputerPageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Doriîi specificarea arhitecturii de calcul.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Utilizaîi tastele SUS/JOS pentru a selecta o", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " arhitecturÇ de calcul, apoi apÇsaîi ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 ApÇsaîi ESC pentru a reveni la pagina precedentÇ", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " fÇrÇ a specifica o altÇ arhitecturÇ de calcul.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continuare ESC = Anulare F3 = Ieire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roROFlushPageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "Verificarea stocÇrii datelor necesare.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "La final, calculatorul va fi repornit automat.", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "VÇ rugÇm sÇ ateptaîi.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Eliberare memorie...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roROQuitPageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "ReactOS nu a fost instalat complet.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Scoateîi discul flexibil din unitatea A:", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "i toate CD-ROM din unitÇîile CD.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "ApÇsaîi ENTER pentru a reporni calculatorul.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "VÇ rugÇm sÇ ateptaîi...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roRODisplayPageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Doriîi modificarea parametrilor grafici de afiare.", + TEXT_STYLE_NORMAL + }, + { 8, + 10, + "\x07 Utilizaîi tastele SUS/JOS pentru a selecta", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " un set de parametri, apoi apÇsaîi ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 ApÇsaîi ESC pentru a reveni la pagina precedentÇ", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " fara a modifica parametrii grafici actuali.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continuare ESC = Anulare F3 = Ieire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roROSuccessPageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "Componentele de bazÇ ale ReactOS au fost instalate cu succes.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Scoateîi discul flexibil din unitatea A: i toate CD-ROM", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "din unitÇîile CD.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "ApÇsaîi ENTER pentru a reporni calculatorul.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Repornire calculator", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roROBootPageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Instalatorul nu poate instala aplicaîia de iniîializare", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "a calculatorului pe discul calculatorului dumneavoastrÇ.", + TEXT_STYLE_NORMAL + }, + { + 6, + 13, + "Sunteîi rugaîi sÇ introduceîi un disc flexibil formatat", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "n unitatea A: apoi sÇ apÇsaîi ENTER.", + TEXT_STYLE_NORMAL, + }, + { + 0, + 0, + "ENTER = Continuare F3 = Ieire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +static MUI_ENTRY roROSelectPartitionEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "UrmÇtoarea listÇ cuprinde partiîiile existente precum", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "i spaîiul nefolosit pentru crearea de noi partiîii.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + "\x07 Utilizaîi tastele SUS/JOS pentru a selecta o opîiune.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 ApÇsaîi ENTER pentru a instala pe partiîia selectatÇ.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Tastaîi C pentru a crea o nouÇ partiîie.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Tastaîi D pentru a terge o partiîie existentÇ.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Va rugÇm sÇ ateptaîi...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roROFormatPartitionEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Formatare partiîie.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "UrmeazÇ formatarea partiîiei.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "ApÇsaîi ENTER pentru a continua.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continuare F3 = Ieire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + TEXT_STYLE_NORMAL + } +}; + +static MUI_ENTRY roROInstallDirectoryEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Alegeîi un director de instalare pe partiîia aleasÇ.", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "Aici vor fi amplasate fiierele sistemului ReactOS:", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Puteîi indica un alt director. ApÇsaîi BACKSPACE pentru", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "a terge caractere, apoi scrieîi calea directorului unde", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "doriîi instalarea ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continuare F3 = Ieire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roROFileCopyEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 12, + "Transferarea fiierelor n directorul ReactOS specificat.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 13, + "(poate dura cteva minute)", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 50, + 0, + "\xB3 VÇ rugÇm sÇ ateptaîi... ", + TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roROBootLoaderEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Instalarea aplicaîiei de iniîializare a calculatorului", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "InstaleazÇ iniîializator pe discul intern (MBR i VBR).", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "InstaleazÇ iniîializator pe discul intern (doar VBR).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "InstaleazÇ iniîializator pe un disc flexibil.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "Omite instalarea aplicaîiei de iniîializare.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continuare F3 = Ieire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roROKeyboardSettingsEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Doriîi specificarea modelului tastaturii instalate.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Utilizaîi tastele SUS/JOS pentru a selecta un model", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " de tastaturÇ, apoi apÇsaîi ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 ApÇsaîi ESC pentru a reveni la pagina precedentÇ fÇrÇ", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " a schimba modelul tastaturii curente.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continuare ESC = Anulare F3 = Ieire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roROLayoutSettingsEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Specificaîi pentru instalare o configuraîie implicitÇ a tastaturii.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Utilizaîi tastele SUS/JOS pentru a selecta o configuraîie", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " doritÇ de tastaturÇ, apoi apÇsaîi ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 ApÇsaîi ESC pentru a reveni la pagina precedentÇ fÇrÇ", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " a schimba configuraîia curentÇ a tastaturii.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continuare ESC = Anulare F3 = Ieire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY roROPrepareCopyEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Se fac pregÇtirile necesare pentru copierea de fiiere...", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Crearea listei de fiiere...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY roROSelectFSEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 14, + "Alegeîi un sistem de fiiere din lista de mai jos.", + 0 + }, + { + 8, + 16, + "\x07 Utilizaîi tastele SUS/JOS pentru a selecta", + 0 + }, + { + 8, + 17, + " un sistem de fiiere.", + 0 + }, + { + 8, + 19, + "\x07 ApÇsaîi ENTER pentru a formata partiîia.", + 0 + }, + { + 8, + 21, + "\x07 ApÇsaîi ESC pentru a alege o altÇ partiîie.", + 0 + }, + { + 0, + 0, + "ENTER = Continuare ESC = Anulare F3 = Ieire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roRODeletePartitionEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Aîi ales sÇ tergeîi partiîia", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "\x07 Tastaîi D pentru a terge partiîia.", + TEXT_STYLE_NORMAL + }, + { + 11, + 19, + "ATENõIE: Toate datele de pe aceastÇ partiîie vor fi pierdute!", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 ApÇsaîi ESC pentru a anula.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "D = ¸tergere partiîie ESC = Anulare F3 = Ieire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY roRORegistryEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Actualizarea configuraîiei sistemului.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Crearea registului...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +MUI_ERROR roROErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "ReactOS nu a fost instalat complet n calculatorul\n" + "dumneavoastrÇ. DacÇ abandonaîi instalarea ReactOS\n" + "acum, va fi nevoie sÇ o reluaîi din nou altÇ datÇ.\n" + "\n" + " \x07 ApÇsaîi ENTER pentru a continua instalarea.\n" + " \x07 ApÇsaîi F3 pentru a iei din Instalator.", + "F3 = Ieire ENTER = Continuare" + }, + { + //ERROR_NO_HDD + "Nu se pot gÇsi discuri interne.", + "ENTER = Repornire calculator" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Nu se poate gÇsi unitatea de citire.", + "ENTER = Repornire calculator" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Nu poate ncÇrca fiierul TXTSETUP.SIF.", + "ENTER = Repornire calculator" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Fiieul TXTSETUP.SIF a fos gÇsit deteriorat.", + "ENTER = Repornire calculator" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Fiierul TXTSETUP.SIF conîine o semnÇturÇ invalidÇ.", + "ENTER = Repornire calculator" + }, + { + //ERROR_DRIVE_INFORMATION + "Nu se pot obîine informaîii despre dispozitiv(ele)\n" + "din calculator.\n", + "ENTER = Repornire calculator" + }, + { + //ERROR_WRITE_BOOT, + "Nu s-a reuit instalarea codului FAT de iniîializare\n" + "pe partiîia de sistem.", + "ENTER = Repornire calculator" + }, + { + //ERROR_LOAD_COMPUTER, + "A euat ncÇrcarea listei cu arhitecturi de\n" + "calcul disponibile.", + "ENTER = Repornire calculator" + }, + { + //ERROR_LOAD_DISPLAY, + "A euat ncÇrcarea listei cu parametri de\n" + "afiare pentru ecran.", + "ENTER = Repornire calculator" + }, + { + //ERROR_LOAD_KEYBOARD, + "A euat ncÇrcarea listei cu tipuri\n" + "disponibile de tastaturÇ.", + "ENTER = Repornire calculator" + }, + { + //ERROR_LOAD_KBLAYOUT, + "A euat ncÇrcarea listei de configuraîii\n" + "ale tastaturii.", + "ENTER = Repornire calculator" + }, + { + //ERROR_WARN_PARTITION, + "A fost gÇsit cel puîin un disc cu tabelÇ de partiîii\n" + "nesuportatÇ, ce nu pot fi gestionatÇ corespunzÇtor!\n" + "\n" + "Crearea sau tergerea de partiîii poate astfel cauza\n" + "distrugerea tabelei de partiîii." + "\n" + " \x07 ApÇsaîi F3 pentru a iei din Instalator.\n" + " \x07 ApÇsaîi ENTER pentru a continua.", + "F3= Ieire ENTER = Continuare" + }, + { + //ERROR_NEW_PARTITION, + "O partiîie nouÇ nu se creazÇ n interiorul\n" + "unei partiîii existente!\n" + "\n" + " * Tastaîi pentru a continua.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "Aîi ncercat tergerea de spaîiu nepartiîionat,\n" + "nsÇ doar spaîiul partiîionat poate fi ters!\n" + "\n" + " * Tastaîi pentru a continua.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Nu s-a reuit instalarea codului FAT de iniîializare\n" + "pe partiîia de sistem.", + "ENTER = Repornire calculator" + }, + { + //ERROR_NO_FLOPPY, + "Nu existÇ discuri flexibile n unitatea A:", + "ENTER = Continuare" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "A euat actualizarea configuraîiei de tastaturÇ.", + "ENTER = Repornire calculator" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Nu s-a reuit actualizarea registrului cu\n" + "parametrii grafici ai ecranului!", + "ENTER = Repornire calculator" + }, + { + //ERROR_IMPORT_HIVE, + "Nu s-a reuit importarea registrului.", + "ENTER = Repornire calculator" + }, + { + //ERROR_FIND_REGISTRY + "Fiierele cu datele registrului\n" + "nu au putut fi localizate.", + "ENTER = Repornire calculator" + }, + { + //ERROR_CREATE_HIVE, + "Crearea registrului local a euat!", + "ENTER = Repornire calculator" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Iniîializarea registrului a euat.", + "ENTER = Repornire calculator" + }, + { + //ERROR_INVALID_CABINET_INF, + "Fiierul cabinet nu conîine nici un fiier\n" + "valid de tip inf.", + "ENTER = Repornire calculator" + }, + { + //ERROR_CABINET_MISSING, + "Fiierul cabinet nu e gÇsit.\n", + "ENTER = Repornire calculator" + }, + { + //ERROR_CABINET_SCRIPT, + "Fiierul cabinet nu conîine nici un script\n" + "de instalare.", + "ENTER = Repornire calculator" + }, + { + //ERROR_COPY_QUEUE, + "Nu se poate deschide lista de fiiere\n" + "pentru copiere.", + "ENTER = Repornire calculator" + }, + { + //ERROR_CREATE_DIR, + "Nu se pot crea directoarele de instalare.", + "ENTER = Repornire calculator" + }, + { + //ERROR_TXTSETUP_SECTION, + "Nu se poate gÇsi secîiunea de directoare\n" + "n fiierul TXTSETUP.SIF.", + "ENTER = Repornire calculator" + }, + { + //ERROR_CABINET_SECTION, + "Nu se poate gÇsi secîiunea de directoare\n" + "n fiierul cabinet.", + "ENTER = Repornire calculator" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Nu se poate crea directorul de instalare.", + "ENTER = Repornire calculator" + }, + { + //ERROR_FIND_SETUPDATA, + "Nu se poate gÇsi secîiunea pentru date de\n" + "instalare din fiierul TXTSETUP.SIF.", + "ENTER = Repornire calculator" + }, + { + //ERROR_WRITE_PTABLE, + "A euat scrierea tabelelor de partiîii.\n", + "ENTER = Repornire calculator" + }, + { + //ERROR_ADDING_CODEPAGE, + "A euat includerea paginÇrii n registre.\n", + "ENTER = Repornire calculator" + }, + { + //ERROR_UPDATE_LOCALESETTINGS, + "Nu se poate seta sistemul de localizare.\n", + "ENTER = Repornire calculator" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "A euat includerea n registre a configuraîiei\n" + "de tastaturÇ.", + "ENTER = Repornire calculator" + }, + { + //ERROR_UPDATE_GEOID, + "Nu s-a reuit setarea geo id.", + "ENTER = Repornire calculator" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Pe partiîia selectatÇ nu existÇ suficient\n" + "spaîiu liber." + " * Tastaîi pentru a continua.", + NULL + }, + { + NULL, + NULL + } +}; + +MUI_PAGE roROPages[] = +{ + { + LANGUAGE_PAGE, + roROLanguagePageEntries + }, + { + START_PAGE, + roROWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + roROIntroPageEntries + }, + { + LICENSE_PAGE, + roROLicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + roRODevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + roRORepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + roROComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + roRODisplayPageEntries + }, + { + FLUSH_PAGE, + roROFlushPageEntries + }, + { + SELECT_PARTITION_PAGE, + roROSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + roROSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + roROFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + roRODeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + roROInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + roROPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + roROFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + roROKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + roROBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + roROLayoutSettingsEntries + }, + { + QUIT_PAGE, + roROQuitPageEntries + }, + { + SUCCESS_PAGE, + roROSuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + roROBootPageEntries + }, + { + REGISTRY_PAGE, + roRORegistryEntries + }, + { + -1, + NULL + } +}; + +MUI_STRING roROStrings[] = +{ + {STRING_PLEASEWAIT, + " VÇ rugÇm sÇ ateptaîi..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Instalare C = Creare partiîie F3 = Ieire"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Instalare D = ¸tergere partiîie F3 = Ieire"}, + {STRING_PARTITIONSIZE, + "MÇrimea noii partiîii:"}, + {STRING_CHOOSENEWPARTITION, + "Aîi ales crearea unei noi partiîii pe"}, + {STRING_HDDSIZE, + "VÇ rugÇm sÇ introduceîi mÇrimea noii partiîii n megaocteîi."}, + {STRING_CREATEPARTITION, + " ENTER = Creare partiîie ESC = Anulare F3 = Ieire"}, + {STRING_PARTFORMAT, + "AceastÇ Partiîie urmeazÇ sÇ fie formatatÇ."}, + {STRING_NONFORMATTEDPART, + "Alegeîi sÇ instalaîi ReactOS pe partiîie nouÇ sau neformatatÇ."}, + {STRING_INSTALLONPART, + "Instalare ReactOS pe partiîia"}, + {STRING_CHECKINGPART, + "Instalatorul verificÇ acum partiîia aleasÇ."}, + {STRING_QUITCONTINUE, + "F3= Ieire ENTER = Continuare"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Repornire calculator"}, + {STRING_TXTSETUPFAILED, + "Nu s-a reuit gÇsirea sesiunii\n'%S' n TXTSETUP.SIF.\n"}, + {STRING_COPYING, + " Copiere fiier: %S"}, + {STRING_SETUPCOPYINGFILES, + "Copiere fiiere..."}, + {STRING_REGHIVEUPDATE, + " Actualizare registrului..."}, + {STRING_IMPORTFILE, + " Importare %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Actualizarea n registru a configuraîiei grafice..."}, + {STRING_LOCALESETTINGSUPDATE, + " Actualizarea particularitÇîilor locale..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Actualizarea configuraîiei tastaturii..."}, + {STRING_CODEPAGEINFOUPDATE, + " AdÇugarea n registru a datelor de paginare..."}, + {STRING_DONE, + " Terminat..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Repornire calculator"}, + {STRING_CONSOLEFAIL1, + "Nu se poate deschide consola\n\n"}, + {STRING_CONSOLEFAIL2, + "Cea mai frecventÇ cauzÇ pentru asta este utilizarea unei tastaturi USB\n"}, + {STRING_CONSOLEFAIL3, + "Tastaturile USB ncÇ nu sunt complet suportate\n"}, + {STRING_FORMATTINGDISK, + "Formatarea discului"}, + {STRING_CHECKINGDISK, + "Verificarea discului"}, + {STRING_FORMATDISK1, + " Formatarea partiîiei ca sistem de fiiere %S (formatare rapidÇ) "}, + {STRING_FORMATDISK2, + " Formatarea partiîiei ca sistem de fiiere %S "}, + {STRING_KEEPFORMAT, + " PÇstreazÇ sistemul de fiiere actual (fÇrÇ schimbÇri) "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Tip %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "de pe %I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ."}, + {STRING_HDDINFOUNK3, + "de pe %I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK4, + "%c%c Tip %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "de pe Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c Tip %-3u %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "O nouÇ partiîie a fost creatÇ n"}, + {STRING_UNPSPACE, + " Spaîiu nepartiîionat %6lu %s"}, + {STRING_MAXSIZE, + "MO (max. %lu MO)"}, + {STRING_UNFORMATTED, + "Part. nouÇ (neformatatÇ)"}, + {STRING_FORMATUNUSED, + "Nefolosit"}, + {STRING_FORMATUNKNOWN, + "Necunoscut"}, + {STRING_KB, + "KO"}, + {STRING_MB, + "MO"}, + {STRING_GB, + "GO"}, + {STRING_ADDKBLAYOUTS, + "AdÇugare configuraîii de tastaturÇ"}, + {0, 0} +}; Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Sat Sep 3 01:09:42 2011 @@ -234,7 +234,7 @@ {L"00000816", L"1252", L"850", L"10000", L"Portuguese (Portugal)", L"351", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, ptPTLayouts }, {L"00000416", L"1252", L"850", L"10000", L"Portuguese (Brazil)", L"55", ptBRPages, ptBRErrorEntries, ptBRStrings, LatinFonts, ptBRLayouts }, {L"00000446", L"0", L"1", L"2", L"Punjabi (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, paINLayouts }, - {L"00000418", L"1250", L"852", L"10029", L"Romanian", L"40", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, roROLayouts }, + {L"00000418", L"1250", L"852", L"10029", L"Romanian", L"40", roROPages, roROErrorEntries, roROStrings, LatinFonts, roROLayouts }, {L"00000417", L"1252", L"850", L"10000", L"Romansh", L"41", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, rmCHLayouts }, {L"00000419", L"1251", L"866", L"10007", L"Russian", L"7", ruRUPages, ruRUErrorEntries, ruRUStrings, CyrillicFonts, ruRULayouts }, {L"0000044F", L"0", L"1", L"2", L"Sanskrit", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, saINLayouts }, Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] Sat Sep 3 01:09:42 2011 @@ -25,8 +25,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bun venit la Expertul de instalare al ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Acest expert instaleazÄ ReactOS pe computerul dvs. Expertul trebuie sÄ adune niÈte informaÈii despre computerpentru a instala ReactOS corect.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Clic pe UrmÄtor pentru a continua.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Acest expert va finaliza instalarea ReactOS. Ãn cele ce urmeazÄ Expertul va culege niÈte informaÈii despre calculator pentru a instala ReactOS corect.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Clic pe Ãnainte pentru a continua.", IDC_STATIC, 115, 169, 195, 17 END @@ -35,14 +35,14 @@ CAPTION "Instalare ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Dezvoltatorii ReactOS le sunt recunoscÄtori urmÄtoarelor proiecte de software liber care au fost utilizate la crearea ReactOS:", + LTEXT "Dezvoltatorii ReactOS sunt recunoscÄtori urmÄtoarelor proiecte de software public ce au fost utilizate la crearea ReactOS:", IDC_STATIC,15,7,286,19 LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS este sub licenÈa GPL, astfel dacÄ vreÈi sÄ Ã®l redistribuiÈi trebuie sÄ respectaÈi licenÈa GPL.", - IDC_STATIC,15,110,227,19 - PUSHBUTTON "&Vizualizare GPL...",IDC_VIEWGPL,251,110,50,19 - LTEXT "Clic pe UrmÄtor pentru a continua.",IDC_STATIC,15,136, + LTEXT "ReactOS este oferit sub licenÈa GPL, astfel reutilizarea sau redistribuÈia sa (sau a pÄrÈilor sale componente), cere respectarea licenÈei GPL.", + IDC_STATIC,15,110,234,19 + PUSHBUTTON "&AfiÈeazÄ GPL",IDC_VIEWGPL,251,110,50,19 + LTEXT "Clic pe Ãnainte pentru a continua.",IDC_STATIC,15,136, 195,17 END @@ -53,9 +53,9 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 - LTEXT "ScrieÈi-vÄ numele Èi numele companiei sau organizaÈiei din care faceÈi parte.", + LTEXT "ScrieÈi-vÄ numele complet Èi compania sau organizaÈia din care faceÈi parte.", IDC_STATIC, 54, 7, 242, 21 - LTEXT "Nu&me:", IDC_STATIC, 54, 37, 44, 8 + LTEXT "Nu&me complet:", IDC_STATIC, 54, 37, 70, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "&OrganizaÈie:", IDC_STATIC, 54, 57, 44, 8 EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL @@ -68,14 +68,14 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 - LTEXT "ScrieÈi un nume pentru computer de maxim 15 de caractere. DacÄ sunteÈi Ã®n reÈea, numele computerului trebuie sÄ fie unic.", + LTEXT "ScrieÈi un nume pentru calculator de maxim 15 de caractere. DacÄ sunteÈi Ã®ntr-o reÈea, numele calculatorului trebuie sÄ fie unic.", IDC_STATIC, 54, 7, 250, 24 - LTEXT "&Nume:", IDC_STATIC, 54, 38, 75, 8 + LTEXT "&Nume calculator:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 - LTEXT "Expertul va crea un cont de utilizator cu numele Administrator. Ãl puteÈi folosi cÃ¢nd vreÈi control complet asupra computerului.", + LTEXT "Expertul va crea un cont de utilizator cu numele Administrator. Ãl puteÈi folosi cÃ¢nd veÈi avea nevoie de control complet asupra calculatorului.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "ScrieÈi o parolÄ pentru Administrator de maxim 14 caractere.", + LTEXT "IntroduceÈi o parolÄ pentru Administrator de maxim 14 caractere.", IDC_STATIC, 54, 87, 250, 8 LTEXT "&ParolÄ administrator:", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD @@ -90,17 +90,16 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 - LTEXT "SetÄrile regionale ar trebui sÄ se potriveascÄ cu limbaprogramelor. Acestea controleazÄ cum apar numerele, datele Èi valutele.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "Localizarea regionalÄ trebuie sÄ se potriveascÄ cu limba aplicaÈiilor utilizate. De ea depinde cum vor apare numerele, valutele Èi data.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "Pentru a aceste setÄri, clic pe Particularizare.", - IDC_STATIC, 53, 60, 196, 8 - PUSHBUTTON "&Particularizare", IDC_CUSTOMLOCALE, 250, 57, 50, 14 - LTEXT "Controalele de Èablon tastaturÄ seteazÄ cum apar literele cÃ¢nd scrieÈi.", - IDC_STATIC, 53, 86, 253, 8 + LTEXT "Modificare particularizÄri de sistem Èi localizare.", + IDC_STATIC, 53, 60, 186, 8 + PUSHBUTTON "&ParticularizÄri", IDC_CUSTOMLOCALE, 240, 57, 60, 14 + LTEXT "ConfigurÄri Èi localizÄri pentru tastaturÄ, aranjamente de caractere asociate tastelor la dactilografiere.", IDC_STATIC, 53, 82, 253, 20 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 - LTEXT "Pentru a schimba Èablonul, clic pe Particularizare.", + LTEXT "Particularizarea configuraÈiilor de tastaturÄ.", IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "Particularizare", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 + PUSHBUTTON "&ConfigureazÄ", IDC_CUSTOMLAYOUT, 240, 122, 60, 14 END @@ -110,7 +109,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 - LTEXT "DatÄ Èi timp:", IDC_STATIC, 53, 7, 253, 8 + LTEXT "DatÄ Èi orÄ:", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", @@ -118,7 +117,7 @@ LTEXT "Fus orar:", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - AUTOCHECKBOX "Ajustare automatÄ ceas la schimbarea de fus orar", + AUTOCHECKBOX "Ajustare automatÄ de orÄ la schimbarea de fus orar", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END @@ -141,9 +140,9 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Terminare Expert instalare ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "AÈi terminat cu succes instalarea ReactOS.\n\nDupÄ ce veÈi apÄsa TerminÄ computerul va reporni.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Instalarea ReactOS a fost finalizatÄ cu succes.\nDupÄ apasarea TerminÄ calculatorul va reporni.", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "DacÄ aveÈi un CD introdus Ã®n computer, scoateÈi-l. Pentru a reporni computerul, clic pe TerminÄ.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "DacÄ aveÈi vreun CD introdus Ã®n calculator, scoateÈi-l. Pentru a reporni calculatorul, clic pe TerminÄ.", IDC_STATIC, 115, 169, 195, 17 END @@ -154,7 +153,7 @@ BEGIN EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL - DEFPUSHBUTTON "OK",IDOK,141,209,50,14 + DEFPUSHBUTTON "Ã&nchide",IDOK,141,209,50,14 END @@ -169,17 +168,17 @@ STRINGTABLE BEGIN - IDS_ACKTITLE "Aducere-aminte" - IDS_ACKSUBTITLE "Cine a contribuit la ReactOS Èi informaÈii despre licenÈÄ" - IDS_OWNERTITLE "PersonalizaÈi" - IDS_OWNERSUBTITLE "Expertul foloseÈte informaÈii despre dvs pentru a personaliza ReactOS." - IDS_COMPUTERTITLE "Nume computer Èi parolÄ administrator" - IDS_COMPUTERSUBTITLE "Trebuie sÄ introduceÈi un nume Èi o parolÄ de administrator pentru computer." - IDS_LOCALETITLE "SetÄri regionale" - IDS_LOCALESUBTITLE "PuteÈi particulariza ReactOS pentru diferite regiuni sau limbi." - IDS_DATETIMETITLE "DatÄ Èi timp" - IDS_DATETIMESUBTITLE "SetaÈi data corectÄ pentru computer." - IDS_PROCESSTITLE "Ãnregistrare componente" + IDS_ACKTITLE "ConÈtientizÄri" + IDS_ACKSUBTITLE "ContribuÈii aduse Èi informaÈii despre licenÈÄ" + IDS_OWNERTITLE "Personalizare" + IDS_OWNERSUBTITLE "Expertul va folosi cÃ¢teva informaÈii pentru a personaliza ReactOS." + IDS_COMPUTERTITLE "Nume calculator Èi parolÄ administrator" + IDS_COMPUTERSUBTITLE "Pentru calculator sunt necesare un nume Èi o parolÄ de administrator." + IDS_LOCALETITLE "ParticularizÄri regionale" + IDS_LOCALESUBTITLE "Particularizarea ReactOS pentru anumite regiuni sau limbi." + IDS_DATETIMETITLE "DatÄ Èi orÄ" + IDS_DATETIMESUBTITLE "StabiliÈi data Èi ora corectÄ pentru calculator." + IDS_PROCESSTITLE "Ãnregistrarea componentelor" IDS_PROCESSSUBTITLE "VÄ rugÄm aÈteptaÈi..." END @@ -191,35 +190,35 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accesorii" - IDS_CMT_CALC "Lansare Calculator" - IDS_CMT_CMD "Pornire linie de comandÄ" - IDS_CMT_DEVMGMT "Pornire Gestionarul de dispozitive" - IDS_CMT_EVENTVIEW "Pornire Vizualizator de evenimente" - IDS_CMT_EXPLORER "Pornire Explorer" - IDS_CMT_MSCONFIG "Pornire Programul de configurare sistem" - IDS_CMT_NOTEPAD "Pornire Editor de text" - IDS_CMT_RDESKTOP "Pornire Remote Desktop" - IDS_CMT_REGEDIT "Pornire Editor de registri" - IDS_CMT_SCREENSHOT "Efectuare capturÄ de ecran" - IDS_CMT_SERVMAN "Pornire Gestionar de servicii" - IDS_CMT_WORDPAD "Pornire Editor de documente" - IDS_CMT_PAINT "Pornire Paint" + IDS_CMT_CALC "Deschide aplicaÈia Calculator" + IDS_CMT_CMD "Deschide linia de comandÄ" + IDS_CMT_DEVMGMT "Deschide gestionarul de dispozitive" + IDS_CMT_EVENTVIEW "Deschide gestionarul de evenimente" + IDS_CMT_EXPLORER "Deschide exploratorul ReactOS" + IDS_CMT_MSCONFIG "Deschide configuratorul de sistem" + IDS_CMT_NOTEPAD "Deschide carneÈel" + IDS_CMT_RDESKTOP "Deschide birou la distanÈÄ" + IDS_CMT_REGEDIT "Deschide editor de registru" + IDS_CMT_SCREENSHOT "ExecutÄ capturÄ de ecran" + IDS_CMT_SERVMAN "Deschide gestionarul de servicii" + IDS_CMT_WORDPAD "Deschide editorul de documente" + IDS_CMT_PAINT "Deschide Pictare" END STRINGTABLE BEGIN IDS_GAMES "Jocuri" - IDS_CMT_SOLITAIRE "Solitaire" - IDS_CMT_WINEMINE "WineMine" - IDS_CMT_SPIDER "Spider Solitaire" -END - -STRINGTABLE -BEGIN - IDS_SYS_TOOLS "Unelte de sistem" - IDS_CMT_CHARMAP "Tabel caractere" - IDS_CMT_DXDIAG "Pornire program de diagnostic React-X" - IDS_CMT_KBSWITCH "Comutator de Èablon tastaturÄ" + IDS_CMT_SOLITAIRE "PasienÈÄ" + IDS_CMT_WINEMINE "Genist" + IDS_CMT_SPIDER "PasienÈÄ âpÄianjenâ" +END + +STRINGTABLE +BEGIN + IDS_SYS_TOOLS "Instrumente de sistem" + IDS_CMT_CHARMAP "Deschide harta caracterelor" + IDS_CMT_DXDIAG "Deschide aplicaÈia de diagnostic React-X" + IDS_CMT_KBSWITCH "Comutatorul configuraÈiilor de tastaturÄ" END STRINGTABLE @@ -231,9 +230,9 @@ STRINGTABLE BEGIN IDS_SYS_ENTERTAINMENT "DistracÈie" - IDS_CMT_MPLAY32 "Pornire Player Multimedia" - IDS_CMT_SNDVOL32 "Pornire Control Volum" - IDS_CMT_SNDREC32 "Launch Sound Recorder" + IDS_CMT_MPLAY32 "Deschide lectorul multimedia" + IDS_CMT_SNDVOL32 "Deschide reglajele de volum" + IDS_CMT_SNDREC32 "Deschide Ã®nregistratorul audio" END STRINGTABLE @@ -252,43 +251,43 @@ STRINGTABLE BEGIN IDS_SHORT_CALC "Calculator.lnk" - IDS_SHORT_CHARMAP "HartÄ caractere.lnk" - IDS_SHORT_CMD "Linie comandÄ.lnk" - IDS_SHORT_DEVICE "Gestionar dispozitive.lnk" - IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" + IDS_SHORT_CHARMAP "Harta caracterelor.lnk" + IDS_SHORT_CMD "Linie de comandÄ.lnk" + IDS_SHORT_DEVICE "Gestionar de dispozitive.lnk" + IDS_SHORT_DOWNLOADER "Gestionar de aplicaÈii.lnk" IDS_SHORT_DXDIAG "Diagnostic ReactX.lnk" - IDS_SHORT_EVENTVIEW "Vizualizator evenimente.lnk" - IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" - IDS_SHORT_KBSWITCH "Comutator Èablon tastaturÄ.lnk" + IDS_SHORT_EVENTVIEW "Gestionar de evenimente.lnk" + IDS_SHORT_EXPLORER "Explorator ReactOS.lnk" + IDS_SHORT_KBSWITCH "Comutator configuraÈii de tastaturÄ.lnk" IDS_SHORT_MAGNIFY "LupÄ.lnk" - IDS_SHORT_MPLAY32 "Player Multimedia.lnk" - IDS_SHORT_MSCONFIG "Configurare sistem.lnk" + IDS_SHORT_MPLAY32 "Lector multimedia.lnk" + IDS_SHORT_MSCONFIG "Configurator de sistem.lnk" IDS_SHORT_NOTEPAD "CarneÈel.lnk" - IDS_SHORT_RDESKTOP "Remote Desktop.lnk" - IDS_SHORT_REGEDIT "Editor de registrii.lnk" + IDS_SHORT_RDESKTOP "Birou la distanÈÄ.lnk" + IDS_SHORT_REGEDIT "Editor de registru.lnk" IDS_SHORT_SERVICE "Gestionar de servicii.lnk" IDS_SHORT_SNAP "CapturÄ de ecran.lnk" - IDS_SHORT_SNDVOL32 "Control volum.lnk" - IDS_SHORT_SNDREC32 "Audiorecorder.lnk" - IDS_SHORT_SOLITAIRE "Solitaire.lnk" - IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_WORDPAD "WordPad.lnk" - IDS_SHORT_PAINT "Paint.lnk" - IDS_SHORT_SPIDER "Spider Solitaire.lnk" -END - -STRINGTABLE -BEGIN - IDS_WZD_NAME "Expertul nu poate continua pÃ¢nÄ cÃ¢nd nu scrieÈi un nume." - IDS_WZD_SETCOMPUTERNAME "Expertul nu a putut seta numele computerului." - IDS_WZD_COMPUTERNAME "Expertul nu poate continua pÃ¢nÄ cÃ¢nd nu scrieÈi un nume pentru computer." - IDS_WZD_PASSWORDEMPTY "Trebuie sÄ scrieÈi o parolÄ !" - IDS_WZD_PASSWORDMATCH "Parolele scrise nu se potrivesc. VÄ rugÄm rescrieÈi parola doritÄ Èi reÃ®ncercaÈi." - IDS_WZD_PASSWORDCHAR "Parola introdusÄ de dumneavoastrÄ conÈine caractere invalide. RescrieÈi parola Èi reÃ®ncercaÈi." - IDS_WZD_LOCALTIME "Expertul nu a putut seta ora localÄ." -END - -STRINGTABLE -BEGIN - IDS_STATUS_INSTALL_DEV "Instalare dispozitive..." -END + IDS_SHORT_SNDVOL32 "Reglaj de volum.lnk" + IDS_SHORT_SNDREC32 "Ãnregistrator audio.lnk" + IDS_SHORT_SOLITAIRE "PasienÈÄ.lnk" + IDS_SHORT_WINEMINE "Genist.lnk" + IDS_SHORT_WORDPAD "Editor de documente.lnk" + IDS_SHORT_PAINT "Pictare.lnk" + IDS_SHORT_SPIDER "PasienÈÄ âpÄianjenâ.lnk" +END + +STRINGTABLE +BEGIN + IDS_WZD_NAME "Expertul nu poate continua pÃ¢nÄ nu scrieÈi un nume." + IDS_WZD_SETCOMPUTERNAME "Expertul poate da calculatorului acest nume." + IDS_WZD_COMPUTERNAME "Expertul nu poate continua pÃ¢nÄ nu introduceÈi un nume pentru calculator." + IDS_WZD_PASSWORDEMPTY "Trebuie sÄ introduceÈi o parolÄ!" + IDS_WZD_PASSWORDMATCH "Mostrele pentru parolÄ nu se potrivesc. VÄ rugÄm Ã®ncercaÈi reintroducerea parolei." + IDS_WZD_PASSWORDCHAR "Parola introdusÄ de dumneavoastrÄ conÈine caractere invalide. Ã®ncercaÈi rescrierea parolei." + IDS_WZD_LOCALTIME "Expertul nu a putut stabili ora localÄ." +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Instalarea dispozitivelor..." +END

13 years, 3 months

[cmihail] 53538: [shell32.dll] [FORMATTING] - Don't use tabs, use spaces.

by cmihail＠svn.reactos.org

Author: cmihail Date: Sat Sep 3 00:13:22 2011 New Revision: 53538 URL: http://svn.reactos.org/svn/reactos?rev=53538&view=rev Log: [shell32.dll] [FORMATTING] - Don't use tabs, use spaces. Modified: branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Sat Sep 3 00:13:22 2011 @@ -102,7 +102,7 @@ argc++; /* skip the remaining spaces */ while (*cs==0x0009 || *cs==0x0020) - { + { cs++; } if (*cs==0) @@ -133,10 +133,10 @@ */ argv = (LPWSTR *)LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(wcslen(lpCmdline)+1)*sizeof(WCHAR)); - if (!argv) + if (!argv) return NULL; - cmdline=(LPWSTR)(argv+argc); + cmdline=(LPWSTR)(argv+argc); wcscpy(cmdline, lpCmdline); argc=0; @@ -242,17 +242,17 @@ SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET ); ReadFile( hfile, magic, sizeof(magic), &len, NULL ); - if ( *(DWORD*)magic == IMAGE_NT_SIGNATURE ) + if ( *(DWORD*)magic == IMAGE_NT_SIGNATURE ) { SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET ); ReadFile( hfile, &nt, sizeof(nt), &len, NULL ); CloseHandle( hfile ); - /* DLL files are not executable and should return 0 */ + /* DLL files are not executable and should return 0 */ if (nt.FileHeader.Characteristics & IMAGE_FILE_DLL) return 0; - if (nt.OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) + if (nt.OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { return IMAGE_NT_SIGNATURE | (nt.OptionalHeader.MajorSubsystemVersion << 24) | @@ -267,7 +267,7 @@ ReadFile( hfile, &ne, sizeof(ne), &len, NULL ); CloseHandle( hfile ); - if (ne.ne_exetyp == 2) + if (ne.ne_exetyp == 2) return IMAGE_OS2_SIGNATURE | (ne.ne_expver << 16); return 0; } @@ -276,7 +276,7 @@ } /************************************************************************* - * SHELL_IsShortcut [internal] + * SHELL_IsShortcut [internal] * * Decide if an item id list points to a shell shortcut */ @@ -319,8 +319,8 @@ int iIndex; DWORD_PTR ret = TRUE; DWORD dwAttributes = 0; - CComPtr<IShellFolder> psfParent; - CComPtr<IExtractIconW> pei; + CComPtr<IShellFolder> psfParent; + CComPtr<IExtractIconW> pei; LPITEMIDLIST pidlLast = NULL, pidl = NULL; HRESULT hr = S_OK; BOOL IconNotYetLoaded=TRUE; @@ -333,7 +333,7 @@ if ( (flags & SHGFI_USEFILEATTRIBUTES) && (flags & (SHGFI_ATTRIBUTES|SHGFI_EXETYPE|SHGFI_PIDL))) return FALSE; - if (!path) + if (!path) return FALSE; /* windows initializes these values regardless of the flags */ @@ -412,8 +412,8 @@ { psfi->dwAttributes = 0xffffffff; } - if (psfParent != NULL) - psfParent->GetAttributesOf(1, (LPCITEMIDLIST*)&pidlLast, + if (psfParent != NULL) + psfParent->GetAttributesOf(1, (LPCITEMIDLIST*)&pidlLast, &(psfi->dwAttributes) ); } @@ -590,7 +590,7 @@ GetSystemMetrics( SM_CYICON), &psfi->hIcon, 0, 1, 0); - if (ret != 0 && ret != 0xFFFFFFFF) + if (ret != 0 && ret != 0xFFFFFFFF) { IconNotYetLoaded=FALSE; psfi->iIcon = icon_idx; @@ -857,49 +857,49 @@ switch (msg) { - case ABM_GETSTATE: - return ABS_ALWAYSONTOP | ABS_AUTOHIDE; - - case ABM_GETTASKBARPOS: - GetWindowRect(data->hWnd, &rec); - data->rc=rec; - return TRUE; - - case ABM_ACTIVATE: - SetActiveWindow(data->hWnd); - return TRUE; - - case ABM_GETAUTOHIDEBAR: - return 0; /* pretend there is no autohide bar */ - - case ABM_NEW: - /* cbSize, hWnd, and uCallbackMessage are used. All other ignored */ - SetWindowPos(data->hWnd,HWND_TOP,0,0,0,0,SWP_SHOWWINDOW|SWP_NOMOVE|SWP_NOSIZE); - return TRUE; - - case ABM_QUERYPOS: - GetWindowRect(data->hWnd, &(data->rc)); - return TRUE; - - case ABM_REMOVE: - FIXME("ABM_REMOVE broken\n"); - /* FIXME: this is wrong; should it be DestroyWindow instead? */ - /*CloseHandle(data->hWnd);*/ - return TRUE; - - case ABM_SETAUTOHIDEBAR: - SetWindowPos(data->hWnd,HWND_TOP,rec.left+1000,rec.top, - width,height,SWP_SHOWWINDOW); - return TRUE; - - case ABM_SETPOS: - data->uEdge=(ABE_RIGHT | ABE_LEFT); - SetWindowPos(data->hWnd,HWND_TOP,data->rc.left,data->rc.top, - width,height,SWP_SHOWWINDOW); - return TRUE; - - case ABM_WINDOWPOSCHANGED: - return TRUE; + case ABM_GETSTATE: + return ABS_ALWAYSONTOP | ABS_AUTOHIDE; + + case ABM_GETTASKBARPOS: + GetWindowRect(data->hWnd, &rec); + data->rc=rec; + return TRUE; + + case ABM_ACTIVATE: + SetActiveWindow(data->hWnd); + return TRUE; + + case ABM_GETAUTOHIDEBAR: + return 0; /* pretend there is no autohide bar */ + + case ABM_NEW: + /* cbSize, hWnd, and uCallbackMessage are used. All other ignored */ + SetWindowPos(data->hWnd,HWND_TOP,0,0,0,0,SWP_SHOWWINDOW|SWP_NOMOVE|SWP_NOSIZE); + return TRUE; + + case ABM_QUERYPOS: + GetWindowRect(data->hWnd, &(data->rc)); + return TRUE; + + case ABM_REMOVE: + FIXME("ABM_REMOVE broken\n"); + /* FIXME: this is wrong; should it be DestroyWindow instead? */ + /*CloseHandle(data->hWnd);*/ + return TRUE; + + case ABM_SETAUTOHIDEBAR: + SetWindowPos(data->hWnd,HWND_TOP,rec.left+1000,rec.top, + width,height,SWP_SHOWWINDOW); + return TRUE; + + case ABM_SETPOS: + data->uEdge=(ABE_RIGHT | ABE_LEFT); + SetWindowPos(data->hWnd,HWND_TOP,data->rc.left,data->rc.top, + width,height,SWP_SHOWWINDOW); + return TRUE; + + case ABM_WINDOWPOSCHANGED: + return TRUE; } return FALSE; @@ -932,7 +932,7 @@ */ EXTERN_C HRESULT WINAPI SHLoadInProc (REFCLSID rclsid) { - CComPtr<IUnknown> ptr; + CComPtr<IUnknown> ptr; TRACE("%s\n", debugstr_guid(&rclsid)); @@ -1095,8 +1095,8 @@ // We need the decimal point of the current locale to display the RAM size correctly if (GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, - szDecimalSeparator, - sizeof(szDecimalSeparator) / sizeof(WCHAR)) > 0) + szDecimalSeparator, + sizeof(szDecimalSeparator) / sizeof(WCHAR)) > 0) { UCHAR uDecimals; UINT uIntegral; @@ -1150,7 +1150,7 @@ }; break; case WM_COMMAND: - { + { switch(wParam) { case IDOK: @@ -1179,7 +1179,7 @@ return TRUE; } } - }; break; + }; break; case WM_CLOSE: EndDialog(hWnd, TRUE); @@ -1292,32 +1292,32 @@ OBJECT_ENTRY(CLSID_MenuBandSite, CMenuBandSite) END_OBJECT_MAP() -CShell32Module gModule; +CShell32Module gModule; /* static const struct { - REFIID riid; - LPFNCREATEINSTANCE lpfnCI; + REFIID riid; + LPFNCREATEINSTANCE lpfnCI; } InterfaceTable[] = { - {CLSID_ShellFSFolder, &IFSFolder_Constructor}, - {CLSID_MyComputer, &ISF_MyComputer_Constructor}, - {CLSID_ShellDesktop, &ISF_Desktop_Constructor}, - {CLSID_ShellItem, &IShellItem_Constructor}, - {CLSID_ShellLink, &IShellLink_Constructor}, - {CLSID_DragDropHelper, &IDropTargetHelper_Constructor}, - {CLSID_ControlPanel, &IControlPanel_Constructor}, - {CLSID_AutoComplete, &IAutoComplete_Constructor}, - {CLSID_MyDocuments, &ISF_MyDocuments_Constructor}, - {CLSID_NetworkPlaces, &ISF_NetworkPlaces_Constructor}, - {CLSID_FontsFolderShortcut, &ISF_Fonts_Constructor}, - {CLSID_Printers, &ISF_Printers_Constructor}, - {CLSID_AdminFolderShortcut, &ISF_AdminTools_Constructor}, - {CLSID_RecycleBin, &RecycleBin_Constructor}, - {CLSID_OpenWithMenu, &SHEOW_Constructor}, - {CLSID_NewMenu, &INewItem_Constructor}, - {CLSID_StartMenu, &StartMenu_Constructor}, - {CLSID_MenuBandSite, &MenuBandSite_Constructor}, + {CLSID_ShellFSFolder, &IFSFolder_Constructor}, + {CLSID_MyComputer, &ISF_MyComputer_Constructor}, + {CLSID_ShellDesktop, &ISF_Desktop_Constructor}, + {CLSID_ShellItem, &IShellItem_Constructor}, + {CLSID_ShellLink, &IShellLink_Constructor}, + {CLSID_DragDropHelper, &IDropTargetHelper_Constructor}, + {CLSID_ControlPanel, &IControlPanel_Constructor}, + {CLSID_AutoComplete, &IAutoComplete_Constructor}, + {CLSID_MyDocuments, &ISF_MyDocuments_Constructor}, + {CLSID_NetworkPlaces, &ISF_NetworkPlaces_Constructor}, + {CLSID_FontsFolderShortcut, &ISF_Fonts_Constructor}, + {CLSID_Printers, &ISF_Printers_Constructor}, + {CLSID_AdminFolderShortcut, &ISF_AdminTools_Constructor}, + {CLSID_RecycleBin, &RecycleBin_Constructor}, + {CLSID_OpenWithMenu, &SHEOW_Constructor}, + {CLSID_NewMenu, &INewItem_Constructor}, + {CLSID_StartMenu, &StartMenu_Constructor}, + {CLSID_MenuBandSite, &MenuBandSite_Constructor}, }; */ @@ -1380,7 +1380,7 @@ void *operator new (size_t, void *buf) { - return buf; + return buf; } /************************************************************************* @@ -1391,38 +1391,38 @@ */ STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad) { - TRACE("%p 0x%x %p\n", hInstance, dwReason, fImpLoad); - if (dwReason == DLL_PROCESS_ATTACH) - { - /* HACK - the global constructors don't run, so I placement new them here */ - new (&gModule) CShell32Module; - new (&_AtlWinModule) CAtlWinModule; - new (&_AtlBaseModule) CAtlBaseModule; - new (&_AtlComModule) CAtlComModule; - - shell32_hInstance = hInstance; - gModule.Init(ObjectMap, hInstance, NULL); - - DisableThreadLibraryCalls (hInstance); - - /* get full path to this DLL for IExtractIconW_fnGetIconLocation() */ - GetModuleFileNameW(hInstance, swShell32Name, MAX_PATH); - swShell32Name[MAX_PATH - 1] = '\0'; - - InitCommonControlsEx(NULL); - - SIC_Initialize(); - InitChangeNotifications(); - InitIconOverlays(); - } - else if (dwReason == DLL_PROCESS_DETACH) - { - shell32_hInstance = NULL; - SIC_Destroy(); - FreeChangeNotifications(); - gModule.Term(); - } - return TRUE; + TRACE("%p 0x%x %p\n", hInstance, dwReason, fImpLoad); + if (dwReason == DLL_PROCESS_ATTACH) + { + /* HACK - the global constructors don't run, so I placement new them here */ + new (&gModule) CShell32Module; + new (&_AtlWinModule) CAtlWinModule; + new (&_AtlBaseModule) CAtlBaseModule; + new (&_AtlComModule) CAtlComModule; + + shell32_hInstance = hInstance; + gModule.Init(ObjectMap, hInstance, NULL); + + DisableThreadLibraryCalls (hInstance); + + /* get full path to this DLL for IExtractIconW_fnGetIconLocation() */ + GetModuleFileNameW(hInstance, swShell32Name, MAX_PATH); + swShell32Name[MAX_PATH - 1] = '\0'; + + InitCommonControlsEx(NULL); + + SIC_Initialize(); + InitChangeNotifications(); + InitIconOverlays(); + } + else if (dwReason == DLL_PROCESS_DETACH) + { + shell32_hInstance = NULL; + SIC_Destroy(); + FreeChangeNotifications(); + gModule.Term(); + } + return TRUE; } /*********************************************************************** @@ -1430,7 +1430,7 @@ */ STDAPI DllCanUnloadNow() { - return gModule.DllCanUnloadNow(); + return gModule.DllCanUnloadNow(); } /************************************************************************* @@ -1439,13 +1439,13 @@ */ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - HRESULT hResult; - - TRACE("CLSID:%s,IID:%s\n", shdebugstr_guid(&rclsid), shdebugstr_guid(&riid)); - - hResult = gModule.DllGetClassObject(rclsid, riid, ppv); - TRACE("-- pointer to class factory: %p\n", *ppv); - return hResult; + HRESULT hResult; + + TRACE("CLSID:%s,IID:%s\n", shdebugstr_guid(&rclsid), shdebugstr_guid(&riid)); + + hResult = gModule.DllGetClassObject(rclsid, riid, ppv); + TRACE("-- pointer to class factory: %p\n", *ppv); + return hResult; } /*********************************************************************** @@ -1453,7 +1453,7 @@ */ STDAPI DllRegisterServer() { - return gModule.DllRegisterServer(FALSE); + return gModule.DllRegisterServer(FALSE); } /*********************************************************************** @@ -1461,7 +1461,7 @@ */ STDAPI DllUnregisterServer() { - return gModule.DllUnregisterServer(FALSE); + return gModule.DllUnregisterServer(FALSE); } /************************************************************************* Modified: branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Sat Sep 3 00:13:22 2011 @@ -145,7 +145,7 @@ SelectObject(hdc, hOldFont); EndPaint(hDlg, &ps); - return TRUE; + return TRUE; } static INT_PTR ConfirmMsgBox_Init(HWND hDlg, LPARAM lParam) @@ -224,89 +224,89 @@ { HINSTANCE hIconInstance; UINT icon_resource_id; - UINT caption_resource_id, text_resource_id; + UINT caption_resource_id, text_resource_id; } SHELL_ConfirmIDstruc; static BOOL SHELL_ConfirmIDs(int nKindOfDialog, SHELL_ConfirmIDstruc *ids) { ids->hIconInstance = shell32_hInstance; - switch (nKindOfDialog) - { - case ASK_DELETE_FILE: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_DELETEITEM_TEXT; - return TRUE; - - case ASK_DELETE_FOLDER: + switch (nKindOfDialog) + { + case ASK_DELETE_FILE: ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; - ids->text_resource_id = IDS_DELETEITEM_TEXT; - return TRUE; - - case ASK_DELETE_MULTIPLE_ITEM: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_DELETEMULTIPLE_TEXT; - return TRUE; - - case ASK_TRASH_FILE: - ids->icon_resource_id = IDI_SHELL_TRASH_FILE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_TRASHITEM_TEXT; - return TRUE; - - case ASK_TRASH_FOLDER: - ids->icon_resource_id = IDI_SHELL_TRASH_FILE; - ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; - ids->text_resource_id = IDS_TRASHFOLDER_TEXT; - return TRUE; - - case ASK_TRASH_MULTIPLE_ITEM: - ids->icon_resource_id = IDI_SHELL_TRASH_FILE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_TRASHMULTIPLE_TEXT; - return TRUE; - - case ASK_CANT_TRASH_ITEM: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_CANTTRASH_TEXT; - return TRUE; - - case ASK_DELETE_SELECTED: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_DELETESELECTED_TEXT; - return TRUE; - - case ASK_OVERWRITE_FILE: - ids->hIconInstance = NULL; - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; - ids->text_resource_id = IDS_OVERWRITEFILE_TEXT; - return TRUE; - - case ASK_OVERWRITE_FOLDER: - ids->hIconInstance = NULL; - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; - ids->text_resource_id = IDS_OVERWRITEFOLDER_TEXT; - return TRUE; - - default: - FIXME(" Unhandled nKindOfDialog %d stub\n", nKindOfDialog); - } - return FALSE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_DELETEITEM_TEXT; + return TRUE; + + case ASK_DELETE_FOLDER: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; + ids->text_resource_id = IDS_DELETEITEM_TEXT; + return TRUE; + + case ASK_DELETE_MULTIPLE_ITEM: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_DELETEMULTIPLE_TEXT; + return TRUE; + + case ASK_TRASH_FILE: + ids->icon_resource_id = IDI_SHELL_TRASH_FILE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_TRASHITEM_TEXT; + return TRUE; + + case ASK_TRASH_FOLDER: + ids->icon_resource_id = IDI_SHELL_TRASH_FILE; + ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; + ids->text_resource_id = IDS_TRASHFOLDER_TEXT; + return TRUE; + + case ASK_TRASH_MULTIPLE_ITEM: + ids->icon_resource_id = IDI_SHELL_TRASH_FILE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_TRASHMULTIPLE_TEXT; + return TRUE; + + case ASK_CANT_TRASH_ITEM: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_CANTTRASH_TEXT; + return TRUE; + + case ASK_DELETE_SELECTED: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_DELETESELECTED_TEXT; + return TRUE; + + case ASK_OVERWRITE_FILE: + ids->hIconInstance = NULL; + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; + ids->text_resource_id = IDS_OVERWRITEFILE_TEXT; + return TRUE; + + case ASK_OVERWRITE_FOLDER: + ids->hIconInstance = NULL; + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; + ids->text_resource_id = IDS_OVERWRITEFOLDER_TEXT; + return TRUE; + + default: + FIXME(" Unhandled nKindOfDialog %d stub\n", nKindOfDialog); + } + return FALSE; } static BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir, FILE_OPERATION *op) { - WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256]; - SHELL_ConfirmIDstruc ids; - DWORD_PTR args[1]; - HICON hIcon; - int ret; + WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256]; + SHELL_ConfirmIDstruc ids; + DWORD_PTR args[1]; + HICON hIcon; + int ret; DbgPrint("[shell32, SHELL_ConfirmDialogW] Called\n"); @@ -316,12 +316,12 @@ if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; - LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)/sizeof(WCHAR)); - LoadStringW(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)/sizeof(WCHAR)); - - args[0] = (DWORD_PTR)szDir; - FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)args); + LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)/sizeof(WCHAR)); + LoadStringW(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)/sizeof(WCHAR)); + + args[0] = (DWORD_PTR)szDir; + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, + szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)args); hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems); @@ -347,23 +347,23 @@ static DWORD SHELL32_AnsiToUnicodeBuf(LPCSTR aPath, LPWSTR *wPath, DWORD minChars) { - DWORD len = MultiByteToWideChar(CP_ACP, 0, aPath, -1, NULL, 0); - - if (len < minChars) - len = minChars; - - *wPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (*wPath) - { - MultiByteToWideChar(CP_ACP, 0, aPath, -1, *wPath, len); - return NO_ERROR; - } - return E_OUTOFMEMORY; + DWORD len = MultiByteToWideChar(CP_ACP, 0, aPath, -1, NULL, 0); + + if (len < minChars) + len = minChars; + + *wPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (*wPath) + { + MultiByteToWideChar(CP_ACP, 0, aPath, -1, *wPath, len); + return NO_ERROR; + } + return E_OUTOFMEMORY; } static void SHELL32_FreeUnicodeBuf(LPWSTR wPath) { - HeapFree(GetProcessHeap(), 0, wPath); + HeapFree(GetProcessHeap(), 0, wPath); } EXTERN_C HRESULT WINAPI SHIsFileAvailableOffline(LPCWSTR path, LPDWORD status) @@ -380,34 +380,34 @@ */ BOOL SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) { - BOOL ret = TRUE; - HANDLE hFind; - WIN32_FIND_DATAW wfd; - WCHAR szTemp[MAX_PATH]; - - /* Make sure the directory exists before eventually prompting the user */ - PathCombineW(szTemp, pszDir, wWildcardFile); - hFind = FindFirstFileW(szTemp, &wfd); - if (hFind == INVALID_HANDLE_VALUE) - return FALSE; - - if (!bShowUI || (ret = SHELL_ConfirmDialogW(hwnd, ASK_DELETE_FOLDER, pszDir, NULL))) - { - do - { - if (IsDotDir(wfd.cFileName)) - continue; - PathCombineW(szTemp, pszDir, wfd.cFileName); - if (FILE_ATTRIBUTE_DIRECTORY & wfd.dwFileAttributes) - ret = SHELL_DeleteDirectoryW(hwnd, szTemp, FALSE); - else - ret = (SHNotifyDeleteFileW(szTemp) == ERROR_SUCCESS); - } while (ret && FindNextFileW(hFind, &wfd)); - } - FindClose(hFind); - if (ret) - ret = (SHNotifyRemoveDirectoryW(pszDir) == ERROR_SUCCESS); - return ret; + BOOL ret = TRUE; + HANDLE hFind; + WIN32_FIND_DATAW wfd; + WCHAR szTemp[MAX_PATH]; + + /* Make sure the directory exists before eventually prompting the user */ + PathCombineW(szTemp, pszDir, wWildcardFile); + hFind = FindFirstFileW(szTemp, &wfd); + if (hFind == INVALID_HANDLE_VALUE) + return FALSE; + + if (!bShowUI || (ret = SHELL_ConfirmDialogW(hwnd, ASK_DELETE_FOLDER, pszDir, NULL))) + { + do + { + if (IsDotDir(wfd.cFileName)) + continue; + PathCombineW(szTemp, pszDir, wfd.cFileName); + if (FILE_ATTRIBUTE_DIRECTORY & wfd.dwFileAttributes) + ret = SHELL_DeleteDirectoryW(hwnd, szTemp, FALSE); + else + ret = (SHNotifyDeleteFileW(szTemp) == ERROR_SUCCESS); + } while (ret && FindNextFileW(hFind, &wfd)); + } + FindClose(hFind); + if (ret) + ret = (SHNotifyRemoveDirectoryW(pszDir) == ERROR_SUCCESS); + return ret; } /************************************************************************** @@ -424,21 +424,21 @@ static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec) { - TRACE("(%s, %p)\n", debugstr_w(path), sec); - - if (CreateDirectoryW(path, sec)) - { - SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW, path, NULL); - return ERROR_SUCCESS; - } - return GetLastError(); + TRACE("(%s, %p)\n", debugstr_w(path), sec); + + if (CreateDirectoryW(path, sec)) + { + SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW, path, NULL); + return ERROR_SUCCESS; + } + return GetLastError(); } /**********************************************************************/ EXTERN_C BOOL WINAPI Win32CreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec) { - return (SHNotifyCreateDirectoryW(path, sec) == ERROR_SUCCESS); + return (SHNotifyCreateDirectoryW(path, sec) == ERROR_SUCCESS); } /************************************************************************ @@ -454,31 +454,31 @@ */ static DWORD SHNotifyRemoveDirectoryW(LPCWSTR path) { - BOOL ret; - TRACE("(%s)\n", debugstr_w(path)); - - ret = RemoveDirectoryW(path); - if (!ret) - { - /* Directory may be write protected */ - DWORD dwAttr = GetFileAttributesW(path); - if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY)) - if (SetFileAttributesW(path, dwAttr & ~FILE_ATTRIBUTE_READONLY)) - ret = RemoveDirectoryW(path); - } - if (ret) - { - SHChangeNotify(SHCNE_RMDIR, SHCNF_PATHW, path, NULL); - return ERROR_SUCCESS; - } - return GetLastError(); + BOOL ret; + TRACE("(%s)\n", debugstr_w(path)); + + ret = RemoveDirectoryW(path); + if (!ret) + { + /* Directory may be write protected */ + DWORD dwAttr = GetFileAttributesW(path); + if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY)) + if (SetFileAttributesW(path, dwAttr & ~FILE_ATTRIBUTE_READONLY)) + ret = RemoveDirectoryW(path); + } + if (ret) + { + SHChangeNotify(SHCNE_RMDIR, SHCNF_PATHW, path, NULL); + return ERROR_SUCCESS; + } + return GetLastError(); } /***********************************************************************/ EXTERN_C BOOL WINAPI Win32RemoveDirectoryW(LPCWSTR path) { - return (SHNotifyRemoveDirectoryW(path) == ERROR_SUCCESS); + return (SHNotifyRemoveDirectoryW(path) == ERROR_SUCCESS); } /************************************************************************ @@ -494,32 +494,32 @@ */ static DWORD SHNotifyDeleteFileW(LPCWSTR path) { - BOOL ret; - - TRACE("(%s)\n", debugstr_w(path)); - - ret = DeleteFileW(path); - if (!ret) - { - /* File may be write protected or a system file */ - DWORD dwAttr = GetFileAttributesW(path); - if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)) - if (SetFileAttributesW(path, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))) - ret = DeleteFileW(path); - } - if (ret) - { - SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, path, NULL); - return ERROR_SUCCESS; - } - return GetLastError(); + BOOL ret; + + TRACE("(%s)\n", debugstr_w(path)); + + ret = DeleteFileW(path); + if (!ret) + { + /* File may be write protected or a system file */ + DWORD dwAttr = GetFileAttributesW(path); + if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)) + if (SetFileAttributesW(path, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))) + ret = DeleteFileW(path); + } + if (ret) + { + SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, path, NULL); + return ERROR_SUCCESS; + } + return GetLastError(); } /***********************************************************************/ EXTERN_C DWORD WINAPI Win32DeleteFileW(LPCWSTR path) { - return (SHNotifyDeleteFileW(path) == ERROR_SUCCESS); + return (SHNotifyDeleteFileW(path) == ERROR_SUCCESS); } /************************************************************************ @@ -536,9 +536,9 @@ */ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) { - BOOL ret; - - TRACE("(%s %s)\n", debugstr_w(src), debugstr_w(dest)); + BOOL ret; + + TRACE("(%s %s)\n", debugstr_w(src), debugstr_w(dest)); ret = MoveFileExW(src, dest, MOVEFILE_REPLACE_EXISTING); @@ -546,26 +546,26 @@ if (!ret) ret = MoveFileW(src, dest); - if (!ret) - { - DWORD dwAttr; - - dwAttr = SHFindAttrW(dest, FALSE); - if (INVALID_FILE_ATTRIBUTES == dwAttr) - { - /* Source file may be write protected or a system file */ - dwAttr = GetFileAttributesW(src); - if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)) - if (SetFileAttributesW(src, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))) - ret = MoveFileW(src, dest); - } - } - if (ret) - { - SHChangeNotify(SHCNE_RENAMEITEM, SHCNF_PATHW, src, dest); - return ERROR_SUCCESS; - } - return GetLastError(); + if (!ret) + { + DWORD dwAttr; + + dwAttr = SHFindAttrW(dest, FALSE); + if (INVALID_FILE_ATTRIBUTES == dwAttr) + { + /* Source file may be write protected or a system file */ + dwAttr = GetFileAttributesW(src); + if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)) + if (SetFileAttributesW(src, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))) + ret = MoveFileW(src, dest); + } + } + if (ret) + { + SHChangeNotify(SHCNE_RENAMEITEM, SHCNF_PATHW, src, dest); + return ERROR_SUCCESS; + } + return GetLastError(); } static DWORD WINAPI SHOperationProgressRoutine(LARGE_INTEGER TotalFileSize, LARGE_INTEGER TotalBytesTransferred, LARGE_INTEGER StreamSize, LARGE_INTEGER StreamBytesTransferred, DWORD dwStreamNumber, DWORD dwCallbackReason, HANDLE hSourceFile, HANDLE hDestinationFile, LPVOID lpData) @@ -641,52 +641,52 @@ switch(uMsg) { - case WM_INITDIALOG: - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)lParam); - - /* get context */ - Context = (FILE_OPERATION_CONTEXT*)lParam; - - /* store progress bar handle */ - Context->hDlgCtrl = GetDlgItem(hwndDlg, 14000); - - /* store window handle */ - Context->hwndDlg = hwndDlg; - - /* set progress bar range */ - (void)SendMessageW(Context->hDlgCtrl, (UINT) PBM_SETRANGE, 0, MAKELPARAM(0, 100)); - - /* start file queueing */ - SetTimer(hwndDlg, TIMER_ID, 1000, NULL); - //QueueFile(Context); - - return TRUE; - - case WM_CLOSE: - Context->op->bCancelled = TRUE; - EndDialog(hwndDlg, Context->op->bCancelled); - return TRUE; - - case WM_COMMAND: - if (LOWORD(wParam) == 14002) - { - Context->op->bCancelled = TRUE; - EndDialog(hwndDlg, Context->op->bCancelled); - return TRUE; - }; break; - - case WM_TIMER: - if (wParam == TIMER_ID) - { - QueueFile(Context); - KillTimer(hwndDlg, TIMER_ID); - }; break; - - case WM_FILE: - if (!QueueFile(Context)) - EndDialog(hwndDlg, Context->op->bCancelled); - default: - break; + case WM_INITDIALOG: + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)lParam); + + /* get context */ + Context = (FILE_OPERATION_CONTEXT*)lParam; + + /* store progress bar handle */ + Context->hDlgCtrl = GetDlgItem(hwndDlg, 14000); + + /* store window handle */ + Context->hwndDlg = hwndDlg; + + /* set progress bar range */ + (void)SendMessageW(Context->hDlgCtrl, (UINT) PBM_SETRANGE, 0, MAKELPARAM(0, 100)); + + /* start file queueing */ + SetTimer(hwndDlg, TIMER_ID, 1000, NULL); + //QueueFile(Context); + + return TRUE; + + case WM_CLOSE: + Context->op->bCancelled = TRUE; + EndDialog(hwndDlg, Context->op->bCancelled); + return TRUE; + + case WM_COMMAND: + if (LOWORD(wParam) == 14002) + { + Context->op->bCancelled = TRUE; + EndDialog(hwndDlg, Context->op->bCancelled); + return TRUE; + }; break; + + case WM_TIMER: + if (wParam == TIMER_ID) + { + QueueFile(Context); + KillTimer(hwndDlg, TIMER_ID); + }; break; + + case WM_FILE: + if (!QueueFile(Context)) + EndDialog(hwndDlg, Context->op->bCancelled); + default: + break; } return FALSE; } @@ -742,12 +742,12 @@ */ static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists) { - BOOL ret; - DWORD attribs; + BOOL ret; + DWORD attribs; DbgPrint("[shell32, SHNotifyCopyFileW] Called\n"); - TRACE("(%s %s %s)\n", debugstr_w(src), debugstr_w(dest), bFailIfExists ? "failIfExists" : ""); + TRACE("(%s %s %s)\n", debugstr_w(src), debugstr_w(dest), bFailIfExists ? "failIfExists" : ""); /* Destination file may already exist with read only attribute */ attribs = GetFileAttributesW(dest); @@ -764,14 +764,14 @@ } } - ret = CopyFileW(src, dest, bFailIfExists); - if (ret) - { - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, dest, NULL); - return ERROR_SUCCESS; - } - - return GetLastError(); + ret = CopyFileW(src, dest, bFailIfExists); + if (ret) + { + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, dest, NULL); + return ERROR_SUCCESS; + } + + return GetLastError(); } /************************************************************************* @@ -838,18 +838,18 @@ */ int WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES sec) { - LPWSTR wPath; - DWORD retCode; - - TRACE("(%s, %p)\n", debugstr_a(path), sec); - - retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); - if (!retCode) - { - retCode = SHCreateDirectoryExW(hWnd, wPath, sec); - SHELL32_FreeUnicodeBuf(wPath); - } - return retCode; + LPWSTR wPath; + DWORD retCode; + + TRACE("(%s, %p)\n", debugstr_a(path), sec); + + retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); + if (!retCode) + { + retCode = SHCreateDirectoryExW(hWnd, wPath, sec); + SHELL32_FreeUnicodeBuf(wPath); + } + return retCode; } /************************************************************************* @@ -859,50 +859,50 @@ */ int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES sec) { - int ret = ERROR_BAD_PATHNAME; - TRACE("(%p, %s, %p)\n", hWnd, debugstr_w(path), sec); - - if (PathIsRelativeW(path)) - { - SetLastError(ret); - } - else - { - ret = SHNotifyCreateDirectoryW(path, sec); - /* Refuse to work on certain error codes before trying to create directories recursively */ - if (ret != ERROR_SUCCESS && - ret != ERROR_FILE_EXISTS && - ret != ERROR_ALREADY_EXISTS && - ret != ERROR_FILENAME_EXCED_RANGE) - { - WCHAR *pEnd, *pSlash, szTemp[MAX_PATH + 1]; /* extra for PathAddBackslash() */ - - lstrcpynW(szTemp, path, MAX_PATH); - pEnd = PathAddBackslashW(szTemp); - pSlash = szTemp + 3; - - while (*pSlash) - { - while (*pSlash && *pSlash != '\\') pSlash++; - if (*pSlash) - { - *pSlash = 0; /* terminate path at separator */ - - ret = SHNotifyCreateDirectoryW(szTemp, pSlash + 1 == pEnd ? sec : NULL); - } - *pSlash++ = '\\'; /* put the separator back */ - } - } - - if (ret && hWnd && (ERROR_CANCELLED != ret)) - { - /* We failed and should show a dialog box */ - FIXME("Show system error message, creating path %s, failed with error %d\n", debugstr_w(path), ret); - ret = ERROR_CANCELLED; /* Error has been already presented to user (not really yet!) */ - } - } - - return ret; + int ret = ERROR_BAD_PATHNAME; + TRACE("(%p, %s, %p)\n", hWnd, debugstr_w(path), sec); + + if (PathIsRelativeW(path)) + { + SetLastError(ret); + } + else + { + ret = SHNotifyCreateDirectoryW(path, sec); + /* Refuse to work on certain error codes before trying to create directories recursively */ + if (ret != ERROR_SUCCESS && + ret != ERROR_FILE_EXISTS && + ret != ERROR_ALREADY_EXISTS && + ret != ERROR_FILENAME_EXCED_RANGE) + { + WCHAR *pEnd, *pSlash, szTemp[MAX_PATH + 1]; /* extra for PathAddBackslash() */ + + lstrcpynW(szTemp, path, MAX_PATH); + pEnd = PathAddBackslashW(szTemp); + pSlash = szTemp + 3; + + while (*pSlash) + { + while (*pSlash && *pSlash != '\\') pSlash++; + if (*pSlash) + { + *pSlash = 0; /* terminate path at separator */ + + ret = SHNotifyCreateDirectoryW(szTemp, pSlash + 1 == pEnd ? sec : NULL); + } + *pSlash++ = '\\'; /* put the separator back */ + } + } + + if (ret && hWnd && (ERROR_CANCELLED != ret)) + { + /* We failed and should show a dialog box */ + FIXME("Show system error message, creating path %s, failed with error %d\n", debugstr_w(path), ret); + ret = ERROR_CANCELLED; /* Error has been already presented to user (not really yet!) */ + } + } + + return ret; } /************************************************************************* @@ -922,25 +922,25 @@ */ static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly) { - WIN32_FIND_DATAW wfd; - BOOL b_FileMask = fileOnly && (NULL != StrPBrkW(pName, wWildcardChars)); - DWORD dwAttr = INVALID_FILE_ATTRIBUTES; - HANDLE hFind = FindFirstFileW(pName, &wfd); - - TRACE("%s %d\n", debugstr_w(pName), fileOnly); - if (INVALID_HANDLE_VALUE != hFind) - { - do - { - if (b_FileMask && IsAttribDir(wfd.dwFileAttributes)) - continue; - dwAttr = wfd.dwFileAttributes; - break; - } while (FindNextFileW(hFind, &wfd)); - - FindClose(hFind); - } - return dwAttr; + WIN32_FIND_DATAW wfd; + BOOL b_FileMask = fileOnly && (NULL != StrPBrkW(pName, wWildcardChars)); + DWORD dwAttr = INVALID_FILE_ATTRIBUTES; + HANDLE hFind = FindFirstFileW(pName, &wfd); + + TRACE("%s %d\n", debugstr_w(pName), fileOnly); + if (INVALID_HANDLE_VALUE != hFind) + { + do + { + if (b_FileMask && IsAttribDir(wfd.dwFileAttributes)) + continue; + dwAttr = wfd.dwFileAttributes; + break; + } while (FindNextFileW(hFind, &wfd)); + + FindClose(hFind); + } + return dwAttr; } /************************************************************************* @@ -954,28 +954,28 @@ */ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more) { - DWORD size = 0, aSize = 0; - LPCSTR aString = (LPCSTR)*pWToFrom; - - if (aString) - { - do - { - size = lstrlenA(aString) + 1; - aSize += size; - aString += size; - } while ((size != 1) && more); - - /* The two sizes might be different in the case of multibyte chars */ - size = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, 0); - if (*wString) /* only in the second loop */ - { - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, size); - *pWToFrom = *wString; - *wString += size; - } - } - return size; + DWORD size = 0, aSize = 0; + LPCSTR aString = (LPCSTR)*pWToFrom; + + if (aString) + { + do + { + size = lstrlenA(aString) + 1; + aSize += size; + aString += size; + } while ((size != 1) && more); + + /* The two sizes might be different in the case of multibyte chars */ + size = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, 0); + if (*wString) /* only in the second loop */ + { + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, size); + *pWToFrom = *wString; + *wString += size; + } + } + return size; } /************************************************************************* * SHFileOperationA [SHELL32.@] @@ -995,43 +995,43 @@ */ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) { - SHFILEOPSTRUCTW nFileOp = *((LPSHFILEOPSTRUCTW)lpFileOp); - int retCode = 0; - DWORD size; - LPWSTR ForFree = NULL, /* we change wString in SHNameTranslate and can't use it for freeing */ - wString = NULL; /* we change this in SHNameTranslate */ - - TRACE("\n"); - if (FO_DELETE == (nFileOp.wFunc & FO_MASK)) - nFileOp.pTo = NULL; /* we need a NULL or a valid pointer for translation */ - if (!(nFileOp.fFlags & FOF_SIMPLEPROGRESS)) - nFileOp.lpszProgressTitle = NULL; /* we need a NULL or a valid pointer for translation */ - while (1) /* every loop calculate size, second translate also, if we have storage for this */ - { - size = SHNameTranslate(&wString, &nFileOp.lpszProgressTitle, FALSE); /* no loop */ - size += SHNameTranslate(&wString, &nFileOp.pFrom, TRUE); /* internal loop */ - size += SHNameTranslate(&wString, &nFileOp.pTo, TRUE); /* internal loop */ - - if (ForFree) - { - retCode = SHFileOperationW(&nFileOp); - HeapFree(GetProcessHeap(), 0, ForFree); /* we cannot use wString, it was changed */ - break; - } - else - { - wString = ForFree = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (ForFree) continue; - retCode = ERROR_OUTOFMEMORY; - nFileOp.fAnyOperationsAborted = TRUE; - SetLastError(retCode); - return retCode; - } - } - - lpFileOp->hNameMappings = nFileOp.hNameMappings; - lpFileOp->fAnyOperationsAborted = nFileOp.fAnyOperationsAborted; - return retCode; + SHFILEOPSTRUCTW nFileOp = *((LPSHFILEOPSTRUCTW)lpFileOp); + int retCode = 0; + DWORD size; + LPWSTR ForFree = NULL, /* we change wString in SHNameTranslate and can't use it for freeing */ + wString = NULL; /* we change this in SHNameTranslate */ + + TRACE("\n"); + if (FO_DELETE == (nFileOp.wFunc & FO_MASK)) + nFileOp.pTo = NULL; /* we need a NULL or a valid pointer for translation */ + if (!(nFileOp.fFlags & FOF_SIMPLEPROGRESS)) + nFileOp.lpszProgressTitle = NULL; /* we need a NULL or a valid pointer for translation */ + while (1) /* every loop calculate size, second translate also, if we have storage for this */ + { + size = SHNameTranslate(&wString, &nFileOp.lpszProgressTitle, FALSE); /* no loop */ + size += SHNameTranslate(&wString, &nFileOp.pFrom, TRUE); /* internal loop */ + size += SHNameTranslate(&wString, &nFileOp.pTo, TRUE); /* internal loop */ + + if (ForFree) + { + retCode = SHFileOperationW(&nFileOp); + HeapFree(GetProcessHeap(), 0, ForFree); /* we cannot use wString, it was changed */ + break; + } + else + { + wString = ForFree = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (ForFree) continue; + retCode = ERROR_OUTOFMEMORY; + nFileOp.fAnyOperationsAborted = TRUE; + SetLastError(retCode); + return retCode; + } + } + + lpFileOp->hNameMappings = nFileOp.hNameMappings; + lpFileOp->fAnyOperationsAborted = nFileOp.fAnyOperationsAborted; + return retCode; } static void __inline grow_list(FILE_LIST *list) @@ -1097,21 +1097,21 @@ for (res = TRUE; res; res = FindNextFileW(hFile, &wfd)) { if (IsDotDir(wfd.cFileName)) - continue; + continue; if (*pdwListIndex >= flList->num_alloc) - grow_list( flList ); + grow_list( flList ); - szFullPath = wildcard_to_file(szFile, wfd.cFileName); + szFullPath = wildcard_to_file(szFile, wfd.cFileName); file = &flList->feFiles[(*pdwListIndex)++]; add_file_to_entry(file, szFullPath); file->bFromWildcard = TRUE; file->attributes = wfd.dwFileAttributes; - if (IsAttribDir(file->attributes)) - flList->bAnyDirectories = TRUE; + if (IsAttribDir(file->attributes)) + flList->bAnyDirectories = TRUE; - HeapFree(GetProcessHeap(), 0, szFullPath); + HeapFree(GetProcessHeap(), 0, szFullPath); } FindClose(hFile); @@ -1221,7 +1221,7 @@ lstrcpyW(szTo, szDestPath); if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) - { + { if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FOLDER, feFrom->szFilename, op)) { /* Vista returns an ERROR_CANCELLED even if user pressed "No" */ @@ -1711,19 +1711,19 @@ */ void WINAPI SHFreeNameMappings(HANDLE hNameMapping) { - if (hNameMapping) - { - int i = SHDSA_GetItemCount((HDSA)hNameMapping) - 1; - - for (; i>= 0; i--) - { - LPSHNAMEMAPPINGW lp = (SHNAMEMAPPINGW *)DSA_GetItemPtr((HDSA)hNameMapping, i); - - SHFree(lp->pszOldPath); - SHFree(lp->pszNewPath); - } - DSA_Destroy((HDSA)hNameMapping); - } + if (hNameMapping) + { + int i = SHDSA_GetItemCount((HDSA)hNameMapping) - 1; + + for (; i>= 0; i--) + { + LPSHNAMEMAPPINGW lp = (SHNAMEMAPPINGW *)DSA_GetItemPtr((HDSA)hNameMapping, i); + + SHFree(lp->pszOldPath); + SHFree(lp->pszNewPath); + } + DSA_Destroy((HDSA)hNameMapping); + } } /************************************************************************* @@ -1779,7 +1779,7 @@ /* change current directory to the specified drive */ if (drive) - { + { strcpy(drv_path, "A:"); drv_path[0] += (char)drive-1; @@ -1830,14 +1830,14 @@ } /************************************************************************* - * IsNetDrive [SHELL32.66] + * IsNetDrive [SHELL32.66] */ EXTERN_C int WINAPI IsNetDrive(int drive) { - char root[4]; - strcpy(root, "A:\\"); - root[0] += (char)drive; - return (GetDriveTypeA(root) == DRIVE_REMOTE); + char root[4]; + strcpy(root, "A:\\"); + root[0] += (char)drive; + return (GetDriveTypeA(root) == DRIVE_REMOTE); } @@ -1856,7 +1856,7 @@ */ EXTERN_C HRESULT WINAPI SHPathPrepareForWriteW(HWND hwnd, IUnknown *modless, LPCWSTR path, DWORD flags) { - DWORD res; + DWORD res; DWORD err; LPCWSTR realpath; int len;

13 years, 3 months

[cmihail] 53537: [shell32.dll] [FORMATTING] - Format the code to a more acceptable level. This is just for my sanity while sifting through it.

by cmihail＠svn.reactos.org

Author: cmihail Date: Sat Sep 3 00:08:11 2011 New Revision: 53537 URL: http://svn.reactos.org/svn/reactos?rev=53537&view=rev Log: [shell32.dll] [FORMATTING] - Format the code to a more acceptable level. This is just for my sanity while sifting through it. Modified: branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Sat Sep 3 00:08:11 2011 @@ -101,7 +101,8 @@ /* space */ argc++; /* skip the remaining spaces */ - while (*cs==0x0009 || *cs==0x0020) { + while (*cs==0x0009 || *cs==0x0020) + { cs++; } if (*cs==0) @@ -131,9 +132,11 @@ * This way the caller can make a single GlobalFree call to free both, as per MSDN. */ argv = (LPWSTR *)LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(wcslen(lpCmdline)+1)*sizeof(WCHAR)); - if (!argv) + + if (!argv) return NULL; - cmdline=(LPWSTR)(argv+argc); + + cmdline=(LPWSTR)(argv+argc); wcscpy(cmdline, lpCmdline); argc=0; @@ -238,15 +241,18 @@ SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET ); ReadFile( hfile, magic, sizeof(magic), &len, NULL ); - if ( *(DWORD*)magic == IMAGE_NT_SIGNATURE ) + + if ( *(DWORD*)magic == IMAGE_NT_SIGNATURE ) { SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET ); ReadFile( hfile, &nt, sizeof(nt), &len, NULL ); CloseHandle( hfile ); - /* DLL files are not executable and should return 0 */ + + /* DLL files are not executable and should return 0 */ if (nt.FileHeader.Characteristics & IMAGE_FILE_DLL) return 0; - if (nt.OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) + + if (nt.OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { return IMAGE_NT_SIGNATURE | (nt.OptionalHeader.MajorSubsystemVersion << 24) | @@ -260,7 +266,8 @@ SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET ); ReadFile( hfile, &ne, sizeof(ne), &len, NULL ); CloseHandle( hfile ); - if (ne.ne_exetyp == 2) + + if (ne.ne_exetyp == 2) return IMAGE_OS2_SIGNATURE | (ne.ne_expver << 16); return 0; } @@ -582,7 +589,8 @@ GetSystemMetrics( SM_CXICON), GetSystemMetrics( SM_CYICON), &psfi->hIcon, 0, 1, 0); - if (ret != 0 && ret != 0xFFFFFFFF) + + if (ret != 0 && ret != 0xFFFFFFFF) { IconNotYetLoaded=FALSE; psfi->iIcon = icon_idx; @@ -849,41 +857,51 @@ switch (msg) { - case ABM_GETSTATE: - return ABS_ALWAYSONTOP | ABS_AUTOHIDE; - case ABM_GETTASKBARPOS: - GetWindowRect(data->hWnd, &rec); - data->rc=rec; - return TRUE; - case ABM_ACTIVATE: - SetActiveWindow(data->hWnd); - return TRUE; - case ABM_GETAUTOHIDEBAR: - return 0; /* pretend there is no autohide bar */ - case ABM_NEW: - /* cbSize, hWnd, and uCallbackMessage are used. All other ignored */ - SetWindowPos(data->hWnd,HWND_TOP,0,0,0,0,SWP_SHOWWINDOW|SWP_NOMOVE|SWP_NOSIZE); - return TRUE; - case ABM_QUERYPOS: - GetWindowRect(data->hWnd, &(data->rc)); - return TRUE; - case ABM_REMOVE: - FIXME("ABM_REMOVE broken\n"); - /* FIXME: this is wrong; should it be DestroyWindow instead? */ - /*CloseHandle(data->hWnd);*/ - return TRUE; - case ABM_SETAUTOHIDEBAR: - SetWindowPos(data->hWnd,HWND_TOP,rec.left+1000,rec.top, - width,height,SWP_SHOWWINDOW); - return TRUE; - case ABM_SETPOS: - data->uEdge=(ABE_RIGHT | ABE_LEFT); - SetWindowPos(data->hWnd,HWND_TOP,data->rc.left,data->rc.top, - width,height,SWP_SHOWWINDOW); - return TRUE; - case ABM_WINDOWPOSCHANGED: - return TRUE; - } + case ABM_GETSTATE: + return ABS_ALWAYSONTOP | ABS_AUTOHIDE; + + case ABM_GETTASKBARPOS: + GetWindowRect(data->hWnd, &rec); + data->rc=rec; + return TRUE; + + case ABM_ACTIVATE: + SetActiveWindow(data->hWnd); + return TRUE; + + case ABM_GETAUTOHIDEBAR: + return 0; /* pretend there is no autohide bar */ + + case ABM_NEW: + /* cbSize, hWnd, and uCallbackMessage are used. All other ignored */ + SetWindowPos(data->hWnd,HWND_TOP,0,0,0,0,SWP_SHOWWINDOW|SWP_NOMOVE|SWP_NOSIZE); + return TRUE; + + case ABM_QUERYPOS: + GetWindowRect(data->hWnd, &(data->rc)); + return TRUE; + + case ABM_REMOVE: + FIXME("ABM_REMOVE broken\n"); + /* FIXME: this is wrong; should it be DestroyWindow instead? */ + /*CloseHandle(data->hWnd);*/ + return TRUE; + + case ABM_SETAUTOHIDEBAR: + SetWindowPos(data->hWnd,HWND_TOP,rec.left+1000,rec.top, + width,height,SWP_SHOWWINDOW); + return TRUE; + + case ABM_SETPOS: + data->uEdge=(ABE_RIGHT | ABE_LEFT); + SetWindowPos(data->hWnd,HWND_TOP,data->rc.left,data->rc.top, + width,height,SWP_SHOWWINDOW); + return TRUE; + + case ABM_WINDOWPOSCHANGED: + return TRUE; + } + return FALSE; } @@ -1076,7 +1094,9 @@ } // We need the decimal point of the current locale to display the RAM size correctly - if( GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szDecimalSeparator, sizeof(szDecimalSeparator) / sizeof(WCHAR)) > 0) + if (GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, + szDecimalSeparator, + sizeof(szDecimalSeparator) / sizeof(WCHAR)) > 0) { UCHAR uDecimals; UINT uIntegral; @@ -1127,11 +1147,10 @@ EndPaint(hWnd, &ps); } - - break; - } + }; break; case WM_COMMAND: + { switch(wParam) { case IDOK: @@ -1160,7 +1179,7 @@ return TRUE; } } - break; + }; break; case WM_CLOSE: EndDialog(hWnd, TRUE); Modified: branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Sat Sep 3 00:08:11 2011 @@ -107,7 +107,8 @@ HWND hButton = GetDlgItem(hDlg, iId); RECT r; - if (bShow) { + if (bShow) + { POINT pt; int width; @@ -143,7 +144,8 @@ DrawTextW(hdc, (LPWSTR)GetPropW(hDlg, CONFIRM_MSG_PROP), -1, &r, DT_NOPREFIX | DT_PATH_ELLIPSIS | DT_WORDBREAK); SelectObject(hdc, hOldFont); EndPaint(hDlg, &ps); - return TRUE; + + return TRUE; } static INT_PTR ConfirmMsgBox_Init(HWND hDlg, LPARAM lParam) @@ -183,6 +185,7 @@ confirm_msg_move_button(hDlg, IDNO, &xPos, yOffset, TRUE); confirm_msg_move_button(hDlg, IDD_YESTOALL, &xPos, yOffset, info->bYesToAll); confirm_msg_move_button(hDlg, IDYES, &xPos, yOffset, TRUE); + return TRUE; } @@ -219,69 +222,80 @@ /* confirmation dialogs content */ typedef struct { - HINSTANCE hIconInstance; - UINT icon_resource_id; + HINSTANCE hIconInstance; + UINT icon_resource_id; UINT caption_resource_id, text_resource_id; } SHELL_ConfirmIDstruc; static BOOL SHELL_ConfirmIDs(int nKindOfDialog, SHELL_ConfirmIDstruc *ids) { - ids->hIconInstance = shell32_hInstance; - switch (nKindOfDialog) { - case ASK_DELETE_FILE: + ids->hIconInstance = shell32_hInstance; + switch (nKindOfDialog) + { + case ASK_DELETE_FILE: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_DELETEITEM_TEXT; + return TRUE; + + case ASK_DELETE_FOLDER: ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_DELETEITEM_TEXT; - return TRUE; - case ASK_DELETE_FOLDER: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; - ids->text_resource_id = IDS_DELETEITEM_TEXT; - return TRUE; - case ASK_DELETE_MULTIPLE_ITEM: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_DELETEMULTIPLE_TEXT; - return TRUE; - case ASK_TRASH_FILE: - ids->icon_resource_id = IDI_SHELL_TRASH_FILE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_TRASHITEM_TEXT; - return TRUE; - case ASK_TRASH_FOLDER: - ids->icon_resource_id = IDI_SHELL_TRASH_FILE; - ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; - ids->text_resource_id = IDS_TRASHFOLDER_TEXT; - return TRUE; - case ASK_TRASH_MULTIPLE_ITEM: - ids->icon_resource_id = IDI_SHELL_TRASH_FILE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_TRASHMULTIPLE_TEXT; - return TRUE; - case ASK_CANT_TRASH_ITEM: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_CANTTRASH_TEXT; - return TRUE; - case ASK_DELETE_SELECTED: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_DELETESELECTED_TEXT; - return TRUE; + ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; + ids->text_resource_id = IDS_DELETEITEM_TEXT; + return TRUE; + + case ASK_DELETE_MULTIPLE_ITEM: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_DELETEMULTIPLE_TEXT; + return TRUE; + + case ASK_TRASH_FILE: + ids->icon_resource_id = IDI_SHELL_TRASH_FILE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_TRASHITEM_TEXT; + return TRUE; + + case ASK_TRASH_FOLDER: + ids->icon_resource_id = IDI_SHELL_TRASH_FILE; + ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; + ids->text_resource_id = IDS_TRASHFOLDER_TEXT; + return TRUE; + + case ASK_TRASH_MULTIPLE_ITEM: + ids->icon_resource_id = IDI_SHELL_TRASH_FILE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_TRASHMULTIPLE_TEXT; + return TRUE; + + case ASK_CANT_TRASH_ITEM: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_CANTTRASH_TEXT; + return TRUE; + + case ASK_DELETE_SELECTED: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_DELETESELECTED_TEXT; + return TRUE; + case ASK_OVERWRITE_FILE: - ids->hIconInstance = NULL; - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; - ids->text_resource_id = IDS_OVERWRITEFILE_TEXT; - return TRUE; + ids->hIconInstance = NULL; + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; + ids->text_resource_id = IDS_OVERWRITEFILE_TEXT; + return TRUE; + case ASK_OVERWRITE_FOLDER: - ids->hIconInstance = NULL; - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; - ids->text_resource_id = IDS_OVERWRITEFOLDER_TEXT; - return TRUE; - default: - FIXME(" Unhandled nKindOfDialog %d stub\n", nKindOfDialog); + ids->hIconInstance = NULL; + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; + ids->text_resource_id = IDS_OVERWRITEFOLDER_TEXT; + return TRUE; + + default: + FIXME(" Unhandled nKindOfDialog %d stub\n", nKindOfDialog); } return FALSE; } @@ -294,11 +308,13 @@ HICON hIcon; int ret; - assert(nKindOfDialog >= 0 && nKindOfDialog < 32); - if (op && (op->dwYesToAllMask & (1 << nKindOfDialog))) - return TRUE; - - if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; + DbgPrint("[shell32, SHELL_ConfirmDialogW] Called\n"); + + assert(nKindOfDialog >= 0 && nKindOfDialog < 32); + if (op && (op->dwYesToAllMask & (1 << nKindOfDialog))) + return TRUE; + + if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)/sizeof(WCHAR)); LoadStringW(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)/sizeof(WCHAR)); @@ -306,20 +322,22 @@ args[0] = (DWORD_PTR)szDir; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)args); - hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); - - ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems); - if (op) { - if (ret == IDD_YESTOALL) { - op->dwYesToAllMask |= (1 << nKindOfDialog); - ret = IDYES; - } - if (ret == IDCANCEL) - op->bCancelled = TRUE; - if (ret != IDYES) - op->req->fAnyOperationsAborted = TRUE; + hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); + + ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems); + if (op) + { + if (ret == IDD_YESTOALL) + { + op->dwYesToAllMask |= (1 << nKindOfDialog); + ret = IDYES; } - return ret == IDYES; + if (ret == IDCANCEL) + op->bCancelled = TRUE; + if (ret != IDYES) + op->req->fAnyOperationsAborted = TRUE; + } + return ret == IDYES; } BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir) @@ -375,20 +393,20 @@ if (!bShowUI || (ret = SHELL_ConfirmDialogW(hwnd, ASK_DELETE_FOLDER, pszDir, NULL))) { - do - { - if (IsDotDir(wfd.cFileName)) - continue; - PathCombineW(szTemp, pszDir, wfd.cFileName); - if (FILE_ATTRIBUTE_DIRECTORY & wfd.dwFileAttributes) - ret = SHELL_DeleteDirectoryW(hwnd, szTemp, FALSE); - else - ret = (SHNotifyDeleteFileW(szTemp) == ERROR_SUCCESS); - } while (ret && FindNextFileW(hFind, &wfd)); + do + { + if (IsDotDir(wfd.cFileName)) + continue; + PathCombineW(szTemp, pszDir, wfd.cFileName); + if (FILE_ATTRIBUTE_DIRECTORY & wfd.dwFileAttributes) + ret = SHELL_DeleteDirectoryW(hwnd, szTemp, FALSE); + else + ret = (SHNotifyDeleteFileW(szTemp) == ERROR_SUCCESS); + } while (ret && FindNextFileW(hFind, &wfd)); } FindClose(hFind); if (ret) - ret = (SHNotifyRemoveDirectoryW(pszDir) == ERROR_SUCCESS); + ret = (SHNotifyRemoveDirectoryW(pszDir) == ERROR_SUCCESS); return ret; } @@ -486,13 +504,13 @@ /* File may be write protected or a system file */ DWORD dwAttr = GetFileAttributesW(path); if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)) - if (SetFileAttributesW(path, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))) - ret = DeleteFileW(path); + if (SetFileAttributesW(path, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))) + ret = DeleteFileW(path); } if (ret) { - SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, path, NULL); - return ERROR_SUCCESS; + SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, path, NULL); + return ERROR_SUCCESS; } return GetLastError(); } @@ -536,16 +554,16 @@ if (INVALID_FILE_ATTRIBUTES == dwAttr) { /* Source file may be write protected or a system file */ - dwAttr = GetFileAttributesW(src); - if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)) - if (SetFileAttributesW(src, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))) - ret = MoveFileW(src, dest); + dwAttr = GetFileAttributesW(src); + if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)) + if (SetFileAttributesW(src, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))) + ret = MoveFileW(src, dest); } } if (ret) { - SHChangeNotify(SHCNE_RENAMEITEM, SHCNF_PATHW, src, dest); - return ERROR_SUCCESS; + SHChangeNotify(SHCNE_RENAMEITEM, SHCNF_PATHW, src, dest); + return ERROR_SUCCESS; } return GetLastError(); } @@ -623,51 +641,52 @@ switch(uMsg) { - case WM_INITDIALOG: - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)lParam); - - /* get context */ - Context = (FILE_OPERATION_CONTEXT*)lParam; - - /* store progress bar handle */ - Context->hDlgCtrl = GetDlgItem(hwndDlg, 14000); - - /* store window handle */ - Context->hwndDlg = hwndDlg; - - /* set progress bar range */ - (void)SendMessageW(Context->hDlgCtrl, (UINT) PBM_SETRANGE, 0, MAKELPARAM(0, 100)); - - /* start file queueing */ - SetTimer(hwndDlg, TIMER_ID, 1000, NULL); - //QueueFile(Context); - - return TRUE; - - case WM_CLOSE: - Context->op->bCancelled = TRUE; - EndDialog(hwndDlg, Context->op->bCancelled); - return TRUE; - case WM_COMMAND: - if (LOWORD(wParam) == 14002) - { - Context->op->bCancelled = TRUE; - EndDialog(hwndDlg, Context->op->bCancelled); - return TRUE; - } - break; - case WM_TIMER: - if (wParam == TIMER_ID) - { - QueueFile(Context); - KillTimer(hwndDlg, TIMER_ID); - } - break; - case WM_FILE: - if (!QueueFile(Context)) - EndDialog(hwndDlg, Context->op->bCancelled); - default: - break; + case WM_INITDIALOG: + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)lParam); + + /* get context */ + Context = (FILE_OPERATION_CONTEXT*)lParam; + + /* store progress bar handle */ + Context->hDlgCtrl = GetDlgItem(hwndDlg, 14000); + + /* store window handle */ + Context->hwndDlg = hwndDlg; + + /* set progress bar range */ + (void)SendMessageW(Context->hDlgCtrl, (UINT) PBM_SETRANGE, 0, MAKELPARAM(0, 100)); + + /* start file queueing */ + SetTimer(hwndDlg, TIMER_ID, 1000, NULL); + //QueueFile(Context); + + return TRUE; + + case WM_CLOSE: + Context->op->bCancelled = TRUE; + EndDialog(hwndDlg, Context->op->bCancelled); + return TRUE; + + case WM_COMMAND: + if (LOWORD(wParam) == 14002) + { + Context->op->bCancelled = TRUE; + EndDialog(hwndDlg, Context->op->bCancelled); + return TRUE; + }; break; + + case WM_TIMER: + if (wParam == TIMER_ID) + { + QueueFile(Context); + KillTimer(hwndDlg, TIMER_ID); + }; break; + + case WM_FILE: + if (!QueueFile(Context)) + EndDialog(hwndDlg, Context->op->bCancelled); + default: + break; } return FALSE; } @@ -726,18 +745,30 @@ BOOL ret; DWORD attribs; + DbgPrint("[shell32, SHNotifyCopyFileW] Called\n"); + TRACE("(%s %s %s)\n", debugstr_w(src), debugstr_w(dest), bFailIfExists ? "failIfExists" : ""); - /* Destination file may already exist with read only attribute */ - attribs = GetFileAttributesW(dest); - if (IsAttrib(attribs, FILE_ATTRIBUTE_READONLY)) - SetFileAttributesW(dest, attribs & ~FILE_ATTRIBUTE_READONLY); + /* Destination file may already exist with read only attribute */ + attribs = GetFileAttributesW(dest); + if (IsAttrib(attribs, FILE_ATTRIBUTE_READONLY)) + SetFileAttributesW(dest, attribs & ~FILE_ATTRIBUTE_READONLY); + + if (GetFileAttributesW(dest) & FILE_ATTRIBUTE_READONLY) + { + SetFileAttributesW(dest, attribs & ~FILE_ATTRIBUTE_READONLY); + DbgPrint("[shell32, SHNotifyCopyFileW] Something went really WRONG...%ls, we still have FILE_ATTRIBUTE_READONLY\n", dest); + if (GetFileAttributesW(dest) & FILE_ATTRIBUTE_READONLY) + { + DbgPrint("[shell32, SHNotifyCopyFileW] STILL SHIT\n"); + } + } ret = CopyFileW(src, dest, bFailIfExists); if (ret) { - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, dest, NULL); - return ERROR_SUCCESS; + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, dest, NULL); + return ERROR_SUCCESS; } return GetLastError(); @@ -815,8 +846,8 @@ retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); if (!retCode) { - retCode = SHCreateDirectoryExW(hWnd, wPath, sec); - SHELL32_FreeUnicodeBuf(wPath); + retCode = SHCreateDirectoryExW(hWnd, wPath, sec); + SHELL32_FreeUnicodeBuf(wPath); } return retCode; } @@ -837,39 +868,40 @@ } else { - ret = SHNotifyCreateDirectoryW(path, sec); - /* Refuse to work on certain error codes before trying to create directories recursively */ - if (ret != ERROR_SUCCESS && - ret != ERROR_FILE_EXISTS && - ret != ERROR_ALREADY_EXISTS && - ret != ERROR_FILENAME_EXCED_RANGE) - { - WCHAR *pEnd, *pSlash, szTemp[MAX_PATH + 1]; /* extra for PathAddBackslash() */ - - lstrcpynW(szTemp, path, MAX_PATH); - pEnd = PathAddBackslashW(szTemp); - pSlash = szTemp + 3; - - while (*pSlash) - { - while (*pSlash && *pSlash != '\\') pSlash++; - if (*pSlash) - { - *pSlash = 0; /* terminate path at separator */ - - ret = SHNotifyCreateDirectoryW(szTemp, pSlash + 1 == pEnd ? sec : NULL); - } - *pSlash++ = '\\'; /* put the separator back */ - } - } - - if (ret && hWnd && (ERROR_CANCELLED != ret)) - { - /* We failed and should show a dialog box */ - FIXME("Show system error message, creating path %s, failed with error %d\n", debugstr_w(path), ret); - ret = ERROR_CANCELLED; /* Error has been already presented to user (not really yet!) */ - } + ret = SHNotifyCreateDirectoryW(path, sec); + /* Refuse to work on certain error codes before trying to create directories recursively */ + if (ret != ERROR_SUCCESS && + ret != ERROR_FILE_EXISTS && + ret != ERROR_ALREADY_EXISTS && + ret != ERROR_FILENAME_EXCED_RANGE) + { + WCHAR *pEnd, *pSlash, szTemp[MAX_PATH + 1]; /* extra for PathAddBackslash() */ + + lstrcpynW(szTemp, path, MAX_PATH); + pEnd = PathAddBackslashW(szTemp); + pSlash = szTemp + 3; + + while (*pSlash) + { + while (*pSlash && *pSlash != '\\') pSlash++; + if (*pSlash) + { + *pSlash = 0; /* terminate path at separator */ + + ret = SHNotifyCreateDirectoryW(szTemp, pSlash + 1 == pEnd ? sec : NULL); + } + *pSlash++ = '\\'; /* put the separator back */ + } + } + + if (ret && hWnd && (ERROR_CANCELLED != ret)) + { + /* We failed and should show a dialog box */ + FIXME("Show system error message, creating path %s, failed with error %d\n", debugstr_w(path), ret); + ret = ERROR_CANCELLED; /* Error has been already presented to user (not really yet!) */ + } } + return ret; } @@ -898,14 +930,14 @@ TRACE("%s %d\n", debugstr_w(pName), fileOnly); if (INVALID_HANDLE_VALUE != hFind) { - do - { - if (b_FileMask && IsAttribDir(wfd.dwFileAttributes)) - continue; - dwAttr = wfd.dwFileAttributes; - break; - } - while (FindNextFileW(hFind, &wfd)); + do + { + if (b_FileMask && IsAttribDir(wfd.dwFileAttributes)) + continue; + dwAttr = wfd.dwFileAttributes; + break; + } while (FindNextFileW(hFind, &wfd)); + FindClose(hFind); } return dwAttr; @@ -927,20 +959,21 @@ if (aString) { - do - { - size = lstrlenA(aString) + 1; - aSize += size; - aString += size; - } while ((size != 1) && more); - /* The two sizes might be different in the case of multibyte chars */ - size = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, 0); - if (*wString) /* only in the second loop */ - { - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, size); - *pWToFrom = *wString; - *wString += size; - } + do + { + size = lstrlenA(aString) + 1; + aSize += size; + aString += size; + } while ((size != 1) && more); + + /* The two sizes might be different in the case of multibyte chars */ + size = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, 0); + if (*wString) /* only in the second loop */ + { + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, size); + *pWToFrom = *wString; + *wString += size; + } } return size; } @@ -970,30 +1003,30 @@ TRACE("\n"); if (FO_DELETE == (nFileOp.wFunc & FO_MASK)) - nFileOp.pTo = NULL; /* we need a NULL or a valid pointer for translation */ + nFileOp.pTo = NULL; /* we need a NULL or a valid pointer for translation */ if (!(nFileOp.fFlags & FOF_SIMPLEPROGRESS)) - nFileOp.lpszProgressTitle = NULL; /* we need a NULL or a valid pointer for translation */ + nFileOp.lpszProgressTitle = NULL; /* we need a NULL or a valid pointer for translation */ while (1) /* every loop calculate size, second translate also, if we have storage for this */ { - size = SHNameTranslate(&wString, &nFileOp.lpszProgressTitle, FALSE); /* no loop */ - size += SHNameTranslate(&wString, &nFileOp.pFrom, TRUE); /* internal loop */ - size += SHNameTranslate(&wString, &nFileOp.pTo, TRUE); /* internal loop */ - - if (ForFree) - { - retCode = SHFileOperationW(&nFileOp); - HeapFree(GetProcessHeap(), 0, ForFree); /* we cannot use wString, it was changed */ - break; - } - else - { - wString = ForFree = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (ForFree) continue; - retCode = ERROR_OUTOFMEMORY; - nFileOp.fAnyOperationsAborted = TRUE; - SetLastError(retCode); - return retCode; - } + size = SHNameTranslate(&wString, &nFileOp.lpszProgressTitle, FALSE); /* no loop */ + size += SHNameTranslate(&wString, &nFileOp.pFrom, TRUE); /* internal loop */ + size += SHNameTranslate(&wString, &nFileOp.pTo, TRUE); /* internal loop */ + + if (ForFree) + { + retCode = SHFileOperationW(&nFileOp); + HeapFree(GetProcessHeap(), 0, ForFree); /* we cannot use wString, it was changed */ + break; + } + else + { + wString = ForFree = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (ForFree) continue; + retCode = ERROR_OUTOFMEMORY; + nFileOp.fAnyOperationsAborted = TRUE; + SetLastError(retCode); + return retCode; + } } lpFileOp->hNameMappings = nFileOp.hNameMappings; @@ -1063,15 +1096,22 @@ for (res = TRUE; res; res = FindNextFileW(hFile, &wfd)) { - if (IsDotDir(wfd.cFileName)) continue; - if (*pdwListIndex >= flList->num_alloc) grow_list( flList ); - szFullPath = wildcard_to_file(szFile, wfd.cFileName); + if (IsDotDir(wfd.cFileName)) + continue; + + if (*pdwListIndex >= flList->num_alloc) + grow_list( flList ); + + szFullPath = wildcard_to_file(szFile, wfd.cFileName); file = &flList->feFiles[(*pdwListIndex)++]; add_file_to_entry(file, szFullPath); file->bFromWildcard = TRUE; file->attributes = wfd.dwFileAttributes; - if (IsAttribDir(file->attributes)) flList->bAnyDirectories = TRUE; - HeapFree(GetProcessHeap(), 0, szFullPath); + + if (IsAttribDir(file->attributes)) + flList->bAnyDirectories = TRUE; + + HeapFree(GetProcessHeap(), 0, szFullPath); } FindClose(hFile); @@ -1180,7 +1220,8 @@ else lstrcpyW(szTo, szDestPath); - if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) { + if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) + { if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FOLDER, feFrom->szFilename, op)) { /* Vista returns an ERROR_CANCELLED even if user pressed "No" */ @@ -1367,6 +1408,7 @@ { if (!copy_file_to_file(op, entryToCopy->szFullPath, fileDest->szFullPath)) { + DbgPrint("[shell32, copy_files] copy_file_to_file failed\n"); op->req->fAnyOperationsAborted = TRUE; return ERROR_CANCELLED; } @@ -1671,16 +1713,16 @@ { if (hNameMapping) { - int i = SHDSA_GetItemCount((HDSA)hNameMapping) - 1; - - for (; i>= 0; i--) - { - LPSHNAMEMAPPINGW lp = (SHNAMEMAPPINGW *)DSA_GetItemPtr((HDSA)hNameMapping, i); - - SHFree(lp->pszOldPath); - SHFree(lp->pszNewPath); - } - DSA_Destroy((HDSA)hNameMapping); + int i = SHDSA_GetItemCount((HDSA)hNameMapping) - 1; + + for (; i>= 0; i--) + { + LPSHNAMEMAPPINGW lp = (SHNAMEMAPPINGW *)DSA_GetItemPtr((HDSA)hNameMapping, i); + + SHFree(lp->pszOldPath); + SHFree(lp->pszNewPath); + } + DSA_Destroy((HDSA)hNameMapping); } } @@ -1736,7 +1778,8 @@ char drv_path[3]; /* change current directory to the specified drive */ - if (drive) { + if (drive) + { strcpy(drv_path, "A:"); drv_path[0] += (char)drive-1;

13 years, 3 months

[tkreuzer] 53536: [HAL] Fix a dependency issue

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 2 22:07:28 2011 New Revision: 53536 URL: http://svn.reactos.org/svn/reactos?rev=53536&view=rev Log: [HAL] Fix a dependency issue Modified: trunk/reactos/hal/halx86/CMakeLists.txt Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Fri Sep 2 22:07:28 2011 @@ -30,6 +30,7 @@ endif() add_library(lib_hal_generic ${HAL_GENERIC_SOURCE}) +add_dependencies(lib_hal_generic asm) add_pch(lib_hal_generic include/hal.h) list(APPEND HAL_LEGACY_SOURCE

13 years, 3 months

[fireball] 53535: - Fix a totally broken case when a directory has no name in ObQueryNameString. Spotted by Coverity.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Sep 2 21:22:30 2011 New Revision: 53535 URL: http://svn.reactos.org/svn/reactos?rev=53535&view=rev Log: - Fix a totally broken case when a directory has no name in ObQueryNameString. Spotted by Coverity. Modified: trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Fri Sep 2 21:22:30 2011 @@ -1126,8 +1126,11 @@ else { /* Directory without a name, we add "..." */ - ObjectName -= sizeof(L"..."); - ObjectName = L"..."; + ObjectName = (PWCH)((ULONG_PTR)ObjectName - + sizeof(L"...") + sizeof(UNICODE_NULL)); + RtlCopyMemory(ObjectName, + L"...", + sizeof(L"...") + sizeof(UNICODE_NULL)); break; } }

13 years, 3 months

[cmihail] 53534: [shell32.dll] - replace DbgPrints with TRACE.

by cmihail＠svn.reactos.org

Author: cmihail Date: Fri Sep 2 19:56:58 2011 New Revision: 53534 URL: http://svn.reactos.org/svn/reactos?rev=53534&view=rev Log: [shell32.dll] - replace DbgPrints with TRACE. Modified: branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] Fri Sep 2 19:56:58 2011 @@ -189,11 +189,8 @@ DWORD used = 0; bool tildeEffect = false; - TRACE("%p, %d, %s, %s, %p, %p\n", out, len, debugstr_w(fmt), + TRACE("Before parsing: %p, %d, %s, %s, %p, %p\n", out, len, debugstr_w(fmt), debugstr_w(lpFile), pidl, args); - - DbgPrint("[shell32, SHELL_ArgifyW] Processing %ws\n", args); - DbgPrint("[shell32, SHELL_ArgifyW] fmt = %ws\n", fmt); while (*fmt) { @@ -391,7 +388,8 @@ if (out_len) *out_len = used; - DbgPrint("[shell32, SHELL_ArgifyW] Done result = %ws\n", out); + TRACE("After parsing: %p, %d, %s, %s, %p, %p\n", out, len, debugstr_w(fmt), + debugstr_w(lpFile), pidl, args); return found_p1; }

13 years, 3 months

[cmihail] 53533: [shell32.dll] - rewrite the parser to handle command line argument parsing - include basic description of what the rules for parsing are - some minor formatting here and there (cou...

by cmihail＠svn.reactos.org

Author: cmihail Date: Fri Sep 2 19:29:30 2011 New Revision: 53533 URL: http://svn.reactos.org/svn/reactos?rev=53533&view=rev Log: [shell32.dll] - rewrite the parser to handle command line argument parsing - include basic description of what the rules for parsing are - some minor formatting here and there (couldn't be helped) Modified: branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] Fri Sep 2 19:29:30 2011 @@ -32,6 +32,125 @@ #define SEE_MASK_CLASSALL (SEE_MASK_CLASSNAME | SEE_MASK_CLASSKEY) +static void ParseNoTildeEffect(PWSTR &res, LPCWSTR &args, DWORD &len, DWORD &used, int argNum) +{ + bool firstCharQuote = false; + bool quotes_opened = false; + bool backslash_encountered = false; + + for (int curArg=0; curArg<=argNum && *args; ++curArg) + { + firstCharQuote = false; + if (*args == '"') + { + quotes_opened = true; + firstCharQuote = true; + args++; + } + + while(*args) + { + if (*args == '\\') + { + // if we found a backslash then flip the variable + backslash_encountered = !backslash_encountered; + } + else if (*args == '"') + { + if (quotes_opened) + { + if (*(args+1) != '"') + { + quotes_opened = false; + args++; + break; + } + else + { + args++; + } + } + else + { + quotes_opened = true; + } + + backslash_encountered = false; + } + else + { + backslash_encountered = false; + if (*args == ' ' && !firstCharQuote) + break; + } + + if (curArg == argNum) + { + used++; + if (used < len) + *res++ = *args; + } + + args++; + } + + while(*args == ' ') + ++args; + } +} + +static void ParseTildeEffect(PWSTR &res, LPCWSTR &args, DWORD &len, DWORD &used, int argNum) +{ + bool quotes_opened = false; + bool backslash_encountered = false; + + for (int curArg=0; curArg<=argNum && *args; ++curArg) + { + while(*args) + { + if (*args == '\\') + { + // if we found a backslash then flip the variable + backslash_encountered = !backslash_encountered; + } + else if (*args == '"') + { + if (quotes_opened) + { + if (*(args+1) != '"') + { + quotes_opened = false; + } + else + { + args++; + } + } + else + { + quotes_opened = true; + } + + backslash_encountered = false; + } + else + { + backslash_encountered = false; + if (*args == ' ' && !quotes_opened && curArg!=argNum) + break; + } + + if (curArg == argNum) + { + used++; + if (used < len) + *res++ = *args; + } + + args++; + } + } +} /*********************************************************************** * SHELL_ArgifyW [Internal] @@ -48,7 +167,18 @@ * %S ??? * %* all following parameters (see batfile) * - */ +* The way we parse the command line arguments was determined through extensive +* testing and can be summed up by the following rules" +* +* - %2 +* - if first letter is " break on first non literal " and include any white spaces +* - if first letter is NOT " break on first " or white space +* - if " is opened any pair of consecutive " results in ONE literal " +* +* - %~2 +* - use rules from here http://www.autohotkey.net/~deleyd/parameters/parameters.htm +*/ + static BOOL SHELL_ArgifyW(WCHAR* out, DWORD len, const WCHAR* fmt, const WCHAR* lpFile, LPITEMIDLIST pidl, LPCWSTR args, DWORD* out_len) { WCHAR xlpFile[1024]; @@ -57,175 +187,188 @@ PWSTR res = out; PCWSTR cmd; DWORD used = 0; + bool tildeEffect = false; TRACE("%p, %d, %s, %s, %p, %p\n", out, len, debugstr_w(fmt), debugstr_w(lpFile), pidl, args); + DbgPrint("[shell32, SHELL_ArgifyW] Processing %ws\n", args); + DbgPrint("[shell32, SHELL_ArgifyW] fmt = %ws\n", fmt); + while (*fmt) { if (*fmt == '%') { switch (*++fmt) { - case '\0': - case '%': - used++; - if (used < len) - *res++ = '%'; - break; - - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - case '0': - case '*': - if (args) + case '\0': + case '%': { - if (*fmt == '*') + used++; + if (used < len) + *res++ = '%'; + }; break; + + case '*': + { + if (args) { - used++; - if (used < len) - *res++ = '"'; - while(*args) + if (*fmt == '*') { used++; - if (used < len) - *res++ = *args++; - else - args++; + while(*args) + { + used++; + if (used < len) + *res++ = *args++; + else + args++; + } + used++; + break; } - used++; - if (used < len) - *res++ = '"'; - break; } - else + }; break; + + case '~': + + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + //case '0': + { + if (*fmt == '~') { - while(*args && !isspace(*args)) + fmt++; + tildeEffect = true; + } + + if (args) + { + if (tildeEffect) { - used++; - if (used < len) - *res++ = *args++; - else - args++; + ParseTildeEffect(res, args, len, used, *fmt - '2'); + tildeEffect = false; } - - while(isspace(*args)) - ++args; + else + { + ParseNoTildeEffect(res, args, len, used, *fmt - '2'); + } } - break; - } - else - { - break; - } - case '1': - if (!done || (*fmt == '1')) - { - /*FIXME Is the call to SearchPathW() really needed? We already have separated out the parameter string in args. */ - if (SearchPathW(NULL, lpFile, wszExe, sizeof(xlpFile)/sizeof(WCHAR), xlpFile, NULL)) - cmd = xlpFile; - else - cmd = lpFile; - - used += wcslen(cmd); - if (used < len) + }; break; + + case '1': + if (!done || (*fmt == '1')) { - wcscpy(res, cmd); - res += wcslen(cmd); - } - } - found_p1 = TRUE; - break; - - /* - * IE uses this a lot for activating things such as windows media - * player. This is not verified to be fully correct but it appears - * to work just fine. - */ - case 'l': - case 'L': - if (lpFile) { - used += wcslen(lpFile); - if (used < len) - { - wcscpy(res, lpFile); - res += wcslen(lpFile); - } - } - found_p1 = TRUE; - break; - - case 'i': - case 'I': - if (pidl) { - DWORD chars = 0; - /* %p should not exceed 8, maybe 16 when looking forward to 64bit. - * allowing a buffer of 100 should more than exceed all needs */ - WCHAR buf[100]; - LPVOID pv; - HGLOBAL hmem = SHAllocShared(pidl, ILGetSize(pidl), 0); - pv = SHLockShared(hmem, 0); - chars = swprintf(buf, wszILPtr, pv); - if (chars >= sizeof(buf)/sizeof(WCHAR)) - ERR("pidl format buffer too small!\n"); - used += chars; - if (used < len) - { - wcscpy(res,buf); - res += chars; - } - SHUnlockShared(pv); - } - found_p1 = TRUE; - break; - - default: - /* - * Check if this is an env-variable here... - */ - - /* Make sure that we have at least one more %.*/ - if (strchrW(fmt, '%')) - { - WCHAR tmpBuffer[1024]; - PWSTR tmpB = tmpBuffer; - WCHAR tmpEnvBuff[MAX_PATH]; - DWORD envRet; - - while (*fmt != '%') - *tmpB++ = *fmt++; - *tmpB++ = 0; - - TRACE("Checking %s to be an env-var\n", debugstr_w(tmpBuffer)); - - envRet = GetEnvironmentVariableW(tmpBuffer, tmpEnvBuff, MAX_PATH); - if (envRet == 0 || envRet > MAX_PATH) - { - used += wcslen(tmpBuffer); + /*FIXME Is the call to SearchPathW() really needed? We already have separated out the parameter string in args. */ + if (SearchPathW(NULL, lpFile, wszExe, sizeof(xlpFile)/sizeof(WCHAR), xlpFile, NULL)) + cmd = xlpFile; + else + cmd = lpFile; + + used += wcslen(cmd); if (used < len) { - wcscpy( res, tmpBuffer ); - res += wcslen(tmpBuffer); + wcscpy(res, cmd); + res += wcslen(cmd); } } - else + found_p1 = TRUE; + break; + + /* + * IE uses this a lot for activating things such as windows media + * player. This is not verified to be fully correct but it appears + * to work just fine. + */ + case 'l': + case 'L': + if (lpFile) { - used += wcslen(tmpEnvBuff); + used += wcslen(lpFile); + if (used < len) + { + wcscpy(res, lpFile); + res += wcslen(lpFile); + } + } + found_p1 = TRUE; + break; + + case 'i': + case 'I': + if (pidl) + { + DWORD chars = 0; + /* %p should not exceed 8, maybe 16 when looking forward to 64bit. + * allowing a buffer of 100 should more than exceed all needs */ + WCHAR buf[100]; + LPVOID pv; + HGLOBAL hmem = SHAllocShared(pidl, ILGetSize(pidl), 0); + pv = SHLockShared(hmem, 0); + chars = swprintf(buf, wszILPtr, pv); + + if (chars >= sizeof(buf)/sizeof(WCHAR)) + ERR("pidl format buffer too small!\n"); + + used += chars; + if (used < len) + { + wcscpy(res,buf); + res += chars; + } + SHUnlockShared(pv); + } + found_p1 = TRUE; + break; + + default: + /* + * Check if this is an env-variable here... + */ + + /* Make sure that we have at least one more %.*/ + if (strchrW(fmt, '%')) + { + WCHAR tmpBuffer[1024]; + PWSTR tmpB = tmpBuffer; + WCHAR tmpEnvBuff[MAX_PATH]; + DWORD envRet; + + while (*fmt != '%') + *tmpB++ = *fmt++; + *tmpB++ = 0; + + TRACE("Checking %s to be an env-var\n", debugstr_w(tmpBuffer)); + + envRet = GetEnvironmentVariableW(tmpBuffer, tmpEnvBuff, MAX_PATH); + if (envRet == 0 || envRet > MAX_PATH) { - wcscpy( res, tmpEnvBuff ); - res += wcslen(tmpEnvBuff); + used += wcslen(tmpBuffer); + if (used < len) + { + wcscpy( res, tmpBuffer ); + res += wcslen(tmpBuffer); + } + } + else + { + used += wcslen(tmpEnvBuff); + if (used < len) + { + wcscpy( res, tmpEnvBuff ); + res += wcslen(tmpEnvBuff); + } } } - } - done = TRUE; - break; + done = TRUE; + break; } /* Don't skip past terminator (catch a single '%' at the end) */ if (*fmt != '\0') @@ -248,6 +391,8 @@ if (out_len) *out_len = used; + DbgPrint("[shell32, SHELL_ArgifyW] Done result = %ws\n", out); + return found_p1; } @@ -258,13 +403,14 @@ HRESULT hr = SHGetDesktopFolder(&desktop); - if (SUCCEEDED(hr)) { - hr = desktop->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strret); - - if (SUCCEEDED(hr)) - StrRetToStrNW(pszPath, uOutSize, &strret, pidl); - - desktop->Release(); + if (SUCCEEDED(hr)) + { + hr = desktop->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strret); + + if (SUCCEEDED(hr)) + StrRetToStrNW(pszPath, uOutSize, &strret, pidl); + + desktop->Release(); } return hr; @@ -298,17 +444,23 @@ /* ShellExecute specifies the command from psei->lpDirectory * if present. Not from the current dir as CreateProcess does */ - if( lpDirectory ) - if( ( gcdret = GetCurrentDirectoryW( MAX_PATH, curdir))) - if( !SetCurrentDirectoryW( lpDirectory)) + if ( lpDirectory ) + if ( ( gcdret = GetCurrentDirectoryW( MAX_PATH, curdir))) + if ( !SetCurrentDirectoryW( lpDirectory)) ERR("cannot set directory %s\n", debugstr_w(lpDirectory)); + ZeroMemory(&startup,sizeof(STARTUPINFOW)); startup.cb = sizeof(STARTUPINFOW); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = psei->nShow; dwCreationFlags = CREATE_UNICODE_ENVIRONMENT; + if (psei->fMask & SEE_MASK_NO_CONSOLE) dwCreationFlags |= CREATE_NEW_CONSOLE; + + //DbgPrint("[shell32, SHELL_ExecuteW] CreateProcessW cmd = %ws\n", (LPWSTR)lpCmd); + //DbgBreakPoint(); + if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, dwCreationFlags, env, lpDirectory, &startup, &info)) { @@ -318,6 +470,7 @@ if (WaitForInputIdle( info.hProcess, 30000 ) == WAIT_FAILED) WARN("WaitForInputIdle failed: Error %d\n", GetLastError() ); retval = 33; + if (psei->fMask & SEE_MASK_NOCLOSEPROCESS) psei_out->hProcess = info.hProcess; else @@ -333,6 +486,7 @@ TRACE("returning %lu\n", retval); psei_out->hInstApp = (HINSTANCE)retval; + if( gcdret ) if( !SetCurrentDirectoryW( curdir)) ERR("cannot return to directory %s\n", debugstr_w(curdir)); @@ -626,8 +780,9 @@ &filetypelen) == ERROR_SUCCESS) { filetypelen /= sizeof(WCHAR); - if (filetypelen == sizeof(filetype)/sizeof(WCHAR)) - filetypelen--; + if (filetypelen == sizeof(filetype)/sizeof(WCHAR)) + filetypelen--; + filetype[filetypelen] = '\0'; TRACE("File type: %s\n", debugstr_w(filetype)); } @@ -644,41 +799,41 @@ filetype[filetypelen] = '\0'; retval = SHELL_FindExecutableByOperation(lpOperation, key, filetype, command, sizeof(command)); - if (retval > 32) - { - DWORD finishedLen; - SHELL_ArgifyW(lpResult, resultLen, command, xlpFile, pidl, args, &finishedLen); - if (finishedLen > resultLen) - ERR("Argify buffer not large enough.. truncated\n"); - - /* Remove double quotation marks and command line arguments */ - if (*lpResult == '"') + if (retval > 32) { - WCHAR *p = lpResult; - while (*(p + 1) != '"') - { - *p = *(p + 1); - p++; - } - *p = '\0'; - } + DWORD finishedLen; + SHELL_ArgifyW(lpResult, resultLen, command, xlpFile, pidl, args, &finishedLen); + if (finishedLen > resultLen) + ERR("Argify buffer not large enough.. truncated\n"); + DbgPrint("[shell32, SHELL_FindExecutable] Remove double quotation marks and command line arguments\n"); + /* Remove double quotation marks and command line arguments */ + if (*lpResult == '"') + { + WCHAR *p = lpResult; + while (*(p + 1) != '"') + { + *p = *(p + 1); + p++; + } + *p = '\0'; + } else { /* Truncate on first space */ - WCHAR *p = lpResult; - while (*p != ' ' && *p != '\0') + WCHAR *p = lpResult; + while (*p != ' ' && *p != '\0') p++; *p='\0'; } - } + } } else /* Check win.ini */ { - static const WCHAR wExtensions[] = {'e','x','t','e','n','s','i','o','n','s',0}; - - /* Toss the leading dot */ - extension++; - if (GetProfileStringW(wExtensions, extension, wszEmpty, command, sizeof(command)/sizeof(WCHAR)) > 0) + static const WCHAR wExtensions[] = {'e','x','t','e','n','s','i','o','n','s',0}; + + /* Toss the leading dot */ + extension++; + if (GetProfileStringW(wExtensions, extension, wszEmpty, command, sizeof(command)/sizeof(WCHAR)) > 0) { if (wcslen(command) != 0) { @@ -1370,11 +1525,14 @@ strcpyW(wszQuotedCmd, wQuote); strcatW(wszQuotedCmd, wcmd); strcatW(wszQuotedCmd, wQuote); - if (wszParameters[0]) { + if (wszParameters[0]) + { strcatW(wszQuotedCmd, wSpace); strcatW(wszQuotedCmd, wszParameters); } + TRACE("%s/%s => %s/%s\n", debugstr_w(wszApplicationName), debugstr_w(psei->lpVerb), debugstr_w(wszQuotedCmd), debugstr_w(lpstrProtocol)); + if (*lpstrProtocol) retval = execute_from_key(lpstrProtocol, wszApplicationName, env, psei->lpParameters, wcmd, execfunc, psei, psei_out); else @@ -1498,14 +1656,20 @@ else if (*sei_tmp.lpFile == '\"') { DWORD l = strlenW(sei_tmp.lpFile+1); - if(l >= dwApplicationNameLen) dwApplicationNameLen = l+1; + if(l >= dwApplicationNameLen) + dwApplicationNameLen = l+1; + wszApplicationName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen*sizeof(WCHAR)); memcpy(wszApplicationName, sei_tmp.lpFile+1, (l+1)*sizeof(WCHAR)); + if (wszApplicationName[l-1] == '\"') wszApplicationName[l-1] = '\0'; appKnownSingular = TRUE; + TRACE("wszApplicationName=%s\n",debugstr_w(wszApplicationName)); - } else { + } + else + { DWORD l = strlenW(sei_tmp.lpFile)+1; if(l > dwApplicationNameLen) dwApplicationNameLen = l+1; wszApplicationName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen*sizeof(WCHAR)); @@ -1521,10 +1685,10 @@ wszParameters = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); parametersLen = len; } - strcpyW(wszParameters, sei_tmp.lpParameters); + strcpyW(wszParameters, sei_tmp.lpParameters); } else - *wszParameters = '\0'; + *wszParameters = '\0'; wszDir = dirBuffer; if (sei_tmp.lpDirectory) @@ -1535,10 +1699,10 @@ wszDir = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); dirLen = len; } - strcpyW(wszDir, sei_tmp.lpDirectory); + strcpyW(wszDir, sei_tmp.lpDirectory); } else - *wszDir = '\0'; + *wszDir = '\0'; /* adjust string pointers to point to the new buffers */ sei_tmp.lpFile = wszApplicationName; @@ -1553,25 +1717,26 @@ /* process the IDList */ if (sei_tmp.fMask & SEE_MASK_IDLIST) { - IShellExecuteHookW* pSEH; - - HRESULT hr = SHBindToParent((LPCITEMIDLIST)sei_tmp.lpIDList, IID_IShellExecuteHookW, (LPVOID*)&pSEH, NULL); - - if (SUCCEEDED(hr)) - { - hr = pSEH->Execute(&sei_tmp); - - pSEH->Release(); - - if (hr == S_OK) { + IShellExecuteHookW* pSEH; + + HRESULT hr = SHBindToParent((LPCITEMIDLIST)sei_tmp.lpIDList, IID_IShellExecuteHookW, (LPVOID*)&pSEH, NULL); + + if (SUCCEEDED(hr)) + { + hr = pSEH->Execute(&sei_tmp); + + pSEH->Release(); + + if (hr == S_OK) + { HeapFree(GetProcessHeap(), 0, wszApplicationName); if (wszParameters != parametersBuffer) HeapFree(GetProcessHeap(), 0, wszParameters); if (wszDir != dirBuffer) HeapFree(GetProcessHeap(), 0, wszDir); - return TRUE; + return TRUE; } - } + } SHGetPathFromIDListW((LPCITEMIDLIST)sei_tmp.lpIDList, wszApplicationName); appKnownSingular = TRUE; @@ -1677,65 +1842,71 @@ TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); /* separate out command line arguments from executable file name */ - if (!*sei_tmp.lpParameters && !appKnownSingular) { - /* If the executable path is quoted, handle the rest of the command line as parameters. */ - if (sei_tmp.lpFile[0] == '"') { - LPWSTR src = wszApplicationName/*sei_tmp.lpFile*/ + 1; - LPWSTR dst = wfileName; - LPWSTR end; - - /* copy the unquoted executable path to 'wfileName' */ - while(*src && *src!='"') - *dst++ = *src++; - - *dst = '\0'; - - if (*src == '"') { - end = ++src; - - while(isspace(*src)) - ++src; - } else - end = src; - - /* copy the parameter string to 'wszParameters' */ - strcpyW(wszParameters, src); - - /* terminate previous command string after the quote character */ - *end = '\0'; - } - else - { - /* If the executable name is not quoted, we have to use this search loop here, - that in CreateProcess() is not sufficient because it does not handle shell links. */ - WCHAR buffer[MAX_PATH], xlpFile[MAX_PATH]; - LPWSTR space, s; - - LPWSTR beg = wszApplicationName/*sei_tmp.lpFile*/; - for(s=beg; (space= const_cast<LPWSTR>(strchrW(s, ' '))); s=space+1) { - int idx = space-sei_tmp.lpFile; - memcpy(buffer, sei_tmp.lpFile, idx * sizeof(WCHAR)); - buffer[idx] = '\0'; - - /*FIXME This finds directory paths if the targeted file name contains spaces. */ - if (SearchPathW(*sei_tmp.lpDirectory? sei_tmp.lpDirectory: NULL, buffer, wszExe, sizeof(xlpFile)/sizeof(xlpFile[0]), xlpFile, NULL)) - { - /* separate out command from parameter string */ - LPCWSTR p = space + 1; - - while(isspaceW(*p)) - ++p; - - strcpyW(wszParameters, p); - *space = '\0'; - - break; - } + if (!*sei_tmp.lpParameters && !appKnownSingular) + { + /* If the executable path is quoted, handle the rest of the command line as parameters. */ + if (sei_tmp.lpFile[0] == '"') + { + LPWSTR src = wszApplicationName/*sei_tmp.lpFile*/ + 1; + LPWSTR dst = wfileName; + LPWSTR end; + + /* copy the unquoted executable path to 'wfileName' */ + while(*src && *src!='"') + *dst++ = *src++; + + *dst = '\0'; + + if (*src == '"') + { + end = ++src; + + while(isspace(*src)) + ++src; + } + else + end = src; + + /* copy the parameter string to 'wszParameters' */ + strcpyW(wszParameters, src); + + /* terminate previous command string after the quote character */ + *end = '\0'; } - - lstrcpynW(wfileName, sei_tmp.lpFile,sizeof(wfileName)/sizeof(WCHAR)); - } - } else + else + { + /* If the executable name is not quoted, we have to use this search loop here, + that in CreateProcess() is not sufficient because it does not handle shell links. */ + WCHAR buffer[MAX_PATH], xlpFile[MAX_PATH]; + LPWSTR space, s; + + LPWSTR beg = wszApplicationName/*sei_tmp.lpFile*/; + for(s=beg; (space= const_cast<LPWSTR>(strchrW(s, ' '))); s=space+1) + { + int idx = space-sei_tmp.lpFile; + memcpy(buffer, sei_tmp.lpFile, idx * sizeof(WCHAR)); + buffer[idx] = '\0'; + + /*FIXME This finds directory paths if the targeted file name contains spaces. */ + if (SearchPathW(*sei_tmp.lpDirectory? sei_tmp.lpDirectory: NULL, buffer, wszExe, sizeof(xlpFile)/sizeof(xlpFile[0]), xlpFile, NULL)) + { + /* separate out command from parameter string */ + LPCWSTR p = space + 1; + + while(isspaceW(*p)) + ++p; + + strcpyW(wszParameters, p); + *space = '\0'; + + break; + } + } + + lstrcpynW(wfileName, sei_tmp.lpFile,sizeof(wfileName)/sizeof(WCHAR)); + } + } + else lstrcpynW(wfileName, sei_tmp.lpFile,sizeof(wfileName)/sizeof(WCHAR)); lpFile = wfileName; @@ -1750,13 +1921,15 @@ wcmdLen = len; } strcpyW(wcmd, wszApplicationName); - if (sei_tmp.lpParameters[0]) { + if (sei_tmp.lpParameters[0]) + { strcatW(wcmd, wSpace); strcatW(wcmd, wszParameters); } retval = execfunc(wcmd, NULL, FALSE, &sei_tmp, sei); - if (retval > 32) { + if (retval > 32) + { HeapFree(GetProcessHeap(), 0, wszApplicationName); if (wszParameters != parametersBuffer) HeapFree(GetProcessHeap(), 0, wszParameters); @@ -1894,7 +2067,7 @@ memcpy(&seiW, sei, sizeof(SHELLEXECUTEINFOW)); if (sei->lpVerb) - seiW.lpVerb = __SHCloneStrAtoW(&wVerb, sei->lpVerb); + seiW.lpVerb = __SHCloneStrAtoW(&wVerb, sei->lpVerb); if (sei->lpFile) seiW.lpFile = __SHCloneStrAtoW(&wFile, sei->lpFile);

13 years, 3 months

[fireball] 53532: - Remove unnecessary assignment.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Sep 2 19:25:49 2011 New Revision: 53532 URL: http://svn.reactos.org/svn/reactos?rev=53532&view=rev Log: - Remove unnecessary assignment. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Fri Sep 2 19:25:49 2011 @@ -1109,7 +1109,6 @@ RegStart = RegName.Length; /* Build the base name */ - RegName.Length = RegStart; RtlInitUnicodeString(&TempName, CmpMachineHiveList[i].BaseName); RtlAppendStringToString((PSTRING)&RegName, (PSTRING)&TempName);

13 years, 3 months

[akhaldi] 53531: * Fix CMake build. Our current PCH handling doesn't allow this.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Sep 2 15:47:51 2011 New Revision: 53531 URL: http://svn.reactos.org/svn/reactos?rev=53531&view=rev Log: * Fix CMake build. Our current PCH handling doesn't allow this. Modified: trunk/reactos/hal/halx86/CMakeLists.txt Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Fri Sep 2 15:47:51 2011 @@ -44,7 +44,7 @@ legacy/halpcat.c) add_library(lib_hal_legacy ${HAL_LEGACY_SOURCE}) -add_pch(lib_hal_legacy include/hal.h) +#add_pch(lib_hal_legacy include/hal.h) target_link_libraries(lib_hal_legacy lib_hal_generic) list(APPEND HAL_ACPI_SOURCE @@ -54,7 +54,7 @@ legacy/bus/pcibus.c) add_library(lib_hal_acpi ${HAL_ACPI_SOURCE}) -add_pch(lib_hal_acpi include/hal.h) +#add_pch(lib_hal_acpi include/hal.h) target_link_libraries(lib_hal_acpi lib_hal_generic) if(ARCH MATCHES i386) @@ -100,7 +100,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/hal.def) target_link_libraries(hal lib_hal_generic lib_hal_legacy libcntpr) add_importlibs(hal ntoskrnl) - add_pch(hal include/hal.h) + #add_pch(hal include/hal.h) add_dependencies(hal psdk bugcodes) set_entrypoint(hal HalInitSystem 8) set_subsystem(hal native)

13 years, 3 months

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 September 2011