Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 75604: [STOBJECT] Fix bug that caused some resource strings not to be loaded. - These strings need to either be in every language file or have their own resource range but since we a...
by gadamopoulos＠svn.reactos.org 18 Aug '17

18 Aug '17

Author: gadamopoulos Date: Fri Aug 18 08:38:52 2017 New Revision: 75604 URL: http://svn.reactos.org/svn/reactos?rev=75604&view=rev Log: [STOBJECT] Fix bug that caused some resource strings not to be loaded. - These strings need to either be in every language file or have their own resource range but since we are using the same resource ids with windows I will just duplicate them. Modified: trunk/reactos/dll/shellext/stobject/lang/cs-CZ.rc trunk/reactos/dll/shellext/stobject/lang/de-DE.rc trunk/reactos/dll/shellext/stobject/lang/en-US.rc trunk/reactos/dll/shellext/stobject/lang/es-ES.rc trunk/reactos/dll/shellext/stobject/lang/fr-FR.rc trunk/reactos/dll/shellext/stobject/lang/it-IT.rc trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc trunk/reactos/dll/shellext/stobject/lang/tr-TR.rc trunk/reactos/dll/shellext/stobject/lang/zh-CN.rc trunk/reactos/dll/shellext/stobject/lang/zh-TW.rc trunk/reactos/dll/shellext/stobject/stobject.rc Modified: trunk/reactos/dll/shellext/stobject/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/cs-CZ.rc [iso-8859-1] Fri Aug 18 08:38:52 2017 @@ -17,6 +17,7 @@ //Power related strings IDS_PWR_PROPERTIES "&Upravit moÅ¾nosti napÃ¡jenÃ" IDS_PWR_METER "&OtevÅÃt ukazatel spotÅeby" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "zbÃ½vÃ¡ %1!u!%%" IDS_PWR_CHARGING " (nabÃjenÃ)" IDS_PWR_UNKNOWN_REMAINING "ZbÃ½vÃ¡ neznÃ¡mo" @@ -28,6 +29,7 @@ IDS_HOTPLUG_REMOVE_1 "BezpeÄnÄ odebrat hardware" IDS_HOTPLUG_REMOVE_2 "&BezpeÄnÄ odebrat hardwar" IDS_HOTPLUG_REMOVE_3 "BezpeÄnÄ odebrat%s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - Jednotka(%s)" IDS_HOTPLUG_DRIVES " - Jednotky(%s)" @@ -39,6 +41,7 @@ IDS_VOL_VOLUME "Hlasitost" IDS_VOL_ADJUST "&Upravit vlastnosti zvuku" IDS_VOL_OPEN "&OtevÅÃt ovlÃ¡dÃ¡nÃ hlasitosti" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Hlasitost (ztlumeno)" //Keyboard-Mouse related strings Modified: trunk/reactos/dll/shellext/stobject/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/de-DE.rc [iso-8859-1] Fri Aug 18 08:38:52 2017 @@ -17,6 +17,7 @@ //Power related strings IDS_PWR_PROPERTIES "&Energieverwaltungseigenschaften einstellen" IDS_PWR_METER "Batterieanzeige Ã¶&ffnen" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%1!u!%% verbleibend" IDS_PWR_CHARGING " (wird aufgeladen)" IDS_PWR_UNKNOWN_REMAINING "Unbekannt verbleibend" @@ -28,6 +29,7 @@ IDS_HOTPLUG_REMOVE_1 "Hardware sicher entfernen" IDS_HOTPLUG_REMOVE_2 "&Hardware sicher entfernen" IDS_HOTPLUG_REMOVE_3 "%s entfernen" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - Laufwerk (%s)" IDS_HOTPLUG_DRIVES " - Laufwerke (%s)" @@ -39,6 +41,7 @@ IDS_VOL_VOLUME "LautstÃ¤rke" IDS_VOL_ADJUST "&Audioeigenschaften einstellen" IDS_VOL_OPEN "&LautstÃ¤rkeregelung Ã¶ffnen" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "LautstÃ¤rke (ausgeschaltet)" //Keyboard-Mouse related strings Modified: trunk/reactos/dll/shellext/stobject/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/en-US.rc [iso-8859-1] Fri Aug 18 08:38:52 2017 @@ -17,6 +17,7 @@ //Power related strings IDS_PWR_PROPERTIES "&Adjust Power Properties" IDS_PWR_METER "&Open Power Meter" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%1!u!%% remaining" IDS_PWR_CHARGING " (charging)" IDS_PWR_UNKNOWN_REMAINING "Unknown remaining" @@ -28,6 +29,7 @@ IDS_HOTPLUG_REMOVE_1 "Safely Remove Hardware" IDS_HOTPLUG_REMOVE_2 "&Safely Remove Hardware" IDS_HOTPLUG_REMOVE_3 "Safely remove %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - Drive(%s)" IDS_HOTPLUG_DRIVES " - Drives(%s)" @@ -39,6 +41,7 @@ IDS_VOL_VOLUME "Volume" IDS_VOL_ADJUST "&Adjust Audio Properties" IDS_VOL_OPEN "&Open Volume Control" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Volume (muted)" //Keyboard-Mouse related strings Modified: trunk/reactos/dll/shellext/stobject/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/es-ES.rc [iso-8859-1] Fri Aug 18 08:38:52 2017 @@ -18,6 +18,7 @@ //Power related strings IDS_PWR_PROPERTIES "&Ajustar propiedades de energÃa" IDS_PWR_METER "Abrir &medidor de energÃa" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "Queda un %1!u!%%" IDS_PWR_CHARGING " (cargando)" IDS_PWR_UNKNOWN_REMAINING "Estado de baterÃa desconocido" @@ -29,6 +30,7 @@ IDS_HOTPLUG_REMOVE_1 "Desconectar de forma segura" IDS_HOTPLUG_REMOVE_2 "&Desconectar de forma segura" IDS_HOTPLUG_REMOVE_3 "Desconectar de forma segura %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - Unidad(%s)" IDS_HOTPLUG_DRIVES " - Unidades(%s)" @@ -40,6 +42,7 @@ IDS_VOL_VOLUME "Volumen" IDS_VOL_ADJUST "&Ajustar propiedades de audio" IDS_VOL_OPEN "Abrir &control de volumen" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Volumen (silenciado)" //Keyboard-Mouse related strings Modified: trunk/reactos/dll/shellext/stobject/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/fr-FR.rc [iso-8859-1] Fri Aug 18 08:38:52 2017 @@ -17,6 +17,7 @@ //Power related strings IDS_PWR_PROPERTIES "&Adjust Power Properties" IDS_PWR_METER "&Open Power Meter" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%1!u!%% remaining" IDS_PWR_CHARGING " (charging)" IDS_PWR_UNKNOWN_REMAINING "Unknown remaining" @@ -28,6 +29,7 @@ IDS_HOTPLUG_REMOVE_1 "Safely Remove Hardware" IDS_HOTPLUG_REMOVE_2 "&Safely Remove Hardware" IDS_HOTPLUG_REMOVE_3 "Safely remove %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - Drive(%s)" IDS_HOTPLUG_DRIVES " - Drives(%s)" @@ -39,6 +41,7 @@ IDS_VOL_VOLUME "Volume" IDS_VOL_ADJUST "&Ajuster les propriÃ©tÃ©s audio" IDS_VOL_OPEN "&Ouvrir le controle du volume" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Volume (muet)" //Keyboard-Mouse related strings Modified: trunk/reactos/dll/shellext/stobject/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/it-IT.rc [iso-8859-1] Fri Aug 18 08:38:52 2017 @@ -17,6 +17,7 @@ //Power related strings IDS_PWR_PROPERTIES "&Modifica proprietÃ alimentazione" IDS_PWR_METER "&Apri misuratore alimentazione" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%1!u!%% rimanenti" IDS_PWR_CHARGING " (in carica)" IDS_PWR_UNKNOWN_REMAINING "Autonomia sconosciuta" @@ -28,6 +29,7 @@ IDS_HOTPLUG_REMOVE_1 "Rimozione sicura dell'Hardware" IDS_HOTPLUG_REMOVE_2 "&Rimozione sicura dell'Hardware" IDS_HOTPLUG_REMOVE_3 "Rimozione sicura di %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - UnitÃ disco(%s)" IDS_HOTPLUG_DRIVES " - UnitÃ dischi(%s)" @@ -39,6 +41,7 @@ IDS_VOL_VOLUME "Volume" IDS_VOL_ADJUST "&Modifica proprietÃ audio" IDS_VOL_OPEN "&Apri controllo del Volume" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Volume (spento)" //Keyboard-Mouse related strings Modified: trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc [iso-8859-1] Fri Aug 18 08:38:52 2017 @@ -18,6 +18,7 @@ //Power related strings IDS_PWR_PROPERTIES "&Ajustare proprietÄÈi de consum energie" IDS_PWR_METER "&Deschide Contor de energie" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "Au mai rÄmas %1!u!%%" IDS_PWR_CHARGING " (Ã®n Ã®ncÄrcare)" IDS_PWR_UNKNOWN_REMAINING "Nu este disponibil cÃ¢t a mai rÄmas" @@ -29,6 +30,7 @@ IDS_HOTPLUG_REMOVE_1 "Scoate Ã®n siguranÈÄ acest dispozitiv" IDS_HOTPLUG_REMOVE_2 "S&coate Ã®n siguranÈÄ acest dispozitiv" IDS_HOTPLUG_REMOVE_3 "Scoate Ã®n siguranÈÄ %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - unitate (%s)" IDS_HOTPLUG_DRIVES " - unitÄÈi (%s)" @@ -40,6 +42,7 @@ IDS_VOL_VOLUME "Volum" IDS_VOL_ADJUST "&AjusteazÄ proprietÄÈi audio" IDS_VOL_OPEN "&Deschide control de volum" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Volum (mut)" //Keyboard-Mouse related strings Modified: trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc [iso-8859-1] Fri Aug 18 08:38:52 2017 @@ -19,6 +19,7 @@ //Power related strings IDS_PWR_PROPERTIES "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² ÑÐ»ÐµÐºÑÑÐ¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ" IDS_PWR_METER "&ÐÑÐºÑÑÑÑ Ð¿Ð¾ÐºÐ°Ð·Ð°ÑÐµÐ»Ð¸ Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%1!u!%% Ð¾ÑÑÐ°Ð»Ð¾ÑÑ" IDS_PWR_CHARGING " (Ð·Ð°ÑÑÐ´ÐºÐ°)" IDS_PWR_UNKNOWN_REMAINING "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾" @@ -30,6 +31,7 @@ IDS_HOTPLUG_REMOVE_1 "ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾Ðµ Ð¸Ð·Ð²Ð»ÐµÑÐµÐ½Ð¸Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°" IDS_HOTPLUG_REMOVE_2 "&ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾Ðµ Ð¸Ð·Ð²Ð»ÐµÑÐµÐ½Ð¸Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°" IDS_HOTPLUG_REMOVE_3 "ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾Ðµ Ð¸Ð·Ð²Ð»ÐµÑÐµÐ½Ð¸Ðµ %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - ÐÐ¸ÑÐº(%s)" IDS_HOTPLUG_DRIVES " - ÐÐ¸ÑÐºÐ¸(%s)" @@ -41,6 +43,7 @@ IDS_VOL_VOLUME "ÐÑÐ¾Ð¼ÐºÐ¾ÑÑÑ" IDS_VOL_ADJUST "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð°ÑÐ´Ð¸Ð¾" IDS_VOL_OPEN "&ÐÑÐºÑÑÑÑ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð³ÑÐ¾Ð¼ÐºÐ¾ÑÑÑÑ" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "ÐÑÐ¾Ð¼ÐºÐ¾ÑÑÑ (Ð²ÑÐºÐ»ÑÑÐµÐ½Ð¾)" //Keyboard-Mouse related strings Modified: trunk/reactos/dll/shellext/stobject/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/tr-TR.rc [iso-8859-1] Fri Aug 18 08:38:52 2017 @@ -19,6 +19,7 @@ //Power related strings IDS_PWR_PROPERTIES "&GÃ¼Ã§ HusÃ»siyetlerini DÃ¼zenle" IDS_PWR_METER "G&Ã¼Ã§ ÃlÃ§Ã¼cÃ¼sÃ¼nÃ¼ AÃ§" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%%%1!u! kaldÄ±." IDS_PWR_CHARGING " (YÃ¼kleniyor)" IDS_PWR_UNKNOWN_REMAINING "Bilinmeyen kalan." @@ -30,6 +31,7 @@ IDS_HOTPLUG_REMOVE_1 "DonanÄ±mÄ± GÃ¼venli KaldÄ±r" IDS_HOTPLUG_REMOVE_2 "&DonanÄ±mÄ± GÃ¼venli KaldÄ±r" IDS_HOTPLUG_REMOVE_3 "%s DonanÄ±mÄ±nÄ± GÃ¼venli KaldÄ±r" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - SÃ¼rÃ¼cÃ¼ (%s)" IDS_HOTPLUG_DRIVES " - SÃ¼rÃ¼cÃ¼ler (%s)" @@ -41,6 +43,7 @@ IDS_VOL_VOLUME "Ses DÃ¼zeyi" IDS_VOL_ADJUST "&Ses HusÃ»siyetlerini DÃ¼zenle" IDS_VOL_OPEN "&Ses DÃ¼zeyi Denetimini AÃ§" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Ses DÃ¼zeyi (Sessiz)" //Keyboard-Mouse related strings Modified: trunk/reactos/dll/shellext/stobject/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/zh-CN.rc [iso-8859-1] Fri Aug 18 08:38:52 2017 @@ -19,6 +19,7 @@ //Power related strings IDS_PWR_PROPERTIES "è°æ´çµæºå±æ§(&A)" IDS_PWR_METER "å¼æ¾å¼çµæºè¡¨(&O)" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "å©ä½ %1!u!%%" IDS_PWR_CHARGING " (åçµä¸)" IDS_PWR_UNKNOWN_REMAINING "æªç¥å©ä½" @@ -30,6 +31,7 @@ IDS_HOTPLUG_REMOVE_1 "å®å¨å°å é¤ç¡¬ä»¶" IDS_HOTPLUG_REMOVE_2 "å®å¨å°å é¤ç¡¬ä»¶(&S)" IDS_HOTPLUG_REMOVE_3 "å®å¨å°å é¤ %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - ç£ç(%s)" IDS_HOTPLUG_DRIVES " - ç£ç(%s)" @@ -41,6 +43,7 @@ IDS_VOL_VOLUME "é³é" IDS_VOL_ADJUST "è°æ´é³é¢å±æ§(&A)" IDS_VOL_OPEN "æå¼é³éæ§å¶(&O)" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "(éé³)" //Keyboard-Mouse related strings Modified: trunk/reactos/dll/shellext/stobject/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/zh-TW.rc [iso-8859-1] Fri Aug 18 08:38:52 2017 @@ -19,6 +19,7 @@ //Power related strings IDS_PWR_PROPERTIES "èª¿æ´é»æºå±¬æ§(&A)" IDS_PWR_METER "éæ¾å¼é»æºè¡¨(&O)" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "å©é¤ %1!u!%%" IDS_PWR_CHARGING " (åé»ä¸)" IDS_PWR_UNKNOWN_REMAINING "æªç¥å©é¤" @@ -30,6 +31,7 @@ IDS_HOTPLUG_REMOVE_1 "å®å¨å°åªé¤ç¡¬é«" IDS_HOTPLUG_REMOVE_2 "å®å¨å°åªé¤ç¡¬é«(&S)" IDS_HOTPLUG_REMOVE_3 "å®å¨å°åªé¤ %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - ç£ç¢(%s)" IDS_HOTPLUG_DRIVES " - ç£ç¢(%s)" @@ -41,6 +43,7 @@ IDS_VOL_VOLUME "é³é" IDS_VOL_ADJUST "èª¿æ´é³è¨å±¬æ§(&A)" IDS_VOL_OPEN "éåé³éæ§å¶(&O)" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "(éé³)" //Keyboard-Mouse related strings Modified: trunk/reactos/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stob… ============================================================================== --- trunk/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] Fri Aug 18 08:38:52 2017 @@ -14,19 +14,6 @@ IDR_SYSTRAY REGISTRY "resources/rgs/systray.rgs" #include <reactos/manifest_dll.rc> - -// Strings common to all languages -STRINGTABLE -BEGIN - // Power related strings - IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - - // Hotplug related strings - IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" - - // Volume related strings - IDS_VOL_RUN "SNDVOL32.EXE" -END /* UTF-8 */ #pragma code_page(65001)

1 0

[bfreisen] 75603: [PSDK][GDIPLUS] Further work on Graphics
by bfreisen＠svn.reactos.org 18 Aug '17

18 Aug '17

Author: bfreisen Date: Fri Aug 18 08:09:04 2017 New Revision: 75603 URL: http://svn.reactos.org/svn/reactos?rev=75603&view=rev Log: [PSDK][GDIPLUS] Further work on Graphics Modified: trunk/reactos/sdk/include/psdk/gdiplusbrush.h trunk/reactos/sdk/include/psdk/gdiplusgraphics.h Modified: trunk/reactos/sdk/include/psdk/gdiplusbrush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusbr… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusbrush.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusbrush.h [iso-8859-1] Fri Aug 18 08:09:04 2017 @@ -24,6 +24,7 @@ class Brush : public GdiplusBase { public: + friend class Graphics; friend class Pen; Brush *Clone(VOID) const Modified: trunk/reactos/sdk/include/psdk/gdiplusgraphics.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusgr… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusgraphics.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusgraphics.h [iso-8859-1] Fri Aug 18 08:09:04 2017 @@ -481,42 +481,42 @@ Status FillClosedCurve(const Brush *brush, const Point *points, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipFillClosedCurveI(graphics, brush ? brush->brush : NULL, points, count)); } Status FillClosedCurve(const Brush *brush, const Point *points, INT count, FillMode fillMode, REAL tension) { - return NotImplemented; + return SetStatus(DllExports::GdipFillClosedCurve2I(graphics, brush ? brush->brush : NULL, points, count, tension, fillMode)); } Status FillClosedCurve(const Brush *brush, const PointF *points, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipFillClosedCurve(graphics, brush ? brush->brush : NULL, points, count)); } Status FillClosedCurve(const Brush *brush, const PointF *points, INT count, FillMode fillMode, REAL tension) { - return NotImplemented; + return SetStatus(DllExports::GdipFillClosedCurve2(graphics, brush ? brush->brush : NULL, points, count, tension, fillMode)); } Status FillEllipse(const Brush *brush, const Rect &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipFillEllipseI(graphics, brush ? brush->brush : NULL, rect.X, rect.Y, rect.Width, rect.Height)); } Status FillEllipse(const Brush *brush, REAL x, REAL y, REAL width, REAL height) { - return NotImplemented; + return SetStatus(DllExports::GdipFillEllipse(graphics, brush ? brush->brush : NULL, x, y, width, height)); } Status FillEllipse(const Brush *brush, const RectF &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipFillEllipse(graphics, brush ? brush->brush : NULL, rect.X, rect.Y, rect.Width, rect.Height)); } Status FillEllipse(const Brush *brush, INT x, INT y, INT width, INT height) { - return NotImplemented; + return SetStatus(DllExports::GdipFillEllipseI(graphics, brush ? brush->brush : NULL, x, y, width, height)); } Status FillPath(const Brush *brush, const GraphicsPath *path) @@ -526,72 +526,72 @@ Status FillPie(const Brush *brush, const Rect &rect, REAL startAngle, REAL sweepAngle) { - return NotImplemented; + return SetStatus(DllExports::GdipFillPieI(graphics, brush ? brush->brush : NULL, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)); } Status FillPie(const Brush *brush, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) { - return NotImplemented; + return SetStatus(DllExports::GdipFillPieI(graphics, brush ? brush->brush : NULL, x, y, width, height, startAngle, sweepAngle)); } Status FillPie(const Brush *brush, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { - return NotImplemented; + return SetStatus(DllExports::GdipFillPie(graphics, brush ? brush->brush : NULL, x, y, width, height, startAngle, sweepAngle)); } Status FillPie(const Brush *brush, RectF &rect, REAL startAngle, REAL sweepAngle) { - return NotImplemented; + return SetStatus(DllExports::GdipFillPie(graphics, brush ? brush->brush : NULL, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)); } Status FillPolygon(const Brush *brush, const Point *points, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipFillPolygon2I(graphics, brush ? brush->brush : NULL, points, count)); } Status FillPolygon(const Brush *brush, const PointF *points, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipFillPolygon2(graphics, brush ? brush->brush : NULL, points, count)); } Status FillPolygon(const Brush *brush, const Point *points, INT count, FillMode fillMode) { - return NotImplemented; + return SetStatus(DllExports::GdipFillPolygonI(graphics, brush ? brush->brush : NULL, points, count, fillMode)); } Status FillPolygon(const Brush *brush, const PointF *points, INT count, FillMode fillMode) { - return NotImplemented; + return SetStatus(DllExports::GdipFillPolygon(graphics, brush ? brush->brush : NULL, points, count, fillMode)); } Status FillRectangle(const Brush *brush, const Rect &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipFillRectangleI(graphics, brush ? brush->brush : NULL, rect.X, rect.Y, rect.Width, rect.Height)); } Status FillRectangle(const Brush *brush, const RectF &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipFillRectangle(graphics, brush ? brush->brush : NULL, rect.X, rect.Y, rect.Width, rect.Height)); } Status FillRectangle(const Brush *brush, REAL x, REAL y, REAL width, REAL height) { - return NotImplemented; + return SetStatus(DllExports::GdipFillRectangle(graphics, brush ? brush->brush : NULL, x, y, width, height)); } Status FillRectangle(const Brush *brush, INT x, INT y, INT width, INT height) { - return NotImplemented; + return SetStatus(DllExports::GdipFillRectangleI(graphics, brush ? brush->brush : NULL, x, y, width, height)); } Status FillRectangles(const Brush *brush, const Rect *rects, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipFillRectanglesI(graphics, brush ? brush->brush : NULL, rects, count)); } Status FillRectangles(const Brush *brush, const RectF *rects, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipFillRectangles(graphics, brush ? brush->brush : NULL, rects, count)); } Status FillRegion(const Brush *brush, const Region *region) @@ -630,251 +630,294 @@ Status GetClipBounds(Rect* rect) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetClipBoundsI(graphics, rect)); } Status GetClipBounds(RectF* rect) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetClipBounds(graphics, rect)); } CompositingMode GetCompositingMode(VOID) { - return CompositingModeSourceOver; + CompositingMode compositingMode; + SetStatus(DllExports::GdipGetCompositingMode(graphics, &compositingMode)); + return compositingMode; } CompositingQuality GetCompositingQuality(VOID) { - return CompositingQualityDefault; + CompositingQuality compositingQuality; + SetStatus(DllExports::GdipGetCompositingQuality(graphics, &compositingQuality)); + return compositingQuality; } REAL GetDpiX(VOID) { + REAL dpi; + SetStatus(DllExports::GdipGetDpiX(graphics, &dpi)); + return dpi; + } + + REAL GetDpiY(VOID) + { + REAL dpi; + SetStatus(DllExports::GdipGetDpiY(graphics, &dpi)); + return dpi; + } + + static HPALETTE GetHalftonePalette(VOID) + { + return NULL; + } + + HDC GetHDC(VOID) + { + return NULL; + } + + InterpolationMode GetInterpolationMode(VOID) + { + InterpolationMode interpolationMode; + SetStatus(DllExports::GdipGetInterpolationMode(graphics, &interpolationMode)); + return interpolationMode; + } + + Status GetLastStatus(VOID) + { + return status; + } + + Status GetNearestColor(Color* color) const + { + return NotImplemented; + } + + REAL GetPageScale(VOID) + { + REAL scale; + SetStatus(DllExports::GdipGetPageScale(graphics, &scale)); + return scale; + } + + Unit GetPageUnit(VOID) + { + Unit unit; + SetStatus(DllExports::GdipGetPageUnit(graphics, &unit)); + return unit; + } + + PixelOffsetMode GetPixelOffsetMode(VOID) + { + PixelOffsetMode pixelOffsetMode; + SetStatus(DllExports::GdipGetPixelOffsetMode(graphics, &pixelOffsetMode)); + return pixelOffsetMode; + } + + Status GetRenderingOrigin(INT *x, INT *y) + { + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipGetRenderingOrigin(graphics, x, y)); + } + + SmoothingMode GetSmoothingMode(VOID) const + { + SmoothingMode smoothingMode; + SetStatus(DllExports::GdipGetSmoothingMode(graphics, &smoothingMode)); + return smoothingMode; + } + + UINT GetTextContrast(VOID) const + { + UINT contrast; + SetStatus(DllExports::GdipGetTextContrast(graphics, &contrast)); + return contrast; + } + + TextRenderingHint GetTextRenderingHint(VOID) const + { + TextRenderingHint mode; + SetStatus(DllExports::GdipGetTextRenderingHint(graphics, &mode)); + return mode; + } + + Status GetTransform(Matrix* matrix) + { + return NotImplemented; + } + + Status GetVisibleClipBounds(Rect* rect) const + { + return SetStatus(DllExports::GdipGetVisibleClipBoundsI(graphics, rect)); + } + + Status GetVisibleClipBounds(RectF* rect) const + { + return SetStatus(DllExports::GdipGetVisibleClipBounds(graphics, rect)); + } + + Status IntersectClip(const Rect& rect) + { + return NotImplemented; + } + + Status IntersectClip(const Region* region) + { + return NotImplemented; + } + + Status IntersectClip(const RectF& rect) + { + return NotImplemented; + } + + BOOL IsClipEmpty(VOID) const + { + BOOL result; + SetStatus(DllExports::GdipIsClipEmpty(graphics, &result)); + return result; + } + + BOOL IsVisible(const Point& point) const + { + BOOL result; + SetStatus(DllExports::GdipIsVisiblePointI(graphics, point.X, point.Y, &result)); + return result; + } + + BOOL IsVisible(const Rect& rect) const + { + BOOL result; + SetStatus(DllExports::GdipIsVisibleRectI(graphics, rect.X, rect.Y, rect.Width, rect.Height, &result)); + return result; + } + + BOOL IsVisible(REAL x, REAL y) const + { + BOOL result; + SetStatus(DllExports::GdipIsVisiblePoint(graphics, x, y, &result)); + return result; + } + + BOOL IsVisible(const RectF& rect) const + { + BOOL result; + SetStatus(DllExports::GdipIsVisibleRect(graphics, rect.X, rect.Y, rect.Width, rect.Height, &result)); + return result; + } + + BOOL IsVisible(INT x, INT y, INT width, INT height) const + { + BOOL result; + SetStatus(DllExports::GdipIsVisibleRectI(graphics, x, y, width, height, &result)); + return result; + } + + BOOL IsVisible(INT x, INT y) const + { + BOOL result; + SetStatus(DllExports::GdipIsVisiblePointI(graphics, x, y, &result)); + return result; + } + + BOOL IsVisible(const PointF& point) const + { + BOOL result; + SetStatus(DllExports::GdipIsVisiblePoint(graphics, point.X, point.Y, &result)); + return result; + } + + BOOL IsVisible(REAL x, REAL y, REAL width, REAL height) const + { + BOOL result; + SetStatus(DllExports::GdipIsVisibleRect(graphics, x, y, width, height, &result)); + return result; + } + + BOOL IsVisibleClipEmpty(VOID) const + { + return FALSE; /* FIXME: not available: + BOOL result; + SetStatus(DllExports::GdipIsVisibleClipEmpty(graphics, &result)); + return result;*/ + } + + Status MeasureCharacterRanges(const WCHAR *string, INT length, const Font *font, const RectF &layoutRect, const StringFormat *stringFormat, INT regionCount, Region *regions) const + { + return NotImplemented; + } + + Status MeasureDriverString(const UINT16 *text, INT length, const Font *font, const PointF *positions, INT flags, const Matrix *matrix, RectF *boundingBox) const + { + return NotImplemented; + } + + Status MeasureString(const WCHAR *string, INT length, const Font *font, const RectF &layoutRect, RectF *boundingBox) const + { + return NotImplemented; + } + + Status MeasureString(const WCHAR *string, INT length, const Font *font, const PointF &origin, const StringFormat *stringFormat, RectF *boundingBox) const + { + return NotImplemented; + } + + Status MeasureString(const WCHAR *string, INT length, const Font *font, const RectF &layoutRect, const StringFormat *stringFormat, RectF *boundingBox, INT *codepointsFitted, INT *linesFilled) const + { + return NotImplemented; + } + + Status MeasureString(const WCHAR *string, INT length, const Font *font, const SizeF &layoutRectSize, const StringFormat *stringFormat, SizeF *size, INT *codepointsFitted, INT *linesFilled) const + { + return NotImplemented; + } + + Status MeasureString(const WCHAR *string, INT length, const Font *font, const PointF &origin, RectF *boundingBox) const + { + return NotImplemented; + } + + Status MultiplyTransform(Matrix *matrix, MatrixOrder order) + { + return NotImplemented; + } + + VOID ReleaseHDC(HDC hdc) + { + } + + Status ResetClip(VOID) + { + return SetStatus(DllExports::GdipResetClip(graphics)); + } + + Status ResetTransform(VOID) + { + return SetStatus(DllExports::GdipResetWorldTransform(graphics)); + } + + Status Restore(GraphicsState gstate) + { + return NotImplemented; + } + + Status RotateTransform(REAL angle, MatrixOrder order) + { + return SetStatus(DllExports::GdipRotateWorldTransform(graphics, angle, order)); + } + + GraphicsState Save(VOID) + { return 0; } - REAL GetDpiY(VOID) - { - return 0; - } - - static HPALETTE GetHalftonePalette(VOID) - { - return NULL; - } - - HDC GetHDC(VOID) - { - return NULL; - } - - InterpolationMode GetInterpolationMode(VOID) - { - return InterpolationModeInvalid; - } - - Status GetLastStatus(VOID) - { - return NotImplemented; - } - - Status GetNearestColor(Color* color) const - { - return NotImplemented; - } - - REAL GetPageScale(VOID) - { - return 0; - } - - Unit GetPageUnit(VOID) - { - return UnitWorld; - } - - PixelOffsetMode GetPixelOffsetMode(VOID) - { - return PixelOffsetModeInvalid; - } - - Status GetRenderingOrigin(INT *x, INT *y) - { - return NotImplemented; - } - - SmoothingMode GetSmoothingMode(VOID) const - { - return SmoothingModeInvalid; - } - - UINT GetTextContrast(VOID) const - { - return 0; - } - - TextRenderingHint GetTextRenderingHint(VOID) const - { - return TextRenderingHintSystemDefault; - } - - Status GetTransform(Matrix* matrix) - { - return NotImplemented; - } - - Status GetVisibleClipBounds(Rect* rect) const - { - return NotImplemented; - } - - Status GetVisibleClipBounds(RectF* rect) const - { - return NotImplemented; - } - - Status IntersectClip(const Rect& rect) - { - return NotImplemented; - } - - Status IntersectClip(const Region* region) - { - return NotImplemented; - } - - Status IntersectClip(const RectF& rect) - { - return NotImplemented; - } - - BOOL IsClipEmpty(VOID) const - { - return FALSE; - } - - BOOL IsVisible(const Point& point) const - { - return FALSE; - } - - BOOL IsVisible(const Rect& rect) const - { - return FALSE; - } - - BOOL IsVisible(REAL x, REAL y) const - { - return FALSE; - } - - BOOL IsVisible(const RectF& rect) const - { - return FALSE; - } - - BOOL IsVisible(INT x, INT y, INT width, INT height) const - { - return FALSE; - } - - BOOL IsVisible(INT x, INT y) const - { - return FALSE; - } - - BOOL IsVisible(const PointF& point) const - { - return FALSE; - } - - BOOL IsVisible(REAL x, REAL y, REAL width, REAL height) const - { - return FALSE; - } - - BOOL IsVisibleClipEmpty(VOID) const - { - return FALSE; - } - - Status MeasureCharacterRanges(const WCHAR *string, INT length, const Font *font, const RectF &layoutRect, const StringFormat *stringFormat, INT regionCount, Region *regions) const - { - return NotImplemented; - } - - Status MeasureDriverString(const UINT16 *text, INT length, const Font *font, const PointF *positions, INT flags, const Matrix *matrix, RectF *boundingBox) const - { - return NotImplemented; - } - - Status MeasureString(const WCHAR *string, INT length, const Font *font, const RectF &layoutRect, RectF *boundingBox) const - { - return NotImplemented; - } - - Status MeasureString(const WCHAR *string, INT length, const Font *font, const PointF &origin, const StringFormat *stringFormat, RectF *boundingBox) const - { - return NotImplemented; - } - - Status MeasureString(const WCHAR *string, INT length, const Font *font, const RectF &layoutRect, const StringFormat *stringFormat, RectF *boundingBox, INT *codepointsFitted, INT *linesFilled) const - { - return NotImplemented; - } - - Status MeasureString(const WCHAR *string, INT length, const Font *font, const SizeF &layoutRectSize, const StringFormat *stringFormat, SizeF *size, INT *codepointsFitted, INT *linesFilled) const - { - return NotImplemented; - } - - Status MeasureString(const WCHAR *string, INT length, const Font *font, const PointF &origin, RectF *boundingBox) const - { - return NotImplemented; - } - - Status MultiplyTransform(Matrix *matrix, MatrixOrder order) - { - return NotImplemented; - } - - VOID ReleaseHDC(HDC hdc) - { - } - - Status ResetClip(VOID) - { - return NotImplemented; - } - - Status ResetTransform(VOID) - { - return NotImplemented; - } - - Status Restore(GraphicsState gstate) - { - return NotImplemented; - } - - Status RotateTransform(REAL angle, MatrixOrder order) - { - return NotImplemented; - } - - GraphicsState Save(VOID) - { - return 0; - } - Status ScaleTransform(REAL sx, REAL sy, MatrixOrder order) { - return NotImplemented; + return SetStatus(DllExports::GdipScaleWorldTransform(graphics, sx, sy, order)); } Status SetClip(const Graphics *g, CombineMode combineMode) { - return NotImplemented; + return SetStatus(DllExports::GdipSetClipGraphics(graphics, g ? g->graphics : NULL, combineMode)); } Status SetClip(const GraphicsPath *path, CombineMode combineMode) @@ -889,67 +932,67 @@ Status SetClip(const Rect &rect, CombineMode combineMode) { - return NotImplemented; + return SetStatus(DllExports::GdipSetClipRectI(graphics, rect.X, rect.Y, rect.Width, rect.Height, combineMode)); } Status SetClip(HRGN hRgn, CombineMode combineMode) { - return NotImplemented; + return SetStatus(DllExports::GdipSetClipHrgn(graphics, hRgn, combineMode)); } Status SetClip(const RectF& rect, CombineMode combineMode) { - return NotImplemented; + return SetStatus(DllExports::GdipSetClipRect(graphics, rect.X, rect.Y, rect.Width, rect.Height, combineMode)); } Status SetCompositingMode(CompositingMode compositingMode) { - return NotImplemented; + return SetStatus(DllExports::GdipSetCompositingMode(graphics, compositingMode)); } Status SetCompositingQuality(CompositingQuality compositingQuality) { - return NotImplemented; + return SetStatus(DllExports::GdipSetCompositingQuality(graphics, compositingQuality)); } Status SetInterpolationMode(InterpolationMode interpolationMode) { - return NotImplemented; + return SetStatus(DllExports::GdipSetInterpolationMode(graphics, interpolationMode)); } Status SetPageScale(REAL scale) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPageScale(graphics, scale)); } Status SetPageUnit(Unit unit) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPageUnit(graphics, unit)); } Status SetPixelOffsetMode(PixelOffsetMode pixelOffsetMode) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPixelOffsetMode(graphics, pixelOffsetMode)); } Status SetRenderingOrigin(INT x, INT y) { - return NotImplemented; + return SetStatus(DllExports::GdipSetRenderingOrigin(graphics, x, y)); } Status SetSmoothingMode(SmoothingMode smoothingMode) { - return NotImplemented; + return SetStatus(DllExports::GdipSetSmoothingMode(graphics, smoothingMode)); } Status SetTextContrast(UINT contrast) { - return NotImplemented; + return SetStatus(DllExports::GdipSetTextContrast(graphics, contrast)); } Status SetTextRenderingHint(TextRenderingHint newMode) { - return NotImplemented; + return SetStatus(DllExports::GdipSetTextRenderingHint(graphics, newMode)); } Status SetTransform(const Matrix *matrix) @@ -959,22 +1002,22 @@ Status TransformPoints(CoordinateSpace destSpace, CoordinateSpace srcSpace, Point *pts, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipTransformPointsI(graphics, destSpace, srcSpace, pts, count)); } Status TranslateClip(INT dx, INT dy) { - return NotImplemented; + return SetStatus(DllExports::GdipTranslateClipI(graphics, dx, dy)); } Status TranslateClip(REAL dx, REAL dy) { - return NotImplemented; + return SetStatus(DllExports::GdipTranslateClip(graphics, dx, dy)); } Status TranslateTransform(REAL dx, REAL dy, MatrixOrder order) { - return NotImplemented; + return SetStatus(DllExports::GdipTranslateWorldTransform(graphics, dx, dy, order)); } private:

1 0

[tkreuzer] 75602: [NTOSKRNL] Remove duplicate fields from MEMORY_AREA
by tkreuzer＠svn.reactos.org 18 Aug '17

18 Aug '17

Author: tkreuzer Date: Fri Aug 18 07:13:34 2017 New Revision: 75602 URL: http://svn.reactos.org/svn/reactos?rev=75602&view=rev Log: [NTOSKRNL] Remove duplicate fields from MEMORY_AREA Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Fri Aug 18 07:13:34 2017 @@ -200,17 +200,13 @@ }; } ROS_SECTION_OBJECT, *PROS_SECTION_OBJECT; -#define MA_GetStartingAddress(_MemoryArea) ((_MemoryArea)->StartingVpn << PAGE_SHIFT) -#define MA_GetEndingAddress(_MemoryArea) (((_MemoryArea)->EndingVpn + 1) << PAGE_SHIFT) +#define MA_GetStartingAddress(_MemoryArea) (MemoryArea->VadNode.StartingVpn << PAGE_SHIFT) +#define MA_GetEndingAddress(_MemoryArea) ((MemoryArea->VadNode.EndingVpn + 1) << PAGE_SHIFT) typedef struct _MEMORY_AREA { MMVAD VadNode; - ULONG_PTR StartingVpn; - ULONG_PTR EndingVpn; - struct _MEMORY_AREA *Parent; - struct _MEMORY_AREA *LeftChild; - struct _MEMORY_AREA *RightChild; + ULONG Type; ULONG Protect; ULONG Flags; Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Fri Aug 18 07:13:34 2017 @@ -5383,10 +5383,10 @@ Vad->u.VadFlags.CommitCharge -= CommitReduction; // For ReactOS: shrink the corresponding memory area MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)StartingAddress); - ASSERT(Vad->StartingVpn == MemoryArea->StartingVpn); - ASSERT(Vad->EndingVpn == MemoryArea->EndingVpn); + ASSERT(Vad->StartingVpn == MemoryArea->VadNode.StartingVpn); + ASSERT(Vad->EndingVpn == MemoryArea->VadNode.EndingVpn); Vad->EndingVpn = (StartingAddress - 1) >> PAGE_SHIFT; - MemoryArea->EndingVpn = Vad->EndingVpn; + MemoryArea->VadNode.EndingVpn = Vad->EndingVpn; } else { Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=75… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Fri Aug 18 07:13:34 2017 @@ -169,13 +169,11 @@ { PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - marea->VadNode.StartingVpn = marea->StartingVpn; - marea->VadNode.EndingVpn = marea->EndingVpn; marea->VadNode.u.VadFlags.Spare = 1; marea->VadNode.u.VadFlags.Protection = MiMakeProtectionMask(marea->Protect); /* Build a lame VAD if this is a user-space allocation */ - if (marea->EndingVpn + 1 < (ULONG_PTR)MmSystemRangeStart >> PAGE_SHIFT) + if (marea->VadNode.EndingVpn + 1 < (ULONG_PTR)MmSystemRangeStart >> PAGE_SHIFT) { ASSERT(Process != NULL); if (marea->Type != MEMORY_AREA_OWNED_BY_ARM3) @@ -354,7 +352,7 @@ //if (MemoryArea->VadNode.StartingVpn < (ULONG_PTR)MmSystemRangeStart >> PAGE_SHIFT if (MemoryArea->Vad) { - ASSERT(MemoryArea->EndingVpn + 1 < (ULONG_PTR)MmSystemRangeStart >> PAGE_SHIFT); + ASSERT(MemoryArea->VadNode.EndingVpn + 1 < (ULONG_PTR)MmSystemRangeStart >> PAGE_SHIFT); ASSERT(MemoryArea->Type == MEMORY_AREA_SECTION_VIEW || MemoryArea->Type == MEMORY_AREA_CACHE); /* MmCleanProcessAddressSpace might have removed it (and this would be MmDeleteProcessAdressSpace) */ @@ -470,8 +468,8 @@ return STATUS_NO_MEMORY; } - MemoryArea->StartingVpn = (ULONG_PTR)*BaseAddress >> PAGE_SHIFT; - MemoryArea->EndingVpn = ((ULONG_PTR)*BaseAddress + tmpLength - 1) >> PAGE_SHIFT; + MemoryArea->VadNode.StartingVpn = (ULONG_PTR)*BaseAddress >> PAGE_SHIFT; + MemoryArea->VadNode.EndingVpn = ((ULONG_PTR)*BaseAddress + tmpLength - 1) >> PAGE_SHIFT; MmInsertMemoryArea(AddressSpace, MemoryArea); } else @@ -508,8 +506,8 @@ } } - MemoryArea->StartingVpn = (ULONG_PTR)*BaseAddress >> PAGE_SHIFT; - MemoryArea->EndingVpn = ((ULONG_PTR)*BaseAddress + tmpLength - 1) >> PAGE_SHIFT; + MemoryArea->VadNode.StartingVpn = (ULONG_PTR)*BaseAddress >> PAGE_SHIFT; + MemoryArea->VadNode.EndingVpn = ((ULONG_PTR)*BaseAddress + tmpLength - 1) >> PAGE_SHIFT; MmInsertMemoryArea(AddressSpace, MemoryArea); }

1 0

[gadamopoulos] 75601: [WIN32K] -Fix a bug with TransparentBlt when it should really ignore the alpha channel. CORE-13040. Approved by Timo.
by gadamopoulos＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: gadamopoulos Date: Thu Aug 17 22:45:51 2017 New Revision: 75601 URL: http://svn.reactos.org/svn/reactos?rev=75601&view=rev Log: [WIN32K] -Fix a bug with TransparentBlt when it should really ignore the alpha channel. CORE-13040. Approved by Timo. Modified: trunk/reactos/win32ss/gdi/dib/dib32bpp.c Modified: trunk/reactos/win32ss/gdi/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/dib/dib32bpp.c… ============================================================================== --- trunk/reactos/win32ss/gdi/dib/dib32bpp.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/dib/dib32bpp.c [iso-8859-1] Thu Aug 17 22:45:51 2017 @@ -312,7 +312,7 @@ SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) { Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); - if (Source != iTransColor) + if ((0x00FFFFFF & Source) != (0x00FFFFFF & iTransColor)) { *DestBits = XLATEOBJ_iXlate(ColorTranslation, Source); }

1 0

[gadamopoulos] 75600: [UXTHEME] -Remove some dead code
by gadamopoulos＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: gadamopoulos Date: Thu Aug 17 21:31:52 2017 New Revision: 75600 URL: http://svn.reactos.org/svn/reactos?rev=75600&view=rev Log: [UXTHEME] -Remove some dead code Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Thu Aug 17 21:31:52 2017 @@ -7,26 +7,6 @@ */ #include "uxthemep.h" - -HFONT hMenuFont = NULL; -HFONT hMenuFontBold = NULL; - -void InitMenuFont(VOID) -{ - NONCLIENTMETRICS ncm; - - ncm.cbSize = sizeof(NONCLIENTMETRICS); - - if (!SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) - { - return; - } - - hMenuFont = CreateFontIndirect(&ncm.lfMenuFont); - - ncm.lfMenuFont.lfWeight = max(ncm.lfMenuFont.lfWeight + 300, 1000); - hMenuFontBold = CreateFontIndirect(&ncm.lfMenuFont); -} static BOOL IsWindowActive(HWND hWnd, DWORD ExStyle)

1 0

[tfaber] 75599: [USBHUB_NEW] - Fix interval calculation in USBH_Wait. Patch by Vadim Galyant.
by tfaber＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: tfaber Date: Thu Aug 17 19:55:13 2017 New Revision: 75599 URL: http://svn.reactos.org/svn/reactos?rev=75599&view=rev Log: [USBHUB_NEW] - Fix interval calculation in USBH_Wait. Patch by Vadim Galyant. Modified: trunk/reactos/drivers/usb/usbhub_new/usbhub.c Modified: trunk/reactos/drivers/usb/usbhub_new/usbhub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/usb… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] Thu Aug 17 19:55:13 2017 @@ -18,7 +18,7 @@ LARGE_INTEGER Interval; DPRINT("USBH_Wait: Milliseconds - %x\n", Milliseconds); - Interval.QuadPart = -10000 * Milliseconds + (KeQueryTimeIncrement() - 1); + Interval.QuadPart = -10000LL * Milliseconds - ((ULONGLONG)KeQueryTimeIncrement() - 1); return KeDelayExecutionThread(KernelMode, FALSE, &Interval); }

1 0

[tfaber] 75598: [CMIDriver] - Set svn:eol-style to CRLF for inf files. Files that end up on the iso should never have 'native' line endings.
by tfaber＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: tfaber Date: Thu Aug 17 19:25:32 2017 New Revision: 75598 URL: http://svn.reactos.org/svn/reactos?rev=75598&view=rev Log: [CMIDriver] - Set svn:eol-style to CRLF for inf files. Files that end up on the iso should never have 'native' line endings. Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CM8738-x32-WaveRT.inf (contents, props changed) trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CM8738-x32.inf (contents, props changed) trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CM8738-x64-WaveRT.inf (contents, props changed) trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CM8738-x64.inf (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CM8738-x32-WaveRT.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CM8738-x32.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CM8738-x64-WaveRT.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CM8738-x64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/…

1 0

[gadamopoulos] 75597: [SHELL32] -Simplify some coe in CShellLink.cpp
by gadamopoulos＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: gadamopoulos Date: Thu Aug 17 16:46:15 2017 New Revision: 75597 URL: http://svn.reactos.org/svn/reactos?rev=75597&view=rev Log: [SHELL32] -Simplify some coe in CShellLink.cpp Modified: trunk/reactos/dll/win32/shell32/CShellLink.cpp Modified: trunk/reactos/dll/win32/shell32/CShellLink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CShellLi… ============================================================================== --- trunk/reactos/dll/win32/shell32/CShellLink.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CShellLink.cpp [iso-8859-1] Thu Aug 17 16:46:15 2017 @@ -1690,28 +1690,31 @@ return S_OK; } -static HRESULT SHELL_PidlGetIconLocationW(IShellFolder* psf, LPCITEMIDLIST pidl, +static HRESULT SHELL_PidlGetIconLocationW(PCIDLIST_ABSOLUTE pidl, UINT uFlags, PWSTR pszIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) { LPCITEMIDLIST pidlLast; + CComPtr<IShellFolder> psf; HRESULT hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &psf), &pidlLast); - if (SUCCEEDED(hr)) - { - CComPtr<IExtractIconW> pei; - - hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_NULL_PPV_ARG(IExtractIconW, &pei)); - if (SUCCEEDED(hr)) - hr = pei->GetIconLocation(uFlags, pszIconFile, cchMax, piIndex, pwFlags); - - psf->Release(); - } - - return hr; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComPtr<IExtractIconW> pei; + hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_NULL_PPV_ARG(IExtractIconW, &pei)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pei->GetIconLocation(uFlags, pszIconFile, cchMax, piIndex, pwFlags); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; } HRESULT STDMETHODCALLTYPE CShellLink::GetIconLocation(UINT uFlags, PWSTR pszIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) { + HRESULT hr; /* * It is possible for a shell link to point to another shell link, * and in particular there is the possibility to point to itself. @@ -1732,33 +1735,30 @@ if (m_pPidl || m_sPath) { - CComPtr<IShellFolder> pdsk; - - HRESULT hr = SHGetDesktopFolder(&pdsk); - if (SUCCEEDED(hr)) - { - /* first look for an icon using the PIDL (if present) */ - if (m_pPidl) - hr = SHELL_PidlGetIconLocationW(pdsk, m_pPidl, uFlags, pszIconFile, cchMax, piIndex, pwFlags); - else - hr = E_FAIL; + /* first look for an icon using the PIDL (if present) */ + if (m_pPidl) + hr = SHELL_PidlGetIconLocationW(m_pPidl, uFlags, pszIconFile, cchMax, piIndex, pwFlags); + else + hr = E_FAIL; #if 0 // FIXME: Analyse further whether this is needed... - /* if we couldn't find an icon yet, look for it using the file system path */ - if (FAILED(hr) && m_sPath) + /* if we couldn't find an icon yet, look for it using the file system path */ + if (FAILED(hr) && m_sPath) + { + LPITEMIDLIST pidl; + CComPtr<IShellFolder> pdsk; + + hr = SHGetDesktopFolder(&pdsk); + + /* LPITEMIDLIST pidl = ILCreateFromPathW(sPath); */ + hr = pdsk->ParseDisplayName(0, NULL, m_sPath, NULL, &pidl, NULL); + if (SUCCEEDED(hr)) { - LPITEMIDLIST pidl; - - /* LPITEMIDLIST pidl = ILCreateFromPathW(sPath); */ - hr = pdsk->ParseDisplayName(0, NULL, m_sPath, NULL, &pidl, NULL); - if (SUCCEEDED(hr)) - { - hr = SHELL_PidlGetIconLocationW(pdsk, pidl, uFlags, pszIconFile, cchMax, piIndex, pwFlags); - SHFree(pidl); - } + hr = SHELL_PidlGetIconLocationW(pidl, uFlags, pszIconFile, cchMax, piIndex, pwFlags); + SHFree(pidl); } + } #endif - } return hr; }

1 0

[mjansen] 75596: [SHIMENG] Enable the Application Compatibility framework by default. - Also add disabled keys to configure the logging - Demote a noisy print used in the shim engine. At this point...
by mjansen＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: mjansen Date: Thu Aug 17 16:42:29 2017 New Revision: 75596 URL: http://svn.reactos.org/svn/reactos?rev=75596&view=rev Log: [SHIMENG] Enable the Application Compatibility framework by default. - Also add disabled keys to configure the logging - Demote a noisy print used in the shim engine. At this point the shim engine should be functional enough to be used. One thing that remains is creating more shims(fixes) to use, and implement more features for the already existing ones. CORE-13284 Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/appcompat/apphelp/shimeng.c Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Thu Aug 17 16:42:29 2017 @@ -1667,8 +1667,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","TransmissionRetryTimeout",0x00000000,"90" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","USERProcessHandleQuota",0x00010001,0x2710 -; App Compat -- Disable on ReactOS -HKLM,"SOFTWARE\Policies\Microsoft\Windows\AppCompat","DisableEngine",0x00010003, 0x00000001 +; App Compat -- Enable on ReactOS +;HKLM,"SOFTWARE\Policies\Microsoft\Windows\AppCompat","DisableEngine",0x00010003, 0x00000001 ;-------------------------------- STRINGS ------------------------------- Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Thu Aug 17 16:42:29 2017 @@ -1417,6 +1417,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020002,"%SystemRoot%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020002,"%SystemRoot%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020002,"%SystemRoot%" +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","SHIMENG_DEBUG_LEVEL",0x00000000,"4" +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","SHIM_DEBUG_LEVEL",0x00000000,"4" ; Known DLLs Modified: trunk/reactos/dll/appcompat/apphelp/shimeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/shim… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/shimeng.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/shimeng.c [iso-8859-1] Thu Aug 17 16:42:29 2017 @@ -1201,13 +1201,13 @@ VOID WINAPI SE_DllUnloaded(PLDR_DATA_TABLE_ENTRY LdrEntry) { - SHIMENG_MSG("(%p)\n", LdrEntry); + SHIMENG_INFO("(%p)\n", LdrEntry); NotifyShims(SHIM_REASON_DLL_UNLOAD, LdrEntry); } BOOL WINAPI SE_IsShimDll(PVOID BaseAddress) { - SHIMENG_MSG("(%p)\n", BaseAddress); + SHIMENG_INFO("(%p)\n", BaseAddress); return SeiGetShimModuleInfo(BaseAddress) != NULL; }

1 0

[gadamopoulos] 75595: [SHELL32] -AddFSClassKeysToArray: Increase the size of the buffer for the value read from the registry. There are cases when 40 are not enough.
by gadamopoulos＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: gadamopoulos Date: Thu Aug 17 16:35:16 2017 New Revision: 75595 URL: http://svn.reactos.org/svn/reactos?rev=75595&view=rev Log: [SHELL32] -AddFSClassKeysToArray: Increase the size of the buffer for the value read from the registry. There are cases when 40 are not enough. Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Thu Aug 17 16:35:16 2017 @@ -288,7 +288,7 @@ { AddClassKeyToArray(extension, array, cKeys); - WCHAR wszClass[40], wszClass2[40]; + WCHAR wszClass[MAX_PATH], wszClass2[MAX_PATH]; DWORD dwSize = sizeof(wszClass); if (RegGetValueW(HKEY_CLASSES_ROOT, extension, NULL, RRF_RT_REG_SZ, NULL, wszClass, &dwSize) == ERROR_SUCCESS) {

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