Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[sginsberg] 39012: - Change DPRINT to INFO_ to silence the spam
by sginsberg＠svn.reactos.org 22 Jan '09

22 Jan '09

Author: sginsberg Date: Thu Jan 22 07:35:13 2009 New Revision: 39012 URL: http://svn.reactos.org/svn/reactos?rev=39012&view=rev Log: - Change DPRINT to INFO_ to silence the spam Modified: trunk/reactos/drivers/serial/serial/pnp.c Modified: trunk/reactos/drivers/serial/serial/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/pnp.… ============================================================================== --- trunk/reactos/drivers/serial/serial/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/pnp.c [iso-8859-1] Thu Jan 22 07:35:13 2009 @@ -223,7 +223,7 @@ ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); /* Test if we are trying to start the serial port used for debugging */ - DPRINT("Comparing addresses: KdComPortInUse: %p, ComPortBase: %p\n", KdComPortInUse, ComPortBase); + INFO_(SERIAL, "Comparing addresses: KdComPortInUse: %p, ComPortBase: %p\n", KdComPortInUse, ComPortBase); if (KdComPortInUse == ComPortBase) { INFO_(SERIAL, "Failing IRP_MN_START_DEVICE as this serial port is used for debugging\n");

1 0

[dchapyshev] 39011: - More fixes for icons in shell32
by dchapyshev＠svn.reactos.org 22 Jan '09

22 Jan '09

Author: dchapyshev Date: Thu Jan 22 07:00:14 2009 New Revision: 39011 URL: http://svn.reactos.org/svn/reactos?rev=39011&view=rev Log: - More fixes for icons in shell32 Added: trunk/reactos/dll/win32/shell32/res/icons/1700.ico (with props) Modified: trunk/reactos/dll/win32/shell32/icon_res.rc trunk/reactos/dll/win32/shell32/res/icons/328.ico trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/icon_res… ============================================================================== --- trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] Thu Jan 22 07:00:14 2009 @@ -11,7 +11,7 @@ IDI_SHELL_NETDRIVE2 ICON "res/icons/11.ico" //THIS SHOULD BE IDI_SHELL_NETDRIVE_OFF IDI_SHELL_CDROM ICON "res/icons/12.ico" IDI_SHELL_RAMDISK ICON "res/icons/13.ico" -// "res/icons/14.ico" +IDI_SHELL_ENTIRE_NETWORK ICON "res/icons/14.ico" IDI_SHELL_NETWORK ICON "res/icons/15.ico" IDI_SHELL_MY_COMPUTER ICON "res/icons/16.ico" IDI_SHELL_PRINTER ICON "res/icons/17.ico" @@ -38,13 +38,14 @@ IDI_SHELL_FAVORITES ICON "res/icons/44.ico" IDI_SHELL_LOGOFF ICON "res/icons/45.ico" IDI_SHELL_EXPLORER ICON "res/icons/46.ico" -// "res/icons/47.ico" +IDI_SHELL_UPDATE ICON "res/icons/47.ico" IDI_SHELL_LOCKED ICON "res/icons/48.ico" -// "res/icons/54.ico" +IDI_SHELL_NOT_CONNECTED_HDD ICON "res/icons/54.ico" IDI_SHELL_FIND_IN_FILE ICON "res/icons/134.ico" IDI_SHELL_OPEN_WITH ICON "res/icons/135.ico" IDI_SHELL_CONTROL_PANEL3 ICON "res/icons/137.ico" IDI_SHELL_PRINTER2 ICON "res/icons/138.ico" +/* TODO: 139.ico, 140.ico, 141.ico, 142.ico, 143.ico, 144,ico, 145.ico, 146.ico, 147.ico, 148.ico */ IDI_SHELL_INF_FILE ICON "res/icons/151.ico" IDI_SHELL_TEXT_FILE ICON "res/icons/152.ico" IDI_SHELL_BAT_FILE ICON "res/icons/153.ico" @@ -54,8 +55,10 @@ IDI_SHELL_FONT_FILE2 ICON "res/icons/157.ico" IDI_SHELL_RUN2 ICON "res/icons/160.ico" IDI_SHELL_CONFIRM_DELETE ICON "res/icons/161.ico" +/* TODO: 165.ico, 166.ico, 167.ico, 168.ico, 169.ico, 170.ico, 171.ico */ IDI_SHELL_NETWORK_FOLDER ICON "res/icons/172.ico" -// "res/icons/173.ico" +IDI_SHELL_FAVORITES2 ICON "res/icons/173.ico" +/* TODO: 174.ico, 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ // Folder Options, General dialog IDI_SHELL_SHOW_COMMON_TASKS ICON "res/icons/182.ico" @@ -65,38 +68,55 @@ IDI_SHELL_SINGLE_CLICK_TO_OPEN ICON "res/icons/186.ico" IDI_SHELL_DOUBLE_CLICK_TO_OPEN ICON "res/icons/187.ico" +/* TODO: 174.ico, 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN1 ICON "res/icons/191.ico" IDI_SHELL_FULL_RECYCLE_BIN1 ICON "res/icons/192.ico" +/* TODO: 193.ico, 194.ico, 196.ico, 197.ico, 198.ico, 199.ico, 200.ico */ IDI_SHELL_FOLDER_OPTIONS ICON "res/icons/210.ico" -// "res/icons/220.ico" +IDI_SHELL_USERS2 ICON "res/icons/220.ico" IDI_SHELL_TURN_OFF ICON "res/icons/221.ico" +/* TODO: 223.ico */ IDI_SHELL_DVD_ROM ICON "res/icons/222.ico" IDI_SHELL_MOVIE_FILE ICON "res/icons/224.ico" IDI_SHELL_MUSIC_FILE ICON "res/icons/225.ico" -// "res/icons/226.ico" +IDI_SHELL_PICTURE_FILE ICON "res/icons/226.ico" +/* TODO: 227.ico */ IDI_SHELL_CD_MUSIC2 ICON "res/icons/228.ico" -// "res/icons/233.ico" +/* TODO: 229.ico, 230.ico, 231.ico, 232.ico */ +IDI_SHELL_FDD ICON "res/icons/233.ico" +/* TODO: 234.ico */ IDI_SHELL_MY_DOCUMENTS ICON "res/icons/235.ico" IDI_SHELL_MY_PICTURES ICON "res/icons/236.ico" IDI_SHELL_MY_MUSIC ICON "res/icons/237.ico" IDI_SHELL_MY_MOVIES ICON "res/icons/238.ico" -// "res/icons/240.ico" +/* TODO: 239.ico */ +IDI_SHELL_FULL_RECYCLE_BIN2 ICON "res/icons/240.ico" +/* TODO: 241.ico, 242.ico, 243.ico, 244.ico */ IDI_SHELL_PRINTER3 ICON "res/icons/245.ico" -// "res/icons/246.ico" +IDI_SHELL_ICON_246 ICON "res/icons/246.ico" +/* TODO: 247.ico */ IDI_SHELL_CAMERA ICON "res/icons/248.ico" IDI_SHELL_SLIDE_SHOW ICON "res/icons/249.ico" IDI_SHELL_DISPLAY ICON "res/icons/250.ico" +/* TODO: 251.ico */ IDI_SHELL_PRINT_PICS ICON "res/icons/252.ico" +/* TODO: 253.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN3 ICON "res/icons/254.ico" -// "res/icons/255.ico" +IDI_SHELL_ICON_255 ICON "res/icons/255.ico" +/* TODO: 256.ico, 257.ico, 258.ico, 259.ico, 260.ico, 261.ico, 262.ico */ IDI_SHELL_HELP1 ICON "res/icons/263.ico" +/* TODO: 264.ico */ IDI_SHELL_SENDMAIL ICON "res/icons/265.ico" +/* TODO: 266.ico, 267.ico */ IDI_SHELL_ACCESSABILITY ICON "res/icons/268.ico" IDI_SHELL_USERS ICON "res/icons/269.ico" IDI_SHELL_SCREEN_COLORS ICON "res/icons/270.ico" IDI_SHELL_ADD_REM_PROGRAMS ICON "res/icons/271.ico" +/* TODO: 272.ico, 273.ico, 274.ico, 275.ico, 276.ico */ IDI_SHELL_TUNES ICON "res/icons/277.ico" +/* TODO: 278.ico */ IDI_SHELL_USER_ACCOUNTS ICON "res/icons/279.ico" +/* TODO: 281.ico, 282.ico, 283.ico, 284.ico */ IDI_SHELL_HELP_FILE ICON "res/icons/289.ico" IDI_SHELL_GO ICON "res/icons/290.ico" IDI_SHELL_DVD_DRIVE ICON "res/icons/291.ico" @@ -108,14 +128,20 @@ IDI_SHELL_DVD_RAM ICON "res/icons/297.ico" IDI_SHELL_DVDR_ROM ICON "res/icons/298.ico" IDI_SHELL_MP3_PLAYER ICON "res/icons/299.ico" +/* TODO: 300.ico, 301.ico */ IDI_SHELL_CD_ROM1 ICON "res/icons/302.ico" +/* TODO: 303.ico */ IDI_SHELL_DVD_ROM1 ICON "res/icons/304.ico" -// "res/icons/305.ico" +IDI_SHELL_FDD2 ICON "res/icons/305.ico" +/* TODO: 306.ico, 307.ico, 308.ico */ IDI_SHELL_CAMERA1 ICON "res/icons/309.ico" +/* TODO: 310.ico, 311.ico, 312.ico, 313.ico, 314.ico */ IDI_SHELL_SCANNER ICON "res/icons/315.ico" +/* TODO: 316.ico */ IDI_SHELL_CAMCORDER ICON "res/icons/317.ico" IDI_SHELL_DVDRW_ROM ICON "res/icons/318.ico" IDI_SHELL_NEW_FOLDER ICON "res/icons/319.ico" +/* TODO: 320.ico, 321.ico */ IDI_SHELL_FAVOTITES ICON "res/icons/322.ico" IDI_SHELL_SEARCH1 ICON "res/icons/323.ico" IDI_SHELL_HELP2 ICON "res/icons/324.ico" @@ -125,11 +151,16 @@ IDI_SHELL_RUN1 ICON "res/icons/328.ico" IDI_SHELL_SHUTDOWN1 ICON "res/icons/329.ico" IDI_SHELL_CONTROL_PANEL1 ICON "res/icons/330.ico" +/* TODO: 331.ico, 337.ico, 338.ico, 512.ico */ IDI_SHELL_IDEA ICON "res/icons/1001.ico" +/* TODO: 1002.ico, 1003.ico */ IDI_SHELL_HELP_FILE1 ICON "res/icons/1004.ico" +/* TODO: 1005.ico, 1006.ico, 1007.ico, 1008.ico, 1009.ico, 1010.ico, 1011.ico */ IDI_SHELL_SHUTDOWN2 ICON "res/icons/8240.ico" -// "res/icons/16710.ico" -// "res/icons/16715.ico" -// "res/icons/16717.ico" -// "res/icons/16718.ico" -// "res/icons/16721.ico" +IDI_SHELL_DELETE1 ICON "res/icons/16710.ico" +IDI_SHELL_DELETE2 ICON "res/icons/16715.ico" +IDI_SHELL_DELETE3 ICON "res/icons/16717.ico" +IDI_SHELL_DELETE4 ICON "res/icons/16718.ico" +IDI_SHELL_DELETE5 ICON "res/icons/16721.ico" + +IDI_SHELL_ADMINTOOLS ICON "res/icons/1700.ico" /* FIXME */ Added: trunk/reactos/dll/win32/shell32/res/icons/1700.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/1700.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/res/icons/328.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Thu Jan 22 07:00:14 2009 @@ -231,6 +231,7 @@ #define IDI_SHELL_SEARCH 23 #define IDI_SHELL_HELP 24 #define IDI_SHELL_RUN 25 +/* TODO: 26.ico, 27.ico */ #define IDI_SHELL_SHUTDOWN 28 #define IDI_SHELL_SHARE 29 #define IDI_SHELL_SHORTCUT 30 @@ -249,14 +250,17 @@ #define IDI_SHELL_FAVORITES 44 #define IDI_SHELL_LOGOFF 45 #define IDI_SHELL_EXPLORER 46 -/* TODO: 47.ico */ +#define IDI_SHELL_UPDATE 47 #define IDI_SHELL_LOCKED 48 -/* TODO: 54.ico */ +#define IDI_SHELL_NOT_CONNECTED_HDD 54 +/* TODO: 133.ico */ #define IDI_SHELL_FIND_IN_FILE 134 #define IDI_SHELL_OPEN_WITH 135 #define IDI_SHELL_CONTROL_PANEL3 137 #define IDI_SHELL_PRINTER2 138 +/* TODO: 139.ico, 140.ico, 141.ico */ #define IDI_SHELL_TRASH_FILE 142 +/* TODO: 143.ico, 144,ico, 145.ico, 146.ico, 147.ico, 148.ico */ #define IDI_SHELL_INF_FILE 151 #define IDI_SHELL_TEXT_FILE 152 #define IDI_SHELL_BAT_FILE 153 @@ -266,35 +270,58 @@ #define IDI_SHELL_FONT_FILE2 157 #define IDI_SHELL_RUN2 160 #define IDI_SHELL_CONFIRM_DELETE 161 +/* TODO: 165.ico, 166.ico, 167.ico, 168.ico, 169.ico, 170.ico, 171.ico */ #define IDI_SHELL_NETWORK_FOLDER 172 -/* TODO: 173.ico */ +#define IDI_SHELL_FAVORITES2 173 +/* TODO: 174.ico, 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ #define IDI_SHELL_EMPTY_RECYCLE_BIN1 191 #define IDI_SHELL_FULL_RECYCLE_BIN1 192 +/* TODO: 193.ico, 194.ico, 196.ico, 197.ico, 198.ico, 199.ico, 200.ico */ #define IDI_SHELL_FOLDER_OPTIONS 210 +#define IDI_SHELL_USERS2 220 #define IDI_SHELL_TURN_OFF 221 #define IDI_SHELL_DVD_ROM 222 +/* TODO: 223.ico */ #define IDI_SHELL_MOVIE_FILE 224 #define IDI_SHELL_MUSIC_FILE 225 +#define IDI_SHELL_PICTURE_FILE 226 +/* TODO: 227.ico */ #define IDI_SHELL_CD_MUSIC2 228 -#define IDI_SHELL_SEARCH1 232 +/* TODO: 229.ico, 230.ico, 231.ico, 232.ico */ +#define IDI_SHELL_FDD 233 +/* TODO: 234.ico */ #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237 #define IDI_SHELL_MY_MOVIES 238 +/* TODO: 239.ico */ +#define IDI_SHELL_FULL_RECYCLE_BIN2 240 +/* TODO: 241.ico, 242.ico, 243.ico, 244.ico */ #define IDI_SHELL_PRINTER3 245 +#define IDI_SHELL_ICON_246 246 +/* TODO: 247.ico */ #define IDI_SHELL_CAMERA 248 #define IDI_SHELL_SLIDE_SHOW 249 #define IDI_SHELL_DISPLAY 250 +/* TODO: 251.ico */ #define IDI_SHELL_PRINT_PICS 252 +/* TODO: 253.ico */ #define IDI_SHELL_EMPTY_RECYCLE_BIN3 254 +#define IDI_SHELL_ICON_255 255 +/* TODO: 256.ico, 257.ico, 258.ico, 259.ico, 260.ico, 261.ico, 262.ico */ #define IDI_SHELL_HELP1 263 +/* TODO: 264.ico */ #define IDI_SHELL_SENDMAIL 265 +/* TODO: 266.ico, 267.ico */ #define IDI_SHELL_ACCESSABILITY 268 #define IDI_SHELL_USERS 269 #define IDI_SHELL_SCREEN_COLORS 270 #define IDI_SHELL_ADD_REM_PROGRAMS 271 +/* TODO: 272.ico, 273.ico, 274.ico, 275.ico, 276.ico */ #define IDI_SHELL_TUNES 277 +/* TODO: 278.ico */ #define IDI_SHELL_USER_ACCOUNTS 279 +/* TODO: 281.ico, 282.ico, 283.ico, 284.ico */ #define IDI_SHELL_HELP_FILE 289 #define IDI_SHELL_GO 290 #define IDI_SHELL_DVD_DRIVE 291 @@ -306,14 +333,22 @@ #define IDI_SHELL_DVD_RAM 297 #define IDI_SHELL_DVDR_ROM 298 #define IDI_SHELL_MP3_PLAYER 299 +/* TODO: 300.ico, 301.ico */ #define IDI_SHELL_CD_ROM1 302 +/* TODO: 303.ico */ #define IDI_SHELL_DVD_ROM1 304 +#define IDI_SHELL_FDD2 305 +/* TODO: 306.ico, 307.ico, 308.ico */ #define IDI_SHELL_CAMERA1 309 +/* TODO: 310.ico, 311.ico, 312.ico, 313.ico, 314.ico */ #define IDI_SHELL_SCANNER 315 +/* TODO: 316.ico */ #define IDI_SHELL_CAMCORDER 317 #define IDI_SHELL_DVDRW_ROM 318 #define IDI_SHELL_NEW_FOLDER 319 +/* TODO: 320.ico, 321.ico */ #define IDI_SHELL_FAVOTITES 322 +#define IDI_SHELL_SEARCH1 323 #define IDI_SHELL_HELP2 324 #define IDI_SHELL_LOGOFF1 325 #define IDI_SHELL_PROGRAMS_FOLDER1 326 @@ -321,10 +356,20 @@ #define IDI_SHELL_RUN1 328 #define IDI_SHELL_SHUTDOWN1 329 #define IDI_SHELL_CONTROL_PANEL1 330 -#define IDI_SHELL_ADMINTOOLS 328 +/* TODO: 331.ico, 337.ico, 338.ico, 512.ico */ #define IDI_SHELL_IDEA 1001 +/* TODO: 1002.ico, 1003.ico */ #define IDI_SHELL_HELP_FILE1 1004 +/* TODO: 1005.ico, 1006.ico, 1007.ico, 1008.ico, 1009.ico, 1010.ico, 1011.ico */ #define IDI_SHELL_SHUTDOWN2 8240 + +#define IDI_SHELL_DELETE1 16710 +#define IDI_SHELL_DELETE2 16715 +#define IDI_SHELL_DELETE3 16717 +#define IDI_SHELL_DELETE4 16718 +#define IDI_SHELL_DELETE5 16721 + +#define IDI_SHELL_ADMINTOOLS 1700 /* FIXME */ // Icons for Folder Options (ID's identical to Windows XP SP3) #define IDI_SHELL_SHOW_COMMON_TASKS 182

1 0

[hyperion] 39010: modified tools/rbuild/module.cpp modified tools/rbuild/project.cpp modified tools/rbuild/project.dtd modified tools/rbuild/rbuild.h New per-project property allowwarnings overrides allowwarnings property of all modules in the project
by hyperion＠svn.reactos.org 22 Jan '09

22 Jan '09

Author: hyperion Date: Thu Jan 22 05:55:12 2009 New Revision: 39010 URL: http://svn.reactos.org/svn/reactos?rev=39010&view=rev Log: modified tools/rbuild/module.cpp modified tools/rbuild/project.cpp modified tools/rbuild/project.dtd modified tools/rbuild/rbuild.h New per-project property allowwarnings overrides allowwarnings property of all modules in the project Modified: trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.cpp trunk/reactos/tools/rbuild/project.dtd trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Thu Jan 22 05:55:12 2009 @@ -452,6 +452,8 @@ } if ( att != NULL ) allowWarnings = att->value == "true"; + else if ( project.allowWarningsSet ) + allowWarnings = project.allowWarnings; else allowWarnings = false; Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] Thu Jan 22 05:55:12 2009 @@ -298,6 +298,11 @@ assert(att); makefile = Environment::GetAutomakeFile ( att->value ); + att = node->GetAttribute ( "allowwarnings", false ); + allowWarningsSet = att != NULL; + if ( att != NULL ) + allowWarnings = att->value == "true"; + size_t i; for ( i = 0; i < node->subElements.size (); i++ ) { Modified: trunk/reactos/tools/rbuild/project.dtd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.dtd [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/project.dtd [iso-8859-1] Thu Jan 22 05:55:12 2009 @@ -137,6 +137,7 @@ <!ATTLIST project name (ReactOS|Project) #REQUIRED makefile %Text; #REQUIRED + allowwarnings (true|false) "false" xmlns:xi %Text; #FIXED "http://www.w3.org/2001/XInclude" > Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Thu Jan 22 05:55:12 2009 @@ -237,6 +237,8 @@ std::map<std::string, Module*> modules; IfableData non_if_data; IfableData host_non_if_data; + bool allowWarnings; + bool allowWarningsSet; Project ( const Configuration& configuration, const std::string& filename,

1 0

[dchapyshev] 39009: - Add more defines for icons - Update icon for "Administration tools"
by dchapyshev＠svn.reactos.org 22 Jan '09

22 Jan '09

Author: dchapyshev Date: Thu Jan 22 05:27:28 2009 New Revision: 39009 URL: http://svn.reactos.org/svn/reactos?rev=39009&view=rev Log: - Add more defines for icons - Update icon for "Administration tools" Modified: trunk/reactos/dll/win32/shell32/icon_res.rc trunk/reactos/dll/win32/shell32/res/icons/328.ico trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/icon_res… ============================================================================== --- trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] Thu Jan 22 05:27:28 2009 @@ -53,7 +53,7 @@ IDI_SHELL_TT_FONT_FILE ICON "res/icons/156.ico" IDI_SHELL_FONT_FILE2 ICON "res/icons/157.ico" IDI_SHELL_RUN2 ICON "res/icons/160.ico" -// "res/icons/161.ico" +IDI_SHELL_CONFIRM_DELETE ICON "res/icons/161.ico" IDI_SHELL_NETWORK_FOLDER ICON "res/icons/172.ico" // "res/icons/173.ico" @@ -66,8 +66,8 @@ IDI_SHELL_DOUBLE_CLICK_TO_OPEN ICON "res/icons/187.ico" IDI_SHELL_EMPTY_RECYCLE_BIN1 ICON "res/icons/191.ico" -IDI_SHELL_FULL_RECYCLE_BIN1 ICON "res/icons/192.ico" -// "res/icons/210.ico" +IDI_SHELL_FULL_RECYCLE_BIN1 ICON "res/icons/192.ico" +IDI_SHELL_FOLDER_OPTIONS ICON "res/icons/210.ico" // "res/icons/220.ico" IDI_SHELL_TURN_OFF ICON "res/icons/221.ico" IDI_SHELL_DVD_ROM ICON "res/icons/222.ico" Modified: trunk/reactos/dll/win32/shell32/res/icons/328.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Thu Jan 22 05:27:28 2009 @@ -208,6 +208,7 @@ #define IDI_SHELL_DOCUMENT 1 #define IDI_SHELL_RICH_TEXT 2 +#define IDI_SHELL_EXE 3 #define IDI_SHELL_FOLDER 4 #define IDI_SHELL_FOLDER_OPEN 5 #define IDI_SHELL_5_12_FLOPPY 6 @@ -224,19 +225,37 @@ #define IDI_SHELL_PRINTER 17 #define IDI_SHELL_MY_NETWORK_PLACES 18 #define IDI_SHELL_COMPUTERS_NEAR_ME 19 -#define IDI_SHELL_FOLDER_SMALL_XP 20 +#define IDI_SHELL_PROGRAMS_FOLDER 20 +#define IDI_SHELL_RECENT_DOCUMENTS 21 +#define IDI_SHELL_CONTROL_PANEL 22 #define IDI_SHELL_SEARCH 23 #define IDI_SHELL_HELP 24 -#define IDI_SHELL_FOLDER_OPEN_LARGE 29 +#define IDI_SHELL_RUN 25 +#define IDI_SHELL_SHUTDOWN 28 +#define IDI_SHELL_SHARE 29 #define IDI_SHELL_SHORTCUT 30 -#define IDI_SHELL_FOLDER_OPEN_SMALL 31 +#define IDI_SHELL_FOLDER_OPEN_SMALL 31 /* ??? */ #define IDI_SHELL_EMPTY_RECYCLE_BIN 32 #define IDI_SHELL_FULL_RECYCLE_BIN 33 +/* TODO: 34.ico */ #define IDI_SHELL_DESKTOP 35 -#define IDI_SHELL_CONTROL_PANEL 36 +#define IDI_SHELL_CONTROL_PANEL2 36 +#define IDI_SHELL_PROGRAMS_FOLDER2 37 #define IDI_SHELL_PRINTERS_FOLDER 38 #define IDI_SHELL_FONTS_FOLDER 39 +#define IDI_SHELL_TSKBAR_STARTMENU 40 +#define IDI_SHELL_CD_MUSIC 41 +/* TODO: 42.ico, 43.ico */ +#define IDI_SHELL_FAVORITES 44 +#define IDI_SHELL_LOGOFF 45 +#define IDI_SHELL_EXPLORER 46 +/* TODO: 47.ico */ +#define IDI_SHELL_LOCKED 48 +/* TODO: 54.ico */ +#define IDI_SHELL_FIND_IN_FILE 134 #define IDI_SHELL_OPEN_WITH 135 +#define IDI_SHELL_CONTROL_PANEL3 137 +#define IDI_SHELL_PRINTER2 138 #define IDI_SHELL_TRASH_FILE 142 #define IDI_SHELL_INF_FILE 151 #define IDI_SHELL_TEXT_FILE 152 @@ -244,12 +263,68 @@ #define IDI_SHELL_SYSTEM_FILE 154 #define IDI_SHELL_FONT_FILE 155 #define IDI_SHELL_TT_FONT_FILE 156 +#define IDI_SHELL_FONT_FILE2 157 #define IDI_SHELL_RUN2 160 #define IDI_SHELL_CONFIRM_DELETE 161 +#define IDI_SHELL_NETWORK_FOLDER 172 +/* TODO: 173.ico */ +#define IDI_SHELL_EMPTY_RECYCLE_BIN1 191 +#define IDI_SHELL_FULL_RECYCLE_BIN1 192 +#define IDI_SHELL_FOLDER_OPTIONS 210 +#define IDI_SHELL_TURN_OFF 221 +#define IDI_SHELL_DVD_ROM 222 +#define IDI_SHELL_MOVIE_FILE 224 #define IDI_SHELL_MUSIC_FILE 225 +#define IDI_SHELL_CD_MUSIC2 228 +#define IDI_SHELL_SEARCH1 232 #define IDI_SHELL_MY_DOCUMENTS 235 +#define IDI_SHELL_MY_PICTURES 236 +#define IDI_SHELL_MY_MUSIC 237 +#define IDI_SHELL_MY_MOVIES 238 +#define IDI_SHELL_PRINTER3 245 +#define IDI_SHELL_CAMERA 248 +#define IDI_SHELL_SLIDE_SHOW 249 +#define IDI_SHELL_DISPLAY 250 +#define IDI_SHELL_PRINT_PICS 252 +#define IDI_SHELL_EMPTY_RECYCLE_BIN3 254 +#define IDI_SHELL_HELP1 263 +#define IDI_SHELL_SENDMAIL 265 +#define IDI_SHELL_ACCESSABILITY 268 +#define IDI_SHELL_USERS 269 +#define IDI_SHELL_SCREEN_COLORS 270 +#define IDI_SHELL_ADD_REM_PROGRAMS 271 +#define IDI_SHELL_TUNES 277 +#define IDI_SHELL_USER_ACCOUNTS 279 +#define IDI_SHELL_HELP_FILE 289 +#define IDI_SHELL_GO 290 +#define IDI_SHELL_DVD_DRIVE 291 +#define IDI_SHELL_CD_ADD_MUSIC 292 +#define IDI_SHELL_CD 293 +#define IDI_SHELL_CD_ROM 294 +#define IDI_SHELL_CDR 295 +#define IDI_SHELL_CDRW 296 +#define IDI_SHELL_DVD_RAM 297 +#define IDI_SHELL_DVDR_ROM 298 +#define IDI_SHELL_MP3_PLAYER 299 +#define IDI_SHELL_CD_ROM1 302 +#define IDI_SHELL_DVD_ROM1 304 +#define IDI_SHELL_CAMERA1 309 +#define IDI_SHELL_SCANNER 315 +#define IDI_SHELL_CAMCORDER 317 +#define IDI_SHELL_DVDRW_ROM 318 +#define IDI_SHELL_NEW_FOLDER 319 +#define IDI_SHELL_FAVOTITES 322 +#define IDI_SHELL_HELP2 324 +#define IDI_SHELL_LOGOFF1 325 +#define IDI_SHELL_PROGRAMS_FOLDER1 326 +#define IDI_SHELL_RECENT_DOCUMENTS1 327 +#define IDI_SHELL_RUN1 328 +#define IDI_SHELL_SHUTDOWN1 329 #define IDI_SHELL_CONTROL_PANEL1 330 #define IDI_SHELL_ADMINTOOLS 328 +#define IDI_SHELL_IDEA 1001 +#define IDI_SHELL_HELP_FILE1 1004 +#define IDI_SHELL_SHUTDOWN2 8240 // Icons for Folder Options (ID's identical to Windows XP SP3) #define IDI_SHELL_SHOW_COMMON_TASKS 182

1 0

[cwittich] 39008: Author: Aric Stewart <aric at codeweavers.com> Date: Tue Jan 20 13:04:50 2009 -0600 shell32: Initial stub for SHCreateShellItem. It returns E_NOINTERFACE until shell32 version 6.0 or later.
by cwittich＠svn.reactos.org 22 Jan '09

22 Jan '09

Author: cwittich Date: Thu Jan 22 04:56:24 2009 New Revision: 39008 URL: http://svn.reactos.org/svn/reactos?rev=39008&view=rev Log: Author: Aric Stewart <aric at codeweavers.com> Date: Tue Jan 20 13:04:50 2009 -0600 shell32: Initial stub for SHCreateShellItem. It returns E_NOINTERFACE until shell32 version 6.0 or later. Modified: trunk/reactos/dll/win32/shell32/pidl.c trunk/reactos/dll/win32/shell32/shell32.spec Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Thu Jan 22 04:56:24 2009 @@ -2392,3 +2392,10 @@ return dst; } + +HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, + IShellFolder *psfParent, LPCITEMIDLIST pidl, void **ppsi) +{ + FIXME("STUB: %p %p %p %p\n",pidlParent, psfParent, pidl, ppsi); + return E_NOINTERFACE; +} Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Thu Jan 22 04:56:24 2009 @@ -331,6 +331,7 @@ @ stdcall SHCreateDirectoryExA(long str ptr) @ stdcall SHCreateDirectoryExW(long wstr ptr) @ stub SHCreateProcessAsUserW +@ stdcall SHCreateShellItem(ptr ptr ptr ptr) @ stdcall SHEmptyRecycleBinA(long str long) @ stdcall SHEmptyRecycleBinW(long wstr long) @ stub SHExtractIconsW

1 0

[cwittich] 39007: forgot to add \n
by cwittich＠svn.reactos.org 22 Jan '09

22 Jan '09

Author: cwittich Date: Thu Jan 22 03:43:02 2009 New Revision: 39007 URL: http://svn.reactos.org/svn/reactos?rev=39007&view=rev Log: forgot to add \n Modified: trunk/reactos/dll/win32/kernel32/file/deviceio.c Modified: trunk/reactos/dll/win32/kernel32/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/deviceio.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/deviceio.c [iso-8859-1] Thu Jan 22 03:43:02 2009 @@ -134,7 +134,7 @@ completed) */ if (!lpBytesReturned) { - ERR("Bad caller: lpBytesReturned must not be NULL"); + ERR("Bad caller: lpBytesReturned must not be NULL\n"); } *lpBytesReturned = Iosb.Information; } @@ -190,7 +190,7 @@ if (!lpNumberOfBytesTransferred) { - ERR("Bad caller: lpNumberOfBytesTransferred must not be NULL"); + ERR("Bad caller: lpNumberOfBytesTransferred must not be NULL\n"); } *lpNumberOfBytesTransferred = lpOverlapped->InternalHigh;

1 0

[dchapyshev] 39006: - Add mscat32, ntprint and wmi from Wine
by dchapyshev＠svn.reactos.org 22 Jan '09

22 Jan '09

Author: dchapyshev Date: Thu Jan 22 03:29:16 2009 New Revision: 39006 URL: http://svn.reactos.org/svn/reactos?rev=39006&view=rev Log: - Add mscat32, ntprint and wmi from Wine Added: trunk/reactos/dll/win32/mscat32/ (with props) trunk/reactos/dll/win32/mscat32/main.c (with props) trunk/reactos/dll/win32/mscat32/mscat32.rbuild (with props) trunk/reactos/dll/win32/mscat32/mscat32.spec (with props) trunk/reactos/dll/win32/ntprint/ (with props) trunk/reactos/dll/win32/ntprint/ntprint.c (with props) trunk/reactos/dll/win32/ntprint/ntprint.rbuild (with props) trunk/reactos/dll/win32/ntprint/ntprint.rc (with props) trunk/reactos/dll/win32/ntprint/ntprint.spec (with props) trunk/reactos/dll/win32/wmi/ (with props) trunk/reactos/dll/win32/wmi/wmi.rbuild (with props) trunk/reactos/dll/win32/wmi/wmi.rc (with props) trunk/reactos/dll/win32/wmi/wmi.spec (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=390… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Thu Jan 22 03:29:16 2009 @@ -30,6 +30,7 @@ <property name="BASEADDRESS_INPUT" value ="0x5e400000" /> <property name="BASEADDRESS_DINPUT" value="0x5f580000" /> <property name="BASEADDRESS_NETID" value="0x5f660000" /> + <property name="BASEADDRESS_NTPRINT" value="0x5f6a0000" /> <property name="BASEADDRESS_QEDIT" value="0x611c0000" /> <property name="BASEADDRESS_MODEMUI" value="0x61650000" /> <property name="BASEADDRESS_MAPI32" value="0x62250000" /> @@ -103,6 +104,7 @@ <property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> <property name="BASEADDRESS_WDMAUD" value="0x72d20000" /> <property name="BASEADDRESS_WINSPOOL" value="0x72f50000" /> + <property name="BASEADDRESS_MSCAT32" value="0x732b0000" /> <property name="BASEADDRESS_MSTASK" value="0x73520000" /> <property name="BASEADDRESS_MSDMO" value="0x73670000" /> <property name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> @@ -164,6 +166,7 @@ <property name="BASEADDRESS_WINTRUST" value="0x76c30000" /> <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> <property name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> + <property name="BASEADDRESS_WMI" value="0x76d20000" /> <property name="BASEADDRESS_DHCPCSVC" value="0x76d80000" /> <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> <property name="BASEADDRESS_OLEAUT32" value="0x76e00000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Jan 22 03:29:16 2009 @@ -285,6 +285,7 @@ dll\win32\mprapi\mprapi.dll 1 dll\win32\msacm32\msacm32.dll 1 dll\win32\msafd\msafd.dll 1 +dll\win32\mscat32\mscat32.dll 1 dll\win32\mscoree\mscoree.dll 1 dll\win32\msgina\msgina.dll 1 dll\win32\mshtml\mshtml.dll 1 @@ -307,6 +308,7 @@ dll\win32\newdev\newdev.dll 1 dll\win32\ntdsapi\ntdsapi.dll 1 dll\win32\ntmarta\ntmarta.dll 1 +dll\win32\ntprint\ntprint.dll 1 dll\win32\objsel\objsel.dll 1 dll\win32\odbc32\odbc32.dll 1 dll\win32\odbccp32\odbccp32.dll 1 @@ -373,6 +375,7 @@ dll\win32\winsta\winsta.dll 1 dll\win32\wintrust\wintrust.dll 1 dll\win32\wldap32\wldap32.dll 1 +dll\win32\wmi\wmi.dll 1 dll\win32\ws2_32\ws2_32.dll 1 dll\win32\ws2help\ws2help.dll 1 dll\win32\wshirda\wshirda.dll 1 Propchange: trunk/reactos/dll/win32/mscat32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jan 22 03:29:16 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/mscat32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/mscat32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/mscat32/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/mscat32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscat32/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/mscat32/main.c (added) +++ trunk/reactos/dll/win32/mscat32/main.c [iso-8859-1] Thu Jan 22 03:29:16 2009 @@ -1,0 +1,47 @@ +/* mscat32.dll - Backend for Microsoft's MakeCat command-line tool + * + * Copyright (C) 2007 Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mscat); + + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ + + if (fdwReason == DLL_PROCESS_ATTACH) + { + DisableThreadLibraryCalls( hinstDLL ); + /* FIXME: Initialisation */ + } + else if (fdwReason == DLL_PROCESS_DETACH) + { + /* FIXME: Cleanup */ + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/mscat32/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/mscat32/mscat32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscat32/mscat32.… ============================================================================== --- trunk/reactos/dll/win32/mscat32/mscat32.rbuild (added) +++ trunk/reactos/dll/win32/mscat32/mscat32.rbuild [iso-8859-1] Thu Jan 22 03:29:16 2009 @@ -1,0 +1,14 @@ +<group> +<module name="mscat32" type="win32dll" baseaddress="${BASEADDRESS_MSCAT32}" installbase="system32" installname="mscat32.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="mscat32.spec" /> + <include base="mscat32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>main.c</file> + <library>wine</library> + <library>wintrust</library> + <library>kernel32</library> + <library>ntdll</library> +</module> +</group> Propchange: trunk/reactos/dll/win32/mscat32/mscat32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/mscat32/mscat32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscat32/mscat32.… ============================================================================== --- trunk/reactos/dll/win32/mscat32/mscat32.spec (added) +++ trunk/reactos/dll/win32/mscat32/mscat32.spec [iso-8859-1] Thu Jan 22 03:29:16 2009 @@ -1,0 +1,34 @@ +@ stub CryptCATVerifyMember +@ stdcall CryptCATAdminAcquireContext(long ptr long) wintrust.CryptCATAdminAcquireContext +@ stdcall CryptCATAdminAddCatalog(long wstr wstr long) wintrust.CryptCATAdminAddCatalog +@ stdcall CryptCATAdminCalcHashFromFileHandle(long ptr ptr long) wintrust.CryptCATAdminCalcHashFromFileHandle +@ stdcall CryptCATAdminEnumCatalogFromHash(long ptr long long ptr) wintrust.CryptCATAdminEnumCatalogFromHash +@ stdcall CryptCATAdminReleaseCatalogContext(long long long) wintrust.CryptCATAdminReleaseCatalogContext +@ stdcall CryptCATAdminReleaseContext(long long) wintrust.CryptCATAdminReleaseContext +@ stub CryptCATCDFClose +@ stub CryptCATCDFEnumAttributes +@ stub CryptCATCDFEnumAttributesWithCDFTag +@ stub CryptCATCDFEnumCatAttributes +@ stub CryptCATCDFEnumMembers +@ stub CryptCATCDFEnumMembersByCDFTag +@ stub CryptCATCDFOpen +@ stub CryptCATCatalogInfoFromContext +@ stdcall CryptCATClose(long) wintrust.CryptCATClose +@ stub CryptCATEnumerateAttr +@ stub CryptCATEnumerateCatAttr +@ stdcall CryptCATEnumerateMember(long ptr) wintrust.CryptCATEnumerateMember +@ stub CryptCATGetAttrInfo +@ stub CryptCATGetCatAttrInfo +@ stub CryptCATGetMemberInfo +@ stub CryptCATHandleFromStore +@ stdcall CryptCATOpen(wstr long long long long) wintrust.CryptCATOpen +@ stub CryptCATPersistStore +@ stub CryptCATPutAttrInfo +@ stub CryptCATPutCatAttrInfo +@ stub CryptCATPutMemberInfo +@ stub CryptCATStoreFromHandle +@ stdcall -private DllRegisterServer() wintrust.mscat32DllRegisterServer +@ stdcall -private DllUnregisterServer() wintrust.mscat32DllUnregisterServer +@ stub IsCatalogFile +@ stub MsCatConstructHashTag +@ stub MsCatFreeHashTag Propchange: trunk/reactos/dll/win32/mscat32/mscat32.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/ntprint/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jan 22 03:29:16 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/ntprint/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/ntprint/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/ntprint/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/ntprint/ntprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntprint/ntprint.… ============================================================================== --- trunk/reactos/dll/win32/ntprint/ntprint.c (added) +++ trunk/reactos/dll/win32/ntprint/ntprint.c [iso-8859-1] Thu Jan 22 03:29:16 2009 @@ -1,0 +1,167 @@ +/* + * Implementation of the Spooler Setup API (Printing) + * + * Copyright 2007 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "winnls.h" +#include "winver.h" +#include "winspool.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntprint); + +HINSTANCE NTPRINT_hInstance = NULL; + +typedef struct { + LPMONITOR_INFO_2W mi2; /* Buffer for installed Monitors */ + DWORD installed; /* Number of installed Monitors */ +} monitorinfo_t; + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + NTPRINT_hInstance = hinstDLL; + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} + +/***************************************************** + * PSetupCreateMonitorInfo [NTPRINT.@] + * + * + */ + +HANDLE WINAPI PSetupCreateMonitorInfo(LPVOID unknown1, LPVOID unknown2,LPVOID unknown3) +{ + monitorinfo_t * mi=NULL; + DWORD needed; + DWORD res; + + TRACE("(%p, %p, %p)\n", unknown1, unknown2, unknown3); + + if ((unknown2 != NULL) || (unknown3 != NULL)) { + FIXME("got unknown parameter: (%p, %p, %p)\n", unknown1, unknown2, unknown3); + return NULL; + } + + mi = HeapAlloc(GetProcessHeap(), 0, sizeof(monitorinfo_t)); + if (!mi) { + /* FIXME: SetLastError() needed? */ + return NULL; + } + + /* Get the needed size for all Monitors */ + res = EnumMonitorsW(NULL, 2, NULL, 0, &needed, &mi->installed); + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + mi->mi2 = HeapAlloc(GetProcessHeap(), 0, needed); + res = EnumMonitorsW(NULL, 2, (LPBYTE) mi->mi2, needed, &needed, &mi->installed); + } + + if (!res) { + HeapFree(GetProcessHeap(), 0, mi); + /* FIXME: SetLastError() needed? */ + return NULL; + } + + TRACE("=> %p (%u monitors installed)\n", mi, mi->installed); + return (HANDLE) mi; +} + +/***************************************************** + * PSetupDestroyMonitorInfo [NTPRINT.@] + * + */ + +VOID WINAPI PSetupDestroyMonitorInfo(HANDLE monitorinfo) +{ + monitorinfo_t * mi = (monitorinfo_t *) monitorinfo; + + TRACE("(%p)\n", mi); + if (mi) { + if (mi->installed) HeapFree(GetProcessHeap(), 0, mi->mi2); + HeapFree(GetProcessHeap(), 0, mi); + } +} + +/***************************************************** + * PSetupEnumMonitor [NTPRINT.@] + * + * Copy the selected Monitorname to a buffer + * + * PARAMS + * monitorinfo [I] HANDLE from PSetupCreateMonitorInfo + * index [I] Nr. of the Monitorname to copy + * buffer [I] Target, that receive the Monitorname + * psize [IO] PTR to a DWORD that hold the size of the buffer and receive + * the needed size, when the buffer is too small + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * size is in Bytes on w2k and WCHAR on XP + * + */ + +BOOL WINAPI PSetupEnumMonitor(HANDLE monitorinfo, DWORD index, LPWSTR buffer, LPDWORD psize) +{ + monitorinfo_t * mi = (monitorinfo_t *) monitorinfo; + LPWSTR nameW; + DWORD len; + + TRACE("(%p, %u, %p, %p) => %d\n", mi, index, buffer, psize, psize ? *psize : 0); + + if (index < mi->installed) { + nameW = mi->mi2[index].pName; + len = lstrlenW(nameW) + 1; + if (len <= *psize) { + memcpy(buffer, nameW, len * sizeof(WCHAR)); + TRACE("#%u: %s\n", index, debugstr_w(buffer)); + return TRUE; + } + *psize = len; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + SetLastError(ERROR_NO_MORE_ITEMS); + return FALSE; +} Propchange: trunk/reactos/dll/win32/ntprint/ntprint.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ntprint/ntprint.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntprint/ntprint.… ============================================================================== --- trunk/reactos/dll/win32/ntprint/ntprint.rbuild (added) +++ trunk/reactos/dll/win32/ntprint/ntprint.rbuild [iso-8859-1] Thu Jan 22 03:29:16 2009 @@ -1,0 +1,14 @@ +<group> +<module name="ntprint" type="win32dll" baseaddress="${BASEADDRESS_NTPRINT}" installbase="system32" installname="ntprint.dll" allowwarnings="true"> + <importlibrary definition="ntprint.spec" /> + <include base="ntprint">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>ntprint.c</file> + <file>ntprint.rc</file> + <library>wine</library> + <library>winspool</library> + <library>kernel32</library> + <library>ntdll</library> +</module> +</group> Propchange: trunk/reactos/dll/win32/ntprint/ntprint.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ntprint/ntprint.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntprint/ntprint.… ============================================================================== --- trunk/reactos/dll/win32/ntprint/ntprint.rc (added) +++ trunk/reactos/dll/win32/ntprint/ntprint.rc [iso-8859-1] Thu Jan 22 03:29:16 2009 @@ -1,0 +1,37 @@ +/* + * Top level resource file for ntprint.dll + * + * Copyright 2007 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winver.h" + +#define WINE_FILENAME_STR "ntprint.dll" +#define WINE_FILEDESCRIPTION_STR "Spooler Setup API (Printing)" + +/* Same Version as WinXP_sp2 */ +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" + +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/ntprint/ntprint.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ntprint/ntprint.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntprint/ntprint.… ============================================================================== --- trunk/reactos/dll/win32/ntprint/ntprint.spec (added) +++ trunk/reactos/dll/win32/ntprint/ntprint.spec [iso-8859-1] Thu Jan 22 03:29:16 2009 @@ -1,0 +1,35 @@ +@ stub ClassInstall32 +@ stub PSetupAssociateICMProfiles +@ stub PSetupBuildDriversFromPath +@ stub PSetupCreateDrvSetupPage +@ stdcall PSetupCreateMonitorInfo(long ptr ptr) +@ stub PSetupCreatePrinterDeviceInfoList +@ stub PSetupDestroyDriverInfo3 +@ stdcall PSetupDestroyMonitorInfo(long) +@ stub PSetupDestroyPrinterDeviceInfoList +@ stub PSetupDestroySelectedDriverInfo +@ stub PSetupDriverInfoFromName +@ stdcall PSetupEnumMonitor(long long ptr ptr) +@ stub PSetupFreeDrvField +@ stub PSetupGetDriverInfForPrinter +@ stub PSetupGetDriverInfo3 +@ stub PSetupGetLocalDataField +@ stub PSetupGetPathToSearch +@ stub PSetupGetSelectedDriverInfo +@ stub PSetupInstallICMProfiles +@ stub PSetupInstallMonitor +@ stub PSetupInstallPrinterDriver +@ stub PSetupInstallPrinterDriverFromTheWeb +@ stub PSetupIsCompatibleDriver +@ stub PSetupIsDriverInstalled +@ stub PSetupIsMonitorInstalled +@ stub PSetupIsOemDriver +@ stub PSetupIsTheDriverFoundInInfInstalled +@ stub PSetupKillBadUserConnections +@ stub PSetupPreSelectDriver +@ stub PSetupProcessPrinterAdded +@ stub PSetupRefreshDriverList +@ stub PSetupSelectDeviceButtons +@ stub PSetupSelectDriver +@ stub PSetupSetSelectDevTitleAndInstructions +@ stub PSetupThisPlatform Propchange: trunk/reactos/dll/win32/ntprint/ntprint.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Thu Jan 22 03:29:16 2009 @@ -178,6 +178,9 @@ <directory name="msafd"> <xi:include href="msafd/msafd.rbuild" /> </directory> +<directory name="mscat32"> + <xi:include href="mscat32/mscat32.rbuild" /> +</directory> <directory name="mscoree"> <xi:include href="mscoree/mscoree.rbuild" /> </directory> @@ -244,6 +247,9 @@ <directory name="ntmarta"> <xi:include href="ntmarta/ntmarta.rbuild" /> </directory> +<directory name="ntprint"> + <xi:include href="ntprint/ntprint.rbuild" /> +</directory> <directory name="objsel"> <xi:include href="objsel/objsel.rbuild" /> </directory> @@ -445,6 +451,9 @@ <directory name="wldap32"> <xi:include href="wldap32/wldap32.rbuild" /> </directory> +<directory name="wmi"> + <xi:include href="wmi/wmi.rbuild" /> +</directory> <directory name="ws2_32"> <xi:include href="ws2_32/ws2_32.rbuild" /> </directory> Propchange: trunk/reactos/dll/win32/wmi/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jan 22 03:29:16 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/wmi/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/wmi/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/wmi/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/wmi/wmi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmi/wmi.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/wmi/wmi.rbuild (added) +++ trunk/reactos/dll/win32/wmi/wmi.rbuild [iso-8859-1] Thu Jan 22 03:29:16 2009 @@ -1,0 +1,10 @@ +<group> +<module name="wmi" type="win32dll" baseaddress="${BASEADDRESS_WMI}" installbase="system32" installname="wmi.dll" entrypoint="0"> + <importlibrary definition="wmi.spec" /> + <include base="wmi">.</include> + <library>advapi32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>wmi.rc</file> +</module> +</group> Propchange: trunk/reactos/dll/win32/wmi/wmi.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wmi/wmi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmi/wmi.rc?rev=3… ============================================================================== --- trunk/reactos/dll/win32/wmi/wmi.rc (added) +++ trunk/reactos/dll/win32/wmi/wmi.rc [iso-8859-1] Thu Jan 22 03:29:16 2009 @@ -1,0 +1,7 @@ +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "WMI DC and DP functionality\0" +#define REACTOS_STR_INTERNAL_NAME "wmi\0" +#define REACTOS_STR_ORIGINAL_FILENAME "wmi.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/wmi/wmi.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wmi/wmi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmi/wmi.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/wmi/wmi.spec (added) +++ trunk/reactos/dll/win32/wmi/wmi.spec [iso-8859-1] Thu Jan 22 03:29:16 2009 @@ -1,0 +1,45 @@ +@ stdcall CloseTrace(long) advapi32.CloseTrace +@ stdcall ControlTraceA(long long ptr long) advapi32.ControlTraceA +@ stdcall ControlTraceW(long long ptr long) advapi32.ControlTraceW +@ stdcall CreateTraceInstanceId(long ptr) advapi32.CreateTraceInstanceId +@ stdcall EnableTrace(long long long ptr long) advapi32.EnableTrace +@ stdcall GetTraceEnableFlags(long) advapi32.GetTraceEnableFlags +@ stdcall GetTraceEnableLevel(long) advapi32.GetTraceEnableLevel +@ stdcall GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle +@ stdcall OpenTraceA(ptr) advapi32.OpenTraceA +@ stdcall OpenTraceW(ptr) advapi32.OpenTraceW +@ stdcall ProcessTrace(ptr long ptr ptr) advapi32.ProcessTrace +@ stdcall QueryAllTracesA(ptr long ptr) advapi32.QueryAllTracesA +@ stdcall QueryAllTracesW(ptr long ptr) advapi32.QueryAllTracesW +@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsA +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsW +@ stdcall RemoveTraceCallback(ptr) advapi32.RemoveTraceCallback +@ stdcall SetTraceCallback(ptr ptr) advapi32.SetTraceCallback +@ stdcall StartTraceA(ptr ptr ptr) advapi32.StartTraceA +@ stdcall StartTraceW(ptr ptr ptr) advapi32.StartTraceW +@ stdcall TraceEvent(long ptr) advapi32.TraceEvent +@ stdcall TraceEventInstance(long ptr ptr ptr) advapi32.TraceEventInstance +@ stdcall UnregisterTraceGuids(long) advapi32.UnregisterTraceGuids +@ stdcall WmiCloseBlock() advapi32.WmiCloseBlock +@ stdcall WmiDevInstToInstanceNameA() advapi32.WmiDevInstToInstanceNameA +@ stdcall WmiDevInstToInstanceNameW() advapi32.WmiDevInstToInstanceNameW +@ stdcall WmiEnumerateGuids() advapi32.WmiEnumerateGuids +@ stdcall WmiExecuteMethodA() advapi32.WmiExecuteMethodA +@ stdcall WmiExecuteMethodW() advapi32.WmiExecuteMethodW +@ stdcall WmiFileHandleToInstanceNameA() advapi32.WmiFileHandleToInstanceNameA +@ stdcall WmiFileHandleToInstanceNameW() advapi32.WmiFileHandleToInstanceNameW +@ stdcall WmiFreeBuffer() advapi32.WmiFreeBuffer +@ stdcall WmiMofEnumerateResourcesA() advapi32.WmiMofEnumerateResourcesA +@ stdcall WmiMofEnumerateResourcesW() advapi32.WmiMofEnumerateResourcesW +@ stdcall WmiNotificationRegistrationA() advapi32.WmiNotificationRegistrationA +@ stdcall WmiNotificationRegistrationW() advapi32.WmiNotificationRegistrationW +@ stdcall WmiOpenBlock() advapi32.WmiOpenBlock +@ stdcall WmiQueryAllDataA() advapi32.WmiQueryAllDataA +@ stdcall WmiQueryAllDataW() advapi32.WmiQueryAllDataW +@ stdcall WmiQueryGuidInformation() advapi32.WmiQueryGuidInformation +@ stdcall WmiQuerySingleInstanceA() advapi32.WmiQuerySingleInstanceA +@ stdcall WmiQuerySingleInstanceW() advapi32.WmiQuerySingleInstanceW +@ stdcall WmiSetSingleInstanceA() advapi32.WmiSetSingleInstanceA +@ stdcall WmiSetSingleInstanceW() advapi32.WmiSetSingleInstanceW +@ stdcall WmiSetSingleItemA() advapi32.WmiSetSingleItemA +@ stdcall WmiSetSingleItemW() advapi32.WmiSetSingleItemW Propchange: trunk/reactos/dll/win32/wmi/wmi.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Jan 22 03:29:16 2009 @@ -64,6 +64,7 @@ reactos/dll/win32/mlang # Autosync reactos/dll/win32/mpr # Autosync reactos/dll/win32/msacm32 # Out of sync +reactos/dll/win32/mscat32 # Autosync reactos/dll/win32/mscoree # Autosync reactos/dll/win32/mshtml # Autosync reactos/dll/win32/msimg32 # Autosync @@ -76,6 +77,7 @@ reactos/dll/win32/nddeapi # Autosync reactos/dll/win32/netapi32 # Autosync reactos/dll/win32/ntdsapi # Autosync +reactos/dll/win32/ntprint # Autosync reactos/dll/win32/objsel # Autosync reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Autosync @@ -117,6 +119,7 @@ reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/wldap32 # Autosync +reactos/dll/win32/wmi # Autosync reactos/dll/win32/wtsapi32 # Autosync reactos/dll/directx/dinput # Synced to Wine-0_9_5 reactos/dll/directx/dinput8 # Synced to Wine-0_9_5

1 0

[tkreuzer] 39005: kd64: KdpReadControlSpace works a bit different on x64, u.ReadMemory.TargetBaseAddress is not used as an offset, it's rather an index. On 1 a pointer to the prcb is returned, on 2 ProcessorState.SpecialRegisters is copied. Fix usage of IN and OUT.
by tkreuzer＠svn.reactos.org 21 Jan '09

21 Jan '09

Author: tkreuzer Date: Wed Jan 21 16:21:19 2009 New Revision: 39005 URL: http://svn.reactos.org/svn/reactos?rev=39005&view=rev Log: kd64: KdpReadControlSpace works a bit different on x64, u.ReadMemory.TargetBaseAddress is not used as an offset, it's rather an index. On 1 a pointer to the prcb is returned, on 2 ProcessorState.SpecialRegisters is copied. Fix usage of IN and OUT. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Wed Jan 21 16:21:19 2009 @@ -101,7 +101,7 @@ VOID NTAPI -DumpTraceData(IN PSTRING TraceData) +DumpTraceData(OUT PSTRING TraceData) { /* Update the buffer */ TraceDataBuffer[0] = TraceDataBufferPosition; @@ -162,7 +162,7 @@ NTAPI KdpSetCommonState(IN ULONG NewState, IN PCONTEXT Context, - IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange) + OUT PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange) { USHORT InstructionCount; BOOLEAN HadBreakpoints; @@ -315,6 +315,38 @@ Length = PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64); } +#if defined (_M_AMD64) + if ((ULONG)ReadMemory->TargetBaseAddress <= 2) + { + switch ((ULONG_PTR)ReadMemory->TargetBaseAddress) + { + case 1: + ControlStart = &KiProcessorBlock[State->Processor]; + RealLength = sizeof(PVOID); + break; + + case 2: + ControlStart = &KiProcessorBlock[State->Processor]-> + ProcessorState.SpecialRegisters; + RealLength = sizeof(KSPECIAL_REGISTERS); + break; + + default: + ControlStart = NULL; + ASSERT(FALSE); + } + + if (RealLength < Length) Length = RealLength; + + /* Copy the memory */ + RtlCopyMemory(Data->Buffer, ControlStart, Length); + Data->Length = Length; + + /* Finish up */ + State->ReturnStatus = STATUS_SUCCESS; + ReadMemory->ActualBytesRead = Data->Length; + } +#else /* Make sure that this is a valid request */ if (((ULONG)ReadMemory->TargetBaseAddress < sizeof(KPROCESSOR_STATE)) && (State->Processor < KeNumberProcessors)) @@ -337,6 +369,7 @@ State->ReturnStatus = STATUS_SUCCESS; ReadMemory->ActualBytesRead = Data->Length; } +#endif else { /* Invalid request */ @@ -554,8 +587,7 @@ SendPacket: /* Send the Packet */ -// KdSendPacket(PacketType, SendHeader, SendData, &KdpContext); - KdSendPacket(PacketType, SendHeader, SendData, (PVOID)FrLdrDbgPrint); + KdSendPacket(PacketType, SendHeader, SendData, &KdpContext); /* If the debugger isn't present anymore, just return success */ if (KdDebuggerNotPresent) return ContinueSuccess; @@ -566,7 +598,6 @@ /* Receive Loop */ do { - FrLdrDbgPrint("KdpSendWaitContinue 1\n"); /* Wait to get a reply to our packet */ RecvCode = KdReceivePacket(PACKET_TYPE_KD_STATE_MANIPULATE, &Header, @@ -965,7 +996,7 @@ KdpSetContextState(&WaitStateChange, Context); /* Setup the actual header to send to KD */ - Header.Length = sizeof(DBGKD_WAIT_STATE_CHANGE64); + Header.Length = sizeof(DBGKD_WAIT_STATE_CHANGE64) - sizeof(CONTEXT); Header.Buffer = (PCHAR)&WaitStateChange; /* Setup the trace data */

1 0

[silverblade] 39004: Allow hybrid install/live CD by providing special FreeLdr OS type that gets used only on the bootcd, for calling setupldr. Also added bootcd.ini which becomes freeldr.ini on the bootcd. My previous attempt omitted this, so bootcd broke. I have tested bootcd and livecd successfully. Also made it easier to specify a different path in IopApplyRosCdromArcHack.
by silverblade＠svn.reactos.org 21 Jan '09

21 Jan '09

Author: silverblade Date: Wed Jan 21 13:45:08 2009 New Revision: 39004 URL: http://svn.reactos.org/svn/reactos?rev=39004&view=rev Log: Allow hybrid install/live CD by providing special FreeLdr OS type that gets used only on the bootcd, for calling setupldr. Also added bootcd.ini which becomes freeldr.ini on the bootcd. My previous attempt omitted this, so bootcd broke. I have tested bootcd and livecd successfully. Also made it easier to specify a different path in IopApplyRosCdromArcHack. Added: trunk/reactos/boot/bootdata/bootcd.ini (with props) Modified: trunk/reactos/boot/bootdata/bootdata.rbuild trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild trunk/reactos/ntoskrnl/io/iomgr/arcname.c Added: trunk/reactos/boot/bootdata/bootcd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd.ini (added) +++ trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] Wed Jan 21 13:45:08 2009 @@ -1,0 +1,26 @@ +[FREELOADER] +DefaultOS=Setup +Timeout=0 + +[Display] +TitleText=ReactOS Setup +StatusBarColor=Cyan +StatusBarTextColor=Black +BackdropTextColor=White +BackdropColor=Blue +BackdropFillStyle=Medium +TitleBoxTextColor=White +TitleBoxColor=Red +MessageBoxTextColor=White +MessageBoxColor=Blue +MenuTextColor=White +MenuColor=Blue +TextColor=Yellow +SelectedTextColor=Black +SelectedColor=Gray + +[Operating Systems] +Setup="Setup" + +[Setup] +BootType=ReactOSSetup Propchange: trunk/reactos/boot/bootdata/bootcd.ini ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbu… ============================================================================== --- trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] Wed Jan 21 13:45:08 2009 @@ -4,6 +4,7 @@ <cdfile>autorun.inf</cdfile> <cdfile>icon.ico</cdfile> <cdfile>readme.txt</cdfile> + <cdfile nameoncd="freeldr.ini">bootcd.ini</cdfile> <cdfile installbase="$(CDOUTPUT)" nameoncd="hivecls.inf">hivecls_$(ARCH).inf</cdfile> <cdfile installbase="$(CDOUTPUT)" nameoncd="hivedef.inf">hivedef_$(ARCH).inf</cdfile> Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Wed Jan 21 13:45:08 2009 @@ -115,6 +115,14 @@ { LoadAndBootReactOS(OperatingSystemSectionNames[SelectedOperatingSystem]); } +#ifdef FREELDR_REACTOS_SETUP + else if (_stricmp(SettingValue, "ReactOSSetup") == 0) + { + // In future we could pass the selected OS details through this + // to have different install methods, etc. + LoadReactOSSetup(); + } +#endif #ifdef __i386__ else if (_stricmp(SettingValue, "WindowsNT40") == 0) { Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Wed Jan 21 13:45:08 2009 @@ -80,4 +80,10 @@ <directory name="include"> <pch>freeldr.h</pch> </directory> + <file>drivemap.c</file> + <file>miscboot.c</file> + <file>options.c</file> + <file>linuxboot.c</file> + <file>oslist.c</file> + <file>custom.c</file> </module> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] Wed Jan 21 13:45:08 2009 @@ -7,10 +7,4 @@ <compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag> <file>bootmgr.c</file> - <file>drivemap.c</file> - <file>miscboot.c</file> - <file>options.c</file> - <file>linuxboot.c</file> - <file>oslist.c</file> - <file>custom.c</file> </module> Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Wed Jan 21 13:45:08 2009 @@ -108,4 +108,7 @@ VOID BootMain(LPSTR CmdLine); VOID RunLoader(VOID); +/* Special hack for ReactOS setup OS type */ +VOID LoadReactOSSetup(VOID); + #endif // defined __FREELDR_H Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Wed Jan 21 13:45:08 2009 @@ -42,7 +42,7 @@ #define USE_UI -VOID RunLoader(VOID) +VOID LoadReactOSSetup(VOID) { ULONG i; LPCSTR SourcePath; Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Wed Jan 21 13:45:08 2009 @@ -4,11 +4,13 @@ <include base="setupldr_main">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> + <define name="FREELDR_REACTOS_SETUP" /> <compilerflag>-ffreestanding</compilerflag> <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag> <compilerflag>-Os</compilerflag> + <file>bootmgr.c</file> <directory name="inffile"> <file>inffile.c</file> </directory> Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Wed Jan 21 13:45:08 2009 @@ -29,19 +29,22 @@ OBJECT_ATTRIBUTES ObjectAttributes; ANSI_STRING InstallName; UNICODE_STRING DeviceName; - CHAR Buffer[128]; + CHAR Buffer[128], RosSysPath[16]; FILE_BASIC_INFORMATION FileInfo; NTSTATUS Status; PCHAR p, q; PCONFIGURATION_INFORMATION ConfigInfo = IoGetConfigurationInformation(); extern BOOLEAN InitIsWinPEMode, ExpInTextModeSetup; + /* Change this if you want ROS to boot properly from another directory */ + sprintf(RosSysPath, "%s", "reactos"); + /* Only ARC Name left - Build full ARC Name */ p = strstr(KeLoaderBlock->ArcBootDeviceName, "cdrom"); if (p) { /* Build installer name */ - sprintf(Buffer, "\\Device\\CdRom%lu\\reactos\\ntoskrnl.exe", i); + sprintf(Buffer, "\\Device\\CdRom%lu\\%s\\ntoskrnl.exe", i, RosSysPath); RtlInitAnsiString(&InstallName, Buffer); Status = RtlAnsiStringToUnicodeString(&DeviceName, &InstallName, TRUE); if (!NT_SUCCESS(Status)) return FALSE; @@ -67,8 +70,8 @@ { /* Build live CD kernel name */ sprintf(Buffer, - "\\Device\\CdRom%lu\\reactos\\system32\\ntoskrnl.exe", - i); + "\\Device\\CdRom%lu\\%s\\system32\\ntoskrnl.exe", + i, RosSysPath); RtlInitAnsiString(&InstallName, Buffer); Status = RtlAnsiStringToUnicodeString(&DeviceName, &InstallName, @@ -112,7 +115,7 @@ if ((InitIsWinPEMode) || (ExpInTextModeSetup)) { /* Hack until IoAssignDriveLetters is fixed */ - swprintf(SharedUserData->NtSystemRoot, L"%c:\\reactos", 'C' + DeviceNumber); + swprintf(SharedUserData->NtSystemRoot, L"%c:\\%hs", 'C' + DeviceNumber, RosSysPath); return TRUE; }

1 0

[tkreuzer] 39003: Merge 38961 from trunk
by tkreuzer＠svn.reactos.org 21 Jan '09

21 Jan '09

Author: tkreuzer Date: Wed Jan 21 12:32:33 2009 New Revision: 39003 URL: http://svn.reactos.org/svn/reactos?rev=39003&view=rev Log: Merge 38961 from trunk Modified: branches/ros-amd64-bringup/reactos/include/psdk/wdbgexts.h branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/wdbgexts.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/wdbgexts.h [iso-8859-1] Wed Jan 21 12:32:33 2009 @@ -21,6 +21,101 @@ #define DBGKD_VERS_FLAG_PARTITIONS 0x0020 #define KDBG_TAG TAG('K', 'D', 'B', 'G') + +typedef struct _DBGKD_GET_VERSION32 +{ + USHORT MajorVersion; + USHORT MinorVersion; + USHORT ProtocolVersion; + USHORT Flags; + ULONG KernBase; + ULONG PsLoadedModuleList; + USHORT MachineType; + USHORT ThCallbackStack; + USHORT NextCallback; + USHORT FramePointer; + ULONG KiCallUserMode; + ULONG KeUserCallbackDispatcher; + ULONG BreakpointWithStatus; + ULONG DebuggerDataList; +} DBGKD_GET_VERSION32, *PDBGKD_GET_VERSION32; + +typedef struct _DBGKD_DEBUG_DATA_HEADER32 +{ + LIST_ENTRY32 List; + ULONG OwnerTag; + ULONG Size; +} DBGKD_DEBUG_DATA_HEADER32, *PDBGKD_DEBUG_DATA_HEADER32; + +typedef struct _KDDEBUGGER_DATA32 +{ + DBGKD_DEBUG_DATA_HEADER32 Header; + ULONG KernBase; + ULONG BreakpointWithStatus; + ULONG SavedContext; + USHORT ThCallbackStack; + USHORT NextCallback; + USHORT FramePointer; + USHORT PaeEnabled:1; + ULONG KiCallUserMode; + ULONG KeUserCallbackDispatcher; + ULONG PsLoadedModuleList; + ULONG PsActiveProcessHead; + ULONG PspCidTable; + ULONG ExpSystemResourcesList; + ULONG ExpPagedPoolDescriptor; + ULONG ExpNumberOfPagedPools; + ULONG KeTimeIncrement; + ULONG KeBugCheckCallbackListHead; + ULONG KiBugcheckData; + ULONG IopErrorLogListHead; + ULONG ObpRootDirectoryObject; + ULONG ObpTypeObjectType; + ULONG MmSystemCacheStart; + ULONG MmSystemCacheEnd; + ULONG MmSystemCacheWs; + ULONG MmPfnDatabase; + ULONG MmSystemPtesStart; + ULONG MmSystemPtesEnd; + ULONG MmSubsectionBase; + ULONG MmNumberOfPagingFiles; + ULONG MmLowestPhysicalPage; + ULONG MmHighestPhysicalPage; + ULONG MmNumberOfPhysicalPages; + ULONG MmMaximumNonPagedPoolInBytes; + ULONG MmNonPagedSystemStart; + ULONG MmNonPagedPoolStart; + ULONG MmNonPagedPoolEnd; + ULONG MmPagedPoolStart; + ULONG MmPagedPoolEnd; + ULONG MmPagedPoolInformation; + ULONG MmPageSize; + ULONG MmSizeOfPagedPoolInBytes; + ULONG MmTotalCommitLimit; + ULONG MmTotalCommittedPages; + ULONG MmSharedCommit; + ULONG MmDriverCommit; + ULONG MmProcessCommit; + ULONG MmPagedPoolCommit; + ULONG MmExtendedCommit; + ULONG MmZeroedPageListHead; + ULONG MmFreePageListHead; + ULONG MmStandbyPageListHead; + ULONG MmModifiedPageListHead; + ULONG MmModifiedNoWritePageListHead; + ULONG MmAvailablePages; + ULONG MmResidentAvailablePages; + ULONG PoolTrackTable; + ULONG NonPagedPoolDescriptor; + ULONG MmHighestUserAddress; + ULONG MmSystemRangeStart; + ULONG MmUserProbeAddress; + ULONG KdPrintCircularBuffer; + ULONG KdPrintCircularBufferEnd; + ULONG KdPrintWritePointer; + ULONG KdPrintRolloverCount; + ULONG MmLoadedUserImageList; +} KDDEBUGGER_DATA32, *PKDDEBUGGER_DATA32; typedef struct _DBGKD_GET_VERSION64 { Modified: branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] Wed Jan 21 12:32:33 2009 @@ -60,6 +60,12 @@ #define DbgKdLoadSymbolsStateChange 0x00003031 #define DbgKdCommandStringStateChange 0x00003032 #define DbgKdMaximumStateChange 0x00003033 + +// +// This is combined with the basic state change code +// if the state is from an alternate source +// +#define DbgKdAlternateStateChange 0x00010000 // // Manipulate Types @@ -114,6 +120,25 @@ #define DbgKdGetStringApi 0x00003231 // +// Trace I/O Types +// +#define DbgKdPrintTraceApi 0x00003330 + +// +// Control Request Types +// +#define DbgKdRequestHardwareBp 0x00004300 +#define DbgKdReleaseHardwareBp 0x00004301 + +// +// File I/O Types +// +#define DbgKdCreateFileApi 0x00003430 +#define DbgKdReadFileApi 0x00003431 +#define DbgKdWriteFileApi 0x00003432 +#define DbgKdCloseFileApi 0x00003433 + +// // Control Report Flags // #define REPORT_INCLUDES_SEGS 0x0001 @@ -140,6 +165,34 @@ #define DBGKD_QUERY_MEMORY_WRITE 0x02 #define DBGKD_QUERY_MEMORY_EXECUTE 0x04 #define DBGKD_QUERY_MEMORY_FIXED 0x08 + +// +// Internal Breakpoint Flags +// +#define DBGKD_INTERNAL_BP_FLAG_COUNTONLY 0x01 +#define DBGKD_INTERNAL_BP_FLAG_INVALID 0x02 +#define DBGKD_INTERNAL_BP_FLAG_SUSPENDED 0x04 +#define DBGKD_INTERNAL_BP_FLAG_DYING 0x08 + +// +// Fill Memory Flags +// +#define DBGKD_FILL_MEMORY_VIRTUAL 0x01 +#define DBGKD_FILL_MEMORY_PHYSICAL 0x002 + +// +// Physical Memory Caching Flags +// +#define DBGKD_CACHING_DEFAULT 0 +#define DBGKD_CACHING_CACHED 1 +#define DBGKD_CACHING_UNCACHED 2 +#define DBGKD_CACHING_WRITE_COMBINED 3 + +// +// Partition Switch Flags +// +#define DBGKD_PARTITION_DEFAULT 0x00 +#define DBGKD_PARTITION_ALTERNATE 0x01 // // KD Packet Structure @@ -189,6 +242,13 @@ ULONG64 CurrentSymbolEnd; } AMD64_DBGKD_CONTROL_SET, *PAMD64_DBGKD_CONTROL_SET; +typedef struct _ARM_DBGKD_CONTROL_SET +{ + ULONG Continue; + ULONG CurrentSymbolStart; + ULONG CurrentSymbolEnd; +} ARM_DBGKD_CONTROL_SET, *PARM_DBGKD_CONTROL_SET; + typedef struct _DBGKD_ANY_CONTROL_SET { union @@ -196,6 +256,7 @@ X86_DBGKD_CONTROL_SET X86ControlSet; IA64_DBGKD_CONTROL_SET IA64ControlSet; AMD64_DBGKD_CONTROL_SET Amd64ControlSet; + ARM_DBGKD_CONTROL_SET ArmControlSet; }; } DBGKD_ANY_CONTROL_SET, *PDBGKD_ANY_CONTROL_SET; #include <poppack.h> @@ -211,6 +272,12 @@ // // DBGKM Structure for Exceptions // +typedef struct _DBGKM_EXCEPTION32 +{ + EXCEPTION_RECORD32 ExceptionRecord; + ULONG FirstChance; +} DBGKM_EXCEPTION32, *PDBGKM_EXCEPTION32; + typedef struct _DBGKM_EXCEPTION64 { EXCEPTION_RECORD64 ExceptionRecord; @@ -220,25 +287,33 @@ // // DBGKD Structure for State Change // -#if defined(_M_X86) - -typedef struct _DBGKD_CONTROL_REPORT -{ - ULONG Dr6; - ULONG Dr7; - USHORT InstructionCount; - USHORT ReportFlags; +typedef struct _X86_DBGKD_CONTROL_REPORT +{ + ULONG Dr6; + ULONG Dr7; + USHORT InstructionCount; + USHORT ReportFlags; + UCHAR InstructionStream[DBGKD_MAXSTREAM]; + USHORT SegCs; + USHORT SegDs; + USHORT SegEs; + USHORT SegFs; + ULONG EFlags; +} X86_DBGKD_CONTROL_REPORT, *PX86_DBGKD_CONTROL_REPORT; + +typedef struct _ALPHA_DBGKD_CONTROL_REPORT +{ + ULONG InstructionCount; UCHAR InstructionStream[DBGKD_MAXSTREAM]; - USHORT SegCs; - USHORT SegDs; - USHORT SegEs; - USHORT SegFs; - ULONG EFlags; -} DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT; - -#elif defined(_M_AMD64) - -typedef struct _DBGKD_CONTROL_REPORT +} ALPHA_DBGKD_CONTROL_REPORT, *PALPHA_DBGKD_CONTROL_REPORT; + +typedef struct _IA64_DBGKD_CONTROL_REPORT +{ + ULONG InstructionCount; + UCHAR InstructionStream[DBGKD_MAXSTREAM]; +} IA64_DBGKD_CONTROL_REPORT, *PIA64_DBGKD_CONTROL_REPORT; + +typedef struct _AMD64_DBGKD_CONTROL_REPORT { ULONG64 Dr6; ULONG64 Dr7; @@ -250,9 +325,26 @@ USHORT SegDs; USHORT SegEs; USHORT SegFs; -} DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT; - +} AMD64_DBGKD_CONTROL_REPORT, *PAMD64_DBGKD_CONTROL_REPORT; + +#if defined(_M_X86) +typedef X86_DBGKD_CONTROL_REPORT DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT; +#elif defined(_M_AMD64) +typedef AMD64_DBGKD_CONTROL_REPORT DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT; +#else +#error unsupported architecture #endif + +typedef struct _DBGKD_ANY_CONTROL_REPORT +{ + union + { + X86_DBGKD_CONTROL_REPORT X86ControlReport; + ALPHA_DBGKD_CONTROL_REPORT AlphaControlReport; + IA64_DBGKD_CONTROL_REPORT IA64ControlReport; + AMD64_DBGKD_CONTROL_REPORT Amd64ControlReport; + }; +} DBGKD_ANY_CONTROL_REPORT, *PDBGKD_ANY_CONTROL_REPORT; // // DBGKD Structure for Debug I/O Type Print String @@ -287,8 +379,28 @@ } DBGKD_DEBUG_IO, *PDBGKD_DEBUG_IO; // +// DBGkD Structure for Command String +// +typedef struct _DBGKD_COMMAND_STRING +{ + ULONG Flags; + ULONG Reserved1; + ULONG64 Reserved2[7]; +} DBGKD_COMMAND_STRING, *PDBGKD_COMMAND_STRING; + +// // DBGKD Structure for Load Symbols // +typedef struct _DBGKD_LOAD_SYMBOLS32 +{ + ULONG PathNameLength; + ULONG BaseOfDll; + ULONG ProcessId; + ULONG CheckSum; + ULONG SizeOfImage; + BOOLEAN UnloadSymbols; +} DBGKD_LOAD_SYMBOLS32, *PDBGKD_LOAD_SYMBOLS32; + typedef struct _DBGKD_LOAD_SYMBOLS64 { ULONG PathNameLength; @@ -302,6 +414,24 @@ // // DBGKD Structure for Wait State Change // + +typedef struct _DBGKD_WAIT_STATE_CHANGE32 +{ + ULONG NewState; + USHORT ProcessorLevel; + USHORT Processor; + ULONG NumberProcessors; + ULONG Thread; + ULONG ProgramCounter; + union + { + DBGKM_EXCEPTION32 Exception; + DBGKD_LOAD_SYMBOLS32 LoadSymbols; + } u; + DBGKD_CONTROL_REPORT ControlReport; + CONTEXT Context; +} DBGKD_WAIT_STATE_CHANGE32, *PDBGKD_WAIT_STATE_CHANGE32; + typedef struct _DBGKD_WAIT_STATE_CHANGE64 { ULONG NewState; @@ -319,9 +449,37 @@ CONTEXT Context; } DBGKD_WAIT_STATE_CHANGE64, *PDBGKD_WAIT_STATE_CHANGE64; +typedef struct _DBGKD_ANY_WAIT_STATE_CHANGE +{ + ULONG NewState; + USHORT ProcessorLevel; + USHORT Processor; + ULONG NumberProcessors; + ULONG64 Thread; + ULONG64 ProgramCounter; + union + { + DBGKM_EXCEPTION64 Exception; + DBGKD_LOAD_SYMBOLS64 LoadSymbols; + DBGKD_COMMAND_STRING CommandString; + } u; + union + { + DBGKD_CONTROL_REPORT ControlReport; + DBGKD_ANY_CONTROL_REPORT AnyControlReport; + }; +} DBGKD_ANY_WAIT_STATE_CHANGE, *PDBGKD_ANY_WAIT_STATE_CHANGE; + // // DBGKD Manipulate Structures // +typedef struct _DBGKD_READ_MEMORY32 +{ + ULONG TargetBaseAddress; + ULONG TransferCount; + ULONG ActualBytesRead; +} DBGKD_READ_MEMORY32, *PDBGKD_READ_MEMORY32; + typedef struct _DBGKD_READ_MEMORY64 { ULONG64 TargetBaseAddress; @@ -329,6 +487,13 @@ ULONG ActualBytesRead; } DBGKD_READ_MEMORY64, *PDBGKD_READ_MEMORY64; +typedef struct _DBGKD_WRITE_MEMORY32 +{ + ULONG TargetBaseAddress; + ULONG TransferCount; + ULONG ActualBytesWritten; +} DBGKD_WRITE_MEMORY32, *PDBGKD_WRITE_MEMORY32; + typedef struct _DBGKD_WRITE_MEMORY64 { ULONG64 TargetBaseAddress; @@ -345,6 +510,12 @@ { ULONG ContextFlags; } DBGKD_SET_CONTEXT, *PDBGKD_SET_CONTEXT; + +typedef struct _DBGKD_WRITE_BREAKPOINT32 +{ + ULONG BreakPointAddress; + ULONG BreakPointHandle; +} DBGKD_WRITE_BREAKPOINT32, *PDBGKD_WRITE_BREAKPOINT32; typedef struct _DBGKD_WRITE_BREAKPOINT64 { @@ -374,12 +545,29 @@ } DBGKD_CONTINUE2, *PDBGKD_CONTINUE2; #include <poppack.h> +typedef struct _DBGKD_READ_WRITE_IO32 +{ + ULONG IoAddress; + ULONG DataSize; + ULONG DataValue; +} DBGKD_READ_WRITE_IO32, *PDBGKD_READ_WRITE_IO32; + typedef struct _DBGKD_READ_WRITE_IO64 { ULONG64 IoAddress; ULONG DataSize; ULONG DataValue; } DBGKD_READ_WRITE_IO64, *PDBGKD_READ_WRITE_IO64; + +typedef struct _DBGKD_READ_WRITE_IO_EXTENDED32 +{ + ULONG DataSize; + ULONG InterfaceType; + ULONG BusNumber; + ULONG AddressSpace; + ULONG IoAddress; + ULONG DataValue; +} DBGKD_READ_WRITE_IO_EXTENDED32, *PDBGKD_READ_WRITE_IO_EXTENDED32; typedef struct _DBGKD_READ_WRITE_IO_EXTENDED64 { @@ -403,16 +591,38 @@ ULONG NumberOfSpecialCalls; } DBGKD_QUERY_SPECIAL_CALLS, *PDBGKD_QUERY_SPECIAL_CALLS; +typedef struct _DBGKD_SET_SPECIAL_CALL32 +{ + ULONG SpecialCall; +} DBGKD_SET_SPECIAL_CALL32, *PDBGKD_SET_SPECIAL_CALL32; + typedef struct _DBGKD_SET_SPECIAL_CALL64 { ULONG64 SpecialCall; } DBGKD_SET_SPECIAL_CALL64, *PDBGKD_SET_SPECIAL_CALL64; + +typedef struct _DBGKD_SET_INTERNAL_BREAKPOINT32 +{ + ULONG BreakpointAddress; + ULONG Flags; +} DBGKD_SET_INTERNAL_BREAKPOINT32, *PDBGKD_SET_INTERNAL_BREAKPOINT32; typedef struct _DBGKD_SET_INTERNAL_BREAKPOINT64 { ULONG64 BreakpointAddress; ULONG Flags; } DBGKD_SET_INTERNAL_BREAKPOINT64, *PDBGKD_SET_INTERNAL_BREAKPOINT64; + +typedef struct _DBGKD_GET_INTERNAL_BREAKPOINT32 +{ + ULONG BreakpointAddress; + ULONG Flags; + ULONG Calls; + ULONG MaxCallsPerPeriod; + ULONG MinInstructions; + ULONG MaxInstructions; + ULONG TotalInstructions; +} DBGKD_GET_INTERNAL_BREAKPOINT32, *PDBGKD_GET_INTERNAL_BREAKPOINT32; typedef struct _DBGKD_GET_INTERNAL_BREAKPOINT64 { @@ -475,6 +685,41 @@ // // DBGKD Structure for Manipulate // +typedef struct _DBGKD_MANIPULATE_STATE32 +{ + ULONG ApiNumber; + USHORT ProcessorLevel; + USHORT Processor; + NTSTATUS ReturnStatus; + union + { + DBGKD_READ_MEMORY32 ReadMemory; + DBGKD_WRITE_MEMORY32 WriteMemory; + DBGKD_READ_MEMORY64 ReadMemory64; + DBGKD_WRITE_MEMORY64 WriteMemory64; + DBGKD_GET_CONTEXT GetContext; + DBGKD_SET_CONTEXT SetContext; + DBGKD_WRITE_BREAKPOINT32 WriteBreakPoint; + DBGKD_RESTORE_BREAKPOINT RestoreBreakPoint; + DBGKD_CONTINUE Continue; + DBGKD_CONTINUE2 Continue2; + DBGKD_READ_WRITE_IO32 ReadWriteIo; + DBGKD_READ_WRITE_IO_EXTENDED32 ReadWriteIoExtended; + DBGKD_QUERY_SPECIAL_CALLS QuerySpecialCalls; + DBGKD_SET_SPECIAL_CALL32 SetSpecialCall; + DBGKD_SET_INTERNAL_BREAKPOINT32 SetInternalBreakpoint; + DBGKD_GET_INTERNAL_BREAKPOINT32 GetInternalBreakpoint; + DBGKD_GET_VERSION32 GetVersion32; + DBGKD_BREAKPOINTEX BreakPointEx; + DBGKD_READ_WRITE_MSR ReadWriteMsr; + DBGKD_SEARCH_MEMORY SearchMemory; + DBGKD_GET_SET_BUS_DATA GetSetBusData; + DBGKD_FILL_MEMORY FillMemory; + DBGKD_QUERY_MEMORY QueryMemory; + DBGKD_SWITCH_PARTITION SwitchPartition; + } u; +} DBGKD_MANIPULATE_STATE32, *PDBGKD_MANIPULATE_STATE32; + typedef struct _DBGKD_MANIPULATE_STATE64 { ULONG ApiNumber; @@ -508,6 +753,99 @@ } u; } DBGKD_MANIPULATE_STATE64, *PDBGKD_MANIPULATE_STATE64; +// +// File I/O Structure +// +typedef struct _DBGKD_CREATE_FILE +{ + ULONG DesiredAccess; + ULONG FileAttributes; + ULONG ShareAccess; + ULONG CreateDisposition; + ULONG CreateOptions; + ULONG64 Handle; + ULONG64 Length; +} DBGKD_CREATE_FILE, *PDBGKD_CREATE_FILE; + +typedef struct _DBGKD_READ_FILE +{ + ULONG64 Handle; + ULONG64 Offset; + ULONG Length; +} DBGKD_READ_FILE, *PDBGKD_READ_FILE; + +typedef struct _DBGKD_WRITE_FILE +{ + ULONG64 Handle; + ULONG64 Offset; + ULONG Length; +} DBGKD_WRITE_FILE, *PDBGKD_WRITE_FILE; + +typedef struct _DBGKD_CLOSE_FILE +{ + ULONG64 Handle; +} DBGKD_CLOSE_FILE, *PDBGKD_CLOSE_FILE; + +typedef struct _DBGKD_FILE_IO +{ + ULONG ApiNumber; + ULONG Status; + union + { + ULONG64 ReserveSpace[7]; + DBGKD_CREATE_FILE CreateFile; + DBGKD_READ_FILE ReadFile; + DBGKD_WRITE_FILE WriteFile; + DBGKD_CLOSE_FILE CloseFile; + } u; +} DBGKD_FILE_IO, *PDBGKD_FILE_IO; + + +// +// Control Request Structure +// +typedef struct _DBGKD_REQUEST_BREAKPOINT +{ + ULONG HardwareBreakPointNumber; + ULONG Available; +} DBGKD_REQUEST_BREAKPOINT, *PDBGKD_REQUEST_BREAKPOINT; + +typedef struct _DBGKD_RELEASE_BREAKPOINT +{ + ULONG HardwareBreakPointNumber; + ULONG Released; +} DBGKD_RELEASE_BREAKPOINT, *PDBGKD_RELEASE_BREAKPOINT; + +typedef struct _DBGKD_CONTROL_REQUEST +{ + ULONG ApiNumber; + union + { + DBGKD_REQUEST_BREAKPOINT RequestBreakpoint; + DBGKD_RELEASE_BREAKPOINT ReleaseBreakpoint; + } u; +} DBGKD_CONTROL_REQUEST, *PDBGKD_CONTROL_REQUEST; + +// +// Trace I/O Structure +// +typedef struct _DBGKD_PRINT_TRACE +{ + ULONG LengthOfData; +} DBGKD_PRINT_TRACE, *PDBGKD_PRINT_TRACE; + +typedef struct _DBGKD_TRACE_IO +{ + ULONG ApiNumber; + USHORT ProcessorLevel; + USHORT Processor; + union + { + ULONG64 ReserveSpace[7]; + DBGKD_PRINT_TRACE PrintTrace; + } u; +} DBGKD_TRACE_IO, *PDBGKD_TRACE_IO; + FORCEINLINE VOID ExceptionRecord32To64(IN PEXCEPTION_RECORD32 Ex32,

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
76
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 January 2009