Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[weiden] 27147: Fix syntax error
by weiden＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: weiden Date: Mon Jun 11 22:14:14 2007 New Revision: 27147 URL: http://svn.reactos.org/svn/reactos?rev=27147&view=rev Log: Fix syntax error Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc (original) +++ trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc Mon Jun 11 22:14:14 2007 @@ -44,7 +44,7 @@ MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED MENUITEM "S&ynchroniser", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED MENUITEM "Fermer &la session %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED - MENUITEM "Déconnecter...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED */ + MENUITEM "Déconnecter...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED MENUITEM "Libér&er l'ordinateur de la station", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED MENUITEM "Éteindre...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED END

1 0

[fireball] 27146: - Remove a call to TREEVIEW_Update() which causes an infinite loop on ReactOS. Now it should be possible to use treeview controls (such as regedit's left pane) without major problems.
by fireball＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: fireball Date: Mon Jun 11 21:57:07 2007 New Revision: 27146 URL: http://svn.reactos.org/svn/reactos?rev=27146&view=rev Log: - Remove a call to TREEVIEW_Update() which causes an infinite loop on ReactOS. Now it should be possible to use treeview controls (such as regedit's left pane) without major problems. Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/treeview.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Mon Jun 11 21:57:07 2007 @@ -137,3 +137,16 @@ return 0; } +Index: treeview.c +=================================================================== +--- treeview.c (revision 27134) ++++ treeview.c (working copy) +@@ -2839,8 +2839,6 @@ + } + } + +- TREEVIEW_UpdateScrollBars(infoPtr); +- + if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) + infoPtr->cdmode = + TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect); Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c Mon Jun 11 21:57:07 2007 @@ -2839,8 +2839,6 @@ } } - TREEVIEW_UpdateScrollBars(infoPtr); - if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode = TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect);

1 0

[dgorbachev] 27145: Update Polish translation. Bug #2298.
by dgorbachev＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: dgorbachev Date: Mon Jun 11 19:57:16 2007 New Revision: 27145 URL: http://svn.reactos.org/svn/reactos?rev=27145&view=rev Log: Update Polish translation. Bug #2298. Modified: trunk/reactos/dll/win32/aclui/aclui_Pl.rc Modified: trunk/reactos/dll/win32/aclui/aclui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_Pl.r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui_Pl.rc (original) +++ trunk/reactos/dll/win32/aclui/aclui_Pl.rc Mon Jun 11 19:57:16 2007 @@ -5,8 +5,10 @@ CAPTION "Zabezpieczenia" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Nazwy grupy lub u¿ytkownika:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Nazwy grupy lub u¿ytkownika:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&W³aciciel:", -1, 7, 7, 49, 8 + EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "&Dodaj...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 PUSHBUTTON "U&suñ", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX

1 0

[dgorbachev] 27144: Translations: - Dutch by Joost de Meij (dreamsmsn *at* gmail *dot* com). Bug #2296. - French by Pierre Schweitzer. Bug #2297. - Polish by Olaf Siejka. Bug #2298.
by dgorbachev＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: dgorbachev Date: Mon Jun 11 19:56:42 2007 New Revision: 27144 URL: http://svn.reactos.org/svn/reactos?rev=27144&view=rev Log: Translations: - Dutch by Joost de Meij (dreamsmsn *at* gmail *dot* com). Bug #2296. - French by Pierre Schweitzer. Bug #2297. - Polish by Olaf Siejka. Bug #2298. Added: trunk/reactos/base/applications/wordpad/lang/nl-NL.rc trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc Modified: trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/setup/reactos/lang/nl-NL.rc trunk/reactos/base/setup/welcome/lang/nl-NL.rc trunk/reactos/base/shell/explorer-new/explorer.rc trunk/reactos/base/shell/explorer/explorer-nl.rc Added: trunk/reactos/base/applications/wordpad/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/nl-NL.rc (added) +++ trunk/reactos/base/applications/wordpad/lang/nl-NL.rc Mon Jun 11 19:56:42 2007 @@ -1,0 +1,169 @@ +LANGUAGE LANG_DUTCH, SUBLANG_DUTCH + +IDR_MAINMENU MENU +BEGIN + POPUP "&Bestand" + BEGIN + MENUITEM "&Nieuw...", ID_NEW + MENUITEM "&Openen...", ID_OPEN + MENUITEM SEPARATOR + MENUITEM "&Sluiten\tCtrl+F4", ID_CLOSE, GRAYED + MENUITEM "Alles s&luiten", ID_CLOSEALL, GRAYED + MENUITEM SEPARATOR + MENUITEM "O&pslaan", ID_SAVE, GRAYED + MENUITEM "Op&slaan Als...", ID_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&fdrukvoorbeeld", ID_PRINTPRE, GRAYED + MENUITEM "Af&drukken...", ID_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Pa&gina-instelling...", ID_PAGESETUP, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Afsluiten\tAlt+F4", ID_EXIT + END + POPUP "Be&werken" + BEGIN + MENUITEM "&Ongedaan maken", ID_UNDO, GRAYED + MENUITEM "&Herhalen", ID_REDO, GRAYED + MENUITEM SEPARATOR + MENUITEM "K&nippen", ID_CUT, GRAYED + MENUITEM "&Kopieren", ID_COPY, GRAYED + MENUITEM "&Plakken", ID_PASTE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Se&lectie wissen", -1, GRAYED + MENUITEM "&Alles selecteren", ID_SELALL, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Zoeken...\tCtrl+F",-1, GRAYED + MENUITEM "Vo&lgende zoeken", -1, GRAYED + MENUITEM "Ve&rvangen\tCtrl+H", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "Object Eigenschappen",-1, GRAYED + MENUITEM "Object", -1, GRAYED + END + POPUP "Beel&d" + BEGIN + MENUITEM "&Werkbalk", -1, CHECKED + MENUITEM "Werkbalk opmaa&k", -1, CHECKED + MENUITEM "&Liniaal", -1, CHECKED + MENUITEM "&Statusbalk", ID_STATUSBAR, CHECKED + END + POPUP "&Invoegen" + BEGIN + MENUITEM "&Datum en tijd...",-1, GRAYED + MENUITEM "&Object...", -1, GRAYED + END + POPUP "Opmaa&k" + BEGIN + MENUITEM "&Lettertype...", -1 GRAYED + MENUITEM "&Opsommingsteken", -1, GRAYED + MENUITEM "&Alinea...", -1, GRAYED + MENUITEM "&Tabs...", -1, GRAYED + END + POPUP "&Venster" + BEGIN + MENUITEM "&Cascade", ID_WINDOW_CASCADE + MENUITEM "&Horizontaal schikken", ID_WINDOW_TILE_HORZ + MENUITEM "&Verticaal schikken", ID_WINDOW_TILE_VERT + MENUITEM "&Pictogrammen schikken", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "Vo&lgende\tCtrl+F6", ID_WINDOW_NEXT + END + POPUP "&Help" + BEGIN + MENUITEM "&Info...", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + + MENUITEM SEPARATOR + + END +END + + +IDD_NEWDOCSEL DIALOGEX 6,6,159,67 +CAPTION "Nieuw" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + LTEXT "Nieuw documenttype:", IDC_STATIC, 4, 3, 72, 9 + LISTBOX IDC_LIST, 4, 16, 104, 46, WS_TABSTOP + PUSHBUTTON "&OK", IDOK, 112, 16, 44, 13 + PUSHBUTTON "&Annuleren", IDCANCEL, 112, 33, 44, 13 +END + + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "WordPad Info" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "WordPad II v0.1\nCopyright (C) 2006\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "OK", IDOK, 65, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 40, 174, 110, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou 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." + IDS_DEFAULT_NAME "Document %1!u!" + IDS_READY " Ready." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DOC_TYPE_RICH_TEXT "Rich Text Document" + IDS_DOC_TYPE_UNICODE_TEXT "Text Document" + IDS_DOC_TYPE_TEXT "Unicode Text Document" +END + + + +/* Tooltips */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_NEW "Nieuw" + IDS_TOOLTIP_OPEN "Openen" + IDS_TOOLTIP_SAVE "Opslaan" + IDS_TOOLTIP_PRINTPRE "Afdrukvoorbeeld" + IDS_TOOLTIP_PRINT "Afdrukken" + IDS_TOOLTIP_CUT "Knippen" + IDS_TOOLTIP_COPY "Kopieren" + IDS_TOOLTIP_PASTE "Plakken" + IDS_TOOLTIP_UNDO "Ongedaan maken" + IDS_TOOLTIP_REDO "Herhalen" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_NEW " Een nieuw document maken." + IDS_HINT_OPEN " Een bestaand document openen." + IDS_HINT_CLOSE " Sluit actief venster af." + IDS_HINT_CLOSEALL " Sluit alle vensters af." + IDS_HINT_SAVE " Het actieve document opslaan." + IDS_HINT_SAVEAS " Het actieve document opslaan onder een nieuwe naam." + IDS_HINT_PRINT " Het actieve document afdrukken." + IDS_HINT_PRINTPRE " Volledige pagina's weergeven." + IDS_HINT_PAGESETUP " Instellingen van de pagina-indeling wijzigen." + IDS_HINT_EXIT " De toepassing afsluiten." + + IDS_HINT_CASCADE " Vensters schikken zodat ze overlappen." + IDS_HINT_TILE_HORZ " Vensters schikken zodat ze niet overlappen." + IDS_HINT_TILE_VERT " Vensters schikken zodat ze niet overlappen." + IDS_HINT_ARRANGE " Iconen aan de onderkant van dit venster schikken." + IDS_HINT_NEXT " Het volgende venster activeren." + + IDS_HINT_SYS_RESTORE " Vorig formaat van dit venster." + IDS_HINT_SYS_MOVE " Verplaats dit venster." + IDS_HINT_SYS_SIZE " Wijzig het vermaak van dit venster." + IDS_HINT_SYS_MINIMIZE " Dit venster minimaliseren." + IDS_HINT_SYS_MAXIMIZE " Dit venster maximaliseren." +END + Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/rsrc.rc (original) +++ trunk/reactos/base/applications/wordpad/rsrc.rc Mon Jun 11 19:56:42 2007 @@ -7,7 +7,8 @@ #include "lang/fi-FI.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/nb-NO.rc" +#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" -#include "lang/nb-NO.rc" #include "lang/th-TH.rc" #include "lang/zh-CN.rc" Modified: trunk/reactos/base/setup/reactos/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/nl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/nl-NL.rc (original) +++ trunk/reactos/base/setup/reactos/lang/nl-NL.rc Mon Jun 11 19:56:42 2007 @@ -6,7 +6,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_CAPTION "ReactOS Setup" - IDS_TEXT "Je kunt ReactOS niet direct van deze CD instaleren!\n\nHerstart je computer vanaf deze CD om ReactOS te kunnen instaleren." + IDS_TEXT "U kunt ReactOS niet direct vanaf deze CD installeren!\n\nHerstart uw computer vanaf deze CD om ReactOS te installeren." END /* EOF */ Modified: trunk/reactos/base/setup/welcome/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/nl… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/nl-NL.rc (original) +++ trunk/reactos/base/setup/welcome/lang/nl-NL.rc Mon Jun 11 19:56:42 2007 @@ -8,7 +8,7 @@ IDS_APPTITLE "ReactOS - Welkom" IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Welkom bij het React Operation System.\n\nKlik links op een onderwerp." -// IDS_CHECKTEXT "Gaat terug naar dit scherm" +// IDS_CHECKTEXT "Ga terug naar dit scherm" // IDS_CLOSETEXT "Afsluiten" END Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc Mon Jun 11 19:56:42 2007 @@ -14,3 +14,5 @@ IDB_STARTMENU BITMAP DISCARDABLE res/logov.bmp #include "lang/en-US.rc" +#include "lang/fr-FR.rc" +#include "lang/pl-PL.rc" Added: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc (added) +++ trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc Mon Jun 11 19:56:42 2007 @@ -1,0 +1,59 @@ +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH + +IDM_TRAYWND MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Véroui&ller la barre de tâhces", ID_LOCKTASKBAR + MENUITEM "P&ropriétés", ID_SHELL_CMD_PROPERTIES + END +END + +IDM_STARTMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Programmes", IDM_PROGRAMS + BEGIN + MENUITEM "(Vide)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "F&avoris", IDM_FAVORITES + BEGIN + MENUITEM "(Vide)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Documents", IDM_DOCUMENTS + BEGIN + MENUITEM "(Vide)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "Paramètre&s", IDM_SETTINGS + BEGIN + MENUITEM "Panneau de &contrôle", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM SEPARATOR + MENUITEM "&Sécurité...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "Co&nnexions au réseau", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "Im&primantes et fax", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "Barre de &tâches et menu démarrer", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + END + POPUP "&Chercher", IDM_SEARCH + BEGIN + MENUITEM SEPARATOR + END + MENUITEM "Aide et support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "Exécuter...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "S&ynchroniser", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "Fermer &la session %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "Déconnecter...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED */ + MENUITEM "Libér&er l'ordinateur de la station", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "Éteindre...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_START "Démarrer" + IDS_PROPERTIES "P&ropriétés" + IDS_OPEN_ALL_USERS "Ouvrir tous les utilisateurs" + IDS_EXPLORE_ALL_USERS "E&xplorer tous les utilisateurs" +END Added: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc (added) +++ trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc Mon Jun 11 19:56:42 2007 @@ -1,0 +1,61 @@ +//Polish translation by Olaf Siejka (caemyr(a)gmail.com) June, 2007 + +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL + +IDM_TRAYWND MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Zablokuj Pasek zadañ", ID_LOCKTASKBAR + MENUITEM "&W³aciwoci", ID_SHELL_CMD_PROPERTIES + END +END + +IDM_STARTMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Programy", IDM_PROGRAMS + BEGIN + MENUITEM "(Pusty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Ulubione", IDM_FAVORITES + BEGIN + MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Dokumenty", IDM_DOCUMENTS + BEGIN + MENUITEM "(Pusty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "Us&tawienia", IDM_SETTINGS + BEGIN + MENUITEM "P&anel Sterowania", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM SEPARATOR + MENUITEM "Za&bezpieczenia...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "P&o³¹æzenia sieciowe", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "&Drukarki i faksy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "P&asek zadañ i Menu Start", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + END + POPUP "&Szukaj", IDM_SEARCH + BEGIN + MENUITEM SEPARATOR + END + MENUITEM "Po&moc", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "&Uruchom...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "S&ynchronizuj", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "&Wyloguj %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "&Roz³¹cz...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "Wydokuj &Komputer", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "&Zamnij system...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_START "Start" + IDS_PROPERTIES "W³a&ciwoci" + IDS_OPEN_ALL_USERS "&Otworz - Wszyscy u¿ytkownicy" + IDS_EXPLORE_ALL_USERS "&Eksploruj - Wszyscy u¿ytkownicy" +END 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 Jun 11 19:56:42 2007 @@ -42,7 +42,7 @@ MENUITEM "&Zijbalk", ID_VIEW_SIDE_BAR MENUITEM "&Statusbalk", ID_VIEW_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Verversen\tF5", ID_REFRESH + MENUITEM "&Vernieuwen\tF5", ID_REFRESH MENUITEM "V&olledig Scherm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM "SDI", ID_VIEW_SDI END @@ -82,7 +82,7 @@ BEGIN POPUP "" BEGIN - MENUITEM "Volumeregelingen Openen", ID_TRAY_VOLUME + MENUITEM "Volumeregeling openen", ID_TRAY_VOLUME MENUITEM "Eigenschappen van audio aanpassen", ID_VOLUME_PROPERTIES END END @@ -90,11 +90,11 @@ IDM_NOTIFYAREA MENU DISCARDABLE BEGIN POPUP "" - BEGIN - MENUITEM "&Verborgen pictogrammen weergeven", ID_SHOW_HIDDEN_ICONS + BEGIN + MENUITEM "&Verborgen Pictogrammen weergeven", ID_SHOW_HIDDEN_ICONS MENUITEM "Show Icon &Button", ID_SHOW_ICON_BUTTON - MENUITEM "&Configure Notifications...", ID_CONFIG_NOTIFYAREA - MENUITEM "Datum/Tijd Aanpassen", ID_CONFIG_TIME + MENUITEM "&Meldingen aanpassen...", ID_CONFIG_NOTIFYAREA + MENUITEM "Datum/Tijd aanpassen", ID_CONFIG_TIME MENUITEM SEPARATOR MENUITEM "&Over Explorer...", ID_ABOUT_EXPLORER END @@ -114,7 +114,7 @@ MENUITEM "&Zijbalk", ID_VIEW_SIDE_BAR, GRAYED MENUITEM "&Statusbalk", ID_VIEW_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Verversen\tF5", ID_REFRESH + MENUITEM "&Vernieuwen\tF5", ID_REFRESH MENUITEM "V&olledig Scherm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM "&MDI", ID_VIEW_MDI END @@ -350,7 +350,7 @@ IDS_DESKTOP_NUM "Desktop %d" IDS_VOLUME "Volume" IDS_ITEMS_CUR "Huidige items" - IDS_ITEMS_CONFIGURED "configuratie" + IDS_ITEMS_CONFIGURED "Configuratie" IDS_ITEMS_VISIBLE "Zichtbaar" IDS_ITEMS_HIDDEN "Verborgen" IDS_NOTIFY_SHOW "Weergeven" @@ -370,13 +370,13 @@ IDS_SETTINGS_MENU "Instellingen" IDS_CONTROL_PANEL "Configuratiescherm" IDS_PRINTERS "Printers" - IDS_BROWSE "Browse Files" + IDS_BROWSE "Bestanden Verkennen" IDS_SEARCH_PRG "Zoek Programma..." IDS_ALL_USERS "Alle Gebruikers\\" IDS_SEARCH "Zoeken" - IDS_ABOUT_EXPLORER "&About Explorer..." + IDS_ABOUT_EXPLORER "&Over Explorer..." IDS_LAUNCH_MANY_PROGRAMS - "U heeft meer dan één programma geselecteerd.\nWeet u zeker dat u ze allemaal wilt laden?" + "U heeft meer dan één programma geselecteerd.\nWeet u zeker dat u ze allemaal wilt starten?" IDS_DESKTOPBAR_SETTINGS "Bureaublad instellingen" IDS_DESKTOP "Bureaublad" IDS_TASKBAR "Taakbalk"

1 0

[cfinck] 27143: - Clarify the purpose of this "RosBE-Unix" directory - Add some information about where to get the necessary sources
by cfinck＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: cfinck Date: Mon Jun 11 19:39:06 2007 New Revision: 27143 URL: http://svn.reactos.org/svn/reactos?rev=27143&view=rev Log: - Clarify the purpose of this "RosBE-Unix" directory - Add some information about where to get the necessary sources Added: trunk/tools/RosBE-Unix/SVN-Readme.txt trunk/tools/RosBE-Unix/sources/SVN-Readme.txt - copied, changed from r27115, trunk/tools/RosBE-Unix/sources/Readme.txt Removed: trunk/tools/RosBE-Unix/sources/Readme.txt Added: trunk/tools/RosBE-Unix/SVN-Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Unix/SVN-Readme.txt?re… ============================================================================== --- trunk/tools/RosBE-Unix/SVN-Readme.txt (added) +++ trunk/tools/RosBE-Unix/SVN-Readme.txt Mon Jun 11 19:39:06 2007 @@ -1,0 +1,10 @@ +Information +------------ + +This "RosBE-Unix" SVN directory is just for tracking changes in the script +files. +It does not contain a fully functional Build Environment as some packages are +missing in the "sources" directory. + +You can download a full RosBE-Unix package from http://reactos.colinfinck.de +(later on it will be downloadable from the official ReactOS Website) Removed: trunk/tools/RosBE-Unix/sources/Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Unix/sources/Readme.tx… ============================================================================== --- trunk/tools/RosBE-Unix/sources/Readme.txt (original) +++ trunk/tools/RosBE-Unix/sources/Readme.txt (removed) @@ -1,19 +1,0 @@ -Put the following files into this directory: - -- binutils.tar.bz2 - --> containing the binutils source tree in a subdirectory "binutils" - -- gcc.tar.bz2 - --> containing the gcc source tree for C and C++ compilation in a subdirectory "gcc" - -- make.tar.bz2 - --> containing the make source tree in a subdirectory "make" - -- mingw-runtime.tar.bz2 - --> containing the "include" and "lib" subdirectories of the mingw-runtime package - -- nasm.tar.bz2 - --> containing the nasm source tree in a subdirectory "nasm" - -- w32api.tar.bz2 - --> containing the "include" and "lib" subdirectories of the w32api package Copied: trunk/tools/RosBE-Unix/sources/SVN-Readme.txt (from r27115, trunk/tools/RosBE-Unix/sources/Readme.txt) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Unix/sources/SVN-Readm… ============================================================================== --- trunk/tools/RosBE-Unix/sources/Readme.txt (original) +++ trunk/tools/RosBE-Unix/sources/SVN-Readme.txt Mon Jun 11 19:39:06 2007 @@ -2,18 +2,24 @@ - binutils.tar.bz2 --> containing the binutils source tree in a subdirectory "binutils" + Source is available here: http://www.gnu.org/software/binutils/ - gcc.tar.bz2 --> containing the gcc source tree for C and C++ compilation in a subdirectory "gcc" + Source is available here: http://gcc.gnu.org/svn.html - make.tar.bz2 --> containing the make source tree in a subdirectory "make" + Source is available here: http://savannah.gnu.org/cvs/?group=make - mingw-runtime.tar.bz2 --> containing the "include" and "lib" subdirectories of the mingw-runtime package + Source is available here: http://sourceforge.net/project/showfiles.php?group_id=2435 - nasm.tar.bz2 --> containing the nasm source tree in a subdirectory "nasm" + Source is available here: http://sourceforge.net/project/showfiles.php?group_id=6208 - w32api.tar.bz2 - --> containing the "include" and "lib" subdirectories of the w32api package + --> containing the "include" and "lib" subdirectories of the w32api package + Source is available here: http://sourceforge.net/project/showfiles.php?group_id=2435

1 0

[cfinck] 27142: - Remove the old QEMU and VMware files - Add a directory "VM-Templates" containing new QEMU and VMware templates. These templates can be used for packaging the next ReactOS Releases
by cfinck＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: cfinck Date: Mon Jun 11 19:16:35 2007 New Revision: 27142 URL: http://svn.reactos.org/svn/reactos?rev=27142&view=rev Log: - Remove the old QEMU and VMware files - Add a directory "VM-Templates" containing new QEMU and VMware templates. These templates can be used for packaging the next ReactOS Releases Added: trunk/tools/VM-Templates/ trunk/tools/VM-Templates/QEMU/ trunk/tools/VM-Templates/QEMU/Readme.txt trunk/tools/VM-Templates/QEMU/SVN-Readme.txt trunk/tools/VM-Templates/QEMU/boot.bat trunk/tools/VM-Templates/QEMU/install.bat trunk/tools/VM-Templates/VMware/ trunk/tools/VM-Templates/VMware/ReactOS-Installation.vmx trunk/tools/VM-Templates/VMware/ReactOS.vmx trunk/tools/VM-Templates/VMware/Readme.txt trunk/tools/VM-Templates/VMware/SVN-Readme.txt Removed: trunk/tools/ReactOS.vmx trunk/tools/boot.bat Removed: trunk/tools/ReactOS.vmx URL: http://svn.reactos.org/svn/reactos/trunk/tools/ReactOS.vmx?rev=27141&view=a… ============================================================================== --- trunk/tools/ReactOS.vmx (original) +++ trunk/tools/ReactOS.vmx (removed) @@ -1,56 +1,0 @@ -config.version = "8" -virtualHW.version = "3" -memsize = "128" -ide0:0.present = "TRUE" -ide0:0.fileName = "ReactOS.vmdk" -floppy0.present = "FALSE" -floppy0.startConnected = "FALSE" -floppy0.fileName = "" -Ethernet0.present = "TRUE" -displayName = "ReactOS" -guestOS = "winxppro" -priority.grabbed = "normal" -priority.ungrabbed = "normal" -powerType.powerOff = "hard" -powerType.powerOn = "hard" -powerType.suspend = "hard" -powerType.reset = "hard" - -sound.present = "FALSE" -sound.virtualDev = "es1371" - -Ethernet0.addressType = "generated" -uuid.location = "56 4d f3 82 2e e6 c2 57-a8 3d d3 58 af 7c 4c 8b" -uuid.bios = "56 4d f3 82 2e e6 c2 57-a8 3d d3 58 af 7c 4c 8b" -ethernet0.generatedAddress = "00:0c:29:7c:4c:8b" -ethernet0.generatedAddressOffset = "0" - -tools.remindInstall = "TRUE" - -### CDROM ### -ide1:0.startConnected = "FALSE" -ide1:0.present = "FALSE" -ide1:0.fileName = "ReactOS.iso" -ide1:0.deviceType = "cdrom-image" - -ide0:0.deviceType = "disk" -usb.present = "FALSE" - -ide0:0.redo = "" - -nvram = "ReactOS.nvram" - -floppy0.fileType = "file" - -checkpoint.vmState = "" - -ethernet0.connectionType = "nat" - -serial0.present = "TRUE" -serial0.fileName = "debug.txt" -serial0.fileType = "file" -serial0.tryNoRxLoss = "FALSE" -serial0.yieldOnMsrRead = "TRUE" -serial0.startConnected = "TRUE" - -uuid.action = "create" Added: trunk/tools/VM-Templates/QEMU/Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/QEMU/Readme.txt… ============================================================================== --- trunk/tools/VM-Templates/QEMU/Readme.txt (added) +++ trunk/tools/VM-Templates/QEMU/Readme.txt Mon Jun 11 19:16:35 2007 @@ -1,0 +1,53 @@ +ReactOS Preinstalled on a QEMU Virtual Machine +=============================================== + +This package contains a preinstalled ReactOS version on a QEMU virtual +machine. +For Windows users, it also contains the QEMU application, so you can easily +start the virtual machine and run ReactOS. + + +Windows users +-------------- +To start the preinstalled ReactOS version, just execute the "boot.bat" file. + +You can improve the speed of this virtual machine by installing Kqemu. +It is available at http://www.h7.dion.ne.jp/~qemu-win (Section "Accelerators") + +If you want to access files of the virtual hard disk, download and install VDK +from http://chitchat.at.infoseek.co.jp/vmware/vdk.html +This tool allows you to mount the virtual hard disk in your Windows system. + + +Users of Unix-based Operating Systems +-------------------------------------- +If you use an Unix-based Operating System such as Linux, install the +appropriate QEMU package for your OS. +Then open a Terminal, change the current directory to the directory containing +the "ReactOS.vmdk" file and execute the following command: + + qemu -m 128 -hda ReactOS.vmdk + +You can improve the speed of the virtual machine by installing the appropriate +Kqemu package for your system. + +If you want to access and modify files of the virtual hard disk, you have to +convert it to the "raw" format. +To convert it, execute the following commands in the directory containing the +"ReactOS.vmdk" file: + + qemu-img convert ReactOS.vmdk -O raw ReactOS.hd + +Beware that this takes 2 GB of hard disk space, since a raw hard disk image +is not growable. +Now you can easily mount the image with the following command: + + mount -oloop,offset=32256 -t vfat ReactOS.hd /mnt/vhd + +In this case, I assume that you want to mount the hard disk image to /mnt/vhd. +Otherwise modify the command line accordingly. + +After you unmounted the changed hard disk, you can boot it by executing the +following command: + + qemu -m 128 -hda ReactOS.hd Added: trunk/tools/VM-Templates/QEMU/SVN-Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/QEMU/SVN-Readme… ============================================================================== --- trunk/tools/VM-Templates/QEMU/SVN-Readme.txt (added) +++ trunk/tools/VM-Templates/QEMU/SVN-Readme.txt Mon Jun 11 19:16:35 2007 @@ -1,0 +1,18 @@ +Packaging the QEMU Preinstallation +----------------------------------- + +Replace [VERSION] with the version of ReactOS you want to package, e.g. 0.3.1. + +- Copy the files in this directory into a directory called + "ReactOS-[VERSION]-QEMU". +- Put the QEMU program files there, including its subdirectories. +- Use the following command to create the virtual hard disk: + + qemu-img create -f vmdk ReactOS.vmdk 2G + +- Copy the "ReactOS.iso" file into this directory and run "install.bat" to + install it. +- Remove the "ReactOS.iso", "install.bat" and this "SVN-Readme.txt" file +- Create a ZIP file "ReactOS-[VERSION]-REL-qemu.zip" containing this + directory. + Do not forget to activate the option to store the relative path names. Added: trunk/tools/VM-Templates/QEMU/boot.bat URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/QEMU/boot.bat?r… ============================================================================== --- trunk/tools/VM-Templates/QEMU/boot.bat (added) +++ trunk/tools/VM-Templates/QEMU/boot.bat Mon Jun 11 19:16:35 2007 @@ -1,0 +1,2 @@ +@echo off +qemu -L . -m 128 -hda ReactOS.vmdk Added: trunk/tools/VM-Templates/QEMU/install.bat URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/QEMU/install.ba… ============================================================================== --- trunk/tools/VM-Templates/QEMU/install.bat (added) +++ trunk/tools/VM-Templates/QEMU/install.bat Mon Jun 11 19:16:35 2007 @@ -1,0 +1,2 @@ +@echo off +qemu -L . -m 128 -hda ReactOS.vmdk -cdrom ReactOS.iso -boot d Added: trunk/tools/VM-Templates/VMware/ReactOS-Installation.vmx URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/VMware/ReactOS-… ============================================================================== --- trunk/tools/VM-Templates/VMware/ReactOS-Installation.vmx (added) +++ trunk/tools/VM-Templates/VMware/ReactOS-Installation.vmx Mon Jun 11 19:16:35 2007 @@ -1,0 +1,27 @@ +config.version = "7" +virtualHW.version = "3" + +displayName = "ReactOS-Installation" +guestOS = "winxppro" +memsize = 128 + +floppy0.present = "FALSE" +ide0:0.present = "TRUE" +ide0:0.fileName = "ReactOS.vmdk" +ide1:0.present = "TRUE" +ide1:0.fileName = "ReactOS.iso" +ide1:0.deviceType = "cdrom-image" + +Ethernet0.present = "TRUE" +Ethernet0.addressType = "generated" +Ethernet0.generatedAddress = "00:0c:29:7c:4c:8b" +Ethernet0.generatedAddressOffset = "0" +uuid.action = "create" +uuid.location = "56 4d 0e c2 bf 9a 5a bd-fa 1c 5e 1f d6 6e eb f7" +uuid.bios = "56 4d 0e c2 bf 9a 5a bd-fa 1c 5e 1f d6 6e eb f7" + +usb.present = "FALSE" + +ide0:0.deviceType = "ata-hardDisk" +priority.grabbed = "normal" +priority.ungrabbed = "normal" Added: trunk/tools/VM-Templates/VMware/ReactOS.vmx URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/VMware/ReactOS.… ============================================================================== --- trunk/tools/VM-Templates/VMware/ReactOS.vmx (added) +++ trunk/tools/VM-Templates/VMware/ReactOS.vmx Mon Jun 11 19:16:35 2007 @@ -1,0 +1,20 @@ +config.version = "7" +virtualHW.version = "3" + +displayName = "ReactOS" +guestOS = "winxppro" +memsize = 128 + +floppy0.present = "FALSE" +ide0:0.present = "TRUE" +ide0:0.fileName = "ReactOS.vmdk" + +Ethernet0.present = "TRUE" +Ethernet0.addressType = "generated" +Ethernet0.generatedAddress = "00:0c:29:7c:4c:8b" +Ethernet0.generatedAddressOffset = "0" +uuid.action = "create" +uuid.location = "56 4d f3 82 2e e6 c2 57-a8 3d d3 58 af 7c 4c 8b" +uuid.bios = "56 4d f3 82 2e e6 c2 57-a8 3d d3 58 af 7c 4c 8b" + +usb.present = "FALSE" Added: trunk/tools/VM-Templates/VMware/Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/VMware/Readme.t… ============================================================================== --- trunk/tools/VM-Templates/VMware/Readme.txt (added) +++ trunk/tools/VM-Templates/VMware/Readme.txt Mon Jun 11 19:16:35 2007 @@ -1,0 +1,10 @@ +ReactOS Preinstalled on a VMware Virtual Machine +================================================= + +This package contains a preinstalled ReactOS version on a VMware virtual +machine. You need a VMware product from http://www.vmware.com to use it. + +If you want to access files of the virtual hard disk, you can use the +"vmware-mount" utility bundled with some VMware products. +Windows users can also use VDK from +http://chitchat.at.infoseek.co.jp/vmware/vdk.html Added: trunk/tools/VM-Templates/VMware/SVN-Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/VMware/SVN-Read… ============================================================================== --- trunk/tools/VM-Templates/VMware/SVN-Readme.txt (added) +++ trunk/tools/VM-Templates/VMware/SVN-Readme.txt Mon Jun 11 19:16:35 2007 @@ -1,0 +1,20 @@ +Packaging the VMware Preinstallation +------------------------------------- + +Replace [VERSION] with the version of ReactOS you want to package, e.g. 0.3.1. + +- Copy the files in this directory into a directory called + "ReactOS-[VERSION]-VMware". +- Copy the "ReactOS.iso" file into this directory. +- Open the "ReactOS-Installation.vmx" file in your VMware product, click on + "Edit virtual machine settings" and on "Add". +- Add a new hard disk called "ReactOS.vmdk" with 2 GB size and in a growable + format (deselect "Allocate all disk space now"). +- Remove the created "Hard Disk 2" entry as we already have a "Hard Disk" + entry, which now uses the created file. +- Start the virtual machine and install ReactOS on it. +- Remove all files in this directory except "ReactOS.vmx", "ReactOS.vmdk" and + "Readme.txt" +- Create a ZIP file "ReactOS-[VERSION]-REL-vmware.zip" containing the + "ReactOS-[VERSION]-VMware" directory. + Do not forget to activate the option to store the relative path names. Removed: trunk/tools/boot.bat URL: http://svn.reactos.org/svn/reactos/trunk/tools/boot.bat?rev=27141&view=auto ============================================================================== --- trunk/tools/boot.bat (original) +++ trunk/tools/boot.bat (removed) @@ -1,2 +1,0 @@ -qemu -boot c -m 128 -L . c.img -REM qemu -boot d -m 128 -L . c.img -cdrom ReactOS.iso

1 0

[dgorbachev] 27141: - Remove root device hack. - Add event dereferencing hack (bug report #2240).
by dgorbachev＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: dgorbachev Date: Mon Jun 11 19:02:23 2007 New Revision: 27141 URL: http://svn.reactos.org/svn/reactos?rev=27141&view=rev Log: - Remove root device hack. - Add event dereferencing hack (bug report #2240). Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c Mon Jun 11 19:02:23 2007 @@ -37,18 +37,9 @@ SourceDeviceExtension = IoGetDevObjExtension(SourceDevice); ASSERT(SourceDeviceExtension->AttachedTo == NULL); - /* FIXME: ROS HACK */ - if (AttachedDevice->Flags & DO_DEVICE_INITIALIZING) - { - DPRINT1("Io: CRITICAL: Allowing attach to device which hasn't " - "cleared its DO_DEVICE_INITIALIZING flag. Fix the damn " - "thing: %p %wZ\n", - AttachedDevice, - &AttachedDevice->DriverObject->DriverName); - } - /* Make sure that it's in a correct state */ - if ((IoGetDevObjExtension(AttachedDevice)->ExtensionFlags & + if ((AttachedDevice->Flags & DO_DEVICE_INITIALIZING) || + (IoGetDevObjExtension(AttachedDevice)->ExtensionFlags & (DOE_UNLOAD_PENDING | DOE_DELETE_PENDING | DOE_REMOVE_PENDING | Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c Mon Jun 11 19:02:23 2007 @@ -346,8 +346,16 @@ /* Check if this is an Asynch API */ if (!(Irp->Flags & IRP_SYNCHRONOUS_API)) { + /* HACK */ + if (*((PULONG)(Irp->UserEvent) - 1) != 0x87878787) + { /* Dereference the event */ ObDereferenceObject(Irp->UserEvent); + } + else + { + DPRINT1("Not an executive event -- should not be dereferenced\n"); + } } /*

1 0

[gedmurphy] 27140: fix build
by gedmurphy＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: gedmurphy Date: Mon Jun 11 18:48:39 2007 New Revision: 27140 URL: http://svn.reactos.org/svn/reactos?rev=27140&view=rev Log: fix build Modified: trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h (original) +++ trunk/reactos/include/psdk/shlobj.h Mon Jun 11 18:48:39 2007 @@ -210,7 +210,7 @@ #define FCIDM_STATUS (FCIDM_BROWSERFIRST + 1) -VOID SHSetInstanceExplorer(IUnknown *punk); +VOID WINAPI SHSetInstanceExplorer(LPUNKNOWN); BOOL WINAPI IsUserAnAdmin(VOID); /****************************************************************************

1 0

[gedmurphy] 27139: delete todo.h the definitions
by gedmurphy＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: gedmurphy Date: Mon Jun 11 18:24:50 2007 New Revision: 27139 URL: http://svn.reactos.org/svn/reactos?rev=27139&view=rev Log: delete todo.h the definitions Modified: trunk/reactos/base/shell/explorer-new/todo.h Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… ============================================================================== --- trunk/reactos/base/shell/explorer-new/todo.h (original) +++ trunk/reactos/base/shell/explorer-new/todo.h Mon Jun 11 18:24:50 2007 @@ -32,45 +32,6 @@ #define SID_SMenuPopup SID_HACK_SMenuPopup - -#define HSHELL_HIGHBIT 0x8000 -#define HSHELL_FLASH (HSHELL_REDRAW|HSHELL_HIGHBIT) -#define HSHELL_RUDEAPPACTIVATED (HSHELL_WINDOWACTIVATED|HSHELL_HIGHBIT) - -#define FAPPCOMMAND_MOUSE 0x8000 -#define FAPPCOMMAND_KEY 0 -#define FAPPCOMMAND_OEM 0x1000 -#define FAPPCOMMAND_MASK 0xf000 - -#define GET_APPCOMMAND_LPARAM(lParam) ((SHORT)(HIWORD(lParam) & ~FAPPCOMMAND_MASK)) -#define GET_DEVICE_LPARAM(lParam) ((WORD)(HIWORD(lParam) & FAPPCOMMAND_MASK)) -#define GET_MOUSEORKEY_LPARAM GET_DEVICE_LPARAM -#define GET_FLAGS_LPARAM(lParam) (LOWORD(lParam)) -#define GET_KEYSTATE_LPARAM(lParam) GET_FLAGS_LPARAM(lParam) - -#define TBSTATE_ELLIPSES 0x40 - -#define TPM_VERPOSANIMATION 0x1000 -#define TPM_VERNEGANIMATION 0x2000 - -BOOL WINAPI IsUserAnAdmin(VOID); - -#define INTERFACE IDockingWindow -DECLARE_INTERFACE_(IDockingWindow,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** IOleWindow methods ***/ - STDMETHOD_(HRESULT,GetWindow)(THIS_ HWND*) PURE; - STDMETHOD_(HRESULT,ContextSensitiveHelp)(THIS_ BOOL) PURE; - /*** IDockingWindow methods ***/ - STDMETHOD_(HRESULT,ShowDW)(THIS_ BOOL) PURE; - STDMETHOD_(HRESULT,CloseDW)(THIS_ DWORD) PURE; - STDMETHOD_(HRESULT,ResizeBoderDW)(THIS_ LPCRECT,IUnknown*,BOOL) PURE; -}; -#undef INTERFACE #ifdef COBJMACROS #define IDockingWindow_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)

1 0

[gedmurphy] 27138: move a couple more definitions into the public sdk
by gedmurphy＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: gedmurphy Date: Mon Jun 11 18:23:49 2007 New Revision: 27138 URL: http://svn.reactos.org/svn/reactos?rev=27138&view=rev Log: move a couple more definitions into the public sdk Modified: trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h (original) +++ trunk/reactos/include/psdk/shlobj.h Mon Jun 11 18:23:49 2007 @@ -210,6 +210,9 @@ #define FCIDM_STATUS (FCIDM_BROWSERFIRST + 1) +VOID SHSetInstanceExplorer(IUnknown *punk); +BOOL WINAPI IsUserAnAdmin(VOID); + /**************************************************************************** * IShellIcon interface */ @@ -365,6 +368,25 @@ /*** IACList methods ***/ #define IACList_Expand(p,a) (p)->lpVtbl->Expand(p,a) #endif + + +/* IDockingWindowFrame interface */ +#define INTERFACE IDockingWindow +DECLARE_INTERFACE_(IDockingWindow,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IOleWindow methods ***/ + STDMETHOD_(HRESULT,GetWindow)(THIS_ HWND*) PURE; + STDMETHOD_(HRESULT,ContextSensitiveHelp)(THIS_ BOOL) PURE; + /*** IDockingWindow methods ***/ + STDMETHOD_(HRESULT,ShowDW)(THIS_ BOOL) PURE; + STDMETHOD_(HRESULT,CloseDW)(THIS_ DWORD) PURE; + STDMETHOD_(HRESULT,ResizeBoderDW)(THIS_ LPCRECT,IUnknown*,BOOL) PURE; +}; +#undef INTERFACE /**************************************************************************** Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Mon Jun 11 18:23:49 2007 @@ -1182,6 +1182,11 @@ #define HSHELL_WINDOWREPLACING 14 #endif /* _WIN32_WINNT >= 0x0501 */ +#define HSHELL_HIGHBIT 0x8000 +#define HSHELL_FLASH (HSHELL_REDRAW|HSHELL_HIGHBIT) +#define HSHELL_RUDEAPPACTIVATED (HSHELL_WINDOWACTIVATED|HSHELL_HIGHBIT) + +#if(_WIN32_WINNT >= 0x0500) #define APPCOMMAND_BROWSER_BACKWARD 1 #define APPCOMMAND_BROWSER_FORWARD 2 #define APPCOMMAND_BROWSER_REFRESH 3 @@ -1237,8 +1242,17 @@ #define APPCOMMAND_MEDIA_CHANNEL_DOWN 52 #endif /* _WIN32_WINNT >= 0x0501 */ +#define FAPPCOMMAND_MOUSE 0x8000 +#define FAPPCOMMAND_KEY 0 +#define FAPPCOMMAND_OEM 0x1000 +#define FAPPCOMMAND_MASK 0xf000 - +#define GET_APPCOMMAND_LPARAM(lParam) ((SHORT)(HIWORD(lParam) & ~FAPPCOMMAND_MASK)) +#define GET_DEVICE_LPARAM(lParam) ((WORD)(HIWORD(lParam) & FAPPCOMMAND_MASK)) +#define GET_MOUSEORKEY_LPARAM GET_DEVICE_LPARAM +#define GET_FLAGS_LPARAM(lParam) (LOWORD(lParam)) +#define GET_KEYSTATE_LPARAM(lParam) GET_FLAGS_LPARAM(lParam) +#endif /* _WIN32_WINNT >= 0x0500 */ #define SPI_GETACCESSTIMEOUT 60 #define SPI_GETACTIVEWNDTRKTIMEOUT 8194 @@ -2114,7 +2128,11 @@ #define TPM_NONOTIFY 128 #define TPM_RETURNCMD 256 #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) -#define TPM_RECURSE 1 +#define TPM_RECURSE 0x0001 +#define TPM_HORPOSANIMATION 0x0400 +#define TPM_HORNEGANIMATION 0x0800 +#define TPM_VERPOSANIMATION 0x1000 +#define TPM_VERNEGANIMATION 0x2000 #endif #define HELP_COMMAND 0x102 #define HELP_CONTENTS 3

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2007