Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[dreimer] 29881: Fix one evil Bug by me. Modify ERROR messages to abort the process when Name and Path are specified by Shell Commands, too.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Oct 25 23:24:14 2007 New Revision: 29881 URL: http://svn.reactos.org/svn/reactos?rev=29881&view=rev Log: Fix one evil Bug by me. Modify ERROR messages to abort the process when Name and Path are specified by Shell Commands, too. Modified: trunk/tools/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Thu Oct 25 23:24:14 2007 @@ -52,16 +52,13 @@ :: Load Shortcut from txt and set it active. :: :DEF -set /p XY="Choose your Source Folder: " -if not exist "%XY%\." ( - echo ERROR: The path specified doesn't seem to exist. - goto :END -) +set /p XY="Choose your Shortcut: " + +:RUN if /i "%XY%" == "" ( - echo ERROR: You must enter a valid directory. - goto :END -) -:RUN + echo ERROR: You must enter a valid Shortcut. + goto :END +) for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( if %%i == %XY% ( cd /d %%j @@ -94,8 +91,11 @@ echo ERROR: You must enter a valid Shortcut. goto :END ) + :ADD2 set /p DIR="Choose your Source Folder: " + +:ADD23 if not exist "%DIR%\." ( echo ERROR: The path specified doesn't seem to exist. goto :END @@ -104,7 +104,6 @@ echo ERROR: You must enter a valid directory. goto :END ) -:ADD23 for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( if %%i == %CUT% ( echo A Shortcut with the name %CUT% does already exist. Editing the existing one. @@ -129,6 +128,7 @@ echo ERROR: You must enter a valid Shortcut. goto :END ) + :REM1 set _ROSBE_REM=0 for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( @@ -161,6 +161,7 @@ echo ERROR: You must enter a valid Shortcut. goto :END ) + :DEF1 call "%_ROSBE_BASEDIR%\scut.cmd" edit Base %DIR% @@ -187,8 +188,11 @@ echo ERROR: You must enter a valid Shortcut. goto :END ) + :EDIT2 set /p DIR="Choose your Source Folder: " + +:EDIT23 if not exist "%DIR%\." ( echo ERROR: The path specified doesn't seem to exist. goto :END @@ -197,7 +201,6 @@ echo ERROR: You must enter a valid directory. goto :END ) -:EDIT23 set _ROSBE_EDIT=0 for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( if %%i == %CUT% (

16 years, 11 months

[cfinck] 29880: - Add a Ukrainian translation for eventvwr by Rostislav Zabolotny (rstzab AT yandex DOT ru). I modified it a bit to reflect the current changes, since it was created from an older revision. - Add a common header to all translations - Fix the dialog metrics of the About dialog in the Russian translation See issue #2764 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Oct 25 21:28:30 2007 New Revision: 29880 URL: http://svn.reactos.org/svn/reactos?rev=29880&view=rev Log: - Add a Ukrainian translation for eventvwr by Rostislav Zabolotny (rstzab AT yandex DOT ru). I modified it a bit to reflect the current changes, since it was created from an older revision. - Add a common header to all translations - Fix the dialog metrics of the About dialog in the Russian translation See issue #2764 for more details. Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc (with props) Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc Thu Oct 25 21:28:30 2007 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Event Viewer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/eventvwr/lang/de-DE.rc + * PURPOSE: German Language File for ReactOS Event Viewer + * TRANSLATORS: Daniel Reimer + */ + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDC_EVENTVWR MENU Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc Thu Oct 25 21:28:30 2007 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Event Viewer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/eventvwr/lang/en-US.rc + * PURPOSE: English Language File for ReactOS Event Viewer + * TRANSLATORS: Marc Piulachs + */ + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDC_EVENTVWR MENU Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc Thu Oct 25 21:28:30 2007 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Event Viewer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/eventvwr/lang/es-ES.rc + * PURPOSE: Spanish Language File for ReactOS Event Viewer + * TRANSLATORS: Marc Piulachs + */ + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDC_EVENTVWR MENU Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc Thu Oct 25 21:28:30 2007 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Event Viewer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/eventvwr/lang/fr-FR.rc + * PURPOSE: French Language File for ReactOS Event Viewer + * TRANSLATORS: Pierre Schweitzer + */ + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDC_EVENTVWR MENU Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc Thu Oct 25 21:28:30 2007 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Event Viewer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/eventvwr/lang/ru-RU.rc + * PURPOSE: Russian Language File for ReactOS Event Viewer + * TRANSLATORS: Dmitry Chapyshev + */ + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDC_EVENTVWR MENU @@ -29,7 +37,7 @@ "/", IDM_ABOUT, ASCII, ALT END -IDD_ABOUTBOX DIALOGEX 0, 0, 200, 75 +IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU CAPTION "Î ïðîãðàììå" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -37,7 +45,7 @@ ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 LTEXT "Ïðîñìîòð ñîáûòèé ReactOS. Âåðñèÿ 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX LTEXT "Àâòîðñêèå ïðàâà (Ñ) 2007 Ìàðê Ïèóëà÷ñ (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,140,22 - DEFPUSHBUTTON "OK",IDOK,80,48,42,16,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP END IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc Thu Oct 25 21:28:30 2007 @@ -1,0 +1,104 @@ +/* + * PROJECT: ReactOS Event Viewer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/eventvwr/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for ReactOS Event Viewer + * TRANSLATORS: Rostislav Zabolotny + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDC_EVENTVWR MENU +BEGIN + POPUP "&Çâ³ò" + BEGIN + MENUITEM "&Ïðîãðàìà", ID_LOG_APPLICATION, CHECKED + MENUITEM "&Çàõèñò", ID_LOG_SECURITY + MENUITEM "&Ñèñòåìà", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Â&èõ³ä", IDM_EXIT + END + POPUP "&Âèãëÿä" + BEGIN + MENUITEM "&Îíîâèòè", IDM_REFRESH + END + MENUITEM "&Âëàñòèâîñò³", ID_OPTIONS + POPUP "&Äîïîìîãà" + BEGIN + MENUITEM "Ä&îïîìîãà", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "&Ïðî...", IDM_ABOUT + END +END + +IDC_EVENTVWR ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "Ïðî..." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "ReactOS Îãëÿäà÷ ïîä³é âåðñ³¿ 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 + DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP +END + +IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER +CAPTION "Çà÷åêàéòå.." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CTEXT "Çàâàíòàæåííÿ Çâ³òó ïîä³é. Áóäü ëàñêà, çà÷åêàéòå ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX +END + +IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Äåòàë³ ïîä³¿" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Çàêðèòè",IDOK,12,258,50,14 + PUSHBUTTON "&Ïîïåðåäÿ",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "&Íàñòóïíà",IDNEXT,144,258,50,14 + PUSHBUTTON "&Äîïîìîãà",IDHELP,210,258,50,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "&Îïèñ:",IDC_STATIC,15,70,39,8 + LTEXT "Äàòà:",IDC_STATIC,14,14,36,8 + LTEXT "Ïîñò³éíà",IDC_EVENTDATESTATIC,56,14,72,8 + LTEXT "×àñ:",IDC_STATIC,14,27,36,8 + LTEXT "Ïîñò³éíèé",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "&Êîðèñòóâà÷:",IDC_STATIC,14,41,36,8 + LTEXT "Ïîñò³éíèé",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "Êî&ìï'þòåð:",IDC_STATIC,14,54,36,8 + LTEXT "Ïîñò³éíèé",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 + LTEXT "²äåíò. Ïîä³¿:",IDC_STATIC,133,15,36,8 + LTEXT "Ïîñò³éíèé",IDC_EVENTIDSTATIC,175,15,87,8 + LTEXT "Äæåðåëî:",IDC_STATIC,133,28,36,8 + LTEXT "Ïîñò³éíå",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "Òèï:",IDC_STATIC,133,42,36,8 + LTEXT "ïîñò³éíèé",IDC_EVENTTYPESTATIC,175,42,87,8 + LTEXT "Êàòåãîð³ÿ:",IDC_STATIC,133,55,36,8 + LTEXT "ïîñò³éíà",IDC_EVENTCATEGORYSTATIC,175,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "Ä&aòà",IDC_STATIC,14,194,16,8 + CONTROL "&Áàéò",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 + CONTROL "&Ñëîâî",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Îãëÿäà÷ ïîä³é" + IDC_EVENTSTRINGIDNOTFOUND "Îïèñ äëÿ ²äåíòèô³êàòîðà ïîä³¿( %lu ) çà äæåðåëîì( %s ) íå çíàéäåíî. Ëîêàëüíèé êîìï'þòåð ìîæå íå ìàòè íåîáõ³äíî¿ ³íôîðìàö³¿ â ðåºñòð³ ÷è DLL ôàéë³â ïîâ³äîìëåíü äëÿ â³äîáðàæåííÿ ïîâ³äîìëåíü, ùî íàäõîäÿòü â³ä â³ääàëåíîãî êîìï'þòåðà." + IDC_EVENTLOG_ERROR_TYPE "Error" + IDC_EVENTLOG_WARNING_TYPE "Warning" + IDC_EVENTLOG_INFORMATION_TYPE "Information" + IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" + IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDC_EVENTLOG_SUCCESS "Success" + IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" +END Propchange: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc Thu Oct 25 21:28:30 2007 @@ -13,6 +13,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/ru-RU.rc" -#include "lang/es-ES.rc" +#include "lang/uk-UA.rc"

16 years, 11 months

[fireball] 29879: - Update cmlib interface to NT 5.2. - Fix a bug in CmpInitializeHive which was calling HvInitializeHive with inverted params. - Fix some host header issues.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Oct 25 19:53:51 2007 New Revision: 29879 URL: http://svn.reactos.org/svn/reactos?rev=29879&view=rev Log: - Update cmlib interface to NT 5.2. - Fix a bug in CmpInitializeHive which was calling HvInitializeHive with inverted params. - Fix some host header issues. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c trunk/reactos/include/host/typedefs.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/lib/cmlib/cminit.c trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/hivebin.c trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/lib/cmlib/hivewrt.c trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmcontrl.c trunk/reactos/ntoskrnl/config/cmindex.c trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmkeydel.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/cmvalue.c trunk/reactos/ntoskrnl/config/cmwraprs.c trunk/reactos/tools/mkhive/cmi.c trunk/reactos/tools/mkhive/registry.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=298… Modified: trunk/reactos/lib/cmlib/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cminit.c?rev=298… Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=2987… Modified: trunk/reactos/lib/cmlib/hivebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivebin.c?rev=29… Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=2… Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=2… Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=2… Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=29… Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=29879… Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… Modified: trunk/reactos/ntoskrnl/config/cmcontrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmcontrl.c… Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… Modified: trunk/reactos/ntoskrnl/config/cmkeydel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkeydel.c… Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… Modified: trunk/reactos/ntoskrnl/config/cmvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalue.c?… Modified: trunk/reactos/ntoskrnl/config/cmwraprs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmwraprs.c… Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=298… Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re…

16 years, 11 months

[mnordell] 29878: [COMMENTS] Redundant comments removed.

by mnordell＠svn.reactos.org

Author: mnordell Date: Thu Oct 25 18:56:30 2007 New Revision: 29878 URL: http://svn.reactos.org/svn/reactos?rev=29878&view=rev Log: [COMMENTS] Redundant comments removed. Modified: trunk/reactos/ntoskrnl/ps/quota.c Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c (original) +++ trunk/reactos/ntoskrnl/ps/quota.c Thu Oct 25 18:56:30 2007 @@ -157,7 +157,6 @@ /* * @implemented - * Publically documented and exported. */ VOID STDCALL @@ -229,7 +228,6 @@ /* * @unimplemented - * Publically documented and exported. */ VOID STDCALL

16 years, 11 months

[dreimer] 29877: Fix typos in readme.pdf Fix a bug in Build.cmd

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Oct 25 18:04:46 2007 New Revision: 29877 URL: http://svn.reactos.org/svn/reactos?rev=29877&view=rev Log: Fix typos in readme.pdf Fix a bug in Build.cmd Modified: trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/readme.pdf Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Thu Oct 25 18:04:46 2007 @@ -16,7 +16,7 @@ :: Check if config.template.rbuild is newer than config.rbuild, if it is then :: abort the build and inform the user. :: -if exist "config.rbuild" ( +if exist "%_ROSBE_BASEDIR%\config.rbuild" ( chknewer "config.template.rbuild" "%_ROSBE_BASEDIR%\config.rbuild" if not errorlevel 1 ( echo. Modified: trunk/tools/RosBE-Windows/Root/readme.pdf URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/readme.pd… ============================================================================== Binary files - no diff available.

16 years, 11 months

[jimtabor] 29876: Fix icon title class descriptor for ReactOS.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Oct 25 16:38:15 2007 New Revision: 29876 URL: http://svn.reactos.org/svn/reactos?rev=29876&view=rev Log: Fix icon title class descriptor for ReactOS. Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c Thu Oct 25 16:38:15 2007 @@ -37,6 +37,15 @@ */ const struct builtin_class_descr ICONTITLE_builtin_class = { +#ifdef __REACTOS__ + ICONTITLE_CLASS_ATOM, /* name */ + 0, /* style */ + IconTitleWndProc, /* procW */ + NULL, /* procA (winproc is Unicode only) */ + 0, /* extra */ + IDC_ARROW, /* cursor */ + 0 /* brush */ +#else ICONTITLE_CLASS_ATOM, /* name */ 0, /* style */ NULL, /* procA (winproc is Unicode only) */ @@ -44,6 +53,7 @@ 0, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ +#endif };

16 years, 11 months

[mnordell] 29875: Quota cleanup. IRQL verfications for public functions. Still macro-protected and defaults to disabled.

by mnordell＠svn.reactos.org

Author: mnordell Date: Thu Oct 25 16:31:55 2007 New Revision: 29875 URL: http://svn.reactos.org/svn/reactos?rev=29875&view=rev Log: Quota cleanup. IRQL verfications for public functions. Still macro-protected and defaults to disabled. Modified: trunk/reactos/ntoskrnl/ps/quota.c Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c (original) +++ trunk/reactos/ntoskrnl/ps/quota.c Thu Oct 25 16:31:55 2007 @@ -5,6 +5,7 @@ * PURPOSE: Process Pool Quotas * * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * Mike Nordell */ /* INCLUDES **************************************************************/ @@ -19,6 +20,78 @@ /* Define this macro to enable quota code testing. Once quota code is */ /* stable and verified, remove this macro and checks for it. */ /*#define PS_QUOTA_ENABLE_QUOTA_CODE*/ + + +/* PRIVATE FUNCTIONS *******************************************************/ + +#ifdef PS_QUOTA_ENABLE_QUOTA_CODE + +/* + * Private helper to charge the specified process quota. + * ReturnsSTATUS_QUOTA_EXCEEDED on quota limit check failure. + * Updates QuotaPeak as needed for specified PoolIndex. + * TODO: Research and possibly add (the undocumented) enum type PS_QUOTA_TYPE + * to replace UCHAR for 'PoolIndex'. + * Notes: Conceptually translation unit local/private. + */ +NTSTATUS +NTAPI +PspChargeProcessQuotaSpecifiedPool(IN PEPROCESS Process, + IN UCHAR PoolIndex, + IN ULONG Amount) +{ + ASSERT(Process); + ASSERT(Process != PsInitialSystemProcess); + ASSERT(PoolIndex <= 2); + ASSERT(Process->QuotaBlock); + + /* Note: Race warning. TODO: Needs to add/use lock for this */ + if (Process->QuotaUsage[PoolIndex] + Amount > + Process->QuotaBlock->QuotaEntry[PoolIndex].Limit) + { + return STATUS_QUOTA_EXCEEDED; /* caller raises the exception */ + } + + InterlockedExchangeAdd((LONG*)&Process->QuotaUsage[PoolIndex], Amount); + + /* Note: Race warning. TODO: Needs to add/use lock for this */ + if (Process->QuotaPeak[PoolIndex] < Process->QuotaUsage[PoolIndex]) + { + Process->QuotaPeak[PoolIndex] = Process->QuotaUsage[PoolIndex]; + } + + return STATUS_SUCCESS; +} + + +/* + * Private helper to remove quota charge from the specified process quota. + * TODO: Research and possibly add (the undocumented) enum type PS_QUOTA_TYPE + * to replace UCHAR for 'PoolIndex'. + * Notes: Conceptually translation unit local/private. + */ +VOID +NTAPI +PspReturnProcessQuotaSpecifiedPool(IN PEPROCESS Process, + IN UCHAR PoolIndex, + IN ULONG Amount) +{ + ASSERT(Process); + ASSERT(Process != PsInitialSystemProcess); + ASSERT(PoolIndex <= 2); + ASSERT(!(Amount & 0x80000000)); /* we need to be able to negate it */ + if (Process->QuotaUsage[PoolIndex] < Amount) + { + DPRINT1("WARNING: Process->QuotaUsage sanity check failed.\n"); + } + else + { + InterlockedExchangeAdd((LONG*)&Process->QuotaUsage[PoolIndex], + -(LONG)Amount); + } +} + +#endif /* PS_QUOTA_ENABLE_QUOTA_CODE */ /* FUNCTIONS ***************************************************************/ @@ -74,33 +147,17 @@ if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; #ifdef PS_QUOTA_ENABLE_QUOTA_CODE - if (Process) - { - /* TODO: Check with Process->QuotaBlock if this can be satisfied, */ - /* assuming this indeed is the place to check it. */ - /* Probably something like: - if (Process->QuotaUsage[2] + Amount > - Process->QuotaBlock->QuotaEntry[2].Limit) - { - refuse - } - */ - InterlockedExchangeAdd((LONG*)&Process->QuotaUsage[2], Amount); - /* Note: possibility for race. */ - if (Process->QuotaPeak[2] < Process->QuotaUsage[2]) - { - Process->QuotaPeak[2] = Process->QuotaUsage[2]; - } - } + return PspChargeProcessQuotaSpecifiedPool(Process, 2, Amount); #else /* Otherwise, not implemented */ UNIMPLEMENTED; -#endif return STATUS_SUCCESS; +#endif } /* * @implemented + * Publically documented and exported. */ VOID STDCALL @@ -110,9 +167,15 @@ { NTSTATUS Status; +#ifdef PS_QUOTA_ENABLE_QUOTA_CODE + /* MS-documented IRQL requirement. Not yet enabled as it */ + /* needs verification that it does not break ReactOS, */ + ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); +#endif + /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return; - + /* Charge the usage */ Status = PsChargeProcessPoolQuota(Process, PoolType, Amount); if (!NT_SUCCESS(Status)) ExRaiseStatus(Status); @@ -142,38 +205,6 @@ return PsChargeProcessPoolQuota(Process, PagedPool, Amount); } -#ifdef PS_QUOTA_ENABLE_QUOTA_CODE -/* - * Internal helper function. - * Returns the index of the Quota* member in EPROCESS for - * a specified pool type, or -1 on failure. - */ -static -INT -PspPoolQuotaIndexFromPoolType(POOL_TYPE PoolType) -{ - switch (PoolType) - { - case NonPagedPool: - case NonPagedPoolMustSucceed: - case NonPagedPoolCacheAligned: - case NonPagedPoolCacheAlignedMustS: - case NonPagedPoolSession: - case NonPagedPoolMustSucceedSession: - case NonPagedPoolCacheAlignedSession: - case NonPagedPoolCacheAlignedMustSSession: - return 1; - case PagedPool: - case PagedPoolCacheAligned: - case PagedPoolSession: - case PagedPoolCacheAlignedSession: - return 0; - default: - return -1; - } -} -#endif - /* * @implemented */ @@ -183,41 +214,22 @@ IN POOL_TYPE PoolType, IN ULONG Amount) { -#ifdef PS_QUOTA_ENABLE_QUOTA_CODE - INT PoolIndex; -#endif - /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; #ifdef PS_QUOTA_ENABLE_QUOTA_CODE - PoolIndex = PspPoolQuotaIndexFromPoolType(PoolType); - if (Process && PoolIndex != -1) - { - /* TODO: Check with Process->QuotaBlock if this can be satisfied, */ - /* assuming this indeed is the place to check it. */ - /* Probably something like: - if (Process->QuotaUsage[PoolIndex] + Amount > - Process->QuotaBlock->QuotaEntry[PoolIndex].Limit) - { - refuse - } - */ - InterlockedExchangeAdd((LONG*)&Process->QuotaUsage[PoolIndex], Amount); - /* Note: possibility for race. */ - if (Process->QuotaPeak[PoolIndex] < Process->QuotaUsage[PoolIndex]) - { - Process->QuotaPeak[PoolIndex] = Process->QuotaUsage[PoolIndex]; - } - } -#else - UNIMPLEMENTED; -#endif + return PspChargeProcessQuotaSpecifiedPool(Process, + (PoolType & PAGED_POOL_MASK), + Amount); +#else + UNIMPLEMENTED; return STATUS_SUCCESS; +#endif } /* * @unimplemented + * Publically documented and exported. */ VOID STDCALL @@ -226,25 +238,18 @@ IN ULONG_PTR Amount) { #ifdef PS_QUOTA_ENABLE_QUOTA_CODE - INT PoolIndex; + /* MS-documented IRQL requirement. Not yet enabled as it */ + /* needs verification that it does not break ReactOS, */ + ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); #endif /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return; #ifdef PS_QUOTA_ENABLE_QUOTA_CODE - PoolIndex = PspPoolQuotaIndexFromPoolType(PoolType); - if (Process && PoolIndex != -1) - { - if (Process->QuotaUsage[PoolIndex] < Amount) - { - DPRINT1("WARNING: Process->QuotaUsage sanity check failed.\n"); - } - else - { - InterlockedExchangeAdd((LONG*)&Process->QuotaUsage[PoolIndex], -Amount); - } - } + PspReturnProcessQuotaSpecifiedPool(Process, + (PoolType & PAGED_POOL_MASK), + Amount); #else UNIMPLEMENTED; #endif @@ -295,17 +300,7 @@ if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; #ifdef PS_QUOTA_ENABLE_QUOTA_CODE - if (Process) - { - if (Process->QuotaUsage[2] < Amount) - { - DPRINT1("WARNING: Process PageFileQuotaUsage sanity check failed.\n"); - } - else - { - InterlockedExchangeAdd((LONG*)&Process->QuotaUsage[2], -Amount); - } - } + PspReturnProcessQuotaSpecifiedPool(Process, 2, Amount); #else /* Otherwise, not implemented */ UNIMPLEMENTED;

16 years, 11 months

[peterw] 29874: - Update the help for raddr2line.

by peterw＠svn.reactos.org

Author: peterw Date: Thu Oct 25 15:06:14 2007 New Revision: 29874 URL: http://svn.reactos.org/svn/reactos?rev=29874&view=rev Log: - Update the help for raddr2line. Modified: trunk/tools/RosBE-Windows/Root/Help.cmd Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Thu Oct 25 15:06:14 2007 @@ -41,8 +41,8 @@ if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( echo raddr2line [OPTIONS] - Translates program addresses into file names and - echo line numbers to assist Developers to find - echo specific Bugs in ReactOS. + echo line numbers to assist developers with finding + echo specific bugs in ReactOS. ) if exist "%_ROSBE_BASEDIR%\scut.cmd" ( @@ -124,14 +124,18 @@ ) if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( if "%1" == "raddr2line" ( - echo Usage: raddr2line [OPTIONS] + echo Usage: raddr2line [FILE] [ADDRESS] echo Translates program addresses into file names and line numbers to - echo assist Developers to find specific Bugs in ReactOS. + echo assist developers with finding specific bugs in ReactOS. If + echo either of the options is not given you will be prompted for it. echo. - echo USAGE: - The first parameter has to be the Executable to be analyzed. - echo - The second one has to be the address to be translated. + echo FILE - This can be either a fully specified path or just the + echo file name [you can use partial name ie. ntdll*] of + echo the executable to be analyzed. When using just a file + echo the current directory and all sub-directories are + echo searched. + echo ADDRESS - The address to be translated. echo. - echo If you don't set the needed Parameters, you will be asked for them. goto :EOC ) )

16 years, 11 months

[peterw] 29873: - Fix chdefdir.

by peterw＠svn.reactos.org

Author: peterw Date: Thu Oct 25 14:29:36 2007 New Revision: 29873 URL: http://svn.reactos.org/svn/reactos?rev=29873&view=rev Log: - Fix chdefdir. Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/chdefdir.cmd Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Thu Oct 25 14:29:36 2007 @@ -19,7 +19,7 @@ set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% set _ROSBE_ROSSOURCEDIR=%CD% -set _ROSBE_PREVIOUSSOURCEDIR="" +set _ROSBE_PREVIOUSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% set _ROSBE_SHOWTIME=1 set _ROSBE_WRITELOG=1 set _ROSBE_USECCACHE=0 Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Thu Oct 25 14:29:36 2007 @@ -5,49 +5,39 @@ :: PURPOSE: Tool to change the current working ReactOS source directory :: in RosBE. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: Peter Ward <dralnix(a)gmail.com> :: :: @echo off title Change the current working ReactOS source directory... -if not %_ROSBE_PREVIOUSSOURCEDIR% == %_ROSBE_ROSSOURCEDIR% ( - set _ROSBE_PREVIOUSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% -) - :: :: Parse the command line arguments. :: -if /i "%1" == "" ( - goto :INTERACTIVE +if "%1" == "" ( + call :INTERACTIVE +) else ( + set _1=%1 ) -if /i "%1" == "previous" ( +if "%_1%" == "previous" ( set _ROSBE_ROSSOURCEDIR=%_ROSBE_PREVIOUSSOURCEDIR% ) else ( - if not exist "%1\." ( + if not exist "%_1%\." ( echo ERROR: The path specified doesn't seem to exist. goto :EOC ) - set _ROSBE_ROSSOURCEDIR=%1 + set _ROSBE_PREVIOUSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% + set _ROSBE_ROSSOURCEDIR=%_1% ) goto :EOC +:: +:: If Parameters were set, parse them, if not, ask the user to add them. +:: :INTERACTIVE -set /p XY="Please enter a ReactOS source directory, or 'previous': " - -if /i "%XY%" == "" ( - echo ERROR: You must either enter a valid directory or "previous". - goto :EOC -) -if /i "%XY%"=="previous" ( - set _ROSBE_ROSSOURCEDIR=%_ROSBE_PREVIOUSSOURCEDIR% -) else ( - if not exist "%XY%\." ( - echo ERROR: The path specified doesn't seem to exist. - goto :EOC - ) - set _ROSBE_ROSSOURCEDIR=%XY% -) +set /p _1="Please enter a ReactOS source directory, or 'previous': " +goto :EOF :EOC title ReactOS Build Environment %_ROSBE_VERSION%

16 years, 11 months

[hpoussin] 29872: Add traces Do not crash in IExtractIconW::GetIconLocation if out pointers are NULL

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Oct 25 14:28:19 2007 New Revision: 29872 URL: http://svn.reactos.org/svn/reactos?rev=29872&view=rev Log: Add traces Do not crash in IExtractIconW::GetIconLocation if out pointers are NULL Modified: trunk/reactos/dll/win32/shell32/extracticon.c Modified: trunk/reactos/dll/win32/shell32/extracticon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/extracti… ============================================================================== --- trunk/reactos/dll/win32/shell32/extracticon.c (original) +++ trunk/reactos/dll/win32/shell32/extracticon.c Thu Oct 25 14:28:19 2007 @@ -12,6 +12,8 @@ #include <shlobj.h> #include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(shell); + struct IconLocation { LPWSTR file; @@ -57,6 +59,8 @@ void **ppvObject) { struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); if (!ppvObject) return E_POINTER; @@ -89,6 +93,7 @@ { struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); ULONG refCount = InterlockedIncrement((PLONG)&s->ref); + TRACE("(%p)\n", This); return refCount; } @@ -98,9 +103,8 @@ { struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); ULONG refCount; - - if (!This) - return E_POINTER; + + TRACE("(%p)\n", This); refCount = InterlockedDecrement((PLONG)&s->ref); if (refCount == 0) @@ -122,6 +126,9 @@ int iIcon) { struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); + + TRACE("(%p, %s, %d)\n", This, debugstr_w(pszFile), iIcon); + DuplicateString(pszFile, &s->defaultIcon.file); if (!s->defaultIcon.file) return E_OUTOFMEMORY; @@ -135,6 +142,9 @@ UINT uFlags) { struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); + + TRACE("(%p, 0x%x)\n", This, uFlags); + s->flags = uFlags; return S_OK; } @@ -144,6 +154,7 @@ IDefaultExtractIconInit *This, HKEY hkey) { + FIXME("(%p, %p)\n", This, hkey); UNIMPLEMENTED; return E_NOTIMPL; } @@ -155,6 +166,9 @@ int iIcon) { struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); + + TRACE("(%p, %s, %d)\n", This, debugstr_w(pszFile), iIcon); + DuplicateString(pszFile, &s->normalIcon.file); if (!s->normalIcon.file) return E_OUTOFMEMORY; @@ -169,6 +183,9 @@ int iIcon) { struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); + + TRACE("(%p, %s, %d)\n", This, debugstr_w(pszFile), iIcon); + DuplicateString(pszFile, &s->openIcon.file); if (!s->openIcon.file) return E_OUTOFMEMORY; @@ -183,6 +200,9 @@ int iIcon) { struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); + + TRACE("(%p, %s, %d)\n", This, debugstr_w(pszFile), iIcon); + DuplicateString(pszFile, &s->shortcutIcon.file); if (!s->shortcutIcon.file) return E_OUTOFMEMORY; @@ -228,6 +248,11 @@ struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, extractIconWImpl); const struct IconLocation *icon = NULL; SIZE_T cb; + + TRACE("(%p, 0x%x, %s, 0x%x, %p, %p)\n", This, uFlags, debugstr_w(szIconFile), cchMax, piIndex, pwFlags); + + if (!piIndex || !pwFlags) + return E_POINTER; if (uFlags & GIL_DEFAULTICON) icon = s->defaultIcon.file ? &s->defaultIcon : &s->normalIcon; @@ -259,6 +284,9 @@ HICON *phiconSmall, UINT nIconSize) { + TRACE("(%p, %s, %u, %p, %p, %u)\n", This, debugstr_w(pszFile), + nIconIndex, phiconLarge, phiconSmall, nIconSize); + /* Nothing to do, ExtractIconW::GetIconLocation should be enough */ return S_FALSE; } @@ -308,7 +336,7 @@ if (!szIconFileW) return E_OUTOFMEMORY; } - + hr = IconExtraction_ExtractIconW_GetIconLocation( &s->extractIconWImpl, uFlags, szIconFileW, cchMax, piIndex, pwFlags); if (SUCCEEDED(hr) && cchMax > 0) @@ -388,6 +416,8 @@ IPersistFile *This, CLSID *pClassID) { + TRACE("(%p, %p)\n", This, pClassID); + if (!pClassID) return E_POINTER; @@ -399,6 +429,7 @@ IconExtraction_PersistFile_IsDirty( IPersistFile *This) { + FIXME("(%p)\n", This); UNIMPLEMENTED; return E_NOTIMPL; } @@ -409,6 +440,7 @@ LPCOLESTR pszFileName, DWORD dwMode) { + FIXME("(%p, %s, %u)\n", This, debugstr_w(pszFileName), dwMode); UNIMPLEMENTED; return E_NOTIMPL; } @@ -419,6 +451,7 @@ LPCOLESTR pszFileName, BOOL fRemember) { + FIXME("(%p, %s, %d)\n", This, debugstr_w(pszFileName), fRemember); UNIMPLEMENTED; return E_NOTIMPL; } @@ -428,6 +461,7 @@ IPersistFile *This, LPCOLESTR pszFileName) { + FIXME("(%p, %s)\n", This, debugstr_w(pszFileName)); UNIMPLEMENTED; return E_NOTIMPL; } @@ -437,6 +471,7 @@ IPersistFile *This, LPOLESTR *ppszFileName) { + FIXME("(%p, %p)\n", This, ppszFileName); UNIMPLEMENTED; return E_NOTIMPL; }

16 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007