Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 28942: - Get rid of NTLPC configuration var completely.
by fireball＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: fireball Date: Sat Sep 8 16:07:45 2007 New Revision: 28942 URL: http://svn.reactos.org/svn/reactos?rev=28942&view=rev Log: - Get rid of NTLPC configuration var completely. Modified: trunk/reactos/base/system/smss/smss.rbuild trunk/reactos/config.template.rbuild Modified: trunk/reactos/base/system/smss/smss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.rbui… ============================================================================== --- trunk/reactos/base/system/smss/smss.rbuild (original) +++ trunk/reactos/base/system/smss/smss.rbuild Sat Sep 8 16:07:45 2007 @@ -3,9 +3,6 @@ <include base="ReactOS">include/reactos/subsys</include> <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> - <if property="NTLPC" value="1"> - <define name="NTLPC" /> - </if> <library>nt</library> <library>smlib</library> <library>ntdll</library> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Sat Sep 8 16:07:45 2007 @@ -80,11 +80,6 @@ <property name="NSWPAT" value="0" />  -<property name="NTLPC" value="1" /> - -<!-- Whether to compile with the KD protocol. This will disable support for KDBG as well as rossym and symbol lookups, and allow WinDBG to connect to ReactOS. This is currently not fully working, and requires kdcom from Windows 2003 or

1 0

[fireball] 28941: - NTLPC always 1 now, remove deprecated code - Unlock SMSS: authors are clearly known, history of smss goes to the beginnings of the project. Code needs cleaning up (headers, formatting).
by fireball＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: fireball Date: Sat Sep 8 16:02:52 2007 New Revision: 28941 URL: http://svn.reactos.org/svn/reactos?rev=28941&view=rev Log: - NTLPC always 1 now, remove deprecated code - Unlock SMSS: authors are clearly known, history of smss goes to the beginnings of the project. Code needs cleaning up (headers, formatting). Modified: trunk/reactos/base/system/smss/client.c (props changed) trunk/reactos/base/system/smss/debug.c (props changed) trunk/reactos/base/system/smss/init.c (props changed) trunk/reactos/base/system/smss/initdosdev.c (props changed) trunk/reactos/base/system/smss/initenv.c (props changed) trunk/reactos/base/system/smss/initobdir.c (props changed) trunk/reactos/base/system/smss/initpage.c (props changed) trunk/reactos/base/system/smss/initrun.c (props changed) trunk/reactos/base/system/smss/initss.c (props changed) trunk/reactos/base/system/smss/smapi.c (contents, props changed) trunk/reactos/base/system/smss/smapiquery.c (props changed) Propchange: trunk/reactos/base/system/smss/client.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/debug.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/init.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/initdosdev.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/initenv.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/initobdir.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/initpage.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/initrun.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/initss.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/base/system/smss/smapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapi.c?r… ============================================================================== --- trunk/reactos/base/system/smss/smapi.c (original) +++ trunk/reactos/base/system/smss/smapi.c Sat Sep 8 16:02:52 2007 @@ -249,21 +249,14 @@ } } DPRINT("SM: %s: before NtAcceptConnectPort\n", __FUNCTION__); -#if defined(NTLPC) + Status = NtAcceptConnectPort (ClientDataApiPort, Context, (PPORT_MESSAGE) Request, Accept, NULL, NULL); -#else /* ReactOS LPC */ - Status = NtAcceptConnectPort (ClientDataApiPort, - SmApiPort, // ROS LPC requires the listen port here - Context, - Accept, - NULL, - NULL); -#endif + if(Accept) { if(!NT_SUCCESS(Status)) @@ -280,25 +273,6 @@ __FUNCTION__, Status); return Status; } -#if !defined(NTLPC) /* ReactOS LPC */ - DPRINT("SM: %s: server side comm port thread (ROS LPC)\n", __FUNCTION__); - Status = RtlCreateUserThread(NtCurrentProcess(), - NULL, - FALSE, - 0, - 0, - 0, - (PTHREAD_START_ROUTINE) SmpApiConnectedThread, - ClientDataApiPort, - ClientDataApiPortThread, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SM: %s: Unable to create server thread (Status=0x%08lx)\n", - __FUNCTION__, Status); - return Status; - } -#endif } Status = STATUS_SUCCESS; } @@ -390,17 +364,11 @@ 0, 0, 0, -#ifdef NTLPC - (PTHREAD_START_ROUTINE)SmpApiConnectedThread, - &SmApiPort, -#else - (PTHREAD_START_ROUTINE)SmpApiThread, - (PVOID)SmApiPort, -#endif + (PTHREAD_START_ROUTINE)SmpApiConnectedThread, + &SmApiPort, NULL, NULL); -#ifdef NTLPC // // On NT LPC, we need a second thread to handle incoming connections // generated by incoming requests, otherwise the thread handling @@ -417,7 +385,6 @@ &SmApiPort, NULL, NULL); -#endif return(Status); } Propchange: trunk/reactos/base/system/smss/smapi.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/smapiquery.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[jimtabor] 28940: Fix bootcd problem and found another one.
by jimtabor＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: jimtabor Date: Sat Sep 8 15:57:40 2007 New Revision: 28940 URL: http://svn.reactos.org/svn/reactos?rev=28940&view=rev Log: Fix bootcd problem and found another one. Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h Sat Sep 8 15:57:40 2007 @@ -5,10 +5,10 @@ /* GDI logical bitmap object */ typedef struct _BITMAPOBJ { - HGDIOBJ hHmgr; - PVOID pvEntry; - ULONG lucExcLock; - ULONG Tid; +// HGDIOBJ hHmgr; +// PVOID pvEntry; +// ULONG lucExcLock; +// ULONG Tid; SURFOBJ SurfObj; FLONG flHooks;

1 0

[cfinck] 28939: - Merge 28587:28928 (only the stuff from the base/shell/explorer folder) - "Restart" button and corresponding translations - Merge 28938 - German translation changes in Explorer and Shell32
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 15:39:46 2007 New Revision: 28939 URL: http://svn.reactos.org/svn/reactos?rev=28939&view=rev Log: - Merge 28587:28928 (only the stuff from the base/shell/explorer folder) - "Restart" button and corresponding translations - Merge 28938 - German translation changes in Explorer and Shell32 Added: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/res/restart.ico - copied unchanged from r28928, trunk/reactos/base/shell/explorer/res/restart.ico Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bg.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bn.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cn.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cz.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-de.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-en.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-es.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-fr.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-gr.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-hu.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-id.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-it.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-jp.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-nl.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-no.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pl.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pt.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ro.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ru.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sk.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sv.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-uk.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer.cpp branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer_intres.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/globals.h branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/resource.h branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/desktopbar.h branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.cpp branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.h branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shell32_De.rc Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bg.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bg.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bg.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bn.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bn.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bn.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cn.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cn.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cn.rc Sat Sep 8 15:39:46 2007 @@ -330,6 +330,7 @@ IDS_START "¿ªÊ¼" IDS_LOGOFF "×¢Ïú..." IDS_SHUTDOWN "¹Ø±Õ..." + IDS_RESTART "Restart..." IDS_LAUNCH "ÔËÐÐ..." IDS_START_HELP "°ïÖú" IDS_SEARCH_FILES "ËÑË÷..." Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cz.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cz.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cz.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-de.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-de.rc Sat Sep 8 15:39:46 2007 @@ -336,6 +336,7 @@ IDS_START "Start" IDS_LOGOFF "Abmelden..." IDS_SHUTDOWN "Herunterfahren..." + IDS_RESTART "Neu starten..." IDS_LAUNCH "Ausführen..." IDS_START_HELP "Hilfe" IDS_SEARCH_FILES "Suche Dateien..." @@ -403,3 +404,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-en.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-en.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-en.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-es.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-es.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-es.rc Sat Sep 8 15:39:46 2007 @@ -57,7 +57,7 @@ END POPUP "&Tools" BEGIN - MENUITEM "&Options", ID_TOOLS_OPTIONS + MENUITEM "&Opciones", ID_TOOLS_OPTIONS END POPUP "A&yuda" BEGIN @@ -312,9 +312,10 @@ STRINGTABLE DISCARDABLE BEGIN IDS_TITLE "ReactOS Explorer" - IDS_START "Iniciar" + IDS_START "Inicio" IDS_LOGOFF "Salir..." IDS_SHUTDOWN "Apagar..." + IDS_RESTART "Reiniciar..." IDS_LAUNCH "Ejecutar..." IDS_START_HELP "Ayuda" IDS_SEARCH_FILES "Buscar..." @@ -331,7 +332,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_STARTMENU "Menú Inicio" - IDS_MINIMIZE_ALL "mimimizar todas las ventanas" + IDS_MINIMIZE_ALL "Mimimizar todas las ventanas" IDS_DESKTOP_NUM "Escritorio %d" IDS_VOLUME "Volumen" IDS_ITEMS_CUR "Objetos Actuales" @@ -382,3 +383,5 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-fr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-fr.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-fr.rc Sat Sep 8 15:39:46 2007 @@ -329,6 +329,7 @@ IDS_START "Démarrer" IDS_LOGOFF "Se déconnecter..." IDS_SHUTDOWN "Arrêter..." + IDS_RESTART "Redémarrer..." IDS_LAUNCH "Exécuter..." IDS_START_HELP "Aide" IDS_SEARCH_FILES "Rechercher..." @@ -396,3 +397,5 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-gr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-gr.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-gr.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-hu.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-hu.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-hu.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-id.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-id.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-id.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-it.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-it.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-it.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-jp.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-jp.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-jp.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-nl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-nl.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-nl.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-no.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-no.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pl.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pl.rc Sat Sep 8 15:39:46 2007 @@ -49,10 +49,10 @@ POPUP "&Okna" BEGIN MENUITEM "Nowe &okno", ID_WINDOW_NEW - MENUITEM "&Kaskada\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "&Kaskadowo\tShift+F5", ID_WINDOW_CASCADE MENUITEM "&S¹siaduj¹co poziomo", ID_WINDOW_TILE_HORZ MENUITEM "S¹siaduj¹co &pionowo\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "&Autorozmieszczenie", ID_WINDOW_AUTOSORT + MENUITEM "&Autorozmieszczanie", ID_WINDOW_AUTOSORT MENUITEM "Rozmieæ wed³ug &nazwy", ID_WINDOW_ARRANGE END POPUP "&Narzêdzia" @@ -62,8 +62,8 @@ POPUP "Pomo&c" BEGIN MENUITEM "Explorer &FAQ", ID_EXPLORER_FAQ - MENUITEM "ReactOS Explorer - &Informacje", ID_ABOUT_EXPLORER - MENUITEM "ReactOS - I&nformacje", ID_ABOUT_WINDOWS + MENUITEM "ReactOS Explorer - &informacje", ID_ABOUT_EXPLORER + MENUITEM "ReactOS - i&nformacje", ID_ABOUT_WINDOWS END END @@ -74,7 +74,7 @@ MENUITEM "&W³aciwoci", ID_DESKTOPBAR_SETTINGS MENUITEM "Mened¿er &zadañ", ID_TASKMGR MENUITEM SEPARATOR - MENUITEM "ReactOS Explorer - &Informacje", ID_ABOUT_EXPLORER + MENUITEM "ReactOS Explorer - &informacje", ID_ABOUT_EXPLORER END END @@ -82,7 +82,7 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Otwórz regulacje g³onoci", ID_TRAY_VOLUME + MENUITEM "&Otwórz regulacjê g³onoci", ID_TRAY_VOLUME MENUITEM "&Ustaw w³aciwoci audio", ID_VOLUME_PROPERTIES END END @@ -96,7 +96,7 @@ MENUITEM "&Konfiguruj powiadomienia", ID_CONFIG_NOTIFYAREA MENUITEM "Ustaw &datê/godzinê", ID_CONFIG_TIME MENUITEM SEPARATOR - MENUITEM "ReactOS Explorer - &Informacje", ID_ABOUT_EXPLORER + MENUITEM "ReactOS Explorer - &informacje", ID_ABOUT_EXPLORER END END @@ -125,8 +125,8 @@ POPUP "Pomo&c" BEGIN MENUITEM "Explorer &FAQ", ID_EXPLORER_FAQ - MENUITEM "ReactOS Explorer - &Informacje", ID_ABOUT_EXPLORER - MENUITEM "ReactOS - I&nformacje", ID_ABOUT_WINDOWS + MENUITEM "ReactOS Explorer - &informacje", ID_ABOUT_EXPLORER + MENUITEM "ReactOS - i&nformacje", ID_ABOUT_WINDOWS END END @@ -156,7 +156,7 @@ STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW -CAPTION "Szukaj programu w menu start" +CAPTION "Szukaj programu w Menu Start" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "&Filtry:",IDC_STATIC,7,9,18,8 @@ -279,7 +279,7 @@ IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Explorer - &Informacje" +CAPTION "ReactOS Explorer - &informacje" FONT 10, "MS Sans Serif" BEGIN LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 @@ -345,7 +345,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_STARTMENU "Menu start" + IDS_STARTMENU "Menu Start" IDS_MINIMIZE_ALL "Minimalizuj wszystko" IDS_DESKTOP_NUM "Pulpit %d" IDS_VOLUME "G³onoæ" @@ -358,7 +358,7 @@ IDS_NOTIFY_AUTOHIDE "autoukrywanie" IDS_SHOW_HIDDEN_ICONS "Poka¿ ukryte ikony" IDS_HIDE_ICONS "Ukryj ikony" - IDS_TERMINATE "Zakoñcz dzia³anie ROS Explorer" + IDS_TERMINATE "Zakoñcz dzia³anie ReactOS Explorer" END STRINGTABLE DISCARDABLE @@ -374,7 +374,7 @@ IDS_SEARCH_PRG "Znajd program..." IDS_ALL_USERS "Wszyscy\\" IDS_SEARCH "Szukaj" - IDS_ABOUT_EXPLORER "ReactOS Explorer - &Informacje" + IDS_ABOUT_EXPLORER "ReactOS Explorer - &informacje" IDS_LAUNCH_MANY_PROGRAMS "Zaznaczy³e wiêcej ni¿ jeden program.\nCzy chcesz uruchomiæ je jednoczenie?" IDS_DESKTOPBAR_SETTINGS "W³aciwoci pulpitu" Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pt.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pt.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pt.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ro.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ro.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ru.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ru.rc Sat Sep 8 15:39:46 2007 @@ -330,6 +330,7 @@ IDS_START "Ïóñê" IDS_LOGOFF "Âûõîä èç ñèñòåìû..." IDS_SHUTDOWN "Âûêëþ÷åíèå..." + IDS_RESTART "Ïåðåçàãðóçêà..." IDS_LAUNCH "Âûïîëíèòü..." IDS_START_HELP "Ñïðàâêà" IDS_SEARCH_FILES "Ïîèñê..." @@ -398,3 +399,5 @@ #endif // not APSTUDIO_INVOKED + + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sk.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sk.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sk.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sv.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sv.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-uk.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-uk.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-uk.rc Sat Sep 8 15:39:46 2007 @@ -328,8 +328,9 @@ BEGIN IDS_TITLE "Ïðîâ³äíèê ReactOS" IDS_START "Ïóñê" - IDS_LOGOFF "Âèõ³ä ³ç ñèñòåìè..." + IDS_LOGOFF "Çàâåðøåííÿ ñåàíñó..." IDS_SHUTDOWN "Âèìêíåííÿ..." + IDS_RESTART "Ïåðåçàâàíòàæåííÿ..." IDS_LAUNCH "Âèêîíàòè..." IDS_START_HELP "Äîâ³äêà" IDS_SEARCH_FILES "Ïîøóê..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer.cpp (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer.cpp Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer_intres.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer_intres.rc Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/globals.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/globals.h (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/globals.h Sat Sep 8 15:39:46 2007 @@ -81,6 +81,7 @@ ICID_COMPUTER, ICID_LOGOFF, ICID_SHUTDOWN, + ICID_RESTART, ICID_BOOKMARK, ICID_MINIMIZE, ICID_CONTROLPAN, Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/resource.h (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/resource.h Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/desktopbar.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/desktopbar.h (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/desktopbar.h Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.cpp (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.cpp Sat Sep 8 15:39:46 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: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.h (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.h Sat Sep 8 15:39:46 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(); }; Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shell32_De.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shell32_De.rc Sat Sep 8 15:39:46 2007 @@ -169,10 +169,10 @@ IDS_OVERWRITEFILE_CAPTION "Bestätigung: Datei überschreiben" /* message box strings */ - IDS_RESTART_TITLE "Neustarten" - IDS_RESTART_PROMPT "Möchten Sie, dass ein simulierter Windows Neustart durchgeführt wird ?" - IDS_SHUTDOWN_TITLE "Anhalten" - IDS_SHUTDOWN_PROMPT "Möchten Sie die aktuelle ReactOS Sitzung beenden ?" + IDS_RESTART_TITLE "Neu starten" + IDS_RESTART_PROMPT "Möchten Sie das System neu starten?" + IDS_SHUTDOWN_TITLE "Herunterfahren" + IDS_SHUTDOWN_PROMPT "Möchten Sie das System herunterfahren?" /* shell folder path default values */ IDS_PROGRAMS "Startmenü\\Programme"

1 0

[cfinck] 28938: Change some prompts in the German translation of Explorer and Shell32, the previous ones sounded a bit strange
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 15:28:19 2007 New Revision: 28938 URL: http://svn.reactos.org/svn/reactos?rev=28938&view=rev Log: Change some prompts in the German translation of Explorer and Shell32, the previous ones sounded a bit strange Modified: trunk/reactos/base/shell/explorer/explorer-de.rc trunk/reactos/dll/win32/shell32/shell32_De.rc 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 Sat Sep 8 15:28:19 2007 @@ -336,7 +336,7 @@ IDS_START "Start" IDS_LOGOFF "Abmelden..." IDS_SHUTDOWN "Herunterfahren..." - IDS_RESTART "Neustarten..." + IDS_RESTART "Neu starten..." IDS_LAUNCH "Ausführen..." IDS_START_HELP "Hilfe" IDS_SEARCH_FILES "Suche Dateien..." Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Sat Sep 8 15:28:19 2007 @@ -169,10 +169,10 @@ IDS_OVERWRITEFILE_CAPTION "Bestätigung: Datei überschreiben" /* message box strings */ - IDS_RESTART_TITLE "Neustarten" - IDS_RESTART_PROMPT "Möchten Sie, dass ein simulierter Windows Neustart durchgeführt wird ?" - IDS_SHUTDOWN_TITLE "Anhalten" - IDS_SHUTDOWN_PROMPT "Möchten Sie die aktuelle ReactOS Sitzung beenden ?" + IDS_RESTART_TITLE "Neu starten" + IDS_RESTART_PROMPT "Möchten Sie das System neu starten?" + IDS_SHUTDOWN_TITLE "Herunterfahren" + IDS_SHUTDOWN_PROMPT "Möchten Sie das System herunterfahren?" /* shell folder path default values */ IDS_PROGRAMS "Startmenü\\Programme"

1 0

[cfinck] 28937: Accept the parameters case-insensitive in shutdown as well
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 13:55:42 2007 New Revision: 28937 URL: http://svn.reactos.org/svn/reactos?rev=28937&view=rev Log: Accept the parameters case-insensitive in shutdown as well Modified: trunk/reactos/base/applications/shutdown/shutdown.c Modified: trunk/reactos/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/shutdown.c (original) +++ trunk/reactos/base/applications/shutdown/shutdown.c Sat Sep 8 13:55:42 2007 @@ -55,11 +55,25 @@ if (argv[i][0] == '-' || argv[i][0] == '/') { switch(argv[i][1]) { - case '?': PrintUsage(); exit(0); - case 'f': opts.force = TRUE; break; - case 'l': opts.logoff = TRUE; break; - case 'r': opts.restart = TRUE; break; - case 's': opts.shutdown = TRUE; break; + case '?': + PrintUsage(); + exit(0); + case 'f': + case 'F': + opts.force = TRUE; + break; + case 'l': + case 'L': + opts.logoff = TRUE; + break; + case 'r': + case 'R': + opts.restart = TRUE; + break; + case 's': + case 'S': + opts.shutdown = TRUE; + break; default: // Unknown arguments will exit program. PrintUsage();

1 0

[cfinck] 28936: - Accept the parameters case-insensitive - Replace the "/h" option by a "/?" option as described in the Usage text - Use a consistent indentation - Change the Usage text a bit
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 13:04:51 2007 New Revision: 28936 URL: http://svn.reactos.org/svn/reactos?rev=28936&view=rev Log: - Accept the parameters case-insensitive - Replace the "/h" option by a "/?" option as described in the Usage text - Use a consistent indentation - Change the Usage text a bit Modified: trunk/rosapps/logevent/logevent.c Modified: trunk/rosapps/logevent/logevent.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/logevent/logevent.c?rev=28… ============================================================================== --- trunk/rosapps/logevent/logevent.c (original) +++ trunk/rosapps/logevent/logevent.c Sat Sep 8 13:04:51 2007 @@ -32,58 +32,58 @@ #include <tchar.h> #include <stdarg.h> -TCHAR* m_MachineName = NULL; -TCHAR* m_Text = "No User Event Text"; -TCHAR* m_Source = "User Event"; -WORD m_Severity = EVENTLOG_INFORMATION_TYPE; -WORD m_Category = 0; -DWORD m_EventID = 1; +TCHAR* m_MachineName = NULL; +TCHAR* m_Text = "No User Event Text"; +TCHAR* m_Source = "User Event"; +WORD m_Severity = EVENTLOG_INFORMATION_TYPE; +WORD m_Category = 0; +DWORD m_EventID = 1; void Usage(VOID) { - fputs("logevent.exe [-m \\MachineName] [options] \"Event Text\"", stderr); - fputs("\n", stderr); - fputs(" Options:\n", stderr); - fputs(" -s Severity one of :\n", stderr); - fputs(" (S)uccess\n", stderr); - fputs(" (I)nformation\n", stderr); - fputs(" (W)arning\n", stderr); - fputs(" (E)rror\n", stderr); - fputs(" (F)ailure\n", stderr); - fputs(" -r Source\n", stderr); - fputs(" -c Category number\n", stderr); - fputs(" -e Event ID\n", stderr); - fputs(" /? Help\n", stderr); + fputs("Usage: logevent.exe [-m \\MachineName] [options] \"Event Text\"", stderr); + fputs("\n\n", stderr); + fputs("Options:\n", stderr); + fputs(" -s Severity one of:\n", stderr); + fputs(" \t(S)uccess\n", stderr); + fputs(" \t(I)nformation\n", stderr); + fputs(" \t(W)arning\n", stderr); + fputs(" \t(E)rror\n", stderr); + fputs(" \t(F)ailure\n", stderr); + fputs(" -r Source\n", stderr); + fputs(" -c Category number\n", stderr); + fputs(" -e Event ID\n", stderr); + fputs(" /? Help\n", stderr); } void WriteEvent (VOID) { - HANDLE hAppLog; - BOOL bSuccess; - LPCTSTR arrLogEntry[] = { m_Text }; //writing just one entry - - /* Get a handle to the Application event log */ - hAppLog = RegisterEventSource( - (LPCSTR)m_MachineName, /* machine */ - (LPCSTR)m_Source); /* source name */ - - /* Now report the event, which will add this event to the event log */ - bSuccess = ReportEvent( - hAppLog, /* event-log handle */ - m_Severity, /* event type */ - m_Category, /* category */ - m_EventID, /* event ID */ - NULL, /* no user SID */ - 1, /* number of substitution strings */ - 0, /* no binary data */ - arrLogEntry, /* string array */ - NULL); /* address of data */ - - DeregisterEventSource(hAppLog); - - return; + HANDLE hAppLog; + BOOL bSuccess; + LPCTSTR arrLogEntry[] = { m_Text }; //writing just one entry + + /* Get a handle to the Application event log */ + hAppLog = RegisterEventSource( + (LPCSTR)m_MachineName, /* machine */ + (LPCSTR)m_Source); /* source name */ + + /* Now report the event, which will add this event to the event log */ + bSuccess = ReportEvent( + hAppLog, /* event-log handle */ + m_Severity, /* event type */ + m_Category, /* category */ + m_EventID, /* event ID */ + NULL, /* no user SID */ + 1, /* number of substitution strings */ + 0, /* no binary data */ + arrLogEntry, /* string array */ + NULL); /* address of data */ + + DeregisterEventSource(hAppLog); + + return; } /* Parse command line parameters */ @@ -92,7 +92,7 @@ INT i; BOOL ShowUsage; BOOL FoundEventText; - BOOL InvalidOption; + BOOL InvalidOption; if (argc < 2) { ShowUsage = TRUE; @@ -106,44 +106,68 @@ for (i = 1; i < argc; i++) { if (argv[i][0] == '-' || argv[i][0] == '/') { switch (argv[i][1]) { - case 's': - switch (argv[i + 1][0]) - { - case 's': - m_Severity = EVENTLOG_SUCCESS; - i++; - break; - case 'i': - m_Severity = EVENTLOG_INFORMATION_TYPE; - i++; - break; - case 'w': - m_Severity = EVENTLOG_WARNING_TYPE; - i++; - break; - case 'e': - m_Severity = EVENTLOG_ERROR_TYPE; - i++; - break; - case 'f': - m_Severity = EVENTLOG_ERROR_TYPE; - i++; - break; - default: - printf("Bad option %s.\n", argv[i]); - Usage(); - return FALSE; - } - break; - case 'm': m_MachineName = argv[i + 1]; i++; break; - case 'r': m_Source = argv[i + 1]; i++; break; - case 'c': m_Category = atoi(argv[i + 1]); i++; break; - case 'e': m_EventID = atoi(argv[i + 1]); i++; break; - case 'h': ShowUsage = TRUE; break; - default: - printf("Bad option %s.\n", argv[i]); - Usage(); - return FALSE; + case 's': + case 'S': + switch (argv[i + 1][0]) + { + case 's': + case 'S': + m_Severity = EVENTLOG_SUCCESS; + i++; + break; + case 'i': + case 'I': + m_Severity = EVENTLOG_INFORMATION_TYPE; + i++; + break; + case 'w': + case 'W': + m_Severity = EVENTLOG_WARNING_TYPE; + i++; + break; + case 'e': + case 'E': + m_Severity = EVENTLOG_ERROR_TYPE; + i++; + break; + case 'f': + case 'F': + m_Severity = EVENTLOG_ERROR_TYPE; + i++; + break; + default: + printf("Bad option %s.\n", argv[i]); + Usage(); + return FALSE; + } + break; + case 'm': + case 'M': + m_MachineName = argv[i + 1]; + i++; + break; + case 'r': + case 'R': + m_Source = argv[i + 1]; + i++; + break; + case 'c': + case 'C': + m_Category = atoi(argv[i + 1]); + i++; + break; + case 'e': + case 'E': + m_EventID = atoi(argv[i + 1]); + i++; + break; + case '?': + ShowUsage = TRUE; + break; + default: + printf("Bad option %s.\n", argv[i]); + Usage(); + return FALSE; } if (InvalidOption) { printf("Bad option format %s.\n", argv[i]); @@ -154,7 +178,7 @@ printf("Bad parameter %s.\n", argv[i]); return FALSE; } else { - m_Text = argv[i]; + m_Text = argv[i]; FoundEventText = TRUE; } } @@ -175,8 +199,8 @@ int main(int argc, char **argv) { - if (ParseCmdline(argc, argv)) - WriteEvent (); - - return 0; -} + if (ParseCmdline(argc, argv)) + WriteEvent (); + + return 0; +}

1 0

[cfinck] 28935: Add a "logevent" utility for adding an event to the EventLog, developed by Marc Piulachs (marc DOT piulachs AT codexchange DOT net) See issue #2598 for more details.
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 12:31:56 2007 New Revision: 28935 URL: http://svn.reactos.org/svn/reactos?rev=28935&view=rev Log: Add a "logevent" utility for adding an event to the EventLog, developed by Marc Piulachs (marc DOT piulachs AT codexchange DOT net) See issue #2598 for more details. Added: trunk/rosapps/logevent/ trunk/rosapps/logevent/logevent.c trunk/rosapps/logevent/logevent.rbuild trunk/rosapps/logevent/logevent.rc Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=28935… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Sat Sep 8 12:31:56 2007 @@ -49,6 +49,10 @@ </directory> --> +<directory name="logevent"> + <xi:include href="logevent/logevent.rbuild" /> +</directory> + <directory name="magnify"> <xi:include href="magnify/magnify.rbuild" /> </directory> Added: trunk/rosapps/logevent/logevent.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/logevent/logevent.c?rev=28… ============================================================================== --- trunk/rosapps/logevent/logevent.c (added) +++ trunk/rosapps/logevent/logevent.c Sat Sep 8 12:31:56 2007 @@ -1,0 +1,182 @@ +/* + * ReactOS Win32 Applications + * Copyright (C) 2007 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: hostname.c 21664 2006-04-19 20:14:03Z gedmurphy $ + * + * COPYRIGHT : See COPYING in the top level directory + * PROJECT : Event Logging Utility + * FILE : logevent.c + * PROGRAMMER: Marc Piulachs (marc.piulachs at codexchange [dot] net) + */ + +#include <windows.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <malloc.h> +#include <tchar.h> +#include <stdarg.h> + +TCHAR* m_MachineName = NULL; +TCHAR* m_Text = "No User Event Text"; +TCHAR* m_Source = "User Event"; +WORD m_Severity = EVENTLOG_INFORMATION_TYPE; +WORD m_Category = 0; +DWORD m_EventID = 1; + +void +Usage(VOID) +{ + fputs("logevent.exe [-m \\MachineName] [options] \"Event Text\"", stderr); + fputs("\n", stderr); + fputs(" Options:\n", stderr); + fputs(" -s Severity one of :\n", stderr); + fputs(" (S)uccess\n", stderr); + fputs(" (I)nformation\n", stderr); + fputs(" (W)arning\n", stderr); + fputs(" (E)rror\n", stderr); + fputs(" (F)ailure\n", stderr); + fputs(" -r Source\n", stderr); + fputs(" -c Category number\n", stderr); + fputs(" -e Event ID\n", stderr); + fputs(" /? Help\n", stderr); +} + +void +WriteEvent (VOID) +{ + HANDLE hAppLog; + BOOL bSuccess; + LPCTSTR arrLogEntry[] = { m_Text }; //writing just one entry + + /* Get a handle to the Application event log */ + hAppLog = RegisterEventSource( + (LPCSTR)m_MachineName, /* machine */ + (LPCSTR)m_Source); /* source name */ + + /* Now report the event, which will add this event to the event log */ + bSuccess = ReportEvent( + hAppLog, /* event-log handle */ + m_Severity, /* event type */ + m_Category, /* category */ + m_EventID, /* event ID */ + NULL, /* no user SID */ + 1, /* number of substitution strings */ + 0, /* no binary data */ + arrLogEntry, /* string array */ + NULL); /* address of data */ + + DeregisterEventSource(hAppLog); + + return; +} + +/* Parse command line parameters */ +static BOOL ParseCmdline(int argc, TCHAR **argv) +{ + INT i; + BOOL ShowUsage; + BOOL FoundEventText; + BOOL InvalidOption; + + if (argc < 2) { + ShowUsage = TRUE; + } else { + ShowUsage = FALSE; + } + + FoundEventText = FALSE; + InvalidOption = FALSE; + + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-' || argv[i][0] == '/') { + switch (argv[i][1]) { + case 's': + switch (argv[i + 1][0]) + { + case 's': + m_Severity = EVENTLOG_SUCCESS; + i++; + break; + case 'i': + m_Severity = EVENTLOG_INFORMATION_TYPE; + i++; + break; + case 'w': + m_Severity = EVENTLOG_WARNING_TYPE; + i++; + break; + case 'e': + m_Severity = EVENTLOG_ERROR_TYPE; + i++; + break; + case 'f': + m_Severity = EVENTLOG_ERROR_TYPE; + i++; + break; + default: + printf("Bad option %s.\n", argv[i]); + Usage(); + return FALSE; + } + break; + case 'm': m_MachineName = argv[i + 1]; i++; break; + case 'r': m_Source = argv[i + 1]; i++; break; + case 'c': m_Category = atoi(argv[i + 1]); i++; break; + case 'e': m_EventID = atoi(argv[i + 1]); i++; break; + case 'h': ShowUsage = TRUE; break; + default: + printf("Bad option %s.\n", argv[i]); + Usage(); + return FALSE; + } + if (InvalidOption) { + printf("Bad option format %s.\n", argv[i]); + return FALSE; + } + } else { + if (FoundEventText) { + printf("Bad parameter %s.\n", argv[i]); + return FALSE; + } else { + m_Text = argv[i]; + FoundEventText = TRUE; + } + } + } + + if ((!ShowUsage) && (!FoundEventText)) { + printf("The event text must be specified.\n"); + return FALSE; + } + + if (ShowUsage) { + Usage(); + return FALSE; + } + + return TRUE; +} + +int main(int argc, char **argv) +{ + if (ParseCmdline(argc, argv)) + WriteEvent (); + + return 0; +} Added: trunk/rosapps/logevent/logevent.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/logevent/logevent.rbuild?r… ============================================================================== --- trunk/rosapps/logevent/logevent.rbuild (added) +++ trunk/rosapps/logevent/logevent.rbuild Sat Sep 8 12:31:56 2007 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> + +<module name="logevent" type="win32cui" installbase="system32" installname="logevent.exe" allowwarnings="true"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>advapi32</library> + <file>logevent.c</file> + <file>logevent.rc</file> +</module> Added: trunk/rosapps/logevent/logevent.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/logevent/logevent.rc?rev=2… ============================================================================== --- trunk/rosapps/logevent/logevent.rc (added) +++ trunk/rosapps/logevent/logevent.rc Sat Sep 8 12:31:56 2007 @@ -1,0 +1,5 @@ +#define REACTOS_STR_FILE_DESCRIPTION "Win32 logevent utility\0" +#define REACTOS_STR_INTERNAL_NAME "logevent\0" +#define REACTOS_STR_ORIGINAL_FILENAME "logevent.exe\0" + +#include <reactos/version.rc>

1 0

[cwittich] 28934: -fix a bug in GetDisplayNumberFromDeviceName -don't overwrite memory in IntEnumDisplaySettings
by cwittich＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cwittich Date: Sat Sep 8 11:43:45 2007 New Revision: 28934 URL: http://svn.reactos.org/svn/reactos?rev=28934&view=rev Log: -fix a bug in GetDisplayNumberFromDeviceName -don't overwrite memory in IntEnumDisplaySettings Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sat Sep 8 11:43:45 2007 @@ -2736,7 +2736,7 @@ *DisplayNumber = ((GDIDEVICE *)pDC->GDIDevice)->DisplayNumber; - DC_UnlockDc(DesktopHDC); + DC_UnlockDc(pDC); UserReleaseDC(DesktopObject, DesktopHDC, FALSE); return STATUS_SUCCESS; @@ -2787,7 +2787,6 @@ static UNICODE_STRING CachedDeviceName; PDEVMODEW CachedMode = NULL; DEVMODEW DevMode; - INT Size, OldSize; ULONG DisplayNumber; if (!NT_SUCCESS(GetDisplayNumberFromDeviceName(pDeviceName, &DisplayNumber))) @@ -2884,7 +2883,7 @@ } /* Call DDI driver's EnableDriver function */ - RtlZeroMemory(&DrvEnableData, sizeof (DrvEnableData)); + RtlZeroMemory(&DrvEnableData, sizeof(DrvEnableData)); if (!GDEnableDriver(DDI_DRIVER_VERSION_NT5_01, sizeof (DrvEnableData), &DrvEnableData)) { @@ -2999,20 +2998,9 @@ ASSERT(CachedMode != NULL); - Size = OldSize = pDevMode->dmSize; - if (Size > CachedMode->dmSize) - Size = CachedMode->dmSize; - RtlCopyMemory(pDevMode, CachedMode, Size); - RtlZeroMemory((PCHAR)pDevMode + Size, OldSize - Size); - pDevMode->dmSize = OldSize; - - Size = OldSize = pDevMode->dmDriverExtra; - if (Size > CachedMode->dmDriverExtra) - Size = CachedMode->dmDriverExtra; - RtlCopyMemory((PCHAR)pDevMode + pDevMode->dmSize, - (PCHAR)CachedMode + CachedMode->dmSize, Size); - RtlZeroMemory((PCHAR)pDevMode + pDevMode->dmSize + Size, OldSize - Size); - pDevMode->dmDriverExtra = OldSize; + RtlCopyMemory(pDevMode, CachedMode, pDevMode->dmSize); + RtlZeroMemory(pDevMode + pDevMode->dmSize, pDevMode->dmDriverExtra); + RtlCopyMemory(pDevMode + pDevMode->dmSize, CachedMode + CachedMode->dmSize, min(pDevMode->dmDriverExtra, CachedMode->dmDriverExtra)); return TRUE; } @@ -3162,7 +3150,7 @@ LONG Ret=0; NTSTATUS Status ; - DPRINT1("display flag : %x\n",dwflags); + DPRINT1("display flags : %x\n",dwflags); if ((dwflags & CDS_UPDATEREGISTRY) == CDS_UPDATEREGISTRY) { @@ -3185,7 +3173,7 @@ if (dwflags == 0) { /* Dynamically change graphics mode */ - DPRINT1("flag 0 UNIMPLEMENT \n"); + DPRINT1("flag 0 UNIMPLEMENTED\n"); return DISP_CHANGE_FAILED; } @@ -3193,7 +3181,7 @@ { /* Test reslution */ dwflags &= ~CDS_TEST; - DPRINT1("flag CDS_TEST UNIMPLEMENT"); + DPRINT1("flag CDS_TEST UNIMPLEMENTED\n"); Ret = DISP_CHANGE_FAILED; } @@ -3202,15 +3190,12 @@ DEVMODEW lpDevMode; /* Full Screen */ dwflags &= ~CDS_FULLSCREEN; - DPRINT1("flag CDS_FULLSCREEN partially implemented"); + DPRINT1("flag CDS_FULLSCREEN partially implemented\n"); Ret = DISP_CHANGE_FAILED; - lpDevMode.dmBitsPerPel =0; - lpDevMode.dmPelsWidth =0; - lpDevMode.dmPelsHeight =0; - lpDevMode.dmDriverExtra =0; - + RtlZeroMemory(&lpDevMode, sizeof(DEVMODEW)); lpDevMode.dmSize = sizeof(DEVMODEW); + if (!IntEnumDisplaySettings(pDeviceName, ENUM_CURRENT_SETTINGS, &lpDevMode, 0)) return DISP_CHANGE_FAILED; @@ -3231,7 +3216,7 @@ Ret=DISP_CHANGE_BADPARAM; else { - DPRINT1("flag CDS_VIDEOPARAMETERS UNIMPLEMENT"); + DPRINT1("flag CDS_VIDEOPARAMETERS UNIMPLEMENTED\n"); Ret = DISP_CHANGE_FAILED; } @@ -3247,7 +3232,7 @@ HANDLE DevInstRegKey; ULONG NewValue; - DPRINT1("set CDS_UPDATEREGISTRY \n"); + DPRINT1("set CDS_UPDATEREGISTRY\n"); dwflags &= ~CDS_UPDATEREGISTRY;

1 0

[jimtabor] 28933: - Remove DCU_UpdateUserXForms from files for now. - 28932: Wrong Meta Tag! - Starting the implementation of thread locking of GDI objects. - Ref: http://www.winehq.org/pipermail/wine-cvs/2007-August/035810.html
by jimtabor＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: jimtabor Date: Sat Sep 8 05:27:49 2007 New Revision: 28933 URL: http://svn.reactos.org/svn/reactos?rev=28933&view=rev Log: - Remove DCU_UpdateUserXForms from files for now. - 28932: Wrong Meta Tag! - Starting the implementation of thread locking of GDI objects. - Ref: http://www.winehq.org/pipermail/wine-cvs/2007-August/035810.html Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Sat Sep 8 05:27:49 2007 @@ -411,7 +411,6 @@ // // If we are getting called that means User XForms is a mess! // - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); ExFreePool(Points); return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sat Sep 8 05:27:49 2007 @@ -2608,7 +2608,6 @@ /* Create inverse of world-to-viewport transformation */ dc->w.vport2WorldValid = DC_InvertXform(&dc->w.xformWorld2Vport, &dc->w.xformVport2World); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); } BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c Sat Sep 8 05:27:49 2007 @@ -1626,7 +1626,6 @@ IntDPtoLP(dc, &pt, 1); IntGdiMoveToEx(dc, pt.x, pt.y, NULL); } - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DPRINT("Leave %s, ret=%d\n", __FUNCTION__, ret); return ret; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs