Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[dreimer] 68735: [DEVMGMT] Add german translation. -1 @ ROS Translation tool missing files ^^

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Aug 17 12:48:37 2015 New Revision: 68735 URL: http://svn.reactos.org/svn/reactos?rev=68735&view=rev Log: [DEVMGMT] Add german translation. -1 @ ROS Translation tool missing files ^^ Added: trunk/reactos/dll/win32/devmgr/devmgmt/lang/de-DE.rc (with props) Added: trunk/reactos/dll/win32/devmgr/devmgmt/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/l… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/lang/de-DE.rc (added) +++ trunk/reactos/dll/win32/devmgr/devmgmt/lang/de-DE.rc [iso-8859-1] Mon Aug 17 12:48:37 2015 @@ -0,0 +1,78 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDR_MAINMENU MENU +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Beenden", IDC_EXIT + END + MENUITEM "Ak&tion" IDC_ACTIONMENU + POPUP "&Ansicht" + BEGIN + MENUITEM "GerÃ¤te nach &Typ", IDC_DEVBYTYPE + MENUITEM "GerÃ¤te nach &Verbindung", IDC_DEVBYCONN + MENUITEM "Ressourcen nac&h Typ", IDC_RESBYTYPE, GRAYED + MENUITEM "Ressourcen nach V&erbindung", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Ausgeblendete &GerÃ¤te anzeigen", IDC_SHOWHIDDEN + END + POPUP "&Hilfe" + BEGIN + MENUITEM "&Ãber", IDC_ABOUT + END +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONFIRM_DISABLE "Wenn Sie dieses GerÃ¤t deaktivieren, funktioniert es nicht mehr.\r\nSoll das GerÃ¤t deaktiviert werden?" +END +STRINGTABLE DISCARDABLE +BEGIN + IDS_MENU_UPDATE "Treiber aktualisieren" + IDS_MENU_ENABLE "Aktivieren" + IDS_MENU_DISABLE "Deaktivieren" + IDS_MENU_UNINSTALL "Deinstallieren" + IDS_MENU_SCAN "Nach geÃ¤nderter Hardware suchen" + IDS_MENU_ADD "Hardware hinzufÃ¼gen" + IDS_MENU_PROPERTIES "Eigenschaften" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROPERTIES "Eigenschaften" + IDS_TOOLTIP_SCAN "Nach geÃ¤nderter Hardware suchen" + IDS_TOOLTIP_ENABLE "Aktivieren" + IDS_TOOLTIP_DISABLE "Deaktivieren" + IDS_TOOLTIP_UPDATE "Treiber aktualisieren" + IDS_TOOLTIP_UNINSTALL "Deinstallieren" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS GerÃ¤temanager" + IDS_HINT_BLANK " " + IDS_HINT_PROPERTIES " Ãffnet die Eigenschaften des aktuellen Objekts." + IDS_HINT_SCAN " Nach geÃ¤nderten oder neuen Plug & Play-GerÃ¤ten suchen." + IDS_HINT_ENABLE " Aktiviert das ausgewÃ¤hlte GerÃ¤t." + IDS_HINT_DISABLE " Deaktiviert das ausgewÃ¤hlte GerÃ¤t." + IDS_HINT_UPDATE " Startet den Hardwareupdate-Assistent fÃ¼r das ausgewÃ¤hlte GerÃ¤t." + IDS_HINT_UNINSTALL " Deinstalliert den Treiber des ausgewÃ¤hlten GerÃ¤ts." + IDS_HINT_ADD " FÃ¼gt ein Ã¤lteres (nicht Plug and Play) GerÃ¤t dem Computer hinzu." + IDS_HINT_ABOUT " Ãber ReactOS GerÃ¤temanager." + IDS_HINT_EXIT " SchlieÃt dieses Programm." + + IDS_HINT_DEV_BY_TYPE " GerÃ¤te werden nach Hardwaretyp angezeigt." + IDS_HINT_DEV_BY_CONN " GerÃ¤te werden nach Verbindung angezeigt." + IDS_HINT_RES_BY_TYPE " Ressourcen werden nach Typ angezeigt." + IDS_HINT_RES_BY_CONN " Ressourcen werden nach Verbindung angezeigt." + IDS_HINT_SHOW_HIDDEN " Ãltere GerÃ¤te und bereits nicht mehr installierte GerÃ¤te werden angezeigt." + + IDS_HINT_SYS_RESTORE " Stellt die normale GrÃ¶Ãe des Fensters wieder her." + IDS_HINT_SYS_MOVE " Bewegt dieses Fenster." + IDS_HINT_SYS_SIZE " Ãndert die GrÃ¶Ãe dieses Fensters." + IDS_HINT_SYS_MINIMIZE " Mimimiert dieses Fenster zu einem Symbol." + IDS_HINT_SYS_MAXIMIZE " Erweitert dieses Fenster, um den Bildschirm zu fÃ¼llen." + IDS_HINT_SYS_CLOSE " SchlieÃt dieses Fenster." +END Propchange: trunk/reactos/dll/win32/devmgr/devmgmt/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 4 months

[dreimer] 68734: [TRANSLATION] Updating Turkish Translations by Erdem Ersoy CORE-9993 #resolve #comment Committed, thx. ^^

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Aug 17 12:05:10 2015 New Revision: 68734 URL: http://svn.reactos.org/svn/reactos?rev=68734&view=rev Log: [TRANSLATION] Updating Turkish Translations by Erdem Ersoy CORE-9993 #resolve #comment Committed, thx. ^^ Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/media/rapps/cstalin.txt trunk/reactos/media/rapps/mkvtoolnix.txt trunk/reactos/media/rapps/scratch.txt trunk/reactos/media/rapps/scribus.txt trunk/reactos/media/rapps/ultraiso.txt trunk/reactos/media/rapps/watercolor.txt trunk/reactos/media/rapps/windirstat.txt trunk/reactos/media/rapps/winmerge.txt trunk/reactos/media/rapps/winspypp.txt Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Mon Aug 17 12:05:10 2015 @@ -823,85 +823,79 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Kur'a dizge blmn silmeyi sordunuz.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "Dizge blmleri; tanlama izlenceleri, donanm yaplandrma", TEXT_STYLE_NORMAL }, { 6, 11, - "programs, programs to start an operating system (like ReactOS) or other", + "izlenceleri, ReactOS gibi bir iletim dizgesini balatmak iin izlenceler", TEXT_STYLE_NORMAL }, { 6, 12, - "programs provided by the hardware manufacturer.", + "vey donanm reticisi eliyle sa§lanan baka izlenceler ierebilir.", TEXT_STYLE_NORMAL }, { 6, 14, - "Delete a system partition only when you are sure that there are no such", + "Yalnzca blmde byle izlencelerin olmad§ndan emin oldu§unuzda ya da", TEXT_STYLE_NORMAL }, { 6, 15, - "programs on the partiton, or when you are sure you want to delete them.", + "onlar silmek istedi§inizden emin oldu§unuzda bir dizge blmn siliniz.", TEXT_STYLE_NORMAL }, { 6, 16, - "When you delete the partition, you might not be able to boot the", + "Blm sildi§inizde ReactOS Kur'u bitirene dek bilgisayar sbit diskten", TEXT_STYLE_NORMAL }, { 6, 17, - "computer from the harddisk until you finished the ReactOS Setup.", + "n ykleyemeyebilirsiniz.", TEXT_STYLE_NORMAL }, { 8, 20, - "\x07 Press ENTER to delete the system partition. You will be asked", + "\x07 Dizge blmn silmek iin Giri'e basnz.", TEXT_STYLE_NORMAL }, { 8, 21, - " to confirm the deletion of the partition again later.", + "Sonra blm silmeyi onaylamak iin yeniden sorulacaksnz.", TEXT_STYLE_NORMAL }, { 8, 24, - "\x07 Press ESC to return to the previous page. The partition will", - TEXT_STYLE_NORMAL - }, - { - 8, - 25, - " not be deleted.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER=Continue ESC=Cancel", + "\x07 Bir nceki sayfaya dnmek iin k'a basnz. Blm silinmeyecek.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Giri = Srdr k = ptal", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { Modified: trunk/reactos/media/rapps/cstalin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/cstalin.txt?re… ============================================================================== --- trunk/reactos/media/rapps/cstalin.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/cstalin.txt [iso-8859-1] Mon Aug 17 12:05:10 2015 @@ -15,3 +15,6 @@ [Section.0419] Description = "ÑÐ¾Ð²ÐµÑÑÐºÐ°Ñ" ÑÑÑÐ°ÑÐµÐ³Ð¸Ñ ÑÐµÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ Ð²ÑÐµÐ¼ÐµÐ½Ð¸ Ð¾ÑÐ½Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð½Ð° Boswars. (Ð°ÑÑÐ¸Ð²) + +[Section.041f] +Description = Boswars tabanlÄ± bir "Sovyet" gerÃ§ek zamanlÄ± izlem (RTS) oyunu. (belgelik) Modified: trunk/reactos/media/rapps/mkvtoolnix.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mkvtoolnix.txt… ============================================================================== --- trunk/reactos/media/rapps/mkvtoolnix.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/mkvtoolnix.txt [iso-8859-1] Mon Aug 17 12:05:10 2015 @@ -15,3 +15,7 @@ [Section.0419] Description = ÐÐ°Ð±Ð¾Ñ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð² Ð´Ð»Ñ ÑÐ°Ð±Ð¾ÑÑ Ñ ÑÐ°Ð¹Ð»Ð°Ð¼Ð¸ ÑÐ¾ÑÐ¼Ð°ÑÐ° mkv. + +[Section.041f] +Description = MKV biÃ§iminde kÃ¼tÃ¼klerle Ã§alÄ±Åma iÃ§in araÃ§ takÄ±mÄ±. +Size = 5,3 MB Modified: trunk/reactos/media/rapps/scratch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scratch.txt?re… ============================================================================== --- trunk/reactos/media/rapps/scratch.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/scratch.txt [iso-8859-1] Mon Aug 17 12:05:10 2015 @@ -15,3 +15,7 @@ [Section.0419] Description = ÐÐ¸Ð·ÑÐ°Ð»ÑÐ½Ð°Ñ Ð¾Ð±ÑÐµÐºÑÐ½Ð¾-Ð¾ÑÐ¸ÐµÐ½ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð°Ñ ÑÑÐµÐ´Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ð´ÐµÑÐµÐ¹. + +[Section.041f] +Description = Ãocuklar iÃ§in gÃ¶rmelik nesneye yÃ¶nelik izlenceleme ortamÄ±. +Size = 33,0 MB Modified: trunk/reactos/media/rapps/scribus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scribus.txt?re… ============================================================================== --- trunk/reactos/media/rapps/scribus.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/scribus.txt [iso-8859-1] Mon Aug 17 12:05:10 2015 @@ -1,5 +1,6 @@ ; UTF-8 ; Translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Scribus @@ -48,7 +49,8 @@ Description = Open-source program, ktorÃ½ prinÃ¡Å¡a profesionÃ¡lnej strÃ¡nke rozloÅ¾enie na ReactOS. [Section.041f] -Description = Profesyonel sayfa dÃ¼zeni getiriyor ReactOS iÃ§in aÃ§Ä±k kaynak programÄ±. +License = GPL sÃ¼rÃ¼m 2 +Description = ReactOS'a profesyonel sayfa dÃ¼zenlemesi getiren bir aÃ§Ä±k kaynak izlence. Size = 76,52 MB [Section.0422] Modified: trunk/reactos/media/rapps/ultraiso.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ultraiso.txt?r… ============================================================================== --- trunk/reactos/media/rapps/ultraiso.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/ultraiso.txt [iso-8859-1] Mon Aug 17 12:05:10 2015 @@ -20,4 +20,4 @@ [Section.0804] License = è¯ç¨çæ¬ -Description = UltraISO æ¯ä¸ç§ ISO CD/DVD å¾åæä»¶åå»º/ç¼è¾/è½¬æ¢å·¥å·åä¸ä¸ªå¯å¯å¨ç CD/DVD å¶é åï¼å®å¯ä»¥ç´æ¥ç¼è¾ç CD/DVD å¾åæä»¶åæåçæä»¶åæä»¶å¤¹ï¼ä»¥åç´æ¥ä»æ¨ç CD ç DVD-ROM æç¡¬çä½¿ ISO æä»¶ã +Description = UltraISO æ¯ä¸ç§ ISO CD/DVD å¾åæä»¶åå»º/ç¼è¾/è½¬æ¢å·¥å·åä¸ä¸ªå¯å¯å¨ç CD/DVD å¶é åï¼å®å¯ä»¥ç´æ¥ç¼è¾ç CD/DVD å¾åæä»¶åæåçæä»¶åæä»¶å¤¹ï¼ä»¥åç´æ¥ä»æ¨ç CD ç DVD-ROM æç¡¬çä½¿ ISO æä»¶ã Modified: trunk/reactos/media/rapps/watercolor.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/watercolor.txt… ============================================================================== --- trunk/reactos/media/rapps/watercolor.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/watercolor.txt [iso-8859-1] Mon Aug 17 12:05:10 2015 @@ -1,4 +1,5 @@ ; 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] @@ -15,5 +16,10 @@ [Section.0407] Description = Ein Windows Design basierend auf dem Aussehenvon Windows Codename Whistler. +[Section.041f] +License = Ãcretsiz +Description = Windows Codename Whistler gÃ¶rÃ¼nÃ¼mÃ¼ tabanlÄ± bir Windows temasÄ±. +Size = 861 KB + [Section.0804] -Description = åºäº Windows ä»£å· Whistler çå¤è§ç Windows ä¸»é¢ã +Description = åºäº Windows ä»£å· Whistler çå¤è§ç Windows ä¸»é¢ã Modified: trunk/reactos/media/rapps/windirstat.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/windirstat.txt… ============================================================================== --- trunk/reactos/media/rapps/windirstat.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/windirstat.txt [iso-8859-1] Mon Aug 17 12:05:10 2015 @@ -5,7 +5,7 @@ Version = 1.1.2 Licence = GPL Description = Program for analyzing disk usage and his cleanup. -Size = 631 KB +Size = 631 kB Category = 12 URLSite = http://windirstat.info/ URLDownload = https://download.sourceforge.net/project/windirstat/windirstat/1.1.2%20inst… @@ -15,3 +15,7 @@ [Section.0419] Description = ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° Ð´Ð»Ñ Ð°Ð½Ð°Ð»Ð¸Ð·Ð° Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÐ²Ð° Ð¸ ÐµÐ³Ð¾ Ð¾ÑÐ¸ÑÑÐºÐ¸. + +[Section.041f] +Description = Disk kullanÄ±mÄ±nÄ± Ã§Ã¶zÃ¼mleme ve silme iÃ§in izlence. +Size = 631 KB Modified: trunk/reactos/media/rapps/winmerge.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winmerge.txt?r… ============================================================================== --- trunk/reactos/media/rapps/winmerge.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/winmerge.txt [iso-8859-1] Mon Aug 17 12:05:10 2015 @@ -1,4 +1,5 @@ ; 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] @@ -15,5 +16,10 @@ [Section.0407] Description = Werkzeug zur grafischen Darstellung und ZusammenfÃ¼hren von Dateien und Ordnern. +[Section.041f] +License = GPL sÃ¼rÃ¼m 2 +Description = KÃ¼tÃ¼kler ve dizinler iÃ§in, gÃ¶rmelik ayrÄ±m gÃ¶rÃ¼ntÃ¼leme ve birleÅtirme iÃ§in bir araÃ§. +Size = 6,13 MB + [Section.0804] Description = è§è§ä¸çå·®å¼æ¾ç¤ºååå¹¶ã æä»¶åç®å½çå·¥å·ã Modified: trunk/reactos/media/rapps/winspypp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winspypp.txt?r… ============================================================================== --- trunk/reactos/media/rapps/winspypp.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/winspypp.txt [iso-8859-1] Mon Aug 17 12:05:10 2015 @@ -1,9 +1,12 @@ +; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + [Section] Name = Winspy++ Version = 1.7 License = Freeware Description = A handy programmer's utility which can be used to select and view the properties of any window in the system. A tool like 7-Zip is needed to extract it. -Size = 58.33 KB +Size = 58.33 kB Category = 7 URLSite = http://www.catch22.net/software/winspy-17 URLDownload = http://www.catch22.net/sites/default/files/WinSpy17.zip @@ -11,3 +14,8 @@ [Section.0407] Description = Ein nÃ¼tzliches Werkzeug fÃ¼r Programmierer, das verwendet werden kann, um die Eigenschaften jedes Fensters im System sehen zu kÃ¶nnen. Ein Werkzeug wie 7-Zip ist zum extrahieren notwendig. + +[Section.041f] +License = Ãcretsiz +Description = Dizgedeki bir pencerenin husÃ»siyetlerini gÃ¶rÃ¼ntÃ¼lemek ve seÃ§mek iÃ§in kullanÄ±labilecek bir usta izlencecinin aracÄ±. Onu Ã§Ä±kartmak iÃ§in 7-Zip gibi bir araÃ§ gereklidir. +Size = 58,33 KB

9 years, 4 months

[bfreisen] 68733: [MSPAINT_NEW] implement fullscreen view

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Mon Aug 17 12:03:39 2015 New Revision: 68733 URL: http://svn.reactos.org/svn/reactos?rev=68733&view=rev Log: [MSPAINT_NEW] implement fullscreen view Added: trunk/reactos/base/applications/mspaint_new/fullscreen.cpp (with props) trunk/reactos/base/applications/mspaint_new/fullscreen.h (with props) Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt trunk/reactos/base/applications/mspaint_new/globalvar.h trunk/reactos/base/applications/mspaint_new/main.cpp trunk/reactos/base/applications/mspaint_new/precomp.h trunk/reactos/base/applications/mspaint_new/winproc.cpp Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/CMakeLists.txt [iso-8859-1] Mon Aug 17 12:03:39 2015 @@ -8,6 +8,7 @@ dialogs.cpp dib.cpp drawing.cpp + fullscreen.cpp history.cpp imgarea.cpp main.cpp Added: trunk/reactos/base/applications/mspaint_new/fullscreen.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/fullscreen.cpp (added) +++ trunk/reactos/base/applications/mspaint_new/fullscreen.cpp [iso-8859-1] Mon Aug 17 12:03:39 2015 @@ -0,0 +1,61 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint_new/fullscreen.cpp + * PURPOSE: Window for fullscreen view + * PROGRAMMERS: Benedikt Freisen + */ + +/* INCLUDES *********************************************************/ + +#include "precomp.h" + +/* FUNCTIONS ********************************************************/ + +LRESULT CFullscreenWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + SendMessage(WM_SETICON, ICON_BIG, (LPARAM) LoadIcon(hProgInstance, MAKEINTRESOURCE(IDI_APPICON))); + SendMessage(WM_SETICON, ICON_SMALL, (LPARAM) LoadIcon(hProgInstance, MAKEINTRESOURCE(IDI_APPICON))); + return 0; +} + +LRESULT CFullscreenWindow::OnCloseOrKeyDownOrLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + mainWindow.ShowWindow(SW_SHOW); + ShowWindow(SW_HIDE); + return 0; +} + +LRESULT CFullscreenWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + PAINTSTRUCT ps; + HDC hDC = BeginPaint(&ps); + RECT rcWnd; + GetWindowRect(&rcWnd); + INT cxDest = imageModel.GetWidth(); + INT cyDest = imageModel.GetHeight(); + INT xDest = (rcWnd.right - rcWnd.left - cxDest) / 2; + INT yDest = (rcWnd.bottom - rcWnd.top - cyDest) / 2; + BitBlt(hDC, xDest, yDest, cxDest, cyDest, imageModel.GetDC(), 0, 0, SRCCOPY); + EndPaint(&ps); + return 0; +} + +LRESULT CFullscreenWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + Invalidate(TRUE); + return 0; +} + +LRESULT CFullscreenWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + SetCursor(LoadCursor(NULL, IDC_ARROW)); + bHandled = FALSE; + return 0; +} + +LRESULT CFullscreenWindow::OnGetText(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + // return caption of the main window, instead + return mainWindow.SendMessage(nMsg, wParam, lParam); +} Propchange: trunk/reactos/base/applications/mspaint_new/fullscreen.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mspaint_new/fullscreen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/fullscreen.h (added) +++ trunk/reactos/base/applications/mspaint_new/fullscreen.h [iso-8859-1] Mon Aug 17 12:03:39 2015 @@ -0,0 +1,31 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint_new/fullscreen.h + * PURPOSE: Window for fullscreen view + * PROGRAMMERS: Benedikt Freisen + */ + +class CFullscreenWindow : public CWindowImpl<CFullscreenWindow> +{ +public: + DECLARE_WND_CLASS_EX(_T("FullscreenWindow"), CS_DBLCLKS, COLOR_BACKGROUND) + + BEGIN_MSG_MAP(CFullscreenWindow) + MESSAGE_HANDLER(WM_CREATE, OnCreate) + MESSAGE_HANDLER(WM_CLOSE, OnCloseOrKeyDownOrLButtonDown) + MESSAGE_HANDLER(WM_KEYDOWN, OnCloseOrKeyDownOrLButtonDown) + MESSAGE_HANDLER(WM_LBUTTONDOWN, OnCloseOrKeyDownOrLButtonDown) + MESSAGE_HANDLER(WM_PAINT, OnPaint) + MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) + MESSAGE_HANDLER(WM_GETTEXT, OnGetText) + END_MSG_MAP() + + LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCloseOrKeyDownOrLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnGetText(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); +}; Propchange: trunk/reactos/base/applications/mspaint_new/fullscreen.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] Mon Aug 17 12:03:39 2015 @@ -73,6 +73,7 @@ extern BOOL showMiniature; class CMainWindow; +class CFullscreenWindow; class CMiniatureWindow; class CToolBox; class CToolSettingsWindow; @@ -84,6 +85,7 @@ class CTextEditWindow; extern CMainWindow mainWindow; +extern CFullscreenWindow fullscreenWindow; extern CMiniatureWindow miniature; extern CToolBox toolBoxContainer; extern CToolSettingsWindow toolSettingsWindow; Modified: trunk/reactos/base/applications/mspaint_new/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] Mon Aug 17 12:03:39 2015 @@ -66,6 +66,7 @@ BOOL showMiniature = FALSE; CMainWindow mainWindow; +CFullscreenWindow fullscreenWindow; CMiniatureWindow miniature; CToolBox toolBoxContainer; CToolSettingsWindow toolSettingsWindow; @@ -144,6 +145,9 @@ /* create main window */ RECT mainWindowPos = {0, 0, 544, 375}; // FIXME: use equivalent of CW_USEDEFAULT for position hwnd = mainWindow.Create(HWND_DESKTOP, mainWindowPos, progtitle, WS_OVERLAPPEDWINDOW); + + RECT fullscreenWindowPos = {0, 0, 100, 100}; + fullscreenWindow.Create(HWND_DESKTOP, fullscreenWindowPos, NULL, WS_POPUPWINDOW | WS_MAXIMIZE); RECT miniaturePos = {(LONG) registrySettings.ThumbXPos, (LONG) registrySettings.ThumbYPos, (LONG) registrySettings.ThumbXPos + (LONG) registrySettings.ThumbWidth, Modified: trunk/reactos/base/applications/mspaint_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/precomp.h [iso-8859-1] Mon Aug 17 12:03:39 2015 @@ -21,6 +21,7 @@ #include "definitions.h" #include "drawing.h" #include "dib.h" +#include "fullscreen.h" #include "globalvar.h" #include "history.h" #include "imgarea.h" Modified: trunk/reactos/base/applications/mspaint_new/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] Mon Aug 17 12:03:39 2015 @@ -613,6 +613,11 @@ case IDM_VIEWZOOM800: zoomTo(8000, 0, 0); break; - } - return 0; -} + + case IDM_VIEWFULLSCREEN: + fullscreenWindow.ShowWindow(SW_SHOW); + ShowWindow(SW_HIDE); + break; + } + return 0; +}

9 years, 4 months

[dreimer] 68732: [TAPIUI] Add/Update Chinese (zh-CN) translation by Henry Tang Ih CORE-9003 #resolve #comment Committed v7 Patch, as the author told me, this resolves this report. Thx once more for...

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Aug 17 11:54:37 2015 New Revision: 68732 URL: http://svn.reactos.org/svn/reactos?rev=68732&view=rev Log: [TAPIUI] Add/Update Chinese (zh-CN) translation by Henry Tang Ih CORE-9003 #resolve #comment Committed v7 Patch, as the author told me, this resolves this report. Thx once more for translating ROS to Chinese ^^ Added: trunk/reactos/dll/win32/tapiui/lang/zh-CN.rc (with props) Modified: trunk/reactos/dll/win32/tapiui/tapiui.rc Added: trunk/reactos/dll/win32/tapiui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/zh-C… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/zh-CN.rc (added) +++ trunk/reactos/dll/win32/tapiui/lang/zh-CN.rc [iso-8859-1] Mon Aug 17 11:54:37 2015 @@ -0,0 +1,448 @@ +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +101 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "æ¨å·è§å" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 201, 2000, 7, 7, 21, 20 + LTEXT "ä¸é¢çåè¡¨æ¾ç¤ºæ¨æå®çä½ç½®ãéæ©æ¨æ¨å·çä½ç½®ã", -1, 35, 7, 210, 16 + LTEXT "å°ç¹ä½ç½®:(&L)", -1, 7, 35, 210, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000011D, 7, 46, 238, 105, WS_EX_CLIENTEDGE + PUSHBUTTON "æ°å»º...(&N)", 1030, 87, 155, 50, 14 + PUSHBUTTON "ç¼è¾...(&E)", 1031, 141, 155, 50, 14 + PUSHBUTTON "å é¤(&D)", 1032, 195, 155, 50, 14 + LTEXT "è¦æ¨ççµè¯å·ç :", 1052, 7, 181, 100, 8 + LTEXT "", 1053, 14, 195, 224, 16 +END + +102 DIALOGEX 0, 0, 252, 255 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "å¸¸è§" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 202, 2000, 7, 7, 20, 20 + LTEXT "å°ç¹ä½ç½®åç§°:(&N)", -1, 35, 11, 56, 8, SS_CENTERIMAGE + EDITTEXT 1038, 96, 8, 149, 14, ES_AUTOHSCROLL + LTEXT "æå®ä»ä¸ä½ å°æ¨å·çä½ç½®ã", 2001, 7, 33, 238, 8 + LTEXT "å½å®¶/å°åº:(&R)", -1, 7, 49, 161, 8 + COMBOBOX 1006, 7, 60, 175, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "å°åºä»£ç :(&C)", -1, 190, 49, 48, 8 + EDITTEXT 1034, 190, 60, 48, 12, ES_AUTOHSCROLL + GROUPBOX "æ¨å·è§å", 2002, 7, 80, 238, 92 + LTEXT "å½ä»è¯¥ä½ç½®æ¨å·ï¼ä½¿ç¨ä»¥ä¸è§å:", 2003, 14, 92, 224, 8 + LTEXT "è¥è¦è®¿é®æ¬å°çµè¯çå¤çº¿çµè¯ï¼è¯·æ¨:(&L)", -1, 14, 106, 170, 8 + EDITTEXT 1010, 190, 104, 48, 12, ES_AUTOHSCROLL + LTEXT "è¦è®¿é®å¤çº¿é¿éçµè¯ï¼è¯·åæ¨:(&D)", -1, 14, 122, 170, 8 + EDITTEXT 1011, 190, 120, 48, 12, ES_AUTOHSCROLL + LTEXT "ä½¿ç¨æ¤è½½æ³¢ç æ¥æé¿éçµè¯:(&E)", -1, 14, 138, 170, 8 + EDITTEXT 1059, 190, 136, 48, 12, ES_AUTOHSCROLL + LTEXT "ä½¿ç¨æ¤è½½æ³¢ç æ¥æå½éçµè¯:(&I)", -1, 14, 154, 170, 8 + EDITTEXT 1060, 190, 152, 48, 12, ES_AUTOHSCROLL + AUTOCHECKBOX "è¥è¦ç¦ç¨å¼å«çå¾ï¼è¯·æ¨æ:(&W)", 1035, 14, 177, 170, 10 + COMBOBOX 1013, 190, 176, 48, 73, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL + LTEXT "ä½¿ç¨æ¨å·:", -1, 14, 195, 40, 8 + AUTORADIOBUTTON "è¯æ°(&T)", 1036, 58, 194, 50, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "èå²(&P)", 1037, 112, 194, 50, 10, NOT WS_TABSTOP + LTEXT "è¦æ¨ççµè¯å·ç :", 1052, 7, 219, 100, 8 + LTEXT "", 1053, 14, 232, 224, 16 +END + +103 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "åºå·è§å" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "åºå·è§åç¡®å®çµè¯å·ç çæ¨å·æ¹å¼ä»ä½ å½åçå°åºä»£ç äºå¶ä»å°åºä»£ç ååºå·ä¸ã", 2000, 7, 7, 238, 16 + LTEXT "åºå·è§å:(&C)", -1, 7, 31, 238, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000801D, 7, 42, 238, 99, WS_EX_CLIENTEDGE + PUSHBUTTON "æ°å»º...(&N)", 1030, 87, 147, 50, 14 + PUSHBUTTON "ç¼è¾...(&E)", 1031, 141, 147, 50, 14 + PUSHBUTTON "å é¤(&D)", 1032, 195, 147, 50, 14 + GROUPBOX "æè¿°", 2006, 7, 166, 238, 45 + LTEXT "", 1039, 14, 180, 224, 24 +END + +104 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "çµè¯å¡" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "éæ©æ¨å°ä½¿ç¨ççµè¯å¡ï¼æåå»æ°å»ºæ·»å ä¸åçå¡ã", 2000, 7, 7, 238, 8 + LTEXT "å¡ç±»å:(&T)", -1, 7, 23, 238, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 34, 238, 63, WS_EX_CLIENTEDGE + PUSHBUTTON "æ°å»º...(&N)", 1030, 87, 103, 50, 14 + PUSHBUTTON "ç¼è¾...(&E)", 1031, 141, 103, 50, 14 + PUSHBUTTON "å é¤(&D)", 1032, 195, 103, 50, 14 + LTEXT "å¸å·:(&C)", -1, 7, 127, 91, 8 + EDITTEXT 1018, 102, 125, 143, 12, ES_AUTOHSCROLL + LTEXT "ä¸ªäººIDå· (PIN):(&P)", -1, 7, 145, 91, 8 + EDITTEXT 1019, 102, 143, 143, 12, ES_AUTOHSCROLL + GROUPBOX "è®¿é®ççµè¯å·ç ", 2001, 7, 158, 238, 53 + LTEXT "é¿éçµè¯:", -1, 14, 172, 84, 8 + LTEXT "", 1042, 102, 172, 136, 8 + LTEXT "å½éçµè¯:", -1, 14, 184, 84, 8 + LTEXT "", 1043, 102, 184, 136, 8 + LTEXT "æ¬å°çµè¯:", -1, 14, 196, 84, 8 + LTEXT "", 1051, 102, 196, 136, 8 +END + +105 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "å¸¸è§" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 203, 2000, 7, 7, 20, 20 + LTEXT "çµè¯å¡å:(&C)", -1, 35, 12, 64, 8, SS_CENTERIMAGE + EDITTEXT 1047, 105, 9, 140, 14, ES_AUTOHSCROLL + LTEXT "å¸å·:(&N)", -1, 7, 35, 238, 8 + EDITTEXT 1018, 7, 46, 116, 14, ES_AUTOHSCROLL + LTEXT "ä¸ªäººè¯å«å·ç (PIN):(&P)", -1, 7, 68, 238, 8 + EDITTEXT 1019, 7, 80, 116, 14, ES_AUTOHSCROLL + LTEXT "æ¤çµè¯å¡å°æ¶ä½¿ç¨:", 1056, 14, 117, 224, 8 + GROUPBOX "çµè¯å¡è¯¦ç»ä¿¡æ¯", 2001, 7, 105, 238, 66 + LTEXT "", 1000, 22, 131, 216, 8 + LTEXT "", 1001, 22, 143, 216, 8 + LTEXT "", 1002, 22, 155, 216, 8 +END + +106 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "é¿é" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "é¿éçµè¯è®¿é®å·ç :(&L)", -1, 7, 7, 238, 8 + EDITTEXT 1044, 7, 18, 140, 14, ES_AUTOHSCROLL + LTEXT "ä½¿ç¨ä¸é¢çæé®æ¥è¾å¥æé¿éçµè¯æ¨å·æ¥éª¤ãå½å®ä»¬åºç°å¨ä½ çåçä¸ï¼æåç¡®é¡ºåºè¾å¥è¿äºæ¥éª¤ã", 2000, 7, 40, 238, 24 + LTEXT "çµè¯å¡æ¨å·æ¥éª¤:(&R)", -1, 7, 72, 80, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "åä¸ç§»å¨(&U)", 1022, 195, 83, 50, 14 + PUSHBUTTON "åä¸ç§»å¨(&M)", 1023, 195, 101, 50, 14 + PUSHBUTTON "å é¤(&D)", 1024, 195, 119, 50, 14 + PUSHBUTTON "è®¿é®å·ç (&N)", 1025, 7, 161, 90, 14 + PUSHBUTTON "å¸å·(&C)", 1018, 101, 161, 90, 14 + PUSHBUTTON "å¯ç (&P)", 1019, 7, 179, 90, 14 + PUSHBUTTON "ç®æ å·ç ...(&E)", 1020, 101, 179, 90, 14 + PUSHBUTTON "çå¾æç¤º...(&W)", 1017, 7, 197, 90, 14 + PUSHBUTTON "æå®æ°å...(&S)", 1021, 101, 197, 90, 14 +END + +107 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "å½é" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "å½éçµè¯è®¿é®å·ç :(&I)", -1, 7, 7, 238, 8 + EDITTEXT 1045, 7, 18, 140, 14, ES_AUTOHSCROLL + LTEXT "ä½¿ç¨ä¸é¢çæé®æ¥è¾å¥æå½éçµè¯æ¨å·æ¥éª¤ãå½å®ä»¬åºç°å¨ä½ çåçä¸ï¼æåç¡®é¡ºåºè¾å¥è¿äºæ¥éª¤ã", 2000, 7, 40, 244, 24 + LTEXT "çµè¯å¡æ¨å·æ¥éª¤:(&R)", -1, 7, 72, 80, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "åä¸ç§»å¨(&U)", 1022, 195, 83, 50, 14 + PUSHBUTTON "åä¸ç§»å¨(&M)", 1023, 195, 101, 50, 14 + PUSHBUTTON "å é¤(&D)", 1024, 195, 119, 50, 14 + PUSHBUTTON "è®¿é®å·ç (&N)", 1025, 7, 161, 90, 14 + PUSHBUTTON "å¸å·(&C)", 1018, 101, 161, 90, 14 + PUSHBUTTON "å¯ç (&P)", 1019, 7, 179, 90, 14 + PUSHBUTTON "ç®æ å·ç ...(&E)", 1020, 101, 179, 90, 14 + PUSHBUTTON "çå¾æç¤º...(&W)", 1017, 7, 197, 90, 14 + PUSHBUTTON "æå®æ°å...(&S)", 1021, 101, 197, 90, 14 +END + +108 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "æ¬å°çµè¯" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "æ¬å°çµè¯è®¿é®å·ç :(&L)", -1, 7, 7, 238, 8 + EDITTEXT 1008, 7, 18, 140, 14, ES_AUTOHSCROLL + LTEXT "ä½¿ç¨ä¸é¢çæé®æ¥è¾å¥æå¸åçµè¯æ¨å·æ¥éª¤ãå½ä»ä»¬åºç°å¨ä½ çåçä¸ï¼æåç¡®é¡ºåºè¾å¥è¿äºæ¥éª¤ãæ¥èæ éä½¿ç¨æ¨ççµè¯å¡ææ¬å°çµè¯ï¼è¯·å°æ¤é¨åçä¸ºç©ºç½ã", 2000, 7, 40, 238, 24 + LTEXT "çµè¯å¡æ¨å·æ¥éª¤:(&R)", -1, 7, 72, 238, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "åä¸ç§»å¨(&U)", 1022, 195, 83, 50, 14 + PUSHBUTTON "åä¸ç§»å¨(&M)", 1023, 195, 101, 50, 14 + PUSHBUTTON "å é¤(&D)", 1024, 195, 119, 50, 14 + PUSHBUTTON "è®¿é®å·ç (&N)", 1025, 7, 161, 90, 14 + PUSHBUTTON "å¸å·(&C)", 1018, 101, 161, 90, 14 + PUSHBUTTON "å¯ç (&P)", 1019, 7, 179, 90, 14 + PUSHBUTTON "ç®æ å·ç ...(&E)", 1020, 101, 179, 90, 14 + PUSHBUTTON "çå¾æç¤º...(&W)", 1017, 7, 197, 90, 14 + PUSHBUTTON "æå®æ°å...(&S)", 1021, 101, 197, 90, 14 +END + +109 DIALOGEX 0, 0, 252, 257 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "æ°çåºå·è§å" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "æ¤åºå·è§ååªéç¨äºçµè¯çåºå·åæ¨å¨ä¸é¢æå®çåç¼ç»åä½åºã", 2000, 7, 6, 238, 16 + LTEXT "è¦è°ç¨çå°åºä»£ç :", -1, 7, 31, 110, 8 + LTEXT "å°åºä»£ç :(&R)", -1, 7, 47, 36, 8 + EDITTEXT 1034, 46, 44, 50, 14, ES_AUTOHSCROLL + LTEXT "æå®è¦ç¨äºæ¤åºå·è§åçåç¼ã", -1, 14, 78, 224, 8 + AUTORADIOBUTTON "åå«æ¤åºå·ä¹åçææåç¼(&I)", 1014, 14, 90, 224, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "å¨ä¸é¢çåè¡¨ä¸åæ¬å¯ä¸çåç¼:(&O)", 1015, 14, 104, 224, 12, NOT WS_TABSTOP + LTEXT "è¦åå«çåç¼:(&P)", 1057, 26, 117, 119, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000411D, 25, 128, 66, 32, WS_EX_CLIENTEDGE + PUSHBUTTON "æ·»å ...(&A)", 1005, 95, 128, 50, 14 + PUSHBUTTON "å é¤(&E)", 1024, 95, 146, 50, 14 + LTEXT "å½æ¨å·çµè¯å·ç åå«ä¸è¿°åç¼:", -1, 14, 184, 224, 8 + AUTOCHECKBOX "æ¨æ:(&D)", 1012, 14, 198, 30, 12 + EDITTEXT 1007, 46, 196, 42, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "åæ¬å°åºä»£ç (&C)", 1029, 14, 214, 85, 12 + DEFPUSHBUTTON "ç¡®å®", 1, 141, 236, 50, 14 + PUSHBUTTON "åæ¶", 2, 195, 236, 50, 14 + RTEXT "å°åºä»£ç ", 2001, 133, 31, 51, 8 + LTEXT "åç¼", 2002, 200, 31, 45, 8 + CONTROL "", 2003, "STATIC", SS_BLACKFRAME | SS_SUNKEN, 180, 41, 1, 6 + CONTROL "", 2004, "STATIC", SS_BLACKFRAME | SS_SUNKEN, 203, 41, 1, 6 + RTEXT "X - X X X - X X X - X X X X", 2005, 133, 48, 112, 8 + GROUPBOX "åç¼", -1, 7, 64, 238, 102 + GROUPBOX "è§å", -1, 7, 170, 238, 60 +END + +110 DIALOGEX 0, 0, 227, 82 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", 1003, 7, 7, 213, 8 + LTEXT "", 1039, 7, 23, 213, 8 + EDITTEXT 1031, 7, 34, 213, 14, ES_AUTOHSCROLL + DEFPUSHBUTTON "ç¡®å®", 1, 116, 62, 50, 14 + PUSHBUTTON "åæ¶", 2, 170, 62, 50, 14 +END + +111 DIALOGEX 0, 0, 252, 124 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "çå¾" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "éæ©æç¤ºç»§ç»æ¨å·åºåä¹åçå¾çç±»åã", 2000, 7, 7, 238, 16 + AUTORADIOBUTTON "çå¾æ¨å·é³(&D)", 1009, 7, 31, 238, 10, WS_GROUP + AUTORADIOBUTTON "çå¾å®æè¯é³æ¶æ¯(&V)", 1016, 7, 47, 238, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "çå¾ä¸ä¸ªç¹å®çæ¶é´é¿åº¦:(&T)", 1048, 7, 63, 238, 10, NOT WS_TABSTOP + EDITTEXT 1050, 18, 77, 36, 14, ES_AUTOHSCROLL | WS_GROUP + CONTROL "Spin1", 1049, "msctls_updown32", 0x00000036, 42, 78, 11, 14 + LTEXT "ç§(&S)", -1, 58, 81, 187, 8 + DEFPUSHBUTTON "ç¡®å®", 1, 141, 103, 50, 14 + PUSHBUTTON "åæ¶", 2, 195, 103, 50, 14 +END + +112 DIALOGEX 0, 0, 252, 111 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "ç®æ å·ç " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "æ¤æ¥éª¤å°ææ¨å°æ¨å¥çµè¯å¡åºåçç®æ æ°ãå½æ¨æç®æ å·ç ï¼ä½ æ³æ¨æ°ä¸çåªäºé¨å?:", 2000, 7, 7, 238, 24 + AUTOCHECKBOX "æ¨æå½å®¶/å°åºä»£ç (&C)", 1027, 7, 39, 238, 10 + AUTOCHECKBOX "æ¨åºå·(&A)", 1034, 7, 55, 238, 10 + AUTOCHECKBOX "æ¨å·ç (&N)", 1008, 7, 71, 238, 10, WS_DISABLED + DEFPUSHBUTTON "ç¡®å®", 1, 141, 92, 50, 14 + PUSHBUTTON "åæ¶", 2, 195, 92, 50, 14 +END + +113 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "é«çº§" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 201, 2000, 7, 7, 20, 20 + LTEXT "å¨æ¤è®¡ç®æºä¸å®è£ä¸åçµè¯æå¡æä¾ç¨åº:", -1, 40, 7, 205, 8 + LTEXT "æä¾å:(&P)", -1, 7, 35, 238, 8 + LISTBOX 1033, 7, 46, 238, 147, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | WS_TABSTOP + PUSHBUTTON "æ·»å ...(&D)", 1005, 87, 197, 50, 14 + PUSHBUTTON "å é¤(&R)", 1024, 141, 197, 50, 14 + PUSHBUTTON "éç½®...(&C)", 1031, 195, 197, 50, 14 +END + +114 DIALOGEX 20, 15, 252, 127 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "æ·»å æä¾ç¨åº" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "éæ©ä½ æ³ä»ä¸é¢åè¡¨ä¸å®è£çæä¾ç¨åºå¹¶åå»æ·»å ã", 2000, 7, 7, 241, 8 + LTEXT "çµè¯æå¡æä¾ç¨åº:(&T)", -1, 7, 23, 144, 10 + LISTBOX 1055, 7, 34, 238, 74, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "æ·»å (&A)", 1005, 141, 106, 50, 14 + DEFPUSHBUTTON "åæ¶", 2, 195, 106, 50, 14 +END + +115 DIALOGEX 10, 10, 303, 228 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "ä½ç½®ä¿¡æ¯" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL 302, 302, "STATIC", SS_BITMAP, 10, 10, 88, 155 + LTEXT "æ¨å¯ä»¥ä½¿ä»»ä½çµè¯æè°å¶è§£è°å¨çè¿æ¥ä¹åï¼çµèéè¦ä»¥ä¸æå³æ¨å½åçä½ç½®ä¿¡æ¯ã", 2000, 107, 15, 188, 25 + LTEXT "ä½ ç°å¨å¨ä»ä¹å½å®¶/å°åº?(&W)", -1, 107, 43, 189, 10 + COMBOBOX 1006, 107, 55, 180, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "ç°å¨ä½ çæ¯ä»ä¹åºå· (æåå¸ä»£ç ) ?(&C)", -1, 107, 74, 189, 10 + EDITTEXT 1034, 107, 87, 45, 12, ES_AUTOHSCROLL + LTEXT "å¦ææ¨éè¦æå®æ¿è¿äººä»£ç ï¼æ¯ä»ä¹?(&R)", -1, 107, 105, 189, 10 + EDITTEXT 1058, 106, 118, 45, 12, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "å¦æä½ æ¨ä¸ä¸ªå·ç æè½æ¨æå¤çº¿ï¼å®æ¯ä»ä¹?(&O)", -1, 107, 137, 189, 10 + EDITTEXT 1010, 107, 149, 45, 12, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "å¨æ¤ä½ç½®ççµè¯ç³»ç»ä½¿ç¨:", -1, 107, 168, 189, 10 + AUTORADIOBUTTON "é³é¢æ¨å·(&T)", 1036, 107, 178, 57, 14, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "èå²æ¨å·(&P)", 1037, 175, 178, 57, 14, NOT WS_TABSTOP + DEFPUSHBUTTON "ç¡®å®", 1, 192, 204, 50, 14 + PUSHBUTTON "åæ¶", 2, 246, 204, 50, 14 +END + +400 DIALOGEX 0, 0, 290, 151 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL 302, 302, "STATIC", SS_BITMAP, 0, 0, 88, 155 + LTEXT "æ¨å¯ä»¥ä½¿ä»»ä½çµè¯æè°å¶è§£è°å¨çè¿æ¥ä¹åï¼çµèéè¦ä»¥ä¸æå³æ¨å½åçä½ç½®ä¿¡æ¯ã", 2000, 95, 2, 188, 25 + LTEXT "ä½ ç°å¨å¨ä»ä¹å½å®¶/å°åº?(&W)", -1, 95, 30, 188, 10 + COMBOBOX 1006, 95, 41, 177, 68, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "ç°å¨ä½ çæ¯ä»ä¹åºå· (æåå¸ä»£ç ) ?(&C)", -1, 95, 61, 188, 10 + EDITTEXT 1034, 95, 73, 40, 14, ES_AUTOHSCROLL + LTEXT "å¦æä½ æ¨ä¸ä¸ªå·ç æè½æ¨æå¤çº¿ï¼å®æ¯ä»ä¹?(&O)", -1, 95, 96, 188, 10 + EDITTEXT 1010, 95, 107, 40, 14, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "å¨æ¤ä½ç½®ççµè¯ç³»ç»ä½¿ç¨:", -1, 95, 129, 159, 10 + AUTORADIOBUTTON "é³é¢æ¨å·(&T)", 1036, 95, 139, 55, 12, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "èå²æ¨å·(&P)", 1037, 155, 139, 55, 12, NOT WS_TABSTOP +END + +500 DIALOGEX 0, 0, 235, 88 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ReactOS æµè§å¨" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 504, 501, 13, 14, 21, 20 + LTEXT "", 502, 47, 15, 180, 32 + AUTOCHECKBOX "å¨å°æ¥ï¼ä¸ç´ä¿¡ä»»æ¤é¡µ(&I)", 503, 50, 47, 147, 12 + DEFPUSHBUTTON "ç¡®å®(&O)", 505, 110, 65, 50, 14 + PUSHBUTTON "åæ¶(&C)", 506, 164, 65, 50, 14 +END + +STRINGTABLE +BEGIN + 1 "çµè¯åè°å¶è§£è°å¨éé¡¹" + 2 "éç½®æ¨å·è§ååä½¿ç¨è°å¶è§£è°å¨çå±æ§ã" + 3 "ä½ç½®" + 4 "è¥è¦åå»ºä¸ä¸ªæ°çä½ç½®ï¼åå»æ°å»ºã" + 5 "æ°ä½ç½®" + 6 "ç¼è¾ä½ç½®" + 7 "æ°åç" + 8 "ç¼è¾åç" + 9 "åºå·" + 10 "åç¼" + 11 "è§å" + 12 "æ¨è¾å¥çåç¬¦æ æã\n\nææçåç¬¦æ¯ 0 å° 9, *, #, åéå·ã" + 13 "æ¨è¾å¥çåç¬¦æ æã\n\nææçåç¬¦æ¯ 0 å° 9, *, #, ç©ºæ ¼åéå·ã" + 14 "æ¨è¾å¥çåç¬¦æ æã\n\nææçåç¬¦æ¯ 0 å° 9." + 15 "æ¨è¾å¥çåç¬¦æ æã" + 16 "æ¨æ %1" + 17 "æ¨æ %1 åå ä¸åºå·" + 18 "æ¨æåºå·" + 19 "æ¨æå·ç èå·²" + 20 "å¨é¨" + 21 "éæ©" + 22 "ç¼è¾åºå·è§å" + 23 "ä¸é¢å¯ä»¥æ¥çå¶æè¿°çåè¡¨ä¸éæ©ä¸ä¸ªè§åæåå»æ°å»ºæ·»å ä¸ä¸ªè§åã" + 24 "æ¨æ '%2' åå ä¸ä¹åçææ %1 åºå·ä¹åççµè¯å·ç çåºå·ã" + 25 "%1 åºå·ä¹åççµè¯å·ç åæ¨æ '%2'ã" + 26 "æ¨ %1 åºå·ä¹åççµè¯å·ç ååºç ã" + 27 "æ¨ %1 åºå·ä¹åççµè¯å·ç ã" + 28 "æ¨æ '%2' åå ä¸ä¹åç %1 åºå·ä¹åççµè¯å·ç åå«æ¨æå®çåç¼çåºå·ã" + 29 "æ¨æ '%2' çæ°ååè°ç¨åå«æ¨æå®çåç¼ %1 åºå·ä¹åã" + 30 "æ¨åºå·ä¹åç %1 åºå·ä¹åççµè¯å·ç åå«æ¨æå®çåç¼ã" + 31 "æ¨å·åå«æ¨æå®çåç¼ç %1 åºå·ä¹åççµè¯å·ç ã" + 32 "æ¨æææå¶å®åºå·ä¹åå '1' å¹¶ä¸åæ¬ææåç¼çåºå·ã" + 33 "æ·»å åç¼" + 34 "è¾å¥ç¨ç©ºæ ¼æéå·åéçä¸ä¸ªæå¤ä¸ªåç¼ã" + 35 "æå®ä½æ°" + 36 "è¾å¥ä¸ä¸ªæå¤ä¸ªæ°å (åæ¬ * å #) è¦æ¨æã" + 37 "ä½ è¯çè¾å¥ä¸ä¸ªæ æåç¬¦ã\n\nææçåç¬¦æ¯ 0 å° 9 åç©ºæ ¼ã" + 38 "çå¾ %1! d!ç§ã" + 39 "åæ¨è®¿é®å·ç ã" + 40 "æ¨å·çå¸å·ã" + 41 "æ¨å·ç PIN å·ç ã" + 42 "çå¾æ¨å·é³ã" + 43 "çå¾çè¨ç»æã" + 44 "æ¨æå½å®¶/å°åºä»£ç ã åºå·åå·ç ã" + 45 "æ¨å½å®¶ (å°åº) ä»£ç åå·ç ã" + 46 "æ¨åºå·åå·ç ã" + 47 "æ¨æå½å®¶/å°åºä»£ç ã" + 48 "æ¨åºå·ã" + 49 "æ¨æå·ç ã" + 50 "æ¨æé¿éçµè¯ä¸ã" + 51 "æ¨æå½éçµè¯ä¸ã" + 52 "æ¨ææ¬å°çµè¯ä¸ã" + 53 "æ²¡æå®ä¹ä¸ºåºå¦ä½ä½¿ç¨æ¤çµè¯å¡çè§åã" + 54 "æ¨å¿é¡»è¾å¥æ¤ä½ç½®çé¿éè½½ä½ä»£ç ã" + 55 "æ¨å¿é¡»è¾å¥æ¤ä½ç½®çåç§°ã" + 56 "æ¨å¿é¡»è¾å¥æ¤ä½ç½®çå°åºä»£ç ã" + 57 "æ¨å¿é¡»éæ©è¦æ¨æè¦ç¦ç¨å¼å«çå¾çå·ç ã" + 58 "æ¨æççµè¯å¿é¡»éæ©å½å®¶æå°åºã" + 59 "ç¼ºå°çä¿¡æ¯" + 60 "ä½ æè¾å¥çä½ç½®åç§°å·²å¨ä½¿ç¨ãè¯·è¾å¥ä¸ä¸ªå¯ä¸çåç§°ã" + 61 "æ¤çµè¯å¡ç¼ºå°ä¸äºå¿éçä¿¡æ¯ãä½¿ç¨æ¤å¡ï¼è¯·åå»ç¼è¾ï¼æä¾æ´å¤çä¿¡æ¯ï¼æéæ©å¦ä¸ä¸ªå¡ã" + 62 "æ¨å¿é¡»éæ©ä¸ä¸ªé»è®¤çµè¯å¡ãä»åè¡¨ä¸ï¼éæ©ä¸ä¸ªå¡ï¼æåå»æ°å»ºåå»ºä¸ä¸ªæ°çå¡ã" + 63 "æ¨å¿é¡»è¾å¥çµè¯å¡åç§°ã" + 64 "æ¨å¿é¡»è¾å¥å¸æ·å·ç ã" + 65 "æ¨å¿é¡»è¾å¥ç PIN å·ç ã" + 66 "æ²¡æå®ä¹è¯¥çµè¯å¡çè§åãè¥è¦åå»ºä¸ä¸ªè§åï¼è¯·éæ©é¿éã å½éææ¬å°çµè¯éé¡¹å¡ã" + 67 "ä½ é¿éè§åéè¦æ¨ççµè¯å¡é¿éè®¿é®å·ç ã" + 68 "æ¨çå½éè§åéè¦æ¨ççµè¯å¡å½éè®¿é®å·ç ã" + 69 "æ¨çæ¬å°è§åéè¦æ¨ççµè¯å¡çæ¬å°è®¿é®å·ç ã" + 70 "æ " + 71 "ç¡®å®è¦å é¤éå®ççµè¯æå¡æä¾ç¨åºå?" + 72 "< æ²¡ææå¡æä¾åå®è£ >" + 73 "æ¨å¿é¡»è¾å¥æ¤è§åéç¨çåç¼ã" + 74 "æ°å:(&D)" + 75 "åç¼:(&P)" + 76 "ä½ è¯çè¾å¥ä¸ä¸ªæ æåç¬¦ã\n\nææçåç¬¦æ¯ 0 è³ 9ï¼ç©ºæ ¼åéå·ã" + 77 "ç¡®è®¤å é¤" + 78 "æ¯å¦ç¡®å®è¦å é¤æ¤ä½ç½®?" + 79 "ç¡®å®è¦å é¤æ¤çµè¯å¡å?" + 80 "æ¯å¦ç¡®å®è¦å é¤æ¤åºå·è§å?" + 81 "æ¨å¿é¡»è¾å¥è¦æ¨æçå·ç ã" + 82 "æ¨è¾å¥ççµè¯å¡åç§°å·²å¨ä½¿ç¨ãè¯·è¾å¥ä¸ä¸ªå¯ä¸çåç§°ã" + 83 "ReactOS éè¦ä»ä¸ä½ å°æ¨å·çä½ç½®çµè¯ä¿¡æ¯ãå¦ææ¨åæ¶æ²¡ææä¾æ¤ä¿¡æ¯ï¼æ¤ç¨åºå¯è½æ æ³æ£å¸¸æ¨å·æ¶ãæ¤å¤ï¼ä¸äºåºç¨ç¨åºååºæ¨åæ¶æ¤å¯¹è¯æ¡ç±ç«å³éæ°åå¸å®ã\nç¡®å®è¦åæ¶å?" + 84 "ç¡®è®¤åæ¶" + 85 "æçä½ç½®" + 86 "< æ²¡ææå¡æä¾åå¯ç¨äºå®è£ >" + 87 "æ¨è¾å¥çåç¬¦æ æã\n\nææçåç¬¦æ¯ 0 å° 9ï¼A å° Dï¼*ï¼#ï¼+ï¼!ï¼ç©ºæ ¼åéå·ã" + 88 "æ¨å¿é¡»è¾å¥æ¤ä½ç½®å½éæ¿è¿äººä»£ç ã" + 89 "æ¨å¿é¡»è¾å¥æ¤ä½ç½®çæ¿è¿äººä»£ç ã" + 90 "æ¤é¡µæ£å¨å°è¯è¿è¡æçè§çµè¯å¼å«æå¶ä»å¤åªä½è¿æ¥æ¨çè®¡ç®æºä¸ã\næ¨æ³åè®¸å®ç»§ç»å?" + 91 "æ¤é¡µæ£å¨å°è¯è®¿é®æ¨çç½ç»ä¸çç®å½ä¿¡æ¯ã\nä½ æ³åè®¸å®ç»§ç»å?" + 92 "æ¤é¡µå°è¯è®¿é®ææ´æ¹ç½ç»ä¼è®®ä¿¡æ¯ã\nä½ æ³åè®¸å®ç»§ç»å?" + 93 "æ¤é¡µå°è¯è®¿é®ææ´æ¹æ³¨åè¡¨ä¿¡æ¯ã\nä½ æ³åè®¸å®ç»§ç»å?" + 1064 "ä¸è½æå¼çµè¯åè°å¶è§£è°å¨æ§å¶é¢æ¿ãä½ å¯è½æé®é¢å¯å¨çµè¯æå¡ã" + 1065 "å é¤æä¾å" + 15800 "23" + 15801 "0,""None (Direct Dial)"","""","""","""","""","""","""","""","""",1" + 15802 "1,""AT&T Direct Dial via 1010ATT1"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010288"",""1010288"",1" + 15803 "2,""AT&T via 1010ATT0"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010288"",""1010288"",1" + 15804 "3,""AT&T via 1-800-321-0288"","""",""G"",""J$TFG$TH"",""J$T01EFG$TH"","""","""",""18003210288"",""18003210288"",1" + 15805 "4,""MCI Direct Dial via 10102221"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010222"",""1010222"",1" + 15806 "5,""MCI via 10102220"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010222"",""1010222"",1" + 15807 "6,""MCI via 1-800-888-8000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18008888000"",""18008888000"",1" + 15808 "7,""MCI via 1-800-674-0700"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006740700"",""18006740700"",1" + 15809 "8,""MCI via 1-800-674-7000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006747000"",""18006747000"",1" + 15810 "9,""US Sprint Direct Dial via 10103331"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010333"",""1010333"",1" + 15811 "10,""US Sprint via 10103330"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010333"",""1010333"",1" + 15812 "11,""US Sprint via 1-800-877-8000"","""",""G"",""J,,,T0FG,,H"",""J,,,T01EFG#,H"","""","""",""18008778000"",""18008778000"",1" + 15813 "12,""Calling Card via 0"","""",""G"",""0FG$TH"",""01EFG$TH"","""","""","""","""",1" + 15814 "13,""Carte France Telecom"","""",""T3010,H,0FG#"",""T3010,H,0FG#"",""T3010,H,00EFG#"","""","""","""","""",1" + 15815 "14,""Mercury (UK)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,0FG"","""",""0500800800"",""0500800800"",""0500800800"",1" + 15816 "15,""British Telecom (UK)"","""",""J$H,0FG"",""J$H,0FG"",""J$H,00EFG"","""",""144"",""144"".""144"",1" + 15817 "16,""CLEAR Communications (New Zealand)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,00EFG"","""",""0502333"",""0502333"",""0502333"",1" + 15818 "17,""Telecom New Zealand"","""",""J,0FG?H"",""J,0FG?H"",""J,00EFG?H"","""",""012"",""012"",""012"",1" + 15819 "18,""Global Card (Taiwan to USA)"","""",""G"",""0FG"",""J,102880$TFG$H"","""","""","""",""0080"",1" + 15820 "19,""Telstra (Australia) via 1818 (voice)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0011EFG#"","""",""1818"",""1818"",""1818"",1" + 15821 "20,""Telstra (Australia) via 1818 (fax)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0015EFG#"","""",""1818"",""1818"",""1818"",1" + 15822 "21,""Optus (Australia) via 1812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""1812"",1" + 15823 "22,""Optus (Australia) via 008551812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""008551812"",1" +END Propchange: trunk/reactos/dll/win32/tapiui/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/tapiui/tapiui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rc… ============================================================================== --- trunk/reactos/dll/win32/tapiui/tapiui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapiui/tapiui.rc [iso-8859-1] Mon Aug 17 11:54:37 2015 @@ -52,3 +52,6 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif

9 years, 4 months

[gadamopoulos] 68731: [SHELL32] -Fix build

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Aug 17 11:46:22 2015 New Revision: 68731 URL: http://svn.reactos.org/svn/reactos?rev=68731&view=rev Log: [SHELL32] -Fix build Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Mon Aug 17 11:46:22 2015 @@ -398,7 +398,7 @@ } else { - DPRINT1("Got and unknown pidl!\n"); + ERR("Got and unknown pidl!\n"); } } else

9 years, 4 months

[gadamopoulos] 68730: [SHELL32] - Use SHELL32_GetGuidItemAttributes, SHELL32_GetFSItemAttributes, SHELL32_BindToGuidItem and SHELL32_GetDisplayNameOfGUIDItem in CControlPanelFolder, CDrivesFolder a...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Aug 17 11:41:15 2015 New Revision: 68730 URL: http://svn.reactos.org/svn/reactos?rev=68730&view=rev Log: [SHELL32] - Use SHELL32_GetGuidItemAttributes, SHELL32_GetFSItemAttributes, SHELL32_BindToGuidItem and SHELL32_GetDisplayNameOfGUIDItem in CControlPanelFolder, CDrivesFolder and CFSFolder instead of using functions that accept all sorts of pidl types. Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Mon Aug 17 11:41:15 2015 @@ -388,9 +388,7 @@ REFIID riid, LPVOID *ppvOut) { - TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbcReserved, shdebugstr_guid(&riid), ppvOut); - - return SHELL32_BindToChild(pidlRoot, NULL, pidl, riid, ppvOut); + return SHELL32_BindToGuidItem(pidlRoot, pidl, pbcReserved, riid, ppvOut); } /************************************************************************** @@ -484,7 +482,7 @@ if (_ILIsCPanelStruct(*apidl)) *rgfInOut &= SFGAO_CANLINK; else if (_ILIsSpecialFolder(*apidl)) - SHELL32_GetItemAttributes(this, *apidl, rgfInOut); + SHELL32_GetGuidItemAttributes(this, *apidl, rgfInOut); else ERR("Got an unkown pidl here!\n"); apidl++; @@ -574,69 +572,24 @@ */ HRESULT WINAPI CControlPanelFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { - CHAR szName[MAX_PATH]; - WCHAR wszName[MAX_PATH+1]; /* +1 for potential backslash */ - PIDLCPanelStruct *pCPanel; - HRESULT hr; - - *szName = '\0'; - - TRACE("(%p)->(pidl=%p,0x%08x,%p)\n", this, pidl, dwFlags, strRet); - pdump(pidl); - if (!pidl) return S_FALSE; - pCPanel = _ILGetCPanelPointer(pidl); + PIDLCPanelStruct *pCPanel = _ILGetCPanelPointer(pidl); if (pCPanel) { /* copy display name from pidl - it was retrived from applet before; SHGDN_FORPARSING does not need special handling */ - lstrcpyA(szName, pCPanel->szName + pCPanel->offsDispName); - } - /* take names of special folders only if it's only this folder */ + strRet->uType = STRRET_CSTR; + lstrcpyA(strRet->cStr, pCPanel->szName + pCPanel->offsDispName); + } else if (_ILIsSpecialFolder(pidl)) { - BOOL bSimplePidl = _ILIsPidlSimple(pidl); - SFGAOF Attr = SFGAO_FILESYSTEM; - - SHELL32_GetItemAttributes(this, pidl, &Attr); - if (Attr & SFGAO_FILESYSTEM) - { - hr = SHELL32_GetDisplayNameOfChild(this, pidl, dwFlags, wszName, sizeof(wszName)); - if (FAILED(hr)) - return hr; - } - else if (bSimplePidl) - { - _ILSimpleGetTextW(pidl, wszName, MAX_PATH); /* append my own path */ - } - else - { - FIXME("special pidl\n"); - if (dwFlags & SHGDN_FORPARSING) - { - /* go deeper if needed */ - int cchName; - - PathAddBackslashW(wszName); - cchName = wcslen(wszName); - - hr = SHELL32_GetDisplayNameOfChild(this, pidl, dwFlags, wszName + cchName, MAX_PATH + 1 - cchName); - if (FAILED(hr)) - return hr; - } - } - - if (!WideCharToMultiByte(CP_ACP, 0, wszName, -1, szName, MAX_PATH, NULL, NULL)) - szName[0] = '\0'; - } - - strRet->uType = STRRET_CSTR; - lstrcpynA(strRet->cStr, szName, MAX_PATH); - - TRACE("--(%p)->(%s)\n", this, szName); + static const WCHAR* pszCPanelPath = L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}"; + return SHELL32_GetDisplayNameOfGUIDItem(this, pszCPanelPath, pidl, dwFlags, strRet); + } + return S_OK; } Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Mon Aug 17 11:41:15 2015 @@ -263,6 +263,9 @@ TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbcReserved, shdebugstr_guid(&riid), ppvOut); + if (_ILIsSpecialFolder(pidl)) + return SHELL32_BindToGuidItem(pidlRoot, pidl, pbcReserved, riid, ppvOut); + return SHELL32_BindToChild(pidlRoot, NULL, pidl, riid, ppvOut); } @@ -376,7 +379,7 @@ else if (_ILIsControlPanel(apidl[i])) *rgfInOut &= dwControlPanelAttributes; else if (_ILIsSpecialFolder(*apidl)) - SHELL32_GetItemAttributes(this, apidl[i], rgfInOut); + SHELL32_GetGuidItemAttributes(this, apidl[i], rgfInOut); else ERR("Got unknown pidl type!\n"); } @@ -493,91 +496,10 @@ } else if (_ILIsPidlSimple(pidl)) { - /* take names of special folders only if its only this folder */ if (_ILIsSpecialFolder(pidl)) - { - GUID const *clsid; - - clsid = _ILGetGUIDPointer (pidl); - if (clsid) - { - if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING) - { - static const WCHAR clsidW[] = L"CLSID\\"; - static const WCHAR shellfolderW[] = L"\\shellfolder"; - static const WCHAR wantsForParsingW[] = L"WantsForParsing"; - BOOL bWantsForParsing = FALSE; - WCHAR szRegPath[100]; - LONG r; - - /* - * We can only get a filesystem path from a shellfolder - * if the value WantsFORPARSING exists in - * CLSID\\{...}\\shellfolder - * exception: the MyComputer folder has this keys not - * but like any filesystem backed - * folder it needs these behaviour - * - * Get the "WantsFORPARSING" flag from the registry - */ - - wcscpy(szRegPath, clsidW); - SHELL32_GUIDToStringW(*clsid, &szRegPath[6]); - wcscat(szRegPath, shellfolderW); - r = SHGetValueW(HKEY_CLASSES_ROOT, szRegPath, - wantsForParsingW, NULL, NULL, NULL); - if (r == ERROR_SUCCESS) - bWantsForParsing = TRUE; - - if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && - bWantsForParsing) - { - /* - * We need the filesystem path to the destination folder - * Only the folder itself can know it - */ - hr = SHELL32_GetDisplayNameOfChild (this, pidl, - dwFlags, pszPath, MAX_PATH); - } - else - { - LPWSTR p = pszPath; - - /* parsing name like ::{...} */ - p[0] = ':'; - p[1] = ':'; - p += 2; - p += SHELL32_GUIDToStringW(CLSID_MyComputer, p); - - /* \:: */ - p[0] = '\\'; - p[1] = ':'; - p[2] = ':'; - p += 3; - SHELL32_GUIDToStringW(*clsid, p); - } - } - else - { - /* user friendly name */ - - if (_ILIsMyComputer(pidl) && sName) - wcscpy(pszPath, sName); - else - HCR_GetClassNameW (*clsid, pszPath, MAX_PATH); - - TRACE("pszPath %s\n", debugstr_w(pszPath)); - } - } - else - { - /* append my own path */ - _ILSimpleGetTextW(pidl, pszPath, MAX_PATH); - } - } + return SHELL32_GetDisplayNameOfGUIDItem(this, L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", pidl, dwFlags, strRet); else if (_ILIsDrive(pidl)) { - _ILSimpleGetTextW(pidl, pszPath, MAX_PATH); /* append my own path */ /* long view "lw_name (C:)" */ if (!(dwFlags & SHGDN_FORPARSING)) Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Mon Aug 17 11:41:15 2015 @@ -233,7 +233,7 @@ { /* it's the last element */ if (pdwAttributes && *pdwAttributes) - hr = SHELL32_GetItemAttributes(this, pidlTemp, pdwAttributes); + hr = SHELL32_GetFSItemAttributes(this, pidlTemp, pdwAttributes); } } } @@ -369,12 +369,6 @@ PCUITEMID_CHILD_ARRAY apidl, DWORD * rgfInOut) { HRESULT hr = S_OK; - static const DWORD dwDriveAttributes = - SFGAO_HASSUBFOLDER | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | - SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANRENAME | SFGAO_CANLINK; - - TRACE("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", this, cidl, apidl, - rgfInOut, rgfInOut ? *rgfInOut : 0); if (!rgfInOut) return E_INVALIDARG; @@ -386,20 +380,25 @@ if(cidl == 0) { - IShellFolder *psfParent = NULL; - LPCITEMIDLIST rpidl = NULL; - - hr = SHBindToParent(pidlRoot, IID_PPV_ARG(IShellFolder, &psfParent), &rpidl); - if(SUCCEEDED(hr)) - { - if (_ILIsDrive(rpidl)) - *rgfInOut &= dwDriveAttributes; - if (_ILIsFolder(rpidl) || _ILIsValue(rpidl)) - SHELL32_GetItemAttributes(this, rpidl, rgfInOut); - else - ERR("Got an unknown type of pidl!!!\n"); - - psfParent->Release(); + LPCITEMIDLIST rpidl = ILFindLastID(pidlRoot); + + if (_ILIsFolder(rpidl) || _ILIsValue(rpidl)) + { + SHELL32_GetFSItemAttributes(this, rpidl, rgfInOut); + } + else if (_ILIsDrive(rpidl)) + { + IShellFolder *psfParent = NULL; + hr = SHBindToParent(pidlRoot, IID_PPV_ARG(IShellFolder, &psfParent), NULL); + if(SUCCEEDED(hr)) + { + hr = psfParent->GetAttributesOf(1, &rpidl, (SFGAOF*)rgfInOut); + psfParent->Release(); + } + } + else + { + DPRINT1("Got and unknown pidl!\n"); } } else @@ -408,7 +407,7 @@ { pdump(*apidl); if(_ILIsFolder(*apidl) || _ILIsValue(*apidl)) - SHELL32_GetItemAttributes(this, *apidl, rgfInOut); + SHELL32_GetFSItemAttributes(this, *apidl, rgfInOut); else ERR("Got an unknown type of pidl!!!\n"); apidl++;

9 years, 4 months

[gadamopoulos] 68729: [SHELL32] - Split SHELL32_GetItemAttributes to SHELL32_GetGuidItemAttributes and SHELL32_GetFSItemAttributes. - Add a couple helper functions that will reduce code duplication...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Aug 17 11:36:56 2015 New Revision: 68729 URL: http://svn.reactos.org/svn/reactos?rev=68729&view=rev Log: [SHELL32] - Split SHELL32_GetItemAttributes to SHELL32_GetGuidItemAttributes and SHELL32_GetFSItemAttributes. - Add a couple helper functions that will reduce code duplication in folders with reg items: SHELL32_BindToGuidItem, SHELL32_GetDisplayNameOfGUIDItem Modified: trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp trunk/reactos/dll/win32/shell32/wine/classes.c Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Mon Aug 17 11:36:56 2015 @@ -52,6 +52,21 @@ HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path); +HRESULT SHELL32_BindToGuidItem(LPCITEMIDLIST pidlRoot, + PCUIDLIST_RELATIVE pidl, + LPBC pbcReserved, + REFIID riid, + LPVOID *ppvOut); + +HRESULT SHELL32_GetGuidItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes); + +HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes); + +HRESULT SHELL32_GetDisplayNameOfGUIDItem(IShellFolder2* psf, LPCWSTR pszFolderPath, PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); + +extern "C" +BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey); + static __inline int SHELL32_GUIDToStringA (REFGUID guid, LPSTR str) { return sprintf(str, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", 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] Mon Aug 17 11:36:56 2015 @@ -330,6 +330,45 @@ return hr; } +HRESULT SHELL32_BindToGuidItem(LPCITEMIDLIST pidlRoot, + PCUIDLIST_RELATIVE pidl, + LPBC pbcReserved, + REFIID riid, + LPVOID *ppvOut) +{ + CComPtr<IPersistFolder> pFolder; + HRESULT hr; + + GUID *pGUID = _ILGetGUIDPointer(pidl); + if (!pGUID) + { + ERR("SHELL32_BindToGuidItem called for non guid item!\n"); + return E_FAIL; + } + + hr = SHCoCreateInstance(NULL, pGUID, NULL, IID_PPV_ARG(IPersistFolder, &pFolder)); + if (FAILED(hr)) + return hr; + + hr = pFolder->Initialize(ILCombine(pidlRoot, pidl)); + if (FAILED(hr)) + return hr; + + if (_ILIsPidlSimple (pidl)) + { + return pFolder->QueryInterface(riid, ppvOut); + } + else + { + CComPtr<IShellFolder> psf; + hr = pFolder->QueryInterface(IID_PPV_ARG(IShellFolder, &psf)); + if (FAILED(hr)) + return hr; + + return psf->BindToObject(ILGetNext (pidl), pbcReserved, riid, ppvOut); + } +} + /*********************************************************************** * SHELL32_GetDisplayNameOfChild * @@ -376,6 +415,85 @@ hr = E_OUTOFMEMORY; TRACE ("-- ret=0x%08x %s\n", hr, debugstr_w(szOut)); + + return hr; +} + +HRESULT SHELL32_GetDisplayNameOfGUIDItem(IShellFolder2* psf, LPCWSTR pszFolderPath, PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) +{ + HRESULT hr = S_OK; + GUID const *clsid = _ILGetGUIDPointer (pidl); + + if (!strRet) + return E_INVALIDARG; + + LPWSTR pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR)); + if (!pszPath) + return E_OUTOFMEMORY; + + if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING) + { + int bWantsForParsing; + + /* + * We can only get a filesystem path from a shellfolder if the + * value WantsFORPARSING in CLSID\\{...}\\shellfolder exists. + * + * Exception: The MyComputer folder doesn't have this key, + * but any other filesystem backed folder it needs it. + */ + if (IsEqualIID (*clsid, CLSID_MyComputer)) + { + bWantsForParsing = TRUE; + } + else + { + HKEY hkeyClass; + if (HCR_RegOpenClassIDKey(*clsid, &hkeyClass)) + { + LONG res = SHGetValueW(hkeyClass, L"Shellfolder", L"WantsForParsing", NULL, NULL, NULL); + bWantsForParsing = (res == ERROR_SUCCESS); + RegCloseKey(hkeyClass); + } + } + + if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && + bWantsForParsing) + { + /* + * we need the filesystem path to the destination folder. + * Only the folder itself can know it + */ + hr = SHELL32_GetDisplayNameOfChild (psf, pidl, dwFlags, + pszPath, + MAX_PATH); + } + else + { + wcscpy(pszPath, pszFolderPath); + PWCHAR pItemName = &pszPath[wcslen(pszPath)]; + + /* parsing name like ::{...} */ + pItemName[0] = ':'; + pItemName[1] = ':'; + SHELL32_GUIDToStringW (*clsid, &pItemName[2]); + } + } + else + { + /* user friendly name */ + HCR_GetClassNameW (*clsid, pszPath, MAX_PATH); + } + + if (SUCCEEDED(hr)) + { + strRet->uType = STRRET_WSTR; + strRet->pOleStr = pszPath; + } + else + { + CoTaskMemFree(pszPath); + } return hr; } @@ -399,27 +517,31 @@ * According to the MSDN documentation this function should not set flags. It claims only to reset flags when necessary. * However it turns out the native shell32.dll _sets_ flags in several cases - so do we. */ -HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) -{ - DWORD dwAttributes; - BOOL has_guid; - static const DWORD dwSupportedAttr= - SFGAO_CANCOPY | /*0x00000001 */ - SFGAO_CANMOVE | /*0x00000002 */ - SFGAO_CANLINK | /*0x00000004 */ - SFGAO_CANRENAME | /*0x00000010 */ - SFGAO_CANDELETE | /*0x00000020 */ - SFGAO_HASPROPSHEET | /*0x00000040 */ - SFGAO_DROPTARGET | /*0x00000100 */ - SFGAO_LINK | /*0x00010000 */ - SFGAO_READONLY | /*0x00040000 */ - SFGAO_HIDDEN | /*0x00080000 */ - SFGAO_FILESYSANCESTOR | /*0x10000000 */ - SFGAO_FOLDER | /*0x20000000 */ - SFGAO_FILESYSTEM | /*0x40000000 */ - SFGAO_HASSUBFOLDER; /*0x80000000 */ - - TRACE ("0x%08x\n", *pdwAttributes); + +static const DWORD dwSupportedAttr= + SFGAO_CANCOPY | /*0x00000001 */ + SFGAO_CANMOVE | /*0x00000002 */ + SFGAO_CANLINK | /*0x00000004 */ + SFGAO_CANRENAME | /*0x00000010 */ + SFGAO_CANDELETE | /*0x00000020 */ + SFGAO_HASPROPSHEET | /*0x00000040 */ + SFGAO_DROPTARGET | /*0x00000100 */ + SFGAO_LINK | /*0x00010000 */ + SFGAO_READONLY | /*0x00040000 */ + SFGAO_HIDDEN | /*0x00080000 */ + SFGAO_FILESYSANCESTOR | /*0x10000000 */ + SFGAO_FOLDER | /*0x20000000 */ + SFGAO_FILESYSTEM | /*0x40000000 */ + SFGAO_HASSUBFOLDER; /*0x80000000 */ + +HRESULT SHELL32_GetGuidItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) +{ + if (!_ILIsSpecialFolder(pidl)) + { + ERR("Got wrong type of pidl!\n"); + *pdwAttributes &= SFGAO_CANLINK; + return S_OK; + } if (*pdwAttributes & ~dwSupportedAttr) { @@ -427,79 +549,114 @@ *pdwAttributes &= dwSupportedAttr; } - has_guid = _ILGetGUIDPointer(pidl) != NULL; - - dwAttributes = *pdwAttributes; - - if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) - *pdwAttributes = dwAttributes; - else if (_ILGetDataPointer(pidl)) - { - dwAttributes = _ILGetFileAttributes(pidl, NULL, 0); - - if (!dwAttributes && has_guid) - { - WCHAR path[MAX_PATH]; - STRRET strret; - - /* File attributes are not present in the internal PIDL structure, so get them from the file system. */ - - HRESULT hr = psf->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strret); - - if (SUCCEEDED(hr)) + /* First try to get them from the registry */ + if (HCR_GetFolderAttributes(pidl, pdwAttributes) && *pdwAttributes) + { + return S_OK; + } + else + { + /* If we can't get it from the registry we have to query the child */ + CComPtr<IShellFolder> psf2; + if (SUCCEEDED(psf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) + { + return psf2->GetAttributesOf(0, NULL, pdwAttributes); + } + } + + *pdwAttributes &= SFGAO_CANLINK; + return S_OK; +} + +HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) +{ + DWORD dwAttributes; + + if (*pdwAttributes & ~dwSupportedAttr) + { + WARN ("attributes 0x%08x not implemented\n", (*pdwAttributes & ~dwSupportedAttr)); + *pdwAttributes &= dwSupportedAttr; + } + + dwAttributes = _ILGetFileAttributes(pidl, NULL, 0); + if (!dwAttributes) + { + ERR("Got 0 attrs!\n"); + *pdwAttributes &= SFGAO_CANLINK; + return S_OK; + } + + /* Set common attributes */ + *pdwAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE | + SFGAO_CANRENAME | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANCOPY; + + if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + *pdwAttributes |= (SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); + } + else + *pdwAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); + + if (dwAttributes & FILE_ATTRIBUTE_HIDDEN) + *pdwAttributes |= SFGAO_HIDDEN; + else + *pdwAttributes &= ~SFGAO_HIDDEN; + + if (dwAttributes & FILE_ATTRIBUTE_READONLY) + *pdwAttributes |= SFGAO_READONLY; + else + *pdwAttributes &= ~SFGAO_READONLY; + + if (SFGAO_LINK & *pdwAttributes) + { + char ext[MAX_PATH]; + + if (!_ILGetExtension(pidl, ext, MAX_PATH) || lstrcmpiA(ext, "lnk")) + *pdwAttributes &= ~SFGAO_LINK; + } + + if (SFGAO_HASSUBFOLDER & *pdwAttributes) + { + CComPtr<IShellFolder> psf2; + if (SUCCEEDED(psf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) + { + CComPtr<IEnumIDList> pEnumIL; + if (SUCCEEDED(psf2->EnumObjects(0, SHCONTF_FOLDERS, &pEnumIL))) { - hr = StrRetToBufW(&strret, pidl, path, MAX_PATH); - - /* call GetFileAttributes() only for file system paths, not for parsing names like "::{...}" */ - if (SUCCEEDED(hr) && path[0]!=':') - dwAttributes = GetFileAttributesW(path); + if (pEnumIL->Skip(1) != S_OK) + *pdwAttributes &= ~SFGAO_HASSUBFOLDER; } } - + } + + TRACE ("-- 0x%08x\n", *pdwAttributes); + return S_OK; +} + +HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) +{ + TRACE ("0x%08x\n", *pdwAttributes); + + if (*pdwAttributes & ~dwSupportedAttr) + { + WARN ("attributes 0x%08x not implemented\n", (*pdwAttributes & ~dwSupportedAttr)); + *pdwAttributes &= dwSupportedAttr; + } + + if (_ILIsSpecialFolder(pidl)) + { + return SHELL32_GetGuidItemAttributes(psf, pidl, pdwAttributes); + } + else if(_ILIsFolder(pidl) || _ILIsValue(pidl)) + { + return SHELL32_GetFSItemAttributes(psf, pidl, pdwAttributes); + } + else + { /* Set common attributes */ - *pdwAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE | - SFGAO_CANRENAME | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANCOPY; - - if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - *pdwAttributes |= (SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); - } - else - *pdwAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); - - if (dwAttributes & FILE_ATTRIBUTE_HIDDEN) - *pdwAttributes |= SFGAO_HIDDEN; - else - *pdwAttributes &= ~SFGAO_HIDDEN; - - if (dwAttributes & FILE_ATTRIBUTE_READONLY) - *pdwAttributes |= SFGAO_READONLY; - else - *pdwAttributes &= ~SFGAO_READONLY; - - if (SFGAO_LINK & *pdwAttributes) - { - char ext[MAX_PATH]; - - if (!_ILGetExtension(pidl, ext, MAX_PATH) || lstrcmpiA(ext, "lnk")) - *pdwAttributes &= ~SFGAO_LINK; - } - - if (SFGAO_HASSUBFOLDER & *pdwAttributes) - { - CComPtr<IShellFolder> psf2; - if (SUCCEEDED(psf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) - { - CComPtr<IEnumIDList> pEnumIL; - if (SUCCEEDED(psf2->EnumObjects(0, SHCONTF_FOLDERS, &pEnumIL))) - { - if (pEnumIL->Skip(1) != S_OK) - *pdwAttributes &= ~SFGAO_HASSUBFOLDER; - } - } - } - } else - *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME|SFGAO_CANLINK; + ERR("We got a pidl that is neither a guid or an FS item!!! Type=0x%x\n",pidl->mkid.abID[0]); + *pdwAttributes &= SFGAO_CANLINK; + } TRACE ("-- 0x%08x\n", *pdwAttributes); return S_OK; Modified: trunk/reactos/dll/win32/shell32/wine/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cla… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/classes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/classes.c [iso-8859-1] Mon Aug 17 11:36:56 2015 @@ -222,7 +222,7 @@ * * Gets the icon for a filetype */ -static BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey) +BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey) { char xriid[50]; sprintf( xriid, "CLSID\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",

9 years, 4 months

[gadamopoulos] 68728: [SHELL32] - CAdminToolsFolder: return proper attributes when no items are specified. (This is fine for reg folders but doesn't work for fs folders). - CFontsFolder: fix GetAtt...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Aug 17 11:28:20 2015 New Revision: 68728 URL: http://svn.reactos.org/svn/reactos?rev=68728&view=rev Log: [SHELL32] - CAdminToolsFolder: return proper attributes when no items are specified. (This is fine for reg folders but doesn't work for fs folders). - CFontsFolder: fix GetAttributesOf as above. Fix Initialize method to return success. All shell folders should support this method. - CNetFolder: Return the name of the folder when asked. - CPrinterFolder: It doesn't have subfolders so it doesn't make sense to implement BindToObject. Modified: trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp [iso-8859-1] Mon Aug 17 11:28:20 2015 @@ -114,7 +114,31 @@ HRESULT WINAPI CAdminToolsFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut) { - return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut); + static const DWORD dwAdminToolsAttributes = + SFGAO_STORAGE | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | + SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; + + if(cidl) + { + return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut); + } + else + { + if (!rgfInOut) + return E_INVALIDARG; + if (cidl && !apidl) + return E_INVALIDARG; + + if (*rgfInOut == 0) + *rgfInOut = ~0; + + *rgfInOut &= dwAdminToolsAttributes; + + /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ + *rgfInOut &= ~SFGAO_VALIDATE; + + return S_OK; + } } HRESULT WINAPI CAdminToolsFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, Modified: trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp [iso-8859-1] Mon Aug 17 11:28:20 2015 @@ -111,7 +111,31 @@ HRESULT WINAPI CFontsFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut) { - return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut); + static const DWORD dwFontsAttributes = + SFGAO_STORAGE | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | + SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; + + if(cidl) + { + return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut); + } + else + { + if (!rgfInOut) + return E_INVALIDARG; + if (cidl && !apidl) + return E_INVALIDARG; + + if (*rgfInOut == 0) + *rgfInOut = ~0; + + *rgfInOut &= dwFontsAttributes; + + /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ + *rgfInOut &= ~SFGAO_VALIDATE; + + return S_OK; + } } HRESULT WINAPI CFontsFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, @@ -222,7 +246,7 @@ { TRACE ("(%p)->(%p)\n", this, pidl); - return E_NOTIMPL; + return S_OK; } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Mon Aug 17 11:28:20 2015 @@ -279,11 +279,30 @@ */ HRESULT WINAPI CNetFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { - FIXME("(%p)->(pidl=%p,0x%08x,%p)\n", this, pidl, dwFlags, strRet); - pdump(pidl); + LPWSTR pszName; + + TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", this, pidl, dwFlags, strRet); + pdump (pidl); if (!strRet) return E_INVALIDARG; + + if (!pidl->mkid.cb) + { + pszName = (LPWSTR)CoTaskMemAlloc(MAX_PATH * sizeof(WCHAR)); + if (!pszName) + return E_OUTOFMEMORY; + + if (LoadStringW(shell32_hInstance, IDS_NETWORKPLACE, pszName, MAX_PATH)) + { + pszName[MAX_PATH-1] = L'\0'; + strRet->uType = STRRET_WSTR; + strRet->pOleStr = pszName; + return S_OK; + } + CoTaskMemFree(pszName); + return E_FAIL; + } return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp [iso-8859-1] Mon Aug 17 11:28:20 2015 @@ -370,10 +370,7 @@ */ HRESULT WINAPI CPrinterFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) { - TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", this, - pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); - - return SHELL32_BindToChild(pidlRoot, NULL, pidl, riid, ppvOut); + return E_NOTIMPL; } /**************************************************************************

9 years, 4 months

[gadamopoulos] 68727: [SHELL32] - Do not try to set the site of the context menu from the CDefView. This should be done elsewhere and should be the context menu callback.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Aug 17 11:22:11 2015 New Revision: 68727 URL: http://svn.reactos.org/svn/reactos?rev=68727&view=rev Log: [SHELL32] - Do not try to set the site of the context menu from the CDefView. This should be done elsewhere and should be the context menu callback. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Mon Aug 17 11:22:11 2015 @@ -1223,10 +1223,6 @@ if (FAILED(hResult)) goto cleanup; - hResult = IUnknown_SetSite(m_pCM, (IShellView *)this); - //if (FAILED( hResult)) - // goto cleanup; - hResult = m_pCM->QueryContextMenu(hMenu, 0, 0x20, 0x7fff, CMF_DEFAULTONLY); if (FAILED(hResult)) goto cleanup; @@ -1251,10 +1247,7 @@ DestroyMenu(hMenu); if (m_pCM) - { - IUnknown_SetSite(m_pCM, NULL); m_pCM.Release(); - } return hResult; } @@ -1290,10 +1283,6 @@ if (FAILED( hResult)) goto cleanup; - hResult = IUnknown_SetSite(m_pCM, (IShellView *)this); - //if (FAILED( hResult)) - // goto cleanup; - hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED( hResult)) goto cleanup; @@ -1319,10 +1308,7 @@ cleanup: if (m_pCM) - { - IUnknown_SetSite(m_pCM, NULL); m_pCM.Release(); - } if (hMenu) DestroyMenu(hMenu); @@ -1343,10 +1329,6 @@ hResult = GetItemObject( bUseSelection ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM)); if (FAILED( hResult)) goto cleanup; - - hResult = IUnknown_SetSite(m_pCM, (IShellView *)this); - //if (FAILED( hResult)) - // goto cleanup; hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED( hResult)) @@ -1361,10 +1343,7 @@ cleanup: if (m_pCM) - { - IUnknown_SetSite(m_pCM, NULL); m_pCM.Release(); - } if (hMenu) DestroyMenu(hMenu);

9 years, 4 months

[tfaber] 68726: [WININET] - Repair the ROS-Diff from r54992. Now we hopefully don't initialize the URL cache multiple times anymore.

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Aug 17 08:14:24 2015 New Revision: 68726 URL: http://svn.reactos.org/svn/reactos?rev=68726&view=rev Log: [WININET] - Repair the ROS-Diff from r54992. Now we hopefully don't initialize the URL cache multiple times anymore. Modified: trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/wininet_ros.diff Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… ============================================================================== --- trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] Mon Aug 17 08:14:24 2015 @@ -804,6 +804,10 @@ cache_containers_add(DefaultContainerData[i].cache_prefix, wszCachePath, DefaultContainerData[i].default_entry_type, wszMutexName); } + +#ifdef __REACTOS__ + bDefaultContainersAdded = TRUE; +#endif } static void cache_containers_free(void) @@ -823,9 +827,11 @@ if(!url) return ERROR_INVALID_PARAMETER; +#ifdef __REACTOS__ /* ReactOS r54992 */ if (!bDefaultContainersAdded) cache_containers_init(); +#endif LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) { @@ -853,9 +859,11 @@ if (search_pattern && index > 0) return FALSE; +#ifdef __REACTOS__ /* ReactOS r54992 */ if (!bDefaultContainersAdded) cache_containers_init(); +#endif LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) { @@ -4014,7 +4022,9 @@ return FALSE; } +#ifndef __REACTOS__ cache_containers_init(); +#endif return TRUE; } Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] Mon Aug 17 08:14:24 2015 @@ -111,25 +111,50 @@ for (i = 0; i < sizeof(DefaultContainerData) / sizeof(DefaultContainerData[0]); i++) { WCHAR wszCachePath[MAX_PATH]; -@@ -835,6 +823,10 @@ static DWORD cache_containers_find(const +@@ -816,6 +804,10 @@ static void cache_containers_init(void) + cache_containers_add(DefaultContainerData[i].cache_prefix, wszCachePath, + DefaultContainerData[i].default_entry_type, wszMutexName); + } ++ ++#ifdef __REACTOS__ ++ bDefaultContainersAdded = TRUE; ++#endif + } + + static void cache_containers_free(void) +@@ -835,6 +827,12 @@ static DWORD cache_containers_find(const if(!url) return ERROR_INVALID_PARAMETER; ++#ifdef __REACTOS__ + /* ReactOS r54992 */ + if (!bDefaultContainersAdded) + cache_containers_init(); ++#endif + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) { int prefix_len = strlen(container->cache_prefix); -@@ -861,6 +853,10 @@ static BOOL cache_containers_enum(char * +@@ -861,6 +859,12 @@ static BOOL cache_containers_enum(char * if (search_pattern && index > 0) return FALSE; ++#ifdef __REACTOS__ + /* ReactOS r54992 */ + if (!bDefaultContainersAdded) + cache_containers_init(); ++#endif + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) { if (search_pattern) +@@ -4018,7 +4022,9 @@ BOOL init_urlcache(void) + return FALSE; + } + ++#ifndef __REACTOS__ + cache_containers_init(); ++#endif + return TRUE; + } +

9 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2015