Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[akhaldi] 67064: [MMSYS] Fix some icons and add more appropriate ones. Brought to you by Jared Smudde. CORE-9471 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 5 16:58:46 2015 New Revision: 67064 URL: http://svn.reactos.org/svn/reactos?rev=67064&view=rev Log: [MMSYS] Fix some icons and add more appropriate ones. Brought to you by Jared Smudde. CORE-9471 for more details. Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/mmsys/resource.h trunk/reactos/dll/cpl/mmsys/resources/3004.ico trunk/reactos/dll/cpl/mmsys/resources/4390.ico trunk/reactos/dll/cpl/mmsys/resources/4393.ico trunk/reactos/dll/cpl/mmsys/volume.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rc [iso-8859-1] Sun Apr 5 16:58:46 2015 @@ -51,7 +51,7 @@ 4386 ICON "resources/4386.ico" 4387 ICON "resources/4387.ico" 4388 ICON "resources/4388.ico" -4390 ICON "resources/4390.ico" +IDI_NO_HW ICON "resources/4390.ico" IDI_MUTED_ICON ICON "resources/4393.ico" IDI_SHUTDOWN_ICON ICON "resources/4394.ico" Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/resource.h [iso-8859-1] Sun Apr 5 16:58:46 2015 @@ -8,6 +8,7 @@ #define IDI_JOY_ICON 4361 #define IDI_CAMERA_ICON 4364 #define IDI_SHUTDOWN_ICON 3009 +#define IDI_NO_HW 4390 #define IDI_MUTED_ICON 4393 #define IDI_MICROPHONE_ICON 4378 Modified: trunk/reactos/dll/cpl/mmsys/resources/3004.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/30… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/mmsys/resources/4390.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/mmsys/resources/4393.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] Sun Apr 5 16:58:46 2015 @@ -26,6 +26,7 @@ HMIXER hMixer; HICON hIconMuted; HICON hIconUnMuted; + HICON hIconNoHW; LONG muteVal; DWORD muteControlID; @@ -234,7 +235,7 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_SET_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_VOL_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED2_BTN), FALSE); - SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconMuted); + SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconNoHW); return; } @@ -333,6 +334,7 @@ pGlobalData->hIconUnMuted = LoadImage(hApplet, MAKEINTRESOURCE(IDI_CPLICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); pGlobalData->hIconMuted = LoadImage(hApplet, MAKEINTRESOURCE(IDI_MUTED_ICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + pGlobalData->hIconNoHW = LoadImage(hApplet, MAKEINTRESOURCE(IDI_NO_HW), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); InitImageInfo(&ImgInfo); InitVolumeControls(hwndDlg, pGlobalData); @@ -411,6 +413,7 @@ mixerClose(pGlobalData->hMixer); DestroyIcon(pGlobalData->hIconMuted); DestroyIcon(pGlobalData->hIconUnMuted); + DestroyIcon(pGlobalData->hIconNoHW); HeapFree(GetProcessHeap(), 0, pGlobalData); break; }

9 years, 8 months

