Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 52378: [NTOSKRNL] - Use PoCallDriver when sending a power IRP
by cgutman＠svn.reactos.org 20 Jun '11

20 Jun '11

Author: cgutman Date: Mon Jun 20 10:54:00 2011 New Revision: 52378 URL: http://svn.reactos.org/svn/reactos?rev=52378&view=rev Log: [NTOSKRNL] - Use PoCallDriver when sending a power IRP Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=52… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Mon Jun 20 10:54:00 2011 @@ -574,7 +574,7 @@ *pIrp = Irp; IoSetCompletionRoutine(Irp, PopRequestPowerIrpCompletion, RequestPowerItem, TRUE, TRUE, TRUE); - IoCallDriver(TopDeviceObject, Irp); + PoCallDriver(TopDeviceObject, Irp); /* Always return STATUS_PENDING. The completion routine * will call CompletionFunction and complete the Irp.

1 0

[tkreuzer] 52377: [DOSKEY] Fix copy paste bug. Patch by r3ddr4g0n
by tkreuzer＠svn.reactos.org 20 Jun '11

20 Jun '11

Author: tkreuzer Date: Mon Jun 20 09:18:42 2011 New Revision: 52377 URL: http://svn.reactos.org/svn/reactos?rev=52377&view=rev Log: [DOSKEY] Fix copy paste bug. Patch by r3ddr4g0n Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c 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] Mon Jun 20 09:18:42 2011 @@ -209,7 +209,7 @@ pExpungeConsoleCommandHistoryW = (ExpungeConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "ExpungeConsoleCommandHistoryW"); assert(pGetConsoleCommandHistoryW && pGetConsoleCommandHistoryLengthW && - pSetConsoleNumberOfCommandsW && pSetConsoleNumberOfCommandsW); + pSetConsoleNumberOfCommandsW && pExpungeConsoleCommandHistoryW); /* Skip the application name */ GetArg(&pArgStart, &pArgEnd);

1 0

[osiejka] 52376: [UTF8] - Convert format, fdebug, ntvdm and win32csr polish locale to UTF-8; - Clean up remainder of #pragma definitions in individual language rc files. This should prevent bugs li...
by osiejka＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: osiejka Date: Sun Jun 19 22:55:34 2011 New Revision: 52376 URL: http://svn.reactos.org/svn/reactos?rev=52376&view=rev Log: [UTF8] - Convert format, fdebug, ntvdm and win32csr polish locale to UTF-8; - Clean up remainder of #pragma definitions in individual language rc files. This should prevent bugs like one with chineese locale in calc; - Move bulgarian and romanian locales, already converted to UTF-8 to proper section in module rc file; Modified: trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/fontview/lang/ro-RO.rc trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc trunk/reactos/base/applications/magnify/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc trunk/reactos/base/applications/mspaint/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/hy-AM.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/system/format/lang/pl-PL.rc trunk/reactos/base/system/format/rsrc.rc trunk/reactos/base/system/winlogon/lang/ro-RO.rc trunk/reactos/base/system/winlogon/rsrc.rc trunk/reactos/boot/freeldr/fdebug/fdebug.rc trunk/reactos/boot/freeldr/fdebug/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ro-RO.rc trunk/reactos/dll/cpl/console/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc trunk/reactos/dll/cpl/input/lang/ro-RO.rc trunk/reactos/dll/cpl/intl/lang/ro-RO.rc trunk/reactos/dll/cpl/joy/lang/ro-RO.rc trunk/reactos/dll/cpl/main/lang/ro-RO.rc trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc trunk/reactos/dll/win32/browseui/lang/bg-BG.rc trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc trunk/reactos/dll/win32/modemui/lang/ro-RO.rc trunk/reactos/dll/win32/modemui/modemui.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/newdev/lang/ro-RO.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/syssetup.rc trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc trunk/reactos/subsystems/ntvdm/rsrc.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -60,7 +60,6 @@ #include "lang/sv-SE.rc" #include "lang/th-TH.rc" - // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/fontview/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,6 +1,4 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) STRINGTABLE DISCARDABLE BEGIN @@ -13,5 +11,3 @@ IDS_ERROR_NOCLASS, "Nu s-a putut iniÅ£ializa clasa de ferestre." IDS_ERROR_BADCMD, "Niciun font specificat.\nSintaxÄ:\n fontview.exe <fiÈier font>" END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -89,5 +89,3 @@ VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/magnify/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -62,5 +62,3 @@ BEGIN IDS_APP_TITLE "LupÄ" END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -280,5 +280,3 @@ BEGIN IDS_APPNAME "Gestionarul de servicii ReactOS" END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/mspaint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -204,5 +204,3 @@ IDS_FILESIZE, "%d bytes" IDS_PRINTRES, "%d x %d pixels per meter" END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/hy-AM.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/hy-AM.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -186,5 +186,3 @@ STRING_CR, "ÕÕ¡Õ¯Õ«Õ¶Õ¿Õ¸Õ·" STRING_LINE_COLUMN, "Line %d, column %d" END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -202,5 +202,3 @@ STRING_CR, "Mac" STRING_LINE_COLUMN, "Linie %d, coloanÄ %d" END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -52,7 +52,6 @@ #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pt-PT.rc" - #include "lang/sk-SK.rc" #include "lang/sl-SI.rc" #include "lang/sv-SE.rc" Modified: trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -5,5 +5,3 @@ IDS_DESCRIPTION "Ecran de veghe SiglÄ" IDS_TEXT "Acest ecran de veghe nu are opÈiuni." END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -4,7 +4,6 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) #ifdef _WIN32 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -#pragma code_page(65001) #endif //_WIN32 #define IDS_PHYSICAL_MEMORY_AVAILABLE 1067 ///////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -4,7 +4,6 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -#pragma code_page(65001) #endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// @@ -652,8 +651,6 @@ IDS_Running "RuleazÄ" END - -#pragma code_page(1252) #endif // Romanian resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/base/system/format/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/pl… ============================================================================== --- trunk/reactos/base/system/format/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/pl-PL.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,57 +1,57 @@ -#include "resource.h" /* -* translated by xrogers (http://rogers.cyberdusk.pl/) -* xxrogers(a)users.sourceforge.net -* https://sourceforge.net/projects/reactospl -*/ + * translated by xrogers + * xxrogers(a)users.sourceforge.net + * https://sourceforge.net/projects/reactospl + * UTF-8 conversion by Caemyr (May, 2011) + */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -STRING_HELP, "Sposób u¿ycia: %s wolumin: [-FS:syst-plik] [-V:etykieta] [-Q] [-A:rozmiar] [-C]\n\n\ - [wolumin:] Okrela literê dysku przeznaczonego do formatowania.\n\ - -FS:syst-plik Okrela rodzaj systemu plików (%s).\n\ - -V:etykieta Okrela etykietê woluminu.\n\ +STRING_HELP, "SposÃ³b uÅ¼ycia: %s wolumin: [-FS:syst-plik] [-V:etykieta] [-Q] [-A:rozmiar] [-C]\n\n\ + [wolumin:] OkreÅla literÄ dysku przeznaczonego do formatowania.\n\ + -FS:syst-plik OkreÅla rodzaj systemu plikÃ³w (%s).\n\ + -V:etykieta OkreÅla etykietÄ woluminu.\n\ -Q Przeprowadza szybkie formatowanie.\n\ - -A:rozmiar Zastêpuje domylny rozmiar jednostki alokacji. Dla zastosowañ\n\ - ogólnych zaleca siê u¿ywanie ustawieñ domylnych.\n\ - System NTFS obs³uguje rozmiary: 512, 1024, 2048, 4096, 8192,\n\ + -A:rozmiar ZastÄpuje domyÅlny rozmiar jednostki alokacji. Dla zastosowaÅ\n\ + ogÃ³lnych zaleca siÄ uÅ¼ywanie ustawieÅ domyÅlnych.\n\ + System NTFS obsÅuguje rozmiary: 512, 1024, 2048, 4096, 8192,\n\ 16 KB, 32 KB, 64 KB.\n\ - System FAT obs³uguje rozmiary: 512, 1024, 2048, 4096, 8192,\n\ + System FAT obsÅuguje rozmiary: 512, 1024, 2048, 4096, 8192,\n\ 16 KB, 32 KB, 64 KB, 128 KB, 256 KB.\n\ - Kompresja NTFS nie jest obs³ugiwana dla jednostek alokacji\n\ - wiêkszych ni¿ 4096 bajtów.\n\ - -C Pliki utworzone na nowym woluminie bêd¹ domylnie poddane\n\ + Kompresja NTFS nie jest obsÅugiwana dla jednostek alokacji\n\ + wiÄkszych niÅ¼ 4096 bajtÃ³w.\n\ + -C Pliki utworzone na nowym woluminie bÄdÄ domyÅlnie poddane\n\ kompresji.\n\n" -STRING_COMPLETE "%lu procent ukoñczone.\r" +STRING_COMPLETE "%lu procent ukoÅczone.\r" -STRING_FORMAT_FAIL "FormatEx nie móg³ zakoñczyæ dzia³ania pomylnie.\n\n" +STRING_FORMAT_FAIL "FormatEx nie mÃ³gÅ zakoÅczyÄ dziaÅania pomyÅlnie.\n\n" STRING_NO_SUPPORT "Operacja niewspierana" -STRING_FMIFS_FAIL "Nie mo¿na zlokalizowaæ punktów wejciowych FMIFS.\n\n" +STRING_FMIFS_FAIL "Nie moÅ¼na zlokalizowaÄ punktÃ³w wejÅciowych FMIFS.\n\n" -STRING_UNKNOW_ARG "Nieprawid³owy parametr: %s\n" +STRING_UNKNOW_ARG "NieprawidÅowy parametr: %s\n" -STRING_DRIVE_PARM "Brakuj¹cy wymagany parametr dysku.\n\n" +STRING_DRIVE_PARM "BrakujÄcy wymagany parametr dysku.\n\n" -STRING_ERROR_DRIVE_TYPE "Nie mo¿na okreliæ rodzaju dysku" +STRING_ERROR_DRIVE_TYPE "Nie moÅ¼na okreÅliÄ rodzaju dysku" -STRING_INSERT_DISK "W³ó¿ nowy dysk do napêdu %C:\ni nacinij Enter, gdy bêdzie gotowe..." +STRING_INSERT_DISK "WÅÃ³Å¼ nowy dysk do napÄdu %C:\ni naciÅnij Enter..." -STRING_NO_VOLUME "Nie mo¿na odczytaæ woluminu" +STRING_NO_VOLUME "Nie moÅ¼na odczytaÄ woluminu" -STRING_NO_VOLUME_SIZE "Nie mo¿na odczytaæ rozmiaru woluminu" +STRING_NO_VOLUME_SIZE "Nie moÅ¼na odczytaÄ rozmiaru woluminu" -STRING_FILESYSTEM "Rodzaj systemu plików to %s.\n" +STRING_FILESYSTEM "Rodzaj systemu plikÃ³w to %s.\n" -STRING_LABEL_NAME_EDIT "Podaj aktualn¹ etykietê woluminu dla dysku %C: " +STRING_LABEL_NAME_EDIT "Podaj aktualnÄ etykietÄ woluminu dla dysku %C: " -STRING_ERROR_LABEL "Nieprawid³owa etykieta woluminu zosta³a wpisana dla tego dysku.\n" +STRING_ERROR_LABEL "NieprawidÅowa etykieta woluminu zostaÅa wpisana dla tego dysku.\n" -STRING_YN_FORMAT "\\OSTRZE¯ENIE: WSZYSTKIE DANE NA NIEWYJMOWALNYM DYSKU\n\ -W STACJI %C: ZOSTAN¥ UTRACONE!\nCzy kontynuowaæ formatowanie (T/N)? " +STRING_YN_FORMAT "\\OSTRZEÅ»ENIE: WSZYSTKIE DANE NA NIEWYJMOWALNYM DYSKU\n\ +W STACJI %C: ZOSTANÄ UTRACONE!\nCzy kontynuowaÄ formatowanie (T/N)? " STRING_YES_NO_FAQ "TN" @@ -59,17 +59,17 @@ STRING_FAST_FMT "Szybkie formatowanie" -STRING_CREATE_FSYS "Tworzenie struktury systemu plików.\n" +STRING_CREATE_FSYS "Tworzenie struktury systemu plikÃ³w.\n" -STRING_FMT_COMPLETE "Formatowanie ukoñczone.\n" +STRING_FMT_COMPLETE "Formatowanie ukoÅczone.\n" -STRING_VOL_COMPRESS "Wolumin nie obs³uguje kompresji.\n" +STRING_VOL_COMPRESS "Wolumin nie obsÅuguje kompresji.\n" -STRING_ENTER_LABEL "Podaj etykietê woluminu (11 znaków, ENTER = bez etykiety) " +STRING_ENTER_LABEL "Podaj etykietÄ woluminu (11 znakÃ³w, ENTER = bez etykiety) " -STRING_NO_LABEL "Nie mo¿na zmieniæ etykiety woluminu" +STRING_NO_LABEL "Nie moÅ¼na zmieniÄ etykiety woluminu" -STRING_FREE_SPACE "\n%I64d bajtów ca³kowitego miejsca na dysku.\n%I64d bajtów dostêpnych na dysku.\n" +STRING_FREE_SPACE "\n%I64d bajtÃ³w caÅkowitego miejsca na dysku.\n%I64d bajtÃ³w dostÄpnych na dysku.\n" STRING_SERIAL_NUMBER "\nNumer seryjny woluminu to %04X-%04X\n" END Modified: trunk/reactos/base/system/format/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/rsrc.rc… ============================================================================== --- trunk/reactos/base/system/format/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/rsrc.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -14,11 +14,11 @@ #include "lang/it-IT.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" -#include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/es-ES.rc" // UTF-8 #pragma code_page(65001) +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/system/winlogon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… ============================================================================== --- trunk/reactos/base/system/winlogon/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,6 +1,4 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) IDD_SHUTDOWNCOMPUTER DIALOGEX 45, 22, 164, 52 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU @@ -44,5 +42,3 @@ BEGIN IDS_FAILEDACTIVATEUSERSHELL "Winlogon nu a putut porni nucleul sistemului!" END - -#pragma code_page(default) Modified: trunk/reactos/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rsrc.… ============================================================================== --- trunk/reactos/base/system/winlogon/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/rsrc.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -19,7 +19,6 @@ #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" -#include "lang/ro-RO.rc" #include "lang/sv-SE.rc" #include "lang/sk-SK.rc" #include "lang/zh-CN.rc" @@ -27,5 +26,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -17,11 +17,11 @@ #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/no-NO.rc" -#include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/tr-TR.rc" // UTF-8 #pragma code_page(65001) +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/boot/freeldr/fdebug/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/p… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/pl-PL.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Polish (P.L.) resources // 2005 Emil Kaczmarek +// UTF-8 conversion by Caemyr (May, 2011) #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -#pragma code_page(1250) #endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// @@ -16,17 +16,17 @@ BEGIN POPUP "&Plik" BEGIN - MENUITEM "P&o³¹cz", IDM_FILE_CONNECT - MENUITEM "&Roz³¹cz", IDM_FILE_DISCONNECT, GRAYED + MENUITEM "P&oÅÄcz", IDM_FILE_CONNECT + MENUITEM "&RozÅÄcz", IDM_FILE_DISCONNECT, GRAYED MENUITEM SEPARATOR - MENUITEM "&Wyczyæ wywietlacz", IDM_FILE_CLEARDISPLAY + MENUITEM "&WyczyÅÄ wyÅwietlacz", IDM_FILE_CLEARDISPLAY MENUITEM SEPARATOR MENUITEM "Ro&zpocznij zrzut", IDM_FILE_STARTCAPTURE MENUITEM "Za&trzymaj zrzut", IDM_FILE_STOPCAPTURE, GRAYED MENUITEM SEPARATOR MENUITEM "Lo&kalne Echo", IDM_FILE_LOCALECHO MENUITEM SEPARATOR - MENUITEM "&Wyjcie", IDM_EXIT + MENUITEM "&WyjÅcie", IDM_EXIT END POPUP "Po&moc" BEGIN @@ -132,12 +132,12 @@ IDD_CONNECTION DIALOGEX DISCARDABLE 0, 0, 196, 100 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Opcje po³¹czenia" +CAPTION "Opcje poÅÄczenia" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Wprowad port COM (np. COM1):",IDC_STATIC,7,7,108,8 + LTEXT "WprowadÅº port COM (np. COM1):",IDC_STATIC,7,7,108,8 EDITTEXT IDC_COMPORT,7,17,182,14,ES_AUTOHSCROLL - LTEXT "Wprowad szybkoæ portu w bodach (np. 115200):",IDC_STATIC,7,38,114, + LTEXT "WprowadÅº szybkoÅÄ portu w bodach (np. 115200):",IDC_STATIC,7,38,114, 8 EDITTEXT IDC_BAUTRATE,7,48,182,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,45,79,50,14 @@ -146,12 +146,12 @@ IDD_CAPTURE DIALOGEX DISCARDABLE 0, 0, 251, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Przechwyæ plik" +CAPTION "PrzechwyÄ plik" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nazwa pliku zrzutu:",IDC_STATIC,7,17,62,8 EDITTEXT IDC_CAPTUREFILENAME,7,26,181,14,ES_AUTOHSCROLL - PUSHBUTTON "Przeg&l¹daj",IDC_BROWSE,194,26,50,14 + PUSHBUTTON "Przeg&lÄdaj",IDC_BROWSE,194,26,50,14 DEFPUSHBUTTON "OK",IDOK,139,74,50,14 PUSHBUTTON "Anuluj",IDCANCEL,194,74,50,14 END @@ -172,7 +172,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Ten program nale¿y do wolnego oprogramowania; mo¿esz go rozpowszechniaæ i/lub modyfikowaæ w zgodzie z zasadami licencji GNU GPL w formie w jakiej zosta³y opublikowane przez fundacjê Free Software Foundation; albo w wersji 2 Licencji albo (tu masz wybór) w jakiejkolwiek póniejszej wersji.\r\n\r\nRozpowszechniaj¹c ten program mamy nadziejê, ¿e bêdzie u¿yteczny, ale BEZ ¯ADNEJ GWARANCJI; nawet bez zak³adanej gwarancji HANDLOWOCI, a w szczególnym przypadku zdatnoci. Aby poznaæ wiêcej szczegó³ów, zajrzyj do licencji GNU.\r\n\r\nKopia licencji GNU GPL powinna byæ dostarczona razem z tym programem; jeli tak nie jest, napisz list do fundacji na adres: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + IDS_LICENSE "Ten program naleÅ¼y do wolnego oprogramowania; moÅ¼esz go rozpowszechniaÄ i/lub modyfikowaÄ w zgodzie z zasadami licencji GNU GPL w formie w jakiej zostaÅy opublikowane przez fundacjÄ Free Software Foundation; albo w wersji 2 Licencji albo (tu masz wybÃ³r) w jakiejkolwiek pÃ³Åºniejszej wersji.\r\n\r\nRozpowszechniajÄc ten program mamy nadziejÄ, Å¼e bÄdzie uÅ¼yteczny, ale BEZ Å»ADNEJ GWARANCJI; nawet bez zakÅadanej gwarancji HANDLOWOÅCI, a w szczegÃ³lnym przypadku zdatnoÅci. Aby poznaÄ wiÄcej szczegÃ³ÅÃ³w, zajrzyj do licencji GNU.\r\n\r\nKopia licencji GNU GPL powinna byÄ dostarczona razem z tym programem; jeÅli tak nie jest, napisz list do fundacji na adres: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END @@ -190,4 +190,3 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED - Modified: trunk/reactos/dll/cpl/access/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -301,5 +301,3 @@ IDS_SECONDS "secunde" IDS_MINUTES "minute" END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ro-RO… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -146,5 +146,3 @@ IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Fonturi raster" END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -265,5 +265,3 @@ IDS_APPLY_FAILED "Nu s-au putut aplica noile setÄri." IDS_APPLY_NEEDS_RESTART "Trebuie sÄ reporniÈi computerul pentru a aplica noile setÄri." END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -145,5 +145,3 @@ IDS_SELECTWAYTITLE "Acest Expert vÄ poate ajuta sÄ instalaÈi alt hardware" IDS_HDTYPESTITLE "Din lista de mai jos, alegeÈi dispozitivul pe care vreÈi sÄ Ã®l instalaÈi." END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/input/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -239,5 +239,3 @@ IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek Cyrillic" IDS_VIETNAMESE_LAYOUT, "Vietnamese" END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -197,5 +197,3 @@ IDS_CPLNAME "OpÈiuni regionale" IDS_CPLDESCRIPTION "SetÄri limbi Èi formatare numere, valute, datÄ Èi timp." END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/joy/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/ro-RO.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/joy/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -82,5 +82,3 @@ IDS_CONTROLLER "Controlor" IDS_STATUS "Stare" END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/main/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -170,5 +170,3 @@ IDS_OVERWRITE_TEXT "Numele de schemÄ ales este deja Ã®n folosinÈÄ. VreÈi sÄ suprascrieÈi schema actualÄ?" IDS_ANIMATE_CURSOR "Cursoare animate" END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -267,5 +267,3 @@ 5853 "Intrare Ã®n ReactOS" 5854 "ReactOS Explorer" END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ro-R… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -162,5 +162,3 @@ IDS_DEL_SCHEME "SunteÈi sigur cÄ vreÈi sÄ eliminaÈi aceastÄ schemÄ?" IDS_DEL_SCHEME_TITLE "Eliminare schemÄ" END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -288,5 +288,3 @@ IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/ro-R… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -66,5 +66,3 @@ IDS_INETTIMESYNCING "AÈteptaÈi cÃ¢t ReactOS se sincronizeazÄ cu %s" IDS_INETTIMEERROR "A apÄrut o eroare cÃ¢t timp ReactOS se sincroniza cu %s" END - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -15,9 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -/* UTF-8 */ -#pragma code_page(65001) LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT @@ -272,5 +269,3 @@ IDS_BACK "ÐÐ°Ð·Ð°Ð´" IDS_FORWARD "ÐÐ°Ð¿ÑÐµÐ´" END - - Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -25,7 +25,6 @@ #include "lang/it-IT.rc" #include "lang/no-NO.rc" #include "lang/pt-BR.rc" -#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" @@ -33,3 +32,4 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,8 +1,6 @@ // Romanian language resource file (Petru Dimitriu, 2009-07-15) LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) STRINGTABLE BEGIN @@ -229,5 +227,3 @@ ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/modemui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/modemui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/modemui/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,6 +1,4 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) IDM_MENU MENU BEGIN @@ -613,5 +611,3 @@ 6604 "Iugoslavia" 20013 "ID dispozitiv" END - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/modemui/modemui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/modemui.… ============================================================================== --- trunk/reactos/dll/win32/modemui/modemui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/modemui/modemui.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -17,10 +17,10 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/no-NO.rc" -#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,6 +1,4 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP @@ -57,5 +55,3 @@ IDS_ASKFORPASSWORD "Parola: " IDS_FORCELOGOFF "Aceasta ac?iune va Ã®nchide sesiunea utilizatorului curent ?i va pierde datele nesalvate de acesta. Sigur continua?i?" END - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -20,7 +20,6 @@ #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/no-NO.rc" -#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" @@ -28,3 +27,4 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/dll/win32/newdev/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,6 +1,4 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | @@ -108,5 +106,3 @@ 179,11 LTEXT "DISPOZITIV NECUNOSCUT",IDC_DEVICE,148,53,147,12 END - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/rsrc.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -19,7 +19,6 @@ #include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" -#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/th-TH.rc" @@ -28,3 +27,4 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -18,8 +18,6 @@ */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU @@ -294,6 +292,3 @@ BEGIN IDS_STATUS_INSTALL_DEV "Instalare dispozitive..." END - -#pragma code_page(default) -/* EOF */ Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -54,9 +54,9 @@ #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" -#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/pl-P… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,14 +1,14 @@ -#include "resource.h" /* -* translated by xrogers (http://rogers.cyberdusk.pl/) -* xxrogers(a)users.sourceforge.net -* https://sourceforge.net/projects/reactospl -*/ - + * translated by xrogers + * xxrogers(a)users.sourceforge.net + * https://sourceforge.net/projects/reactospl + * UTF-8 conversion by Caemyr (May, 2011) + */ + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN STRING_WelcomeMsg, "Wirtualna maszyna DOS dla ReactOS.\n" -STRING_PromptMsg, "Wcinij r<cr> aby uruchomiæ, s<cr> aby wy³¹czyæ lub q<cr>, aby zakoñczyæ." +STRING_PromptMsg, "WciÅnij r<cr> aby uruchomiÄ, s<cr> aby wyÅÄczyÄ lub q<cr>, aby zakoÅczyÄ." END Modified: trunk/reactos/subsystems/ntvdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/rsrc.rc?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/rsrc.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -14,7 +14,6 @@ #include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/th-TH.rc" -#include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/sk-SK.rc" #include "lang/zh-CN.rc" @@ -22,5 +21,6 @@ // UTF-8 #pragma code_page(65001) +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,35 +1,37 @@ /* -* translated by xrogers (http://rogers.cyberdusk.pl/) -* xxrogers(a)users.sourceforge.net -* https://sourceforge.net/projects/reactospl -* translation update by Olaf Siejka (Caemyr), Apr 2011 -*/ + * translated by xrogers + * xxrogers(a)users.sourceforge.net + * https://sourceforge.net/projects/reactospl + * translation update by Olaf Siejka (Caemyr), Apr 2011 + * UTF-8 conversion by Caemyr (May, 2011) + */ + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Zakoñcz program - " +CAPTION "ZakoÅcz program - " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Trwa zamykanie programu... Proszê czekaæ",IDC_STATIC,7,7,186,11 - CONTROL "Postêp",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + LTEXT "Trwa zamykanie programu... ProszÄ czekaÄ",IDC_STATIC,7,7,186,11 + CONTROL "PostÄp",IDC_PROGRESS,"msctls_progress32",WS_BORDER, 7,20,186,13 - LTEXT "Jeli zdecydujesz siê zamkn¹æ program natychmiastowo, utracisz wszelkie niezapisane dane. Aby zakoñczyæ program, wcinij Zakoñcz teraz.", + LTEXT "JeÅli zdecydujesz siÄ zamknÄÄ program natychmiastowo, utracisz wszelkie niezapisane dane. Aby zakoÅczyÄ program, wciÅnij ZakoÅcz teraz.", IDC_STATIC,7,40,186,26 - DEFPUSHBUTTON "&Zakoñcz teraz",IDC_END_NOW,150,71,43,17 + DEFPUSHBUTTON "&ZakoÅcz teraz",IDC_END_NOW,150,71,43,17 END IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Zakoñcz program - " +CAPTION "ZakoÅcz program - " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Anuluj",IDCANCEL,142,98,43,17 - PUSHBUTTON "&Zakoñcz teraz",IDC_END_NOW,78,98,43,17 + PUSHBUTTON "&ZakoÅcz teraz",IDC_END_NOW,78,98,43,17 LTEXT "Wybrany program nie odpowiada",IDC_STATIC,7,7,178,8 - LTEXT "Aby powróciæ do ReactOS i sprawdziæ status programu, kliknij Anuluj", + LTEXT "Aby powrÃ³ciÄ do ReactOS i sprawdziÄ status programu, kliknij Anuluj", IDC_STATIC,7,26,178,16 - LTEXT "Jeli zdecydujesz siê zamkn¹æ program natychmiastowo, utracisz wszelkie niezapisane dane. Aby zakoñczyæ program, wcinij Zakoñcz teraz.", + LTEXT "JeÅli zdecydujesz siÄ zamknÄÄ program natychmiastowo, utracisz wszelkie niezapisane dane. Aby zakoÅczyÄ program, wciÅnij ZakoÅcz teraz.", IDC_STATIC,7,53,178,26 END @@ -45,20 +47,20 @@ BEGIN IDS_EDIT "Edytuj" IDS_MARK "Zaznacz" - IDS_COPY "Kopiuj\tWejd" + IDS_COPY "Kopiuj\tWejdÅº" IDS_PASTE "Wklej" IDS_SELECTALL "Zaznacz wszystko" - IDS_SCROLL "Przewiñ" - IDS_FIND "Znajd..." - IDS_DEFAULTS "Ustawienia domylne" - IDS_PROPERTIES "W³aciwoci" - IDS_SCROLLHERE "Przewiñ tutaj" - IDS_SCROLLTOP "Przewiñ na pocz¹tek" - IDS_SCROLLBOTTOM "Przewiñ na koniec" + IDS_SCROLL "PrzewiÅ" + IDS_FIND "ZnajdÅº..." + IDS_DEFAULTS "Ustawienia domyÅlne" + IDS_PROPERTIES "WÅaÅciwoÅci" + IDS_SCROLLHERE "PrzewiÅ tutaj" + IDS_SCROLLTOP "PrzewiÅ na poczÄtek" + IDS_SCROLLBOTTOM "PrzewiÅ na koniec" IDS_SCROLLPAGE_UP "Poprzednia strona" - IDS_SCROLLPAGE_DOWN "Nastêpna strona" - IDS_SCROLLUP "Przewiñ do góry" - IDS_SCROLLDOWN "Przewiñ na dó³" + IDS_SCROLLPAGE_DOWN "NastÄpna strona" + IDS_SCROLLUP "PrzewiÅ do gÃ³ry" + IDS_SCROLLDOWN "PrzewiÅ na dÃ³Å" IDS_COMMAND_PROMPT "Wiersz polecenia" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -15,7 +15,6 @@ #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/no-NO.rc" -#include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/zh-CN.rc" @@ -23,5 +22,6 @@ // UTF-8 #pragma code_page(65001) +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

1 0

[mkupfer] 52375: [TRANSLATIONS] fix the code_page-#pragma issue for Chinese - add Chinese to UTF-8 section - remove default #pragma at end of Romanian file
by mkupfer＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: mkupfer Date: Sun Jun 19 22:11:42 2011 New Revision: 52375 URL: http://svn.reactos.org/svn/reactos?rev=52375&view=rev Log: [TRANSLATIONS] fix the code_page-#pragma issue for Chinese - add Chinese to UTF-8 section - remove default #pragma at end of Romanian file Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/calc/lang/zh-CN.rc trunk/reactos/base/applications/calc/resource.rc Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:11:42 2011 @@ -730,5 +730,3 @@ IDS_WEIGHT_TONS_UK "Tone (Marea Britanie)" IDS_WEIGHT_TONS_US "Tone (SUA)" END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/calc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/zh-CN.rc [iso-8859-1] Sun Jun 19 22:11:42 2011 @@ -3,8 +3,6 @@ * * By: Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> */ - -#pragma code_page(65001) LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Sun Jun 19 22:11:42 2011 @@ -59,7 +59,6 @@ #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/th-TH.rc" -#include "lang/zh-CN.rc" // UTF-8 @@ -68,3 +67,4 @@ #include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" +#include "lang/zh-CN.rc"

1 0

[cgutman] 52374: [FASTFAT] - Move verification code to the BlockDev* functions (like CDFS does) so functions that call those directly will have verification handled for them - Add verification hand...
by cgutman＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: cgutman Date: Sun Jun 19 20:03:49 2011 New Revision: 52374 URL: http://svn.reactos.org/svn/reactos?rev=52374&view=rev Log: [FASTFAT] - Move verification code to the BlockDev* functions (like CDFS does) so functions that call those directly will have verification handled for them - Add verification handling for IOCTL requests Modified: trunk/reactos/drivers/filesystems/fastfat/blockdev.c trunk/reactos/drivers/filesystems/fastfat/create.c trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/blockdev.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/blockdev.c [iso-8859-1] Sun Jun 19 20:03:49 2011 @@ -37,6 +37,10 @@ if (Irp->PendingReturned) { IrpContext->Flags |= IRPCONTEXT_PENDINGRETURNED; + } + else + { + IrpContext->Flags &= ~IRPCONTEXT_PENDINGRETURNED; } if (!NT_SUCCESS(Irp->IoStatus.Status)) { @@ -67,6 +71,7 @@ KEVENT event; NTSTATUS Status; +again: KeInitializeEvent (&event, NotificationEvent, FALSE); DPRINT ("VfatReadDisk(pDeviceObject %p, Offset %I64x, Length %d, Buffer %p)\n", @@ -102,6 +107,25 @@ KeWaitForSingleObject (&event, Suspended, KernelMode, FALSE, NULL); DPRINT ("Getting IO Status... for %p\n", Irp); Status = IoStatus.Status; + } + + if (Status == STATUS_VERIFY_REQUIRED) + { + PDEVICE_OBJECT DeviceToVerify; + + DPRINT1 ("Media change detected!\n"); + + /* Find the device to verify and reset the thread field to empty value again. */ + DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ()); + IoSetDeviceToVerify (PsGetCurrentThread (), NULL); + Status = IoVerifyVolume (DeviceToVerify, + FALSE); + + if (NT_SUCCESS(Status)) + { + DPRINT1 ("Volume verification successful; Reissuing read request\n"); + goto again; + } } if (!NT_SUCCESS (Status)) @@ -134,6 +158,7 @@ Buffer = (PCHAR)MmGetMdlVirtualAddress(IrpContext->Irp->MdlAddress) + BufferOffset; +again: Irp = IoAllocateIrp(IrpContext->DeviceExt->StorageDevice->StackSize, TRUE); if (Irp == NULL) { @@ -188,6 +213,25 @@ { KeWaitForSingleObject(&IrpContext->Event, Executive, KernelMode, FALSE, NULL); Status = IrpContext->Irp->IoStatus.Status; + } + + if (Status == STATUS_VERIFY_REQUIRED) + { + PDEVICE_OBJECT DeviceToVerify; + + DPRINT1 ("Media change detected!\n"); + + /* Find the device to verify and reset the thread field to empty value again. */ + DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ()); + IoSetDeviceToVerify (PsGetCurrentThread (), NULL); + Status = IoVerifyVolume (DeviceToVerify, + FALSE); + + if (NT_SUCCESS(Status)) + { + DPRINT1 ("Volume verification successful; Reissuing read request\n"); + goto again; + } } DPRINT("%x\n", Status); @@ -212,6 +256,7 @@ Buffer = (PCHAR)MmGetMdlVirtualAddress(IrpContext->Irp->MdlAddress) + BufferOffset; +again: DPRINT ("Building asynchronous FSD Request...\n"); Irp = IoAllocateIrp(IrpContext->DeviceExt->StorageDevice->StackSize, TRUE); if (Irp == NULL) @@ -266,6 +311,25 @@ { KeWaitForSingleObject(&IrpContext->Event, Executive, KernelMode, FALSE, NULL); Status = IrpContext->Irp->IoStatus.Status; + } + + if (Status == STATUS_VERIFY_REQUIRED) + { + PDEVICE_OBJECT DeviceToVerify; + + DPRINT1 ("Media change detected!\n"); + + /* Find the device to verify and reset the thread field to empty value again. */ + DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ()); + IoSetDeviceToVerify (PsGetCurrentThread (), NULL); + Status = IoVerifyVolume (DeviceToVerify, + FALSE); + + if (NT_SUCCESS(Status)) + { + DPRINT1 ("Volume verification successful; Reissuing write request\n"); + goto again; + } } return Status; @@ -292,6 +356,7 @@ InputBuffer, InputBufferSize, OutputBuffer, OutputBufferSize, OutputBufferSize ? *OutputBufferSize : 0); +again: KeInitializeEvent (&Event, NotificationEvent, FALSE); DPRINT("Building device I/O control request ...\n"); @@ -328,6 +393,25 @@ Status = IoStatus.Status; } + + if (Status == STATUS_VERIFY_REQUIRED) + { + PDEVICE_OBJECT DeviceToVerify; + + DPRINT1 ("Media change detected!\n"); + + /* Find the device to verify and reset the thread field to empty value again. */ + DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ()); + IoSetDeviceToVerify (PsGetCurrentThread (), NULL); + Status = IoVerifyVolume (DeviceToVerify, + FALSE); + + if (NT_SUCCESS(Status)) + { + DPRINT1 ("Volume verification successful; Reissuing IOCTL request\n"); + goto again; + } + } if (OutputBufferSize) { Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sun Jun 19 20:03:49 2011 @@ -372,20 +372,6 @@ 0, FALSE); - if (Status == STATUS_VERIFY_REQUIRED) - - { - PDEVICE_OBJECT DeviceToVerify; - - DPRINT ("Media change detected!\n"); - DPRINT ("Device %p\n", DeviceExt->StorageDevice); - - /* Find the device to verify and reset the thread field to empty value again. */ - DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ()); - IoSetDeviceToVerify (PsGetCurrentThread (), NULL); - Status = IoVerifyVolume (DeviceToVerify, - FALSE); - } if (!NT_SUCCESS(Status)) { DPRINT ("Status %lx\n", Status); Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Sun Jun 19 20:03:49 2011 @@ -537,7 +537,6 @@ PERESOURCE Resource = NULL; LARGE_INTEGER ByteOffset; PVOID Buffer; - PDEVICE_OBJECT DeviceToVerify; ULONG BytesPerSector; ASSERT(IrpContext); @@ -697,20 +696,6 @@ } Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength); - if (Status == STATUS_VERIFY_REQUIRED) - { - DPRINT("VfatReadFileData returned STATUS_VERIFY_REQUIRED\n"); - DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); - IoSetDeviceToVerify(PsGetCurrentThread(), NULL); - Status = IoVerifyVolume (DeviceToVerify, FALSE); - - if (NT_SUCCESS(Status)) - { - Status = VfatReadFileData(IrpContext, Length, - ByteOffset, &ReturnedLength); - } - } - if (NT_SUCCESS(Status)) { IrpContext->Irp->IoStatus.Information = ReturnedLength; @@ -767,7 +752,6 @@ ULONG OldAllocationSize; PVOID Buffer; ULONG BytesPerSector; - PDEVICE_OBJECT DeviceToVerify; ASSERT(IrpContext); @@ -989,19 +973,6 @@ } Status = VfatWriteFileData(IrpContext, Length, ByteOffset); - if (Status == STATUS_VERIFY_REQUIRED) - { - DPRINT("VfatWriteFileData returned STATUS_VERIFY_REQUIRED\n"); - DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); - IoSetDeviceToVerify(PsGetCurrentThread(), NULL); - Status = IoVerifyVolume (DeviceToVerify, FALSE); - - if (NT_SUCCESS(Status)) - { - Status = VfatWriteFileData(IrpContext, Length, ByteOffset); - } - } - if (NT_SUCCESS(Status)) { IrpContext->Irp->IoStatus.Information = Length;

1 0

[tkreuzer] 52373: [BROWSEUI] Fix rc syntax
by tkreuzer＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: tkreuzer Date: Sun Jun 19 19:48:43 2011 New Revision: 52373 URL: http://svn.reactos.org/svn/reactos?rev=52373&view=rev Log: [BROWSEUI] Fix rc syntax Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc trunk/reactos/dll/win32/browseui/lang/en-US.rc trunk/reactos/dll/win32/browseui/lang/es-ES.rc trunk/reactos/dll/win32/browseui/lang/pl-PL.rc trunk/reactos/dll/win32/browseui/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] Sun Jun 19 19:48:43 2011 @@ -26,14 +26,14 @@ // Menus // -IDM_CABINET_CONTEXTMENU MENUEX +IDM_CABINET_CONTEXTMENU MENUEX BEGIN POPUP "", 264,MFT_STRING,MFS_ENABLED BEGIN MENUITEM "&ÐÐ±Ð¸ÑÐ°Ð¹Ð½Ð¸ Ð±ÑÑÐ¾Ð½Ð¸", IDM_TOOLBARS_STANDARDBUTTONS,MFT_STRING,MFS_ENABLED MENUITEM "&ÐÐ´ÑÐµÑÐ½Ð° Ð»ÐµÐ½ÑÐ°", IDM_TOOLBARS_ADDRESSBAR,MFT_STRING,MFS_ENABLED MENUITEM "&ÐÑÑÐ·ÐºÐ¸", IDM_TOOLBARS_LINKSBAR,MFT_STRING,MFS_ENABLED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ¸ÑÐµ Ñ &Ð¿Ð¾ÑÐ¾Ð±Ð¸Ñ", IDM_TOOLBARS_LOCKTOOLBARS,MFT_STRING,MFS_ENABLED MENUITEM "&ÐÐ°Ð³Ð»Ð°ÑÑÐ²Ð°Ð½Ðµ...", IDM_TOOLBARS_CUSTOMIZE,MFT_STRING,MFS_ENABLED MENUITEM "&Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸ ÐµÑÐ¸ÐºÐµÑÐ¸", IDM_TOOLBARS_TEXTLABELS,MFT_STRING,MFS_ENABLED @@ -123,7 +123,7 @@ // Accelerator // -IDR_ACCELERATORS ACCELERATORS +IDR_ACCELERATORS ACCELERATORS BEGIN VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT @@ -145,50 +145,50 @@ // Strings // -STRINGTABLE +STRINGTABLE BEGIN 800 "Ð¡ÑÐ´ÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° Ð¸Ð·Ð±ÑÐ°Ð½Ð¸ÑÐµ Ð¿ÑÐµÐ´Ð¼ÐµÑÐ¸." END -STRINGTABLE +STRINGTABLE BEGIN 864 "Ð¡ÑÐ´ÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ°." END -STRINGTABLE +STRINGTABLE BEGIN 928 "Ð¡ÑÐ´ÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° Ð¸Ð·Ð³Ð»ÐµÐ´Ð°." END -STRINGTABLE +STRINGTABLE BEGIN 992 "Ð¡ÑÐ´ÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¿Ð¾ÑÐ¾Ð±Ð¸ÑÑÐ°." END -STRINGTABLE +STRINGTABLE BEGIN 1056 "Ð¡ÑÑÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¿Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ð¼Ð¾Ñ." END -STRINGTABLE +STRINGTABLE BEGIN 9025 "ÐÐ°ÑÐ²Ð°ÑÑ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ°." 9026 "ÐÑÐ¸Ð²Ð° ÑÐ°Ð²Ð½Ð¸ÑÐµ Ð½Ð°Ð³Ð¾ÑÐµ." END -STRINGTABLE +STRINGTABLE BEGIN 9121 "Ð¡Ð²ÑÑÐ²Ð°Ð½Ðµ ÐºÑÐ¼ Ð¼ÑÐµÐ¶Ð¾Ð²Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾." 9122 "Ð Ð°Ð·ÐºÐ°ÑÐ°Ð½Ðµ Ð¾Ñ Ð¼ÑÐµÐ¶Ð¾Ð²Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾." END -STRINGTABLE +STRINGTABLE BEGIN 9250 "ÐÐ¾ÐºÐ°Ð·Ð²Ð° ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð·Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°ÑÐ°, Ð²ÐµÑÑÐ¸Ñ Ð¸ Ð²ÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´ÑÑÐ²ÐµÐ½Ð¸ Ð¿ÑÐ°Ð²Ð°." 9252 "ÐÐ¾ÐºÐ°Ð·Ð²Ð° ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð·Ð° Ð¿ÑÐ¾ÑÐ»ÐµÐ´ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð½ÐµÐ´ÑÐ·Ð¸." END -STRINGTABLE +STRINGTABLE BEGIN 9281 "ÐÑÐ¸Ð²Ð° Ð½Ð° Ð¿ÑÐµÐ´ÑÐ¾Ð´Ð½Ð°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ°." 9282 "ÐÑÐ¸Ð²Ð° Ð½Ð° ÑÐ»ÐµÐ´Ð²Ð°ÑÐ°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ°." @@ -196,13 +196,13 @@ 9285 "ÐÑÐ¸Ð²Ð° Ð² Ð½Ð°ÑÐ°Ð»Ð½Ð°ÑÐ° Ð²Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ°." END -STRINGTABLE +STRINGTABLE BEGIN 9362 "ÐÑÐ²Ð°ÑÑ Ð¿Ð°Ð¿ÐºÐ°ÑÐ° Ñ Ð»ÑÐ±Ð¸Ð¼ÐºÐ¸ÑÐµ." 9363 "ÐÐ¾Ð±Ð°Ð²Ñ ÑÐµÐºÑÑÐ°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ° ÐºÑÐ¼ ÑÐ¿Ð¸ÑÑÐºÐ° Ñ Ð»ÑÐ±Ð¸Ð¼ÐºÐ¸ÑÐµ." END -STRINGTABLE +STRINGTABLE BEGIN 9505 "Ð¡ÐºÑÐ¸Ð²Ð° Ð¸Ð»Ð¸ Ð¿Ð¾ÐºÐ°Ð·Ð²Ð° Ð»ÐµÐ½ÑÐ¸ÑÐµ Ñ Ð¿Ð¾ÑÐ¾Ð±Ð¸Ñ." 9506 "Ð¡ÐºÑÐ¸Ð²Ð° Ð¸Ð»Ð¸ Ð¿Ð¾ÐºÐ°Ð·Ð²Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ð½Ð° ÑÑÑÑÐ¾ÑÐ½Ð¸ÐµÑÐ¾." @@ -212,12 +212,12 @@ 9516 "ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð·Ð¼ÐµÑÐ¸ÑÐµ Ð¸ ÑÐ°Ð·Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð½Ð° Ð»ÐµÐ½ÑÐ¸ÑÐµ Ñ Ð¿Ð¾ÑÐ¾Ð±Ð¸Ñ." END -STRINGTABLE +STRINGTABLE BEGIN 9533 "ÐÐ°Ð³Ð»Ð°ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ñ Ð¿Ð¾ÑÐ¾Ð±Ð¸Ñ." END -STRINGTABLE +STRINGTABLE BEGIN 9552 "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð¸Ð»Ð¸ ÑÐºÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ð½Ð° Ð¸Ð·ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»Ñ." 9553 "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ð·Ð° ÑÑÑÑÐµÐ½Ðµ." @@ -227,47 +227,47 @@ 9559 "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¼ÐµÐ´Ð¸Ð¹Ð½Ð°ÑÐ° Ð»ÐµÐ½ÑÐ°." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SMALLICONS "ÐÐ°Ð»ÐºÐ¸ Ð·Ð½Ð°ÑÐµÑÐ°" IDS_LARGEICONS "ÐÐ¾Ð»ÐµÐ¼Ð¸ Ð·Ð½Ð°ÑÐµÑÐ°" IDS_SHOWTEXTLABELS "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐµÐºÑÑÐ¾Ð²Ð¸ ÐµÑÐ¸ÐºÐµÑÐ¸" END -STRINGTABLE +STRINGTABLE BEGIN IDS_NOTEXTLABELS "ÐÐ¸Ð¿ÑÐ²Ð°Ñ ÑÐµÐºÑÑÐ¾Ð²Ð¸ ÐµÑÐ¸ÐºÐµÑÐ¸" IDS_SELECTIVETEXTONRIGHT "Selective text on right" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GOBUTTONLABEL "|ÐÑÐ¸Ð²Ð°Ð½Ðµ||" IDS_GOBUTTONTIPTEMPLATE "ÐÑÐ¸Ð²Ð°Ð½Ðµ Ð²""%s""" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SEARCHLABEL "Ð¢ÑÑÑÐµÐ½Ðµ" IDS_ADDRESSBANDLABEL "&ÐÐ´ÑÐµÑ" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FOLDERSLABEL "ÐÐ°Ð¿ÐºÐ¸" END -STRINGTABLE +STRINGTABLE BEGIN IDS_HISTORYTEXT "&ÐÐ½ÐµÐ²Ð½Ð¸Ðº\tCtrl+H" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UP "ÐÐ°Ð³Ð¾ÑÐµ" END -STRINGTABLE +STRINGTABLE BEGIN IDS_BACK "ÐÐ°Ð·Ð°Ð´" IDS_FORWARD "ÐÐ°Ð¿ÑÐµÐ´" Modified: trunk/reactos/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/en… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] Sun Jun 19 19:48:43 2011 @@ -23,14 +23,14 @@ // Menus // -IDM_CABINET_CONTEXTMENU MENUEX +IDM_CABINET_CONTEXTMENU MENUEX BEGIN POPUP "", 264,MFT_STRING,MFS_ENABLED BEGIN MENUITEM "&Standard Buttons", IDM_TOOLBARS_STANDARDBUTTONS,MFT_STRING,MFS_ENABLED MENUITEM "&Address Bar", IDM_TOOLBARS_ADDRESSBAR,MFT_STRING,MFS_ENABLED MENUITEM "&Links", IDM_TOOLBARS_LINKSBAR,MFT_STRING,MFS_ENABLED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Lock the Tool&bars", IDM_TOOLBARS_LOCKTOOLBARS,MFT_STRING,MFS_ENABLED MENUITEM "&Customize...", IDM_TOOLBARS_CUSTOMIZE,MFT_STRING,MFS_ENABLED MENUITEM "&Text Labels", IDM_TOOLBARS_TEXTLABELS,MFT_STRING,MFS_ENABLED @@ -120,7 +120,7 @@ // Accelerator // -IDR_ACCELERATORS ACCELERATORS +IDR_ACCELERATORS ACCELERATORS BEGIN VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT @@ -142,50 +142,50 @@ // Strings // -STRINGTABLE +STRINGTABLE BEGIN 800 "Contains commands for manipulating the selected items." END -STRINGTABLE +STRINGTABLE BEGIN 864 "Contains edit commands." END -STRINGTABLE +STRINGTABLE BEGIN 928 "Contains commands for manipulating the view." END -STRINGTABLE +STRINGTABLE BEGIN 992 "Contains tools commands." END -STRINGTABLE +STRINGTABLE BEGIN 1056 "Contains commands for displaying Help." END -STRINGTABLE +STRINGTABLE BEGIN 9025 "Closes the window." 9026 "Goes up one level." END -STRINGTABLE +STRINGTABLE BEGIN 9121 "Connects to a network drive." 9122 "Disconnects from a network drive." END -STRINGTABLE +STRINGTABLE BEGIN 9250 "Displays program information, version number, and copyright." 9252 "Displays information for debugging." END -STRINGTABLE +STRINGTABLE BEGIN 9281 "Goes to the previous page." 9282 "Goes to the next page." @@ -193,13 +193,13 @@ 9285 "Goes to your home page." END -STRINGTABLE +STRINGTABLE BEGIN 9362 "Opens the Favorites folder." 9363 "Adds the current page to your Favorites list." END -STRINGTABLE +STRINGTABLE BEGIN 9505 "Shows or hides toolbars." 9506 "Shows or hides the status bar." @@ -209,12 +209,12 @@ 9516 "Locks the sizes and positions of the toolbars." END -STRINGTABLE +STRINGTABLE BEGIN 9533 "Customizes the toolbar." END -STRINGTABLE +STRINGTABLE BEGIN 9552 "Shows or hides an Explorer bar." 9553 "Shows the Search bar." @@ -224,47 +224,47 @@ 9559 "Shows the Media Bar." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SMALLICONS "Small icons" IDS_LARGEICONS "Large icons" IDS_SHOWTEXTLABELS "Show text labels" END -STRINGTABLE +STRINGTABLE BEGIN IDS_NOTEXTLABELS "No text labels" IDS_SELECTIVETEXTONRIGHT "Selective text on right" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GOBUTTONLABEL "|Go||" IDS_GOBUTTONTIPTEMPLATE "Go to ""%s""" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SEARCHLABEL "Search" IDS_ADDRESSBANDLABEL "A&ddress" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FOLDERSLABEL "Folders" END -STRINGTABLE +STRINGTABLE BEGIN IDS_HISTORYTEXT "&History\tCtrl+H" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UP "Up" END -STRINGTABLE +STRINGTABLE BEGIN IDS_BACK "Back" IDS_FORWARD "Forward" Modified: trunk/reactos/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/es… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] Sun Jun 19 19:48:43 2011 @@ -23,14 +23,14 @@ // Menus // -IDM_CABINET_CONTEXTMENU MENUEX +IDM_CABINET_CONTEXTMENU MENUEX BEGIN POPUP "", 264,MFT_STRING,MFS_ENABLED BEGIN MENUITEM "Botones e&stándar", IDM_TOOLBARS_STANDARDBUTTONS,MFT_STRING,MFS_ENABLED MENUITEM "&Barra de direcciones", IDM_TOOLBARS_ADDRESSBAR,MFT_STRING,MFS_ENABLED MENUITEM "&Vínculos", IDM_TOOLBARS_LINKSBAR,MFT_STRING,MFS_ENABLED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Bloquear las barras de &herramientas", IDM_TOOLBARS_LOCKTOOLBARS,MFT_STRING,MFS_ENABLED MENUITEM "&Personalizar...", IDM_TOOLBARS_CUSTOMIZE,MFT_STRING,MFS_ENABLED MENUITEM "&Etiquetas", IDM_TOOLBARS_TEXTLABELS,MFT_STRING,MFS_ENABLED @@ -120,7 +120,7 @@ // Accelerator // -IDR_ACCELERATORS ACCELERATORS +IDR_ACCELERATORS ACCELERATORS BEGIN VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT @@ -142,50 +142,50 @@ // Strings // -STRINGTABLE +STRINGTABLE BEGIN 800 "Contiene comandos para trabajar con los elementos seleccionados." END -STRINGTABLE +STRINGTABLE BEGIN 864 "Contiene comandos de edición." END -STRINGTABLE +STRINGTABLE BEGIN 928 "Contiene comandos para manipular la vista." END -STRINGTABLE +STRINGTABLE BEGIN 992 "Contiene comandos de herramientas." END -STRINGTABLE +STRINGTABLE BEGIN 1056 "Contiene comandos para mostrar la Ayuda." END -STRINGTABLE +STRINGTABLE BEGIN 9025 "Cierra la ventana." 9026 "Sube un nivel." END -STRINGTABLE +STRINGTABLE BEGIN 9121 "Conecta a unidad de red." 9122 "Desconecta de unidad de red." END -STRINGTABLE +STRINGTABLE BEGIN 9250 "Muestra información sobre el programa, número de versión y copyright." 9252 "Muestra información para debugging." END -STRINGTABLE +STRINGTABLE BEGIN 9281 "Va a la página previa." 9282 "Va a la próxima página." @@ -193,13 +193,13 @@ 9285 "Va a página de inicio." END -STRINGTABLE +STRINGTABLE BEGIN 9362 "Abre la carpeta Organizar Favoritos." 9363 "Añade la página actual a la lista de Favoritos." END -STRINGTABLE +STRINGTABLE BEGIN 9505 "Muestra u oculta las barras de herramientas." 9506 "Muestra u oculta la barra de estado." @@ -209,12 +209,12 @@ 9516 "Bloquear el tamaño y la posición de las barras de herramientas." END -STRINGTABLE +STRINGTABLE BEGIN 9533 "Personalizar la barra de herramientas." END -STRINGTABLE +STRINGTABLE BEGIN 9552 "Muestra u oculta una de las barras del explorador." 9553 "Muestra la barra de búsqueda." @@ -224,47 +224,47 @@ 9559 "Muestra la barra de media." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SMALLICONS "Iconos pequeños" IDS_LARGEICONS "Iconos grandes" IDS_SHOWTEXTLABELS "Muestra etiquetas de texto" END -STRINGTABLE +STRINGTABLE BEGIN IDS_NOTEXTLABELS "Sin etiquetas de texto" IDS_SELECTIVETEXTONRIGHT "Selecciona el texto a la derecha" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GOBUTTONLABEL "|Ir||" IDS_GOBUTTONTIPTEMPLATE "Ir a ""%s""" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SEARCHLABEL "Búsqueda" IDS_ADDRESSBANDLABEL "Dire&cción" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FOLDERSLABEL "Carpetas" END -STRINGTABLE +STRINGTABLE BEGIN IDS_HISTORYTEXT "&Historial\tCtrl+H" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UP "Arriba" END -STRINGTABLE +STRINGTABLE BEGIN IDS_BACK "Atrás" IDS_FORWARD "Adelante" Modified: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] Sun Jun 19 19:48:43 2011 @@ -29,14 +29,14 @@ // Menus // -IDM_CABINET_CONTEXTMENU MENUEX +IDM_CABINET_CONTEXTMENU MENUEX BEGIN POPUP "", 264,MFT_STRING,MFS_ENABLED BEGIN MENUITEM "&Przyciski standardowe", IDM_TOOLBARS_STANDARDBUTTONS,MFT_STRING,MFS_ENABLED MENUITEM "Pasek &Adresu", IDM_TOOLBARS_ADDRESSBAR,MFT_STRING,MFS_ENABLED MENUITEM "&OdnoÅniki", IDM_TOOLBARS_LINKSBAR,MFT_STRING,MFS_ENABLED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Zablokuj paski narzÄdzi", IDM_TOOLBARS_LOCKTOOLBARS,MFT_STRING,MFS_ENABLED MENUITEM "&Dostosuj...", IDM_TOOLBARS_CUSTOMIZE,MFT_STRING,MFS_ENABLED MENUITEM "&Etykiety", IDM_TOOLBARS_TEXTLABELS,MFT_STRING,MFS_ENABLED @@ -126,7 +126,7 @@ // Accelerator // -IDR_ACCELERATORS ACCELERATORS +IDR_ACCELERATORS ACCELERATORS BEGIN VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT @@ -148,50 +148,50 @@ // Strings // -STRINGTABLE +STRINGTABLE BEGIN 800 "Zawiera polecenia do manipulowania wybranymi elementami." END -STRINGTABLE +STRINGTABLE BEGIN 864 "Zawiera polecenia do edycji." END -STRINGTABLE +STRINGTABLE BEGIN 928 "Zawiera polecenia do zmiany widoku." END -STRINGTABLE +STRINGTABLE BEGIN 992 "Zawiera polecenia dla narzÄdzi." END -STRINGTABLE +STRINGTABLE BEGIN 1056 "Zawiera polecenia do wyÅwietlania pomocy." END -STRINGTABLE +STRINGTABLE BEGIN 9025 "Zamyka okno." 9026 "Przechodzi o poziom wyÅ¼ej." END -STRINGTABLE +STRINGTABLE BEGIN 9121 "PodÅÄcza dysk sieciowy." 9122 "OdÅÄcza dysk sieciowy." END -STRINGTABLE +STRINGTABLE BEGIN 9250 "WyÅwietla informacje o programie, jego wersjÄ i licencjÄ." 9252 "WyÅwietla informacje do debugowania." END -STRINGTABLE +STRINGTABLE BEGIN 9281 "Przechodzi na poprzedniÄ stronÄ." 9282 "Przechodzi na nastÄpnÄ stronÄ." @@ -199,13 +199,13 @@ 9285 "Przechodzi na stronÄ domowÄ." END -STRINGTABLE +STRINGTABLE BEGIN 9362 "Otwiera katalog Ulubionych." 9363 "Dodaje bierzÄcÄ stronÄ do listy ulubionych." END -STRINGTABLE +STRINGTABLE BEGIN 9505 "Pokazuje lub ukrywa paski narzÄdzi." 9506 "Pokazuje lub ukrywa pasek stanu." @@ -215,12 +215,12 @@ 9516 "Blokuje poÅoÅ¼enie i rozmiar paskÃ³w." END -STRINGTABLE +STRINGTABLE BEGIN 9533 "Dostosowuje wybrane paski." END -STRINGTABLE +STRINGTABLE BEGIN 9552 "Pokazuje lub ukrywa Pasek Eksploratora." 9553 "Pokazuje pasek Wyszukiwania." @@ -230,47 +230,47 @@ 9559 "Pokazuje pasek MultimediÃ³w." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SMALLICONS "MaÅe ikony" IDS_LARGEICONS "DuÅ¼e ikony" IDS_SHOWTEXTLABELS "PokaÅ¼ etykiety" END -STRINGTABLE +STRINGTABLE BEGIN IDS_NOTEXTLABELS "Brak etykiet" IDS_SELECTIVETEXTONRIGHT "Tekst do zaznaczenia po prawej" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GOBUTTONLABEL "|IdÅº||" IDS_GOBUTTONTIPTEMPLATE "IdÅº do ""%s""" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SEARCHLABEL "Wyszukaj" IDS_ADDRESSBANDLABEL "A&dres" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FOLDERSLABEL "Katalogi" END -STRINGTABLE +STRINGTABLE BEGIN IDS_HISTORYTEXT "&Historia\tCtrl+H" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UP "W gÃ³rÄ" END -STRINGTABLE +STRINGTABLE BEGIN IDS_BACK "Wstecz" IDS_FORWARD "NaprzÃ³d" Modified: trunk/reactos/dll/win32/browseui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] Sun Jun 19 19:48:43 2011 @@ -25,14 +25,14 @@ // Menus // -IDM_CABINET_CONTEXTMENU MENUEX +IDM_CABINET_CONTEXTMENU MENUEX BEGIN POPUP "", 264,MFT_STRING,MFS_ENABLED BEGIN MENUITEM "&Ñòàíäàðòí³ Êíîïêè", IDM_TOOLBARS_STANDARDBUTTONS,MFT_STRING,MFS_ENABLED MENUITEM "&Ðÿäîê Àäðåñè", IDM_TOOLBARS_ADDRESSBAR,MFT_STRING,MFS_ENABLED MENUITEM "&Ïîñèëàííÿ", IDM_TOOLBARS_LINKSBAR,MFT_STRING,MFS_ENABLED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Áëîêóâàííÿ ïàíåëåé ³íñòðóìåíò³â", IDM_TOOLBARS_LOCKTOOLBARS,MFT_STRING,MFS_ENABLED MENUITEM "&Íàëàøòóâàòè...", IDM_TOOLBARS_CUSTOMIZE,MFT_STRING,MFS_ENABLED MENUITEM "&Òåêñòîâ³ ì³òêè", IDM_TOOLBARS_TEXTLABELS,MFT_STRING,MFS_ENABLED @@ -122,7 +122,7 @@ // Accelerator // -IDR_ACCELERATORS ACCELERATORS +IDR_ACCELERATORS ACCELERATORS BEGIN VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT @@ -144,50 +144,50 @@ // Strings // -STRINGTABLE +STRINGTABLE BEGIN 800 "Ì³ñòèòü êîìàíäè ìàí³ïóëþâàííÿ âèáðàíèìè îá'ºêòàìè." END -STRINGTABLE +STRINGTABLE BEGIN 864 "Ì³ñòèòü êîìàíäè ïðàâêè." END -STRINGTABLE +STRINGTABLE BEGIN 928 "Ì³ñòèòü êîìàíäè ìàí³ïóëþâàííÿ âèãëÿäîì." END -STRINGTABLE +STRINGTABLE BEGIN 992 "Ì³ñòèòü êîìàíäè ³íñòðóìåíò³â." END -STRINGTABLE +STRINGTABLE BEGIN 1056 "Ì³ñòèòü êîìàíäè äëÿ â³äîáðàæåííÿ Äîïîìîãè." END -STRINGTABLE +STRINGTABLE BEGIN 9025 "Çàêðèâàº â³êíî." 9026 "Éäå ââåðõ íà îäèí ð³âåíü." END -STRINGTABLE +STRINGTABLE BEGIN 9121 "Ï³ä'ºäíóº äî ìåðåæåâîãî äèñêó." 9122 "Â³ä'ºäíóº â³ä ìåðåæåâîãî äèñêó." END -STRINGTABLE +STRINGTABLE BEGIN 9250 "Â³äîáðàæàº äàí³ ïðî ïðîãðàìó, íîìåð âåðñ³¿, òà copyright." 9252 "Â³äîáðàæàº äàí³ äëÿ íàëàãîäæåííÿ." END -STRINGTABLE +STRINGTABLE BEGIN 9281 "Éäå äî ïîïåðåäíüî¿ ñòîð³íêè." 9282 "Éäå äî íàñòóïíî¿ ñòîð³íêè." @@ -195,13 +195,13 @@ 9285 "Éäå äî âàøî¿ äîìàøíüî¿ ñòîð³íêè." END -STRINGTABLE +STRINGTABLE BEGIN 9362 "Â³äêðèâàº ïàïêó Îáðàíå." 9363 "Äîäàº ïîòî÷íó ñòîð³íêó äî ñïèñêó Îáðàíîãî." END -STRINGTABLE +STRINGTABLE BEGIN 9505 "Ïîêàçóº ÷è ïðèõîâóº ïàíåë³ ³íñòðóìåíò³â." 9506 "Ïîêàçóº ÷è ïðèõîâóº ðÿäîê ñòàíó." @@ -211,12 +211,12 @@ 9516 "Áëîêóº ðîçì³ðè òà ðîçòàøóâàííÿ ïàíåëåé ³íñòðóìåíò³â." END -STRINGTABLE +STRINGTABLE BEGIN 9533 "Ïåðñîíàë³çóº ïàíåëü ³íñòðóìåíò³â." END -STRINGTABLE +STRINGTABLE BEGIN 9552 "Ïîêàçóº ÷è ïðèõîâóº ïàíåëü Ïðîâ³äíèêà." 9553 "Ïîêàçóº ïàíåëü Ïîøóêó." @@ -226,47 +226,47 @@ 9559 "Ïîêàçóº ïàíåëü Ìåä³à." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SMALLICONS "Ìàë³ çíà÷êè" IDS_LARGEICONS "Âåëèê³ çíà÷êè" IDS_SHOWTEXTLABELS "Ïîêàçàòè òåêñòîâ³ ì³òêè" END -STRINGTABLE +STRINGTABLE BEGIN IDS_NOTEXTLABELS "Áåç òåêñòîâèõ ì³òîê" IDS_SELECTIVETEXTONRIGHT "×àñòèíà òåêñòó ïðàâîðó÷" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GOBUTTONLABEL "|Éòè||" IDS_GOBUTTONTIPTEMPLATE "Éòè äî ""%s""" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SEARCHLABEL "Ïîøóê" IDS_ADDRESSBANDLABEL "À&äðåñà" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FOLDERSLABEL "Ïàïêè" END -STRINGTABLE +STRINGTABLE BEGIN IDS_HISTORYTEXT "&²ñòîð³ÿ\tCtrl+H" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UP "Ââåðõ" END -STRINGTABLE +STRINGTABLE BEGIN IDS_BACK "Íàçàä" IDS_FORWARD "Âïåðåä"

1 0

[cgutman] 52372: [FASTFAT] - Handle STATUS_VERIFY_REQUIRED for write requests - Clear the device to verify after retrieving it - Fixes write failure after changing floppy media [CDFS] - Reissue the...
by cgutman＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: cgutman Date: Sun Jun 19 19:43:52 2011 New Revision: 52372 URL: http://svn.reactos.org/svn/reactos?rev=52372&view=rev Log: [FASTFAT] - Handle STATUS_VERIFY_REQUIRED for write requests - Clear the device to verify after retrieving it - Fixes write failure after changing floppy media [CDFS] - Reissue the I/O request if IoVerifyVolume was successful - Fixes read after a media change Modified: trunk/reactos/drivers/filesystems/cdfs/common.c trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/common.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/common.c [iso-8859-1] Sun Jun 19 19:43:52 2011 @@ -50,6 +50,7 @@ PIRP Irp; NTSTATUS Status; +again: KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -102,14 +103,19 @@ if (Status == STATUS_VERIFY_REQUIRED) { PDEVICE_OBJECT DeviceToVerify; - NTSTATUS NewStatus; DPRINT1("STATUS_VERIFY_REQUIRED\n"); DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); IoSetDeviceToVerify(PsGetCurrentThread(), NULL); - NewStatus = IoVerifyVolume(DeviceToVerify, FALSE); - DPRINT1("IoVerifyVolume() returned (Status %lx)\n", NewStatus); + Status = IoVerifyVolume(DeviceToVerify, FALSE); + DPRINT1("IoVerifyVolume() returned (Status %lx)\n", Status); + + if (NT_SUCCESS(Status)) + { + DPRINT1("Volume verify succeeded; trying request again\n"); + goto again; + } } DPRINT("CdfsReadSectors() failed (Status %x)\n", Status); @@ -146,6 +152,7 @@ InputBuffer, InputBufferSize, OutputBuffer, OutputBufferSize, OutputBufferSize ? *OutputBufferSize : 0); +again: KeInitializeEvent (&Event, NotificationEvent, FALSE); DPRINT("Building device I/O control request ...\n"); @@ -191,7 +198,6 @@ if (Status == STATUS_VERIFY_REQUIRED) { PDEVICE_OBJECT DeviceToVerify; - NTSTATUS NewStatus; DPRINT1("STATUS_VERIFY_REQUIRED\n"); DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); @@ -199,8 +205,14 @@ if (DeviceToVerify) { - NewStatus = IoVerifyVolume(DeviceToVerify, FALSE); - DPRINT1("IoVerifyVolume() returned (Status %lx)\n", NewStatus); + Status = IoVerifyVolume(DeviceToVerify, FALSE); + DPRINT1("IoVerifyVolume() returned (Status %lx)\n", Status); + } + + if (NT_SUCCESS(Status)) + { + DPRINT1("Volume verify succeeded; trying request again\n"); + goto again; } } Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Sun Jun 19 19:43:52 2011 @@ -697,12 +697,11 @@ } Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength); -/**/ if (Status == STATUS_VERIFY_REQUIRED) { - DPRINT("VfatReadFile returned STATUS_VERIFY_REQUIRED\n"); + DPRINT("VfatReadFileData returned STATUS_VERIFY_REQUIRED\n"); DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); - IoSetDeviceToVerify(PsGetCurrentThread(), DeviceToVerify); + IoSetDeviceToVerify(PsGetCurrentThread(), NULL); Status = IoVerifyVolume (DeviceToVerify, FALSE); if (NT_SUCCESS(Status)) @@ -710,9 +709,8 @@ Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength); } - - } -/**/ + } + if (NT_SUCCESS(Status)) { IrpContext->Irp->IoStatus.Information = ReturnedLength; @@ -769,6 +767,7 @@ ULONG OldAllocationSize; PVOID Buffer; ULONG BytesPerSector; + PDEVICE_OBJECT DeviceToVerify; ASSERT(IrpContext); @@ -990,6 +989,19 @@ } Status = VfatWriteFileData(IrpContext, Length, ByteOffset); + if (Status == STATUS_VERIFY_REQUIRED) + { + DPRINT("VfatWriteFileData returned STATUS_VERIFY_REQUIRED\n"); + DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); + IoSetDeviceToVerify(PsGetCurrentThread(), NULL); + Status = IoVerifyVolume (DeviceToVerify, FALSE); + + if (NT_SUCCESS(Status)) + { + Status = VfatWriteFileData(IrpContext, Length, ByteOffset); + } + } + if (NT_SUCCESS(Status)) { IrpContext->Irp->IoStatus.Information = Length;

1 0

[tfaber] 52371: [KMTESTS] - add START_TEST macro in case test functions ever have to be passed an argument - add a few ok_* convenience macros - remove unnecessary C library function renaming macros
by tfaber＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: tfaber Date: Sun Jun 19 18:27:14 2011 New Revision: 52371 URL: http://svn.reactos.org/svn/reactos?rev=52371&view=rev Log: [KMTESTS] - add START_TEST macro in case test functions ever have to be passed an argument - add a few ok_* convenience macros - remove unnecessary C library function renaming macros Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] Sun Jun 19 18:27:14 2011 @@ -8,7 +8,7 @@ #include <ntddk.h> #include <kmt_test.h> -VOID Test_Example(VOID) +START_TEST(Example) { KIRQL Irql; @@ -17,5 +17,18 @@ trace("Message from kernel, low-irql. %s. %ls.\n", "Format strings work", L"Even with Unicode"); KeRaiseIrql(HIGH_LEVEL, &Irql); trace("Message from kernel, high-irql. %s. %ls.\n", "Format strings work", L"Even with Unicode"); + + ok_irql(DISPATCH_LEVEL); + ok_eq_int(5, 6); + ok_eq_uint(6U, 7U); + ok_eq_long(1L, 2L); + ok_eq_ulong(3LU, 4LU); + ok_eq_pointer((PVOID)8, (PVOID)9); + ok_eq_hex(0x1234LU, 0x5678LU); + ok_bool_true(FALSE, "foo"); + ok_bool_false(TRUE, "bar"); + ok_eq_print(1, 2, "%i"); + ok_eq_str("Hello", "world"); + ok_eq_wstr(L"ABC", L"DEF"); KeLowerIrql(Irql); } Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Sun Jun 19 18:27:14 2011 @@ -37,6 +37,8 @@ extern PKMT_RESULTBUFFER ResultBuffer; +#define START_TEST(name) VOID Test_##name(VOID) + #define KMT_STRINGIZE(x) #x #define ok(test, ...) ok_(test, __FILE__, __LINE__, __VA_ARGS__) #define trace(...) trace_( __FILE__, __LINE__, __VA_ARGS__) @@ -49,6 +51,21 @@ VOID KmtVTrace(PCSTR FileAndLine, PCSTR Format, va_list Arguments); VOID KmtTrace(PCSTR FileAndLine, PCSTR Format, ...); +#ifdef KMT_KERNEL_MODE +#define ok_irql(irql) ok(KeGetCurrentIrql() == irql, "IRQL is %d, expected %d\n", KeGetCurrentIrql(), irql) +#endif /* defined KMT_KERNEL_MODE */ +#define ok_eq_print(value, expected, spec) ok(value == expected, #value " = " spec ", expected " spec "\n", value, expected) +#define ok_eq_pointer(value, expected) ok_eq_print(value, expected, "%p") +#define ok_eq_int(value, expected) ok_eq_print(value, expected, "%d") +#define ok_eq_uint(value, expected) ok_eq_print(value, expected, "%u") +#define ok_eq_long(value, expected) ok_eq_print(value, expected, "%ld") +#define ok_eq_ulong(value, expected) ok_eq_print(value, expected, "%lu") +#define ok_eq_hex(value, expected) ok_eq_print(value, expected, "0x%08lx") +#define ok_bool_true(value, desc) ok(value == TRUE, desc " FALSE, expected TRUE\n") +#define ok_bool_false(value, desc) ok(value == FALSE, desc " TRUE, expected FALSE\n") +#define ok_eq_str(value, expected) ok(!strcmp(value, expected), #value " = \"%s\", expected \"%s\"\n", value, expected) +#define ok_eq_wstr(value, expected) ok(!wcscmp(value, expected), #value " = \"%ls\", expected \"%ls\"\n", value, expected) + #if defined KMT_DEFINE_TEST_FUNCTIONS PKMT_RESULTBUFFER ResultBuffer = NULL; @@ -70,10 +87,6 @@ HeapFree(GetProcessHeap(), 0, Buffer); } #endif /* defined KMT_USER_MODE */ - -#define KmtMemCpy memcpy -#define KmtStrLen strlen -#define KmtAssert assert static VOID KmtAddToLogBuffer(PKMT_RESULTBUFFER Buffer, PCSTR String, SIZE_T Length) { @@ -92,7 +105,7 @@ } } while (InterlockedCompareExchange(&Buffer->LogBufferLength, NewLength, OldLength) != OldLength); - KmtMemCpy(&Buffer->LogBuffer[OldLength], String, Length); + memcpy(&Buffer->LogBuffer[OldLength], String, Length); } #ifdef KMT_KERNEL_MODE @@ -108,16 +121,16 @@ if (Prepend1) { - SIZE_T Length = min(BufferMaxLength, KmtStrLen(Prepend1)); - KmtMemCpy(Buffer, Prepend1, Length); + SIZE_T Length = min(BufferMaxLength, strlen(Prepend1)); + memcpy(Buffer, Prepend1, Length); Buffer += Length; BufferLength += Length; BufferMaxLength -= Length; } if (Prepend2) { - SIZE_T Length = min(BufferMaxLength, KmtStrLen(Prepend2)); - KmtMemCpy(Buffer, Prepend2, Length); + SIZE_T Length = min(BufferMaxLength, strlen(Prepend2)); + memcpy(Buffer, Prepend2, Length); Buffer += Length; BufferLength += Length; BufferMaxLength -= Length;

1 0

[jgardou] 52370: addendum to r52369: forgot those
by jgardou＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: jgardou Date: Sun Jun 19 16:40:10 2011 New Revision: 52370 URL: http://svn.reactos.org/svn/reactos?rev=52370&view=rev Log: addendum to r52369: forgot those Modified: trunk/reactos/base/applications/dxdiag/CMakeLists.txt trunk/reactos/base/applications/mmc/CMakeLists.txt trunk/reactos/base/applications/msconfig/CMakeLists.txt trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt trunk/reactos/base/applications/notepad/CMakeLists.txt trunk/reactos/base/applications/taskmgr/CMakeLists.txt trunk/reactos/base/services/eventlog/CMakeLists.txt trunk/reactos/base/system/services/CMakeLists.txt Modified: trunk/reactos/base/applications/dxdiag/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/C… ============================================================================== --- trunk/reactos/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -20,12 +20,12 @@ add_executable(dxdiag ${SOURCE}) -add_pch(dxdiag precomp.h) - set_module_type(dxdiag win32gui) target_link_libraries(dxdiag dxguid) add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32 ntdll) +add_pch(dxdiag precomp.h) + add_cd_file(TARGET dxdiag DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/CMak… ============================================================================== --- trunk/reactos/base/applications/mmc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -10,7 +10,6 @@ add_executable(mmcclient ${SOURCE}) -add_pch(mmcclient precomp.h) - set_module_type(mmcclient win32gui) add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32) +add_pch(mmcclient precomp.h) Modified: trunk/reactos/base/applications/msconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -14,8 +14,7 @@ add_executable(msconfig ${SOURCE}) -add_pch(msconfig precomp.h) - set_module_type(msconfig win32gui) add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32) +add_pch(msconfig precomp.h) add_cd_file(TARGET msconfig DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -11,8 +11,7 @@ add_executable(devmgmt ${SOURCE}) -add_pch(devmgmt precomp.h) - set_module_type(devmgmt win32gui) add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32) +add_pch(devmgmt precomp.h) add_cd_file(TARGET devmgmt DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/notepad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -10,8 +10,7 @@ add_executable(notepad ${SOURCE}) -add_pch(notepad notepad.h) - set_module_type(notepad win32gui) add_importlibs(notepad user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32) +add_pch(notepad notepad.h) add_cd_file(TARGET notepad DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/taskmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -25,8 +25,7 @@ add_executable(taskmgr ${SOURCE}) -add_pch(taskmgr precomp.h) - set_module_type(taskmgr win32gui) add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll) +add_pch(taskmgr precomp.h) add_cd_file(TARGET taskmgr DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/services/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/CMa… ============================================================================== --- trunk/reactos/base/services/eventlog/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -15,8 +15,7 @@ target_link_libraries(eventlog eventlogrpc ${PSEH_LIB}) -add_pch(eventlog eventlog.h) - set_module_type(eventlog win32cui) add_importlibs(eventlog advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_pch(eventlog eventlog.h) add_cd_file(TARGET eventlog DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/CMake… ============================================================================== --- trunk/reactos/base/system/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/services/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -20,8 +20,7 @@ svcctlrpc ${PSEH_LIB}) -add_pch(services services.h) - set_module_type(services win32cui) add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_pch(services services.h) add_cd_file(TARGET services DESTINATION reactos/system32 FOR all)

1 0

[jgardou] 52369: [CMAKE] - set PCH file after importing libraries for modules that link to msvcrt. Otherwise it wouldn't get the added definitions and become useless.
by jgardou＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: jgardou Date: Sun Jun 19 16:35:43 2011 New Revision: 52369 URL: http://svn.reactos.org/svn/reactos?rev=52369&view=rev Log: [CMAKE] - set PCH file after importing libraries for modules that link to msvcrt. Otherwise it wouldn't get the added definitions and become useless. Modified: trunk/reactos/base/applications/cacls/CMakeLists.txt trunk/reactos/base/applications/calc/CMakeLists.txt trunk/reactos/base/applications/charmap/CMakeLists.txt trunk/reactos/base/applications/logoff/CMakeLists.txt trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt trunk/reactos/base/applications/mstsc/CMakeLists.txt trunk/reactos/base/applications/regedit/CMakeLists.txt trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/shutdown/CMakeLists.txt trunk/reactos/base/applications/sndvol32/CMakeLists.txt trunk/reactos/base/services/tcpsvcs/CMakeLists.txt trunk/reactos/base/shell/cmd/CMakeLists.txt trunk/reactos/base/shell/explorer-new/CMakeLists.txt trunk/reactos/base/system/winlogon/CMakeLists.txt trunk/reactos/dll/win32/authz/CMakeLists.txt trunk/reactos/dll/win32/msafd/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/user32/CMakeLists.txt Modified: trunk/reactos/base/applications/cacls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/CM… ============================================================================== --- trunk/reactos/base/applications/cacls/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -6,8 +6,6 @@ add_executable(cacls ${SOURCE}) -add_pch(cacls precomp.h) - set_module_type(cacls win32cui) add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32) add_cd_file(TARGET cacls DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/CMa… ============================================================================== --- trunk/reactos/base/applications/calc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -18,5 +18,5 @@ if(MSVC) add_importlibs(calc ntdll) endif() - +add_pch(calc calc.h) add_cd_file(TARGET calc DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/charmap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -11,10 +11,10 @@ add_executable(charmap ${SOURCE}) -add_pch(charmap precomp.h) - set_module_type(charmap win32gui) add_importlibs(charmap msvcrt user32 gdi32 comctl32 kernel32) +add_pch(charmap precomp.h) + add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/logoff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/C… ============================================================================== --- trunk/reactos/base/applications/logoff/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -6,8 +6,7 @@ add_executable(logoff ${SOURCE}) -add_pch(logoff precomp.h) - set_module_type(logoff win32cui) add_importlibs(logoff advapi32 user32 msvcrt kernel32) +add_pch(logoff precomp.h) add_cd_file(TARGET logoff DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -26,10 +26,10 @@ add_executable(servman ${SOURCE}) -add_pch(servman precomp.h) - set_module_type(servman win32gui) add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) +add_pch(servman precomp.h) + add_cd_file(TARGET servman DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mstsc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/CM… ============================================================================== --- trunk/reactos/base/applications/mstsc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -25,10 +25,10 @@ add_executable(mstsc ${SOURCE}) -add_pch(mstsc precomp.h) - set_module_type(mstsc win32gui) add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32) +add_pch(mstsc precomp.h) + add_cd_file(TARGET mstsc DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/regedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -22,14 +22,14 @@ add_executable(regedit ${SOURCE}) -add_pch(regedit regedit.h) - set_module_type(regedit win32gui) target_link_libraries(regedit uuid) add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt kernel32) +add_pch(regedit regedit.h) + #add_subdirectory(clb) add_cd_file(TARGET regedit DESTINATION reactos FOR all) Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -15,8 +15,7 @@ add_executable(sc ${SOURCE}) -add_pch(sc sc.h) - set_module_type(sc win32cui) add_importlibs(sc advapi32 msvcrt kernel32) +add_pch(sc sc.h) add_cd_file(TARGET sc DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/shutdown/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -6,8 +6,7 @@ add_executable(shutdown ${SOURCE}) -add_pch(shutdown precomp.h) - set_module_type(shutdown win32cui) add_importlibs(shutdown advapi32 user32 msvcrt kernel32) +add_pch(shutdown precomp.h) add_cd_file(TARGET shutdown DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/sndvol32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -10,8 +10,7 @@ add_executable(sndvol32 ${SOURCE}) -add_pch(sndvol32 sndvol32.h) - set_module_type(sndvol32 win32gui) add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll) +add_pch(sndvol32 sndvol32.h) add_cd_file(TARGET sndvol32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/services/tcpsvcs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/CMak… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -14,9 +14,9 @@ add_executable(tcpsvcs ${SOURCE}) -add_pch(tcpsvcs tcpsvcs.h) set_module_type(tcpsvcs win32cui) add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt kernel32 ntdll) +add_pch(tcpsvcs tcpsvcs.h) add_cd_file(TARGET tcpsvcs DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/CMakeLists.… ============================================================================== --- trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -76,7 +76,7 @@ target_link_libraries(cmd wine) -add_pch(cmd precomp.h) set_module_type(cmd win32cui) add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll) +add_pch(cmd precomp.h) add_cd_file(TARGET cmd DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/CM… ============================================================================== --- trunk/reactos/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -22,7 +22,6 @@ target_link_libraries(explorer_new uuid) -add_pch(explorer_new precomp.h) set_module_type(explorer_new win32gui) add_importlibs(explorer_new advapi32 @@ -37,5 +36,6 @@ msvcrt kernel32 ntdll) +add_pch(explorer_new precomp.h) add_cd_file(TARGET explorer_new DESTINATION reactos FOR all) Modified: trunk/reactos/base/system/winlogon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/CMake… ============================================================================== --- trunk/reactos/base/system/winlogon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -12,8 +12,7 @@ target_link_libraries(winlogon wine) -add_pch(winlogon winlogon.h) - set_module_type(winlogon win32gui) add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt kernel32 ntdll) +add_pch(winlogon winlogon.h) add_cd_file(TARGET winlogon DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/authz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/authz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/authz/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -15,7 +15,7 @@ set_module_type(authz win32dll) +add_importlibs(authz advapi32 msvcrt kernel32 ntdll) add_pch(authz precomp.h) -add_importlibs(authz advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET authz DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msafd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/msafd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -20,7 +20,6 @@ set_module_type(msafd win32dll) +add_importlibs(msafd advapi32 msvcrt kernel32 ntdll) add_pch(msafd msafd.h) - -add_importlibs(msafd advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET msafd DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -77,8 +77,6 @@ add_library(shell32 SHARED ${SOURCE}) -add_pch(shell32 precomp.h) - set_module_type(shell32 win32dll) target_link_libraries(shell32 @@ -101,6 +99,8 @@ kernel32 msvcrt ntdll) + +add_pch(shell32 precomp.h) add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) add_importlib_target(shell32.spec) Modified: trunk/reactos/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -75,7 +75,7 @@ win32ksys ${PSEH_LIB}) +add_importlibs(user32 gdi32 advapi32 imm32 msvcrt kernel32 ntdll) add_pch(user32 include/user32.h) -add_importlibs(user32 gdi32 advapi32 imm32 msvcrt kernel32 ntdll) add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) add_importlib_target(user32.spec)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs