Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 47882: Make the uiLo and uiHi members of the KMDDELPARAM structure UINT_PTRs
by tkreuzer＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: tkreuzer Date: Sun Jun 27 22:14:22 2010 New Revision: 47882 URL: http://svn.reactos.org/svn/reactos?rev=47882&view=rev Log: Make the uiLo and uiHi members of the KMDDELPARAM structure UINT_PTRs Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/message.c branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Sun Jun 27 22:14:22 2010 @@ -164,8 +164,8 @@ { DdeLparam->Packed = TRUE; if (! UnpackDDElParam(UMMsg->message, UMMsg->lParam, - (PUINT_PTR)&DdeLparam->Value.Packed.uiLo, - (PUINT_PTR)&DdeLparam->Value.Packed.uiHi)) + &DdeLparam->Value.Packed.uiLo, + &DdeLparam->Value.Packed.uiHi)) { return FALSE; } Modified: branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Jun 27 22:14:22 2010 @@ -3118,8 +3118,8 @@ { struct { - UINT uiLo; - UINT uiHi; + UINT_PTR uiLo; + UINT_PTR uiHi; } Packed; LPARAM Unpacked; } Value;

1 0

[sir_richard] 47881: [BOOTDATA]: Add the 176 different PCI devices that Windows knows about, and the erratas that need to be applied to make those devices work correctly. This information is processed by eVb's PCI Bus driver. 3rd-party device manufacturers, as well as Microsoft online support pages, sometimes instruct users to add new entries to this list as well, and new entries are also added by 3rd-party driver .INF files. Probably 30% of computers in the world have at least one of these devi
by sir_richard＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: sir_richard Date: Sun Jun 27 22:12:00 2010 New Revision: 47881 URL: http://svn.reactos.org/svn/reactos?rev=47881&view=rev Log: [BOOTDATA]: Add the 176 different PCI devices that Windows knows about, and the erratas that need to be applied to make those devices work correctly. This information is processed by eVb's PCI Bus driver. 3rd-party device manufacturers, as well as Microsoft online support pages, sometimes instruct users to add new entries to this list as well, and new entries are also added by 3rd-party driver .INF files. Probably 30% of computers in the world have at least one of these devices installed. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sun Jun 27 22:12:00 2010 @@ -1163,6 +1163,190 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Type",0x00010001,0x00000001 +; PCI Bus driver +HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus +HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Tag",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C621",0x00030003,04,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950640",0x00030003,04,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80861230",0x00030003,04,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867010",0x00030003,04,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","104B0140",0x00030003,08,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11790603",0x00030003,08,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867113",0x00030003,08,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","497884C5",0x00030003,08,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11063040",0x00030003,08,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","0E111000",0x00030003,10,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","0E112000",0x00030003,10,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10390406",0x00030003,10,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80860482",0x00030003,00,40,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80860008",0x00030003,10,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10140002",0x00030003,10,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10800600",0x00030003,20,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10131100",0x00030003,40,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10B95219",0x00030003,80,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1C1C0001",0x00030003,00,01,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10970038",0x00030003,00,01,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","100BD001",0x00030003,00,04,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","808604A3",0x00030003,00,08,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10AA0000",0x00030003,00,08,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","533388D1",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11790605",0x00030003,00,10,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10131110",0x00030003,00,20,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11800478",0x00030003,00,20,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11800475",0x00030003,00,20,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11800476",0x00030003,00,20,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10040101",0x00030003,00,40,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10421000",0x00030003,00,40,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","104CAC12",0x00030003,00,00,01,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11800466",0x00030003,00,00,01,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10140095",0x00030003,00,00,04,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80862418",0x00030003,00,00,04,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80862428",0x00030003,00,00,04,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","8086244E",0x00030003,00,00,04,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80862448",0x00030003,00,00,04,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","8086122E",0x00030003,00,00,08,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867000",0x00030003,00,00,08,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867110",0x00030003,00,00,08,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867600",0x00030003,00,00,08,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024747",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024754",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338901",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","101300D6",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","104CAC15",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","110B0004",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1000000F",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","104CAC17",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10239397",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024742",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024744",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024749",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024750",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024751",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024755",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024757",0x00030003,00,00,40,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024759",0x00030003,00,00,40,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C42",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C44",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C47",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C49",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C50",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C51",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10025654",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10025655",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10025656",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","121A0003",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C861107B9300",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C8611045C861",0x00030003,00,00,40,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80861231",0x00030003,00,00,00,01,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","12730002",0x00030003,00,00,00,01,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1014007D",0x00030003,00,00,00,01,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","12850100",0x00030003,00,00,00,01,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","12176836",0x00030003,00,00,00,08,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","12176832",0x00030003,00,00,00,08,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","109107A0",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867800",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10c88005",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10c88006",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10c80005",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10c80006",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","102B1001",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DD0100",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950646",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950670",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950648",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10110026",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","8086B154",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338904",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11068598",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11068605",0x00030003,00,00,00,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11790609",0x00030003,00,00,00,40,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10140047",0x00030003,00,00,00,40,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","102B051B",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","102B0520",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","102B0521",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","102B1025",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","102B0525",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867121",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867123",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867125",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80861132",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","90050050",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","9005005F",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024752",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1002474F",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1002474D",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024753",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1002474C",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1002474E",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C4D",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C4E",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C52",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C53",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10239880",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE00A0",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE00A1",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE00A3",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE00B0",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE00B1",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE00B3",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0100",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0101",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0102",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0103",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0120",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0121",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0122",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0123",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0150",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0151",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0152",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0153",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0200",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0201",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0202",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0203",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","12D20018",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","12D20019",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10136003",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","3D3D000A",0x00030003,00,00,00,80,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024158",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024354",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024358",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024554",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024758",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C54",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338810",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338811",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338812",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338814",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338880",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","533388B0",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","533388C0",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","533388C1",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","533388D0",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","533388F0",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338902",0x00030003,00,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","0E11B109",0x00030003,00,00,00,00,02,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","100C3202",0x00030003,00,8a,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10668002",0x00030003,00,00,30,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10660002",0x00030003,00,00,30,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10040102",0x00030003,00,40,00,02,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C814",0x00030003,00,00,40,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024756",0x00030003,00,00,40,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1002475A",0x00030003,00,00,40,20,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1000000B",0x00030003,00,00,00,a0,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0020",0x00030003,00,00,00,a0,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0028",0x00030003,00,00,00,a0,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0029",0x00030003,00,00,00,a0,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE002A",0x00030003,00,00,00,a0,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE002B",0x00030003,00,00,00,a0,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE002C",0x00030003,00,00,00,a0,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE002D",0x00030003,00,00,00,a0,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE002E",0x00030003,00,00,00,a0,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE002F",0x00030003,00,00,00,a0,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","101300D6101880D6",0x00030003,00,00,00,00,00,00,00,00 + ; Plug and Play manager HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","DisplayName",0x00000000,"Plug and Play" HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Description",0x00000000,"Detects hardware changes and installs needed software if possible"

1 0

[tkreuzer] 47880: [KERNEL32] Fix the pspec file
by tkreuzer＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: tkreuzer Date: Sun Jun 27 22:03:47 2010 New Revision: 47880 URL: http://svn.reactos.org/svn/reactos?rev=47880&view=rev Log: [KERNEL32] Fix the pspec file Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Sun Jun 27 22:03:47 2010 @@ -436,7 +436,7 @@ @ stdcall GetConsoleFontInfo(long long long ptr) @ stdcall GetConsoleFontSize(long long) @ stdcall GetConsoleHardwareState(long long ptr) -@ stdcall GetConsoleHistoryInfo ; Win 7 +;@ stdcall GetConsoleHistoryInfo ; Win 7 @ stdcall GetConsoleInputExeNameA(long ptr) @ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleInputWaitHandle() @@ -1137,7 +1137,7 @@ @ stdcall SetConsoleDisplayMode(long long ptr) @ stdcall SetConsoleFont(long long) @ stdcall SetConsoleHardwareState(long long long) -@ stdcall SetConsoleHistoryInfo ; Win 7 +; @ stdcall SetConsoleHistoryInfo ; Win 7 @ stdcall SetConsoleIcon(ptr) @ stdcall SetConsoleInputExeNameA(ptr) @ stdcall SetConsoleInputExeNameW(ptr)

1 0

[akhaldi] 47879: Fix a warning (treated as an error).
by akhaldi＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: akhaldi Date: Sun Jun 27 21:37:42 2010 New Revision: 47879 URL: http://svn.reactos.org/svn/reactos?rev=47879&view=rev Log: Fix a warning (treated as an error). Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] Sun Jun 27 21:37:42 2010 @@ -251,7 +251,7 @@ } else { - RtlInitAnsiString(&FormatA, MessageResource->Text); + RtlInitAnsiString(&FormatA, (PCHAR)MessageResource->Text); RtlAnsiStringToUnicodeString(&FormatU, &FormatA, TRUE); } } @@ -355,7 +355,7 @@ } else { - RtlInitAnsiString(&FormatA, MessageResource->Text); + RtlInitAnsiString(&FormatA, (PCHAR)MessageResource->Text); RtlAnsiStringToUnicodeString(&FormatU, &FormatA, TRUE); } FormatString = FormatU.Buffer;

