Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 51722: [NTOSKRNL] Fix pathes of resources
by tkreuzer＠svn.reactos.org 14 May '11

14 May '11

Author: tkreuzer Date: Sat May 14 08:50:11 2011 New Revision: 51722 URL: http://svn.reactos.org/svn/reactos?rev=51722&view=rev Log: [NTOSKRNL] Fix pathes of resources Modified: trunk/reactos/ntoskrnl/ntoskrnl.rc Modified: trunk/reactos/ntoskrnl/ntoskrnl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rc?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rc [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rc [iso-8859-1] Sat May 14 08:50:11 2011 @@ -23,20 +23,20 @@ #endif #define VER_LANGNEUTRAL #include "common.ver" -#include "resource.h" +#include "include/resource.h" // // Bug Codes and Bitmaps // #include "bugcodes.rc" -IDB_BOOT_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/1.bmp" -IDB_HIBERNATE_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/2.bmp" -IDB_SHUTDOWN_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/3.bmp" -IDB_BAR_SERVER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/4.bmp" -IDB_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/5.bmp" -IDB_LOGO_HEADER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/6.bmp" -IDB_LOGO_BAND BITMAP DISCARDABLE "ntoskrnl/inbv/logo/7.bmp" -IDB_BAR_PRO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/8.bmp" -IDB_SERVER_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/5.bmp" -IDB_SERVER_HEADER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/14.bmp" -IDB_SERVER_BAND BITMAP DISCARDABLE "ntoskrnl/inbv/logo/15.bmp" +IDB_BOOT_LOGO BITMAP DISCARDABLE "inbv/logo/1.bmp" +IDB_HIBERNATE_LOGO BITMAP DISCARDABLE "inbv/logo/2.bmp" +IDB_SHUTDOWN_LOGO BITMAP DISCARDABLE "inbv/logo/3.bmp" +IDB_BAR_SERVER BITMAP DISCARDABLE "inbv/logo/4.bmp" +IDB_LOGO BITMAP DISCARDABLE "inbv/logo/5.bmp" +IDB_LOGO_HEADER BITMAP DISCARDABLE "inbv/logo/6.bmp" +IDB_LOGO_BAND BITMAP DISCARDABLE "inbv/logo/7.bmp" +IDB_BAR_PRO BITMAP DISCARDABLE "inbv/logo/8.bmp" +IDB_SERVER_LOGO BITMAP DISCARDABLE "inbv/logo/5.bmp" +IDB_SERVER_HEADER BITMAP DISCARDABLE "inbv/logo/14.bmp" +IDB_SERVER_BAND BITMAP DISCARDABLE "inbv/logo/15.bmp"

1 0

[tkreuzer] 51721: [NTOSKRNL] Merge r51181 from cmake branch: Move macro definition out of macro instantiation. Fixes compilation with MSVC
by tkreuzer＠svn.reactos.org 14 May '11

14 May '11

Author: tkreuzer Date: Sat May 14 08:33:30 2011 New Revision: 51721 URL: http://svn.reactos.org/svn/reactos?rev=51721&view=rev Log: [NTOSKRNL] Merge r51181 from cmake branch: Move macro definition out of macro instantiation. Fixes compilation with MSVC Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sat May 14 08:33:30 2011 @@ -474,10 +474,9 @@ } } } - + +#define print_supported(kf_value) ((FeatureBits & kf_value) ? #kf_value : "") DPRINT1("Supported CPU features : %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s\n", -#define print_supported(kf_value) \ - FeatureBits & kf_value ? #kf_value : "" print_supported(KF_V86_VIS), print_supported(KF_RDTSC), print_supported(KF_CR4), @@ -739,7 +738,7 @@ /* Check if we support CPUID 0x80000006 */ CPUID(0x80000000, &Data[0], &Data[1], &Data[2], &Data[3]); if (Data[0] >= 0x80000006) - { + { /* Get 2nd level cache and tlb size */ CPUID(0x80000006, &Data[0], &Data[1], &Data[2], &Data[3]); @@ -1352,7 +1351,7 @@ /* Now load NPX state from the NPX area */ FxSaveArea = KiGetThreadNpxArea(Thread); - Ke386FxStore(FxSaveArea); + Ke386FxStore(FxSaveArea); } else {

1 0

[tkreuzer] 51720: [MKHIVE] Merge msvc fixes from cmake branch
by tkreuzer＠svn.reactos.org 14 May '11

14 May '11

Author: tkreuzer Date: Sat May 14 08:29:48 2011 New Revision: 51720 URL: http://svn.reactos.org/svn/reactos?rev=51720&view=rev Log: [MKHIVE] Merge msvc fixes from cmake branch Modified: trunk/reactos/tools/mkhive/mkhive.h Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] Sat May 14 08:29:48 2011 @@ -46,8 +46,8 @@ #define STATUS_INVALID_PARAMETER_2 ((NTSTATUS)0xC00000F0) #define STATUS_BUFFER_OVERFLOW ((NTSTATUS)0x80000005) -unsigned char BitScanForward(ULONG * Index, const unsigned long Mask); -unsigned char BitScanReverse(ULONG * const Index, const unsigned long Mask); +unsigned char BitScanForward(ULONG * Index, unsigned long Mask); +unsigned char BitScanReverse(ULONG * const Index, unsigned long Mask); #define RtlFillMemoryUlong(dst, len, val) memset(dst, val, len) NTSTATUS NTAPI @@ -66,6 +66,46 @@ WCHAR NTAPI RtlUpcaseUnicodeChar( IN WCHAR Source); + +LONG WINAPI +RegQueryValueExW( + IN HKEY hKey, + IN LPCWSTR lpValueName, + IN PULONG lpReserved, + OUT PULONG lpType, + OUT PUCHAR lpData, + OUT PSIZE_T lpcbData); + +LONG WINAPI +RegSetValueExW( + IN HKEY hKey, + IN LPCWSTR lpValueName OPTIONAL, + IN ULONG Reserved, + IN ULONG dwType, + IN const UCHAR* lpData, + IN USHORT cbData); + +LONG WINAPI +RegDeleteKeyW( + IN HKEY hKey, + IN LPCWSTR lpSubKey); + +LONG WINAPI +RegDeleteValueW( + IN HKEY hKey, + IN LPCWSTR lpValueName OPTIONAL); + +LONG WINAPI +RegCreateKeyW( + IN HKEY hKey, + IN LPCWSTR lpSubKey, + OUT PHKEY phkResult); + +LONG WINAPI +RegOpenKeyW( + IN HKEY hKey, + IN LPCWSTR lpSubKey, + OUT PHKEY phkResult); #define CMLIB_HOST #include <cmlib.h> @@ -95,11 +135,5 @@ #include <string.h> #endif//_WIN32 -#ifdef _MSC_VER -#define GCC_PACKED -#define inline -#else//_MSC_VER -#define GCC_PACKED __attribute__((packed)) -#endif//_MSC_VER /* EOF */

1 0

[rharabien] 51719: [RAPPS] - Merge rapps changes from CMake branch
by rharabien＠svn.reactos.org 13 May '11

13 May '11

Author: rharabien Date: Fri May 13 22:43:04 2011 New Revision: 51719 URL: http://svn.reactos.org/svn/reactos?rev=51719&view=rev Log: [RAPPS] - Merge rapps changes from CMake branch Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/cs-CZ.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/fr-FR.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/no-NO.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/rapps/lang/sv-SE.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…

1 0

[rharabien] 51718: [CMAKE/RAPPS] * Fix Swedish language
by rharabien＠svn.reactos.org 13 May '11

13 May '11

Author: rharabien Date: Fri May 13 22:36:19 2011 New Revision: 51718 URL: http://svn.reactos.org/svn/reactos?rev=51718&view=rev Log: [CMAKE/RAPPS] * Fix Swedish language Modified: branches/cmake-bringup/base/applications/rapps/lang/sv-SE.rc branches/cmake-bringup/base/applications/rapps/rsrc.rc Modified: branches/cmake-bringup/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] Fri May 13 22:36:19 2011 @@ -21,9 +21,9 @@ BEGIN MENUITEM "&Installera", ID_INSTALL MENUITEM "&Avinstallera",ID_UNINSTALL - MENUITEM "&Ã\x84ndra", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "&Ta bort frÃ¥n Registret", ID_REGREMOVE + MENUITEM "&Ãndra", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Ta bort frÄºn Registret", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Uppdatera", ID_REFRESH END @@ -38,8 +38,8 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "&Öppna länk i webläsare", ID_OPEN_LINK - MENUITEM "&Kopiera länk till urklipp", ID_COPY_LINK + MENUITEM "&Ãppna lÃ¤nk i weblÃ¤sare", ID_OPEN_LINK + MENUITEM "&Kopiera lÃ¤nk till urklipp", ID_COPY_LINK END END @@ -49,9 +49,9 @@ BEGIN MENUITEM "&Installera", ID_INSTALL MENUITEM "&Avinstallera", ID_UNINSTALL - MENUITEM "&Ändra", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "&Ta bort frÃ¥n Registret", ID_REGREMOVE + MENUITEM "&Ãndra", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Ta bort frÄºn Registret", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Uppdatera", ID_REFRESH END @@ -62,9 +62,9 @@ CAPTION "InstÃ¤llningar" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Allmänna", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Spara fönsterposition", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Uppdatera listan med tillgängliga program vid start", IDC_UPDATE_AVLIST, 15, 29, 219, 12 + GROUPBOX "AllmÃ¤nna", -1, 4, 2, 240, 61 + AUTOCHECKBOX "&Spara fÃ¶nsterposition", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 + AUTOCHECKBOX "&Uppdatera listan med tillgÃ¤ngliga program vid start", IDC_UPDATE_AVLIST, 15, 29, 219, 12 AUTOCHECKBOX "&Logga ur installation och borttagning program", IDC_LOG_ENABLED, 15, 46, 219, 12 GROUPBOX "Nerladding", -1, 4, 65, 240, 51 @@ -85,7 +85,7 @@ BEGIN LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 - AUTORADIOBUTTON "&Installera frÃ¥n disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "&Installera frÄºn disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Ladda ner och installera", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 @@ -186,8 +186,8 @@ IDS_UNINSTALL "Avinstallera" IDS_MODIFY "Ãndra" IDS_APPS_COUNT "Programantal: %d" - IDS_WELCOME_TITLE "Välkommen till ReactOS programhanterare!\n\n" - IDS_WELCOME_TEXT "Välj en kategori till vänster, och sedan ett program för att installera eller avinstallera.\nReactOS Web sida: " + IDS_WELCOME_TITLE "VÃ¤lkommen till ReactOS programhanterare!\n\n" + IDS_WELCOME_TEXT "VÃ¤lj en kategori till vÃ¤nster, och sedan ett program fÃ¶r att installera eller avinstallera.\nReactOS Web sida: " IDS_WELCOME_URL "http://www.reactos.org" IDS_INSTALLED "Installerat" IDS_AVAILABLEFORINST "TillgÃ¤ngliga for installation" @@ -195,8 +195,8 @@ IDS_APPLICATIONS "Program" IDS_CHOOSE_FOLDER_TEXT "VÃ¤lj en mapp som kommer att anvÃ¤ndas fÃ¶r nerladdning av program:" IDS_CHOOSE_FOLDER_ERROR "Du har specificrat en ej existerande mapp! Vill du skapa den?" - IDS_USER_NOT_ADMIN "Du mÃ¥ste vara administratÃ¶r fÃ¶r att starta ""ReactOS programhanterare""!" - IDS_APP_REG_REMOVE "Ãr du sÃ¤ker pÃ¥ att du vill ta bort data det installerade programmets data frÃ¥n registret?" + IDS_USER_NOT_ADMIN "Du mÄºste vara administratÃ¶r fÃ¶r att starta ""ReactOS programhanterare""!" + IDS_APP_REG_REMOVE "Ãr du sÃ¤ker pÄº att du vill ta bort data det installerade programmets data frÄºn registret?" IDS_INFORMATION "Information" - IDS_UNABLE_TO_REMOVE "Det gick ej att ta bort programmets data frÃ¥n registret!" -END + IDS_UNABLE_TO_REMOVE "Det gick ej att ta bort programmets data frÄºn registret!" +END Modified: branches/cmake-bringup/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/rapps/rsrc.rc [iso-8859-1] Fri May 13 22:36:19 2011 @@ -10,5 +10,5 @@ #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" -//#include "lang/sv-SE.rc" +#include "lang/sv-SE.rc" #include "lang/uk-UA.rc"

1 0

[rharabien] 51717: [CMAKE/RAPPS] * Readd pragma code_page removed in r51716
by rharabien＠svn.reactos.org 13 May '11

13 May '11

Author: rharabien Date: Fri May 13 22:31:18 2011 New Revision: 51717 URL: http://svn.reactos.org/svn/reactos?rev=51717&view=rev Log: [CMAKE/RAPPS] * Readd pragma code_page removed in r51716 Modified: branches/cmake-bringup/base/applications/rapps/lang/ja-JP.rc Modified: branches/cmake-bringup/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Fri May 13 22:31:18 2011 @@ -1,3 +1,5 @@ +#pragma code_page(65001) // UTF-8 + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDR_MAINMENU MENU

1 0

[rharabien] 51716: [CMAKE/RAPPS] - Fix ja-JP encoding
by rharabien＠svn.reactos.org 13 May '11

13 May '11

Author: rharabien Date: Fri May 13 22:12:02 2011 New Revision: 51716 URL: http://svn.reactos.org/svn/reactos?rev=51716&view=rev Log: [CMAKE/RAPPS] - Fix ja-JP encoding Modified: branches/cmake-bringup/base/applications/rapps/lang/ja-JP.rc Modified: branches/cmake-bringup/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Fri May 13 22:12:02 2011 @@ -1,29 +1,27 @@ -#pragma code_page(65001) // UTF-8 - LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDR_MAINMENU MENU BEGIN - POPUP "t@C(&F)" + POPUP "ãã¡ã¤ã«(&F)" BEGIN - MENUITEM "Ýè(&S)", ID_SETTINGS + MENUITEM "è¨å®(&S)", ID_SETTINGS MENUITEM SEPARATOR - MENUITEM "I¹(&X)", ID_EXIT + MENUITEM "çµäº(&X)", ID_EXIT END - POPUP "vO(&P)" + POPUP "ããã°ã©ã (&P)" BEGIN - MENUITEM "CXg[(&I)", ID_INSTALL - MENUITEM "ACXg[(&U)",ID_UNINSTALL - MENUITEM "ÏX(&M)", ID_MODIFY + MENUITEM "ã¤ã³ã¹ãã¼ã«(&I)", ID_INSTALL + MENUITEM "ã¢ã³ã¤ã³ã¹ãã¼ã«(&U)",ID_UNINSTALL + MENUITEM "å¤æ´(&M)", ID_MODIFY MENUITEM SEPARATOR - MENUITEM "WXg©çí(&R)",ID_REGREMOVE + MENUITEM "ã¬ã¸ã¹ããªããåé¤(&R)",ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "XV(&R)", ID_REFRESH + MENUITEM "æ´æ°(&R)", ID_REFRESH END - POPUP "wv" + POPUP "ãã«ã" BEGIN - MENUITEM "wv", ID_HELP, GRAYED - MENUITEM "o[Wîñ", ID_ABOUT + MENUITEM "ãã«ã", ID_HELP, GRAYED + MENUITEM "ãã¼ã¸ã§ã³æå ±", ID_ABOUT END END @@ -31,8 +29,8 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "uEUÅNðJ(&O)", ID_OPEN_LINK - MENUITEM "Nbv{[hÉRs[·é(&C)", ID_COPY_LINK + MENUITEM "ãã©ã¦ã¶ã§ãªã³ã¯ãéã(&O)", ID_OPEN_LINK + MENUITEM "ã¯ãªãããã¼ãã«ã³ãã¼ãã(&C)", ID_COPY_LINK END END @@ -40,156 +38,156 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "CXg[(&I)", ID_INSTALL - MENUITEM "ACXg[(&U)", ID_UNINSTALL - MENUITEM "ÏX(&M)", ID_MODIFY + MENUITEM "ã¤ã³ã¹ãã¼ã«(&I)", ID_INSTALL + MENUITEM "ã¢ã³ã¤ã³ã¹ãã¼ã«(&U)", ID_UNINSTALL + MENUITEM "å¤æ´(&M)", ID_MODIFY MENUITEM SEPARATOR - MENUITEM "WXg©çí(&R)", ID_REGREMOVE + MENUITEM "ã¬ã¸ã¹ããªããåé¤(&R)", ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "XV(&R)", ID_REFRESH + MENUITEM "æ´æ°(&R)", ID_REFRESH END END IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 250, 144 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ýè" +CAPTION "è¨å®" FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "SÊ", -1, 4, 2, 240, 61 - AUTOCHECKBOX "EBhEÌêðÛ¶·é(&S)", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "N®ÉpÅ«évOÌXgðXV·é(&U)", IDC_UPDATE_AVLIST, 15, 29, 219, 12 - AUTOCHECKBOX "vOÌCXg[ÆíðL^·é(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12 + GROUPBOX "å¨è¬", -1, 4, 2, 240, 61 + AUTOCHECKBOX "ã¦ã£ã³ãã¦ã®å ´æãä¿åãã(&S)", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 + AUTOCHECKBOX "èµ·åæã«å©ç¨ã§ããããã°ã©ã ã®ãªã¹ããæ´æ°ãã(&U)", IDC_UPDATE_AVLIST, 15, 29, 219, 12 + AUTOCHECKBOX "ããã°ã©ã ã®ã¤ã³ã¹ãã¼ã«ã¨åé¤ãè¨é²ãã(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12 - GROUPBOX "_E[h", -1, 4, 65, 240, 51 - LTEXT "_E[h·étH_:", -1, 16, 75, 100, 9 + GROUPBOX "ãã¦ã³ãã¼ãå¦ç", -1, 4, 65, 240, 51 + LTEXT "ãã¦ã³ãã¼ããããã©ã«ã:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP - PUSHBUTTON "Ið(&C)", IDC_CHOOSE, 187, 85, 50, 14 - AUTOCHECKBOX "CXg[ãÉvOÌCXg[ðí·é(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 + PUSHBUTTON "é¸æ(&C)", IDC_CHOOSE, 187, 85, 50, 14 + AUTOCHECKBOX "ã¤ã³ã¹ãã¼ã«å¾ã«ããã°ã©ã ã®ã¤ã³ã¹ãã¼ã©ãåé¤ãã(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "ftHg", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 + PUSHBUTTON "ããã©ã«ã", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "LZ", IDCANCEL, 181, 124, 60, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 181, 124, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 216, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "vOÌCXg[" +CAPTION "ããã°ã©ã ã®ã¤ã³ã¹ãã¼ã«" FONT 9, "MS UI Gothic" BEGIN LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 - AUTORADIOBUTTON "fBXN©çCXg[ (CD â DVD)(&I)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP - AUTORADIOBUTTON "_E[hµÄCXg[(&D)", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "ãã£ã¹ã¯ããã¤ã³ã¹ãã¼ã« (CD ã DVD)(&I)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "ãã¦ã³ãã¼ããã¦ã¤ã³ã¹ãã¼ã«(&D)", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 - PUSHBUTTON "LZ", IDCANCEL, 150, 78, 60, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 150, 78, 60, 14 END IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE -CAPTION "_E[h..." +CAPTION "ãã¦ã³ãã¼ã..." FONT 9, "MS UI Gothic" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "LZ", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP END IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -CAPTION "o[Wîñ" +CAPTION "ãã¼ã¸ã§ã³æå ±" FONT 9, "MS UI Gothic" BEGIN - LTEXT "ReactOS AvP[V }l[W\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Â¶é", IDOK, 133, 46, 50, 14 + LTEXT "ReactOS ã¢ããªã±ã¼ã·ã§ã³ ããã¼ã¸ã£\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + PUSHBUTTON "éãã", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 END STRINGTABLE DISCARDABLE BEGIN - IDS_TOOLTIP_INSTALL "CXg[" - IDS_TOOLTIP_UNINSTALL "ACXg[" - IDS_TOOLTIP_MODIFY "ÏX" - IDS_TOOLTIP_SETTINGS "Ýè" - IDS_TOOLTIP_REFRESH "XV" - IDS_TOOLTIP_EXIT "I¹" + IDS_TOOLTIP_INSTALL "ã¤ã³ã¹ãã¼ã«" + IDS_TOOLTIP_UNINSTALL "ã¢ã³ã¤ã³ã¹ãã¼ã«" + IDS_TOOLTIP_MODIFY "å¤æ´" + IDS_TOOLTIP_SETTINGS "è¨å®" + IDS_TOOLTIP_REFRESH "æ´æ°" + IDS_TOOLTIP_EXIT "çµäº" END STRINGTABLE DISCARDABLE BEGIN - IDS_APP_NAME "¼O" - IDS_APP_INST_VERSION "o[W" - IDS_APP_DESCRIPTION "Tv" + IDS_APP_NAME "åå" + IDS_APP_INST_VERSION "ãã¼ã¸ã§ã³" + IDS_APP_DESCRIPTION "æ¦è¦" END STRINGTABLE DISCARDABLE BEGIN - IDS_INFO_VERSION "\no[W: " - IDS_INFO_DESCRIPTION "\nTv: " - IDS_INFO_PUBLISHER "\ns³: " - IDS_INFO_HELPLINK "\nwvÖÌN: " - IDS_INFO_HELPPHONE "\nwvÌdbÔ: " - IDS_INFO_README "\nReadmeÌÊu: " - IDS_INFO_REGOWNER "\no^³ê½LÒ: " - IDS_INFO_PRODUCTID "\nv_NgID: " - IDS_INFO_CONTACT "\nAæ: " - IDS_INFO_UPDATEINFO "\nAbvf[gîñ: " - IDS_INFO_INFOABOUT "\n±êÉÖ·éîñ: " - IDS_INFO_COMMENTS "\nRg: " - IDS_INFO_INSTLOCATION "\nCXg[ê: " - IDS_INFO_INSTALLSRC "\nCXg[³: " - IDS_INFO_UNINSTALLSTR "\nACXg[Égp·é¶ñ: " - IDS_INFO_MODIFYPATH "\nÏXÉgp·épX: " - IDS_INFO_INSTALLDATE "\nCXg[µ½út: " + IDS_INFO_VERSION "\nãã¼ã¸ã§ã³: " + IDS_INFO_DESCRIPTION "\næ¦è¦: " + IDS_INFO_PUBLISHER "\nçºè¡å: " + IDS_INFO_HELPLINK "\nãã«ãã¸ã®ãªã³ã¯: " + IDS_INFO_HELPPHONE "\nãã«ãã®é»è©±çªå·: " + IDS_INFO_README "\nReadmeã®ä½ç½®: " + IDS_INFO_REGOWNER "\nç»é²ãããææè: " + IDS_INFO_PRODUCTID "\nãããã¯ãID: " + IDS_INFO_CONTACT "\né£çµ¡å: " + IDS_INFO_UPDATEINFO "\nã¢ãããã¼ãæå ±: " + IDS_INFO_INFOABOUT "\nããã«é¢ããæå ±: " + IDS_INFO_COMMENTS "\nã³ã¡ã³ã: " + IDS_INFO_INSTLOCATION "\nã¤ã³ã¹ãã¼ã«å ´æ: " + IDS_INFO_INSTALLSRC "\nã¤ã³ã¹ãã¼ã«å: " + IDS_INFO_UNINSTALLSTR "\nã¢ã³ã¤ã³ã¹ãã¼ã«ã«ä½¿ç¨ããæåå: " + IDS_INFO_MODIFYPATH "\nå¤æ´ã«ä½¿ç¨ãããã¹: " + IDS_INFO_INSTALLDATE "\nã¤ã³ã¹ãã¼ã«ããæ¥ä»: " END STRINGTABLE DISCARDABLE BEGIN - IDS_AINFO_VERSION "\no[W: " - IDS_AINFO_DESCRIPTION "\nTv: " - IDS_AINFO_SIZE "\nTCY: " - IDS_AINFO_URLSITE "\nz[y[W: " - IDS_AINFO_LICENCE "\nCZX: " + IDS_AINFO_VERSION "\nãã¼ã¸ã§ã³: " + IDS_AINFO_DESCRIPTION "\næ¦è¦: " + IDS_AINFO_SIZE "\nãµã¤ãº: " + IDS_AINFO_URLSITE "\nãã¼ã ãã¼ã¸: " + IDS_AINFO_LICENCE "\nã©ã¤ã»ã³ã¹: " END STRINGTABLE DISCARDABLE BEGIN - IDS_CAT_AUDIO "I[fBI" - IDS_CAT_DEVEL "J" - IDS_CAT_DRIVERS "hCo" - IDS_CAT_EDU "³ç" - IDS_CAT_ENGINEER "Hw" - IDS_CAT_FINANCE "oc" - IDS_CAT_GAMES "Q[Æ¨yµÝ" - IDS_CAT_GRAPHICS "OtBbNX" - IDS_CAT_INTERNET "C^[lbgÆlbg[N" - IDS_CAT_LIBS "Cu" - IDS_CAT_OFFICE "ItBX" - IDS_CAT_OTHER "»Ì¼" - IDS_CAT_SCIENCE "Èw" - IDS_CAT_TOOLS "c[" - IDS_CAT_VIDEO "rfI" + IDS_CAT_AUDIO "ãªã¼ãã£ãª" + IDS_CAT_DEVEL "éçº" + IDS_CAT_DRIVERS "ãã©ã¤ã" + IDS_CAT_EDU "æè²" + IDS_CAT_ENGINEER "å·¥å¦" + IDS_CAT_FINANCE "çµå¶" + IDS_CAT_GAMES "ã²ã¼ã ã¨ãæ¥½ãã¿" + IDS_CAT_GRAPHICS "ã°ã©ãã£ãã¯ã¹" + IDS_CAT_INTERNET "ã¤ã³ã¿ã¼ãããã¨ãããã¯ã¼ã¯" + IDS_CAT_LIBS "ã©ã¤ãã©ãª" + IDS_CAT_OFFICE "ãªãã£ã¹" + IDS_CAT_OTHER "ãã®ä»" + IDS_CAT_SCIENCE "ç§å¦" + IDS_CAT_TOOLS "ãã¼ã«" + IDS_CAT_VIDEO "ãããª" END STRINGTABLE DISCARDABLE BEGIN - IDS_APPTITLE "ReactOS AvP[V }l[W" - IDS_SEARCH_TEXT "õ..." - IDS_INSTALL "CXg[" - IDS_UNINSTALL "ACXg[" - IDS_MODIFY "ÏX" - IDS_APPS_COUNT "AvP[V: %d" - IDS_WELCOME_TITLE "ReactOS AvP[V }l[WÖæ¤±»!\n\n" - IDS_WELCOME_TEXT "¶¤©çJeSðIðµACXg[ÍACXg[·éAvP[VðIñÅ¾³¢B\nReactOS EFu TCg: " + IDS_APPTITLE "ReactOS ã¢ããªã±ã¼ã·ã§ã³ ããã¼ã¸ã£" + IDS_SEARCH_TEXT "æ¤ç´¢..." + IDS_INSTALL "ã¤ã³ã¹ãã¼ã«" + IDS_UNINSTALL "ã¢ã³ã¤ã³ã¹ãã¼ã«" + IDS_MODIFY "å¤æ´" + IDS_APPS_COUNT "ã¢ããªã±ã¼ã·ã§ã³æ°: %d" + IDS_WELCOME_TITLE "ReactOS ã¢ããªã±ã¼ã·ã§ã³ ããã¼ã¸ã£ã¸ãããã!\n\n" + IDS_WELCOME_TEXT "å·¦å´ããã«ãã´ãªãé¸æããã¤ã³ã¹ãã¼ã«åã¯ã¢ã³ã¤ã³ã¹ãã¼ã«ããã¢ããªã±ã¼ã·ã§ã³ãé¸ãã§ãã ããã\nReactOS ã¦ã§ã ãµã¤ã: " IDS_WELCOME_URL "http://www.reactos.org" - IDS_INSTALLED "CXg[ÏÝ" - IDS_AVAILABLEFORINST "CXg[Â\\" - IDS_UPDATES "Abvf[g" - IDS_APPLICATIONS "AvP[V" - IDS_CHOOSE_FOLDER_TEXT "vOÌ_E[hÉgp·étH_ðIðµÄ¾³¢:" - IDS_CHOOSE_FOLDER_ERROR "wè³ê½tH_Í¶ÝµÜ¹ñ!" - IDS_USER_NOT_ADMIN """ReactOS AvP[V }l[W"" ðN®·éÉÍÇÒ ÀÅ éKvª èÜ·!" - IDS_APP_REG_REMOVE "WXg©çCXg[³ê½vOÉÖ·éf[^ðíµÄàæëµ¢Å·©?" - IDS_INFORMATION "îñ" - IDS_UNABLE_TO_REMOVE "WXg©ç±ÌvOÉÖ·éf[^ðíÅ«Ü¹ñ!" + IDS_INSTALLED "ã¤ã³ã¹ãã¼ã«æ¸ã¿" + IDS_AVAILABLEFORINST "ã¤ã³ã¹ãã¼ã«å¯è½" + IDS_UPDATES "ã¢ãããã¼ã" + IDS_APPLICATIONS "ã¢ããªã±ã¼ã·ã§ã³" + IDS_CHOOSE_FOLDER_TEXT "ããã°ã©ã ã®ãã¦ã³ãã¼ãã«ä½¿ç¨ãããã©ã«ããé¸æãã¦ãã ãã:" + IDS_CHOOSE_FOLDER_ERROR "æå®ããããã©ã«ãã¯åå¨ãã¾ãã!" + IDS_USER_NOT_ADMIN """ReactOS ã¢ããªã±ã¼ã·ã§ã³ ããã¼ã¸ã£"" ãèµ·åããã«ã¯ç®¡çèæ¨©éã§ããå¿è¦ãããã¾ã!" + IDS_APP_REG_REMOVE "ã¬ã¸ã¹ããªããã¤ã³ã¹ãã¼ã«ãããããã°ã©ã ã«é¢ãããã¼ã¿ãåé¤ãã¦ãããããã§ãã?" + IDS_INFORMATION "æå ±" + IDS_UNABLE_TO_REMOVE "ã¬ã¸ã¹ããªãããã®ããã°ã©ã ã«é¢ãããã¼ã¿ãåé¤ã§ãã¾ãã!" END

1 0

[ekohl] 51715: [DEVMGMT] - Set the focus for the treeview when the main window gets the focus. - Select the root item after the devices tree has been built. These changes enable the user to navigat...
by ekohl＠svn.reactos.org 13 May '11

13 May '11

Author: ekohl Date: Fri May 13 21:09:56 2011 New Revision: 51715 URL: http://svn.reactos.org/svn/reactos?rev=51715&view=rev Log: [DEVMGMT] - Set the focus for the treeview when the main window gets the focus. - Select the root item after the devices tree has been built. These changes enable the user to navigate the device tree using the keyboard. Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] Fri May 13 21:09:56 2011 @@ -415,6 +415,9 @@ (void)TreeView_SortChildren(hTreeView, hRoot, 0); + + (void)TreeView_SelectItem(hTreeView, + hRoot); } Modified: trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] Fri May 13 21:09:56 2011 @@ -550,7 +550,13 @@ /* Show the window */ ShowWindow(hwnd, Info->nCmdShow); - + } + break; + + case WM_SETFOCUS: + { + if (Info->hTreeView != NULL) + SetFocus(Info->hTreeView); } break;

1 0

[tkreuzer] 51714: revert part of r51708
by tkreuzer＠svn.reactos.org 13 May '11

13 May '11

Author: tkreuzer Date: Fri May 13 20:43:21 2011 New Revision: 51714 URL: http://svn.reactos.org/svn/reactos?rev=51714&view=rev Log: revert part of r51708 Modified: trunk/reactos/hal/halx86/mp/i386/mps.S Modified: trunk/reactos/hal/halx86/mp/i386/mps.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/i386/mps.S?r… ============================================================================== --- trunk/reactos/hal/halx86/mp/i386/mps.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/i386/mps.S [iso-8859-1] Fri May 13 20:43:21 2011 @@ -11,9 +11,7 @@ /* INCLUDES ******************************************************************/ -#include <asm.inc> - -#include <ks386.inc> +#include <ndk/asm.h> /* FUNCTIONS *****************************************************************/

1 0

[tkreuzer] 51713: [CRT] Merge r51273 from cmake branch: The crt library must provide a and w version of the functions and not rely to _UNICODE being set or not
by tkreuzer＠svn.reactos.org 13 May '11

13 May '11

Author: tkreuzer Date: Fri May 13 20:21:58 2011 New Revision: 51713 URL: http://svn.reactos.org/svn/reactos?rev=51713&view=rev Log: [CRT] Merge r51273 from cmake branch: The crt library must provide a and w version of the functions and not rely to _UNICODE being set or not Modified: trunk/reactos/lib/sdk/crt/string/atol.c Modified: trunk/reactos/lib/sdk/crt/string/atol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/atol.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/atol.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/atol.c [iso-8859-1] Fri May 13 20:21:58 2011 @@ -1,14 +1,17 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <stdlib.h> -#include <tchar.h> /* * @implemented */ -long -_ttol(const _TCHAR *str) +long atol(const char *str) { - return (long)_ttoi64(str); + return (long)_atoi64(str); +} + +long _wtol(const wchar_t *str) +{ + return (long)_wtoi64(str); } int _atoldbl(_LDOUBLE *value, char *str) @@ -16,4 +19,4 @@ /* FIXME needs error checking for huge/small values */ //*value = strtold(str,0); return -1; -} +}

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