Ros-diffs September 2010

ros-diffs@reactos.org

18 participants
278 discussions

[jgardou] 48950: [CMAKE] - fix msvc extrac32 build

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 30 22:05:12 2010 New Revision: 48950 URL: http://svn.reactos.org/svn/reactos?rev=48950&view=rev Log: [CMAKE] - fix msvc extrac32 build Modified: branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt [iso-8859-1] Thu Sep 30 22:05:12 2010 @@ -7,4 +7,4 @@ target_link_libraries(extrac32 wine) -add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt) +add_importlibs(extrac32 ntdll shell32 setupapi shlwapi user32 msvcrt)

14 years, 2 months

[jgardou] 48949: [CMAKE] - fix msvc xcopy compilation by merging 48948 and linking it to ntdll

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 30 21:49:15 2010 New Revision: 48949 URL: http://svn.reactos.org/svn/reactos?rev=48949&view=rev Log: [CMAKE] - fix msvc xcopy compilation by merging 48948 and linking it to ntdll Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/ (props changed) branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/xcopy/Da.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/De.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/En.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/Fr.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/It.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/Ja.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/Ko.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/Lt.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/Nl.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/No.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/Pl.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/Pt.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/Ro.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/Ru.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/Si.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/Uk.rc Propchange: branches/cmake-bringup/base/applications/cmdutils/xcopy/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Sep 30 21:49:15 2010 @@ -1,0 +1,5 @@ +/branches/header-work/base/applications/cmdutils/xcopy:45691-47721 +/branches/reactos-yarotows/base/applications/cmdutils/xcopy:46372,46848,46966,47800,48026,48064 +/branches/ros-amd64-bringup/base/applications/cmdutils/xcopy:36852 +/branches/ros-amd64-bringup/reactos/base/applications/cmdutils/xcopy:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/trunk/reactos/base/applications/cmdutils/xcopy:48236-48828,48884,48948 Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -6,6 +6,6 @@ set_unicode(xcopy yes) -add_importlibs(xcopy shell32 user32 msvcrt) +add_importlibs(xcopy shell32 user32 msvcrt ntdll) target_link_libraries(xcopy wine) Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Da.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -30,9 +30,9 @@ STRING_PAUSE, "Tryk Enter for at begynde at kopiere\n" STRING_SIMCOPY, "%d fil(er) vil blive kopieret\n" STRING_COPY, "%d fil(er) kopieret\n" - STRING_QISDIR, "Er «%s» et filnavn eller katalog\n" \ - "på destinationen?\n" \ - "(F - Fil, K - Katalog)\n" + STRING_QISDIR, "Er «%s» et filnavn eller katalog\n \ + på destinationen?\n \ + (F - Fil, K - Katalog)\n" STRING_SRCPROMPT,"%s? (Ja|Nei)\n" STRING_OVERWRITE,"Overskrive «%s»? (Ja|Nei|Alle)\n" STRING_COPYFAIL, "Kunne ikke kopiere «%s» til «%s»; fejlet med r/c %d\n" Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/De.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -33,9 +33,9 @@ STRING_PAUSE, "Eingabetaste betÃ¤tigen, um mit dem Kopieren zu beginnen\n" STRING_SIMCOPY, "%d Datei(en) wÃ¼rden kopiert\n" STRING_COPY, "%d Datei(en) kopiert\n" - STRING_QISDIR, "Ist '%s' eine Datei oder ein Verzeichnis\n" \ - "am Zielsort?\n" \ - "(D - Datei, V - Verzeichnis)\n" + STRING_QISDIR, "Ist '%s' eine Datei oder ein Verzeichnis\n \ + am Zielsort?\n \ + (D - Datei, V - Verzeichnis)\n" STRING_SRCPROMPT,"%s? (Ja|Nein)\n" STRING_OVERWRITE,"%s Ã¼berschreiben? (Ja|Nein|Alle)\n" STRING_COPYFAIL, "Kopieren von '%s' nach '%s' fehlgeschlagen. Fehlernummer: %d\n" Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/En.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -30,9 +30,9 @@ STRING_PAUSE, "Press <enter> to begin copying\n" STRING_SIMCOPY, "%d file(s) would be copied\n" STRING_COPY, "%d file(s) copied\n" - STRING_QISDIR, "Is '%s' a filename or directory\n" \ - "on the target?\n" \ - "(F - File, D - Directory)\n" + STRING_QISDIR, "Is '%s' a filename or directory\n \ + on the target?\n \ + (F - File, D - Directory)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"Overwrite %s? (Yes|No|All)\n" STRING_COPYFAIL, "Copying of '%s' to '%s' failed with r/c %d\n" @@ -54,7 +54,7 @@ Where:\n\ \n\ [/I] Assume directory if destination does not exist and copying two or\n\ -\ more files\n\ +\tmore files\n\ [/S] Copy directories and subdirectories\n\ [/E] Copy directories and subdirectories, including any empty ones\n\ [/Q] Do not list names during copy, ie quiet.\n\ @@ -72,7 +72,7 @@ [/C] Continue even if an error occurs during the copy\n\ [/A] Only copy files with archive attribute set\n\ [/M] Only copy files with archive attribute set, removes\n\ -\ archive attribute\n\ +\tarchive attribute\n\ [/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\ \t\tIf no date is supplied, only copy if destination is older\n\ \t\tthan source\n\n" Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -33,9 +33,9 @@ STRING_PAUSE, "Appuyez sur ENTRÃE pour dÃ©marrer la copie\n" STRING_SIMCOPY, "%d fichier(s) seront copiÃ©s\n" STRING_COPY, "%d fichier(s) copiÃ©s\n" - STRING_QISDIR, "Â«Â %sÂ Â» est-il un fichier ou un rÃ©pertoire\n" \ - "dans la destinationÂ ?\n" \ - "(F - Fichier, R - RÃ©pertoire)\n" + STRING_QISDIR, "Â«Â %sÂ Â» est-il un fichier ou un rÃ©pertoire\n \ + dans la destinationÂ ?\n \ + (F - Fichier, R - RÃ©pertoire)\n" STRING_SRCPROMPT,"%sÂ ? (Oui|Non)\n" STRING_OVERWRITE,"Ãcraser %sÂ ? (Oui|Non|Tous)\n" STRING_COPYFAIL, "La copie de Â«Â %sÂ Â» vers Â«Â %sÂ Â» a Ã©chouÃ© avec le code de retour %d\n" Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/It.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/It.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/It.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -33,9 +33,9 @@ STRING_PAUSE, "Premi Invio per iniziare a copiare\n" STRING_SIMCOPY, "%d file sarebbero copiati\n" STRING_COPY, "%d file copiato/i\n" - STRING_QISDIR, "'%s' Ã¨ il nome di un file o una cartella\n" \ - "nell'obiettivo?\n" \ - "(F - File, C - Cartella)\n" + STRING_QISDIR, "'%s' Ã¨ il nome di un file o una cartella\n \ + nell'obiettivo?\n \ + (F - File, C - Cartella)\n" STRING_SRCPROMPT,"%s? (SÃ¬|No)\n" STRING_OVERWRITE,"Sovrascrivere %s? (SÃ¬|No|Tutti)\n" STRING_COPYFAIL, "La copia di '%s' in '%s' Ã¨ fallita con r/c %d\n" Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/Ja.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/Ja.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -33,9 +33,9 @@ STRING_PAUSE, "ã³ãã¼ãéå§ããã«ã¯ <enter> ãæ¼ãã¦ãã ãã\n" STRING_SIMCOPY, "%d ãã¡ã¤ã«ãã³ãã¼ãããè¦è¾¼ã¿ã§ãã\n" STRING_COPY, "%d ãã¡ã¤ã«ãã³ãã¼ãã¾ãã\n" - STRING_QISDIR, "éãåã® '%s' ã¯ãã¡ã¤ã«åã§ããã\n" \ - "ãã£ã¬ã¯ããªã§ãã?\n" \ - "(F - ãã¡ã¤ã«ãD - ãã£ã¬ã¯ããª)\n" + STRING_QISDIR, "éãåã® '%s' ã¯ãã¡ã¤ã«åã§ããã\n \ + ãã£ã¬ã¯ããªã§ãã?\n \ + (F - ãã¡ã¤ã«ãD - ãã£ã¬ã¯ããª)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"%s ãä¸æ¸ããã¾ãã? (Yes|No|All)\n" STRING_COPYFAIL, "'%s' ãã '%s' ã¸ã®ã³ãã¼ã¯å¤±æãã¾ãããæ»ãå¤ %d\n" Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -31,9 +31,9 @@ STRING_PAUSE, "<enter> ¸¦ ´©¸£¸é º¹»ç°¡ ½ÃÀÛµÉ °ÍÀÔ´Ï´Ù\n" STRING_SIMCOPY, "%d ÆÄÀÏÀÌ º¹»çµÉ °ÍÀÔ´Ï´Ù\n" STRING_COPY, "%d ÆÄÀÏÀÌ º¹»çµÇ¾ú½À´Ï´Ù\n" - STRING_QISDIR, "'%s'ÀÌ º¹»çÇÒ ÆÄÀÏÀÌ³ª µð·ºÅä¸®?\n" \ - "ÀÔ´Ï±î?\n" \ - "(F - ÆÄÀÏ, D - µð·ºÅä¸®)\n" + STRING_QISDIR, "'%s'ÀÌ º¹»çÇÒ ÆÄÀÏÀÌ³ª µð·ºÅä¸®?\n\ + ÀÔ´Ï±î?\n\ + (F - ÆÄÀÏ, D - µð·ºÅä¸®)\n" STRING_SRCPROMPT,"%s? (¿¹|¾Æ´Ï¿À)\n" STRING_OVERWRITE,"%s¸¦ µ¤¾î¾²°Ú½À´Ï±î? (¿¹|¾Æ´Ï¿À|¸ðµÎ)\n" STRING_COPYFAIL, "Copying of '%s' to '%s' failed with r/c %d\n" @@ -55,7 +55,7 @@ Where:\n\ \n\ [/I] ¸¸¾à ´ë»óÀÌ Á¸ÀçÇÏÁö ¾Ê´Â °æ¿ì µð·ºÅä¸®·Î °¡Á¤ÇÏ°í µÎ°³³ª ´õ ¸¹Àº ÆÄÀÏÀ» \n\ -\ º¹»ç\n\ +\tº¹»ç\n\ [/S] µð·ºÅä¸®ÇÏ°í ÇÏÀ§ µð·ºÅä¸® º¹»ç\n\ [/E] ºó µð·ºÅä¸®¸¦ Æ÷ÇÔÇØ¼ µð·ºÅä¸®¿Í ÇÏÀ§ µð·ºÅä¸® º¹»ç\n\ [/Q] Á¶¿ëÇÏ°Ô º¹»çµÇ´Â ÆÄÀÏÀÌ³ª µð·ºÅä¸®¸¦ Ç¥½ÃÇÏÁö ¾Ê°í º¹»ç.\n\ @@ -73,7 +73,7 @@ [/C] º¹»çÇÏ´Â µ¿¾È¿¡ ¿¡·¯°¡ ¹ß»ýÇØµµ °è¼Ó ÁøÇà\n\ [/A] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â ÆÄÀÏ¸¸ º¹»ç\n\ [/M] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀ» Á¦°ÅÇÏ¸é¼ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â\n\ -\ ÆÄÀÏ¸¸ º¹»ç\n\ +\tÆÄÀÏ¸¸ º¹»ç\n\ [/D | /D:m-d-y] ÁöÁ¤µÈ ³¯Â¥ ÈÄ¿¡ ¼öÁ¤µÇ°Å³ª »õ·Î¿î ÆÄÀÏ º¹»ç.\n\ \t\tI¸¸¾à ¾î¶°ÇÑ ³¯Â¥µµ ÁöÁ¤µÇÁö ¾ÊÀ¸¸é,¿ÀÁ÷ ¿øº»º¸´Ù\n\ \t\t´ë»óÀÌ ¿À·¡µÈ °Í¸¸ º¹»ç\n\n" Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/Lt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/Lt.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -33,9 +33,9 @@ STRING_PAUSE, "Spauskite <enter> kopijavimui pradÄti\n" STRING_SIMCOPY, "bus nukopijuota failÅ³: %d\n" STRING_COPY, "nukopijuota failÅ³: %d\n" - STRING_QISDIR, "Ar â%sâ yra failas, ar katalogas,\n" \ - "ar paskirtis?\n" \ - "(F - failas, K - katalogas)\n" + STRING_QISDIR, "Ar â%sâ yra failas, ar katalogas,\n\ + ar paskirtis?\n\ + (F - failas, K - katalogas)\n" STRING_SRCPROMPT,"%s? (Taip|Ne)\n" STRING_OVERWRITE,"PerraÅ¡yti %s? (Taip|Ne|Visus)\n" STRING_COPYFAIL, "â%sâ kopijavimas Ä¯ â%sâ nepavyko su r/c %d\n" Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/Nl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/Nl.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -32,9 +32,9 @@ STRING_PAUSE, "Druk op <enter> om te beginnen met kopiÃ«ren\n" STRING_SIMCOPY, "%d bestand(en) zouden worden gekopieerd\n" STRING_COPY, "%d bestand(en) gekopieerd\n" - STRING_QISDIR, "Is '%s' een bestand of een map\n" \ - "op de bestemming?\n" \ - "(B - Bestand, D - Directory)\n" + STRING_QISDIR, "Is '%s' een bestand of een map\n\ + op de bestemming?\n\ + (B - Bestand, D - Directory)\n" STRING_SRCPROMPT,"%s? (Ja|Nee)\n" STRING_OVERWRITE,"Overschrijven %s? (Ja|Nee|Alles)\n" STRING_COPYFAIL, "KopiÃ«ren van '%s' naar '%s' mislukt met r/c %d\n" Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/No.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/No.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/No.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -30,9 +30,9 @@ STRING_PAUSE, "Trykk Enter for å begynne å kopiere\n" STRING_SIMCOPY, "%d fil(er) ville blitt kopiert\n" STRING_COPY, "%d fil(er) kopiert\n" - STRING_QISDIR, "Eer «%s» et filnevn eller katalog\n" \ - "i målet?\n" \ - "(F - Fil, K - Katalog)\n" + STRING_QISDIR, "Eer «%s» et filnevn eller katalog\n\ + i målet?\n\ + (F - Fil, K - Katalog)\n" STRING_SRCPROMPT,"%s? (Ja|Nei)\n" STRING_OVERWRITE,"Skrive over «%s»? (Ja|Nei|Alle)\n" STRING_COPYFAIL, "Klarte ikke kopiere «%s» til «%s»; feilet med r/c %d\n" Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -31,9 +31,9 @@ STRING_PAUSE, "Nacinij <enter> aby rozpocz¹æ kopiowanie\n" STRING_SIMCOPY, "%d plik(ów) zosta³oby skopiowanych\n" STRING_COPY, "%d plik(ów) skopiowanych\n" - STRING_QISDIR, "Czy '%s' jest nazw¹ pliku czy katalogu\n" \ - "docelowego?\n" \ - "(P - plik, K - katalog)\n" + STRING_QISDIR, "Czy '%s' jest nazw¹ pliku czy katalogu\n\ + docelowego?\n\ + (P - plik, K - katalog)\n" STRING_SRCPROMPT,"%s? (Tak|Nie)\n" STRING_OVERWRITE,"Zast¹piæ %s? (Tak|Nie|Wszystkie)\n" STRING_COPYFAIL, "Kopiowanie '%s' do '%s' nie powiod³o siê - kod b³êdu %d\n" @@ -54,8 +54,8 @@ \n\ Gdzie:\n\ \n\ -[/I] Je¿eli \"cel\" nie istnieje i kopiowane s¹ co najmniej dwa pliki,\n\ -\tzak³ada, ¿e \"cel\" powien byæ katalogiem\n\ +[/I] Je¿eli ""cel"" nie istnieje i kopiowane s¹ co najmniej dwa pliki,\n\ +\tzak³ada, ¿e ""cel"" powien byæ katalogiem\n\ [/S] Kopiuje katalogi i podkatalogi\n\ [/E] Kopiuje katalogi i podkatalogi, ³¹cznie z pustymi\n\ [/Q] Nie wypisuje nazw plików podczas kopiowania (tryb cichy)\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/Pt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/Pt.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -33,9 +33,9 @@ STRING_PAUSE, "Pressione <Enter> para iniciar a cÃ³pia\n" STRING_SIMCOPY, "%d arquivo(s) seriam copiado(s)\n" STRING_COPY, "%d arquivo(s) copiado(s)\n" - STRING_QISDIR, "'%s' Ã© um arquivo ou diretÃ³rio\n" \ - "no alvo?\n" \ - "(A - Arquivo, D - DirectÃ³rio)\n" + STRING_QISDIR, "'%s' Ã© um arquivo ou diretÃ³rio\n\ + no alvo?\n\ + (A - Arquivo, D - DirectÃ³rio)\n" STRING_SRCPROMPT,"%s? (Sim|NÃ£o)\n" STRING_OVERWRITE,"Reescrever %s? (Sim|NÃ£o|Tudo)\n" STRING_COPYFAIL, "Falha ao copiar '%s' para '%s' com r/c %d\n" @@ -91,9 +91,9 @@ STRING_PAUSE, "Carregue <Enter> para iniciar cÃ³pia\n" STRING_SIMCOPY, "%d ficheiro(s) seriam copiado(s)\n" STRING_COPY, "%d ficheiro(s) copiado(s)\n" - STRING_QISDIR, "'%s' Ã© um ficheiro ou directÃ³rio\n" \ - "no alvo?\n" \ - "(F - Ficheiro, D - DirectÃ³rio)\n" + STRING_QISDIR, "'%s' Ã© um ficheiro ou directÃ³rio\n\ + no alvo?\n\ + (F - Ficheiro, D - DirectÃ³rio)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"Reescrever %s? (Yes|No|All)\n" STRING_COPYFAIL, "CÃ³pia de '%s' para '%s' falhou com r/c %d\n" Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/Ro.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/Ro.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -50,11 +50,11 @@ \n\ SintaxÄ:\n\ XCOPY sursÄ [destinaÈie] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\ [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \nCu:\n\ \n\ [/I] CreeazÄ director dacÄ destinaÈia nu existÄ Èi se copiazÄ douÄ sau\n\ -\ mai multe fiÈiere\n\ +\tmai multe fiÈiere\n\ [/S] CopiazÄ directoarele Èi subdirectoarele\n\ [/E] CopiazÄ directoarele Èi subdirectoarele, inclusiv pe cele goale\n\ [/Q] Nu afiÈa numele Ã®n timpul copierii.\n\ @@ -72,7 +72,7 @@ [/C] ContinuÄ chiar dacÄ apare o eroare Ã®n timpul copierii\n\ [/A] CopiazÄ numai fiÈierele cu atributul de arhivÄ activat\n\ [/M] CopiazÄ numai fiÈierele cu atributul de arhivÄ activat, dezactiveazÄ\n\ -\ apoi atributul\n\ +\tapoi atributul\n\ [/D | /D:m-d-y] CopiazÄ fiÈierele noi sau pe cele modificate dupÄ data\n\ \t\tspecificatÄ. DacÄ nu este specificatÄ nici o datÄ, copiazÄ\n\ \t\tnumai dacÄ fiÈierul destinaÈie este mai vechi decÃ¢t fiÈierul\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -38,8 +38,8 @@ STRING_PAUSE, "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÑ <Enter>, ÑÑÐ¾Ð±Ñ Ð½Ð°ÑÐ°ÑÑ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ.\n" STRING_SIMCOPY, "%d ÑÐ°Ð¹Ð»(Ð¾Ð²) Ð±ÑÐ»Ð¾ Ð±Ñ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" STRING_COPY, "%d ÑÐ°Ð¹Ð»(Ð¾Ð²) ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" - STRING_QISDIR, "'%s' ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°Ð¹Ð»Ð¾Ð¼ Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ¾Ð¹?\n" \ - "(F - Ð¤Ð°Ð¹Ð», D - ÐÐ°Ð¿ÐºÐ°)\n" + STRING_QISDIR, "'%s' ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°Ð¹Ð»Ð¾Ð¼ Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ¾Ð¹?\n\ + (F - Ð¤Ð°Ð¹Ð», D - ÐÐ°Ð¿ÐºÐ°)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"ÐÐµÑÐµÐ¿Ð¸ÑÐ°ÑÑ %s? (Yes|No|All)\n" STRING_COPYFAIL, "ÐÑÐ¸ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ð¸ '%s' Ð² '%s' Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°: %d\n" @@ -77,8 +77,8 @@ [/R] ÐÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÑÐ²Ð°ÐµÑ ÑÐ°Ð¹Ð»Ñ, Ð´Ð¾ÑÑÑÐ¿Ð½ÑÐµ ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ.\n\ [/H] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐºÑÑÑÑÐµ Ð¸ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐµ ÑÐ°Ð¹Ð»Ñ.\n\ [/C] ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð°ÐµÑ ÑÐ°Ð±Ð¾ÑÑ, Ð´Ð°Ð¶Ðµ ÐµÑÐ»Ð¸ Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°.\n\ -[/A] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð°ÑÑÐ¸Ð±ÑÑ \"Ð°ÑÑÐ¸Ð²Ð½ÑÐ¹\".\n\ -[/M] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð°ÑÑÐ¸Ð±ÑÑ \"Ð°ÑÑÐ¸Ð²Ð½ÑÐ¹\",\n\ +[/A] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð°ÑÑÐ¸Ð±ÑÑ ""Ð°ÑÑÐ¸Ð²Ð½ÑÐ¹"".\n\ +[/M] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð°ÑÑÐ¸Ð±ÑÑ ""Ð°ÑÑÐ¸Ð²Ð½ÑÐ¹"",\n\ Ð¿ÑÐ¸ ÑÑÐ¾Ð¼ Ð°ÑÑÐ¸Ð±ÑÑ ÑÐ´Ð°Ð»ÑÐµÑÑÑ.\n\ [/D | /D:m-d-y] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð½Ð¾Ð²ÑÐµ ÑÐ°Ð¹Ð»Ñ Ð¸Ð»Ð¸ ÑÐµ, ÐºÐ¾ÑÐ¾ÑÑÐµ Ð±ÑÐ»Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ñ\n\ Ð¿Ð¾ÑÐ»Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð´Ð°ÑÑ. ÐÑÐ»Ð¸ Ð´Ð°ÑÐ° Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð°, ÐºÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Si.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -32,9 +32,9 @@ STRING_PAUSE, "Za zaÄetek kopiranja pritisnite <enter>\n" STRING_SIMCOPY, "Prekopiral bom %d datotek\n" STRING_COPY, "Prekopiral sem %d datotek\n" - STRING_QISDIR, "Ali je '%s' ime ciljne datoteke\n" \ - "ali mape?\n" \ - "(D - Datoteka, M - Mapa)\n" + STRING_QISDIR, "Ali je '%s' ime ciljne datoteke\n\ + ali mape?\n\ + (D - Datoteka, M - Mapa)\n" STRING_SRCPROMPT,"%s? (Da|Ne)\n" STRING_OVERWRITE,"Ali naj prepiÅ¡em %s? (Da|Ne|Vse)\n" STRING_COPYFAIL, "Kopiranje '%s' v '%s' ni uspelo (koda napake: %d)\n" @@ -56,7 +56,7 @@ Where:\n\ \n\ [/I] Äe cilj ne obstaja in gre za kopiranje dveh ali veÄ datotek, predpostavi,\n\ -\da je cilj mapa\n\ +\tda je cilj mapa\n\ [/S] Kopiraj mape in podmape\n\ [/E] Kopiraj mape in podmape, vkljuÄno s praznimi mapami\n\ [/Q] Ne izpisuj imen med kopiranjem (tiho).\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/Uk.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/Uk.rc [iso-8859-1] Thu Sep 30 21:49:15 2010 @@ -34,8 +34,8 @@ STRING_PAUSE, "ÐÐ°ÑÐ¸ÑÐ½ÑÑÑ <enter> ÑÐ¾Ð± Ð¿Ð¾ÑÐ°ÑÐ¸ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ\n" STRING_SIMCOPY, "%d ÑÐ°Ð¹Ð»(ÑÐ²) Ð±ÑÐ´Ðµ ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" STRING_COPY, "%d ÑÐ°Ð¹Ð»(ÑÐ²) ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" - STRING_QISDIR, "'%s' Ñ ÑÐ°Ð¹Ð»Ð¾Ð¼ ÑÐ¸ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑÑ?\n" \ - "(F - Ð¤Ð°Ð¹Ð», D - ÐÐ¸ÑÐµÐºÑÐ¾ÑÑÑ)\n" + STRING_QISDIR, "'%s' Ñ ÑÐ°Ð¹Ð»Ð¾Ð¼ ÑÐ¸ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑÑ?\n\ + (F - Ð¤Ð°Ð¹Ð», D - ÐÐ¸ÑÐµÐºÑÐ¾ÑÑÑ)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"ÐÐµÑÐµÐ¿Ð¸ÑÐ°ÑÐ¸ %s? (Yes|No|All)\n" STRING_COPYFAIL, "ÐÑÐ´ ÑÐ°Ñ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ '%s' Ð² '%s' ÑÑÐ°Ð»Ð°ÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° r/c %d\n" @@ -75,7 +75,7 @@ [/C] ÐÑÐ¾Ð´Ð¾Ð²Ð¶ÑÑ ÑÐ¾Ð±Ð¾ÑÑ, Ð½Ð°Ð²ÑÑÑ ÑÐºÑÐ¾ Ð¿ÑÐ¸ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ ÑÑÐ°Ð»Ð°ÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°\n\ [/A] ÐÐ¾Ð¿ÑÑÑ Ð»Ð¸ÑÐµ ÑÐ°Ð¹Ð»Ð¸ Ð· Ð²Ð»Ð°ÑÑÐ¸Ð²ÑÑÑÑ ÐÐ Ð¥ÐÐÐÐÐ\n\ [/M] ÐÐ¾Ð¿ÑÑÑ Ð»Ð¸ÑÐµ ÑÐ°Ð¹Ð»Ð¸ Ð· Ð²Ð»Ð°ÑÑÐ¸Ð²ÑÑÑÑ ÐÐ Ð¥ÐÐÐÐÐ, Ð²Ð¸Ð´Ð°Ð»ÑÑ\n\ -\Ð²Ð»Ð°ÑÑÐ¸Ð²ÑÑÑÑ ÐÐ Ð¥ÐÐÐÐÐ\n\ +\tÐ²Ð»Ð°ÑÑÐ¸Ð²ÑÑÑÑ ÐÐ Ð¥ÐÐÐÐÐ\n\ [/D | /D:m-d-y] ÐÐ¾Ð¿ÑÑÑ Ð»Ð¸ÑÐµ Ð½Ð¾Ð²Ñ ÑÐ°Ð¹Ð»Ð¸ Ð°Ð±Ð¾ ÑÑ, ÑÐºÑ Ð±ÑÐ»Ð¸ Ð·Ð¼ÑÐ½ÐµÐ½Ñ Ð¿ÑÑÐ»Ñ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ñ\n\ Ð´Ð°ÑÐ¸. Ð¯ÐºÑÐ¾ Ð´Ð°ÑÐ° Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð°, ÐºÐ¾Ð¿ÑÑÑ Ð»Ð¸ÑÐµ ÑÑ ÑÐ°Ð¹Ð»Ð¸, ÑÐºÑ Ð½Ð¾Ð²ÑÑÑ\n\ Ð² Ð¿Ð¾ÑÐ°ÑÐºÐ¾Ð²ÑÐ¹ Ð¿Ð°Ð¿ÑÑ\n\n"

14 years, 2 months

[jgardou] 48948: [XCOPY] - Fix compilation with msvc 1. Someone should send this to wine (this is NOT lazyness) 2. Someone should tell mingw dev about http://msdn.microsoft.com/en-us/library/aa3810...

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 30 21:45:36 2010 New Revision: 48948 URL: http://svn.reactos.org/svn/reactos?rev=48948&view=rev Log: [XCOPY] - Fix compilation with msvc 1. Someone should send this to wine (this is NOT lazyness) 2. Someone should tell mingw dev about http://msdn.microsoft.com/en-us/library/aa381050%28v=VS.85%29.aspx Modified: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc trunk/reactos/base/applications/cmdutils/xcopy/De.rc trunk/reactos/base/applications/cmdutils/xcopy/En.rc trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc trunk/reactos/base/applications/cmdutils/xcopy/It.rc trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc trunk/reactos/base/applications/cmdutils/xcopy/No.rc trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc trunk/reactos/base/applications/cmdutils/xcopy/Si.rc trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc Modified: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -30,9 +30,9 @@ STRING_PAUSE, "Tryk Enter for at begynde at kopiere\n" STRING_SIMCOPY, "%d fil(er) vil blive kopieret\n" STRING_COPY, "%d fil(er) kopieret\n" - STRING_QISDIR, "Er «%s» et filnavn eller katalog\n" \ - "på destinationen?\n" \ - "(F - Fil, K - Katalog)\n" + STRING_QISDIR, "Er «%s» et filnavn eller katalog\n \ + på destinationen?\n \ + (F - Fil, K - Katalog)\n" STRING_SRCPROMPT,"%s? (Ja|Nei)\n" STRING_OVERWRITE,"Overskrive «%s»? (Ja|Nei|Alle)\n" STRING_COPYFAIL, "Kunne ikke kopiere «%s» til «%s»; fejlet med r/c %d\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -33,9 +33,9 @@ STRING_PAUSE, "Eingabetaste betÃ¤tigen, um mit dem Kopieren zu beginnen\n" STRING_SIMCOPY, "%d Datei(en) wÃ¼rden kopiert\n" STRING_COPY, "%d Datei(en) kopiert\n" - STRING_QISDIR, "Ist '%s' eine Datei oder ein Verzeichnis\n" \ - "am Zielsort?\n" \ - "(D - Datei, V - Verzeichnis)\n" + STRING_QISDIR, "Ist '%s' eine Datei oder ein Verzeichnis\n \ + am Zielsort?\n \ + (D - Datei, V - Verzeichnis)\n" STRING_SRCPROMPT,"%s? (Ja|Nein)\n" STRING_OVERWRITE,"%s Ã¼berschreiben? (Ja|Nein|Alle)\n" STRING_COPYFAIL, "Kopieren von '%s' nach '%s' fehlgeschlagen. Fehlernummer: %d\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -30,9 +30,9 @@ STRING_PAUSE, "Press <enter> to begin copying\n" STRING_SIMCOPY, "%d file(s) would be copied\n" STRING_COPY, "%d file(s) copied\n" - STRING_QISDIR, "Is '%s' a filename or directory\n" \ - "on the target?\n" \ - "(F - File, D - Directory)\n" + STRING_QISDIR, "Is '%s' a filename or directory\n \ + on the target?\n \ + (F - File, D - Directory)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"Overwrite %s? (Yes|No|All)\n" STRING_COPYFAIL, "Copying of '%s' to '%s' failed with r/c %d\n" @@ -54,7 +54,7 @@ Where:\n\ \n\ [/I] Assume directory if destination does not exist and copying two or\n\ -\ more files\n\ +\tmore files\n\ [/S] Copy directories and subdirectories\n\ [/E] Copy directories and subdirectories, including any empty ones\n\ [/Q] Do not list names during copy, ie quiet.\n\ @@ -72,7 +72,7 @@ [/C] Continue even if an error occurs during the copy\n\ [/A] Only copy files with archive attribute set\n\ [/M] Only copy files with archive attribute set, removes\n\ -\ archive attribute\n\ +\tarchive attribute\n\ [/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\ \t\tIf no date is supplied, only copy if destination is older\n\ \t\tthan source\n\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -33,9 +33,9 @@ STRING_PAUSE, "Appuyez sur ENTRÃE pour dÃ©marrer la copie\n" STRING_SIMCOPY, "%d fichier(s) seront copiÃ©s\n" STRING_COPY, "%d fichier(s) copiÃ©s\n" - STRING_QISDIR, "Â«Â %sÂ Â» est-il un fichier ou un rÃ©pertoire\n" \ - "dans la destinationÂ ?\n" \ - "(F - Fichier, R - RÃ©pertoire)\n" + STRING_QISDIR, "Â«Â %sÂ Â» est-il un fichier ou un rÃ©pertoire\n \ + dans la destinationÂ ?\n \ + (F - Fichier, R - RÃ©pertoire)\n" STRING_SRCPROMPT,"%sÂ ? (Oui|Non)\n" STRING_OVERWRITE,"Ãcraser %sÂ ? (Oui|Non|Tous)\n" STRING_COPYFAIL, "La copie de Â«Â %sÂ Â» vers Â«Â %sÂ Â» a Ã©chouÃ© avec le code de retour %d\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/It.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -33,9 +33,9 @@ STRING_PAUSE, "Premi Invio per iniziare a copiare\n" STRING_SIMCOPY, "%d file sarebbero copiati\n" STRING_COPY, "%d file copiato/i\n" - STRING_QISDIR, "'%s' Ã¨ il nome di un file o una cartella\n" \ - "nell'obiettivo?\n" \ - "(F - File, C - Cartella)\n" + STRING_QISDIR, "'%s' Ã¨ il nome di un file o una cartella\n \ + nell'obiettivo?\n \ + (F - File, C - Cartella)\n" STRING_SRCPROMPT,"%s? (SÃ¬|No)\n" STRING_OVERWRITE,"Sovrascrivere %s? (SÃ¬|No|Tutti)\n" STRING_COPYFAIL, "La copia di '%s' in '%s' Ã¨ fallita con r/c %d\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -33,9 +33,9 @@ STRING_PAUSE, "ã³ãã¼ãéå§ããã«ã¯ <enter> ãæ¼ãã¦ãã ãã\n" STRING_SIMCOPY, "%d ãã¡ã¤ã«ãã³ãã¼ãããè¦è¾¼ã¿ã§ãã\n" STRING_COPY, "%d ãã¡ã¤ã«ãã³ãã¼ãã¾ãã\n" - STRING_QISDIR, "éãåã® '%s' ã¯ãã¡ã¤ã«åã§ããã\n" \ - "ãã£ã¬ã¯ããªã§ãã?\n" \ - "(F - ãã¡ã¤ã«ãD - ãã£ã¬ã¯ããª)\n" + STRING_QISDIR, "éãåã® '%s' ã¯ãã¡ã¤ã«åã§ããã\n \ + ãã£ã¬ã¯ããªã§ãã?\n \ + (F - ãã¡ã¤ã«ãD - ãã£ã¬ã¯ããª)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"%s ãä¸æ¸ããã¾ãã? (Yes|No|All)\n" STRING_COPYFAIL, "'%s' ãã '%s' ã¸ã®ã³ãã¼ã¯å¤±æãã¾ãããæ»ãå¤ %d\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -31,9 +31,9 @@ STRING_PAUSE, "<enter> ¸¦ ´©¸£¸é º¹»ç°¡ ½ÃÀÛµÉ °ÍÀÔ´Ï´Ù\n" STRING_SIMCOPY, "%d ÆÄÀÏÀÌ º¹»çµÉ °ÍÀÔ´Ï´Ù\n" STRING_COPY, "%d ÆÄÀÏÀÌ º¹»çµÇ¾ú½À´Ï´Ù\n" - STRING_QISDIR, "'%s'ÀÌ º¹»çÇÒ ÆÄÀÏÀÌ³ª µð·ºÅä¸®?\n" \ - "ÀÔ´Ï±î?\n" \ - "(F - ÆÄÀÏ, D - µð·ºÅä¸®)\n" + STRING_QISDIR, "'%s'ÀÌ º¹»çÇÒ ÆÄÀÏÀÌ³ª µð·ºÅä¸®?\n\ + ÀÔ´Ï±î?\n\ + (F - ÆÄÀÏ, D - µð·ºÅä¸®)\n" STRING_SRCPROMPT,"%s? (¿¹|¾Æ´Ï¿À)\n" STRING_OVERWRITE,"%s¸¦ µ¤¾î¾²°Ú½À´Ï±î? (¿¹|¾Æ´Ï¿À|¸ðµÎ)\n" STRING_COPYFAIL, "Copying of '%s' to '%s' failed with r/c %d\n" @@ -55,7 +55,7 @@ Where:\n\ \n\ [/I] ¸¸¾à ´ë»óÀÌ Á¸ÀçÇÏÁö ¾Ê´Â °æ¿ì µð·ºÅä¸®·Î °¡Á¤ÇÏ°í µÎ°³³ª ´õ ¸¹Àº ÆÄÀÏÀ» \n\ -\ º¹»ç\n\ +\tº¹»ç\n\ [/S] µð·ºÅä¸®ÇÏ°í ÇÏÀ§ µð·ºÅä¸® º¹»ç\n\ [/E] ºó µð·ºÅä¸®¸¦ Æ÷ÇÔÇØ¼ µð·ºÅä¸®¿Í ÇÏÀ§ µð·ºÅä¸® º¹»ç\n\ [/Q] Á¶¿ëÇÏ°Ô º¹»çµÇ´Â ÆÄÀÏÀÌ³ª µð·ºÅä¸®¸¦ Ç¥½ÃÇÏÁö ¾Ê°í º¹»ç.\n\ @@ -73,7 +73,7 @@ [/C] º¹»çÇÏ´Â µ¿¾È¿¡ ¿¡·¯°¡ ¹ß»ýÇØµµ °è¼Ó ÁøÇà\n\ [/A] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â ÆÄÀÏ¸¸ º¹»ç\n\ [/M] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀ» Á¦°ÅÇÏ¸é¼ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â\n\ -\ ÆÄÀÏ¸¸ º¹»ç\n\ +\tÆÄÀÏ¸¸ º¹»ç\n\ [/D | /D:m-d-y] ÁöÁ¤µÈ ³¯Â¥ ÈÄ¿¡ ¼öÁ¤µÇ°Å³ª »õ·Î¿î ÆÄÀÏ º¹»ç.\n\ \t\tI¸¸¾à ¾î¶°ÇÑ ³¯Â¥µµ ÁöÁ¤µÇÁö ¾ÊÀ¸¸é,¿ÀÁ÷ ¿øº»º¸´Ù\n\ \t\t´ë»óÀÌ ¿À·¡µÈ °Í¸¸ º¹»ç\n\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -33,9 +33,9 @@ STRING_PAUSE, "Spauskite <enter> kopijavimui pradÄti\n" STRING_SIMCOPY, "bus nukopijuota failÅ³: %d\n" STRING_COPY, "nukopijuota failÅ³: %d\n" - STRING_QISDIR, "Ar â%sâ yra failas, ar katalogas,\n" \ - "ar paskirtis?\n" \ - "(F - failas, K - katalogas)\n" + STRING_QISDIR, "Ar â%sâ yra failas, ar katalogas,\n\ + ar paskirtis?\n\ + (F - failas, K - katalogas)\n" STRING_SRCPROMPT,"%s? (Taip|Ne)\n" STRING_OVERWRITE,"PerraÅ¡yti %s? (Taip|Ne|Visus)\n" STRING_COPYFAIL, "â%sâ kopijavimas Ä¯ â%sâ nepavyko su r/c %d\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -32,9 +32,9 @@ STRING_PAUSE, "Druk op <enter> om te beginnen met kopiÃ«ren\n" STRING_SIMCOPY, "%d bestand(en) zouden worden gekopieerd\n" STRING_COPY, "%d bestand(en) gekopieerd\n" - STRING_QISDIR, "Is '%s' een bestand of een map\n" \ - "op de bestemming?\n" \ - "(B - Bestand, D - Directory)\n" + STRING_QISDIR, "Is '%s' een bestand of een map\n\ + op de bestemming?\n\ + (B - Bestand, D - Directory)\n" STRING_SRCPROMPT,"%s? (Ja|Nee)\n" STRING_OVERWRITE,"Overschrijven %s? (Ja|Nee|Alles)\n" STRING_COPYFAIL, "KopiÃ«ren van '%s' naar '%s' mislukt met r/c %d\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/No.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -30,9 +30,9 @@ STRING_PAUSE, "Trykk Enter for å begynne å kopiere\n" STRING_SIMCOPY, "%d fil(er) ville blitt kopiert\n" STRING_COPY, "%d fil(er) kopiert\n" - STRING_QISDIR, "Eer «%s» et filnevn eller katalog\n" \ - "i målet?\n" \ - "(F - Fil, K - Katalog)\n" + STRING_QISDIR, "Eer «%s» et filnevn eller katalog\n\ + i målet?\n\ + (F - Fil, K - Katalog)\n" STRING_SRCPROMPT,"%s? (Ja|Nei)\n" STRING_OVERWRITE,"Skrive over «%s»? (Ja|Nei|Alle)\n" STRING_COPYFAIL, "Klarte ikke kopiere «%s» til «%s»; feilet med r/c %d\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -31,9 +31,9 @@ STRING_PAUSE, "Nacinij <enter> aby rozpocz¹æ kopiowanie\n" STRING_SIMCOPY, "%d plik(ów) zosta³oby skopiowanych\n" STRING_COPY, "%d plik(ów) skopiowanych\n" - STRING_QISDIR, "Czy '%s' jest nazw¹ pliku czy katalogu\n" \ - "docelowego?\n" \ - "(P - plik, K - katalog)\n" + STRING_QISDIR, "Czy '%s' jest nazw¹ pliku czy katalogu\n\ + docelowego?\n\ + (P - plik, K - katalog)\n" STRING_SRCPROMPT,"%s? (Tak|Nie)\n" STRING_OVERWRITE,"Zast¹piæ %s? (Tak|Nie|Wszystkie)\n" STRING_COPYFAIL, "Kopiowanie '%s' do '%s' nie powiod³o siê - kod b³êdu %d\n" @@ -54,8 +54,8 @@ \n\ Gdzie:\n\ \n\ -[/I] Je¿eli \"cel\" nie istnieje i kopiowane s¹ co najmniej dwa pliki,\n\ -\tzak³ada, ¿e \"cel\" powien byæ katalogiem\n\ +[/I] Je¿eli ""cel"" nie istnieje i kopiowane s¹ co najmniej dwa pliki,\n\ +\tzak³ada, ¿e ""cel"" powien byæ katalogiem\n\ [/S] Kopiuje katalogi i podkatalogi\n\ [/E] Kopiuje katalogi i podkatalogi, ³¹cznie z pustymi\n\ [/Q] Nie wypisuje nazw plików podczas kopiowania (tryb cichy)\n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -33,9 +33,9 @@ STRING_PAUSE, "Pressione <Enter> para iniciar a cÃ³pia\n" STRING_SIMCOPY, "%d arquivo(s) seriam copiado(s)\n" STRING_COPY, "%d arquivo(s) copiado(s)\n" - STRING_QISDIR, "'%s' Ã© um arquivo ou diretÃ³rio\n" \ - "no alvo?\n" \ - "(A - Arquivo, D - DirectÃ³rio)\n" + STRING_QISDIR, "'%s' Ã© um arquivo ou diretÃ³rio\n\ + no alvo?\n\ + (A - Arquivo, D - DirectÃ³rio)\n" STRING_SRCPROMPT,"%s? (Sim|NÃ£o)\n" STRING_OVERWRITE,"Reescrever %s? (Sim|NÃ£o|Tudo)\n" STRING_COPYFAIL, "Falha ao copiar '%s' para '%s' com r/c %d\n" @@ -91,9 +91,9 @@ STRING_PAUSE, "Carregue <Enter> para iniciar cÃ³pia\n" STRING_SIMCOPY, "%d ficheiro(s) seriam copiado(s)\n" STRING_COPY, "%d ficheiro(s) copiado(s)\n" - STRING_QISDIR, "'%s' Ã© um ficheiro ou directÃ³rio\n" \ - "no alvo?\n" \ - "(F - Ficheiro, D - DirectÃ³rio)\n" + STRING_QISDIR, "'%s' Ã© um ficheiro ou directÃ³rio\n\ + no alvo?\n\ + (F - Ficheiro, D - DirectÃ³rio)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"Reescrever %s? (Yes|No|All)\n" STRING_COPYFAIL, "CÃ³pia de '%s' para '%s' falhou com r/c %d\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -50,11 +50,11 @@ \n\ SintaxÄ:\n\ XCOPY sursÄ [destinaÈie] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\ [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \nCu:\n\ \n\ [/I] CreeazÄ director dacÄ destinaÈia nu existÄ Èi se copiazÄ douÄ sau\n\ -\ mai multe fiÈiere\n\ +\tmai multe fiÈiere\n\ [/S] CopiazÄ directoarele Èi subdirectoarele\n\ [/E] CopiazÄ directoarele Èi subdirectoarele, inclusiv pe cele goale\n\ [/Q] Nu afiÈa numele Ã®n timpul copierii.\n\ @@ -72,7 +72,7 @@ [/C] ContinuÄ chiar dacÄ apare o eroare Ã®n timpul copierii\n\ [/A] CopiazÄ numai fiÈierele cu atributul de arhivÄ activat\n\ [/M] CopiazÄ numai fiÈierele cu atributul de arhivÄ activat, dezactiveazÄ\n\ -\ apoi atributul\n\ +\tapoi atributul\n\ [/D | /D:m-d-y] CopiazÄ fiÈierele noi sau pe cele modificate dupÄ data\n\ \t\tspecificatÄ. DacÄ nu este specificatÄ nici o datÄ, copiazÄ\n\ \t\tnumai dacÄ fiÈierul destinaÈie este mai vechi decÃ¢t fiÈierul\n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -38,8 +38,8 @@ STRING_PAUSE, "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÑ <Enter>, ÑÑÐ¾Ð±Ñ Ð½Ð°ÑÐ°ÑÑ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ.\n" STRING_SIMCOPY, "%d ÑÐ°Ð¹Ð»(Ð¾Ð²) Ð±ÑÐ»Ð¾ Ð±Ñ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" STRING_COPY, "%d ÑÐ°Ð¹Ð»(Ð¾Ð²) ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" - STRING_QISDIR, "'%s' ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°Ð¹Ð»Ð¾Ð¼ Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ¾Ð¹?\n" \ - "(F - Ð¤Ð°Ð¹Ð», D - ÐÐ°Ð¿ÐºÐ°)\n" + STRING_QISDIR, "'%s' ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°Ð¹Ð»Ð¾Ð¼ Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ¾Ð¹?\n\ + (F - Ð¤Ð°Ð¹Ð», D - ÐÐ°Ð¿ÐºÐ°)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"ÐÐµÑÐµÐ¿Ð¸ÑÐ°ÑÑ %s? (Yes|No|All)\n" STRING_COPYFAIL, "ÐÑÐ¸ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ð¸ '%s' Ð² '%s' Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°: %d\n" @@ -77,8 +77,8 @@ [/R] ÐÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÑÐ²Ð°ÐµÑ ÑÐ°Ð¹Ð»Ñ, Ð´Ð¾ÑÑÑÐ¿Ð½ÑÐµ ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ.\n\ [/H] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐºÑÑÑÑÐµ Ð¸ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐµ ÑÐ°Ð¹Ð»Ñ.\n\ [/C] ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð°ÐµÑ ÑÐ°Ð±Ð¾ÑÑ, Ð´Ð°Ð¶Ðµ ÐµÑÐ»Ð¸ Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°.\n\ -[/A] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð°ÑÑÐ¸Ð±ÑÑ \"Ð°ÑÑÐ¸Ð²Ð½ÑÐ¹\".\n\ -[/M] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð°ÑÑÐ¸Ð±ÑÑ \"Ð°ÑÑÐ¸Ð²Ð½ÑÐ¹\",\n\ +[/A] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð°ÑÑÐ¸Ð±ÑÑ ""Ð°ÑÑÐ¸Ð²Ð½ÑÐ¹"".\n\ +[/M] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð°ÑÑÐ¸Ð±ÑÑ ""Ð°ÑÑÐ¸Ð²Ð½ÑÐ¹"",\n\ Ð¿ÑÐ¸ ÑÑÐ¾Ð¼ Ð°ÑÑÐ¸Ð±ÑÑ ÑÐ´Ð°Ð»ÑÐµÑÑÑ.\n\ [/D | /D:m-d-y] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð½Ð¾Ð²ÑÐµ ÑÐ°Ð¹Ð»Ñ Ð¸Ð»Ð¸ ÑÐµ, ÐºÐ¾ÑÐ¾ÑÑÐµ Ð±ÑÐ»Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ñ\n\ Ð¿Ð¾ÑÐ»Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð´Ð°ÑÑ. ÐÑÐ»Ð¸ Ð´Ð°ÑÐ° Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð°, ÐºÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾\n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -32,9 +32,9 @@ STRING_PAUSE, "Za zaÄetek kopiranja pritisnite <enter>\n" STRING_SIMCOPY, "Prekopiral bom %d datotek\n" STRING_COPY, "Prekopiral sem %d datotek\n" - STRING_QISDIR, "Ali je '%s' ime ciljne datoteke\n" \ - "ali mape?\n" \ - "(D - Datoteka, M - Mapa)\n" + STRING_QISDIR, "Ali je '%s' ime ciljne datoteke\n\ + ali mape?\n\ + (D - Datoteka, M - Mapa)\n" STRING_SRCPROMPT,"%s? (Da|Ne)\n" STRING_OVERWRITE,"Ali naj prepiÅ¡em %s? (Da|Ne|Vse)\n" STRING_COPYFAIL, "Kopiranje '%s' v '%s' ni uspelo (koda napake: %d)\n" @@ -56,7 +56,7 @@ Where:\n\ \n\ [/I] Äe cilj ne obstaja in gre za kopiranje dveh ali veÄ datotek, predpostavi,\n\ -\da je cilj mapa\n\ +\tda je cilj mapa\n\ [/S] Kopiraj mape in podmape\n\ [/E] Kopiraj mape in podmape, vkljuÄno s praznimi mapami\n\ [/Q] Ne izpisuj imen med kopiranjem (tiho).\n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc [iso-8859-1] Thu Sep 30 21:45:36 2010 @@ -34,8 +34,8 @@ STRING_PAUSE, "ÐÐ°ÑÐ¸ÑÐ½ÑÑÑ <enter> ÑÐ¾Ð± Ð¿Ð¾ÑÐ°ÑÐ¸ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ\n" STRING_SIMCOPY, "%d ÑÐ°Ð¹Ð»(ÑÐ²) Ð±ÑÐ´Ðµ ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" STRING_COPY, "%d ÑÐ°Ð¹Ð»(ÑÐ²) ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" - STRING_QISDIR, "'%s' Ñ ÑÐ°Ð¹Ð»Ð¾Ð¼ ÑÐ¸ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑÑ?\n" \ - "(F - Ð¤Ð°Ð¹Ð», D - ÐÐ¸ÑÐµÐºÑÐ¾ÑÑÑ)\n" + STRING_QISDIR, "'%s' Ñ ÑÐ°Ð¹Ð»Ð¾Ð¼ ÑÐ¸ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑÑ?\n\ + (F - Ð¤Ð°Ð¹Ð», D - ÐÐ¸ÑÐµÐºÑÐ¾ÑÑÑ)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"ÐÐµÑÐµÐ¿Ð¸ÑÐ°ÑÐ¸ %s? (Yes|No|All)\n" STRING_COPYFAIL, "ÐÑÐ´ ÑÐ°Ñ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ '%s' Ð² '%s' ÑÑÐ°Ð»Ð°ÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° r/c %d\n" @@ -75,7 +75,7 @@ [/C] ÐÑÐ¾Ð´Ð¾Ð²Ð¶ÑÑ ÑÐ¾Ð±Ð¾ÑÑ, Ð½Ð°Ð²ÑÑÑ ÑÐºÑÐ¾ Ð¿ÑÐ¸ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ ÑÑÐ°Ð»Ð°ÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°\n\ [/A] ÐÐ¾Ð¿ÑÑÑ Ð»Ð¸ÑÐµ ÑÐ°Ð¹Ð»Ð¸ Ð· Ð²Ð»Ð°ÑÑÐ¸Ð²ÑÑÑÑ ÐÐ Ð¥ÐÐÐÐÐ\n\ [/M] ÐÐ¾Ð¿ÑÑÑ Ð»Ð¸ÑÐµ ÑÐ°Ð¹Ð»Ð¸ Ð· Ð²Ð»Ð°ÑÑÐ¸Ð²ÑÑÑÑ ÐÐ Ð¥ÐÐÐÐÐ, Ð²Ð¸Ð´Ð°Ð»ÑÑ\n\ -\Ð²Ð»Ð°ÑÑÐ¸Ð²ÑÑÑÑ ÐÐ Ð¥ÐÐÐÐÐ\n\ +\tÐ²Ð»Ð°ÑÑÐ¸Ð²ÑÑÑÑ ÐÐ Ð¥ÐÐÐÐÐ\n\ [/D | /D:m-d-y] ÐÐ¾Ð¿ÑÑÑ Ð»Ð¸ÑÐµ Ð½Ð¾Ð²Ñ ÑÐ°Ð¹Ð»Ð¸ Ð°Ð±Ð¾ ÑÑ, ÑÐºÑ Ð±ÑÐ»Ð¸ Ð·Ð¼ÑÐ½ÐµÐ½Ñ Ð¿ÑÑÐ»Ñ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ñ\n\ Ð´Ð°ÑÐ¸. Ð¯ÐºÑÐ¾ Ð´Ð°ÑÐ° Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð°, ÐºÐ¾Ð¿ÑÑÑ Ð»Ð¸ÑÐµ ÑÑ ÑÐ°Ð¹Ð»Ð¸, ÑÐºÑ Ð½Ð¾Ð²ÑÑÑ\n\ Ð² Ð¿Ð¾ÑÐ°ÑÐºÐ¾Ð²ÑÐ¹ Ð¿Ð°Ð¿ÑÑ\n\n"

14 years, 2 months

[akhaldi] 48947: [CMAKE] - Add audio_test, kmixer, wdmaud, sysaudio and ntvdm to build. By Alexey Komarov.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 30 20:37:04 2010 New Revision: 48947 URL: http://svn.reactos.org/svn/reactos?rev=48947&view=rev Log: [CMAKE] - Add audio_test, kmixer, wdmaud, sysaudio and ntvdm to build. By Alexey Komarov. Added: branches/cmake-bringup/drivers/wdm/CMakeLists.txt (with props) branches/cmake-bringup/drivers/wdm/audio/CMakeLists.txt (with props) branches/cmake-bringup/drivers/wdm/audio/backpln/CMakeLists.txt (with props) branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt (with props) branches/cmake-bringup/drivers/wdm/audio/filters/CMakeLists.txt (with props) branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt (with props) branches/cmake-bringup/drivers/wdm/audio/legacy/CMakeLists.txt (with props) branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt (with props) branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt (with props) branches/cmake-bringup/subsystems/ntvdm/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/CMakeLists.txt branches/cmake-bringup/subsystems/CMakeLists.txt Modified: branches/cmake-bringup/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/CMakeList… ============================================================================== --- branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] Thu Sep 30 20:37:04 2010 @@ -8,4 +8,5 @@ add_subdirectory(setup) add_subdirectory(storage) add_subdirectory(video) +add_subdirectory(wdm) add_subdirectory(wmi) Added: branches/cmake-bringup/drivers/wdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/CMake… ============================================================================== --- branches/cmake-bringup/drivers/wdm/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wdm/CMakeLists.txt [iso-8859-1] Thu Sep 30 20:37:04 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(audio) Propchange: branches/cmake-bringup/drivers/wdm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/wdm/audio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wdm/audio/CMakeLists.txt [iso-8859-1] Thu Sep 30 20:37:04 2010 @@ -1,0 +1,5 @@ + +add_subdirectory(backpln) +add_subdirectory(filters) +add_subdirectory(legacy) +add_subdirectory(sysaudio) Propchange: branches/cmake-bringup/drivers/wdm/audio/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/wdm/audio/backpln/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/CMakeLists.txt [iso-8859-1] Thu Sep 30 20:37:04 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(audio_test) Propchange: branches/cmake-bringup/drivers/wdm/audio/backpln/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt [iso-8859-1] Thu Sep 30 20:37:04 2010 @@ -1,0 +1,18 @@ + +add_definitions(-DPC_NO_IMPORTS) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories(${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud) +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) + +add_executable(audio_test audio_test.c) + +set_module_type(audio_test win32cui) + +target_link_libraries(audio_test + libsamplerate + mingw_main + mingw_common) + +add_importlibs(audio_test setupapi ksuser msvcrt) +add_dependencies(audio_test psdk bugcodes) Propchange: branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/wdm/audio/filters/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/filters/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wdm/audio/filters/CMakeLists.txt [iso-8859-1] Thu Sep 30 20:37:04 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(kmixer) Propchange: branches/cmake-bringup/drivers/wdm/audio/filters/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt [iso-8859-1] Thu Sep 30 20:37:04 2010 @@ -1,0 +1,16 @@ + +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) + +add_library(kmixer SHARED + kmixer.c + filter.c + pin.c) + +set_target_properties(kmixer PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(kmixer + libcntpr + libsamplerate) + +add_importlibs(kmixer ntoskrnl ks hal) +add_dependencies(kmixer psdk bugcodes) Propchange: branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/wdm/audio/legacy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/legacy/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wdm/audio/legacy/CMakeLists.txt [iso-8859-1] Thu Sep 30 20:37:04 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(wdmaud) Propchange: branches/cmake-bringup/drivers/wdm/audio/legacy/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] Thu Sep 30 20:37:04 2010 @@ -1,0 +1,23 @@ + +add_definitions(-D_COMDDK_) + +include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) + +add_library(wdmaud SHARED + control.c + deviface.c + entry.c + mmixer.c + sup.c + wdmaud.rc) + +set_target_properties(wdmaud PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(wdmaud + mmixer + libcntpr + pseh) + +add_importlibs(wdmaud ntoskrnl ks hal) +add_dependencies(wdmaud psdk bugcodes) Propchange: branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt [iso-8859-1] Thu Sep 30 20:37:04 2010 @@ -1,0 +1,17 @@ + +add_definitions(-D_COMDDK_) + +add_library(sysaudio SHARED + control.c + deviface.c + dispatcher.c + main.c + pin.c + sysaudio.rc) + +set_target_properties(sysaudio PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(sysaudio libcntpr) + +add_importlibs(sysaudio ntoskrnl ks hal) +add_dependencies(sysaudio psdk bugcodes) Propchange: branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/subsystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/CMakeL… ============================================================================== --- branches/cmake-bringup/subsystems/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/CMakeLists.txt [iso-8859-1] Thu Sep 30 20:37:04 2010 @@ -1,2 +1,3 @@ +add_subdirectory(ntvdm) add_subdirectory(win32) Added: branches/cmake-bringup/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/ntvdm/… ============================================================================== --- branches/cmake-bringup/subsystems/ntvdm/CMakeLists.txt (added) +++ branches/cmake-bringup/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Thu Sep 30 20:37:04 2010 @@ -1,0 +1,17 @@ + +include_directories(.) + +set_rc_compiler() + +add_executable(ntvdm + ntvdm.c + ntvdm.rc) + +set_module_type(ntvdm win32cui) + +target_link_libraries(ntvdm + mingw_main + mingw_common) + +add_importlibs(ntvdm ntdll user32 gdi32 advapi32 kernel32 msvcrt) +add_dependencies(ntvdm ndk bugcodes) Propchange: branches/cmake-bringup/subsystems/ntvdm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 2 months

[akhaldi] 48946: [CMAKE] - Add vgaddi, bmfd, vbemp, vgamp, vga, vmx_svga and xboxvmp to build. By Alexey Komarov.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 30 19:10:49 2010 New Revision: 48946 URL: http://svn.reactos.org/svn/reactos?rev=48946&view=rev Log: [CMAKE] - Add vgaddi, bmfd, vbemp, vgamp, vga, vmx_svga and xboxvmp to build. By Alexey Komarov. Added: branches/cmake-bringup/drivers/video/displays/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/font/bmfd/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/miniport/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/miniport/vbe/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/miniport/vga/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/miniport/vmx_svga/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/miniport/xboxvmp/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libvideoprt.a (with props) branches/cmake-bringup/importlibs/libwin32k.a (with props) Modified: branches/cmake-bringup/drivers/video/CMakeLists.txt Modified: branches/cmake-bringup/drivers/video/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/CMa… ============================================================================== --- branches/cmake-bringup/drivers/video/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/CMakeLists.txt [iso-8859-1] Thu Sep 30 19:10:49 2010 @@ -1,3 +1,5 @@ +add_subdirectory(displays) add_subdirectory(font) +add_subdirectory(miniport) add_subdirectory(videoprt) Added: branches/cmake-bringup/drivers/video/displays/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/dis… ============================================================================== --- branches/cmake-bringup/drivers/video/displays/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/displays/CMakeLists.txt [iso-8859-1] Thu Sep 30 19:10:49 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(vga) Propchange: branches/cmake-bringup/drivers/video/displays/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/dis… ============================================================================== --- branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt [iso-8859-1] Thu Sep 30 19:10:49 2010 @@ -1,0 +1,22 @@ + +spec2def(vgaddi ${CMAKE_CURRENT_SOURCE_DIR}/vgaddi.spec ${CMAKE_CURRENT_BINARY_DIR}/vgaddi.def) + +add_library(vgaddi SHARED + main/enable.c + objects/screen.c + objects/pointer.c + objects/lineto.c + objects/paint.c + objects/bitblt.c + objects/transblt.c + objects/offscreen.c + objects/copybits.c + vgavideo/vgavideo.c + vgaddi.rc) + +set_target_properties(vgaddi PROPERTIES LINK_FLAGS "-Wl,-entry,_DrvEnableDriver@12 -Wl,--subsystem,native -Wl,--image-base,0x00010000") + +target_link_libraries(vgaddi ${CMAKE_CURRENT_BINARY_DIR}/vgaddi.def) + +add_importlibs(vgaddi win32k) +add_dependencies(vgaddi vgaddi_def psdk bugcodes) Propchange: branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/video/font/bmfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/fon… ============================================================================== --- branches/cmake-bringup/drivers/video/font/bmfd/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/font/bmfd/CMakeLists.txt [iso-8859-1] Thu Sep 30 19:10:49 2010 @@ -1,0 +1,12 @@ + +add_library(bmfd SHARED + enable.c + font.c + glyph.c) + +set_target_properties(bmfd PROPERTIES LINK_FLAGS "-Wl,-entry,_BmfdEnableDriver@12 -Wl,--subsystem,native -Wl,--image-base,0x00010000") + +target_link_libraries(bmfd libcntpr) + +add_importlibs(bmfd win32k) +add_dependencies(bmfd psdk bugcodes) Propchange: branches/cmake-bringup/drivers/video/font/bmfd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/video/miniport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/miniport/CMakeLists.txt [iso-8859-1] Thu Sep 30 19:10:49 2010 @@ -1,0 +1,6 @@ + +add_subdirectory(vbe) +add_subdirectory(vga) +add_subdirectory(vga_new) +add_subdirectory(vmx_svga) +add_subdirectory(xboxvmp) Propchange: branches/cmake-bringup/drivers/video/miniport/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/video/miniport/vbe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/vbe/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/miniport/vbe/CMakeLists.txt [iso-8859-1] Thu Sep 30 19:10:49 2010 @@ -1,0 +1,10 @@ + +add_library(vbemp SHARED + edid.c + vbemp.c + vbemp.rc) + +set_target_properties(vbemp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") + +add_importlibs(vbemp videoprt) +add_dependencies(vbemp psdk bugcodes) Propchange: branches/cmake-bringup/drivers/video/miniport/vbe/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/video/miniport/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/vga/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/miniport/vga/CMakeLists.txt [iso-8859-1] Thu Sep 30 19:10:49 2010 @@ -1,0 +1,13 @@ + +list(APPEND SOURCE + initvga.c + vgamp.c + vgamp.rc) + +add_library(vgamp SHARED ${CMAKE_CURRENT_BINARY_DIR}/vgamp_vgamp.h.gch ${SOURCE}) + +set_target_properties(vgamp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") + +add_importlibs(vgamp videoprt) +add_pch(vgamp ${CMAKE_CURRENT_SOURCE_DIR}/vgamp.h ${SOURCE}) +add_dependencies(vgamp psdk bugcodes) Propchange: branches/cmake-bringup/drivers/video/miniport/vga/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] Thu Sep 30 19:10:49 2010 @@ -1,0 +1,18 @@ + +list(APPEND SOURCE + modeset.c + vgadata.c + vga.c + vbemodes.c + vbe.c + vga.rc) + +add_library(vga SHARED ${CMAKE_CURRENT_BINARY_DIR}/vga_vga.h.gch ${SOURCE}) + +set_target_properties(vga PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin" LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") + +target_link_libraries(vga libcntpr) + +add_importlibs(vga videoprt) +add_pch(vga ${CMAKE_CURRENT_SOURCE_DIR}/vga.h ${SOURCE}) +add_dependencies(vga psdk bugcodes) Propchange: branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/video/miniport/vmx_svga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/vmx_svga/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/miniport/vmx_svga/CMakeLists.txt [iso-8859-1] Thu Sep 30 19:10:49 2010 @@ -1,0 +1,10 @@ + +list(APPEND SOURCE vmx_svga.c vmx_svga.rc) + +add_library(vmx_svga SHARED ${CMAKE_CURRENT_BINARY_DIR}/vmx_svga_precomp.h.gch ${SOURCE}) + +set_target_properties(vmx_svga PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") + +add_importlibs(vmx_svga ntoskrnl videoprt) +add_pch(vmx_svga ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(vmx_svga psdk bugcodes) Propchange: branches/cmake-bringup/drivers/video/miniport/vmx_svga/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/video/miniport/xboxvmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/xboxvmp/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/miniport/xboxvmp/CMakeLists.txt [iso-8859-1] Thu Sep 30 19:10:49 2010 @@ -1,0 +1,7 @@ + +add_library(xboxvmp SHARED xboxvmp.c xboxvmp.rc) + +set_target_properties(xboxvmp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") + +add_importlibs(xboxvmp ntoskrnl videoprt) +add_dependencies(xboxvmp psdk bugcodes) Propchange: branches/cmake-bringup/drivers/video/miniport/xboxvmp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/importlibs/libvideoprt.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libvid… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libvideoprt.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libwin32k.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libwin32k.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

14 years, 2 months

[jgardou] 48945: [CMAKE] - fix reg compilation with msc

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 30 18:57:28 2010 New Revision: 48945 URL: http://svn.reactos.org/svn/reactos?rev=48945&view=rev Log: [CMAKE] - fix reg compilation with msc Modified: branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] Thu Sep 30 18:57:28 2010 @@ -1,3 +1,4 @@ +remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) add_executable(reg

14 years, 2 months

[jgardou] 48944: Merge 48942

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 30 18:56:42 2010 New Revision: 48944 URL: http://svn.reactos.org/svn/reactos?rev=48944&view=rev Log: Merge 48942 Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/ (props changed) branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.c branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.h Propchange: branches/cmake-bringup/base/applications/cmdutils/doskey/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Sep 30 18:56:42 2010 @@ -1,0 +1,5 @@ +/branches/header-work/base/applications/cmdutils/doskey:45691-47721 +/branches/reactos-yarotows/base/applications/cmdutils/doskey:46372,46848,46966,47800,48026,48064 +/branches/ros-amd64-bringup/base/applications/cmdutils/doskey:36852 +/branches/ros-amd64-bringup/reactos/base/applications/cmdutils/doskey:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/trunk/reactos/base/applications/cmdutils/doskey:48236-48828,48884,48942 Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Thu Sep 30 18:56:42 2010 @@ -1,11 +1,23 @@ #include <windows.h> #include <stdio.h> -#include <tchar.h> +#include <wchar.h> +#include <assert.h> #include "doskey.h" #define MAX_STRING 2000 -TCHAR szStringBuf[MAX_STRING]; -LPTSTR pszExeName = _T("cmd.exe"); +WCHAR szStringBuf[MAX_STRING]; +LPWSTR pszExeName = L"cmd.exe"; + +/* Function pointers */ +typedef DWORD (WINAPI *GetConsoleCommandHistoryW_t) (LPWSTR sCommands, DWORD nBufferLength, LPWSTR sExeName); +typedef DWORD (WINAPI *GetConsoleCommandHistoryLengthW_t) (LPWSTR sExeName); +typedef BOOL (WINAPI *SetConsoleNumberOfCommandsW_t)(DWORD nNumber, LPWSTR sExeName); +typedef VOID (WINAPI *ExpungeConsoleCommandHistoryW_t)(LPWSTR sExeName); + +GetConsoleCommandHistoryW_t pGetConsoleCommandHistoryW; +GetConsoleCommandHistoryLengthW_t pGetConsoleCommandHistoryLengthW; +SetConsoleNumberOfCommandsW_t pSetConsoleNumberOfCommandsW; +ExpungeConsoleCommandHistoryW_t pExpungeConsoleCommandHistoryW; static VOID SetInsert(DWORD dwFlag) { @@ -18,79 +30,74 @@ static VOID PrintHistory(VOID) { - DWORD Length = GetConsoleCommandHistoryLength(pszExeName); - DWORD BufferLength; + DWORD Length = pGetConsoleCommandHistoryLengthW(pszExeName); PBYTE HistBuf; - TCHAR *Hist; - TCHAR *HistEnd; - - /* On Windows, the ANSI version of GetConsoleCommandHistory requires - * a buffer twice as large as the actual history length. */ - BufferLength = Length * (sizeof(WCHAR) / sizeof(TCHAR)) * sizeof(BYTE); + WCHAR *Hist; + WCHAR *HistEnd; HistBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - BufferLength); + Length); if (!HistBuf) return; - Hist = (TCHAR *)HistBuf; - HistEnd = (TCHAR *)&HistBuf[Length]; - - if (GetConsoleCommandHistory(Hist, BufferLength, pszExeName)) - for (; Hist < HistEnd; Hist += _tcslen(Hist) + 1) - _tprintf(_T("%s\n"), Hist); + Hist = (WCHAR *)HistBuf; + HistEnd = (WCHAR *)&HistBuf[Length]; + + if (pGetConsoleCommandHistoryW(Hist, Length, pszExeName)) + for (; Hist < HistEnd; Hist += wcslen(Hist) + 1) + wprintf(L"%s\n", Hist); HeapFree(GetProcessHeap(), 0, HistBuf); } -static INT SetMacro(LPTSTR definition) -{ - TCHAR *name, *nameend, *text, temp; +static INT SetMacro(LPWSTR definition) +{ + WCHAR *name, *nameend, *text, temp; name = definition; - while (*name == _T(' ')) + while (*name == L' ') name++; /* error if no '=' found */ - if ((nameend = _tcschr(name, _T('='))) != NULL) + if ((nameend = wcschr(name, L'=')) != NULL) { text = nameend + 1; - while (*text == _T(' ')) + while (*text == L' ') text++; - while (nameend > name && nameend[-1] == _T(' ')) + while (nameend > name && nameend[-1] == L' ') nameend--; /* Split rest into name and substitute */ temp = *nameend; - *nameend = _T('\0'); + *nameend = L'\0'; /* Don't allow spaces in the name, since such a macro would be unusable */ - if (!_tcschr(name, _T(' ')) && AddConsoleAlias(name, text, pszExeName)) + if (!wcschr(name, L' ') && AddConsoleAlias(name, text, pszExeName)) return 0; *nameend = temp; } LoadString(GetModuleHandle(NULL), IDS_INVALID_MACRO_DEF, szStringBuf, MAX_STRING); - _tprintf(szStringBuf, definition); + wprintf(szStringBuf, definition); return 1; } -static VOID PrintMacros(LPTSTR pszExeName, LPTSTR Indent) +static VOID PrintMacros(LPWSTR pszExeName, LPWSTR Indent) { DWORD Length = GetConsoleAliasesLength(pszExeName); PBYTE AliasBuf; - TCHAR *Alias; - TCHAR *AliasEnd; + WCHAR *Alias; + WCHAR *AliasEnd; AliasBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Length * sizeof(BYTE)); if (!AliasBuf) return; - Alias = (TCHAR *)AliasBuf; - AliasEnd = (TCHAR *)&AliasBuf[Length]; + Alias = (WCHAR *)AliasBuf; + AliasEnd = (WCHAR *)&AliasBuf[Length]; if (GetConsoleAliases(Alias, Length * sizeof(BYTE), pszExeName)) - for (; Alias < AliasEnd; Alias += _tcslen(Alias) + 1) - _tprintf(_T("%s%s\n"), Indent, Alias); + for (; Alias < AliasEnd; Alias += wcslen(Alias) + 1) + wprintf(L"%s%s\n", Indent, Alias); HeapFree(GetProcessHeap(), 0, AliasBuf); } @@ -99,51 +106,47 @@ { DWORD Length = GetConsoleAliasExesLength(); PBYTE ExeNameBuf; - TCHAR *ExeName; - TCHAR *ExeNameEnd; + WCHAR *ExeName; + WCHAR *ExeNameEnd; ExeNameBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Length * sizeof(BYTE)); if (!ExeNameBuf) return; - ExeName = (TCHAR *)ExeNameBuf; - ExeNameEnd = (TCHAR *)&ExeNameBuf[Length]; + ExeName = (WCHAR *)ExeNameBuf; + ExeNameEnd = (WCHAR *)&ExeNameBuf[Length]; if (GetConsoleAliasExes(ExeName, Length * sizeof(BYTE))) { - for (; ExeName < ExeNameEnd; ExeName += _tcslen(ExeName) + 1) - { - _tprintf(_T("[%s]\n"), ExeName); - PrintMacros(ExeName, _T(" ")); - _tprintf(_T("\n")); + for (; ExeName < ExeNameEnd; ExeName += wcslen(ExeName) + 1) + { + wprintf(L"[%s]\n", ExeName); + PrintMacros(ExeName, L" "); + wprintf(L"\n"); } } HeapFree(GetProcessHeap(), 0, ExeNameBuf); } -static VOID ReadFromFile(LPTSTR param) +static VOID ReadFromFile(LPWSTR param) { FILE* fp; - TCHAR line[MAX_PATH]; - - fp = _tfopen(param, _T("r")); + WCHAR line[MAX_PATH]; + + fp = _wfopen(param, L"r"); if (!fp) { -#ifdef UNICODE _wperror(param); -#else - perror(param); -#endif return; } - while ( _fgetts(line, MAX_PATH, fp) != NULL) + while ( fgetws(line, MAX_PATH, fp) != NULL) { /* Remove newline character */ - TCHAR *end = &line[_tcslen(line) - 1]; - if (*end == _T('\n')) - *end = _T('\0'); + WCHAR *end = &line[wcslen(line) - 1]; + if (*end == L'\n') + *end = L'\0'; if (*line) SetMacro(line); @@ -154,43 +157,53 @@ } /* Get the start and end of the next command-line argument. */ -static BOOL GetArg(TCHAR **pStart, TCHAR **pEnd) +static BOOL GetArg(WCHAR **pStart, WCHAR **pEnd) { BOOL bInQuotes = FALSE; - TCHAR *p = *pEnd; - p += _tcsspn(p, _T(" \t")); + WCHAR *p = *pEnd; + p += wcsspn(p, L" \t"); if (!*p) return FALSE; *pStart = p; do { - if (!bInQuotes && (*p == _T(' ') || *p == _T('\t'))) + if (!bInQuotes && (*p == L' ' || *p == L'\t')) break; - bInQuotes ^= (*p++ == _T('"')); + bInQuotes ^= (*p++ == L'"'); } while (*p); *pEnd = p; return TRUE; } /* Remove starting and ending quotes from a string, if present */ -static LPTSTR RemoveQuotes(LPTSTR str) -{ - TCHAR *end; - if (*str == _T('"') && *(end = str + _tcslen(str) - 1) == _T('"')) +static LPWSTR RemoveQuotes(LPWSTR str) +{ + WCHAR *end; + if (*str == L'"' && *(end = str + wcslen(str) - 1) == L'"') { str++; - *end = _T('\0'); + *end = L'\0'; } return str; } int -_tmain(VOID) +wmain(VOID) { /* Get the full command line using GetCommandLine(). We can't just use argv, * because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */ - TCHAR *pArgStart; - TCHAR *pArgEnd = GetCommandLine(); + WCHAR *pArgStart; + WCHAR *pArgEnd = GetCommandLine(); + HMODULE hKernel32 = LoadLibraryW(L"kernel32.dll"); + + /* Get function pointers */ + pGetConsoleCommandHistoryW = (GetConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "GetConsoleCommandHistoryW"); + pGetConsoleCommandHistoryLengthW = (GetConsoleCommandHistoryLengthW_t)GetProcAddress( hKernel32, "GetConsoleCommandHistoryLengthW"); + pSetConsoleNumberOfCommandsW = (SetConsoleNumberOfCommandsW_t)GetProcAddress( hKernel32, "SetConsoleNumberOfCommandsW"); + pExpungeConsoleCommandHistoryW = (ExpungeConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "ExpungeConsoleCommandHistoryW"); + + assert(pGetConsoleCommandHistoryW && pGetConsoleCommandHistoryLengthW && + pSetConsoleNumberOfCommandsW && pSetConsoleNumberOfCommandsW); /* Skip the application name */ GetArg(&pArgStart, &pArgEnd); @@ -198,55 +211,55 @@ while (GetArg(&pArgStart, &pArgEnd)) { /* NUL-terminate this argument to make processing easier */ - TCHAR tmp = *pArgEnd; - *pArgEnd = _T('\0'); - - if (!_tcscmp(pArgStart, _T("/?"))) + WCHAR tmp = *pArgEnd; + *pArgEnd = L'\0'; + + if (!wcscmp(pArgStart, L"/?")) { LoadString(GetModuleHandle(NULL), IDS_HELP, szStringBuf, MAX_STRING); - _tprintf(szStringBuf); + wprintf(szStringBuf); break; } - else if (!_tcsnicmp(pArgStart, _T("/EXENAME="), 9)) + else if (!_wcsnicmp(pArgStart, L"/EXENAME=", 9)) { pszExeName = RemoveQuotes(pArgStart + 9); } - else if (!_tcsicmp(pArgStart, _T("/H")) || - !_tcsicmp(pArgStart, _T("/HISTORY"))) + else if (!wcsicmp(pArgStart, L"/H") || + !wcsicmp(pArgStart, L"/HISTORY")) { PrintHistory(); } - else if (!_tcsnicmp(pArgStart, _T("/LISTSIZE="), 10)) - { - SetConsoleNumberOfCommands(_ttoi(pArgStart + 10), pszExeName); - } - else if (!_tcsicmp(pArgStart, _T("/REINSTALL"))) - { - ExpungeConsoleCommandHistory(pszExeName); - } - else if (!_tcsicmp(pArgStart, _T("/INSERT"))) + else if (!_wcsnicmp(pArgStart, L"/LISTSIZE=", 10)) + { + pSetConsoleNumberOfCommandsW(_wtoi(pArgStart + 10), pszExeName); + } + else if (!wcsicmp(pArgStart, L"/REINSTALL")) + { + pExpungeConsoleCommandHistoryW(pszExeName); + } + else if (!wcsicmp(pArgStart, L"/INSERT")) { SetInsert(ENABLE_INSERT_MODE); } - else if (!_tcsicmp(pArgStart, _T("/OVERSTRIKE"))) + else if (!wcsicmp(pArgStart, L"/OVERSTRIKE")) { SetInsert(0); } - else if (!_tcsicmp(pArgStart, _T("/M")) || - !_tcsicmp(pArgStart, _T("/MACROS"))) - { - PrintMacros(pszExeName, _T("")); - } - else if (!_tcsnicmp(pArgStart, _T("/M:"), 3) || - !_tcsnicmp(pArgStart, _T("/MACROS:"), 8)) - { - LPTSTR exe = RemoveQuotes(_tcschr(pArgStart, _T(':')) + 1); - if (!_tcsicmp(exe, _T("ALL"))) + else if (!wcsicmp(pArgStart, L"/M") || + !wcsicmp(pArgStart, L"/MACROS")) + { + PrintMacros(pszExeName, L""); + } + else if (!_wcsnicmp(pArgStart, L"/M:", 3) || + !_wcsnicmp(pArgStart, L"/MACROS:", 8)) + { + LPWSTR exe = RemoveQuotes(wcschr(pArgStart, L':') + 1); + if (!wcsicmp(exe, L"ALL")) PrintAllMacros(); else - PrintMacros(exe, _T("")); - } - else if (!_tcsnicmp(pArgStart, _T("/MACROFILE="), 11)) + PrintMacros(exe, L""); + } + else if (!_wcsnicmp(pArgStart, L"/MACROFILE=", 11)) { ReadFromFile(RemoveQuotes(pArgStart + 11)); } Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.h [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.h [iso-8859-1] Thu Sep 30 18:56:42 2010 @@ -23,11 +23,6 @@ BOOL WINAPI AddConsoleAliasW(LPWSTR, LPWSTR, LPWSTR); #define AddConsoleAlias TNAME(AddConsoleAlias) #endif -#ifndef ExpungeConsoleCommandHistory -BOOL WINAPI ExpungeConsoleCommandHistoryA(LPSTR); -BOOL WINAPI ExpungeConsoleCommandHistoryW(LPWSTR); -#define ExpungeConsoleCommandHistory TNAME(ExpungeConsoleCommandHistory) -#endif #ifndef GetConsoleAliases DWORD WINAPI GetConsoleAliasesA(LPSTR, DWORD, LPSTR); DWORD WINAPI GetConsoleAliasesW(LPWSTR, DWORD, LPWSTR); @@ -48,20 +43,5 @@ DWORD WINAPI GetConsoleAliasExesLengthW(VOID); #define GetConsoleAliasExesLength TNAME(GetConsoleAliasExesLength) #endif -#ifndef GetConsoleCommandHistory -DWORD WINAPI GetConsoleCommandHistoryA(LPSTR, DWORD, LPSTR); -DWORD WINAPI GetConsoleCommandHistoryW(LPWSTR, DWORD, LPWSTR); -#define GetConsoleCommandHistory TNAME(GetConsoleCommandHistory) -#endif -#ifndef GetConsoleCommandHistoryLength -DWORD WINAPI GetConsoleCommandHistoryLengthA(LPSTR); -DWORD WINAPI GetConsoleCommandHistoryLengthW(LPWSTR); -#define GetConsoleCommandHistoryLength TNAME(GetConsoleCommandHistoryLength) -#endif -#ifndef SetConsoleNumberOfCommands -BOOL WINAPI SetConsoleNumberOfCommandsA(DWORD, LPSTR); -BOOL WINAPI SetConsoleNumberOfCommandsW(DWORD, LPWSTR); -#define SetConsoleNumberOfCommands TNAME(SetConsoleNumberOfCommands) -#endif #endif /* RC_INVOKED */

14 years, 2 months

[dreimer] 48943: Anti Oracle Movement has begun. Adding go-oo and LibreOffice to rapps.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Sep 30 18:47:32 2010 New Revision: 48943 URL: http://svn.reactos.org/svn/reactos?rev=48943&view=rev Log: Anti Oracle Movement has begun. Adding go-oo and LibreOffice to rapps. Added: trunk/reactos/base/applications/rapps/rapps/go-oo.txt (with props) trunk/reactos/base/applications/rapps/rapps/libreoffice.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/go-oo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/go-oo.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/go-oo.txt [iso-8859-1] Thu Sep 30 18:47:32 2010 @@ -1,0 +1,24 @@ +ï»¿; UTF-8 + +[Section] +Name = Go-OO +Version = 3.2.1-11 +Licence = LGPL +Description = Open Source Office Suite, based on Open Office, but way better. +Size = 181.0MB +Category = 6 +URLSite = http://www.go-oo.org/ +URLDownload = http://go-oo.mirrorbrain.org/stable/win32/3.2.1/GoOo-3.2.1-11.exe +CDPath = none + +[Section.0407] +Description = Open Source Office Suite, basierend auf Open Office, aber viel besser. + +[Section.040a] +Description = La suite de ofimÃ¡tica de cÃ³digo abierto. + +[Section.0415] +Description = Otwarty pakiet biurowy. + +[Section.0422] +Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. Propchange: trunk/reactos/base/applications/rapps/rapps/go-oo.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Thu Sep 30 18:47:32 2010 @@ -1,0 +1,24 @@ +ï»¿; UTF-8 + +[Section] +Name = LibreOffice +Version = 3.3.0 Beta 1 +Licence = LGPL +Description = Former called OpenOffice. Open Source Office Suite. +Size = 138.0MB +Category = 6 +URLSite = http://www.documentfoundation.org/ +URLDownload = http://download.documentfoundation.org/libreoffice/testing/LO_3.3.0-beta1_W… +CDPath = none + +[Section.0407] +Description = Vorher bekannt als OpenOffice. Open Source Office Suite. + +[Section.040a] +Description = La suite de ofimÃ¡tica de cÃ³digo abierto. + +[Section.0415] +Description = Otwarty pakiet biurowy. + +[Section.0422] +Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. Propchange: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 2 months

[jgardou] 48942: [DOSKEY] - Fix compilation with msvc by GetProcAddress'ing undocumented functions - TCHAR -> WCHAR in the process

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 30 18:45:58 2010 New Revision: 48942 URL: http://svn.reactos.org/svn/reactos?rev=48942&view=rev Log: [DOSKEY] - Fix compilation with msvc by GetProcAddress'ing undocumented functions - TCHAR -> WCHAR in the process Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c trunk/reactos/base/applications/cmdutils/doskey/doskey.h Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Thu Sep 30 18:45:58 2010 @@ -1,11 +1,23 @@ #include <windows.h> #include <stdio.h> -#include <tchar.h> +#include <wchar.h> +#include <assert.h> #include "doskey.h" #define MAX_STRING 2000 -TCHAR szStringBuf[MAX_STRING]; -LPTSTR pszExeName = _T("cmd.exe"); +WCHAR szStringBuf[MAX_STRING]; +LPWSTR pszExeName = L"cmd.exe"; + +/* Function pointers */ +typedef DWORD (WINAPI *GetConsoleCommandHistoryW_t) (LPWSTR sCommands, DWORD nBufferLength, LPWSTR sExeName); +typedef DWORD (WINAPI *GetConsoleCommandHistoryLengthW_t) (LPWSTR sExeName); +typedef BOOL (WINAPI *SetConsoleNumberOfCommandsW_t)(DWORD nNumber, LPWSTR sExeName); +typedef VOID (WINAPI *ExpungeConsoleCommandHistoryW_t)(LPWSTR sExeName); + +GetConsoleCommandHistoryW_t pGetConsoleCommandHistoryW; +GetConsoleCommandHistoryLengthW_t pGetConsoleCommandHistoryLengthW; +SetConsoleNumberOfCommandsW_t pSetConsoleNumberOfCommandsW; +ExpungeConsoleCommandHistoryW_t pExpungeConsoleCommandHistoryW; static VOID SetInsert(DWORD dwFlag) { @@ -18,79 +30,74 @@ static VOID PrintHistory(VOID) { - DWORD Length = GetConsoleCommandHistoryLength(pszExeName); - DWORD BufferLength; + DWORD Length = pGetConsoleCommandHistoryLengthW(pszExeName); PBYTE HistBuf; - TCHAR *Hist; - TCHAR *HistEnd; - - /* On Windows, the ANSI version of GetConsoleCommandHistory requires - * a buffer twice as large as the actual history length. */ - BufferLength = Length * (sizeof(WCHAR) / sizeof(TCHAR)) * sizeof(BYTE); + WCHAR *Hist; + WCHAR *HistEnd; HistBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - BufferLength); + Length); if (!HistBuf) return; - Hist = (TCHAR *)HistBuf; - HistEnd = (TCHAR *)&HistBuf[Length]; - - if (GetConsoleCommandHistory(Hist, BufferLength, pszExeName)) - for (; Hist < HistEnd; Hist += _tcslen(Hist) + 1) - _tprintf(_T("%s\n"), Hist); + Hist = (WCHAR *)HistBuf; + HistEnd = (WCHAR *)&HistBuf[Length]; + + if (pGetConsoleCommandHistoryW(Hist, Length, pszExeName)) + for (; Hist < HistEnd; Hist += wcslen(Hist) + 1) + wprintf(L"%s\n", Hist); HeapFree(GetProcessHeap(), 0, HistBuf); } -static INT SetMacro(LPTSTR definition) -{ - TCHAR *name, *nameend, *text, temp; +static INT SetMacro(LPWSTR definition) +{ + WCHAR *name, *nameend, *text, temp; name = definition; - while (*name == _T(' ')) + while (*name == L' ') name++; /* error if no '=' found */ - if ((nameend = _tcschr(name, _T('='))) != NULL) + if ((nameend = wcschr(name, L'=')) != NULL) { text = nameend + 1; - while (*text == _T(' ')) + while (*text == L' ') text++; - while (nameend > name && nameend[-1] == _T(' ')) + while (nameend > name && nameend[-1] == L' ') nameend--; /* Split rest into name and substitute */ temp = *nameend; - *nameend = _T('\0'); + *nameend = L'\0'; /* Don't allow spaces in the name, since such a macro would be unusable */ - if (!_tcschr(name, _T(' ')) && AddConsoleAlias(name, text, pszExeName)) + if (!wcschr(name, L' ') && AddConsoleAlias(name, text, pszExeName)) return 0; *nameend = temp; } LoadString(GetModuleHandle(NULL), IDS_INVALID_MACRO_DEF, szStringBuf, MAX_STRING); - _tprintf(szStringBuf, definition); + wprintf(szStringBuf, definition); return 1; } -static VOID PrintMacros(LPTSTR pszExeName, LPTSTR Indent) +static VOID PrintMacros(LPWSTR pszExeName, LPWSTR Indent) { DWORD Length = GetConsoleAliasesLength(pszExeName); PBYTE AliasBuf; - TCHAR *Alias; - TCHAR *AliasEnd; + WCHAR *Alias; + WCHAR *AliasEnd; AliasBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Length * sizeof(BYTE)); if (!AliasBuf) return; - Alias = (TCHAR *)AliasBuf; - AliasEnd = (TCHAR *)&AliasBuf[Length]; + Alias = (WCHAR *)AliasBuf; + AliasEnd = (WCHAR *)&AliasBuf[Length]; if (GetConsoleAliases(Alias, Length * sizeof(BYTE), pszExeName)) - for (; Alias < AliasEnd; Alias += _tcslen(Alias) + 1) - _tprintf(_T("%s%s\n"), Indent, Alias); + for (; Alias < AliasEnd; Alias += wcslen(Alias) + 1) + wprintf(L"%s%s\n", Indent, Alias); HeapFree(GetProcessHeap(), 0, AliasBuf); } @@ -99,51 +106,47 @@ { DWORD Length = GetConsoleAliasExesLength(); PBYTE ExeNameBuf; - TCHAR *ExeName; - TCHAR *ExeNameEnd; + WCHAR *ExeName; + WCHAR *ExeNameEnd; ExeNameBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Length * sizeof(BYTE)); if (!ExeNameBuf) return; - ExeName = (TCHAR *)ExeNameBuf; - ExeNameEnd = (TCHAR *)&ExeNameBuf[Length]; + ExeName = (WCHAR *)ExeNameBuf; + ExeNameEnd = (WCHAR *)&ExeNameBuf[Length]; if (GetConsoleAliasExes(ExeName, Length * sizeof(BYTE))) { - for (; ExeName < ExeNameEnd; ExeName += _tcslen(ExeName) + 1) - { - _tprintf(_T("[%s]\n"), ExeName); - PrintMacros(ExeName, _T(" ")); - _tprintf(_T("\n")); + for (; ExeName < ExeNameEnd; ExeName += wcslen(ExeName) + 1) + { + wprintf(L"[%s]\n", ExeName); + PrintMacros(ExeName, L" "); + wprintf(L"\n"); } } HeapFree(GetProcessHeap(), 0, ExeNameBuf); } -static VOID ReadFromFile(LPTSTR param) +static VOID ReadFromFile(LPWSTR param) { FILE* fp; - TCHAR line[MAX_PATH]; - - fp = _tfopen(param, _T("r")); + WCHAR line[MAX_PATH]; + + fp = _wfopen(param, L"r"); if (!fp) { -#ifdef UNICODE _wperror(param); -#else - perror(param); -#endif return; } - while ( _fgetts(line, MAX_PATH, fp) != NULL) + while ( fgetws(line, MAX_PATH, fp) != NULL) { /* Remove newline character */ - TCHAR *end = &line[_tcslen(line) - 1]; - if (*end == _T('\n')) - *end = _T('\0'); + WCHAR *end = &line[wcslen(line) - 1]; + if (*end == L'\n') + *end = L'\0'; if (*line) SetMacro(line); @@ -154,43 +157,53 @@ } /* Get the start and end of the next command-line argument. */ -static BOOL GetArg(TCHAR **pStart, TCHAR **pEnd) +static BOOL GetArg(WCHAR **pStart, WCHAR **pEnd) { BOOL bInQuotes = FALSE; - TCHAR *p = *pEnd; - p += _tcsspn(p, _T(" \t")); + WCHAR *p = *pEnd; + p += wcsspn(p, L" \t"); if (!*p) return FALSE; *pStart = p; do { - if (!bInQuotes && (*p == _T(' ') || *p == _T('\t'))) + if (!bInQuotes && (*p == L' ' || *p == L'\t')) break; - bInQuotes ^= (*p++ == _T('"')); + bInQuotes ^= (*p++ == L'"'); } while (*p); *pEnd = p; return TRUE; } /* Remove starting and ending quotes from a string, if present */ -static LPTSTR RemoveQuotes(LPTSTR str) -{ - TCHAR *end; - if (*str == _T('"') && *(end = str + _tcslen(str) - 1) == _T('"')) +static LPWSTR RemoveQuotes(LPWSTR str) +{ + WCHAR *end; + if (*str == L'"' && *(end = str + wcslen(str) - 1) == L'"') { str++; - *end = _T('\0'); + *end = L'\0'; } return str; } int -_tmain(VOID) +wmain(VOID) { /* Get the full command line using GetCommandLine(). We can't just use argv, * because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */ - TCHAR *pArgStart; - TCHAR *pArgEnd = GetCommandLine(); + WCHAR *pArgStart; + WCHAR *pArgEnd = GetCommandLine(); + HMODULE hKernel32 = LoadLibraryW(L"kernel32.dll"); + + /* Get function pointers */ + pGetConsoleCommandHistoryW = (GetConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "GetConsoleCommandHistoryW"); + pGetConsoleCommandHistoryLengthW = (GetConsoleCommandHistoryLengthW_t)GetProcAddress( hKernel32, "GetConsoleCommandHistoryLengthW"); + pSetConsoleNumberOfCommandsW = (SetConsoleNumberOfCommandsW_t)GetProcAddress( hKernel32, "SetConsoleNumberOfCommandsW"); + pExpungeConsoleCommandHistoryW = (ExpungeConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "ExpungeConsoleCommandHistoryW"); + + assert(pGetConsoleCommandHistoryW && pGetConsoleCommandHistoryLengthW && + pSetConsoleNumberOfCommandsW && pSetConsoleNumberOfCommandsW); /* Skip the application name */ GetArg(&pArgStart, &pArgEnd); @@ -198,55 +211,55 @@ while (GetArg(&pArgStart, &pArgEnd)) { /* NUL-terminate this argument to make processing easier */ - TCHAR tmp = *pArgEnd; - *pArgEnd = _T('\0'); - - if (!_tcscmp(pArgStart, _T("/?"))) + WCHAR tmp = *pArgEnd; + *pArgEnd = L'\0'; + + if (!wcscmp(pArgStart, L"/?")) { LoadString(GetModuleHandle(NULL), IDS_HELP, szStringBuf, MAX_STRING); - _tprintf(szStringBuf); + wprintf(szStringBuf); break; } - else if (!_tcsnicmp(pArgStart, _T("/EXENAME="), 9)) + else if (!_wcsnicmp(pArgStart, L"/EXENAME=", 9)) { pszExeName = RemoveQuotes(pArgStart + 9); } - else if (!_tcsicmp(pArgStart, _T("/H")) || - !_tcsicmp(pArgStart, _T("/HISTORY"))) + else if (!wcsicmp(pArgStart, L"/H") || + !wcsicmp(pArgStart, L"/HISTORY")) { PrintHistory(); } - else if (!_tcsnicmp(pArgStart, _T("/LISTSIZE="), 10)) - { - SetConsoleNumberOfCommands(_ttoi(pArgStart + 10), pszExeName); - } - else if (!_tcsicmp(pArgStart, _T("/REINSTALL"))) - { - ExpungeConsoleCommandHistory(pszExeName); - } - else if (!_tcsicmp(pArgStart, _T("/INSERT"))) + else if (!_wcsnicmp(pArgStart, L"/LISTSIZE=", 10)) + { + pSetConsoleNumberOfCommandsW(_wtoi(pArgStart + 10), pszExeName); + } + else if (!wcsicmp(pArgStart, L"/REINSTALL")) + { + pExpungeConsoleCommandHistoryW(pszExeName); + } + else if (!wcsicmp(pArgStart, L"/INSERT")) { SetInsert(ENABLE_INSERT_MODE); } - else if (!_tcsicmp(pArgStart, _T("/OVERSTRIKE"))) + else if (!wcsicmp(pArgStart, L"/OVERSTRIKE")) { SetInsert(0); } - else if (!_tcsicmp(pArgStart, _T("/M")) || - !_tcsicmp(pArgStart, _T("/MACROS"))) - { - PrintMacros(pszExeName, _T("")); - } - else if (!_tcsnicmp(pArgStart, _T("/M:"), 3) || - !_tcsnicmp(pArgStart, _T("/MACROS:"), 8)) - { - LPTSTR exe = RemoveQuotes(_tcschr(pArgStart, _T(':')) + 1); - if (!_tcsicmp(exe, _T("ALL"))) + else if (!wcsicmp(pArgStart, L"/M") || + !wcsicmp(pArgStart, L"/MACROS")) + { + PrintMacros(pszExeName, L""); + } + else if (!_wcsnicmp(pArgStart, L"/M:", 3) || + !_wcsnicmp(pArgStart, L"/MACROS:", 8)) + { + LPWSTR exe = RemoveQuotes(wcschr(pArgStart, L':') + 1); + if (!wcsicmp(exe, L"ALL")) PrintAllMacros(); else - PrintMacros(exe, _T("")); - } - else if (!_tcsnicmp(pArgStart, _T("/MACROFILE="), 11)) + PrintMacros(exe, L""); + } + else if (!_wcsnicmp(pArgStart, L"/MACROFILE=", 11)) { ReadFromFile(RemoveQuotes(pArgStart + 11)); } Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.h [iso-8859-1] Thu Sep 30 18:45:58 2010 @@ -23,11 +23,6 @@ BOOL WINAPI AddConsoleAliasW(LPWSTR, LPWSTR, LPWSTR); #define AddConsoleAlias TNAME(AddConsoleAlias) #endif -#ifndef ExpungeConsoleCommandHistory -BOOL WINAPI ExpungeConsoleCommandHistoryA(LPSTR); -BOOL WINAPI ExpungeConsoleCommandHistoryW(LPWSTR); -#define ExpungeConsoleCommandHistory TNAME(ExpungeConsoleCommandHistory) -#endif #ifndef GetConsoleAliases DWORD WINAPI GetConsoleAliasesA(LPSTR, DWORD, LPSTR); DWORD WINAPI GetConsoleAliasesW(LPWSTR, DWORD, LPWSTR); @@ -48,20 +43,5 @@ DWORD WINAPI GetConsoleAliasExesLengthW(VOID); #define GetConsoleAliasExesLength TNAME(GetConsoleAliasExesLength) #endif -#ifndef GetConsoleCommandHistory -DWORD WINAPI GetConsoleCommandHistoryA(LPSTR, DWORD, LPSTR); -DWORD WINAPI GetConsoleCommandHistoryW(LPWSTR, DWORD, LPWSTR); -#define GetConsoleCommandHistory TNAME(GetConsoleCommandHistory) -#endif -#ifndef GetConsoleCommandHistoryLength -DWORD WINAPI GetConsoleCommandHistoryLengthA(LPSTR); -DWORD WINAPI GetConsoleCommandHistoryLengthW(LPWSTR); -#define GetConsoleCommandHistoryLength TNAME(GetConsoleCommandHistoryLength) -#endif -#ifndef SetConsoleNumberOfCommands -BOOL WINAPI SetConsoleNumberOfCommandsA(DWORD, LPSTR); -BOOL WINAPI SetConsoleNumberOfCommandsW(DWORD, LPWSTR); -#define SetConsoleNumberOfCommands TNAME(SetConsoleNumberOfCommands) -#endif #endif /* RC_INVOKED */

14 years, 2 months

[sir_richard] 48941: [NTOS]: This is why you shouldn't let Antoine Dodson commit code.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Sep 30 14:48:03 2010 New Revision: 48941 URL: http://svn.reactos.org/svn/reactos?rev=48941&view=rev Log: [NTOS]: This is why you shouldn't let Antoine Dodson commit code. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Thu Sep 30 14:48:03 2010 @@ -111,7 +111,7 @@ // Copy it from our double-mapped system page directory // InterlockedExchangePte(PointerPde, - MmSystemPagePtes[(ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)].u.Long); + MmSystemPagePtes[((ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)) / sizeof(MMPTE)].u.Long); #endif } Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Thu Sep 30 14:48:03 2010 @@ -488,7 +488,7 @@ // // Save it into our double-buffered system page directory // - MmSystemPagePtes[(ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)] = TempPde; + MmSystemPagePtes[((ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)) / sizeof(MMPTE)] = TempPde; /* Initialize the PFN */ MiInitializePfnForOtherProcess(PageFrameNumber,

14 years, 2 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 2010