Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 71072: [Woops...] Fix some missing stuff...
by dreimer＠svn.reactos.org 28 Mar '16

28 Mar '16

Author: dreimer Date: Mon Mar 28 21:40:16 2016 New Revision: 71072 URL: http://svn.reactos.org/svn/reactos?rev=71072&view=rev Log: [Woops...] Fix some missing stuff... Modified: trunk/reactos/media/rapps/smplayer.txt trunk/reactos/media/rapps/utorrent.txt Modified: trunk/reactos/media/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/smplayer.txt?r… ============================================================================== --- trunk/reactos/media/rapps/smplayer.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/smplayer.txt [iso-8859-1] Mon Mar 28 21:40:16 2016 @@ -10,7 +10,7 @@ Size = 23.6 MB Category = 2 URLSite = http://smplayer.sourceforge.net/en/ -URLDownload = http://www.fosshub.com/SMPlayer.html/smplayer-16.1.0-win32.exe +URLDownload = http://download.sourceforge.net/project/smplayer/SMPlayer/16.1.0/smplayer-1… SHA1 = 477e0b57877e96c44d2b5b4e3360134649369993 CDPath = none Modified: trunk/reactos/media/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/utorrent.txt?r… ============================================================================== --- trunk/reactos/media/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/utorrent.txt [iso-8859-1] Mon Mar 28 21:40:16 2016 @@ -1,4 +1,4 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) ; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) @@ -7,7 +7,7 @@ Version = 3.4.5 License = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. -Size = 1.93 MB +Size = 1.99 MB Category = 5 URLSite = http://www.utorrent.com/ URLDownload = http://download-new.utorrent.com/endpoint/utorrent/os/windows/track/stable/… @@ -24,7 +24,7 @@ [Section.040c] License = Gratuit pour une utilisation non-commerciale Description = Client BitTorrent petit et rapide. -Size = 1,66 Mo +Size = 1,99 Mo [Section.040c] License = Gratita per un uso non-commerciale @@ -45,7 +45,7 @@ [Section.0418] License = GratuitÄ pentru uz necomercial Description = Client BitTorrent, mic Èi rapid. -Size = 1,66 Mo +Size = 1,99 Mo [Section.0419] License = ÐÐµÑÐ¿Ð»Ð°ÑÐ½Ð°Ñ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ð¼Ð¼ÐµÑÑÐµÑÐºÐ¾Ð³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ @@ -54,7 +54,7 @@ [Section.041f] License = Tecimlik olmayan kullanÄ±mlar iÃ§in Ã¼cretsiz. Description = KÃ¼Ã§Ã¼k ve hÄ±zlÄ± BitTorrent istemcisi. -Size = 1,66 MB +Size = 1,99 MB [Section.0422] License = ÐÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð° Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ð¼ÐµÑÑÑÐ¹Ð½Ð¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ

1 0

[dreimer] 71071: [RAPPS/RAPPS_NEW] Add Update Database to the toolbar by Jared Smudde CORE-10924 #resolve #comment Committed, thx ^^
by dreimer＠svn.reactos.org 28 Mar '16

28 Mar '16

Author: dreimer Date: Mon Mar 28 21:38:35 2016 New Revision: 71071 URL: http://svn.reactos.org/svn/reactos?rev=71071&view=rev Log: [RAPPS/RAPPS_NEW] Add Update Database to the toolbar by Jared Smudde CORE-10924 #resolve #comment Committed, thx ^^ Added: trunk/reactos/base/applications/rapps/res/updatedb.ico (with props) trunk/reactos/base/applications/rapps_new/res/updatedb.ico (with props) Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/cs-CZ.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/fr-FR.rc trunk/reactos/base/applications/rapps/lang/he-IL.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/no-NO.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pt-BR.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/rapps/lang/sq-AL.rc trunk/reactos/base/applications/rapps/lang/sv-SE.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/rapps/lang/zh-CN.rc trunk/reactos/base/applications/rapps/lang/zh-TW.rc trunk/reactos/base/applications/rapps/rapps.rc trunk/reactos/base/applications/rapps/resource.h trunk/reactos/base/applications/rapps/toolbar.c trunk/reactos/base/applications/rapps_new/gui.cpp trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc trunk/reactos/base/applications/rapps_new/lang/de-DE.rc trunk/reactos/base/applications/rapps_new/lang/en-US.rc trunk/reactos/base/applications/rapps_new/lang/es-ES.rc trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc trunk/reactos/base/applications/rapps_new/lang/he-IL.rc trunk/reactos/base/applications/rapps_new/lang/it-IT.rc trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc trunk/reactos/base/applications/rapps_new/lang/no-NO.rc trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc trunk/reactos/base/applications/rapps_new/rapps.rc trunk/reactos/base/applications/rapps_new/resource.h Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -121,6 +121,7 @@ IDS_TOOLTIP_MODIFY "ÐÑÐ¾Ð¼ÑÐ½Ð°" IDS_TOOLTIP_SETTINGS "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸" IDS_TOOLTIP_REFRESH "ÐÐ¿ÑÐµÑÐ½ÑÐ²Ð°Ð½Ðµ" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "ÐÐ·ÑÐ¾Ð´" END Modified: trunk/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -122,6 +122,7 @@ IDS_TOOLTIP_MODIFY "ZmÄnit" IDS_TOOLTIP_SETTINGS "NastavenÃ" IDS_TOOLTIP_REFRESH "Obnovit" + IDS_TOOLTIP_UPDATE_DB "Aktualizovat databÃ¡zi" IDS_TOOLTIP_EXIT "Konec" END Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -117,6 +117,7 @@ IDS_TOOLTIP_MODIFY "Ãndern" IDS_TOOLTIP_SETTINGS "Einstellungen" IDS_TOOLTIP_REFRESH "Aktualisieren" + IDS_TOOLTIP_UPDATE_DB "Datenbank aktualisieren" IDS_TOOLTIP_EXIT "Beenden" END Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -117,6 +117,7 @@ IDS_TOOLTIP_MODIFY "Modify" IDS_TOOLTIP_SETTINGS "Settings" IDS_TOOLTIP_REFRESH "Refresh" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "Exit" END Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -120,6 +120,7 @@ IDS_TOOLTIP_MODIFY "Modificar" IDS_TOOLTIP_SETTINGS "Ajustes" IDS_TOOLTIP_REFRESH "Recargar" + IDS_TOOLTIP_UPDATE_DB "Actualizar el listado desde Internet" IDS_TOOLTIP_EXIT "Salir" END Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -117,6 +117,7 @@ IDS_TOOLTIP_MODIFY "Modifier" IDS_TOOLTIP_SETTINGS "Configuration" IDS_TOOLTIP_REFRESH "RafraÃ®chir" + IDS_TOOLTIP_UPDATE_DB "Mettre Ã jour la base" IDS_TOOLTIP_EXIT "Sortir" END Modified: trunk/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -119,6 +119,7 @@ IDS_TOOLTIP_MODIFY "×©×× ××" IDS_TOOLTIP_SETTINGS "××××¨××ª" IDS_TOOLTIP_REFRESH "×¨×¢× ××" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "××¦×××" END Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -117,6 +117,7 @@ IDS_TOOLTIP_MODIFY "Modifica" IDS_TOOLTIP_SETTINGS "Impostazioni" IDS_TOOLTIP_REFRESH "Aggiorna" + IDS_TOOLTIP_UPDATE_DB "Aggiorna Database" IDS_TOOLTIP_EXIT "Esci" END Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -117,6 +117,7 @@ IDS_TOOLTIP_MODIFY "å¤æ´" IDS_TOOLTIP_SETTINGS "è¨å®" IDS_TOOLTIP_REFRESH "æ´æ°" + IDS_TOOLTIP_UPDATE_DB "ã¢ãããã¼ã ãã¼ã¿ãã¼ã¹" IDS_TOOLTIP_EXIT "çµäº" END Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -117,6 +117,7 @@ IDS_TOOLTIP_MODIFY "Rediger" IDS_TOOLTIP_SETTINGS "Innstillinger" IDS_TOOLTIP_REFRESH "Oppdatere" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "Avslutt" END Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -125,6 +125,7 @@ IDS_TOOLTIP_MODIFY "Modyfikuj" IDS_TOOLTIP_SETTINGS "Ustawienia" IDS_TOOLTIP_REFRESH "OdÅwieÅ¼" + IDS_TOOLTIP_UPDATE_DB "Aktualizuj bazÄ programÃ³w" IDS_TOOLTIP_EXIT "WyjÅcie" END Modified: trunk/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -119,6 +119,7 @@ IDS_TOOLTIP_MODIFY "Modificar" IDS_TOOLTIP_SETTINGS "ConfiguraÃ§Ãµes" IDS_TOOLTIP_REFRESH "Atualizar" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "Sair" END Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -123,6 +123,7 @@ IDS_TOOLTIP_MODIFY "ModificÄ" IDS_TOOLTIP_SETTINGS "PreferinÈe" IDS_TOOLTIP_REFRESH "ÃmprospÄteazÄ" + IDS_TOOLTIP_UPDATE_DB "ActualizeazÄ baza de date" IDS_TOOLTIP_EXIT "IeÈire" END Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -117,6 +117,7 @@ IDS_TOOLTIP_MODIFY "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ" IDS_TOOLTIP_SETTINGS "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ" IDS_TOOLTIP_REFRESH "ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ" + IDS_TOOLTIP_UPDATE_DB "ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ" IDS_TOOLTIP_EXIT "ÐÑÑÐ¾Ð´" END Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -122,6 +122,7 @@ IDS_TOOLTIP_MODIFY "ZmeniÅ¥" IDS_TOOLTIP_SETTINGS "Nastavenia" IDS_TOOLTIP_REFRESH "ObnoviÅ¥" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "SkonÄiÅ¥" END Modified: trunk/reactos/base/applications/rapps/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -121,6 +121,7 @@ IDS_TOOLTIP_MODIFY "Modifiko" IDS_TOOLTIP_SETTINGS "Konfigurime" IDS_TOOLTIP_REFRESH "Rifresko" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "Dil" END Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -124,6 +124,7 @@ IDS_TOOLTIP_MODIFY "Redigera" IDS_TOOLTIP_SETTINGS "InstÃ¤llingar" IDS_TOOLTIP_REFRESH "Uppdatera" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "Avsluta" END Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -119,6 +119,7 @@ IDS_TOOLTIP_MODIFY "DeÄiÅtir" IDS_TOOLTIP_SETTINGS "Ayarlar" IDS_TOOLTIP_REFRESH "Yenile" + IDS_TOOLTIP_UPDATE_DB "YazÄ±lÄ±m Veri TabanÄ±nÄ± Yenile" IDS_TOOLTIP_EXIT "ÃÄ±kÄ±Å" END Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -125,6 +125,7 @@ IDS_TOOLTIP_MODIFY "ÐÐ¼ÑÐ½Ð¸ÑÐ¸" IDS_TOOLTIP_SETTINGS "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ" IDS_TOOLTIP_REFRESH "ÐÐ½Ð¾Ð²Ð¸ÑÐ¸" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "ÐÐ¸ÑÑÐ´" END Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -120,6 +120,7 @@ IDS_TOOLTIP_MODIFY "ä¿®æ¹" IDS_TOOLTIP_SETTINGS "è®¾ç½®" IDS_TOOLTIP_REFRESH "å·æ°" + IDS_TOOLTIP_UPDATE_DB "æ´æ°æ°æ®åº" IDS_TOOLTIP_EXIT "éåº" END Modified: trunk/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -119,6 +119,7 @@ IDS_TOOLTIP_MODIFY "ä¿®æ¹" IDS_TOOLTIP_SETTINGS "è¨å®" IDS_TOOLTIP_REFRESH "éæ°æ´ç" + IDS_TOOLTIP_UPDATE_DB "æ´æ°è³æåº«" IDS_TOOLTIP_EXIT "éåº" END Modified: trunk/reactos/base/applications/rapps/rapps.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -21,6 +21,7 @@ IDI_APPS ICON "res/apps.ico" IDI_APPUPD ICON "res/appupd.ico" IDI_CATEGORY ICON "res/cat.ico" +IDI_UPDATE_DB ICON "res/updatedb.ico" /* Categories */ IDI_CAT_AUDIO ICON "res/cats/audio.ico" Added: trunk/reactos/base/applications/rapps/res/updatedb.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/rapps/res/updatedb.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… ============================================================================== --- trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -11,6 +11,7 @@ #define IDI_APPS 17 #define IDI_APPUPD 18 #define IDI_CATEGORY 19 +#define IDI_UPDATE_DB 20 /* Icons for categories */ #define IDI_CAT_AUDIO 50 @@ -109,6 +110,7 @@ #define IDS_TOOLTIP_SETTINGS 203 #define IDS_TOOLTIP_REFRESH 204 #define IDS_TOOLTIP_EXIT 205 +#define IDS_TOOLTIP_UPDATE_DB 206 /* Columns info */ #define IDS_APP_NAME 250 Modified: trunk/reactos/base/applications/rapps/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/to… ============================================================================== --- trunk/reactos/base/applications/rapps/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/toolbar.c [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -25,9 +25,10 @@ { 2, ID_MODIFY, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szModifyBtn}, { 5, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, { 3, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0}, + { 4, ID_RESETDB, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0}, { 5, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, - { 4, ID_SETTINGS, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0}, - { 5, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0} + { 5, ID_SETTINGS, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0}, + { 6, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0} }; @@ -60,6 +61,10 @@ case ID_REFRESH: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_REFRESH); + break; + + case ID_RESETDB: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_UPDATE_DB); break; } } @@ -104,6 +109,7 @@ AddImageToImageList(hImageList, IDI_UNINSTALL); AddImageToImageList(hImageList, IDI_MODIFY); AddImageToImageList(hImageList, IDI_REFRESH); + AddImageToImageList(hImageList, IDI_UPDATE_DB); AddImageToImageList(hImageList, IDI_SETTINGS); AddImageToImageList(hImageList, IDI_EXIT); Modified: trunk/reactos/base/applications/rapps_new/gui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/gui.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/gui.cpp [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -70,6 +70,7 @@ AddImageToImageList(hImageList, IDI_UNINSTALL); AddImageToImageList(hImageList, IDI_MODIFY); AddImageToImageList(hImageList, IDI_REFRESH); + AddImageToImageList(hImageList, IDI_UPDATE_DB); AddImageToImageList(hImageList, IDI_SETTINGS); AddImageToImageList(hImageList, IDI_EXIT); @@ -105,6 +106,10 @@ case ID_REFRESH: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_REFRESH); + break; + + case ID_RESETDB: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_UPDATE_DB); break; } } @@ -118,9 +123,10 @@ { 2, ID_MODIFY, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szModifyBtn }, { 5, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, { 3, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, + { 4, ID_RESETDB, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0}, { 5, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, - { 4, ID_SETTINGS, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, - { 5, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 } + { 5, ID_SETTINGS, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, + { 6, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 } }; INT NumButtons = sizeof(Buttons) / sizeof(Buttons[0]); Modified: trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -121,6 +121,7 @@ IDS_TOOLTIP_MODIFY "ÐÑÐ¾Ð¼ÑÐ½Ð°" IDS_TOOLTIP_SETTINGS "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸" IDS_TOOLTIP_REFRESH "ÐÐ¿ÑÐµÑÐ½ÑÐ²Ð°Ð½Ðµ" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "ÐÐ·ÑÐ¾Ð´" END Modified: trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -122,6 +122,7 @@ IDS_TOOLTIP_MODIFY "ZmÄnit" IDS_TOOLTIP_SETTINGS "NastavenÃ" IDS_TOOLTIP_REFRESH "Obnovit" + IDS_TOOLTIP_UPDATE_DB "Aktualizovat databÃ¡zi" IDS_TOOLTIP_EXIT "Konec" END Modified: trunk/reactos/base/applications/rapps_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/de-DE.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -117,6 +117,7 @@ IDS_TOOLTIP_MODIFY "Ãndern" IDS_TOOLTIP_SETTINGS "Einstellungen" IDS_TOOLTIP_REFRESH "Aktualisieren" + IDS_TOOLTIP_UPDATE_DB "Datenbank aktualisieren" IDS_TOOLTIP_EXIT "Beenden" END Modified: trunk/reactos/base/applications/rapps_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/en-US.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -117,6 +117,7 @@ IDS_TOOLTIP_MODIFY "Modify" IDS_TOOLTIP_SETTINGS "Settings" IDS_TOOLTIP_REFRESH "Refresh" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "Exit" END Modified: trunk/reactos/base/applications/rapps_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/es-ES.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -120,6 +120,7 @@ IDS_TOOLTIP_MODIFY "Modificar" IDS_TOOLTIP_SETTINGS "Ajustes" IDS_TOOLTIP_REFRESH "Recargar" + IDS_TOOLTIP_UPDATE_DB "Actualizar el listado desde Internet" IDS_TOOLTIP_EXIT "Salir" END Modified: trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -117,6 +117,7 @@ IDS_TOOLTIP_MODIFY "Modifier" IDS_TOOLTIP_SETTINGS "Configuration" IDS_TOOLTIP_REFRESH "RafraÃ®chir" + IDS_TOOLTIP_UPDATE_DB "Mettre Ã jour la base" IDS_TOOLTIP_EXIT "Sortir" END Modified: trunk/reactos/base/applications/rapps_new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/he-IL.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -119,6 +119,7 @@ IDS_TOOLTIP_MODIFY "×©×× ××" IDS_TOOLTIP_SETTINGS "××××¨××ª" IDS_TOOLTIP_REFRESH "×¨×¢× ××" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "××¦×××" END Modified: trunk/reactos/base/applications/rapps_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/it-IT.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -117,6 +117,7 @@ IDS_TOOLTIP_MODIFY "Modifica" IDS_TOOLTIP_SETTINGS "Impostazioni" IDS_TOOLTIP_REFRESH "Aggiorna" + IDS_TOOLTIP_UPDATE_DB "Aggiorna Database" IDS_TOOLTIP_EXIT "Esci" END Modified: trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -117,6 +117,7 @@ IDS_TOOLTIP_MODIFY "å¤æ´" IDS_TOOLTIP_SETTINGS "è¨å®" IDS_TOOLTIP_REFRESH "æ´æ°" + IDS_TOOLTIP_UPDATE_DB "ã¢ãããã¼ã ãã¼ã¿ãã¼ã¹" IDS_TOOLTIP_EXIT "çµäº" END Modified: trunk/reactos/base/applications/rapps_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/no-NO.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -117,6 +117,7 @@ IDS_TOOLTIP_MODIFY "Rediger" IDS_TOOLTIP_SETTINGS "Innstillinger" IDS_TOOLTIP_REFRESH "Oppdatere" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "Avslutt" END Modified: trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -125,6 +125,7 @@ IDS_TOOLTIP_MODIFY "Modyfikuj" IDS_TOOLTIP_SETTINGS "Ustawienia" IDS_TOOLTIP_REFRESH "OdÅwieÅ¼" + IDS_TOOLTIP_UPDATE_DB "Aktualizuj bazÄ programÃ³w" IDS_TOOLTIP_EXIT "WyjÅcie" END Modified: trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -119,6 +119,7 @@ IDS_TOOLTIP_MODIFY "Modificar" IDS_TOOLTIP_SETTINGS "ConfiguraÃ§Ãµes" IDS_TOOLTIP_REFRESH "Atualizar" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "Sair" END Modified: trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -123,6 +123,7 @@ IDS_TOOLTIP_MODIFY "ModificÄ" IDS_TOOLTIP_SETTINGS "PreferinÈe" IDS_TOOLTIP_REFRESH "ÃmprospÄteazÄ" + IDS_TOOLTIP_UPDATE_DB "ActualizeazÄ baza de date" IDS_TOOLTIP_EXIT "IeÈire" END Modified: trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -117,6 +117,7 @@ IDS_TOOLTIP_MODIFY "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ" IDS_TOOLTIP_SETTINGS "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ" IDS_TOOLTIP_REFRESH "ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ" + IDS_TOOLTIP_UPDATE_DB "ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ" IDS_TOOLTIP_EXIT "ÐÑÑÐ¾Ð´" END Modified: trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -122,6 +122,7 @@ IDS_TOOLTIP_MODIFY "ZmeniÅ¥" IDS_TOOLTIP_SETTINGS "Nastavenia" IDS_TOOLTIP_REFRESH "ObnoviÅ¥" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "SkonÄiÅ¥" END Modified: trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -121,6 +121,7 @@ IDS_TOOLTIP_MODIFY "Modifiko" IDS_TOOLTIP_SETTINGS "Konfigurime" IDS_TOOLTIP_REFRESH "Rifresko" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "Dil" END Modified: trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -124,6 +124,7 @@ IDS_TOOLTIP_MODIFY "Redigera" IDS_TOOLTIP_SETTINGS "InstÃ¤llingar" IDS_TOOLTIP_REFRESH "Uppdatera" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "Avsluta" END Modified: trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -119,6 +119,7 @@ IDS_TOOLTIP_MODIFY "DeÄiÅtir" IDS_TOOLTIP_SETTINGS "Ayarlar" IDS_TOOLTIP_REFRESH "Yenile" + IDS_TOOLTIP_UPDATE_DB "YazÄ±lÄ±m Veri TabanÄ±nÄ± Yenile" IDS_TOOLTIP_EXIT "ÃÄ±kÄ±Å" END Modified: trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -125,6 +125,7 @@ IDS_TOOLTIP_MODIFY "ÐÐ¼ÑÐ½Ð¸ÑÐ¸" IDS_TOOLTIP_SETTINGS "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ" IDS_TOOLTIP_REFRESH "ÐÐ½Ð¾Ð²Ð¸ÑÐ¸" + IDS_TOOLTIP_UPDATE_DB "Update Database" IDS_TOOLTIP_EXIT "ÐÐ¸ÑÑÐ´" END Modified: trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -119,6 +119,7 @@ IDS_TOOLTIP_MODIFY "ä¿®æ¹" IDS_TOOLTIP_SETTINGS "è®¾ç½®" IDS_TOOLTIP_REFRESH "å·æ°" + IDS_TOOLTIP_UPDATE_DB "æ´æ°æ°æ®åº" IDS_TOOLTIP_EXIT "éåº" END Modified: trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -119,6 +119,7 @@ IDS_TOOLTIP_MODIFY "ä¿®æ¹" IDS_TOOLTIP_SETTINGS "è¨å®" IDS_TOOLTIP_REFRESH "éæ°æ´ç" + IDS_TOOLTIP_UPDATE_DB "æ´æ°è³æåº«" IDS_TOOLTIP_EXIT "éåº" END Modified: trunk/reactos/base/applications/rapps_new/rapps.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/rapps.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/rapps.rc [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -21,6 +21,7 @@ IDI_APPS ICON "res/apps.ico" IDI_APPUPD ICON "res/appupd.ico" IDI_CATEGORY ICON "res/cat.ico" +IDI_UPDATE_DB ICON "res/updatedb.ico" /* Categories */ IDI_CAT_AUDIO ICON "res/cats/audio.ico" Added: trunk/reactos/base/applications/rapps_new/res/updatedb.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/rapps_new/res/updatedb.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/applications/rapps_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/resource.h [iso-8859-1] Mon Mar 28 21:38:35 2016 @@ -11,6 +11,7 @@ #define IDI_APPS 17 #define IDI_APPUPD 18 #define IDI_CATEGORY 19 +#define IDI_UPDATE_DB 20 /* Icons for categories */ #define IDI_CAT_AUDIO 50 @@ -109,6 +110,7 @@ #define IDS_TOOLTIP_SETTINGS 203 #define IDS_TOOLTIP_REFRESH 204 #define IDS_TOOLTIP_EXIT 205 +#define IDS_TOOLTIP_UPDATE_DB 206 /* Columns info */ #define IDS_APP_NAME 250

1 0

[dreimer] 71070: [USERINIT] Fix Russian translation for userinit by BinaryTree CORE-10936 #resolve #comment Committed, thx.
by dreimer＠svn.reactos.org 28 Mar '16

28 Mar '16

Author: dreimer Date: Mon Mar 28 21:26:21 2016 New Revision: 71070 URL: http://svn.reactos.org/svn/reactos?rev=71070&view=rev Log: [USERINIT] Fix Russian translation for userinit by BinaryTree CORE-10936 #resolve #comment Committed, thx. Modified: trunk/reactos/base/system/userinit/lang/ru-RU.rc Modified: trunk/reactos/base/system/userinit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/ru-RU.rc [iso-8859-1] Mon Mar 28 21:26:21 2016 @@ -6,15 +6,15 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "Ð¯Ð·ÑÐº:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "Ð Ð°ÑÐºÐ»Ð°Ð´ÐºÐ° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + LTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ·ÑÐº Ð¸ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÑ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ ÐÐ°Ð»ÐµÐµ Ð´Ð»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ.", IDC_STATIC, 7, 152, 300, 8 GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 - DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 + DEFPUSHBUTTON "&ÐÐ°Ð»ÐµÐµ", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 260, 172, 50, 14 END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 @@ -23,20 +23,20 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + DEFPUSHBUTTON "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ReactOS Ð² ÑÐµÐ¶Ð¸Ð¼Ðµ &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ReactOS", IDC_INSTALL, 71, 130, 175, 21 LTEXT "", IDC_STATIC, 7, 152, 300, 8 GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 - PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 + PUSHBUTTON "&ÐÐ°Ð·Ð°Ð´", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 260, 172, 50, 14 END STRINGTABLE BEGIN IDS_SHELL_FAIL "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð¿ÑÐ¸ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¾Ð³Ð¾ ÑÐµÐ°Ð½ÑÐ°!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_INSTALLER_FAIL "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸!\n" END STRINGTABLE

1 0

[dreimer] 71069: [RAPPS] Update link to msxml3 and add entry for msxml6. CORE-10602 #resolve #comment Fixed. Thx
by dreimer＠svn.reactos.org 28 Mar '16

28 Mar '16

Author: dreimer Date: Mon Mar 28 21:16:49 2016 New Revision: 71069 URL: http://svn.reactos.org/svn/reactos?rev=71069&view=rev Log: [RAPPS] Update link to msxml3 and add entry for msxml6. CORE-10602 #resolve #comment Fixed. Thx Added: trunk/reactos/media/rapps/msxml6.txt (with props) Modified: trunk/reactos/media/rapps/msxml3.txt Modified: trunk/reactos/media/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/msxml3.txt?rev… ============================================================================== --- trunk/reactos/media/rapps/msxml3.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/msxml3.txt [iso-8859-1] Mon Mar 28 21:16:49 2016 @@ -1,4 +1,4 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) ; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) @@ -7,11 +7,11 @@ Version = 3.0 License = Unknown Description = Needed for some MSI Installers. Contains: msxml3.dll, msxml3a.dll, msxml3r.dll. -Size = 1.85 MB +Size = 1.02 MB Category = 14 URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyID=28494391-052B-42FF… -URLDownload = ftp://ftp.uni-rostock.de/pub/tools/microsoft/XML/US/msxml3.msi -SHA1 = 352e3825dc392b3fc63cf002ac22da8da841e60a +URLDownload = https://web.archive.org/web/20070126162308/http://download.microsoft.com/do… +SHA1 = d4c2178dfb807e1a0267fce0fd06b8d51106d913 CDPath = none [Section.0407] @@ -25,7 +25,7 @@ [Section.040c] License = Inconnue Description = MSXML3 est nÃ©cessaire pour certains installateurs MSI. Contient: msxml3.dll, msxml3a.dll, msxml3r.dll. -Size = 1,85 Mo +Size = 1,02 Mo [Section.0410] License = Sconosciuto @@ -42,12 +42,12 @@ [Section.0418] License = NespecificatÄ Description = ModÃºl necesar unor programe de instalare MSI. ConÈine: msxml3.dll, msxml3a.dll, msxml3r.dll. -Size = 1,85 Mo +Size = 1,02 Mo [Section.041f] License = Bilinmiyor Description = BirtakÄ±m Microsoft YÃ¼kleyicileri iÃ§in gereklidir. ÅunlarÄ± iÃ§erir: msxml3.dll, msxml3a.dll, msxml3r.dll. -Size = 1,85 MB +Size = 1,02 MB [Section.0422] License = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Added: trunk/reactos/media/rapps/msxml6.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/msxml6.txt?rev… ============================================================================== --- trunk/reactos/media/rapps/msxml6.txt (added) +++ trunk/reactos/media/rapps/msxml6.txt [iso-8859-1] Mon Mar 28 21:16:49 2016 @@ -0,0 +1,62 @@ +ï»¿; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) +; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) + +[Section] +Name = Microsoft XML 6 +Version = 6.0 +License = Unknown +Description = Needed for some MSI Installers. Contains: msxml6.dll, msxml6r.dll. +Size = 1.46 MB +Category = 14 +URLSite = https://www.microsoft.com/en-us/download/details.aspx?id=3988 +URLDownload = https://download.microsoft.com/download/2/e/0/2e01308a-e17f-4bf9-bf48-16135… +SHA1 = 2308743ddb4cb56ae910e461eeb3eab0a9e58058 +CDPath = none + +[Section.0407] +License = Unbekannt +Description = Wird von einigen MSI Installern benÃ¶tigt. Beinhaltet: msxml6.dll, msxml6r.dll. + +[Section.0a] +License = Desconocida +Description = Necesario para algunos instaladores MSI. Incluye: msxml6.dll, msxml6r.dll. + +[Section.040c] +License = Inconnue +Description = MSXML3 est nÃ©cessaire pour certains installateurs MSI. Contient: msxml6.dll, msxml6r.dll. +Size = 1,46 Mo + +[Section.0410] +License = Sconosciuto +Description = MSXML3 Ã¨ necessario per alcuni installatori MSI. Contiene: msxml6.dll, msxml6r.dll. + +[Section.0413] +License = Ongekend +Description = MSXML3 is nodig voor bepaalde MSI installaties. Bevat: msxml6.dll, msxml6r.dll. + +[Section.0415] +License = Nieznana +Description = NiektÃ³re spoÅrÃ³d plikÃ³w instalacyjnych MSI potrzebujÄ parsera MSXML3. Zawiera: msxml6.dll, msxml6r.dll. + +[Section.0418] +License = NespecificatÄ +Description = ModÃºl necesar unor programe de instalare MSI. ConÈine: msxml6.dll, msxml6r.dll. +Size = 1,46 Mo + +[Section.041f] +License = Bilinmiyor +Description = BirtakÄ±m Microsoft YÃ¼kleyicileri iÃ§in gereklidir. ÅunlarÄ± iÃ§erir: msxml6.dll, msxml6r.dll. +Size = 1,46 MB + +[Section.0422] +License = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = MSXML3 Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð° Ð´Ð»Ñ Ð´ÐµÐºÐ¾ÑÑÐ¸Ñ MSI ÑÐ½ÑÑÐ°Ð»ÑÑÐ¾ÑÑÐ². Ð²ÐºÐ»ÑÑÐ°Ñ: msxml6.dll, msxml6r.dll. + +[Section.0804] +License = æªç¥ +Description = éè¦ä¸äº MSI å®è£ç¨åºãåå«ï¼ msxml6.dll, msxml6r.dllã + +[Section.0813] +License = Ongekend +Description = MSXML3 is nodig voor bepaalde MSI installaties. Bevat: msxml6.dll, msxml6r.dll. Propchange: trunk/reactos/media/rapps/msxml6.txt ------------------------------------------------------------------------------ svn:eol-style = CRLF

1 0

[akhaldi] 71068: [TASKMGR][SYSDM] Russian translation update by Sergey Shmygalev. CORE-11043
by akhaldi＠svn.reactos.org 28 Mar '16

28 Mar '16

Author: akhaldi Date: Mon Mar 28 20:29:51 2016 New Revision: 71068 URL: http://svn.reactos.org/svn/reactos?rev=71068&view=rev Log: [TASKMGR][SYSDM] Russian translation update by Sergey Shmygalev. CORE-11043 Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] Mon Mar 28 20:29:51 2016 @@ -425,7 +425,7 @@ IDS_MENU_CPUHISTORY "&ÐÑÑÐ¾ÑÐ¸Ñ Ð¦Ð" IDS_MENU_SHOWKERNELTIMES "&ÐÑÐ²Ð¾Ð´ Ð²ÑÐµÐ¼ÐµÐ½Ð¸ ÑÐ´ÑÐ°" IDS_CREATENEWTASK "Ð¡Ð¾Ð·Ð´Ð°ÑÑ Ð½Ð¾Ð²ÑÑ Ð·Ð°Ð´Ð°ÑÑ" - IDS_CREATENEWTASK_DESC "ÐÑÐ²ÐµÑÑÐ¸ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ, Ð¿Ð°Ð¿ÐºÐ¸ Ð¸Ð»Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ° Ð´Ð»Ñ Ð¾ÑÐºÑÑÑÐ¸Ñ Ð² ÐÐµÐ½ÐµÐ´Ð¶ÐµÑÐµ Ð·Ð°Ð´Ð°Ñ." + IDS_CREATENEWTASK_DESC "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ, Ð¿Ð°Ð¿ÐºÐ¸, Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ° Ð¸Ð»Ð¸ ÑÐµÑÑÑÑÐ° ÐÐ½ÑÐµÑÐ½ÐµÑÐ°, Ð¸ ReactOS Ð¾ÑÐºÑÐ¾ÐµÑ Ð¸Ñ." IDS_MSG_ACCESSPROCESSAFF "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð´Ð¾ÑÑÑÐ¿ Ð¸Ð»Ð¸ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¿ÑÐ¸Ð¾ÑÐ¸ÑÐµÑ Ð¿ÑÐ¾ÑÐµÑÑÐ°" IDS_MSG_PROCESSONEPRO "ÐÑÐ¾ÑÐµÑÑ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¸Ð¼ÐµÑÑ Ð´Ð¾ÑÑÑÐ¿ Ð¿Ð¾ ÐºÑÐ°Ð¹Ð½ÐµÐ¹ Ð¼ÐµÑÐµ Ðº Ð¾Ð´Ð½Ð¾Ð¼Ñ Ð¿ÑÐ¾ÑÐµÑÑÐ¾ÑÑ." IDS_MSG_INVALIDOPTION "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸" Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Mon Mar 28 20:29:51 2016 @@ -45,18 +45,18 @@ CAPTION "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ÐÐ»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑÑÐ¸Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² ÑÑÐµÐ±ÑÑÑÑÑ Ð¿ÑÐ°Ð²Ð° ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°.", IDC_STATIC, 12, 5, 253, 8 + LTEXT "ÐÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð¸Ð¼ÐµÑÑ Ð¿ÑÐ°Ð²Ð° Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ° Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÑÑÐ¸Ð½ÑÑÐ²Ð° Ð¿ÐµÑÐµÑÐ¸ÑÐ»ÐµÐ½Ð½ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð².", IDC_STATIC, 12, 5, 253, 8 GROUPBOX "ÐÑÑÑÑÐ¾Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ", IDC_STATIC, 6, 18, 244, 50 - LTEXT "ÐÐ¸Ð·ÑÐ°Ð»ÑÐ½ÑÐµ ÑÑÑÐµÐºÑÑ, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¿ÑÐ¾ÑÐµÑÑÐ¾ÑÐ°, Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð²Ð½Ð¾Ð¹ Ð¸ Ð²Ð¸ÑÑÑÐ°Ð»ÑÐ½Ð¾Ð¹ Ð¿Ð°Ð¼ÑÑÐ¸.", IDC_STATIC, 16, 29, 210, 20 + LTEXT "ÐÐ¸Ð·ÑÐ°Ð»ÑÐ½ÑÐµ ÑÑÑÐµÐºÑÑ, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¿ÑÐ¾ÑÐµÑÑÐ¾ÑÐ°, Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð²Ð½Ð¾Ð¹ Ð¸ Ð²Ð¸ÑÑÑÐ°Ð»ÑÐ½Ð¾Ð¹ Ð¿Ð°Ð¼ÑÑÐ¸", IDC_STATIC, 16, 29, 210, 20 PUSHBUTTON "&ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ", IDC_PERFOR, 194, 48, 50, 15 GROUPBOX "ÐÑÐ¾ÑÐ¸Ð»Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹", IDC_STATIC, 6, 75, 244, 48 - LTEXT "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐ°Ð±Ð¾ÑÐµÐ³Ð¾ ÑÑÐ¾Ð»Ð°, Ð¾ÑÐ½Ð¾ÑÑÑÐ¸ÐµÑÑ ÐºÐ¾ Ð²ÑÐ¾Ð´Ñ Ð² ÑÐ¸ÑÑÐµÐ¼Ñ.", IDC_STATIC, 16, 88, 210, 20 + LTEXT "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐ°Ð±Ð¾ÑÐµÐ³Ð¾ ÑÑÐ¾Ð»Ð°, Ð¾ÑÐ½Ð¾ÑÑÑÐ¸ÐµÑÑ ÐºÐ¾ Ð²ÑÐ¾Ð´Ñ Ð² ÑÐ¸ÑÑÐµÐ¼Ñ", IDC_STATIC, 16, 88, 210, 20 PUSHBUTTON "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ", IDC_USERPROFILE, 194, 103, 50, 15 GROUPBOX "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¸ Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ", IDC_STATIC, 6, 131, 244, 52 - LTEXT "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¸ Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐ¸ÑÑÐµÐ¼Ñ, Ð¾ÑÐ»Ð°Ð´Ð¾ÑÐ½Ð°Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ.", IDC_STATIC, 16, 144, 210, 20 + LTEXT "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¸ Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐ¸ÑÑÐµÐ¼Ñ, Ð¾ÑÐ»Ð°Ð´Ð¾ÑÐ½Ð°Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ", IDC_STATIC, 16, 144, 210, 20 PUSHBUTTON "&ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ", IDC_STAREC, 194, 162, 50, 15 PUSHBUTTON "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¸ÑÑÐµÐ¼Ñ", IDC_SYSSETTINGS, 6, 192, 80, 15 - PUSHBUTTON "Ð&ÐµÑÐµÐ¼ÐµÐ½Ð½ÑÐµ ÑÑÐµÐ´Ñ", IDC_ENVVAR, 88, 192, 80, 15 + PUSHBUTTON "Ð&ÐµÑÐµÐ¼ÐµÐ½Ð½ÑÐµ ÑÑÐµÐ´Ñ...", IDC_ENVVAR, 88, 192, 80, 15 PUSHBUTTON "ÐÑÑÐµÑ Ð¾Ð± Ð¾ÑÐ¸Ð±ÐºÐ°Ñ", IDC_ERRORREPORT, 170, 192, 80, 15 END

1 0

[dreimer] 71067: [RAPPS] Database Update... incl. SHA1 hashes. Appreciate it! This took 5 hrs thx to the stupid and USELESS hashes!
by dreimer＠svn.reactos.org 28 Mar '16

28 Mar '16

Author: dreimer Date: Mon Mar 28 18:26:24 2016 New Revision: 71067 URL: http://svn.reactos.org/svn/reactos?rev=71067&view=rev Log: [RAPPS] Database Update... incl. SHA1 hashes. Appreciate it! This took 5 hrs thx to the stupid and USELESS hashes! Added: trunk/reactos/media/rapps/efsearch.txt - copied unchanged from r71066, trunk/reactos/media/rapps/efserch.txt trunk/reactos/media/rapps/libreofficestill.txt (with props) Removed: trunk/reactos/media/rapps/codeblocks_gcc_2.txt trunk/reactos/media/rapps/efserch.txt trunk/reactos/media/rapps/seamonkey.txt Modified: trunk/reactos/media/rapps/7zip.txt trunk/reactos/media/rapps/agatemulator.txt trunk/reactos/media/rapps/air.txt trunk/reactos/media/rapps/akelpad.txt trunk/reactos/media/rapps/audacity.txt trunk/reactos/media/rapps/bittorrent.txt trunk/reactos/media/rapps/burnawarefree.txt trunk/reactos/media/rapps/ccleaner.txt trunk/reactos/media/rapps/codeblocks.txt trunk/reactos/media/rapps/codeblocks_gcc.txt trunk/reactos/media/rapps/doublecommander.txt trunk/reactos/media/rapps/fira.txt trunk/reactos/media/rapps/firefox.txt trunk/reactos/media/rapps/foxit.txt trunk/reactos/media/rapps/freebasic.txt trunk/reactos/media/rapps/ghostscript.txt trunk/reactos/media/rapps/gimp.txt trunk/reactos/media/rapps/gnucash.txt trunk/reactos/media/rapps/hiawatha.txt trunk/reactos/media/rapps/irfanview.txt trunk/reactos/media/rapps/irfanviewplugins.txt trunk/reactos/media/rapps/kindlepc.txt trunk/reactos/media/rapps/kmeleon.txt trunk/reactos/media/rapps/lazaruside.txt trunk/reactos/media/rapps/librecad.txt trunk/reactos/media/rapps/libreoffice.txt trunk/reactos/media/rapps/libreofficehelp.txt trunk/reactos/media/rapps/miktex.txt trunk/reactos/media/rapps/mirandaim.txt trunk/reactos/media/rapps/mirc.txt trunk/reactos/media/rapps/mono2.txt trunk/reactos/media/rapps/mpc.txt trunk/reactos/media/rapps/nginx.txt trunk/reactos/media/rapps/nirlauncher.txt trunk/reactos/media/rapps/npp.txt trunk/reactos/media/rapps/openoffice.txt trunk/reactos/media/rapps/openttd.txt trunk/reactos/media/rapps/opera.txt trunk/reactos/media/rapps/pdfsam.txt trunk/reactos/media/rapps/peazip.txt trunk/reactos/media/rapps/pidgin.txt trunk/reactos/media/rapps/putty.txt trunk/reactos/media/rapps/python.txt trunk/reactos/media/rapps/qmmp.txt trunk/reactos/media/rapps/scite.txt trunk/reactos/media/rapps/scribus.txt trunk/reactos/media/rapps/scummvm.txt trunk/reactos/media/rapps/smplayer.txt trunk/reactos/media/rapps/steam.txt trunk/reactos/media/rapps/sumatrapdf.txt trunk/reactos/media/rapps/thunderbird.txt trunk/reactos/media/rapps/tileworld.txt trunk/reactos/media/rapps/totalcommander.txt trunk/reactos/media/rapps/ultravnc.txt trunk/reactos/media/rapps/vlc.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/7zip.txt?rev=7… Modified: trunk/reactos/media/rapps/agatemulator.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/agatemulator.t… Modified: trunk/reactos/media/rapps/air.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/air.txt?rev=71… Modified: trunk/reactos/media/rapps/akelpad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/akelpad.txt?re… Modified: trunk/reactos/media/rapps/audacity.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/audacity.txt?r… Modified: trunk/reactos/media/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/bittorrent.txt… Modified: trunk/reactos/media/rapps/burnawarefree.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/burnawarefree.… Modified: trunk/reactos/media/rapps/ccleaner.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ccleaner.txt?r… Modified: trunk/reactos/media/rapps/codeblocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks.txt… Modified: trunk/reactos/media/rapps/codeblocks_gcc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks_gcc… Removed: trunk/reactos/media/rapps/codeblocks_gcc_2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks_gcc… Modified: trunk/reactos/media/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/doublecommande… Removed: trunk/reactos/media/rapps/efserch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/efserch.txt?re… Modified: trunk/reactos/media/rapps/fira.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/fira.txt?rev=7… Modified: trunk/reactos/media/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/firefox.txt?re… Modified: trunk/reactos/media/rapps/foxit.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/foxit.txt?rev=… Modified: trunk/reactos/media/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/freebasic.txt?… Modified: trunk/reactos/media/rapps/ghostscript.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ghostscript.tx… Modified: trunk/reactos/media/rapps/gimp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gimp.txt?rev=7… Modified: trunk/reactos/media/rapps/gnucash.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gnucash.txt?re… Modified: trunk/reactos/media/rapps/hiawatha.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hiawatha.txt?r… Modified: trunk/reactos/media/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/irfanview.txt?… Modified: trunk/reactos/media/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/irfanviewplugi… Modified: trunk/reactos/media/rapps/kindlepc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kindlepc.txt?r… Modified: trunk/reactos/media/rapps/kmeleon.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kmeleon.txt?re… Modified: trunk/reactos/media/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lazaruside.txt… Modified: trunk/reactos/media/rapps/librecad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/librecad.txt?r… Modified: trunk/reactos/media/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreoffice.tx… Modified: trunk/reactos/media/rapps/libreofficehelp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreofficehel… Added: trunk/reactos/media/rapps/libreofficestill.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreofficesti… Modified: trunk/reactos/media/rapps/miktex.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/miktex.txt?rev… Modified: trunk/reactos/media/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mirandaim.txt?… Modified: trunk/reactos/media/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mirc.txt?rev=7… Modified: trunk/reactos/media/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mono2.txt?rev=… Modified: trunk/reactos/media/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mpc.txt?rev=71… Modified: trunk/reactos/media/rapps/nginx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nginx.txt?rev=… Modified: trunk/reactos/media/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nirlauncher.tx… Modified: trunk/reactos/media/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/npp.txt?rev=71… Modified: trunk/reactos/media/rapps/openoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/openoffice.txt… Modified: trunk/reactos/media/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/openttd.txt?re… Modified: trunk/reactos/media/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/opera.txt?rev=… Modified: trunk/reactos/media/rapps/pdfsam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pdfsam.txt?rev… Modified: trunk/reactos/media/rapps/peazip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/peazip.txt?rev… Modified: trunk/reactos/media/rapps/pidgin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pidgin.txt?rev… Modified: trunk/reactos/media/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/putty.txt?rev=… Modified: trunk/reactos/media/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/python.txt?rev… Modified: trunk/reactos/media/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/qmmp.txt?rev=7… Modified: trunk/reactos/media/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scite.txt?rev=… Modified: trunk/reactos/media/rapps/scribus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scribus.txt?re… Modified: trunk/reactos/media/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scummvm.txt?re… Removed: trunk/reactos/media/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/seamonkey.txt?… Modified: trunk/reactos/media/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/smplayer.txt?r… Modified: trunk/reactos/media/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/steam.txt?rev=… Modified: trunk/reactos/media/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sumatrapdf.txt… Modified: trunk/reactos/media/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/thunderbird.tx… Modified: trunk/reactos/media/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tileworld.txt?… Modified: trunk/reactos/media/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/totalcommander… Modified: trunk/reactos/media/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ultravnc.txt?r… Modified: trunk/reactos/media/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vlc.txt?rev=71…

1 0

[tkreuzer] 71066: [CMAKE/MSVC] Enable function level linking and comdat folding independent from build type. This reduces freeldr size and allows to build with /RTC1 again. Since GCC doesn't suppor...
by tkreuzer＠svn.reactos.org 28 Mar '16

28 Mar '16

Author: tkreuzer Date: Mon Mar 28 16:38:26 2016 New Revision: 71066 URL: http://svn.reactos.org/svn/reactos?rev=71066&view=rev Log: [CMAKE/MSVC] Enable function level linking and comdat folding independent from build type. This reduces freeldr size and allows to build with /RTC1 again. Since GCC doesn't support function level linking, cmlib should be refactored by moving some functions into different source files to avoid linking unused code into freeldr. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=71066… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Mon Mar 28 16:38:26 2016 @@ -6,7 +6,6 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_flags("/Ox /Ob2 /Ot /Oy /GT /GF") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:ICF") elseif(OPTIMIZE STREQUAL "1") add_definitions(/O1) elseif(OPTIMIZE STREQUAL "2") @@ -18,6 +17,11 @@ elseif(OPTIMIZE STREQUAL "5") add_definitions(/GF /Gy /Ob2 /Os /Ox /GS-) endif() + +# Enable function level linking and comdat folding +add_compile_flags("/Gy") +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:ICF") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF") if(ARCH STREQUAL "i386") add_definitions(/DWIN32 /D_WINDOWS)

1 0

[tkreuzer] 71065: {SPEC2DEF] Allow forwarders to contain ordinals (xydll.#123)
by tkreuzer＠svn.reactos.org 28 Mar '16

28 Mar '16

Author: tkreuzer Date: Mon Mar 28 16:31:32 2016 New Revision: 71065 URL: http://svn.reactos.org/svn/reactos?rev=71065&view=rev Log: {SPEC2DEF] Allow forwarders to contain ordinals (xydll.#123) Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Mon Mar 28 16:31:32 2016 @@ -116,7 +116,7 @@ int IsSeparator(char chr) { - return ((chr <= ',' && chr != '$') || + return ((chr <= ',' && chr != '$' && chr != '#') || (chr >= ':' && chr < '?') ); }

1 0

[tfaber] 71064: [SHELL32_APITEST] - Add tests for IShellFolder::CompareIDs. Patch by Mark Jansen, with additional test cases by Sylvain Deverre. CORE-10747
by tfaber＠svn.reactos.org 28 Mar '16

28 Mar '16

Author: tfaber Date: Mon Mar 28 15:35:21 2016 New Revision: 71064 URL: http://svn.reactos.org/svn/reactos?rev=71064&view=rev Log: [SHELL32_APITEST] - Add tests for IShellFolder::CompareIDs. Patch by Mark Jansen, with additional test cases by Sylvain Deverre. CORE-10747 Added: trunk/rostests/apitests/shell32/shelltest.cpp (with props) Modified: trunk/rostests/apitests/shell32/CMakeLists.txt trunk/rostests/apitests/shell32/CShellDesktop.cpp trunk/rostests/apitests/shell32/shelltest.h Modified: trunk/rostests/apitests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CMakeLis… ============================================================================== --- trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] Mon Mar 28 15:35:21 2016 @@ -7,8 +7,9 @@ CMyComputer.cpp CShellDesktop.cpp menu.cpp + shelltest.cpp testlist.c) -target_link_libraries(shell32_apitest wine uuid) +target_link_libraries(shell32_apitest wine uuid ${PSEH_LIB}) set_module_type(shell32_apitest win32cui) -add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 shlwapi msvcrt kernel32) +add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET shell32_apitest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/apitests/shell32/CShellDesktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CShellDe… ============================================================================== --- trunk/rostests/apitests/shell32/CShellDesktop.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CShellDesktop.cpp [iso-8859-1] Mon Mar 28 15:35:21 2016 @@ -3,16 +3,151 @@ * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory * PURPOSE: Test for CShellDesktop * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * Mark Jansen */ #include "shelltest.h" #include <atlbase.h> #include <atlcom.h> #include <strsafe.h> +#include <ndk/rtlfuncs.h> #define NDEBUG #include <debug.h> #include <shellutils.h> + + +// We would normally use S_LESSTHAN and S_GREATERTHAN, but w2k3 returns numbers like 3 and -3... +// So instead we check on the sign bit (compare result is the low word of the hresult). +#define SHORT_SIGN_BIT 0x8000 + +static +VOID +compare_imp(IShellFolder* psf, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2, HRESULT expected) +{ + HRESULT hr; + _SEH2_TRY + { + hr = psf->CompareIDs(0, pidl1, pidl2); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + winetest_ok(0, "Exception %lx!\n", _SEH2_GetExceptionCode()); + hr = HRESULT_FROM_WIN32(RtlNtStatusToDosError(_SEH2_GetExceptionCode())); + } + _SEH2_END; + if (expected == S_LESSTHAN) + winetest_ok(SUCCEEDED(hr) && (hr & SHORT_SIGN_BIT), "hr = %lx\n", hr); + else if (expected == S_EQUAL) + winetest_ok(hr == S_EQUAL, "hr = %lx\n", hr); + else if (expected == S_GREATERTHAN) + winetest_ok(SUCCEEDED(hr) && !(hr & SHORT_SIGN_BIT), "hr = %lx\n", hr); + else + winetest_ok(hr == expected, "hr = %lx\n", hr); +} + +// make the winetest_ok look like it came from the line where the compare function was called, and not from inside the compare_imp function :) +#define compare (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : compare_imp + +static +VOID +TestCompareIDList(IShellFolder* psf) +{ + compare(psf, NULL, NULL, E_INVALIDARG); + + CComHeapPtr<ITEMIDLIST> desktop; + HRESULT hr = SHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, NULL, &desktop); + ok(hr == S_OK, "hr = %lx\n", hr); + compare(psf, desktop, NULL, E_INVALIDARG); + compare(psf, NULL, desktop, E_INVALIDARG); + compare(psf, desktop, desktop, S_EQUAL); + + // First check the ordering of some special folders against eachother + CComHeapPtr<ITEMIDLIST> internet; + hr = SHGetFolderLocation(NULL, CSIDL_INTERNET, NULL, NULL, &internet); + ok(hr == S_OK, "hr = %lx\n", hr); + compare(psf, internet, desktop, S_LESSTHAN); + compare(psf, desktop, internet, S_GREATERTHAN); + + CComHeapPtr<ITEMIDLIST> programs; + hr = SHGetFolderLocation(NULL, CSIDL_PROGRAMS, NULL, NULL, &programs); + ok(hr == S_OK, "hr = %lx\n", hr); + compare(psf, programs, desktop, S_LESSTHAN); + compare(psf, desktop, programs, S_GREATERTHAN); + compare(psf, internet, programs, S_GREATERTHAN); + compare(psf, programs, internet, S_LESSTHAN); + + // Verify that an idlist retrieved from GetCurFolder is equal to the original one. + CComPtr<IPersistFolder2> persist; + hr = psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &persist)); + ok(hr == S_OK, "hr = %lx\n", hr); + if (hr == S_OK) + { + CComHeapPtr<ITEMIDLIST> cur; + hr = persist->GetCurFolder(&cur); + ok(hr == S_OK, "hr = %lx\n", hr); + compare(psf, cur, desktop, S_EQUAL); + compare(psf, desktop, cur, S_EQUAL); + } + + // Compare special folders against full paths + CComHeapPtr<ITEMIDLIST> dir1, dir2; + PathToIDList(L"A:\\AAA.AAA", &dir1); + PathToIDList(L"A:\\ZZZ.ZZZ", &dir2); + + compare(psf, dir1, desktop, S_LESSTHAN); + compare(psf, desktop, dir1, S_GREATERTHAN); + compare(psf, dir1, programs, S_LESSTHAN); + compare(psf, programs, dir1, S_GREATERTHAN); + compare(psf, dir1, dir1, S_EQUAL); + + compare(psf, dir2, desktop, S_LESSTHAN); + compare(psf, desktop, dir2, S_GREATERTHAN); + compare(psf, dir2, programs, S_LESSTHAN); + compare(psf, programs, dir2, S_GREATERTHAN); + compare(psf, dir2, dir2, S_EQUAL); + + CComHeapPtr<ITEMIDLIST> dir3, dir4; + PathToIDList(L"Z:\\AAA.AAA", &dir3); + PathToIDList(L"Z:\\ZZZ.ZZZ", &dir4); + + compare(psf, dir3, desktop, S_LESSTHAN); + compare(psf, desktop, dir3, S_GREATERTHAN); + compare(psf, dir3, programs, S_GREATERTHAN); + compare(psf, programs, dir3, S_LESSTHAN); + compare(psf, dir3, dir3, S_EQUAL); + + compare(psf, dir4, desktop, S_LESSTHAN); + compare(psf, desktop, dir4, S_GREATERTHAN); + compare(psf, dir4, programs, S_GREATERTHAN); + compare(psf, programs, dir4, S_LESSTHAN); + compare(psf, dir4, dir4, S_EQUAL); + + // Now compare the paths against eachother. + compare(psf, dir1, dir2, S_LESSTHAN); + compare(psf, dir2, dir1, S_GREATERTHAN); + + compare(psf, dir2, dir3, S_LESSTHAN); + compare(psf, dir3, dir2, S_GREATERTHAN); + + compare(psf, dir3, dir4, S_LESSTHAN); + compare(psf, dir4, dir3, S_GREATERTHAN); + + // Check that comparing desktop pidl with another one with another IShellFolder fails + CComPtr<IShellFolder> psf2; + hr = psf->BindToObject(programs, NULL, IID_IShellFolder, reinterpret_cast<void**>(&psf2)); + ok(hr == S_OK, "Impossible to bind to Programs pidl"); + if (hr == S_OK) + { + // Compare desktop pidl in programs scope should fail since it's relative pidl + compare(psf2, desktop, programs, E_INVALIDARG); + compare(psf2, programs, desktop, E_INVALIDARG); + // For the same reasons, filesystem paths can't be compared with special shell + // folders that don't have CFSFolder in children + compare(psf2, dir1, dir2, E_INVALIDARG); + compare(psf2, dir2, dir1, E_INVALIDARG); + } +} static VOID @@ -83,4 +218,5 @@ ok(psf == static_cast<IShellFolder *>(psf2), "Expected %p == %p\n", static_cast<PVOID>(psf), static_cast<PVOID>(psf2)); TestShellFolder(psf2); -} + TestCompareIDList(psf); +} Added: trunk/rostests/apitests/shell32/shelltest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/shelltes… ============================================================================== --- trunk/rostests/apitests/shell32/shelltest.cpp (added) +++ trunk/rostests/apitests/shell32/shelltest.cpp [iso-8859-1] Mon Mar 28 15:35:21 2016 @@ -0,0 +1,98 @@ +#include "shelltest.h" +#include <atlbase.h> +#include <atlcom.h> + + +// + Adapted from https://blogs.msdn.microsoft.com/oldnewthing/20130503-00/?p=4463/ +// In short: We want to create an IDLIST from an item that does not exist, +// so we have to provide WIN32_FIND_DATAW in a bind context. +// If we don't, the FS will be queried, and we do not get a valid IDLIST for a non-existing path. + +CComModule gModule; + +class CFileSysBindData : + public CComCoClass<CFileSysBindData>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IFileSystemBindData +{ +public: + virtual HRESULT STDMETHODCALLTYPE SetFindData(const WIN32_FIND_DATAW *pfd) + { + m_Data = *pfd; + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE GetFindData(WIN32_FIND_DATAW *pfd) + { + *pfd = m_Data; + return S_OK; + } + + DECLARE_NOT_AGGREGATABLE(CFileSysBindData) + DECLARE_PROTECT_FINAL_CONSTRUCT() + BEGIN_COM_MAP(CFileSysBindData) + COM_INTERFACE_ENTRY_IID(IID_IFileSystemBindData, IFileSystemBindData) + END_COM_MAP() +private: + WIN32_FIND_DATAW m_Data; +}; + +static +HRESULT +AddFileSysBindCtx(_In_ IBindCtx *pbc) +{ + CComPtr<IFileSystemBindData> spfsbc(new CComObject<CFileSysBindData>()); + WIN32_FIND_DATAW wfd = { 0 }; + wfd.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; + spfsbc->SetFindData(&wfd); + HRESULT hr = pbc->RegisterObjectParam((LPOLESTR)STR_FILE_SYS_BIND_DATA, spfsbc); + ok(hr == S_OK, "hr = %lx\n", hr); + return hr; +} + +static +HRESULT +CreateBindCtxWithOpts(_In_ BIND_OPTS *pbo, _Outptr_ IBindCtx **ppbc) +{ + CComPtr<IBindCtx> spbc; + HRESULT hr = CreateBindCtx(0, &spbc); + ok(hr == S_OK, "hr = %lx\n", hr); + if (SUCCEEDED(hr)) + { + hr = spbc->SetBindOptions(pbo); + ok(hr == S_OK, "hr = %lx\n", hr); + } + *ppbc = SUCCEEDED(hr) ? spbc.Detach() : NULL; + return hr; +} + +static HRESULT +CreateFileSysBindCtx(_Outptr_ IBindCtx **ppbc) +{ + CComPtr<IBindCtx> spbc; + BIND_OPTS bo = { sizeof(bo), 0, STGM_CREATE, 0 }; + HRESULT hr = CreateBindCtxWithOpts(&bo, &spbc); + ok(hr == S_OK, "hr = %lx\n", hr); + if (SUCCEEDED(hr)) + { + hr = AddFileSysBindCtx(spbc); + ok(hr == S_OK, "hr = %lx\n", hr); + } + *ppbc = SUCCEEDED(hr) ? spbc.Detach() : NULL; + return hr; +} + +VOID +PathToIDList(LPCWSTR pszPath, ITEMIDLIST** ppidl) +{ + CComPtr<IBindCtx> spbc; + HRESULT hr = CreateFileSysBindCtx(&spbc); + ok(hr == S_OK, "hr = %lx\n", hr); + if (SUCCEEDED(hr)) + { + hr = SHParseDisplayName(pszPath, spbc, ppidl, 0, NULL); + ok(hr == S_OK, "hr = %lx\n", hr); + } +} + +// - Adapted from https://blogs.msdn.microsoft.com/oldnewthing/20130503-00/?p=4463/ Propchange: trunk/rostests/apitests/shell32/shelltest.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/shell32/shelltest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/shelltes… ============================================================================== --- trunk/rostests/apitests/shell32/shelltest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/shelltest.h [iso-8859-1] Mon Mar 28 15:35:21 2016 @@ -28,3 +28,5 @@ DEFINE_GUID(CLSID_MenuBandSite, 0xE13EF4E4, 0xD2F2, 0x11D0, 0x98, 0x16, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72); #include "unknownbase.h" + +VOID PathToIDList(LPCWSTR pszPath, ITEMIDLIST** ppidl);

1 0

[tfaber] 71063: [USER32] - Fix is_dib_monochrome for bitmaps using BITMAPCOREINFO. Patch by Mark Jansen. CORE-10889
by tfaber＠svn.reactos.org 28 Mar '16

28 Mar '16

Author: tfaber Date: Mon Mar 28 14:58:20 2016 New Revision: 71063 URL: http://svn.reactos.org/svn/reactos?rev=71063&view=rev Log: [USER32] - Fix is_dib_monochrome for bitmaps using BITMAPCOREINFO. Patch by Mark Jansen. CORE-10889 Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] Mon Mar 28 14:58:20 2016 @@ -117,11 +117,11 @@ static BOOL is_dib_monochrome( const BITMAPINFO* info ) { - if (info->bmiHeader.biBitCount != 1) return FALSE; - if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { const RGBTRIPLE *rgb = ((const BITMAPCOREINFO*)info)->bmciColors; + + if (((const BITMAPCOREINFO*)info)->bmciHeader.bcBitCount != 1) return FALSE; /* Check if the first color is black */ if ((rgb->rgbtRed == 0) && (rgb->rgbtGreen == 0) && (rgb->rgbtBlue == 0)) @@ -137,6 +137,8 @@ else /* assume BITMAPINFOHEADER */ { const RGBQUAD *rgb = info->bmiColors; + + if (info->bmiHeader.biBitCount != 1) return FALSE; /* Check if the first color is black */ if ((rgb->rgbRed == 0) && (rgb->rgbGreen == 0) &&

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