Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Aug 27 03:56:05 2007 New Revision: 28588 URL: http://svn.reactos.org/svn/reactos?rev=28588&view=rev Log: - fix warning Modified: trunk/reactos/base/shell/cmd/misc.c Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c (original) +++ trunk/reactos/base/shell/cmd/misc.c Mon Aug 27 03:56:05 2007 @@ -105,7 +105,7 @@ */ VOID GetPathCase( TCHAR * Path, TCHAR * OutPath) { - INT i = 0; + UINT i = 0; TCHAR TempPath[MAX_PATH]; WIN32_FIND_DATA FindFileData; HANDLE hFind;

17 years

[janderwald] 28587: - add restart button by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us - the icon is taken from the tango project (see view-refresh.svg) See issue #2599 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Aug 27 03:41:04 2007 New Revision: 28587 URL: http://svn.reactos.org/svn/reactos?rev=28587&view=rev Log: - add restart button by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us - the icon is taken from the tango project (see view-refresh.svg) See issue #2599 for more details. Added: trunk/reactos/base/shell/explorer/res/restart.ico (with props) Modified: trunk/reactos/base/shell/explorer/explorer-bg.rc trunk/reactos/base/shell/explorer/explorer-bn.rc trunk/reactos/base/shell/explorer/explorer-cn.rc trunk/reactos/base/shell/explorer/explorer-cz.rc trunk/reactos/base/shell/explorer/explorer-de.rc trunk/reactos/base/shell/explorer/explorer-en.rc trunk/reactos/base/shell/explorer/explorer-es.rc trunk/reactos/base/shell/explorer/explorer-fr.rc trunk/reactos/base/shell/explorer/explorer-gr.rc trunk/reactos/base/shell/explorer/explorer-hu.rc trunk/reactos/base/shell/explorer/explorer-id.rc trunk/reactos/base/shell/explorer/explorer-it.rc trunk/reactos/base/shell/explorer/explorer-jp.rc trunk/reactos/base/shell/explorer/explorer-nl.rc trunk/reactos/base/shell/explorer/explorer-no.rc trunk/reactos/base/shell/explorer/explorer-pl.rc trunk/reactos/base/shell/explorer/explorer-pt.rc trunk/reactos/base/shell/explorer/explorer-ro.rc trunk/reactos/base/shell/explorer/explorer-ru.rc trunk/reactos/base/shell/explorer/explorer-sk.rc trunk/reactos/base/shell/explorer/explorer-sv.rc trunk/reactos/base/shell/explorer/explorer-uk.rc trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/explorer_intres.rc trunk/reactos/base/shell/explorer/globals.h trunk/reactos/base/shell/explorer/resource.h trunk/reactos/base/shell/explorer/taskbar/desktopbar.h trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp trunk/reactos/base/shell/explorer/taskbar/startmenu.h Modified: trunk/reactos/base/shell/explorer/explorer-bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-bg.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-bg.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Ïóñê" IDS_LOGOFF "Èçõîä..." IDS_SHUTDOWN "Èçêëþ÷âàíå..." + IDS_RESTART "Restart..." IDS_LAUNCH "Èçïúëíÿâàíå..." IDS_START_HELP "Ïîìîù" IDS_SEARCH_FILES "Òúðñåíå" @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-bn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-bn.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-bn.rc Mon Aug 27 03:41:04 2007 @@ -327,6 +327,7 @@ IDS_START "Kvh©Kvix ZvwjKv" IDS_LOGOFF "Log Off..." IDS_SHUTDOWN "eÜ Kiv..." + IDS_RESTART "Restart..." IDS_LAUNCH "cwiPvjbv..." IDS_START_HELP "mvnvh¨" IDS_SEARCH_FILES "AbymÜvb..." @@ -394,3 +395,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cn.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-cn.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "¿ªÊ¼" IDS_LOGOFF "×¢Ïú..." IDS_SHUTDOWN "¹Ø±Õ..." + IDS_RESTART "Restart..." IDS_LAUNCH "ÔËÐÐ..." IDS_START_HELP "°ïÖú" IDS_SEARCH_FILES "ËÑË÷..." Modified: trunk/reactos/base/shell/explorer/explorer-cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cz.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-cz.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Odhlásit se..." IDS_SHUTDOWN "Vypnout..." + IDS_RESTART "Restart..." IDS_LAUNCH "Spustit..." IDS_START_HELP "Pomoc" IDS_SEARCH_FILES "Hledat" @@ -398,3 +399,4 @@ #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-de.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-de.rc Mon Aug 27 03:41:04 2007 @@ -336,6 +336,7 @@ IDS_START "Start" IDS_LOGOFF "Abmelden..." IDS_SHUTDOWN "Herunterfahren..." + IDS_RESTART "Restart..." IDS_LAUNCH "Ausführen..." IDS_START_HELP "Hilfe" IDS_SEARCH_FILES "Suche Dateien..." @@ -403,3 +404,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-en.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-en.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Log Off..." IDS_SHUTDOWN "Turn Off..." + IDS_RESTART "Restart..." IDS_LAUNCH "Run..." IDS_START_HELP "Help" IDS_SEARCH_FILES "Search..." @@ -398,3 +399,4 @@ #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-es.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-es.rc Mon Aug 27 03:41:04 2007 @@ -315,6 +315,7 @@ IDS_START "Iniciar" IDS_LOGOFF "Salir..." IDS_SHUTDOWN "Apagar..." + IDS_RESTART "Restart..." IDS_LAUNCH "Ejecutar..." IDS_START_HELP "Ayuda" IDS_SEARCH_FILES "Buscar..." @@ -382,3 +383,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-fr.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-fr.rc Mon Aug 27 03:41:04 2007 @@ -329,6 +329,7 @@ IDS_START "Démarrer" IDS_LOGOFF "Se déconnecter..." IDS_SHUTDOWN "Arrêter..." + IDS_RESTART "Restart..." IDS_LAUNCH "Exécuter..." IDS_START_HELP "Aide" IDS_SEARCH_FILES "Rechercher..." @@ -396,3 +397,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-gr.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-gr.rc Mon Aug 27 03:41:04 2007 @@ -332,6 +332,7 @@ IDS_START "Ýíáñîç" IDS_LOGOFF "Áðïóýíäåóç..." IDS_SHUTDOWN "Ôåñìáôéóìüò..." + IDS_RESTART "Restart..." IDS_LAUNCH "ÅêôÝëåóç..." IDS_START_HELP "ÂïÞèåéá" IDS_SEARCH_FILES "ÁíáæÞôçóç..." @@ -399,3 +400,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-hu.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-hu.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Kijelentkezés..." IDS_SHUTDOWN "Kikapcsolás..." + IDS_RESTART "Restart..." IDS_LAUNCH "Futtatás..." IDS_START_HELP "Súgó" IDS_SEARCH_FILES "Keresés..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-id.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-id.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Mulai" IDS_LOGOFF "Keluar..." IDS_SHUTDOWN "Matikan..." + IDS_RESTART "Restart..." IDS_LAUNCH "Jalankan..." IDS_START_HELP "Bantuan" IDS_SEARCH_FILES "Cari..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-it.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-it.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-it.rc Mon Aug 27 03:41:04 2007 @@ -294,6 +294,7 @@ IDS_START "Start" IDS_LOGOFF "Disconnetti..." IDS_SHUTDOWN "Chiudi sessione..." + IDS_RESTART "Restart..." IDS_LAUNCH "Esegui..." IDS_START_HELP "Guida" IDS_SEARCH_FILES "Cerca..." @@ -361,3 +362,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-jp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-jp.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-jp.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "½À°Ä" IDS_LOGOFF "OIt..." IDS_SHUTDOWN "Vbg_E..." + IDS_RESTART "Restart..." IDS_LAUNCH "t@C¼ðwèµÄÀs..." IDS_START_HELP "wv" IDS_SEARCH_FILES "t@CâtH_..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-nl.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-nl.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Afmelden..." IDS_SHUTDOWN "Uitschakelen..." + IDS_RESTART "Restart..." IDS_LAUNCH "Uitvoeren..." IDS_START_HELP "Help" IDS_SEARCH_FILES "Zoeken..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-no.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-no.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Logg av..." IDS_SHUTDOWN "Slå av..." + IDS_RESTART "Restart..." IDS_LAUNCH "Kjør..." IDS_START_HELP "Hjelp" IDS_SEARCH_FILES "Søk..." @@ -398,3 +399,4 @@ #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-pl.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-pl.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Wyloguj..." IDS_SHUTDOWN "Zamknij system..." + IDS_RESTART "Restart..." IDS_LAUNCH "Uruchom..." IDS_START_HELP "Pomoc" IDS_SEARCH_FILES "Szukaj..." @@ -398,3 +399,4 @@ #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-pt.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-pt.rc Mon Aug 27 03:41:04 2007 @@ -98,6 +98,7 @@ IDS_START "Iniciar" IDS_LOGOFF "Terminar sessão..." IDS_SHUTDOWN "Desligar..." + IDS_RESTART "Restart..." IDS_LAUNCH "Executar..." IDS_START_HELP "Ajuda" IDS_SEARCH_FILES "Procurar..." @@ -165,3 +166,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ro.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-ro.rc Mon Aug 27 03:41:04 2007 @@ -134,6 +134,7 @@ IDS_START "Începe" IDS_LOGOFF "Închide sesiunea ..." IDS_SHUTDOWN "Oprire calculator ..." + IDS_RESTART "Restart..." IDS_LAUNCH "Pornire ..." IDS_START_HELP "Ajutor" IDS_SEARCH_FILES "Cãutare Files..." @@ -243,3 +244,4 @@ #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ru.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-ru.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Ïóñê" IDS_LOGOFF "Âûõîä èç ñèñòåìû..." IDS_SHUTDOWN "Âûêëþ÷åíèå..." + IDS_RESTART "Restart..." IDS_LAUNCH "Âûïîëíèòü..." IDS_START_HELP "Ñïðàâêà" IDS_SEARCH_FILES "Ïîèñê..." @@ -398,3 +399,4 @@ #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sk.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-sk.rc Mon Aug 27 03:41:04 2007 @@ -340,6 +340,7 @@ IDS_START "tart" IDS_LOGOFF "Odhlási..." IDS_SHUTDOWN "Vypnú..." + IDS_RESTART "Restart..." IDS_LAUNCH "Spusti..." IDS_START_HELP "Pomocník" IDS_SEARCH_FILES "H¾ada..." @@ -407,3 +408,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sv.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-sv.rc Mon Aug 27 03:41:04 2007 @@ -325,6 +325,7 @@ IDS_START "Start" IDS_LOGOFF "Logga ut..." IDS_SHUTDOWN "Stäng av..." + IDS_RESTART "Restart..." IDS_LAUNCH "Kör..." IDS_START_HELP "Hjälp" IDS_SEARCH_FILES "Sök..." @@ -392,3 +393,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-uk.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-uk.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Ïóñê" IDS_LOGOFF "Âèõ³ä ³ç ñèñòåìè..." IDS_SHUTDOWN "Âèìêíåííÿ..." + IDS_RESTART "Restart..." IDS_LAUNCH "Âèêîíàòè..." IDS_START_HELP "Äîâ³äêà" IDS_SEARCH_FILES "Ïîøóê..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp Mon Aug 27 03:41:04 2007 @@ -402,6 +402,7 @@ _icons[ICID_COMPUTER] = Icon(ICID_COMPUTER, IDI_COMPUTER, icon_size); _icons[ICID_LOGOFF] = Icon(ICID_LOGOFF, IDI_LOGOFF, icon_size); _icons[ICID_SHUTDOWN] = Icon(ICID_SHUTDOWN, IDI_SHUTDOWN, icon_size); + _icons[ICID_RESTART] = Icon(ICID_RESTART, IDI_RESTART, icon_size); _icons[ICID_BOOKMARK] = Icon(ICID_BOOKMARK, IDI_DOT_TRANS, icon_size); _icons[ICID_MINIMIZE] = Icon(ICID_MINIMIZE, IDI_MINIMIZE, icon_size); _icons[ICID_CONTROLPAN] = Icon(ICID_CONTROLPAN, IDI_CONTROLPAN, icon_size); Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc Mon Aug 27 03:41:04 2007 @@ -152,6 +152,7 @@ IDI_STARTMENU ICON DISCARDABLE "res/startmenu.ico" IDI_LOGOFF ICON DISCARDABLE "res/logoff.ico" IDI_SHUTDOWN ICON DISCARDABLE "res/shutdown.ico" +IDI_RESTART ICON DISCARDABLE "res/restart.ico" IDI_ARROW ICON DISCARDABLE "res/arrow.ico" IDI_ARROW_SELECTED ICON DISCARDABLE "res/arrowsel.ico" IDI_APPICON ICON DISCARDABLE "res/appicon.ico" @@ -244,3 +245,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/global… ============================================================================== --- trunk/reactos/base/shell/explorer/globals.h (original) +++ trunk/reactos/base/shell/explorer/globals.h Mon Aug 27 03:41:04 2007 @@ -81,6 +81,7 @@ ICID_COMPUTER, ICID_LOGOFF, ICID_SHUTDOWN, + ICID_RESTART, ICID_BOOKMARK, ICID_MINIMIZE, ICID_CONTROLPAN, Added: trunk/reactos/base/shell/explorer/res/restart.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/re… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/shell/explorer/res/restart.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/shell/explorer/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/resour… ============================================================================== --- trunk/reactos/base/shell/explorer/resource.h (original) +++ trunk/reactos/base/shell/explorer/resource.h Mon Aug 27 03:41:04 2007 @@ -48,6 +48,7 @@ #define IDS_SHOW_HIDDEN_ICONS 43 #define IDS_HIDE_ICONS 44 #define IDS_TERMINATE 45 +#define IDS_RESTART 46 #define IDI_REACTOS 100 #define IDI_EXPLORER 101 #define IDI_STARTMENU 102 @@ -123,6 +124,7 @@ #define IDI_NETCONNS 175 #define IDI_ADMIN 176 #define IDI_RECENT 178 +#define IDI_RESTART 179 #define ID_VIEW_NAME 401 #define ID_VIEW_ALL_ATTRIBUTES 402 #define ID_VIEW_SELECTED_ATTRIBUTES 403 Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.h (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.h Mon Aug 27 03:41:04 2007 @@ -59,6 +59,7 @@ #define IDC_SEARCH_PROGRAM 0x1016 #define IDC_SEARCH 0x1017 #define IDC_TERMINATE 0x1018 +#define IDC_RESTART 0x1019 #define IDC_FIRST_MENU 0x3000 Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp Mon Aug 27 03:41:04 2007 @@ -1752,20 +1752,22 @@ #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) + if (!g_Globals._SHRestricted || SHRestricted(REST_STARTMENULOGOFF) != 1) +#else + if (IS_VALUE_NOT_ZERO(hkeyAdv, _T("StartMenuLogoff"))) +#endif + AddButton(ResString(IDS_LOGOFF), ICID_LOGOFF, false, IDC_LOGOFF); + +#ifdef _ROS_ + AddButton(ResString(IDS_RESTART), ICID_RESTART, false, IDC_RESTART); +#endif + +#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCLOSE)) #else - if (IS_VALUE_NOT_ZERO(hkeyAdv, _T("StartMenuLogoff"))) -#endif - AddButton(ResString(IDS_LOGOFF), ICID_LOGOFF, false, IDC_LOGOFF); - - -#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) - if (!g_Globals._SHRestricted || SHRestricted(REST_STARTMENULOGOFF) != 1) -#else if (IS_VALUE_ZERO(hkey, _T("NoClose"))) #endif AddButton(ResString(IDS_SHUTDOWN), ICID_SHUTDOWN, false, IDC_SHUTDOWN); - #ifndef _ROS_ AddButton(ResString(IDS_TERMINATE), ICID_LOGOFF, false, IDC_TERMINATE); @@ -1940,9 +1942,15 @@ case IDC_SHUTDOWN: CloseStartMenu(id); - ShowExitWindowsDialog(g_Globals._hwndDesktopBar); - break; - + ShowExitWindowsDialog(g_Globals._hwndDesktop); + break; + + case IDC_RESTART: + CloseStartMenu(id); + ShowRestartDialog(g_Globals._hwndDesktop, EWX_REBOOT); + /* An alternative way to do restart without shell32 help */ + //launch_file(_hwnd, TEXT("shutdown.exe"), SW_HIDE, TEXT("-r")); + break; // settings menu @@ -2149,6 +2157,15 @@ MessageBox(hwndOwner, TEXT("ExitWindowsDialog() not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); } +void StartMenuHandler::ShowRestartDialog(HWND hwndOwner, UINT flags) +{ + static DynamicFct<RESTARTWINDOWSDLG> RestartDlg(TEXT("SHELL32"), 59); + + if (RestartDlg) + (*RestartDlg)(hwndOwner, (LPWSTR)L"You selected restart.\n\n", flags); + else + MessageBox(hwndOwner, TEXT("RestartDlg() not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); +} void SettingsMenu::AddEntries() { Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.h (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.h Mon Aug 27 03:41:04 2007 @@ -348,6 +348,7 @@ static void ShowLaunchDialog(HWND hwndOwner); static void ShowLogoffDialog(HWND hwndOwner); + static void ShowRestartDialog(HWND hwndOwner, UINT flags); static void ShowSearchDialog(); static void ShowSearchComputer(); };

17 years

[greatlrd] 28586: fix the build

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Aug 27 03:01:18 2007 New Revision: 28586 URL: http://svn.reactos.org/svn/reactos?rev=28586&view=rev Log: fix the build Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Mon Aug 27 03:01:18 2007 @@ -2616,11 +2616,22 @@ return 0; } - - - - - - - - + /* + * @unimplemented + */ + DWORD +STDCALL +NtGdiDvpGetVideoPortField( + IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTFIELDDATA puGetVPortFieldData) +{ + UNIMPLEMENTED; + return 0; +} + + + + + + +

17 years

[janderwald] 28585: - dont show the same resolution multiple times - sort the resolution according to width, height and bits per pixel See issue #2594 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Aug 27 02:43:51 2007 New Revision: 28585 URL: http://svn.reactos.org/svn/reactos?rev=28585&view=rev Log: - dont show the same resolution multiple times - sort the resolution according to width, height and bits per pixel See issue #2594 for more details. Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Mon Aug 27 02:43:51 2007 @@ -137,11 +137,11 @@ Current->dmPelsHeight = devmode.dmPelsHeight; Current->dmBitsPerPel = devmode.dmBitsPerPel; while (Next != NULL && ( - Next->dmPelsHeight < Current->dmPelsHeight || - (Next->dmPelsHeight == Current->dmPelsHeight && Next->dmBitsPerPel < Current->dmBitsPerPel) || + Next->dmPelsWidth < Current->dmPelsWidth || + (Next->dmPelsWidth == Current->dmPelsWidth && Next->dmPelsHeight < Current->dmPelsHeight) || (Next->dmPelsHeight == Current->dmPelsHeight && - Next->dmBitsPerPel == Current->dmBitsPerPel && - Next->dmPelsWidth < Current->dmPelsWidth))) + Next->dmPelsWidth == Current->dmPelsWidth && + Next->dmBitsPerPel < Current->dmBitsPerPel ))) { Previous = Next; Next = Next->Flink; @@ -194,7 +194,7 @@ for (Current = newEntry->Settings; Current != NULL; Current = Current->Flink) { if (Current->Flink != NULL && - ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) || + ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) && (Current->dmPelsHeight != Current->Flink->dmPelsHeight))) { ResolutionsCount++; @@ -211,7 +211,7 @@ { if (Current->Flink == NULL || (Current->Flink != NULL && - ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) || + ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) && (Current->dmPelsHeight != Current->Flink->dmPelsHeight)))) { newEntry->Resolutions[i].dmPelsWidth = Current->dmPelsWidth;

17 years

[greatlrd] 28584: Implement stub for NtGdiDvpGetVideoPortField, NtGdiDvpGetVideoPortFlipStatus, NtGdiDvpGetVideoPortInputFormats, NtGdiDvpGetVideoPortLine, NtGdiDvpGetVideoPortOutputFormats, NtGdiDvpGetVideoPortConnectInfo, NtGdiDvpGetVideoSignalStatus, NtGdiDvpUpdateVideoPort, NtGdiDvpWaitForVideoPortSync, NtGdiDvpAcquireNotification, NtGdiDvpReleaseNotification, NtGdiDxgGenericThunk, NtGdiDeleteColorTransform, NtGdiGetPerBandInfo, NtGdiDoBanding, NtGdiEnumFontChunk, NtGdiEnumFontClose, NtGdiEn

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Aug 27 02:03:02 2007 New Revision: 28584 URL: http://svn.reactos.org/svn/reactos?rev=28584&view=rev Log: Implement stub for NtGdiDvpGetVideoPortField, NtGdiDvpGetVideoPortFlipStatus, NtGdiDvpGetVideoPortInputFormats, NtGdiDvpGetVideoPortLine, NtGdiDvpGetVideoPortOutputFormats, NtGdiDvpGetVideoPortConnectInfo, NtGdiDvpGetVideoSignalStatus, NtGdiDvpUpdateVideoPort, NtGdiDvpWaitForVideoPortSync, NtGdiDvpAcquireNotification, NtGdiDvpReleaseNotification, NtGdiDxgGenericThunk, NtGdiDeleteColorTransform, NtGdiGetPerBandInfo, NtGdiDoBanding, NtGdiEnumFontChunk, NtGdiEnumFontClose, NtGdiEnumFontOpen, NtGdiEudcLoadUnloadLink, NtGdiExtTextOutW, NtGdiForceUFIMapping, NtGdiFullscreenControl, NtGdiGetAppClipBox, NtGdiGetCharABCWidthsW, NtGdiGetCharacterPlacementW, NtGdiGetCharWidthW, NtGdiGetCharWidthInfo, NtGdiGetColorSpaceforBitmap, NtGdiGetDCforBitmap, NtGdiGetDCObject, NtGdiGetDeviceCapsAll, NtGdiGetETM, NtGdiGetEudcTimeStampEx Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Mon Aug 27 02:03:02 2007 @@ -2141,3 +2141,486 @@ return 0; } + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpGetVideoPortFlipStatus( + IN HANDLE hDirectDraw, + IN OUT PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpGetVideoPortInputFormats( + IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpGetVideoPortLine( + IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTLINEDATA puGetVPortLineData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpGetVideoPortOutputFormats( + IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpGetVideoPortConnectInfo( + IN HANDLE hDirectDraw, + IN OUT PDD_GETVPORTCONNECTDATA puGetVPortConnectData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpGetVideoSignalStatus( + IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTSIGNALDATA puGetVPortSignalData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpUpdateVideoPort( + IN HANDLE hVideoPort, + IN HANDLE* phSurfaceVideo, + IN HANDLE* phSurfaceVbi, + IN OUT PDD_UPDATEVPORTDATA puUpdateVPortData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpWaitForVideoPortSync( + IN HANDLE hVideoPort, + IN OUT PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpAcquireNotification( + IN HANDLE hVideoPort, + IN OUT HANDLE* hEvent, + IN LPDDVIDEOPORTNOTIFY pNotify) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpReleaseNotification( + IN HANDLE hVideoPort, + IN HANDLE hEvent) +{ + UNIMPLEMENTED; + return 0; +} + + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDxgGenericThunk( + IN ULONG_PTR ulIndex, + IN ULONG_PTR ulHandle, + IN OUT SIZE_T *pdwSizeOfPtr1, + IN OUT PVOID pvPtr1, + IN OUT SIZE_T *pdwSizeOfPtr2, + IN OUT PVOID pvPtr2) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiDeleteColorTransform( + IN HDC hdc, + IN HANDLE hColorTransform) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +ULONG +STDCALL +NtGdiGetPerBandInfo( + IN HDC hdc, + IN OUT PERBANDINFO *ppbi) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiDoBanding( + IN HDC hdc, + IN BOOL bStart, + OUT POINTL *pptl, + OUT PSIZE pSize) +{ + UNIMPLEMENTED; + return FALSE; +} + + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiEnumFontChunk( + IN HDC hdc, + IN ULONG_PTR idEnum, + IN ULONG cjEfdw, + OUT ULONG *pcjEfdw, + OUT PENUMFONTDATAW pefdw) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiEnumFontClose( + IN ULONG_PTR idEnum) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +ULONG_PTR +STDCALL +NtGdiEnumFontOpen( + IN HDC hdc, + IN ULONG iEnumType, + IN FLONG flWin31Compat, + IN ULONG cwchMax, + IN OPTIONAL LPWSTR pwszFaceName, + IN ULONG lfCharSet, + OUT ULONG *pulCount) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiEudcLoadUnloadLink( + IN OPTIONAL LPCWSTR pBaseFaceName, + IN UINT cwcBaseFaceName, + IN LPCWSTR pEudcFontPath, + IN UINT cwcEudcFontPath, + IN INT iPriority, + IN INT iFontLinkType, + IN BOOL bLoadLin) +{ + UNIMPLEMENTED; + return FALSE; +} + + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiExtTextOutW( + IN HDC hdc, + IN INT x, + IN INT y, + IN UINT flOpts, + IN OPTIONAL LPRECT prcl, + IN LPWSTR pwsz, + IN INT cwc, + IN OPTIONAL LPINT pdx, + IN DWORD dwCodePage) +{ + UNIMPLEMENTED; + return FALSE; +} + + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiForceUFIMapping( + IN HDC hdc, + IN PUNIVERSAL_FONT_ID pufi) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +NTSTATUS +STDCALL +NtGdiFullscreenControl( + IN FULLSCREENCONTROL FullscreenCommand, + IN PVOID FullscreenInput, + IN DWORD FullscreenInputLength, + OUT PVOID FullscreenOutput, + IN OUT PULONG FullscreenOutputLength) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +INT +STDCALL +NtGdiGetAppClipBox( + IN HDC hdc, + OUT LPRECT prc) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetCharABCWidthsW( + IN HDC hdc, + IN UINT wchFirst, + IN ULONG cwch, + IN OPTIONAL PWCHAR pwch, + IN FLONG fl, + OUT PVOID pvBuf) + { + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiGetCharacterPlacementW( + IN HDC hdc, + IN LPWSTR pwsz, + IN INT nCount, + IN INT nMaxExtent, + IN OUT LPGCP_RESULTSW pgcpw, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetCharWidthW( + IN HDC hdc, + IN UINT wcFirst, + IN UINT cwc, + IN OPTIONAL PWCHAR pwc, + IN FLONG fl, + OUT PVOID pvBuf) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetCharWidthInfo( + IN HDC hdc, + OUT PCHWIDTHINFO pChWidthInfo) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +ULONG_PTR +STDCALL +NtGdiGetColorSpaceforBitmap( + IN HBITMAP hsurf) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +HDC +STDCALL +NtGdiGetDCforBitmap( + IN HBITMAP hsurf) +{ + UNIMPLEMENTED; + return NULL; +} + + + /* + * @unimplemented + */ +HANDLE +STDCALL +NtGdiGetDCObject( + IN HDC hdc, + IN INT itype) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetDeviceCapsAll ( + IN HDC hdc, + OUT PDEVCAPS pDevCaps) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetETM( + IN HDC hdc, + OUT EXTTEXTMETRIC *petm) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +ULONG +STDCALL +NtGdiGetEudcTimeStampEx( + IN OPTIONAL LPWSTR lpBaseFaceName, + IN ULONG cwcBaseFaceName, + IN BOOL bSystemTimeStamp) +{ + UNIMPLEMENTED; + return 0; +} + + + + + + + + + Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Mon Aug 27 02:03:02 2007 @@ -113,25 +113,25 @@ NtGdiDvpDestroyVideoPort 2 NtGdiDvpFlipVideoPort 4 NtGdiDvpGetVideoPortBandwidth 2 -# NtGdiDvpGetVideoPortField 2 -# NtGdiDvpGetVideoPortFlipStatus 2 -# NtGdiDvpGetVideoPortInputFormats 2 -# NtGdiDvpGetVideoPortLine 2 -# NtGdiDvpGetVideoPortOutputFormats 2 -# NtGdiDvpGetVideoPortConnectInfo 2 -# NtGdiDvpGetVideoSignalStatus 2 -# NtGdiDvpUpdateVideoPort 4 -# NtGdiDvpWaitForVideoPortSync 2 -# NtGdiDvpAcquireNotification 3 -# NtGdiDvpReleaseNotification 2 -# NtGdiDxgGenericThunk 6 +NtGdiDvpGetVideoPortField 2 +NtGdiDvpGetVideoPortFlipStatus 2 +NtGdiDvpGetVideoPortInputFormats 2 +NtGdiDvpGetVideoPortLine 2 +NtGdiDvpGetVideoPortOutputFormats 2 +NtGdiDvpGetVideoPortConnectInfo 2 +NtGdiDvpGetVideoSignalStatus 2 +NtGdiDvpUpdateVideoPort 4 +NtGdiDvpWaitForVideoPortSync 2 +NtGdiDvpAcquireNotification 3 +NtGdiDvpReleaseNotification 2 +NtGdiDxgGenericThunk 6 NtGdiDeleteClientObj 1 NtGdiDeleteColorSpace 1 -# NtGdiDeleteColorTransform 2 +NtGdiDeleteColorTransform 2 NtGdiDeleteObjectApp 1 NtGdiDescribePixelFormat 4 -# NtGdiGetPerBandInfo 2 -# NtGdiDoBanding 4 +NtGdiGetPerBandInfo 2 +NtGdiDoBanding 4 NtGdiDoPalette 6 NtGdiDrawEscape 4 NtGdiEllipse 5 @@ -139,12 +139,12 @@ NtGdiEndDoc 1 NtGdiEndPage 1 NtGdiEndPath 1 -# NtGdiEnumFontChunk 5 -# NtGdiEnumFontClose 1 -# NtGdiEnumFontOpen 7 +NtGdiEnumFontChunk 5 +NtGdiEnumFontClose 1 +NtGdiEnumFontOpen 7 NtGdiEnumObjects 4 NtGdiEqualRgn 2 -# NtGdiEudcLoadUnloadLink 7 +NtGdiEudcLoadUnloadLink 7 NtGdiExcludeClipRect 5 NtGdiExtCreatePen 11 NtGdiExtCreateRegion 3 @@ -152,37 +152,37 @@ NtGdiExtFloodFill 5 NtGdiExtGetObjectW 3 NtGdiExtSelectClipRgn 3 -# NtGdiExtTextOutW 9 +NtGdiExtTextOutW 9 NtGdiFillPath 1 NtGdiFillRgn 3 NtGdiFlattenPath 1 NtGdiFlushUserBatch 0 NtGdiFlush 0 -# NtGdiForceUFIMapping 2 +NtGdiForceUFIMapping 2 NtGdiFrameRgn 5 -# NtGdiFullscreenControl 5 +NtGdiFullscreenControl 5 NtGdiGetAndSetDCDword 4 -# NtGdiGetAppClipBox 2 +NtGdiGetAppClipBox 2 NtGdiGetBitmapBits 3 NtGdiGetBitmapDimension 2 NtGdiGetBoundsRect 3 -# NtGdiGetCharABCWidthsW 6 -# NtGdiGetCharacterPlacementW 6 +NtGdiGetCharABCWidthsW 6 +NtGdiGetCharacterPlacementW 6 NtGdiGetCharSet 1 -# NtGdiGetCharWidthW 6 -# NtGdiGetCharWidthInfo 2 +NtGdiGetCharWidthW 6 +NtGdiGetCharWidthInfo 2 NtGdiGetColorAdjustment 2 -# NtGdiGetColorSpaceforBitmap 1 +NtGdiGetColorSpaceforBitmap 1 NtGdiGetDCDword 3 -# NtGdiGetDCforBitmap 1 -# NtGdiGetDCObject 2 +NtGdiGetDCforBitmap 1 +NtGdiGetDCObject 2 NtGdiGetDCPoint 3 NtGdiGetDeviceCaps 2 NtGdiGetDeviceGammaRamp 2 -# NtGdiGetDeviceCapsAll 2 +NtGdiGetDeviceCapsAll 2 NtGdiGetDIBitsInternal 9 -# NtGdiGetETM 2 -# NtGdiGetEudcTimeStampEx 3 +NtGdiGetETM 2 +NtGdiGetEudcTimeStampEx 3 NtGdiGetFontData 5 NtGdiGetFontResourceInfoInternalW 7 # NtGdiGetGlyphIndicesW 5

17 years

[janderwald] 28583: - creation of empty environment variables should not be possible (tested under Windows XP SP2) - dont create variables when cancel is hit - bug report + patch by Gregor Schneider (aka DosX) See issue #2600 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Aug 27 01:42:48 2007 New Revision: 28583 URL: http://svn.reactos.org/svn/reactos?rev=28583&view=rev Log: - creation of empty environment variables should not be possible (tested under Windows XP SP2) - dont create variables when cancel is hit - bug report + patch by Gregor Schneider (aka DosX) See issue #2600 for more details. Modified: trunk/reactos/dll/cpl/sysdm/environment.c Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Mon Aug 27 01:42:48 2007 @@ -266,6 +266,8 @@ /* Set user environment variables */ hwndListView = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_LIST); + (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT); + SetListViewColumns(hwndListView); SetEnvironmentVariables(hwndListView, @@ -273,11 +275,16 @@ _T("Environment")); (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); + + ListView_SetItemState(hwndListView,0,LVIS_FOCUSED,LVIS_FOCUSED); + (void)ListView_Update(hwndListView,0); /* Set system environment variables */ hwndListView = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + + (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT); SetListViewColumns(hwndListView); @@ -286,6 +293,9 @@ _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment")); (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); + + ListView_SetItemState(hwndListView,0,LVIS_FOCUSED,LVIS_FOCUSED); + (void)ListView_Update(hwndListView,0); } @@ -319,17 +329,22 @@ GlobalFree(VarData->lpCookedValue); GlobalFree(VarData); - } - - memset(&lvi, 0x00, sizeof(lvi)); - lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; - lvi.lParam = (LPARAM)VarData; - lvi.pszText = VarData->lpName; - lvi.state = 0; - iItem = ListView_InsertItem(hwndListView, &lvi); - - ListView_SetItemText(hwndListView, iItem, 1, + } + else + { + if(VarData->lpName != NULL && (VarData->lpCookedValue || VarData->lpRawValue)) + { + memset(&lvi, 0x00, sizeof(lvi)); + lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; + lvi.lParam = (LPARAM)VarData; + lvi.pszText = VarData->lpName; + lvi.state = 0; + iItem = ListView_InsertItem(hwndListView, &lvi); + + ListView_SetItemText(hwndListView, iItem, 1, (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); + } + } }

17 years

[greatlrd] 28582: Implement stub for NtGdiClearBrushAttributes, NtGdiColorCorrectPalette, NtGdiComputeXformCoefficients, NtGdiConsoleTextOut, NtGdiConvertMetafileRect, NtGdiCreateColorTransform, NtGdiDvpCanCreateVideoPort, NtGdiDvpColorControl, NtGdiDvpCreateVideoPort, NtGdiDvpDestroyVideoPort, NtGdiDvpFlipVideoPort, NtGdiDvpGetVideoPortBandwidth

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Aug 27 00:33:56 2007 New Revision: 28582 URL: http://svn.reactos.org/svn/reactos?rev=28582&view=rev Log: Implement stub for NtGdiClearBrushAttributes, NtGdiColorCorrectPalette, NtGdiComputeXformCoefficients, NtGdiConsoleTextOut, NtGdiConvertMetafileRect, NtGdiCreateColorTransform, NtGdiDvpCanCreateVideoPort, NtGdiDvpColorControl, NtGdiDvpCreateVideoPort, NtGdiDvpDestroyVideoPort, NtGdiDvpFlipVideoPort, NtGdiDvpGetVideoPortBandwidth Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Mon Aug 27 00:33:56 2007 @@ -1970,3 +1970,174 @@ return NULL; } + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpCanCreateVideoPort( + IN HANDLE hDirectDraw, + IN OUT PDD_CANCREATEVPORTDATA puCanCreateVPortData) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpColorControl( + IN HANDLE hVideoPort, + IN OUT PDD_VPORTCOLORDATA puVPortColorData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +HANDLE +STDCALL +NtGdiDvpCreateVideoPort( + IN HANDLE hDirectDraw, + IN OUT PDD_CREATEVPORTDATA puCreateVPortData) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpDestroyVideoPort( + IN HANDLE hVideoPort, + IN OUT PDD_DESTROYVPORTDATA puDestroyVPortData) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpFlipVideoPort( + IN HANDLE hVideoPort, + IN HANDLE hDDSurfaceCurrent, + IN HANDLE hDDSurfaceTarget, + IN OUT PDD_FLIPVPORTDATA puFlipVPortData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpGetVideoPortBandwidth( + IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +HBRUSH +STDCALL +NtGdiClearBrushAttributes( + IN HBRUSH hbm, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +ULONG +STDCALL +NtGdiColorCorrectPalette( + IN HDC hdc, + IN HPALETTE hpal, + IN ULONG FirstEntry, + IN ULONG NumberOfEntries, + IN OUT PALETTEENTRY *ppalEntry, + IN ULONG Command) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +HANDLE +STDCALL +NtGdiCreateColorTransform( + IN HDC hdc, + IN LPLOGCOLORSPACEW pLogColorSpaceW, + IN OPTIONAL PVOID pvSrcProfile, + IN ULONG cjSrcProfile, + IN OPTIONAL PVOID pvDestProfile, + IN ULONG cjDestProfile, + IN OPTIONAL PVOID pvTargetProfile, + IN ULONG cjTargetProfile) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiComputeXformCoefficients(IN HDC hdc) +{ + UNIMPLEMENTED; + return FALSE; +} + + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiConsoleTextOut( + IN HDC hdc, + IN POLYTEXTW *lpto, + IN UINT nStrings, + IN RECTL *prclBounds) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +LONG +STDCALL +NtGdiConvertMetafileRect( + IN HDC hdc, + IN OUT PRECTL prect) +{ + UNIMPLEMENTED; + return 0; +} + Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Mon Aug 27 00:33:56 2007 @@ -24,17 +24,17 @@ NtGdiCheckBitmapBits 8 NtGdiCloseFigure 1 NtGdiClearBitmapAttributes 2 -# NtGdiClearBrushAttributes 2 -# NtGdiColorCorrectPalette 6 +NtGdiClearBrushAttributes 2 +NtGdiColorCorrectPalette 6 NtGdiCombineRgn 4 NtGdiCombineTransform 3 -# NtGdiComputeXformCoefficients 1 -# NtGdiConsoleTextOut 4 -# NtGdiConvertMetafileRect 2 +NtGdiComputeXformCoefficients 1 +NtGdiConsoleTextOut 4 +NtGdiConvertMetafileRect 2 NtGdiCreateBitmap 5 NtGdiCreateClientObj 1 NtGdiCreateColorSpace 1 -# NtGdiCreateColorTransform 8 +NtGdiCreateColorTransform 8 NtGdiCreateCompatibleBitmap 3 NtGdiCreateCompatibleDC 1 NtGdiCreateDIBBrush 6 @@ -107,12 +107,12 @@ NtGdiDdUnlockD3D 2 NtGdiDdUpdateOverlay 3 NtGdiDdWaitForVerticalBlank 2 -# NtGdiDvpCanCreateVideoPort 2 -# NtGdiDvpColorControl 2 -# NtGdiDvpCreateVideoPort 2 -# NtGdiDvpDestroyVideoPort 2 -# NtGdiDvpFlipVideoPort 4 -# NtGdiDvpGetVideoPortBandwidth 2 +NtGdiDvpCanCreateVideoPort 2 +NtGdiDvpColorControl 2 +NtGdiDvpCreateVideoPort 2 +NtGdiDvpDestroyVideoPort 2 +NtGdiDvpFlipVideoPort 4 +NtGdiDvpGetVideoPortBandwidth 2 # NtGdiDvpGetVideoPortField 2 # NtGdiDvpGetVideoPortFlipStatus 2 # NtGdiDvpGetVideoPortInputFormats 2

17 years

[greatlrd] 28581: redirect FONTOBJ_cGetAllGlyphHandles, FONTOBJ_cGetGlyphs, FONTOBJ_pQueryGlyphAttrs, FONTOBJ_pfdg, FONTOBJ_pifi, FONTOBJ_pvTrueTypeFontFile, FONTOBJ_pxoGetXform, FONTOBJ_vGetInfo to win32k.sys do not redirect ExcludeClipRect, ExtSelectClipRgn, FillRgn to win32k.sys, make a smaller functions in gdi32 for now, we need write more thing in user mode.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Aug 27 00:00:40 2007 New Revision: 28581 URL: http://svn.reactos.org/svn/reactos?rev=28581&view=rev Log: redirect FONTOBJ_cGetAllGlyphHandles, FONTOBJ_cGetGlyphs, FONTOBJ_pQueryGlyphAttrs, FONTOBJ_pfdg, FONTOBJ_pifi, FONTOBJ_pvTrueTypeFontFile, FONTOBJ_pxoGetXform, FONTOBJ_vGetInfo to win32k.sys do not redirect ExcludeClipRect, ExtSelectClipRgn, FillRgn to win32k.sys, make a smaller functions in gdi32 for now, we need write more thing in user mode. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Mon Aug 27 00:00:40 2007 @@ -146,6 +146,46 @@ EngTextOut@40=NtGdiEngTextOut@40 EngTransparentBlt@32=NtGdiEngTransparentBlt@32 EngUnicodeToMultiByteN@20=RtlUnicodeToMultiByteN@20 +EngUnlockSurface@4=NtGdiEngUnlockSurface@4 +EngWideCharToMultiByte@20 +EnumEnhMetaFile@20 +EnumFontFamiliesA@16 +EnumFontFamiliesExA@20 +EnumFontFamiliesExW@20 +EnumFontFamiliesW@16 +EnumFontsA@16 +EnumFontsW@16 +EnumICMProfilesA@12 +EnumICMProfilesW@12 +EnumMetaFile@16 +EnumObjects@16 +EqualRgn@8=NtGdiEqualRgn@8 +Escape@20 +EudcLoadLinkW@16 +EudcUnloadLinkW@8 +ExcludeClipRect@20 +ExtCreatePen@20 +ExtCreateRegion@12 +ExtEscape@24 +ExtFloodFill@20 +ExtSelectClipRgn@12 +ExtTextOutA@32 +ExtTextOutW@32 +FONTOBJ_cGetAllGlyphHandles@8=NtGdiFONTOBJ_cGetAllGlyphHandles@8 +FONTOBJ_cGetGlyphs@20=NtGdiFONTOBJ_cGetGlyphs@20 +FONTOBJ_pQueryGlyphAttrs@8=NtGdiFONTOBJ_pQueryGlyphAttrs@8 +FONTOBJ_pfdg@4=NtGdiFONTOBJ_pfdg@4 +FONTOBJ_pifi@4=NtGdiFONTOBJ_pifi@4 +FONTOBJ_pvTrueTypeFontFile@8=NtGdiFONTOBJ_pvTrueTypeFontFile@8 +FONTOBJ_pxoGetXform@4=NtGdiFONTOBJ_pxoGetXform@4 +FONTOBJ_vGetInfo@12=NtGdiFONTOBJ_vGetInfo@12 +FillPath@4 +FillRgn@12 +FixBrushOrgEx@16 +FlattenPath@4 +FloodFill@16 +FontIsLinked@4 +FrameRgn@20=NtGdiFontIsLinked@4 ClearBitmapAttributes@8 ClearBrushAttributes@8 @@ -205,46 +245,7 @@ DdEntry54@8=NtGdiDdUnlockD3D@8 DdEntry55@12=NtGdiDdUpdateOverlay@12 DdEntry56@8=NtGdiDdWaitForVerticalBlank@8 -EngUnlockSurface@4=NtGdiEngUnlockSurface@4 -EngWideCharToMultiByte@20 -EnumEnhMetaFile@20 -EnumFontFamiliesA@16 -EnumFontFamiliesExA@20 -EnumFontFamiliesExW@20 -EnumFontFamiliesW@16 -EnumFontsA@16 -EnumFontsW@16 -EnumICMProfilesA@12 -EnumICMProfilesW@12 -EnumMetaFile@16 -EnumObjects@16 -EqualRgn@8=NtGdiEqualRgn@8 -Escape@20 -EudcLoadLinkW@16 -EudcUnloadLinkW@8 -ExcludeClipRect@20=NtGdiExcludeClipRect@20 -ExtCreatePen@20 -ExtCreateRegion@12=NtGdiExtCreateRegion@12 -ExtEscape@24 -ExtFloodFill@20 -ExtSelectClipRgn@12=NtGdiExtSelectClipRgn@12 -ExtTextOutA@32 -ExtTextOutW@32 -FillPath@4 -FillRgn@12=NtGdiFillRgn@12 -FixBrushOrgEx@16 -FlattenPath@4 -FloodFill@16 -FontIsLinked@4 -FONTOBJ_cGetAllGlyphHandles@8 -FONTOBJ_cGetGlyphs@20 -FONTOBJ_pQueryGlyphAttrs@8 -FONTOBJ_pfdg@4 -FONTOBJ_pifi@4 -FONTOBJ_pvTrueTypeFontFile@8 -FONTOBJ_pxoGetXform@4 -FONTOBJ_vGetInfo@12 -FrameRgn@20=NtGdiFrameRgn@20 + GdiAddFontResourceW@12 GdiAddGlsBounds@8 GdiAddGlsRecord@16 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Mon Aug 27 00:00:40 2007 @@ -2525,106 +2525,6 @@ NULL); } -/* - * @unimplemented - */ -ULONG -STDCALL -FONTOBJ_cGetAllGlyphHandles(IN FONTOBJ *FontObj, - IN HGLYPH *Glyphs) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -ULONG -STDCALL -FONTOBJ_cGetGlyphs(IN FONTOBJ *FontObj, - IN ULONG Mode, - IN ULONG NumGlyphs, - IN HGLYPH *GlyphHandles, - IN PVOID *OutGlyphs) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -PFD_GLYPHATTR STDCALL -FONTOBJ_pQueryGlyphAttrs(FONTOBJ *pfo,ULONG iMode) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -FD_GLYPHSET *STDCALL -FONTOBJ_pfdg(FONTOBJ *pfo) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -IFIMETRICS* -STDCALL -FONTOBJ_pifi(IN FONTOBJ *FontObj) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -PVOID -STDCALL -FONTOBJ_pvTrueTypeFontFile(IN FONTOBJ *FontObj, - IN ULONG *FileSize) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -XFORMOBJ* -STDCALL -FONTOBJ_pxoGetXform(IN FONTOBJ *FontObj) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -VOID -STDCALL -FONTOBJ_vGetInfo(IN FONTOBJ *FontObj, - IN ULONG InfoSize, - OUT PFONTINFO FontInfo) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -} /* * @unimplemented @@ -2857,3 +2757,39 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } + +/* + * @implemented + */ +INT +STDCALL +ExcludeClipRect(IN HDC hdc, IN INT xLeft, IN INT yTop, IN INT xRight, IN INT yBottom) +{ + /* FIXME some part need be done on user mode size */ + return NtGdiExcludeClipRect(hdc, xLeft, yTop, xRight, yBottom); +} + +/* + * @implemented + */ +INT +STDCALL +ExtSelectClipRgn( IN HDC hdc, IN HRGN hrgn, IN INT iMode) +{ + /* FIXME some part need be done on user mode size */ + return NtGdiExtSelectClipRgn(hdc,hrgn, iMode); +} + +/* + * @implemented + */ +BOOL +STDCALL +FillRgn( IN HDC hdc, IN HRGN hrgn, IN HBRUSH hbrush) +{ + /* FIXME some part need be done on user mode size */ + return NtGdiFillRgn( hdc, hrgn, hbrush); +} + + +

17 years

[ekohl] 28580: Add cursor options to the display page.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 26 23:58:13 2007 New Revision: 28580 URL: http://svn.reactos.org/svn/reactos?rev=28580&view=rev Log: Add cursor options to the display page. Modified: trunk/reactos/dll/cpl/access/access.rbuild trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/access/resource.h Modified: trunk/reactos/dll/cpl/access/access.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rbui… ============================================================================== --- trunk/reactos/dll/cpl/access/access.rbuild (original) +++ trunk/reactos/dll/cpl/access/access.rbuild Sun Aug 26 23:58:13 2007 @@ -1,13 +1,13 @@ -<module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}" installbase="system32" installname="access.cpl"> +<module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}" installbase="system32" installname="access.cpl" unicode="yes"> <importlibrary definition="access.def" /> <include base="access">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> + <define name="_WIN32_WINNT">0x600</define> + <define name="WINVER">0x609</define> <library>kernel32</library> + <library>gdi32</library> <library>user32</library> <library>advapi32</library> <library>comctl32</library> Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c (original) +++ trunk/reactos/dll/cpl/access/display.c Sun Aug 26 23:58:13 2007 @@ -19,7 +19,14 @@ typedef struct _GLOBAL_DATA { HIGHCONTRAST highContrast; + UINT uCaretBlinkTime; + UINT uCaretWidth; + BOOL fShowCaret; + RECT rcCaret; + RECT rcOldCaret; } GLOBAL_DATA, *PGLOBAL_DATA; + +#define ID_BLINK_TIMER 346 static VOID @@ -140,6 +147,7 @@ { PGLOBAL_DATA pGlobalData; LPPSHNOTIFY lppsn; + INT i; pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -152,17 +160,41 @@ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); - /* Get sticky keys information */ + /* Get high contrast information */ pGlobalData->highContrast.cbSize = sizeof(HIGHCONTRAST); SystemParametersInfo(SPI_GETHIGHCONTRAST, sizeof(HIGHCONTRAST), &pGlobalData->highContrast, 0); + SystemParametersInfo(SPI_GETCARETWIDTH, + 0, + &pGlobalData->uCaretWidth, + 0); + + pGlobalData->uCaretBlinkTime = GetCaretBlinkTime(); + + pGlobalData->fShowCaret = TRUE; + GetWindowRect(GetDlgItem(hwndDlg, IDC_CURSOR_WIDTH_TEXT), &pGlobalData->rcCaret); + ScreenToClient(hwndDlg, (LPPOINT)&pGlobalData->rcCaret.left); + ScreenToClient(hwndDlg, (LPPOINT)&pGlobalData->rcCaret.right); + CopyRect(&pGlobalData->rcOldCaret, &pGlobalData->rcCaret); + + pGlobalData->rcCaret.right = pGlobalData->rcCaret.left + pGlobalData->uCaretWidth; + /* Set the checkbox */ CheckDlgButton(hwndDlg, IDC_CONTRAST_BOX, pGlobalData->highContrast.dwFlags & HCF_HIGHCONTRASTON ? BST_CHECKED : BST_UNCHECKED); + + SendDlgItemMessage(hwndDlg, IDC_CURSOR_BLINK_TRACK, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 10)); + SendDlgItemMessage(hwndDlg, IDC_CURSOR_BLINK_TRACK, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)(12 - (pGlobalData->uCaretBlinkTime / 100))); + + SendDlgItemMessage(hwndDlg, IDC_CURSOR_WIDTH_TRACK, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 19)); + SendDlgItemMessage(hwndDlg, IDC_CURSOR_WIDTH_TRACK, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)(pGlobalData->uCaretWidth - 1)); + + /* Start the blink timer */ + SetTimer(hwndDlg, ID_BLINK_TIMER, pGlobalData->uCaretBlinkTime, NULL); return TRUE; case WM_COMMAND: @@ -187,10 +219,67 @@ } break; + case WM_HSCROLL: + switch (GetWindowLong((HWND) lParam, GWL_ID)) + { + case IDC_CURSOR_BLINK_TRACK: + i = SendDlgItemMessage(hwndDlg, IDC_CURSOR_BLINK_TRACK, TBM_GETPOS, 0, 0); + pGlobalData->uCaretBlinkTime = (12 - (UINT)i) * 100; + KillTimer(hwndDlg, ID_BLINK_TIMER); + SetTimer(hwndDlg, ID_BLINK_TIMER, pGlobalData->uCaretBlinkTime, NULL); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + + case IDC_CURSOR_WIDTH_TRACK: + i = SendDlgItemMessage(hwndDlg, IDC_CURSOR_WIDTH_TRACK, TBM_GETPOS, 0, 0); + pGlobalData->uCaretWidth = (UINT)i + 1; + pGlobalData->rcCaret.right = pGlobalData->rcCaret.left + pGlobalData->uCaretWidth; + if (pGlobalData->fShowCaret) + { + HDC hDC = GetDC(hwndDlg); + HBRUSH hBrush = GetSysColorBrush(COLOR_BTNTEXT); + FillRect(hDC, &pGlobalData->rcCaret, hBrush); + DeleteObject(hBrush); + ReleaseDC(hwndDlg, hDC); + } + else + { + InvalidateRect(hwndDlg, &pGlobalData->rcOldCaret, TRUE); + } + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + break; + + case WM_TIMER: + if (wParam == ID_BLINK_TIMER) + { + if (pGlobalData->fShowCaret) + { + HDC hDC = GetDC(hwndDlg); + HBRUSH hBrush = GetSysColorBrush(COLOR_BTNTEXT); + FillRect(hDC, &pGlobalData->rcCaret, hBrush); + DeleteObject(hBrush); + ReleaseDC(hwndDlg, hDC); + } + else + { + InvalidateRect(hwndDlg, &pGlobalData->rcOldCaret, TRUE); + } + + pGlobalData->fShowCaret = !pGlobalData->fShowCaret; + } + break; + case WM_NOTIFY: lppsn = (LPPSHNOTIFY)lParam; if (lppsn->hdr.code == PSN_APPLY) { + SetCaretBlinkTime(pGlobalData->uCaretBlinkTime); + SystemParametersInfo(SPI_SETCARETWIDTH, + 0, + (PVOID)pGlobalData->uCaretWidth, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE /*0*/); SystemParametersInfo(SPI_SETHIGHCONTRAST, sizeof(HIGHCONTRAST), &pGlobalData->highContrast, @@ -200,6 +289,7 @@ break; case WM_DESTROY: + KillTimer(hwndDlg, ID_BLINK_TIMER); HeapFree(GetProcessHeap(), 0, pGlobalData); break; } Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/access/lang/cs-CZ.rc Sun Aug 26 23:58:13 2007 @@ -51,6 +51,18 @@ LTEXT "Vyberte tuto monost pokud chcete, aby Reactos pouíval barvy a písma urèené pro snadnou èitelnost.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Pouít funkci Vysoký kontrast",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "&Nastavení",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Sun Aug 26 23:58:13 2007 @@ -54,6 +54,18 @@ LTEXT "Aktivieren Sie diese Option, damit ReactOS Farben und Schrift besonders leserlich darstellt.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Hohen Kontrast aktivieren",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "&Einstellungen",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc Sun Aug 26 23:58:13 2007 @@ -51,6 +51,18 @@ LTEXT "Use this option if you want Reactos to use colors and fonts designed for easy reading.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Use High Contrast",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "&Settings",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc Sun Aug 26 23:58:13 2007 @@ -54,6 +54,18 @@ LTEXT "Use esta opción si desea que Reactos use colores y letras deseñadas para lectura fácil.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Usar Alto Contraste",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "Opcione&s",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc Sun Aug 26 23:58:13 2007 @@ -52,6 +52,18 @@ LTEXT "Utilisez cette option si vous voulez que ReactOS utilise les couleurs et les polices conçues pour une lecture facilitée.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Utiliser un contraste élevé",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "&Paramètres",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/hu-HU.rc Sun Aug 26 23:58:13 2007 @@ -52,6 +52,18 @@ LTEXT "Ha azt szeretné, hogy a Reactos olyan színeket használjon, amelyek a könnyû olvasást teszik lehetõvé, akkor válassza ki ezt a lehetõséget.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Nagy kontraszt használata",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "&Bellítások",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/access/lang/id-ID.rc Sun Aug 26 23:58:13 2007 @@ -53,6 +53,18 @@ LTEXT "Gunakan opsi ini jika anda ingin Reactos untuk memakai warna dan font yang didesain guna memudahkan pembacaan.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Gunakan Kontras Tinggi",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "&Setelan",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc Sun Aug 26 23:58:13 2007 @@ -51,6 +51,18 @@ LTEXT "Usa questa opzione se devono essere usati colori e font che migliorano la leggibilità.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Usa Alto contrasto",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "&Impostazioni",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc Sun Aug 26 23:58:13 2007 @@ -51,6 +51,18 @@ LTEXT "±Ì@\\ðg¤ÆAæÊ\\¦ÉÇÝâ·¢zFÆtHgðg¢Ü·B",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "nCRgXgðg¤(&U)",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "Ýè(&S)",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/nl-NL.rc Sun Aug 26 23:58:13 2007 @@ -53,6 +53,18 @@ LTEXT "U kunt deze optie gebruiken als u wilt dat Reactos kleuren en lettertypen zodanig instelt dat deze gemakkelijk te lezen zijn.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Hoog contrast gebruiken",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "Inst&ellingen...",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Sun Aug 26 23:58:13 2007 @@ -54,6 +54,18 @@ LTEXT "U¿yj tej funkcji, jeli chcesz, ¿eby Reactos u¿ywa³ kolorów i czcionek zaprojektowanych do ³atwego czytania",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&U¿yj funkcji Wysoki Kontrast",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "U&stawienia",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Sun Aug 26 23:58:13 2007 @@ -51,6 +51,18 @@ LTEXT "Îñîáî ïîäîáðàííûå ñî÷åòàíèÿ öâåòîâ è øðèôòîâ, îáëåã÷àþùèå âîñïðèÿòèå.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Âûñîêàÿ êîíòðàñòíîñòü",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "&Íàñòðîéêà",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/access/resource.h (original) +++ trunk/reactos/dll/cpl/access/resource.h Sun Aug 26 23:58:13 2007 @@ -69,10 +69,17 @@ #define IDC_STICKY_SOUND_CHECK 224 #define IDC_STICKY_STATUS_CHECK 225 +#define IDC_FILTER_ACTIVATE_CHECK 230 +#define IDC_FILTER_BOUNCE_RADIO 231 +#define IDC_FILTER_REPEAT_RADIO 232 + #define IDC_TOGGLE_ACTIVATE_CHECK 246 #define IDC_CONTRAST_ACTIVATE_CHECK 260 #define IDC_CONTRAST_COMBO 261 +#define IDC_CURSOR_BLINK_TRACK 262 +#define IDC_CURSOR_WIDTH_TRACK 263 +#define IDC_CURSOR_WIDTH_TEXT 264 #define IDC_MOUSEKEYS_ACTIVATE_CHECK 265 #define IDC_MOUSEKEYS_SPEED_TRACK 266

17 years

[greatlrd] 28579: Implement stub for NtGdiAddFontResourceW, NtGdiAddRemoteFontToDC, NtGdiAddFontMemResourceEx, NtGdiRemoveMergeFont, NtGdiAddRemoteMMInstanceToDC, NtGdiFontIsLinked, NtGdiCheckBitmapBits, NtGdiClearBitmapAttributes, NtGdiCreateDIBitmapInternal, NtGdiCreateMetafileDC, NtGdiCreatePaletteInternal, NtGdiCreateServerMetaFile, NtGdiGetUFI, NtGdiFONTOBJ_vGetInfo, NtGdiFONTOBJ_pxoGetXform, NtGdiFONTOBJ_cGetGlyphs, NtGdiFONTOBJ_pifi, NtGdiFONTOBJ_pfdg, NtGdiFONTOBJ_pQueryGlyphAttrs, NtGdi

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Aug 26 23:56:06 2007 New Revision: 28579 URL: http://svn.reactos.org/svn/reactos?rev=28579&view=rev Log: Implement stub for NtGdiAddFontResourceW, NtGdiAddRemoteFontToDC, NtGdiAddFontMemResourceEx, NtGdiRemoveMergeFont, NtGdiAddRemoteMMInstanceToDC, NtGdiFontIsLinked, NtGdiCheckBitmapBits, NtGdiClearBitmapAttributes, NtGdiCreateDIBitmapInternal, NtGdiCreateMetafileDC, NtGdiCreatePaletteInternal, NtGdiCreateServerMetaFile, NtGdiGetUFI, NtGdiFONTOBJ_vGetInfo, NtGdiFONTOBJ_pxoGetXform, NtGdiFONTOBJ_cGetGlyphs, NtGdiFONTOBJ_pifi, NtGdiFONTOBJ_pfdg, NtGdiFONTOBJ_pQueryGlyphAttrs, NtGdiFONTOBJ_pvTrueTypeFontFile, NtGdiFONTOBJ_cGetAllGlyphHandles Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sun Aug 26 23:56:06 2007 @@ -1672,4 +1672,301 @@ return NULL; } - +/* + * @unimplemented + */ +ULONG +STDCALL +NtGdiFONTOBJ_cGetAllGlyphHandles(IN FONTOBJ *FontObj, + IN HGLYPH *Glyphs) +{ + UNIMPLEMENTED; + return 0; +} + + +/* + * @unimplemented + */ +ULONG +STDCALL +NtGdiFONTOBJ_cGetGlyphs(IN FONTOBJ *FontObj, + IN ULONG Mode, + IN ULONG NumGlyphs, + IN HGLYPH *GlyphHandles, + IN PVOID *OutGlyphs) +{ + UNIMPLEMENTED; + return 0; +} + + + +/* + * @unimplemented + */ +INT +STDCALL +NtGdiAddFontResourceW( + IN WCHAR *pwszFiles, + IN ULONG cwc, + IN ULONG cFiles, + IN FLONG f, + IN DWORD dwPidTid, + IN OPTIONAL DESIGNVECTOR *pdv) +{ + UNIMPLEMENTED; + return 0; +} + + +/* + * @unimplemented + */ +BOOL +STDCALL +NtGdiAddRemoteFontToDC( + IN HDC hdc, + IN PVOID pvBuffer, + IN ULONG cjBuffer, + IN OPTIONAL PUNIVERSAL_FONT_ID pufi) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +HANDLE +STDCALL +NtGdiAddFontMemResourceEx( + IN PVOID pvBuffer, + IN DWORD cjBuffer, + IN DESIGNVECTOR *pdv, + IN ULONG cjDV, + OUT DWORD *pNumFonts +) +{ + UNIMPLEMENTED; + return NULL; +} + + +/* + * @unimplemented + */ +BOOL +STDCALL +NtGdiRemoveMergeFont( + IN HDC hdc, + IN UNIVERSAL_FONT_ID *pufi) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +NtGdiAddRemoteMMInstanceToDC( + IN HDC hdc, + IN DOWNLOADDESIGNVECTOR *pddv, + IN ULONG cjDDV) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +STDCALL +NtGdiFontIsLinked(IN HDC hdc) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiCheckBitmapBits( + IN HDC hdc, + IN HANDLE hColorTransform, + IN PVOID pvBits, + IN ULONG bmFormat, + IN DWORD dwWidth, + IN DWORD dwHeight, + IN DWORD dwStride, + OUT PBYTE paResults) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +HANDLE +STDCALL +NtGdiCreateServerMetaFile( + IN DWORD iType, + IN ULONG cjData, + IN LPBYTE pjData, + IN DWORD mm, + IN DWORD xExt, + IN DWORD yExt) +{ + UNIMPLEMENTED; + return NULL; +} + + + /* + * @unimplemented + */ + +HDC +STDCALL +NtGdiCreateMetafileDC(IN HDC hdc) +{ + UNIMPLEMENTED; + return NULL; +} + + + /* + * @unimplemented + */ + +HBITMAP +STDCALL +NtGdiCreateDIBitmapInternal( + IN HDC hdc, + IN INT cx, + IN INT cy, + IN DWORD fInit, + IN OPTIONAL LPBYTE pjInit, + IN OPTIONAL LPBITMAPINFO pbmi, + IN DWORD iUsage, + IN UINT cjMaxInitInfo, + IN UINT cjMaxBits, + IN FLONG f, + IN HANDLE hcmXform) +{ + UNIMPLEMENTED; + return NULL; +} + + + /* + * @unimplemented + */ +HBITMAP +STDCALL +NtGdiClearBitmapAttributes( + IN HBITMAP hbm, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return NULL; +} + + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetUFI( + IN HDC hdc, + OUT PUNIVERSAL_FONT_ID pufi, + OUT OPTIONAL DESIGNVECTOR *pdv, + OUT ULONG *pcjDV, + OUT ULONG *pulBaseCheckSum, + OUT FLONG *pfl) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +PFD_GLYPHATTR +STDCALL +NtGdiFONTOBJ_pQueryGlyphAttrs( + IN FONTOBJ *pfo, + IN ULONG iMode) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +IFIMETRICS* +STDCALL +NtGdiFONTOBJ_pifi( + IN FONTOBJ *pfo) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +FD_GLYPHSET* +STDCALL +NtGdiFONTOBJ_pfdg(IN FONTOBJ *pfo) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +PVOID +STDCALL +NtGdiFONTOBJ_pvTrueTypeFontFile( + IN FONTOBJ *pfo, + OUT ULONG *pcjFile +) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +VOID +STDCALL +NtGdiFONTOBJ_vGetInfo( + IN FONTOBJ *pfo, + IN ULONG cjSize, + OUT FONTINFO *pfi) +{ + UNIMPLEMENTED; +} + + /* + * @unimplemented + */ +XFORMOBJ* +STDCALL +NtGdiFONTOBJ_pxoGetXform(IN FONTOBJ *pfo) +{ + UNIMPLEMENTED; + return NULL; +} + Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sun Aug 26 23:56:06 2007 @@ -8,22 +8,22 @@ # NtGdiAbortDoc 1 NtGdiAbortPath 1 -# NtGdiAddFontResourceW 6 -# NtGdiAddRemoteFontToDC 4 -# NtGdiAddFontMemResourceEx 5 -# NtGdiRemoveMergeFont 2 -# NtGdiAddRemoteMMInstanceToDC 3 +NtGdiAddFontResourceW 6 +NtGdiAddRemoteFontToDC 4 +NtGdiAddFontMemResourceEx 5 +NtGdiRemoveMergeFont 2 +NtGdiAddRemoteMMInstanceToDC 3 NtGdiAlphaBlend 12 NtGdiAngleArc 6 NtGdiAnyLinkedFonts 0 -# NtGdiFontIsLinked 1 +NtGdiFontIsLinked 1 NtGdiArcInternal 10 NtGdiBeginPath 1 NtGdiBitBlt 11 NtGdiCancelDC 1 -# NtGdiCheckBitmapBits 8 +NtGdiCheckBitmapBits 8 NtGdiCloseFigure 1 -# NtGdiClearBitmapAttributes 2 +NtGdiClearBitmapAttributes 2 # NtGdiClearBrushAttributes 2 # NtGdiColorCorrectPalette 6 NtGdiCombineRgn 4 @@ -38,18 +38,18 @@ NtGdiCreateCompatibleBitmap 3 NtGdiCreateCompatibleDC 1 NtGdiCreateDIBBrush 6 -#NtGdiCreateDIBitmapInternal 11 +NtGdiCreateDIBitmapInternal 11 NtGdiCreateDIBSection 9 NtGdiCreateEllipticRgn 4 NtGdiCreateHalftonePalette 1 NtGdiCreateHatchBrushInternal 3 -# NtGdiCreateMetafileDC 1 -NtGdiCreatePaletteInternal 2 +NtGdiCreateMetafileDC 1 +NtGdiCreatePaletteInternal 2 NtGdiCreatePatternBrushInternal 3 NtGdiCreatePen 4 NtGdiCreateRectRgn 4 NtGdiCreateRoundRectRgn 6 -#NtGdiCreateServerMetaFile 6 +NtGdiCreateServerMetaFile 6 NtGdiCreateSolidBrush 2 NtGdiD3dContextCreate 4 NtGdiD3dContextDestroy 1 @@ -215,7 +215,7 @@ NtGdiGetTextFaceW 4 NtGdiGetTextMetricsW 3 NtGdiGetTransform 3 -# NtGdiGetUFI 6 +NtGdiGetUFI 6 # NtGdiGetEmbUFI 7 # NtGdiGetUFIPathname 10 # NtGdiGetEmbedFonts 0 @@ -646,14 +646,14 @@ NtGdiBRUSHOBJ_hGetColorTransform 1 # NtGdiXFORMOBJ_bApplyXform 5 # NtGdiXFORMOBJ_iGetXform 2 -# NtGdiFONTOBJ_vGetInfo 3 -# NtGdiFONTOBJ_pxoGetXform 1 -# NtGdiFONTOBJ_cGetGlyphs 5 -# NtGdiFONTOBJ_pifi 1 -# NtGdiFONTOBJ_pfdg 1 -# NtGdiFONTOBJ_pQueryGlyphAttrs 2 -# NtGdiFONTOBJ_pvTrueTypeFontFile 2 -# NtGdiFONTOBJ_cGetAllGlyphHandles 2 +NtGdiFONTOBJ_vGetInfo 3 +NtGdiFONTOBJ_pxoGetXform 1 +NtGdiFONTOBJ_cGetGlyphs 5 +NtGdiFONTOBJ_pifi 1 +NtGdiFONTOBJ_pfdg 1 +NtGdiFONTOBJ_pQueryGlyphAttrs 2 +NtGdiFONTOBJ_pvTrueTypeFontFile 2 +NtGdiFONTOBJ_cGetAllGlyphHandles 2 # NtGdiSTROBJ_bEnum 3 # NtGdiSTROBJ_bEnumPositionsOnly 3 # NtGdiSTROBJ_bGetAdvanceWidths 4

17 years

← Newer
1
...
12
13
14
15
16
17
18
...
67
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 2007