[akhaldi] 67063: [SHELL32] Fix a label in the Open With dialog. Change Abort to Cancel for English in Extended Properties. Add a new icon to Extended Properties. By Jared Smudde. CORE-9488

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 5 16:44:54 2015 New Revision: 67063 URL: http://svn.reactos.org/svn/reactos?rev=67063&view=rev Log: [SHELL32] Fix a label in the Open With dialog. Change Abort to Cancel for English in Extended Properties. Add a new icon to Extended Properties. By Jared Smudde. CORE-9488 Added: trunk/reactos/dll/win32/shell32/res/icons/280.ico (with props) Modified: trunk/reactos/dll/win32/shell32/icon_res.rc trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/icon_res… ============================================================================== --- trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -123,6 +123,7 @@ IDI_SHELL_TUNES ICON "res/icons/277.ico" /* TODO: 278.ico */ IDI_SHELL_USER_ACCOUNTS ICON "res/icons/279.ico" +IDI_SHELL_EXTENDED_PROPERTIES ICON "res/icons/280.ico" /* TODO: 281.ico, 282.ico, 283.ico, 284.ico */ IDI_SHELL_HELP_FILE ICON "res/icons/289.ico" IDI_SHELL_GO ICON "res/icons/290.ico" Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "ÐÐ¾Ð¿ÑÐ»Ð½Ð¸ÑÐµÐ»Ð½Ð¸ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð°" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Ð£ÐºÐ°Ð¶ÐµÑÐµ Ð¶ÐµÐ»Ð°Ð½Ð¸ÑÐµ Ð´Ð¾Ð¿ÑÐ»Ð½Ð¸ÑÐµÐ»Ð½Ð¸ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð° Ð·Ð° Ð¿ÑÐµÐ¿ÑÐ°ÑÐºÐ°ÑÐ°.", -1, 5, 30, 246, 10 CHECKBOX "ÐÐ·Ð¿ÑÐ»Ð½ÑÐ²Ð°Ð½Ðµ Ñ ÑÐ°Ð·Ð»Ð¸ÑÐ½Ð¸ Ð¿ÑÐ°Ð²Ð¾Ð¼Ð¾ÑÐ¸Ñ", 14000, 30, 50, 150, 10 LTEXT "Ð¢Ð°Ð·Ð¸ Ð²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ Ð²Ð¸ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐ²Ð° Ð´Ð° Ð¸Ð·Ð¿ÑÐ»Ð½Ð¸ÑÐµ Ð¿ÑÐµÐ¿ÑÐ°ÑÐºÐ°ÑÐ° ÐºÐ°ÑÐ¾ Ð´ÑÑÐ³ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ» Ð¸Ð»Ð¸ Ð´Ð° Ð¿ÑÐ¾Ð´ÑÐ»Ð¶Ð¸ÑÐµ ÐºÐ°ÑÐ¾ ÑÐµÐ±Ðµ ÑÐ¸, ÐºÐ°ÑÐ¾ Ð¿ÑÐµÐ´Ð¿Ð°Ð·Ð²Ð°ÑÐµ ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ° Ð¸ Ð´Ð°Ð½Ð½Ð¸ÑÐµ Ð¾Ñ Ð½ÐµÑÐ¿ÑÐ»Ð½Ð¾Ð¼Ð¾ÑÐµÐ½Ð° Ð´ÐµÐ¹Ð½Ð¾ÑÑ Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÑÑÐ°.", -1, 50, 60, 200, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "ÐÐ·Ð±ÐµÑÐµÑÐµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ, ÐºÐ¾ÐµÑÐ¾ Ð´Ð° Ð¾ÑÐ²Ð¾ÑÐ¸ ÑÐ¾Ð·Ð¸ ÑÐ°Ð¹Ð»:", -1, 44, 12, 211, 10 - LTEXT "Ð¤Ð°Ð¹Ð»: ", 14001, 44, 25, 188, 10 + LTEXT "Ð¤Ð°Ð¹Ð»: ", 14001, 44, 25, 188, 20 GROUPBOX "&ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&ÐÐ¸Ð½Ð°Ð³Ð¸ Ð¸Ð·Ð±ÑÐ°Ð½Ð¾ÑÐ¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð° Ð¾ÑÐ²Ð°ÑÑ ÑÐ¾Ð·Ð¸ Ð²Ð¸Ð´ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ.", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 + LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -204,6 +204,7 @@ CAPTION "RozÅ¡ÃÅenÃ© vlastnosti" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Zvolte rozÅ¡ÃÅenÃ© vlastnosti, kterÃ© poÅ¾adujtete pro tohoto zÃ¡stupce.", -1, 5, 30, 210, 10 CHECKBOX "Spustit s jinÃ½mi povÄÅenÃmi", 14000, 25, 50, 150, 10 LTEXT "Tato moÅ¾nost umoÅ¾nÃ spustit tohoto zÃ¡stupce jako jinÃ½ uÅ¾ivatel nebo pÅi spuÅ¡tÄnÃ se souÄasnÃ½m uÅ¾ivatelem chrÃ¡nit poÄÃtaÄ pÅed nepovolenou aktivitou programu.", -1, 50, 60, 175, 40 @@ -395,7 +396,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Vyberte program, ve kterÃ©m chcete otevÅÃt tento soubor: ", -1, 44, 12, 211, 10 - LTEXT "Soubor: ", 14001, 44, 25, 188, 10 + LTEXT "Soubor: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programy", -1, 7, 42, 249, 187 CONTROL "Programy", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&VÅ¾dy pouÅ¾Ãt vybranÃ½ program k otevÅenÃ tohoto typu souboru", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -204,6 +204,7 @@ CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 @@ -395,7 +396,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 + LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "Erweiterte Einstellungen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "WÃ¤hlen Sie die erweiterten Einstellungen fÃ¼r diese VerknÃ¼pfung.", -1, 5, 30, 210, 10 CHECKBOX "Als anderer Benutzer ausfÃ¼hren", 14000, 25, 50, 150, 10 LTEXT "Diese Einstellung ermÃ¶glicht es, diese VerknÃ¼pfung unter einem anderen oder Ihrem eigenen Benutzerkonto auszufÃ¼hren wÃ¤hrend der Computer und Ihre Daten vor unautorisierten ProgrammaktivitÃ¤ten geschÃ¼tzt werden kÃ¶nnen.", -1, 50, 60, 175, 40 Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "Î ÏÏÏÎ¸ÎµÏÎµÏ Î¹Î´Î¹ÏÏÎ·ÏÎµÏ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "ÎÏÎ¹Î»ÎÎ¾ÏÎµ ÏÎ¹Ï ÏÏÏÏÎ¸ÎµÏÎµÏ Î¹Î´Î¹ÏÏÎ·ÏÎµÏ ÏÎ¿Ï Î¸ÎÎ»ÎµÏÎµ Î³Î¹Î± Î±ÏÏÎ®Î½ ÏÎ·Î½ ÏÏÎ½ÏÏÎ¼ÎµÏÏÎ·.", -1, 5, 30, 210, 20 CHECKBOX "ÎÎºÏÎÎ»ÎµÏÎ· Î¼Îµ Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ¬ ÏÎ¹ÏÏÎ¿ÏÎ¿Î¹Î·ÏÎ¹ÎºÎ¬", 14000, 25, 50, 150, 10 LTEXT "ÎÏÏÎ® Î· ÎµÏÎ¹Î»Î¿Î³Î® Î¸Î± ÏÎ±Ï ÎµÏÎ¹ÏÏÎÏÎµÎ¹ Î½Î± ÎµÎºÏÎµÎ»ÎÏÎµÏÎµ ÏÎ·Î½ ÏÏÎ½ÏÏÎ¼ÎµÏÏÎ· ÏÏ Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÏÏ ÏÏÎ®ÏÏÎ·Ï Î® ÏÏ ÎµÏÎµÎ¯Ï Î¿ Î¯Î´Î¹Î¿Ï ÏÏÎ¿ÏÏÎ±ÏÎµÏÎ¿Î½ÏÎ±Ï ÏÎ¿Î½ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ±Ï Î±ÏÏ Î¼Î· ÎµÎ¾Î¿ÏÏÎ¹Î¿Î´Î¿ÏÎ·Î¼ÎÎ½ÎµÏ ÎµÎ½ÎÏÎ³ÎµÎ¹ÎµÏ ÏÏÎ¿Î³ÏÎ±Î¼Î¼Î¬ÏÏÎ½.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "ÎÏÎ¹Î»ÎÎ¾ÏÎµ ÏÎ¿ ÏÏÏÎ³ÏÎ±Î¼Î¼Î± Î¼Îµ ÏÎ¿ Î¿ÏÎ¿Î¯Î¿ Î¸ÎÎ»ÎµÏÎµ Î½Î± Î±Î½Î¿Î¯Î¾ÎµÏÎµ Î±ÏÏÏ ÏÎ¿ Î±ÏÏÎµÎ¯Î¿:", -1, 44, 12, 211, 10 - LTEXT "ÎÏÏÎµÎ¯Î¿: %s", 14001, 44, 25, 188, 10 + LTEXT "ÎÏÏÎµÎ¯Î¿: %s", 14001, 44, 25, 188, 20 GROUPBOX "Î ÏÎ¿Î³ÏÎ¬Î¼Î¼Î±ÏÎ±", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 CHECKBOX "&ÎÎ½Î¿Î¹Î³Î¼Î± Î±ÏÏÎ¿Ï ÏÎ¿Ï ÎµÎ¯Î´Î¿ÏÏ Î±ÏÏÎµÎ¯Î¿Ï, ÏÎ¬Î½ÏÎ± Î¼Îµ ÏÎ¿ ÎµÏÎ¹Î»ÎµÎ³Î¼ÎÎ½Î¿ ÏÏÏÎ³ÏÎ±Î¼Î¼Î±", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 + LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,12 +198,13 @@ CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Cancel", 2, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 + LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -199,6 +199,7 @@ CAPTION "Propiedades avanzadas" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Elija las propiedades avanzadas que desee para este acceso directo.", -1, 5, 25, 210, 14 CHECKBOX "Ejecutar con credenciales diferentes", 14000, 25, 50, 150, 10 LTEXT "Esta opciÃ³n puede permitirle ejecutar este acceso directo como otro usuario, o continuar como usted mismo mientras protege su equipo y datos de una actividad de programa no autorizada.", -1, 50, 60, 175, 40 @@ -390,7 +391,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Elija el programa que desea usar para abrir el siguiente archivo:", -1, 44, 12, 211, 10 - LTEXT "Archivo: ", 14001, 44, 25, 188, 10 + LTEXT "Archivo: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programas ", -1, 7, 42, 269, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "Utilizar &siempre el programa seleccionado para abrir este tipo de archivos", 14003, 15, 193, 250, 10 Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 + LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "PropriÃ©tÃ©s Ã©tendues" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choisissez la propriÃ©tÃ© Ã©tendue que vous voulez pour ce raccourci.", -1, 5, 30, 210, 10 CHECKBOX "ExÃ©cuter avec des droits diffÃ©rents", 14000, 25, 50, 150, 10 LTEXT "Cette option peut vous permettre d'utiliser ce raccourci en tant qu'autre utilisateur ou de continuer vous-mÃªme en protÃ©geant votre ordinateur et vos donnÃ©es des activÃ©s de programme non autorisÃ©es.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choisissez le programme que vous dÃ©sirez utiliser pour ouvrir ce fichier :", -1, 44, 12, 211, 10 - LTEXT "Fichier : ", 14001, 44, 25, 188, 10 + LTEXT "Fichier : ", 14001, 44, 25, 188, 20 GROUPBOX "&Programmes", -1, 7, 42, 249, 187 CONTROL "Programmes", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "Toujours utiliser le progr&amme sÃ©lectionnÃ© pour ouvrir ce type de fichier", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "×××¤××× ×× ×××¨××××" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "×§×××¥: ", 14001, 44, 25, 188, 10 + LTEXT "×§×××¥: ", 14001, 44, 25, 188, 20 GROUPBOX "×ª××× ×××ª:", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 + LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "ProprietÃ avanzate" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Scegliere le impostazioni avanzate per questo collegamento.", -1, 5, 30, 210, 10 CHECKBOX "Eseguire con credenziali diverse", 14000, 25, 50, 150, 10 LTEXT "Questa opzione permette l'esecuzione del collegamento come se si fosse un altro utente o di proteggere il computer e i dati da attivitÃ non autorizzate del programma.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Scegliere il programma che volete usare per aprire questo file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 + LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programmi", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Usare sempre il programma selezionato per aprire questo tipo di file", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "æ¡å¼µããããã£" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "ãã®ã·ã§ã¼ãã«ããã«ä½¿ç¨ããæ¡å¼µããããã£ãé¸æãã¦ãã ããã", -1, 5, 30, 210, 10 CHECKBOX "ç°ãªãäººç©è¨¼ææå ±ã§å®è¡ãã", 14000, 25, 50, 150, 10 LTEXT "ãã®ãªãã·ã§ã³ãä½¿ç¨ããã¨ãã®ã·ã§ã¼ãã«ãããå¥ã®ã¦ã¼ã¶ã¼ã¨ãã¦å®è¡ã§ãã¾ããã¾ããèªåèªèº«ã§å®è¡ããå ´åãè¨±å¯ããã¦ããªãããã°ã©ã ã®æ´»åããã³ã³ãã¥ã¼ã¿ã¨ãã¼ã¿ãä¿è·ã§ãã¾ãã", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "ãã®ãã¡ã¤ã«ãéãããã«ä½¿ç¨ããããã°ã©ã ãé¸æãã¦ãã ãã:", -1, 44, 12, 211, 10 - LTEXT "ãã¡ã¤ã«: ", 14001, 44, 25, 188, 10 + LTEXT "ãã¡ã¤ã«: ", 14001, 44, 25, 188, 20 GROUPBOX "ããã°ã©ã ã®ä¸è¦§(&P)", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "ãã®ç¨®é¡ã®ãã¡ã¤ã«ãéãã¨ãã¯ãå¸¸ã«é¸æããããã°ã©ã ãä½¿ç¨ãã(&A)", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 + LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 + LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "Avanserte egenskaper" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Velg avansert egenskaper som du vil for denne snarveien.", -1, 5, 30, 210, 10 CHECKBOX "KjÃ¸r som administrator", 14000, 25, 50, 150, 10 LTEXT "Med dette valget kan du kjÃ¸re denne snarveien med som en administrator, mens du beskytter din datamaskin og data fra uautorisert program aktivitet.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Velg programmet du vil bruke for Ã¥ Ã¥pne denne filen:", -1, 44, 12, 211, 10 - LTEXT "Fil: ", 14001, 44, 25, 188, 10 + LTEXT "Fil: ", 14001, 44, 25, 188, 20 GROUPBOX "&Program", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Alltid bruk valgte program for Ã¥ Ã¥pne denne filtypen", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "WÅaÅciwoÅci zaawansowane" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Wybierz wÅaÅciwoÅci zaawansowane dla tego skrÃ³tu.", -1, 5, 30, 210, 10 CHECKBOX "Uruchom z innym UÅ¼ytkownikiem", 14000, 25, 50, 150, 10 LTEXT "Ta opcja pozwoli ci na uruchomienie skrÃ³tu jako inny uÅ¼ytkownik, do ochrony twoich danych przed niepowoÅanym dostÄpem.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Wybierz program, ktÃ³rego chcesz uÅ¼yÄ do otwarcia tego pliku:", -1, 44, 12, 211, 10 - LTEXT "Plik: ", 14001, 44, 25, 188, 10 + LTEXT "Plik: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programy", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Zawsze uÅ¼ywaj danego programu do otwierania tego typu plikÃ³w", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "Propriedades AvanÃ§adas" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Escolha as propriedades avanÃ§adas para este atalho.", -1, 5, 30, 210, 10 CHECKBOX "Executar com credenciais diferentes", 14000, 25, 50, 150, 10 LTEXT "Esta opÃ§Ã£o permite vocÃª executar este atalho como outro usuÃ¡rio, ou continuar como si prÃ³prio enquanto protege seu computador e dados de atividades de programas nÃ£o autorizados.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Escolha o programa para abrir este arquivo:", -1, 44, 12, 211, 10 - LTEXT "Arquivo: ", 14001, 44, 25, 188, 10 + LTEXT "Arquivo: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programas", -1, 7, 42, 249, 187 CONTROL "Programas", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Sempre usar o programa selecionado para abrir este tipo de arquivo", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "Propriedades AvanÃ§adas" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Escolha as propriedades avanÃ§adas que quer para este atalho.", -1, 5, 30, 210, 10 CHECKBOX "Executar com diferentes credenciais", 14000, 25, 50, 150, 10 LTEXT "Esta opÃ§Ã£o permite executar este atalho como outro utilizador, ou continue com a sua conta enquanto protege o seu computador e dados contra actividade de programas nÃ£o autorizados.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Escolha o programa que quer utilizar para abrir este ficheiro:", -1, 44, 12, 211, 10 - LTEXT "Ficheiro: ", 14001, 44, 25, 188, 10 + LTEXT "Ficheiro: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programas", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Utilizar sempre o programa seleccionado para abrir este tipo de ficheiros", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -200,6 +200,7 @@ CAPTION "ProprietÄÈi avansate" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "SpecificaÈi proprietÄÈile avansate dorite pentru aceastÄ scurtÄturÄ.", -1, 5, 30, 210, 10 CHECKBOX "ExecutÄ sub o identitate explicitÄ", 14000, 25, 50, 150, 10 LTEXT "AceastÄ opÈiune vÄ permite execuÈia scurtÄturii sub autoritatea unui alt utilizator sau continuarea folosirii scurtÄturii Ã®n mod securizat, protejÃ¢nd astfel calculatorul de activitÄÈi neautorizate.", -1, 50, 60, 175, 40 @@ -391,7 +392,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "SpecificaÈi programul folosit pentru deschiderea acestui fiÈier:", -1, 44, 12, 211, 10 - LTEXT "FiÈier: ", 14001, 44, 25, 188, 10 + LTEXT "FiÈier: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programe", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&UtilizeazÄ Ã®ntotdeauna aceastÄ aplicaÈie", 14003, 20, 198, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -200,6 +200,7 @@ CAPTION "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð°" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐµ Ð½ÑÐ¶Ð½ÑÐµ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð° Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ ÑÑÐ»ÑÐºÐ°.", -1, 5, 30, 210, 10 CHECKBOX "ÐÐ°Ð¿ÑÑÐºÐ°ÑÑ Ñ Ð´ÑÑÐ³Ð¸Ð¼Ð¸ ÑÑÐµÑÐ½ÑÐ¼Ð¸ Ð´Ð°Ð½Ð½ÑÐ¼Ð¸", 14000, 25, 50, 150, 10 LTEXT "ÐÐ¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ ÑÑÐ»ÑÐº Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð¾Ñ &Ð¸Ð¼ÐµÐ½Ð¸ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°, Ð² ÑÐ¾ Ð¶Ðµ Ð²ÑÐµÐ¼Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð°Ñ ÑÐ°Ð±Ð¾ÑÑ Ð¾Ñ ÑÐ²Ð¾ÐµÐ³Ð¾ Ð¸Ð¼ÐµÐ½Ð¸, ÑÑÐ¾ Ð·Ð°ÑÐ¸ÑÐ°ÐµÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð¾Ñ Ð½ÐµÑÐ°Ð½ÐºÑÐ¸Ð¾Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ð¹ Ð´ÑÑÐ³Ð¸Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼.", -1, 50, 60, 175, 40 @@ -391,7 +392,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð´Ð»Ñ Ð¾ÑÐºÑÑÑÐ¸Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°.", -1, 44, 12, 211, 10 - LTEXT "Ð¤Ð°Ð¹Ð»: ", 14001, 44, 25, 188, 10 + LTEXT "Ð¤Ð°Ð¹Ð»: ", 14001, 44, 25, 188, 20 GROUPBOX "ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÐµÐµ Ð´Ð»Ñ Ð²ÑÐµÑ ÑÐ°Ð¹Ð»Ð¾Ð² ÑÐ°ÐºÐ¾Ð³Ð¾ ÑÐ¸Ð¿Ð°", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "RozÅ¡ÃrenÃ© vlastnosti" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Vyberte rozÅ¡ÃrenÃ© vlastnosti urÄenÃ© pre tento odkaz.", -1, 5, 30, 210, 10 CHECKBOX "&SpustiÅ¥ s inÃ½mi povereniami", 14000, 25, 50, 150, 10 LTEXT "TÃ¡to moÅ¾nosÅ¥ umoÅ¾Åuje spustiÅ¥ tento odkaz ako inÃ½ pouÅ¾ÃvateÄ¾, alebo pokraÄovaÅ¥ so svojÃm pouÅ¾ÃvateÄ¾skÃ½m oprÃ¡vnenÃm, ale s ochranou poÄÃtaÄa a Ãºdajov pred neoprÃ¡vnenÃ½mi aktivitami programu.", -1, 50, 60, 170, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Vyberte program, v ktorom sa mÃ¡ otvoriÅ¥ tento sÃºbor:", -1, 44, 12, 211, 10 - LTEXT "SÃºbor: ", 14001, 44, 25, 188, 10 + LTEXT "SÃºbor: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programy", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "N&a otvorenie tÃ½chto sÃºborov vÅ¾dy pouÅ¾iÅ¥ vybratÃ½ program", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 + LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -202,6 +202,7 @@ CAPTION "Karakteristika Zgjeruara" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Zgjidhni karakteristikat e avancuara qÃ« ju dÃ«shironi pÃ«r kÃ«tÃ« ikonÃ«.", -1, 5, 30, 210, 10 CHECKBOX "Ekzekuto me kredenciale tÃ« ndryshme", 14000, 25, 50, 150, 10 LTEXT "Ky opsion mund tÃ« lejojÃ« pÃ«r tÃ« drejtuar kÃ«tÃ« ikonÃ« si njÃ« pÃ«rdorues tjetÃ«r, ose tÃ« vazhdojÃ« si veten tÃ«nde, duke mbrojtur kompjuterin tuaj dhe tÃ« dhÃ«nat nga aktiviteti i paautorizuar i programit.", -1, 50, 60, 175, 40 @@ -393,7 +394,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Zgjidhni programin qÃ« dÃ«shironi tÃ« pÃ«rdorni pÃ«r tÃ« hapur kÃ«tÃ« dokument:", -1, 44, 12, 211, 10 - LTEXT "Dokument: ", 14001, 44, 25, 188, 10 + LTEXT "Dokument: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programe", -1, 7, 42, 249, 187 CONTROL "Programe", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&GjithmonÃ« pÃ«rdorni programin e pÃ«rzgjedhur pÃ«r tÃ« hapur kÃ«tÃ« lloj dokumenti", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 + LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "GeliÅmiÅ Ãzellikler" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Bu kÄ±sayolda istediÄiniz geliÅmiÅ Ã¶zellikleri seÃ§in.", -1, 5, 30, 210, 10 CHECKBOX "&FarklÄ± kimlik bilgisiyle Ã§alÄ±ÅtÄ±r", 14000, 25, 50, 150, 10 LTEXT "Bu seÃ§enek bu kÄ±sayolu baÅka bir kullanÄ±cÄ± olarak Ã§alÄ±ÅtÄ±rmanÄ±zÄ± ya da bilgisayar ve verilerinizi yetkisiz program iÅlemlerinden korumak iÃ§in kendiniz olarak devam etmenizi saÄlar.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Bu dosyayÄ± aÃ§mak iÃ§in kullanacaÄÄ±nÄ±z programÄ± seÃ§in:", -1, 44, 12, 211, 10 - LTEXT "Dosya: ", 14001, 44, 25, 188, 10 + LTEXT "Dosya: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programlar", -1, 7, 42, 249, 187 CONTROL "Programlar", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "Bu tÃ¼r dosyalarÄ± aÃ§mak iÃ§i&n her zaman seÃ§ili programÄ± kullan", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -198,6 +198,7 @@ CAPTION "ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ñ Ð²Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "ÐÐ¸Ð±ÐµÑÑÑÑ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð²Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ ÑÑÐ»Ð¸ÐºÐ°.", -1, 5, 30, 210, 10 CHECKBOX "ÐÐ°Ð¿ÑÑÐºÐ°ÑÐ¸ Ð· ÑÐ½ÑÐ¸Ð¼Ð¸ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¸Ð¼Ð¸ Ð´Ð°Ð½Ð¸Ð¼Ð¸", 14000, 25, 50, 150, 10 LTEXT "Ð¦ÐµÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ ÑÐµÐ¹ ÑÑÐ»Ð¸Ðº Ð²ÑÐ´ ÑÐ¼ÐµÐ½Ñ ÑÐ½ÑÐ¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð°Ð±Ð¾ Ð¿ÑÐ¾Ð´Ð¾Ð²Ð¶ÑÐ²Ð°ÑÐ¸ ÑÐ¾Ð±Ð¾ÑÑ Ð²ÑÐ´ ÑÐ²Ð¾Ð³Ð¾ ÑÐ¼ÐµÐ½Ñ, ÑÐ¾ Ð·Ð°ÑÐ¸ÑÐ°Ñ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ Ð¹ Ð´Ð°Ð½Ñ Ð²ÑÐ´ Ð½ÐµÑÐ°Ð½ÐºÑÑÐ¾Ð½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´ÑÐ¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸.", -1, 50, 60, 175, 40 @@ -389,7 +390,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "ÐÐ¸Ð±ÐµÑÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ, Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾Ñ ÑÐºÐ¾Ñ ÑÐ»ÑÐ´ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸ ÑÐµÐ¹ ÑÐ°Ð¹Ð».", -1, 44, 12, 234, 10 - LTEXT "Ð¤Ð°Ð¹Ð»: ", 14001, 44, 25, 188, 10 + LTEXT "Ð¤Ð°Ð¹Ð»: ", 14001, 44, 25, 188, 20 GROUPBOX "&ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¸", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "ÐÐ°Ð²Ð¶Ð´&Ð¸ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð´Ð»Ñ ÑÐ°Ð¹Ð»ÑÐ² ÑÑÐ¾Ð³Ð¾ ÑÐ¸Ð¿Ñ", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -207,6 +207,7 @@ CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 @@ -398,7 +399,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 + LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -206,6 +206,7 @@ CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 @@ -397,7 +398,7 @@ BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 + LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 Added: trunk/reactos/dll/win32/shell32/res/icons/280.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/280.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sun Apr 5 16:44:54 2015 @@ -426,6 +426,7 @@ #define IDI_SHELL_TUNES 277 /* TODO: 278.ico */ #define IDI_SHELL_USER_ACCOUNTS 279 +#define IDI_SHELL_EXTENDED_PROPERTIES 280 /* TODO: 281.ico, 282.ico, 283.ico, 284.ico */ #define IDI_SHELL_HELP_FILE 289 #define IDI_SHELL_GO 290

9 years, 8 months

[hbelusca] 67062: [CMD]: Some fixes for SET /A command: - If we do arithmetics using an non-defined env-var, the latter is automatically understood to be zero. - If one left-shifts more than 31 bit...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Apr 5 16:28:10 2015 New Revision: 67062 URL: http://svn.reactos.org/svn/reactos?rev=67062&view=rev Log: [CMD]: Some fixes for SET /A command: - If we do arithmetics using an non-defined env-var, the latter is automatically understood to be zero. - If one left-shifts more than 31 bits (or left-shifts a negative number of bits), the result is automaticaly set to zero (checked on Windows'cmd + with cmd_winetest + wine cmd code). Modified: trunk/reactos/base/shell/cmd/set.c Modified: trunk/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/set.c?rev=6… ============================================================================== --- trunk/reactos/base/shell/cmd/set.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/set.c [iso-8859-1] Sun Apr 5 16:28:10 2015 @@ -224,18 +224,14 @@ ident[identlen] = 0; \ p += identlen; -static BOOL -seta_identval(LPCTSTR ident, INT* result) +static INT +seta_identval(LPCTSTR ident) { LPCTSTR identVal = GetEnvVarOrSpecial ( ident ); if ( !identVal ) - { - /* TODO FIXME - what to do upon failure? */ - *result = 0; - return FALSE; - } - *result = _tcstol ( identVal, NULL, 0 ); - return TRUE; + return 0; + else + return _tcstol ( identVal, NULL, 0 ); } static BOOL @@ -303,8 +299,7 @@ LPTSTR ident; INT identlen; PARSE_IDENT(ident,identlen,p); - if ( !seta_identval ( ident, result ) ) - return FALSE; + *result = seta_identval ( ident ); } else { @@ -404,8 +399,15 @@ switch ( op ) { case '<': - lval <<= rval; + { + /* Shift left has to be a positive number, 0-31 otherwise 0 is returned, + * which differs from the compiler (for example gcc) so being explicit. */ + if (rval < 0 || rval >= (8 * sizeof(lval))) + lval = 0; + else + lval <<= rval; break; + } case '>': lval >>= rval; break; @@ -467,16 +469,23 @@ if ( !seta_assignment ( &p, &exprval ) ) return FALSE; - if ( !seta_identval ( ident, &identval ) ) - identval = 0; + identval = seta_identval ( ident ); + switch ( op ) { case '=': identval = exprval; break; case '<': - identval <<= exprval; + { + /* Shift left has to be a positive number, 0-31 otherwise 0 is returned, + * which differs from the compiler (for example gcc) so being explicit. */ + if (exprval < 0 || exprval >= (8 * sizeof(identval))) + identval = 0; + else + identval <<= exprval; break; + } case '>': identval >>= exprval; break;

9 years, 8 months

[hbelusca] 67061: [NTVDM]: Remove an injoke that was added and displayed when an application tried to get the internal DOS list of lists (SYSVARS) and instead replace it by a DPRINT. This won't con...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Apr 5 13:46:14 2015 New Revision: 67061 URL: http://svn.reactos.org/svn/reactos?rev=67061&view=rev Log: [NTVDM]: Remove an injoke that was added and displayed when an application tried to get the internal DOS list of lists (SYSVARS) and instead replace it by a DPRINT. This won't confuse people anymore. This DOS list-of-lists feature is completely unimplemented at the moment. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sun Apr 5 13:46:14 2015 @@ -2552,7 +2552,7 @@ setES(0x0000); setBX(0x0000); - DisplayMessage(L"Required for AARD code, do you remember? :P"); + DPRINT1("INT 21h, AH=52h: This application requires the internal DOS List of lists (SYSVARS). UNIMPLEMENTED"); break; }

9 years, 8 months

[tkreuzer] 67060: [WIN32K] Allocate the device lock semaphore for a PDEVOBJ in PDEVOBJ_AllocPDEV and implement PDEVOBJ_vDeletePDEV. Fixes a PDEVOBJ leak, found by Thomas and Giannis.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 5 12:45:01 2015 New Revision: 67060 URL: http://svn.reactos.org/svn/reactos?rev=67060&view=rev Log: [WIN32K] Allocate the device lock semaphore for a PDEVOBJ in PDEVOBJ_AllocPDEV and implement PDEVOBJ_vDeletePDEV. Fixes a PDEVOBJ leak, found by Thomas and Giannis. Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Sun Apr 5 12:45:01 2015 @@ -60,9 +60,25 @@ RtlZeroMemory(ppdev, sizeof(PDEVOBJ)); + ppdev->hsemDevLock = EngCreateSemaphore(); + if (ppdev->hsemDevLock == NULL) + { + ExFreePoolWithTag(ppdev, GDITAG_PDEV); + return NULL; + } + ppdev->cPdevRefs = 1; return ppdev; +} + +static +VOID +PDEVOBJ_vDeletePDEV( + PPDEVOBJ ppdev) +{ + EngDeleteSemaphore(ppdev->hsemDevLock); + ExFreePoolWithTag(ppdev, GDITAG_PDEV); } VOID @@ -124,7 +140,7 @@ gppdevPrimary = NULL; /* Free it */ - ExFreePoolWithTag(ppdev, GDITAG_PDEV ); + PDEVOBJ_vDeletePDEV(ppdev); } /* Unlock loader */ @@ -323,7 +339,7 @@ DPRINT1("Could not load display driver '%ls', '%ls'\n", pGraphicsDevice->pDiplayDrivers, pdm->dmDeviceName); - ExFreePoolWithTag(ppdev, GDITAG_PDEV); + PDEVOBJ_vRelease(ppdev); return NULL; } @@ -336,7 +352,6 @@ ppdev->pfnMovePointer = EngMovePointer; ppdev->pGraphicsDevice = pGraphicsDevice; - ppdev->hsemDevLock = EngCreateSemaphore(); // Should we change the ative mode of pGraphicsDevice ? ppdev->pdmwDev = PDEVOBJ_pdmMatchDevMode(ppdev, pdm) ;

9 years, 8 months

[tfaber] 67059: [SERVICES] - Free unknown groups when their reference count reaches zero CORE-9480 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 5 08:58:08 2015 New Revision: 67059 URL: http://svn.reactos.org/svn/reactos?rev=67059&view=rev Log: [SERVICES] - Free unknown groups when their reference count reaches zero CORE-9480 #resolve Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/groupdb.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Apr 5 08:58:08 2015 @@ -416,8 +416,7 @@ ScmDereferenceServiceImage(lpService->lpImage); /* Decrement the group reference counter */ - if (lpService->lpGroup) - lpService->lpGroup->dwRefCount--; + ScmSetServiceGroup(lpService, NULL); /* FIXME: SecurityDescriptor */ Modified: trunk/reactos/base/system/services/groupdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/group… ============================================================================== --- trunk/reactos/base/system/services/groupdb.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/groupdb.c [iso-8859-1] Sun Apr 5 08:58:08 2015 @@ -33,10 +33,25 @@ if (lpService->lpGroup != NULL) { - lpService->lpGroup->dwRefCount--; - - /* FIXME: What do we have to do when dwRefCount is 0? */ - } + ASSERT(lpService->lpGroup->dwRefCount != 0); + ASSERT(lpService->lpGroup->dwRefCount == (DWORD)-1 || + lpService->lpGroup->dwRefCount < 10000); + if (lpService->lpGroup->dwRefCount != (DWORD)-1) + { + lpService->lpGroup->dwRefCount--; + if (lpService->lpGroup->dwRefCount == 0) + { + ASSERT(lpService->lpGroup->TagCount == 0); + ASSERT(lpService->lpGroup->TagArray == NULL); + RemoveEntryList(&lpService->lpGroup->GroupListEntry); + HeapFree(GetProcessHeap(), 0, lpService->lpGroup); + lpService->lpGroup = NULL; + } + } + } + + if (lpGroupName == NULL) + return ERROR_SUCCESS; GroupEntry = GroupListHead.Flink; while (GroupEntry != &GroupListHead)

9 years, 8 months

[tkreuzer] 67058: [WIN32K] Check in BltMask if the masking operation would exceed the mask bitmap. Should fix crash when running gdi32_apitest MaskBlt. CORE-9483

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 5 08:40:52 2015 New Revision: 67058 URL: http://svn.reactos.org/svn/reactos?rev=67058&view=rev Log: [WIN32K] Check in BltMask if the masking operation would exceed the mask bitmap. Should fix crash when running gdi32_apitest MaskBlt. CORE-9483 Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Sun Apr 5 08:40:52 2015 @@ -51,7 +51,7 @@ POINTL* pptlBrush, ROP4 Rop4) { - LONG x, y; + LONG x, y, cx, cy; BYTE *pjMskLine, *pjMskCurrent; BYTE fjMaskBit0, fjMaskBit; /* Pattern brushes */ @@ -87,6 +87,14 @@ } else psoPattern = NULL; + + cx = prclDest->right - prclDest->left; + cy = prclDest->bottom - prclDest->top; + if ((pptlMask->x + cx > psoMask->sizlBitmap.cx) || + (pptlMask->y + cy > psoMask->sizlBitmap.cy)) + { + return FALSE; + } pjMskLine = (PBYTE)psoMask->pvScan0 + pptlMask->y * psoMask->lDelta + (pptlMask->x >> 3); fjMaskBit0 = 0x80 >> (pptlMask->x & 0x07);

9 years, 8 months

[tfaber] 67057: [NTOSKRNL] - Perform a user-mode wait in NtGetPlugPlayEvent and correctly allow a waiting thread to terminate CORE-9489 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 5 08:33:08 2015 New Revision: 67057 URL: http://svn.reactos.org/svn/reactos?rev=67057&view=rev Log: [NTOSKRNL] - Perform a user-mode wait in NtGetPlugPlayEvent and correctly allow a waiting thread to terminate CORE-9489 #resolve Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Sun Apr 5 08:33:08 2015 @@ -808,12 +808,13 @@ DPRINT("Waiting for pnp notification event\n"); Status = KeWaitForSingleObject(&IopPnpNotifyEvent, UserRequest, - KernelMode, + UserMode, FALSE, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("KeWaitForSingleObject() failed (Status %lx)\n", Status); + if (!NT_SUCCESS(Status) || Status == STATUS_USER_APC) + { + DPRINT("KeWaitForSingleObject() failed (Status %lx)\n", Status); + ASSERT(Status == STATUS_USER_APC); return Status; }

9 years, 8 months

[tfaber] 67056: [RTL] - Use ntstrsafe functions in RtlIpv4AddressToString*. Based on a patch by Mark Jansen. CORE-6490

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 5 04:34:23 2015 New Revision: 67056 URL: http://svn.reactos.org/svn/reactos?rev=67056&view=rev Log: [RTL] - Use ntstrsafe functions in RtlIpv4AddressToString*. Based on a patch by Mark Jansen. CORE-6490 Modified: trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=6705… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Sun Apr 5 04:34:23 2015 @@ -9,7 +9,7 @@ /* INCLUDES *****************************************************************/ #include <rtl.h> - +#include <ntstrsafe.h> #define NDEBUG #include <debug.h> @@ -106,18 +106,29 @@ NTAPI RtlIpv4AddressToStringA( _In_ const struct in_addr *Addr, - _Out_writes_(16) PCHAR S) -{ - INT Length; - - if (!S) return (PSTR)~0; - - Length = sprintf(S, "%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, - Addr->S_un.S_un_b.s_b2, - Addr->S_un.S_un_b.s_b3, - Addr->S_un.S_un_b.s_b4); - - return S + Length; + _Out_writes_(IPV4_ADDR_STRING_MAX_LEN) PCHAR S) +{ + NTSTATUS Status; + PSTR End; + + if (!S) + return (PSTR)~0; + + Status = RtlStringCchPrintfExA(S, + IPV4_ADDR_STRING_MAX_LEN, + &End, + NULL, + 0, + "%u.%u.%u.%u", + Addr->S_un.S_un_b.s_b1, + Addr->S_un.S_un_b.s_b2, + Addr->S_un.S_un_b.s_b3, + Addr->S_un.S_un_b.s_b4); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + return (PSTR)~0; + + return End; } /* @@ -131,23 +142,38 @@ _Out_writes_to_(*AddressStringLength, *AddressStringLength) PCHAR AddressString, _Inout_ PULONG AddressStringLength) { - CHAR Buffer[IPV4_ADDR_STRING_MAX_LEN+IPV4_PORT_STRING_MAX_LEN]; + CHAR Buffer[IPV4_ADDR_STRING_MAX_LEN + IPV4_PORT_STRING_MAX_LEN]; + NTSTATUS Status; ULONG Length; + PSTR End; if (!Address || !AddressString || !AddressStringLength) return STATUS_INVALID_PARAMETER; - Length = sprintf(Buffer, "%u.%u.%u.%u", Address->S_un.S_un_b.s_b1, - Address->S_un.S_un_b.s_b2, - Address->S_un.S_un_b.s_b3, - Address->S_un.S_un_b.s_b4); - - if (Port) Length += sprintf(Buffer + Length, ":%u", WN2H(Port)); - + Status = RtlStringCchPrintfExA(Buffer, + RTL_NUMBER_OF(Buffer), + &End, + NULL, + 0, + Port ? "%u.%u.%u.%u:%u" + : "%u.%u.%u.%u", + Address->S_un.S_un_b.s_b1, + Address->S_un.S_un_b.s_b2, + Address->S_un.S_un_b.s_b3, + Address->S_un.S_un_b.s_b4, + WN2H(Port)); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + return STATUS_INVALID_PARAMETER; + + Length = End - Buffer; if (*AddressStringLength > Length) { + Status = RtlStringCchCopyA(AddressString, + *AddressStringLength, + Buffer); + ASSERT(Status == STATUS_SUCCESS); *AddressStringLength = Length + 1; - strcpy(AddressString, Buffer); return STATUS_SUCCESS; } @@ -162,17 +188,29 @@ NTAPI RtlIpv4AddressToStringW( _In_ const struct in_addr *Addr, - _Out_writes_(16) PWCHAR S) -{ - INT Length; - - if (!S) return (PWSTR)~0; - - Length = swprintf(S, L"%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, - Addr->S_un.S_un_b.s_b2, - Addr->S_un.S_un_b.s_b3, - Addr->S_un.S_un_b.s_b4); - return S + Length; + _Out_writes_(IPV4_ADDR_STRING_MAX_LEN) PWCHAR S) +{ + NTSTATUS Status; + PWSTR End; + + if (!S) + return (PWSTR)~0; + + Status = RtlStringCchPrintfExW(S, + IPV4_ADDR_STRING_MAX_LEN, + &End, + NULL, + 0, + L"%u.%u.%u.%u", + Addr->S_un.S_un_b.s_b1, + Addr->S_un.S_un_b.s_b2, + Addr->S_un.S_un_b.s_b3, + Addr->S_un.S_un_b.s_b4); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + return (PWSTR)~0; + + return End; } /* @@ -186,23 +224,38 @@ _Out_writes_to_(*AddressStringLength, *AddressStringLength) PWCHAR AddressString, _Inout_ PULONG AddressStringLength) { - WCHAR Buffer[IPV4_ADDR_STRING_MAX_LEN+IPV4_PORT_STRING_MAX_LEN]; + WCHAR Buffer[IPV4_ADDR_STRING_MAX_LEN + IPV4_PORT_STRING_MAX_LEN]; + NTSTATUS Status; ULONG Length; + PWSTR End; if (!Address || !AddressString || !AddressStringLength) return STATUS_INVALID_PARAMETER; - Length = swprintf(Buffer, L"%u.%u.%u.%u", Address->S_un.S_un_b.s_b1, - Address->S_un.S_un_b.s_b2, - Address->S_un.S_un_b.s_b3, - Address->S_un.S_un_b.s_b4); - - if (Port) Length += swprintf(Buffer + Length, L":%u", WN2H(Port)); - + Status = RtlStringCchPrintfExW(Buffer, + RTL_NUMBER_OF(Buffer), + &End, + NULL, + 0, + Port ? L"%u.%u.%u.%u:%u" + : L"%u.%u.%u.%u", + Address->S_un.S_un_b.s_b1, + Address->S_un.S_un_b.s_b2, + Address->S_un.S_un_b.s_b3, + Address->S_un.S_un_b.s_b4, + WN2H(Port)); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + return STATUS_INVALID_PARAMETER; + + Length = End - AddressString; if (*AddressStringLength > Length) { + Status = RtlStringCchCopyW(AddressString, + *AddressStringLength, + Buffer); + ASSERT(Status == STATUS_SUCCESS); *AddressStringLength = Length + 1; - wcscpy(AddressString, Buffer); return STATUS_SUCCESS; }

9 years, 8 months

[hbelusca] 67055: [CMD] - Fix some comments that were otherwise hard to understand. - Don't hardcode MAX_PATH in some API calls but instead use the real array char size. - Don't leak find-file hand...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Apr 5 00:39:06 2015 New Revision: 67055 URL: http://svn.reactos.org/svn/reactos?rev=67055&view=rev Log: [CMD] - Fix some comments that were otherwise hard to understand. - Don't hardcode MAX_PATH in some API calls but instead use the real array char size. - Don't leak find-file handles: fix leaked handles to NUL pseudo-file in situations where we do: copy some_file+NUL some_dest_file . Should fix some cmd winetests. Modified: trunk/reactos/base/shell/cmd/copy.c Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] Sun Apr 5 00:39:06 2015 @@ -341,14 +341,12 @@ WIN32_FIND_DATA findBuffer; HANDLE hFile = NULL; BOOL bTouch = FALSE; - /* Used when something like "copy c*.exe d*.exe" during the process of - figuring out the new name */ /* Pointer to keep track of how far through the append input(file1+file2+file3) we are */ TCHAR * appendPointer = _T("\0"); /* The full path to src and dest. This has drive letter, folders, and filename */ TCHAR tmpDestPath[MAX_PATH]; TCHAR tmpSrcPath[MAX_PATH]; - /* A bool on weather or not the destination name will be taking from the input */ + /* A bool to know whether or not the destination name will be taken from the input */ BOOL bSrcName = FALSE; /* Seems like a waste but it is a pointer used to copy from input to PreserveName */ TCHAR * UseThisName; @@ -357,6 +355,7 @@ int size; TCHAR * szTouch; BOOL bHasWildcard, bDone = FALSE, bMoreFiles = FALSE; + /* Used for something like "copy c*.exe d*.exe" */ BOOL bMultipleSource = FALSE, bMultipleDest = FALSE; @@ -369,7 +368,7 @@ nErrorLevel = 0; - /* Get the envor value if it exists */ + /* Get the env variable value if it exists */ evar = cmd_alloc(512 * sizeof(TCHAR)); if (evar == NULL) size = 0; @@ -578,7 +577,7 @@ bMultipleSource = TRUE; } - /* Reusing the number of files variable */ + /* Reuse the number of files variable */ nFiles = 0; /* Check if no destination argument is passed */ @@ -586,19 +585,19 @@ { /* If no destination was entered then just use the current directory as the destination */ - GetCurrentDirectory(MAX_PATH, szDestPath); + GetCurrentDirectory(ARRAYSIZE(szDestPath), szDestPath); } else { /* Check if the destination is 'x:' */ if ((arg[nDes][1] == _T(':')) && (arg[nDes][2] == _T('\0'))) { - GetRootPath(arg[nDes], szDestPath, MAX_PATH); + GetRootPath(arg[nDes], szDestPath, ARRAYSIZE(szDestPath)); } else { /* If the user entered two file names then form the full string path */ - GetFullPathName(arg[nDes], MAX_PATH, szDestPath, NULL); + GetFullPathName(arg[nDes], ARRAYSIZE(szDestPath), szDestPath, NULL); } /* Make sure there is an ending slash to the path if the dest is a folder */ @@ -618,12 +617,12 @@ } } - if (nDes != -1) /* you can only append files when there is a destination */ + if (nDes != -1) /* Append files only when there is a destination */ { if (bMultipleSource && !bMultipleDest) { /* We have multiple source files, but not multiple destination - files. This means we are appending the soruce files. */ + files. This means we are appending the source files. */ bAppend = TRUE; if (_tcschr(arg[nSrc], _T('|')) != NULL) appendPointer = arg[nSrc]; @@ -662,7 +661,7 @@ szSrcPath[0] = _T('\0'); /* Loop through the source file name and copy all - the chars one at a time until it gets too + */ + the chars one at a time until we reach the separator */ while(TRUE) { if (appendPointer[0] == _T('|')) @@ -685,7 +684,7 @@ { /* Only time there is a , in the source is when they are using touch Cant have a destination and can only have on ,, at the end of the string - Cant have more then one file name */ + Cant have more than one file name */ szTouch = _tcsstr(arg[nSrc], _T("|")); if (_tcsncmp(szTouch,_T("|,,\0"), 4) || (nDes != -1)) { @@ -714,8 +713,8 @@ } - /* From this point on, we can assume that the shortest path is 3 letters long - and that would be [DriveLetter]:\ */ + /* From this point on, we can assume that the shortest path is + 3 letters long and that would be [DriveLetter]:\ */ /* Check if the path has a wildcard */ bHasWildcard = (_tcschr(szSrcPath, _T('*')) != NULL); @@ -742,10 +741,10 @@ /* Get a list of all the files */ hFile = FindFirstFile(szSrcPath, &findBuffer); - /* If it couldnt open the file handle, print out the error */ + /* If we could not open the file handle, print out the error */ if (hFile == INVALID_HANDLE_VALUE) { - /* only print source name when more then one file */ + /* only print source name when more than one file */ if (bMultipleSource) ConOutPrintf(_T("%s\n"), szSrcPath); @@ -757,10 +756,12 @@ /* Strip the paths back to the folder they are in */ for (i = (_tcslen(szSrcPath) - 1); i > -1; i--) + { if (szSrcPath[i] != _T('\\')) szSrcPath[i] = _T('\0'); else break; + } do { @@ -803,7 +804,7 @@ _tcscat(tmpDestPath, findBuffer.cFileName); else { - /* If there is no wildcard you can use the name the user entered */ + /* If there is no wildcard, use the name the user entered */ if ((_tcschr(UseThisName, _T('*')) == NULL) && (_tcschr(UseThisName, _T('?')) == NULL)) { @@ -836,7 +837,7 @@ break; } - /* only print source name when more then one file */ + /* only print source name when more than one file */ if (bMultipleSource) ConOutPrintf(_T("%s\n"), tmpSrcPath); @@ -848,11 +849,10 @@ if (nOverwrite == PROMPT_ALL || (nOverwrite == PROMPT_YES && bAppend)) dwFlags |= COPY_NO_PROMPT; - /* Tell weather the copy was successful or not */ + /* Tell whether the copy was successful or not */ if (copy(tmpSrcPath,tmpDestPath, bAppend, dwFlags, bTouch)) { nFiles++; - //LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, ARRAYSIZE(szMsg)); } else { @@ -865,14 +865,14 @@ /* Loop through all wildcard files */ } while (FindNextFile(hFile, &findBuffer)); + FindClose(hFile); + /* Loop through all files in src string with a + */ - } while(!bDone); + } while (!bDone); /* print out the number of files copied */ ConOutResPrintf(STRING_COPY_FILE, bAppend ? 1 : nFiles); - if (hFile) FindClose(hFile); - if (arg != NULL) freep(arg);

9 years, 8 months

← Newer
1
...
40
41
42
43
44
45
46
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2015