1 0

[tkreuzer] 47878: [USER32] - Use UlongToHandle instead of LongToHandle - case to ULONG_PTR instead of using HandleToUlong - SetSysColorsTemp: don't truncate the pointer sized n value, remove a comment - IntGetClsWndProc: fix a bug - IntGetWindowLong: pass !unicode to IntGetWndProc
by tkreuzer＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: tkreuzer Date: Sun Jun 27 21:30:39 2010 New Revision: 47878 URL: http://svn.reactos.org/svn/reactos?rev=47878&view=rev Log: [USER32] - Use UlongToHandle instead of LongToHandle - case to ULONG_PTR instead of using HandleToUlong - SetSysColorsTemp: don't truncate the pointer sized n value, remove a comment - IntGetClsWndProc: fix a bug - IntGetWindowLong: pass !unicode to IntGetWndProc Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/exit.c branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/resources.c branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winhelp.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/exit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/exit.c [iso-8859-1] Sun Jun 27 21:30:39 2010 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll * FILE: lib/user32/misc/exit.c @@ -101,7 +100,7 @@ NTSTATUS Status; CsrRequest = MAKE_CSR_API(REGISTER_SERVICES_PROCESS, CSR_GUI); - Request.Data.RegisterServicesProcessRequest.ProcessId = LongToHandle(ServicesProcessId); + Request.Data.RegisterServicesProcessRequest.ProcessId = UlongToHandle(ServicesProcessId); Status = CsrClientCallServer(&Request, NULL, Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/resources.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] Sun Jun 27 21:30:39 2010 @@ -174,7 +174,7 @@ return FALSE; } - ConfigRet = UnRegNotify( HandleToUlong(Handle) ); + ConfigRet = UnRegNotify((ULONG_PTR)Handle ); if (ConfigRet != CR_SUCCESS) { switch (ConfigRet) Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Sun Jun 27 21:30:39 2010 @@ -197,7 +197,7 @@ } if (!pPens && !pBrushes) /* "restore" call */ { - LPVOID pOldCol = LongToPtr(n); /* FIXME: not 64-bit safe */ + LPVOID pOldCol = (LPVOID)n; LPVOID p = pOldCol; DWORD nCount = *(DWORD *)p; p = (char*)p + sizeof(DWORD); Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winhelp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winhelp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winhelp.c [iso-8859-1] Sun Jun 27 21:30:39 2010 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS user32.dll * FILE: lib/user32/misc/winhelp.c * PURPOSE: WinHelp @@ -51,7 +50,7 @@ */ BOOL WINAPI -WinHelpA(HWND hWnd, LPCSTR lpszHelp, UINT uCommand, ULONG_PTR dwData) +WinHelpA(HWND hWnd, LPCSTR lpszHelp, UINT uCommand, DWORD_PTR dwData) { static WORD WM_WINHELP = 0; HWND hDest; @@ -137,7 +136,7 @@ */ BOOL WINAPI -WinHelpW(HWND hWnd, LPCWSTR lpszHelp, UINT uCommand, ULONG_PTR dwData) +WinHelpW(HWND hWnd, LPCWSTR lpszHelp, UINT uCommand, DWORD_PTR dwData) { INT len; LPSTR file; Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Sun Jun 27 21:30:39 2010 @@ -325,7 +325,7 @@ gcpd = (WNDPROC)NtUserGetCPD( UserHMGetHandle(pWnd), (Ansi ? UserGetCPDA2U : UserGetCPDU2A )|UserGetCPDWindow, - (ULONG_PTR)&Ret); + (ULONG_PTR)Ret); return (gcpd ? gcpd : Ret); } @@ -701,7 +701,7 @@ SetLastError(ERROR_ACCESS_DENIED); retvalue = 0; } - retvalue = (ULONG_PTR)IntGetWndProc(wndPtr, unicode); + retvalue = (ULONG_PTR)IntGetWndProc(wndPtr, !unicode); break; } default:

1 0

[tkreuzer] 47877: [FORMATTING] - Fix broken indentation
by tkreuzer＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: tkreuzer Date: Sun Jun 27 21:24:17 2010 New Revision: 47877 URL: http://svn.reactos.org/svn/reactos?rev=47877&view=rev Log: [FORMATTING] - Fix broken indentation Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/menu.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun Jun 27 21:24:17 2010 @@ -19,8 +19,8 @@ /* internal popup menu window messages */ -#define MM_SETMENUHANDLE (WM_USER + 0) -#define MM_GETMENUHANDLE (WM_USER + 1) +#define MM_SETMENUHANDLE (WM_USER + 0) +#define MM_GETMENUHANDLE (WM_USER + 1) /* internal flags for menu tracking */ @@ -317,7 +317,7 @@ *****************************************************************************/ static UINT MenuGetStartOfNextColumn( PROSMENUINFO MenuInfo) - { +{ PROSMENUITEMINFO MenuItems; UINT i; @@ -333,7 +333,7 @@ return i; return NO_SELECTED_ITEM; - } +} /****************************************************************************** * @@ -363,10 +363,10 @@ } if (i == 0) - { + { MenuCleanupAllRosMenuItemInfo(MenuItems); return NO_SELECTED_ITEM; - } + } for (--i; 0 != i; --i) if (MenuItems[i].fType & (MF_MENUBREAK | MF_MENUBARBREAK)) @@ -386,7 +386,7 @@ * If the submenu cannot be found, NO_SELECTED_ITEM is returned. */ static UINT FASTCALL MenuFindSubMenu(HMENU *hmenu, HMENU hSubTarget ) - { +{ ROSMENUINFO menu; UINT i; ROSMENUITEMINFO item; @@ -400,7 +400,7 @@ { MenuCleanupRosMenuItemInfo(&item); return NO_SELECTED_ITEM; - } + } if (!(item.fType & MF_POPUP)) continue; if (item.hSubMenu == hSubTarget) { MenuCleanupRosMenuItemInfo(&item); @@ -412,7 +412,7 @@ if (pos != NO_SELECTED_ITEM) { *hmenu = hsubmenu; return pos; - } + } } } MenuCleanupRosMenuItemInfo(&item); @@ -427,7 +427,7 @@ */ static void FASTCALL MenuLoadBitmaps(VOID) - { +{ /* Load system buttons bitmaps */ if (NULL == BmpSysMenu) { @@ -653,49 +653,49 @@ HBITMAP hbmToDraw = lpitem->hbmpItem; bmp = hbmToDraw; - /* Check if there is a magic menu item associated with this item */ + /* Check if there is a magic menu item associated with this item */ if (IS_MAGIC_BITMAP(hbmToDraw)) { UINT flags = 0; - RECT r; + RECT r; r = *rect; switch ((INT_PTR)hbmToDraw) { - case (INT_PTR) HBMMENU_SYSTEM: + case (INT_PTR)HBMMENU_SYSTEM: if (lpitem->dwTypeData) - { + { bmp = (HBITMAP)lpitem->dwTypeData; if (!GetObjectW( bmp, sizeof(bm), &bm )) return; - } + } else - { + { if (!BmpSysMenu) BmpSysMenu = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_CLOSE)); bmp = BmpSysMenu; if (! GetObjectW(bmp, sizeof(bm), &bm)) return; /* only use right half of the bitmap */ bmp_xoffset = bm.bmWidth / 2; bm.bmWidth -= bmp_xoffset; - } + } goto got_bitmap; - case (INT_PTR) HBMMENU_MBAR_RESTORE: + case (INT_PTR)HBMMENU_MBAR_RESTORE: flags = DFCS_CAPTIONRESTORE; break; - case (INT_PTR) HBMMENU_MBAR_MINIMIZE: + case (INT_PTR)HBMMENU_MBAR_MINIMIZE: r.right += 1; flags = DFCS_CAPTIONMIN; break; - case (INT_PTR) HBMMENU_MBAR_MINIMIZE_D: + case (INT_PTR)HBMMENU_MBAR_MINIMIZE_D: r.right += 1; flags = DFCS_CAPTIONMIN | DFCS_INACTIVE; break; - case (INT_PTR) HBMMENU_MBAR_CLOSE: + case (INT_PTR)HBMMENU_MBAR_CLOSE: flags = DFCS_CAPTIONCLOSE; break; - case (INT_PTR) HBMMENU_MBAR_CLOSE_D: + case (INT_PTR)HBMMENU_MBAR_CLOSE_D: flags = DFCS_CAPTIONCLOSE | DFCS_INACTIVE; break; - case (INT_PTR) HBMMENU_CALLBACK: + case (INT_PTR)HBMMENU_CALLBACK: { DRAWITEMSTRUCT drawItem; POINT origorg; @@ -730,9 +730,9 @@ } InflateRect(&r, -1, -1); if (0 != (lpitem->fState & MF_HILITE)) - { + { flags |= DFCS_PUSHED; - } + } DrawFrameControl(hdc, &r, DFC_CAPTION, flags); return; } @@ -760,7 +760,7 @@ */ static void FASTCALL MenuCalcItemSize( HDC hdc, PROSMENUITEMINFO lpitem, PROSMENUINFO MenuInfo, HWND hwndOwner, INT orgX, INT orgY, BOOL menuBar) - { +{ WCHAR *p; UINT check_bitmap_width = GetSystemMetrics( SM_CXMENUCHECK ); INT itemheight = 0; @@ -795,7 +795,7 @@ TRACE("id=%04lx size=%dx%d\n", lpitem->wID, mis.itemWidth, mis.itemHeight); - return; + return; } if (lpitem->fType & MF_SEPARATOR) @@ -822,7 +822,7 @@ { MenuInfo->maxBmpSize.cx = abs(size.cx) + MENU_ITEM_HBMP_SPACE; MenuInfo->maxBmpSize.cy = abs(size.cy); - } + } MenuSetRosMenuInfo(MenuInfo); itemheight = size.cy + 2; @@ -841,7 +841,7 @@ if (lpitem->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE || lpitem->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE_D) lpitem->Rect.right -= 1; -} + } } else if (!menuBar) { if( !(MenuInfo->dwStyle & MNS_NOCHECK)) @@ -1143,29 +1143,29 @@ PROSMENUITEMINFO lpitem, UINT Height, BOOL menuBar, UINT odaction) { RECT rect; - PWCHAR Text; - BOOL flat_menu = FALSE; - int bkgnd; - PWND Wnd = ValidateHwnd(hWnd); - - if (!Wnd) + PWCHAR Text; + BOOL flat_menu = FALSE; + int bkgnd; + PWND Wnd = ValidateHwnd(hWnd); + + if (!Wnd) return; if (lpitem->fType & MF_SYSMENU) { - if ( (Wnd->style & WS_MINIMIZE)) + if ( (Wnd->style & WS_MINIMIZE)) { UserGetInsideRectNC(Wnd, &rect); UserDrawSysMenuButton(hWnd, hdc, &rect, lpitem->fState & (MF_HILITE | MF_MOUSESELECT)); - } - return; + } + return; } SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); bkgnd = (menuBar && flat_menu) ? COLOR_MENUBAR : COLOR_MENU; - - /* Setup colors */ + + /* Setup colors */ if (lpitem->fState & MF_HILITE) { @@ -1175,134 +1175,134 @@ } else { if (lpitem->fState & MF_GRAYED) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); - else + else SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT)); - } - } - else + } + } + else { if (lpitem->fState & MF_GRAYED) SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) ); - else + else SetTextColor( hdc, GetSysColor( COLOR_MENUTEXT ) ); SetBkColor( hdc, GetSysColor( bkgnd ) ); - } + } rect = lpitem->Rect; if (lpitem->fType & MF_OWNERDRAW) { - /* - ** Experimentation under Windows reveals that an owner-drawn - ** menu is given the rectangle which includes the space it requested - ** in its response to WM_MEASUREITEM _plus_ width for a checkmark - ** and a popup-menu arrow. This is the value of lpitem->rect. - ** Windows will leave all drawing to the application except for - ** the popup-menu arrow. Windows always draws that itself, after - ** the menu owner has finished drawing. - */ - DRAWITEMSTRUCT dis; - - dis.CtlType = ODT_MENU; - dis.CtlID = 0; + /* + ** Experimentation under Windows reveals that an owner-drawn + ** menu is given the rectangle which includes the space it requested + ** in its response to WM_MEASUREITEM _plus_ width for a checkmark + ** and a popup-menu arrow. This is the value of lpitem->rect. + ** Windows will leave all drawing to the application except for + ** the popup-menu arrow. Windows always draws that itself, after + ** the menu owner has finished drawing. + */ + DRAWITEMSTRUCT dis; + + dis.CtlType = ODT_MENU; + dis.CtlID = 0; dis.itemID = lpitem->wID; dis.itemData = (DWORD)lpitem->dwItemData; - dis.itemState = 0; + dis.itemState = 0; if (lpitem->fState & MF_CHECKED) dis.itemState |= ODS_CHECKED; if (lpitem->fState & MF_GRAYED) dis.itemState |= ODS_GRAYED | ODS_DISABLED; if (lpitem->fState & MF_HILITE) dis.itemState |= ODS_SELECTED; dis.itemAction = odaction; /* ODA_DRAWENTIRE | ODA_SELECT | ODA_FOCUS; */ - dis.hwndItem = (HWND) MenuInfo->Self; + dis.hwndItem = (HWND) MenuInfo->Self; dis.hDC = hdc; dis.rcItem = rect; - TRACE("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, " - "hwndItem=%p, hdc=%p, rcItem={%ld,%ld,%ld,%ld}\n", hWnd, - dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem, - dis.hDC, dis.rcItem.left, dis.rcItem.top, dis.rcItem.right, - dis.rcItem.bottom); - SendMessageW(WndOwner, WM_DRAWITEM, 0, (LPARAM) &dis); - /* Draw the popup-menu arrow */ + TRACE("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, " + "hwndItem=%p, hdc=%p, rcItem={%ld,%ld,%ld,%ld}\n", hWnd, + dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem, + dis.hDC, dis.rcItem.left, dis.rcItem.top, dis.rcItem.right, + dis.rcItem.bottom); + SendMessageW(WndOwner, WM_DRAWITEM, 0, (LPARAM) &dis); + /* Draw the popup-menu arrow */ if (lpitem->fType & MF_POPUP) - { - RECT rectTemp; + { + RECT rectTemp; CopyRect(&rectTemp, &rect); - rectTemp.left = rectTemp.right - GetSystemMetrics(SM_CXMENUCHECK); + rectTemp.left = rectTemp.right - GetSystemMetrics(SM_CXMENUCHECK); DrawFrameControl(hdc, &rectTemp, DFC_MENU, DFCS_MENUARROW); - } - return; + } + return; } if (menuBar && (lpitem->fType & MF_SEPARATOR)) return; if (lpitem->fState & MF_HILITE) - { - if (flat_menu) - { + { + if (flat_menu) + { InflateRect (&rect, -1, -1); FillRect(hdc, &rect, GetSysColorBrush(COLOR_MENUHILIGHT)); InflateRect (&rect, 1, 1); FrameRect(hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT)); - } - else - { + } + else + { if(menuBar) DrawEdge(hdc, &rect, BDR_SUNKENOUTER, BF_RECT); - else + else FillRect(hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT)); - } - } - else + } + } + else FillRect( hdc, &rect, GetSysColorBrush(bkgnd) ); SetBkMode( hdc, TRANSPARENT ); - /* vertical separator */ + /* vertical separator */ if (!menuBar && (lpitem->fType & MF_MENUBARBREAK)) - { - HPEN oldPen; + { + HPEN oldPen; RECT rc = rect; - rc.left -= 3; - rc.top = 3; - rc.bottom = Height - 3; - if (flat_menu) - { + rc.left -= 3; + rc.top = 3; + rc.bottom = Height - 3; + if (flat_menu) + { oldPen = SelectObject( hdc, GetStockObject(DC_PEN) ); SetDCPenColor(hdc, GetSysColor(COLOR_BTNSHADOW)); MoveToEx( hdc, rc.left, rc.top, NULL ); LineTo( hdc, rc.left, rc.bottom ); SelectObject( hdc, oldPen ); - } - else + } + else DrawEdge (hdc, &rc, EDGE_ETCHED, BF_LEFT); - } - - /* horizontal separator */ + } + + /* horizontal separator */ if (lpitem->fType & MF_SEPARATOR) - { - HPEN oldPen; + { + HPEN oldPen; RECT rc = rect; - rc.left++; - rc.right--; - rc.top += SEPARATOR_HEIGHT / 2; - if (flat_menu) - { + rc.left++; + rc.right--; + rc.top += SEPARATOR_HEIGHT / 2; + if (flat_menu) + { oldPen = SelectObject( hdc, GetStockObject(DC_PEN) ); SetDCPenColor( hdc, GetSysColor(COLOR_BTNSHADOW)); MoveToEx( hdc, rc.left, rc.top, NULL ); LineTo( hdc, rc.right, rc.top ); SelectObject( hdc, oldPen ); - } - else + } + else DrawEdge (hdc, &rc, EDGE_ETCHED, BF_TOP); - return; - } + return; + } #if 0 - /* helper lines for debugging */ - /* This is a very good test tool when hacking menus! (JT) 07/16/2006 */ + /* helper lines for debugging */ + /* This is a very good test tool when hacking menus! (JT) 07/16/2006 */ FrameRect(hdc, &rect, GetStockObject(BLACK_BRUSH)); SelectObject(hdc, GetStockObject(DC_PEN)); SetDCPenColor(hdc, GetSysColor(COLOR_WINDOWFRAME)); @@ -1311,23 +1311,23 @@ #endif if (!menuBar) - { + { HBITMAP bm; INT y = rect.top + rect.bottom; RECT rc = rect; - int checked = FALSE; + int checked = FALSE; UINT check_bitmap_width = GetSystemMetrics( SM_CXMENUCHECK ); UINT check_bitmap_height = GetSystemMetrics( SM_CYMENUCHECK ); - /* Draw the check mark - * - * FIXME: - * Custom checkmark bitmaps are monochrome but not always 1bpp. - */ + /* Draw the check mark + * + * FIXME: + * Custom checkmark bitmaps are monochrome but not always 1bpp. + */ if( !(MenuInfo->dwStyle & MNS_NOCHECK)) { bm = (lpitem->fState & MF_CHECKED) ? lpitem->hbmpChecked : lpitem->hbmpUnchecked; if (bm) /* we have a custom bitmap */ - { + { HDC hdcMem = CreateCompatibleDC( hdc ); SelectObject( hdcMem, bm ); @@ -1335,61 +1335,61 @@ check_bitmap_width, check_bitmap_height, hdcMem, 0, 0, SRCCOPY ); DeleteDC( hdcMem ); - checked = TRUE; - } + checked = TRUE; + } else if (lpitem->fState & MF_CHECKED) /* standard bitmaps */ - { + { RECT r; CopyRect(&r, &rect); r.right = r.left + GetSystemMetrics(SM_CXMENUCHECK); DrawFrameControl( hdc, &r, DFC_MENU, (lpitem->fType & MFT_RADIOCHECK) ? DFCS_MENUBULLET : DFCS_MENUCHECK); - checked = TRUE; - } - } + checked = TRUE; + } + } if ( lpitem->hbmpItem ) - { - RECT bmpRect; + { + RECT bmpRect; CopyRect(&bmpRect, &rect); - if (!(MenuInfo->dwStyle & MNS_CHECKORBMP) && !(MenuInfo->dwStyle & MNS_NOCHECK)) + if (!(MenuInfo->dwStyle & MNS_CHECKORBMP) && !(MenuInfo->dwStyle & MNS_NOCHECK)) bmpRect.left += check_bitmap_width + 2; - if (!(checked && (MenuInfo->dwStyle & MNS_CHECKORBMP))) - { - bmpRect.right = bmpRect.left + MenuInfo->maxBmpSize.cx; + if (!(checked && (MenuInfo->dwStyle & MNS_CHECKORBMP))) + { + bmpRect.right = bmpRect.left + MenuInfo->maxBmpSize.cx; MenuDrawBitmapItem(hdc, lpitem, &bmpRect, MenuInfo->Self, WndOwner, odaction, menuBar); - } - } - /* Draw the popup-menu arrow */ + } + } + /* Draw the popup-menu arrow */ if (lpitem->fType & MF_POPUP) - { - RECT rectTemp; + { + RECT rectTemp; CopyRect(&rectTemp, &rect); - rectTemp.left = rectTemp.right - GetSystemMetrics(SM_CXMENUCHECK); + rectTemp.left = rectTemp.right - GetSystemMetrics(SM_CXMENUCHECK); DrawFrameControl(hdc, &rectTemp, DFC_MENU, DFCS_MENUARROW); - } + } rect.left += 4; - if( !(MenuInfo->dwStyle & MNS_NOCHECK)) + if( !(MenuInfo->dwStyle & MNS_NOCHECK)) rect.left += check_bitmap_width; rect.right -= check_bitmap_width; - } + } else if( lpitem->hbmpItem) { /* Draw the bitmap */ MenuDrawBitmapItem(hdc, lpitem, &rect, MenuInfo->Self, WndOwner, odaction, menuBar); - } + } /* process text if present */ if (lpitem->lpstr) - { - register int i = 0; + { + register int i = 0; HFONT hfontOld = 0; UINT uFormat = menuBar ? DT_CENTER | DT_VCENTER | DT_SINGLELINE - : DT_LEFT | DT_VCENTER | DT_SINGLELINE; - - if(MenuInfo->dwStyle & MNS_CHECKORBMP) + : DT_LEFT | DT_VCENTER | DT_SINGLELINE; + + if(MenuInfo->dwStyle & MNS_CHECKORBMP) rect.left += max(0, MenuInfo->maxBmpSize.cx - GetSystemMetrics(SM_CXMENUCHECK)); - else + else rect.left += MenuInfo->maxBmpSize.cx; if ( lpitem->fState & MFS_DEFAULT ) @@ -1403,39 +1403,39 @@ } Text = (PWCHAR) lpitem->dwTypeData; - if(Text) - { - for (i = 0; L'\0' != Text[i]; i++) + if(Text) + { + for (i = 0; L'\0' != Text[i]; i++) if (Text[i] == L'\t' || Text[i] == L'\b') - break; - } + break; + } if(lpitem->fState & MF_GRAYED) - { + { if (!(lpitem->fState & MF_HILITE) ) - { + { ++rect.left; ++rect.top; ++rect.right; ++rect.bottom; SetTextColor(hdc, RGB(0xff, 0xff, 0xff)); DrawTextW( hdc, Text, i, &rect, uFormat ); --rect.left; --rect.top; --rect.right; --rect.bottom; - } + } SetTextColor(hdc, RGB(0x80, 0x80, 0x80)); } DrawTextW( hdc, Text, i, &rect, uFormat); - /* paint the shortcut text */ + /* paint the shortcut text */ if (!menuBar && L'\0' != Text[i]) /* There's a tab or flush-right char */ { - if (L'\t' == Text[i]) + if (L'\t' == Text[i]) { rect.left = lpitem->dxTab; - uFormat = DT_LEFT | DT_VCENTER | DT_SINGLELINE; + uFormat = DT_LEFT | DT_VCENTER | DT_SINGLELINE; } - else + else { rect.right = lpitem->dxTab; - uFormat = DT_RIGHT | DT_VCENTER | DT_SINGLELINE; + uFormat = DT_RIGHT | DT_VCENTER | DT_SINGLELINE; } if (lpitem->fState & MF_GRAYED) @@ -1448,14 +1448,14 @@ --rect.left; --rect.top; --rect.right; --rect.bottom; } SetTextColor(hdc, RGB(0x80, 0x80, 0x80)); - } + } DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat ); } if (hfontOld) SelectObject (hdc, hfontOld); - } - } + } +} /*********************************************************************** * MenuDrawPopupMenu @@ -1481,38 +1481,38 @@ hPrevPen = SelectObject( hdc, GetStockObject( NULL_PEN ) ); if ( hPrevPen ) { - BOOL flat_menu = FALSE; + BOOL flat_menu = FALSE; ROSMENUINFO MenuInfo; ROSMENUITEMINFO ItemInfo; - SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); - if (flat_menu) + SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); + if (flat_menu) FrameRect(hdc, &rect, GetSysColorBrush(COLOR_BTNSHADOW)); - else + else DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT); - /* draw menu items */ + /* draw menu items */ if (MenuGetRosMenuInfo(&MenuInfo, hmenu) && MenuInfo.MenuItemCount) { UINT u; - MenuInitRosMenuItemInfo(&ItemInfo); - - for (u = 0; u < MenuInfo.MenuItemCount; u++) + MenuInitRosMenuItemInfo(&ItemInfo); + + for (u = 0; u < MenuInfo.MenuItemCount; u++) { - if (MenuGetRosMenuItemInfo(MenuInfo.Self, u, &ItemInfo)) + if (MenuGetRosMenuItemInfo(MenuInfo.Self, u, &ItemInfo)) { MenuDrawMenuItem(hwnd, &MenuInfo, MenuInfo.WndOwner, hdc, &ItemInfo, - MenuInfo.Height, FALSE, ODA_DRAWENTIRE); + MenuInfo.Height, FALSE, ODA_DRAWENTIRE); } } - MenuCleanupRosMenuItemInfo(&ItemInfo); - } + MenuCleanupRosMenuItemInfo(&ItemInfo); + } } else { SelectObject( hdc, hPrevBrush ); - } + } } } @@ -1545,7 +1545,7 @@ if (hfontOld) SelectObject( hDC, hfontOld); return lppop.Height; } - else + else return DrawMenuBarTemp(hwnd, hDC, lprect, hMenu, NULL); } @@ -1556,7 +1556,7 @@ */ static BOOL FASTCALL MenuShowPopup(HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, INT x, INT y, INT xanchor, INT yanchor ) - { +{ ROSMENUINFO MenuInfo; ROSMENUITEMINFO ItemInfo; UINT width, height; @@ -1576,7 +1576,7 @@ ItemInfo.fMask |= MIIM_STATE; ItemInfo.fState &= ~(MF_HILITE|MF_MOUSESELECT); MenuSetRosMenuItemInfo(MenuInfo.Self, MenuInfo.FocusedItem, &ItemInfo); - } + } MenuCleanupRosMenuItemInfo(&ItemInfo); MenuInfo.FocusedItem = NO_SELECTED_ITEM; } @@ -1612,11 +1612,11 @@ if( x + width > info.rcMonitor.right) x = info.rcMonitor.right - width; -} + } if( x < info.rcMonitor.left ) x = info.rcMonitor.left; if( y + height > info.rcMonitor.bottom) -{ + { if( yanchor && y >= height + yanchor ) y -= height + yanchor; @@ -1951,68 +1951,68 @@ */ static LPCSTR MENU_ParseResource( LPCSTR res, HMENU hMenu, BOOL unicode ) { - WORD flags, id = 0; - HMENU hSubMenu; - LPCSTR str; - BOOL end = FALSE; - - do - { - flags = GET_WORD(res); - - /* remove MF_END flag before passing it to AppendMenu()! */ - end = (flags & MF_END); - if(end) flags ^= MF_END; - - res += sizeof(WORD); - if(!(flags & MF_POPUP)) - { - id = GET_WORD(res); - res += sizeof(WORD); - } - str = res; - if(!unicode) - res += strlen(str) + 1; - else - res += (strlenW((LPCWSTR)str) + 1) * sizeof(WCHAR); - if (flags & MF_POPUP) - { - hSubMenu = CreatePopupMenu(); - if(!hSubMenu) return NULL; - if(!(res = MENU_ParseResource(res, hSubMenu, unicode))) - return NULL; - if(!unicode) - AppendMenuA(hMenu, flags, (UINT_PTR)hSubMenu, str); - else - AppendMenuW(hMenu, flags, (UINT_PTR)hSubMenu, (LPCWSTR)str); - } - else /* Not a popup */ - { - if(!unicode) - { + WORD flags, id = 0; + HMENU hSubMenu; + LPCSTR str; + BOOL end = FALSE; + + do + { + flags = GET_WORD(res); + + /* remove MF_END flag before passing it to AppendMenu()! */ + end = (flags & MF_END); + if(end) flags ^= MF_END; + + res += sizeof(WORD); + if(!(flags & MF_POPUP)) + { + id = GET_WORD(res); + res += sizeof(WORD); + } + str = res; + if(!unicode) + res += strlen(str) + 1; + else + res += (strlenW((LPCWSTR)str) + 1) * sizeof(WCHAR); + if (flags & MF_POPUP) + { + hSubMenu = CreatePopupMenu(); + if(!hSubMenu) return NULL; + if(!(res = MENU_ParseResource(res, hSubMenu, unicode))) + return NULL; + if(!unicode) + AppendMenuA(hMenu, flags, (UINT_PTR)hSubMenu, str); + else + AppendMenuW(hMenu, flags, (UINT_PTR)hSubMenu, (LPCWSTR)str); + } + else /* Not a popup */ + { + if(!unicode) + { if (*str == 0) flags = MF_SEPARATOR; - } - else - { - if (*(LPCWSTR)str == 0) - flags = MF_SEPARATOR; - } - - if (flags & MF_SEPARATOR) - { - if (!(flags & (MF_GRAYED | MF_DISABLED))) - flags |= MF_GRAYED | MF_DISABLED; - } - - if(!unicode) - AppendMenuA(hMenu, flags, id, *str ? str : NULL); - else - AppendMenuW(hMenu, flags, id, + } + else + { + if (*(LPCWSTR)str == 0) + flags = MF_SEPARATOR; + } + + if (flags & MF_SEPARATOR) + { + if (!(flags & (MF_GRAYED | MF_DISABLED))) + flags |= MF_GRAYED | MF_DISABLED; + } + + if(!unicode) + AppendMenuA(hMenu, flags, id, *str ? str : NULL); + else + AppendMenuW(hMenu, flags, id, *(LPCWSTR)str ? (LPCWSTR)str : NULL); - } - } while(!end); - return res; + } + } while(!end); + return res; } @@ -2388,21 +2388,21 @@ TRACE("owner=%x menu=%x 0x%04x\n", WndOwner, MenuInfo, SendMenuSelect); if (NULL != MenuInfo && NULL != top_popup && NO_SELECTED_ITEM != MenuInfo->FocusedItem) - { + { MenuInitRosMenuItemInfo(&ItemInfo); ItemInfo.fMask |= MIIM_FTYPE | MIIM_STATE; if (! MenuGetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo) || 0 == (ItemInfo.fType & MF_POPUP) || 0 == (ItemInfo.fState & MF_MOUSESELECT)) - { + { MenuCleanupRosMenuItemInfo(&ItemInfo); return; - } + } ItemInfo.fState &= ~MF_MOUSESELECT; ItemInfo.fMask |= MIIM_STATE; MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo); if (MenuGetRosMenuInfo(&SubMenuInfo, ItemInfo.hSubMenu)) - { + { MenuHideSubPopups(WndOwner, &SubMenuInfo, FALSE, wFlags); MenuSelectItem(WndOwner, &SubMenuInfo, NO_SELECTED_ITEM, SendMenuSelect, NULL); DestroyWindow(SubMenuInfo.Wnd); @@ -2412,8 +2412,8 @@ if (!(wFlags & TPM_NONOTIFY)) SendMessageW( WndOwner, WM_UNINITMENUPOPUP, (WPARAM)ItemInfo.hSubMenu, MAKELPARAM(0, IS_SYSTEM_MENU(&SubMenuInfo)) ); - } - } + } + } } /*********************************************************************** @@ -3064,11 +3064,11 @@ static void FASTCALL MenuKeyRight(MTRACKER *Mt, UINT Flags) { HMENU hmenutmp; - ROSMENUINFO MenuInfo; - ROSMENUINFO CurrentMenuInfo; - UINT NextCol; - - TRACE("MenuKeyRight called, cur %p, top %p.\n", + ROSMENUINFO MenuInfo; + ROSMENUINFO CurrentMenuInfo; + UINT NextCol; + + TRACE("MenuKeyRight called, cur %p, top %p.\n", Mt->CurrentMenu, Mt->TopMenu); if (! MenuGetRosMenuInfo(&MenuInfo, Mt->TopMenu)) return; @@ -3084,7 +3084,7 @@ /* if subpopup was displayed then we are done */ if (hmenutmp != Mt->CurrentMenu) return; - } + } if (! MenuGetRosMenuInfo(&CurrentMenuInfo, Mt->CurrentMenu)) { @@ -3139,9 +3139,9 @@ HWND hwnd, const RECT *lprect ) { MSG msg; - ROSMENUINFO MenuInfo; - ROSMENUITEMINFO ItemInfo; - BOOL fRemove; + ROSMENUINFO MenuInfo; + ROSMENUITEMINFO ItemInfo; + BOOL fRemove; INT executedMenuId = -1; MTRACKER mt; BOOL enterIdleSent = FALSE; @@ -3158,47 +3158,47 @@ lprect ? lprect->right : 0, lprect ? lprect->bottom : 0); if (!IsMenu(hmenu)) - { + { WARN("Invalid menu handle %p\n", hmenu); - SetLastError( ERROR_INVALID_MENU_HANDLE ); - return FALSE; - } - - fEndMenu = FALSE; + SetLastError( ERROR_INVALID_MENU_HANDLE ); + return FALSE; + } + + fEndMenu = FALSE; if (! MenuGetRosMenuInfo(&MenuInfo, hmenu)) { - return FALSE; + return FALSE; } if (wFlags & TPM_BUTTONDOWN) { - /* Get the result in order to start the tracking or not */ + /* Get the result in order to start the tracking or not */ fRemove = MenuButtonDown( &mt, hmenu, wFlags ); - fEndMenu = ! fRemove; + fEndMenu = !fRemove; } SetCapture(mt.OwnerWnd); (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, mt.OwnerWnd); - ERR("MenuTrackMenu 1\n"); - while (! fEndMenu) + ERR("MenuTrackMenu 1\n"); + while (! fEndMenu) { PVOID menu = ValidateHandle(mt.CurrentMenu, VALIDATE_TYPE_MENU); - if (!menu) /* sometimes happens if I do a window manager close */ - break; - - /* we have to keep the message in the queue until it's - * clear that menu loop is not over yet. */ - - for (;;) + if (!menu) /* sometimes happens if I do a window manager close */ + break; + + /* we have to keep the message in the queue until it's + * clear that menu loop is not over yet. */ + + for (;;) { if (PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE )) { if (!CallMsgFilterW( &msg, MSGF_MENU )) break; - /* remove the message from the queue */ + /* remove the message from the queue */ PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); } - else + else { if (!enterIdleSent) { @@ -3206,21 +3206,21 @@ enterIdleSent = TRUE; SendMessageW( mt.OwnerWnd, WM_ENTERIDLE, MSGF_MENU, (LPARAM) win); } - WaitMessage(); + WaitMessage(); } } - /* check if EndMenu() tried to cancel us, by posting this message */ + /* check if EndMenu() tried to cancel us, by posting this message */ if (msg.message == WM_CANCELMODE) { - /* we are now out of the loop */ - fEndMenu = TRUE; - - /* remove the message from the queue */ + /* we are now out of the loop */ + fEndMenu = TRUE; + + /* remove the message from the queue */ PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); - /* break out of internal loop, ala ESCAPE */ - break; + /* break out of internal loop, ala ESCAPE */ + break; } TranslateMessage( &msg ); @@ -3229,59 +3229,59 @@ if ( (msg.hwnd == MenuInfo.Wnd) || (msg.message!=WM_TIMER) ) enterIdleSent=FALSE; - fRemove = FALSE; + fRemove = FALSE; if ((msg.message >= WM_MOUSEFIRST) && (msg.message <= WM_MOUSELAST)) { - /* - * Use the mouse coordinates in lParam instead of those in the MSG - * struct to properly handle synthetic messages. They are already - * in screen coordinates. - */ + /* + * Use the mouse coordinates in lParam instead of those in the MSG + * struct to properly handle synthetic messages. They are already + * in screen coordinates. + */ mt.Pt.x = (short)LOWORD(msg.lParam); mt.Pt.y = (short)HIWORD(msg.lParam); - /* Find a menu for this mouse event */ + /* Find a menu for this mouse event */ hmenu = MenuPtMenu(mt.TopMenu, mt.Pt); switch(msg.message) { - /* no WM_NC... messages in captured state */ - - case WM_RBUTTONDBLCLK: - case WM_RBUTTONDOWN: + /* no WM_NC... messages in captured state */ + + case WM_RBUTTONDBLCLK: + case WM_RBUTTONDOWN: if (!(wFlags & TPM_RIGHTBUTTON)) break; - /* fall through */ - case WM_LBUTTONDBLCLK: - case WM_LBUTTONDOWN: - /* If the message belongs to the menu, removes it from the queue */ - /* Else, end menu tracking */ + /* fall through */ + case WM_LBUTTONDBLCLK: + case WM_LBUTTONDOWN: + /* If the message belongs to the menu, removes it from the queue */ + /* Else, end menu tracking */ fRemove = MenuButtonDown(&mt, hmenu, wFlags); - fEndMenu = ! fRemove; - break; - - case WM_RBUTTONUP: + fEndMenu = !fRemove; + break; + + case WM_RBUTTONUP: if (!(wFlags & TPM_RIGHTBUTTON)) break; - /* fall through */ - case WM_LBUTTONUP: - /* Check if a menu was selected by the mouse */ + /* fall through */ + case WM_LBUTTONUP: + /* Check if a menu was selected by the mouse */ if (hmenu) - { + { executedMenuId = MenuButtonUp( &mt, hmenu, wFlags); TRACE("executedMenuId %d\n", executedMenuId); /* End the loop if executedMenuId is an item ID */ /* or if the job was done (executedMenuId = 0). */ fEndMenu = fRemove = (executedMenuId != -1); - } + } /* No menu was selected by the mouse */ /* if the function was called by TrackPopupMenu, continue with the menu tracking. If not, stop it */ else fEndMenu = ((wFlags & TPM_POPUPMENU) ? FALSE : TRUE); - break; - - case WM_MOUSEMOVE: + break; + + case WM_MOUSEMOVE: /* the selected menu item must be changed every time */ /* the mouse moves. */ @@ -3289,20 +3289,20 @@ fEndMenu |= !MenuMouseMove( &mt, hmenu, wFlags ); } /* switch(msg.message) - mouse */ - } + } else if ((msg.message >= WM_KEYFIRST) && (msg.message <= WM_KEYLAST)) - { - fRemove = TRUE; /* Keyboard messages are always removed */ + { + fRemove = TRUE; /* Keyboard messages are always removed */ switch(msg.message) { - case WM_KEYDOWN: + case WM_KEYDOWN: case WM_SYSKEYDOWN: switch(msg.wParam) - { + { case VK_MENU: case VK_F10: - fEndMenu = TRUE; - break; + fEndMenu = TRUE; + break; case VK_HOME: case VK_END: @@ -3313,7 +3313,7 @@ MenuMoveSelection(mt.OwnerWnd, &MenuInfo, VK_HOME == msg.wParam ? ITEM_NEXT : ITEM_PREV); } - break; + break; case VK_UP: case VK_DOWN: /* If on menu bar, pull-down the menu */ @@ -3323,64 +3323,64 @@ { if (MenuGetRosMenuInfo(&MenuInfo, mt.TopMenu)) mt.CurrentMenu = MenuShowSubPopup(mt.OwnerWnd, &MenuInfo, TRUE, wFlags); - } - else /* otherwise try to move selection */ + } + else /* otherwise try to move selection */ MenuMoveSelection(mt.OwnerWnd, &MenuInfo, (msg.wParam == VK_UP)? ITEM_PREV : ITEM_NEXT ); - } - break; + } + break; case VK_LEFT: MenuKeyLeft( &mt, wFlags ); - break; + break; case VK_RIGHT: MenuKeyRight( &mt, wFlags ); - break; + break; case VK_ESCAPE: fEndMenu = MenuKeyEscape(&mt, wFlags); - break; + break; case VK_F1: - { + { HELPINFO hi; hi.cbSize = sizeof(HELPINFO); hi.iContextType = HELPINFO_MENUITEM; if (MenuGetRosMenuInfo(&MenuInfo, mt.CurrentMenu)) - { + { if (MenuInfo.FocusedItem == NO_SELECTED_ITEM) hi.iCtrlId = 0; else - { + { MenuInitRosMenuItemInfo(&ItemInfo); if (MenuGetRosMenuItemInfo(MenuInfo.Self, MenuInfo.FocusedItem, &ItemInfo)) - { + { hi.iCtrlId = ItemInfo.wID; - } + } else - { + { hi.iCtrlId = 0; - } + } MenuCleanupRosMenuItemInfo(&ItemInfo); - } - } + } + } hi.hItemHandle = hmenu; - hi.dwContextId = MenuInfo.dwContextHelpID; + hi.dwContextId = MenuInfo.dwContextHelpID; hi.MousePos = msg.pt; SendMessageW(hwnd, WM_HELP, 0, (LPARAM)&hi); break; - } + } default: - break; - } + break; + } break; /* WM_KEYDOWN */ - case WM_CHAR: - case WM_SYSCHAR: + case WM_CHAR: + case WM_SYSCHAR: { UINT pos; @@ -3389,52 +3389,52 @@ { executedMenuId = MenuExecFocusedItem(&mt, &MenuInfo, wFlags); fEndMenu = (executedMenuId != -2); - break; + break; } - /* Hack to avoid control chars. */ - /* We will find a better way real soon... */ + /* Hack to avoid control chars. */ + /* We will find a better way real soon... */ if (msg.wParam < 32) break; pos = MenuFindItemByKey(mt.OwnerWnd, &MenuInfo, LOWORD(msg.wParam), FALSE); if (pos == (UINT)-2) fEndMenu = TRUE; else if (pos == (UINT)-1) MessageBeep(0); - else + else { MenuSelectItem(mt.OwnerWnd, &MenuInfo, pos, TRUE, 0); executedMenuId = MenuExecFocusedItem(&mt, &MenuInfo, wFlags); fEndMenu = (executedMenuId != -2); } - } - break; + } + break; } /* switch(msg.message) - kbd */ } - else + else { PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); DispatchMessageW( &msg ); - continue; + continue; } if (!fEndMenu) fRemove = TRUE; - /* finally remove message from the queue */ + /* finally remove message from the queue */ if (fRemove && !(mt.TrackFlags & TF_SKIPREMOVE) ) PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); else mt.TrackFlags &= ~TF_SKIPREMOVE; - } - ERR("MenuTrackMenu 2\n"); - - (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, NULL); - SetCapture(NULL); /* release the capture */ - - /* If dropdown is still painted and the close box is clicked on - then the menu will be destroyed as part of the DispatchMessage above. + } + ERR("MenuTrackMenu 2\n"); + + (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, NULL); + SetCapture(NULL); /* release the capture */ + + /* If dropdown is still painted and the close box is clicked on + then the menu will be destroyed as part of the DispatchMessage above. This will then invalidate the menu handle in mt.hTopMenu. We should - check for this first. */ + check for this first. */ if( IsMenu( mt.TopMenu ) ) { if (IsWindow(mt.OwnerWnd)) @@ -3445,10 +3445,10 @@ if (MenuInfo.Flags & MF_POPUP) { - DestroyWindow(MenuInfo.Wnd); - MenuInfo.Wnd = NULL; - - if (!(MenuInfo.Flags & TPM_NONOTIFY)) + DestroyWindow(MenuInfo.Wnd); + MenuInfo.Wnd = NULL; + + if (!(MenuInfo.Flags & TPM_NONOTIFY)) SendMessageW( mt.OwnerWnd, WM_UNINITMENUPOPUP, (WPARAM)mt.TopMenu, MAKELPARAM(0, IS_SYSTEM_MENU(&MenuInfo)) ); @@ -3459,15 +3459,15 @@ SendMessageW( mt.OwnerWnd, WM_MENUSELECT, MAKEWPARAM(0, 0xffff), 0 ); } - /* Reset the variable for hiding menu */ + /* Reset the variable for hiding menu */ if (MenuGetRosMenuInfo(&MenuInfo, mt.TopMenu)) { - MenuInfo.TimeToHide = FALSE; - MenuSetRosMenuInfo(&MenuInfo); - } - } - - /* The return value is only used by TrackPopupMenu */ + MenuInfo.TimeToHide = FALSE; + MenuSetRosMenuInfo(&MenuInfo); + } + } + + /* The return value is only used by TrackPopupMenu */ if (!(wFlags & TPM_RETURNCMD)) return TRUE; if (executedMenuId == -1) executedMenuId = 0; return executedMenuId; @@ -3529,10 +3529,10 @@ TRACE("hwnd=%p\n", hWnd); SendMessageW( hWnd, WM_EXITMENULOOP, bPopup, 0 ); - ShowCaret(0); + ShowCaret(0); top_popup = 0; top_popup_hmenu = NULL; - return TRUE; + return TRUE; } /*********************************************************************** @@ -3549,9 +3549,9 @@ if (IsMenu(hMenu)) { - /* map point to parent client coordinates */ + /* map point to parent client coordinates */ HWND Parent = GetAncestor(hWnd, GA_PARENT ); - if (Parent != GetDesktopWindow()) + if (Parent != GetDesktopWindow()) { ScreenToClient(Parent, &pt); } @@ -4091,7 +4091,7 @@ guii.hwndMenuOwner != top_popup ) { ERR("Capture GUI pti hWnd does not match top_popup!\n"); - } + } } /* if we are in the menu code, and it is active */

1 0

[sir_richard] 47876: [NDK]: Not Alex, not 2006, not February (27th, though), not Power Management.
by sir_richard＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: sir_richard Date: Sun Jun 27 21:19:46 2010 New Revision: 47876 URL: http://svn.reactos.org/svn/reactos?rev=47876&view=rev Log: [NDK]: Not Alex, not 2006, not February (27th, though), not Power Management. Modified: trunk/reactos/include/ndk/vffuncs.h trunk/reactos/include/ndk/vftypes.h Modified: trunk/reactos/include/ndk/vffuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/vffuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/vffuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/vffuncs.h [iso-8859-1] Sun Jun 27 21:19:46 2010 @@ -1,6 +1,6 @@ /*++ NDK Version: 0098 -Copyright (c) Alex Ionescu. All rights reserved. +Copyright (c) ReactOS Portable Systems Group. All rights reserved. Header Name: @@ -8,11 +8,11 @@ Abstract: - Function definitions for the Power Subsystem. + Function definitions for the Driver Verifier. Author: - Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 + ReactOS Portable Systems Group (ros.arm(a)reactos.org) - Created - 27-Jun-2010 --*/ Modified: trunk/reactos/include/ndk/vftypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/vftypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/vftypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/vftypes.h [iso-8859-1] Sun Jun 27 21:19:46 2010 @@ -1,6 +1,6 @@ /*++ NDK Version: 0098 -Copyright (c) Alex Ionescu. All rights reserved. +Copyright (c) ReactOS Portable Systems Group. All rights reserved. Header Name: @@ -8,11 +8,11 @@ Abstract: - Type definitions for the Power Subystem + Type definitions for the Driver Verifier. Author: - Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 + ReactOS Portable Systems Group (ros.arm(a)reactos.org) - Created - 27-Jun-2010 --*/

1 0

[fireball] 47875: [NTOS] - Warn only once in MmSecureVirtualMemory/MmUnsecureVirtualMemory, like it was done in 47864.
by fireball＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: fireball Date: Sun Jun 27 21:18:59 2010 New Revision: 47875 URL: http://svn.reactos.org/svn/reactos?rev=47875&view=rev Log: [NTOS] - Warn only once in MmSecureVirtualMemory/MmUnsecureVirtualMemory, like it was done in 47864. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Jun 27 21:18:59 2010 @@ -742,7 +742,7 @@ IN SIZE_T Length, IN ULONG Mode) { - UNIMPLEMENTED; + static BOOLEAN Warn; if (!Warn++) UNIMPLEMENTED; return Address; } @@ -753,7 +753,7 @@ NTAPI MmUnsecureVirtualMemory(IN PVOID SecureMem) { - UNIMPLEMENTED; + static BOOLEAN Warn; if (!Warn++) UNIMPLEMENTED; } /* SYSTEM CALLS ***************************************************************/

1 0

[akhaldi] 47874: Fix Build. Seriously this time ;)
by akhaldi＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: akhaldi Date: Sun Jun 27 21:11:57 2010 New Revision: 47874 URL: http://svn.reactos.org/svn/reactos?rev=47874&view=rev Log: Fix Build. Seriously this time ;) Modified: trunk/reactos/dll/win32/kernel32/misc/format_msg.c trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c Modified: trunk/reactos/dll/win32/kernel32/misc/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/fo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/format_msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/format_msg.c [iso-8859-1] Sun Jun 27 21:11:57 2010 @@ -65,7 +65,7 @@ */ static LPWSTR load_messageW( HMODULE module, UINT id, WORD lang ) { - PRTL_MESSAGE_RESOURCE_ENTRY mre; + PMESSAGE_RESOURCE_ENTRY mre; WCHAR *buffer; NTSTATUS status; @@ -100,7 +100,7 @@ */ static LPSTR load_messageA( HMODULE module, UINT id, WORD lang ) { - PRTL_MESSAGE_RESOURCE_ENTRY mre; + PMESSAGE_RESOURCE_ENTRY mre; char *buffer; NTSTATUS status; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] Sun Jun 27 21:11:57 2010 @@ -221,7 +221,7 @@ NTSTATUS Status; UNICODE_STRING FileNameU, TempStringU, FormatU; ANSI_STRING FormatA; - PRTL_MESSAGE_RESOURCE_ENTRY MessageResource; + PMESSAGE_RESOURCE_ENTRY MessageResource; PWSTR FormatString; ULONG Size, ExceptionCode;

1 0

[sir_richard] 47873: [NTOS]: VfFailDeviceNode is actuall __cdecl. [NTOS]: Sort, update, clean-up, and add descriptions to bugcodes.mc.
by sir_richard＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: sir_richard Date: Sun Jun 27 21:02:20 2010 New Revision: 47873 URL: http://svn.reactos.org/svn/reactos?rev=47873&view=rev Log: [NTOS]: VfFailDeviceNode is actuall __cdecl. [NTOS]: Sort, update, clean-up, and add descriptions to bugcodes.mc. Modified: trunk/reactos/include/reactos/mc/bugcodes.mc trunk/reactos/ntoskrnl/ntoskrnl.pspec Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Sun Jun 27 21:02:20 2010 @@ -26,6 +26,64 @@ ; ; message definitions ; +MessageId=0x7E +Severity=Informational +Facility=System +SymbolicName=WINDOWS_NT_BANNER +Language=English +ReactOS (R) Kernel Version %hs (Build %u%hs) +. + +MessageId=0x87 +Severity=Informational +Facility=System +SymbolicName=WINDOWS_NT_CSD_STRING +Language=English +Service Pack +. + +MessageId=0x88 +Severity=Informational +Facility=System +SymbolicName=WINDOWS_NT_INFO_STRING +Language=English +%u System Processor [%u MB Memory] %Z +. + +MessageId=0x89 +Severity=Informational +Facility=System +SymbolicName=WINDOWS_NT_MP_STRING +Language=English +MultiProcessor Kernel +. + +MessageId=0x8A +Severity=Informational +Facility=System +SymbolicName=THREAD_TERMINATE_HELD_MUTEX +Language=English +A kernel thread terminated while holding a mutex +. + +MessageId=0x9D +Severity=Informational +Facility=System +SymbolicName=WINDOWS_NT_INFO_STRING_PLURAL +Language=English +%u System Processors [%u MB Memory] %Z +. + +MessageId=0x9F +Severity=Informational +Facility=System +SymbolicName=REACTOS_COPYRIGHT_NOTICE +Language=English +\n\nReactOS is free software, covered by the GNU General Public License, + and you\n are welcome to change it and/or distribute copies of it under + certain\n conditions. There is absolutely no warranty for ReactOS.\n +. + MessageId=0x7F Severity=Warning Facility=System @@ -563,9 +621,6 @@ SYSTEM_EXIT_OWNED_MUTEX . - - - MessageId=0x3E Severity=Success Facility=System @@ -611,8 +666,6 @@ ATDISK_DRIVER_INTERNAL . - - MessageId=0x44 Severity=Success Facility=System @@ -629,8 +682,6 @@ INSUFFICIENT_SYSTEM_MAP_REGS . - - MessageId=0x48 Severity=Success Facility=System @@ -774,8 +825,6 @@ Language=English PINBALL_FILE_SYSTEM . - - MessageId=0x5C Severity=Success @@ -1076,20 +1125,20 @@ Hardware malfunction . +MessageId=0x81 +Severity=Success +Facility=System +SymbolicName=SPIN_LOCK_INIT_FAILURE +Language=English +SPIN_LOCK_INIT_FAILURE +. + MessageId=0x8E Severity=Success Facility=System SymbolicName=KERNEL_MODE_EXCEPTION_NOT_HANDLED Language=English KERNEL_MODE_EXCEPTION_NOT_HANDLED -. - -MessageId=0x81 -Severity=Success -Facility=System -SymbolicName=SPIN_LOCK_INIT_FAILURE -Language=English -SPIN_LOCK_INIT_FAILURE . MessageId=0x8F @@ -1178,7 +1227,7 @@ Facility=System SymbolicName=HAL_MEMORY_ALLOCATION Language=English -HAL_MEMORY_ALLOCATION +Allocate from NonPaged Pool failed for a HAL critical allocation. . MessageId=0xB4 @@ -1186,7 +1235,7 @@ Facility=System SymbolicName=VIDEO_DRIVER_INIT_FAILURE Language=English -VIDEO_DRIVER_INIT_FAILURE +The video driver failed to initialize . MessageId=0xB7 @@ -1202,7 +1251,7 @@ Facility=System SymbolicName=ATTEMPTED_SWITCH_FROM_DPC Language=English -ATTEMPTED_SWITCH_FROM_DPC +A wait operation, attach process, or yield was attempted from a DPC routine. . MessageId=0xBE @@ -1210,7 +1259,7 @@ Facility=System SymbolicName=ATTEMPTED_WRITE_TO_READONLY_MEMORY Language=English -ATTEMPTED_WRITE_TO_READONLY_MEMORY +An attempt was made to write to read-only memory. . MessageId=0xC2 @@ -1270,7 +1319,7 @@ Facility=System SymbolicName=PNP_DETECTED_FATAL_ERROR Language=English -PNP_DETECTED_FATAL_ERROR +Plug and Play detected an error most likely caused by a faulty driver. . MessageId=0xCB @@ -1310,7 +1359,7 @@ Facility=System SymbolicName=DRIVER_PORTION_MUST_BE_NONPAGED Language=English -DRIVER_PORTION_MUST_BE_NONPAGED +The driver mistakenly marked a part of it's image pageable instead of non-pageable. . MessageId=0xD8 @@ -1318,7 +1367,7 @@ Facility=System SymbolicName=DRIVER_USED_EXCESSIVE_PTES Language=English -DRIVER_USED_EXCESSIVE_PTES +The driver has used an excessive number of system PTEs. . MessageId=0xD4 @@ -1326,7 +1375,7 @@ Facility=System SymbolicName=SYSTEM_SCAN_AT_RAISED_IRQL_CAUGHT_IMPROPER_DRIVER_UNLOAD Language=English -SYSTEM_SCAN_AT_RAISED_IRQL_CAUGHT_IMPROPER_DRIVER_UNLOAD +The driver unloaded without cancelling pending operations. . MessageId=0xE0 @@ -1373,7 +1422,13 @@ Facility=System SymbolicName=WORKER_INVALID Language=English -WORKER_INVALID +If Parameter1 == 0, an executive worker item was found in memory which +must not contain such items. Usually this is memory being freed. This +is usually caused by a device driver that has not cleaned up properly +before freeing memory. + +If Parameter1 == 1, an attempt was made to queue an executive worker item +with a usermode execution routine. . MessageId=0xE5 @@ -1384,78 +1439,14 @@ POWER_FAILURE_SIMULATE . -MessageId=0xFA -Severity=Success -Facility=System -SymbolicName=IMPERSONATING_WORKER_THREAD -Language=English -IMPERSONATING_WORKER_THREAD -. - -MessageId=0x7E -Severity=Informational -Facility=System -SymbolicName=WINDOWS_NT_BANNER -Language=English -ReactOS (R) Kernel Version %hs (Build %u%hs) -. - -MessageId=0x87 -Severity=Informational -Facility=System -SymbolicName=WINDOWS_NT_CSD_STRING -Language=English -Service Pack -. - -MessageId=0x88 -Severity=Informational -Facility=System -SymbolicName=WINDOWS_NT_INFO_STRING -Language=English -%u System Processor [%u MB Memory] %Z -. - -MessageId=0x89 -Severity=Informational -Facility=System -SymbolicName=WINDOWS_NT_MP_STRING -Language=English -MultiProcessor Kernel -. - -MessageId=0x8A -Severity=Informational -Facility=System -SymbolicName=THREAD_TERMINATE_HELD_MUTEX -Language=English -A kernel thread terminated while holding a mutex -. - -MessageId=0x9D -Severity=Informational -Facility=System -SymbolicName=WINDOWS_NT_INFO_STRING_PLURAL -Language=English -%u System Processors [%u MB Memory] %Z -. - -MessageId=0x9F -Severity=Informational -Facility=System -SymbolicName=REACTOS_COPYRIGHT_NOTICE -Language=English -\n\nReactOS is free software, covered by the GNU General Public License, - and you\n are welcome to change it and/or distribute copies of it under - certain\n conditions. There is absolutely no warranty for ReactOS.\n -. - MessageId=0xE9 Severity=Success Facility=System SymbolicName=ACTIVE_EX_WORKER_THREAD_TERMINATION Language=English -ACTIVE_EX_WORKER_THREAD_TERMINATION +An executive worker thread is being terminated without having gone through the worker thread rundown code. +Work items queued to the Ex worker queue must not terminate their threads. +A stack trace should indicate the culprit. . MessageId=0xEA @@ -1476,7 +1467,7 @@ Facility=System SymbolicName=CRITICAL_PROCESS_DIED Language=English -CRITICAL_PROCESS_DIED +The kernel attempted to ready a thread that was in an incorrect state such as terminated. . MessageId=0xF4 @@ -1484,7 +1475,15 @@ Facility=System SymbolicName=CRITICAL_OBJECT_TERMINATION Language=English -CRITICAL_OBJECT_TERMINATION +A process or thread crucial to system operation has unexpectedly exited or been terminated. +. + +MessageId=0xF6 +Severity=Success +Facility=System +SymbolicName=PCI_VERIFIER_DETECTED_VIOLATION +Language=English +The PCI driver has detected an error in a PCI device or BIOS being verified. . MessageId=0xF8 @@ -1495,12 +1494,21 @@ An initialization failure occurred while attempting to boot from the RAM disk. . +MessageId=0xFA +Severity=Success +Facility=System +SymbolicName=IMPERSONATING_WORKER_THREAD +Language=English +A worker thread is impersonating another process. The work item forgot to +disable impersonation before it returned. +. + MessageId=0xFC Severity=Success Facility=System SymbolicName=ATTEMPTED_EXECUTE_OF_NOEXECUTE_MEMORY Language=English -ATTEMPTED_EXECUTE_OF_NOEXECUTE_MEMORY +An attempt was made to execute to non-executable memory. . ; EOF Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Sun Jun 27 21:02:20 2010 @@ -1397,7 +1397,7 @@ @ stdcall SeUnregisterLogonSessionTerminatedRoutine(ptr) @ stdcall SeValidSecurityDescriptor(long ptr) @ stdcall VerSetConditionMask(long long long long) -@ stdcall VfFailDeviceNode(ptr long long long ptr ptr ptr) +@ cdecl VfFailDeviceNode(ptr long long long ptr ptr ptr) ;VfFailDriver ;VfFailSystemBIOS @ stdcall VfIsVerificationEnabled(long ptr)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs