Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[greatlrd] 18318: Sync aginst a older version of wine, fixed GvG patch for so we do not lose poll_mouse, tested in few apps and games in ros and windows. Next sync is against current version of wine. and it does remove almost whole my patch for wine dinput thx to GvG implemet userhook for mouse and keyboard in reactos.

by greatlrd＠svn.reactos.com

Sync aginst a older version of wine, fixed GvG patch for so we do not lose poll_mouse, tested in few apps and games in ros and windows. Next sync is against current version of wine. and it does remove almost whole my patch for wine dinput thx to GvG implemet userhook for mouse and keyboard in reactos. Modified: trunk/reactos/lib/dinput/Makefile.in Modified: trunk/reactos/lib/dinput/data_formats.c Modified: trunk/reactos/lib/dinput/device.c Modified: trunk/reactos/lib/dinput/dinput.xml Modified: trunk/reactos/lib/dinput/dinput_main.c Modified: trunk/reactos/lib/dinput/dinput_private.h Modified: trunk/reactos/lib/dinput/joystick_linux.c Modified: trunk/reactos/lib/dinput/joystick_linuxinput.c Modified: trunk/reactos/lib/dinput/keyboard.c Added: trunk/reactos/lib/dinput/makefile Modified: trunk/reactos/lib/dinput/mouse.c _____ Modified: trunk/reactos/lib/dinput/Makefile.in --- trunk/reactos/lib/dinput/Makefile.in 2005-10-07 22:50:26 UTC (rev 18317) +++ trunk/reactos/lib/dinput/Makefile.in 2005-10-08 00:21:29 UTC (rev 18318) @@ -3,6 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dinput.dll +IMPORTLIB = libdinput.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid @@ -16,8 +17,12 @@ mouse.c \ regsvr.c +IMPLIB_SRCS = data_formats.c + RC_SRCS = version.rc +SUBDIRS = tests + @MAKE_DLL_RULES@ ### Dependencies: _____ Modified: trunk/reactos/lib/dinput/data_formats.c --- trunk/reactos/lib/dinput/data_formats.c 2005-10-07 22:50:26 UTC (rev 18317) +++ trunk/reactos/lib/dinput/data_formats.c 2005-10-08 00:21:29 UTC (rev 18318) @@ -16,10 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* TODO: - * add keyboard - */ - #include <stdarg.h> #include "windef.h" @@ -27,7 +23,7 @@ #define numObjects(x) (sizeof(x) / sizeof(x[0])) -DIOBJECTDATAFORMAT dfDIJoystick[] = { +static const DIOBJECTDATAFORMAT dfDIJoystick[] = { { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, @@ -80,10 +76,10 @@ DIDF_ABSAXIS, sizeof(DIJOYSTATE2), numObjects(dfDIJoystick), - dfDIJoystick + (LPDIOBJECTDATAFORMAT)dfDIJoystick }; -DIOBJECTDATAFORMAT dfDIJoystick2[] = { +static const DIOBJECTDATAFORMAT dfDIJoystick2[] = { { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, @@ -256,10 +252,10 @@ DIDF_ABSAXIS, sizeof(DIJOYSTATE2), numObjects(dfDIJoystick2), - dfDIJoystick2 + (LPDIOBJECTDATAFORMAT)dfDIJoystick2 }; -DIOBJECTDATAFORMAT dfDIMouse[] = { +static const DIOBJECTDATAFORMAT dfDIMouse[] = { { &GUID_XAxis, DIMOFS_X, DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, { &GUID_YAxis, DIMOFS_Y, DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, { &GUID_ZAxis, DIMOFS_Z, DIDFT_OPTIONAL | DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, @@ -275,10 +271,10 @@ DIDF_RELAXIS, sizeof(DIMOUSESTATE), numObjects(dfDIMouse), - dfDIMouse + (LPDIOBJECTDATAFORMAT)dfDIMouse }; -DIOBJECTDATAFORMAT dfDIMouse2[] = { +static const DIOBJECTDATAFORMAT dfDIMouse2[] = { { &GUID_XAxis, DIMOFS_X, DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, { &GUID_YAxis, DIMOFS_Y, DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, { &GUID_ZAxis, DIMOFS_Z, DIDFT_OPTIONAL | DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, @@ -298,5 +294,273 @@ DIDF_RELAXIS, sizeof(DIMOUSESTATE2), numObjects(dfDIMouse2), - dfDIMouse2 + (LPDIOBJECTDATAFORMAT)dfDIMouse2 }; + +static const DIOBJECTDATAFORMAT dfDIKeyboard[] = { + { &GUID_Key,0,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(0),0}, + { &GUID_Key,1,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(1),0}, + { &GUID_Key,2,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(2),0}, + { &GUID_Key,3,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(3),0}, + { &GUID_Key,4,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(4),0}, + { &GUID_Key,5,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(5),0}, + { &GUID_Key,6,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(6),0}, + { &GUID_Key,7,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(7),0}, + { &GUID_Key,8,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(8),0}, + { &GUID_Key,9,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(9),0}, + { &GUID_Key,10,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(10),0}, + { &GUID_Key,11,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(11),0}, + { &GUID_Key,12,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(12),0}, + { &GUID_Key,13,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(13),0}, + { &GUID_Key,14,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(14),0}, + { &GUID_Key,15,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(15),0}, + { &GUID_Key,16,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(16),0}, + { &GUID_Key,17,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(17),0}, + { &GUID_Key,18,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(18),0}, + { &GUID_Key,19,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(19),0}, + { &GUID_Key,20,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(20),0}, + { &GUID_Key,21,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(21),0}, + { &GUID_Key,22,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(22),0}, + { &GUID_Key,23,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(23),0}, + { &GUID_Key,24,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(24),0}, + { &GUID_Key,25,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(25),0}, + { &GUID_Key,26,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(26),0}, + { &GUID_Key,27,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(27),0}, + { &GUID_Key,28,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(28),0}, + { &GUID_Key,29,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(29),0}, + { &GUID_Key,30,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(30),0}, + { &GUID_Key,31,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(31),0}, + { &GUID_Key,32,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(32),0}, + { &GUID_Key,33,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(33),0}, + { &GUID_Key,34,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(34),0}, + { &GUID_Key,35,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(35),0}, + { &GUID_Key,36,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(36),0}, + { &GUID_Key,37,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(37),0}, + { &GUID_Key,38,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(38),0}, + { &GUID_Key,39,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(39),0}, + { &GUID_Key,40,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(40),0}, + { &GUID_Key,41,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(41),0}, + { &GUID_Key,42,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(42),0}, + { &GUID_Key,43,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(43),0}, + { &GUID_Key,44,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(44),0}, + { &GUID_Key,45,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(45),0}, + { &GUID_Key,46,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(46),0}, + { &GUID_Key,47,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(47),0}, + { &GUID_Key,48,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(48),0}, + { &GUID_Key,49,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(49),0}, + { &GUID_Key,50,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(50),0}, + { &GUID_Key,51,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(51),0}, + { &GUID_Key,52,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(52),0}, + { &GUID_Key,53,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(53),0}, + { &GUID_Key,54,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(54),0}, + { &GUID_Key,55,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(55),0}, + { &GUID_Key,56,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(56),0}, + { &GUID_Key,57,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(57),0}, + { &GUID_Key,58,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(58),0}, + { &GUID_Key,59,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(59),0}, + { &GUID_Key,60,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(60),0}, + { &GUID_Key,61,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(61),0}, + { &GUID_Key,62,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(62),0}, + { &GUID_Key,63,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(63),0}, + { &GUID_Key,64,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(64),0}, + { &GUID_Key,65,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(65),0}, + { &GUID_Key,66,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(66),0}, + { &GUID_Key,67,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(67),0}, + { &GUID_Key,68,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(68),0}, + { &GUID_Key,69,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(69),0}, + { &GUID_Key,70,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(70),0}, + { &GUID_Key,71,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(71),0}, + { &GUID_Key,72,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(72),0}, + { &GUID_Key,73,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(73),0}, + { &GUID_Key,74,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(74),0}, + { &GUID_Key,75,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(75),0}, + { &GUID_Key,76,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(76),0}, + { &GUID_Key,77,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(77),0}, + { &GUID_Key,78,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(78),0}, + { &GUID_Key,79,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(79),0}, + { &GUID_Key,80,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(80),0}, + { &GUID_Key,81,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(81),0}, + { &GUID_Key,82,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(82),0}, + { &GUID_Key,83,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(83),0}, + { &GUID_Key,84,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(84),0}, + { &GUID_Key,85,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(85),0}, + { &GUID_Key,86,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(86),0}, + { &GUID_Key,87,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(87),0}, + { &GUID_Key,88,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(88),0}, + { &GUID_Key,89,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(89),0}, + { &GUID_Key,90,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(90),0}, + { &GUID_Key,91,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(91),0}, + { &GUID_Key,92,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(92),0}, + { &GUID_Key,93,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(93),0}, + { &GUID_Key,94,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(94),0}, + { &GUID_Key,95,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(95),0}, + { &GUID_Key,96,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(96),0}, + { &GUID_Key,97,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(97),0}, + { &GUID_Key,98,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(98),0}, + { &GUID_Key,99,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(99),0}, + { &GUID_Key,100,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(100),0}, + { &GUID_Key,101,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(101),0}, + { &GUID_Key,102,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(102),0}, + { &GUID_Key,103,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(103),0}, + { &GUID_Key,104,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(104),0}, + { &GUID_Key,105,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(105),0}, + { &GUID_Key,106,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(106),0}, + { &GUID_Key,107,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(107),0}, + { &GUID_Key,108,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(108),0}, + { &GUID_Key,109,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(109),0}, + { &GUID_Key,110,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(110),0}, + { &GUID_Key,111,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(111),0}, + { &GUID_Key,112,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(112),0}, + { &GUID_Key,113,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(113),0}, + { &GUID_Key,114,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(114),0}, + { &GUID_Key,115,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(115),0}, + { &GUID_Key,116,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(116),0}, + { &GUID_Key,117,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(117),0}, + { &GUID_Key,118,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(118),0}, + { &GUID_Key,119,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(119),0}, + { &GUID_Key,120,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(120),0}, + { &GUID_Key,121,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(121),0}, + { &GUID_Key,122,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(122),0}, + { &GUID_Key,123,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(123),0}, + { &GUID_Key,124,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(124),0}, + { &GUID_Key,125,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(125),0}, + { &GUID_Key,126,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(126),0}, + { &GUID_Key,127,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(127),0}, + { &GUID_Key,128,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(128),0}, + { &GUID_Key,129,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(129),0}, + { &GUID_Key,130,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(130),0}, + { &GUID_Key,131,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(131),0}, + { &GUID_Key,132,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(132),0}, + { &GUID_Key,133,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(133),0}, + { &GUID_Key,134,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(134),0}, + { &GUID_Key,135,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(135),0}, + { &GUID_Key,136,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(136),0}, + { &GUID_Key,137,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(137),0}, + { &GUID_Key,138,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(138),0}, + { &GUID_Key,139,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(139),0}, + { &GUID_Key,140,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(140),0}, + { &GUID_Key,141,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(141),0}, + { &GUID_Key,142,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(142),0}, + { &GUID_Key,143,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(143),0}, + { &GUID_Key,144,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(144),0}, + { &GUID_Key,145,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(145),0}, + { &GUID_Key,146,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(146),0}, + { &GUID_Key,147,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(147),0}, + { &GUID_Key,148,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(148),0}, + { &GUID_Key,149,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(149),0}, + { &GUID_Key,150,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(150),0}, + { &GUID_Key,151,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(151),0}, + { &GUID_Key,152,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(152),0}, + { &GUID_Key,153,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(153),0}, + { &GUID_Key,154,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(154),0}, + { &GUID_Key,155,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(155),0}, + { &GUID_Key,156,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(156),0}, + { &GUID_Key,157,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(157),0}, + { &GUID_Key,158,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(158),0}, + { &GUID_Key,159,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(159),0}, + { &GUID_Key,160,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(160),0}, + { &GUID_Key,161,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(161),0}, + { &GUID_Key,162,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(162),0}, + { &GUID_Key,163,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(163),0}, + { &GUID_Key,164,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(164),0}, + { &GUID_Key,165,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(165),0}, + { &GUID_Key,166,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(166),0}, + { &GUID_Key,167,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(167),0}, + { &GUID_Key,168,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(168),0}, + { &GUID_Key,169,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(169),0}, + { &GUID_Key,170,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(170),0}, + { &GUID_Key,171,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(171),0}, + { &GUID_Key,172,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(172),0}, + { &GUID_Key,173,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(173),0}, + { &GUID_Key,174,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(174),0}, + { &GUID_Key,175,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(175),0}, + { &GUID_Key,176,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(176),0}, + { &GUID_Key,177,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(177),0}, + { &GUID_Key,178,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(178),0}, + { &GUID_Key,179,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(179),0}, + { &GUID_Key,180,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(180),0}, + { &GUID_Key,181,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(181),0}, + { &GUID_Key,182,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(182),0}, + { &GUID_Key,183,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(183),0}, + { &GUID_Key,184,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(184),0}, + { &GUID_Key,185,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(185),0}, + { &GUID_Key,186,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(186),0}, + { &GUID_Key,187,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(187),0}, + { &GUID_Key,188,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(188),0}, + { &GUID_Key,189,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(189),0}, + { &GUID_Key,190,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(190),0}, + { &GUID_Key,191,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(191),0}, + { &GUID_Key,192,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(192),0}, + { &GUID_Key,193,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(193),0}, + { &GUID_Key,194,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(194),0}, + { &GUID_Key,195,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(195),0}, + { &GUID_Key,196,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(196),0}, + { &GUID_Key,197,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(197),0}, + { &GUID_Key,198,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(198),0}, + { &GUID_Key,199,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(199),0}, + { &GUID_Key,200,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(200),0}, + { &GUID_Key,201,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(201),0}, + { &GUID_Key,202,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(202),0}, + { &GUID_Key,203,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(203),0}, + { &GUID_Key,204,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(204),0}, + { &GUID_Key,205,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(205),0}, + { &GUID_Key,206,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(206),0}, + { &GUID_Key,207,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(207),0}, + { &GUID_Key,208,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(208),0}, + { &GUID_Key,209,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(209),0}, + { &GUID_Key,210,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(210),0}, + { &GUID_Key,211,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(211),0}, + { &GUID_Key,212,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(212),0}, + { &GUID_Key,213,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(213),0}, + { &GUID_Key,214,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(214),0}, + { &GUID_Key,215,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(215),0}, + { &GUID_Key,216,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(216),0}, + { &GUID_Key,217,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(217),0}, + { &GUID_Key,218,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(218),0}, + { &GUID_Key,219,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(219),0}, + { &GUID_Key,220,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(220),0}, + { &GUID_Key,221,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(221),0}, + { &GUID_Key,222,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(222),0}, + { &GUID_Key,223,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(223),0}, + { &GUID_Key,224,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(224),0}, + { &GUID_Key,225,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(225),0}, + { &GUID_Key,226,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(226),0}, + { &GUID_Key,227,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(227),0}, + { &GUID_Key,228,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(228),0}, + { &GUID_Key,229,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(229),0}, + { &GUID_Key,230,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(230),0}, + { &GUID_Key,231,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(231),0}, + { &GUID_Key,232,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(232),0}, + { &GUID_Key,233,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(233),0}, + { &GUID_Key,234,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(234),0}, + { &GUID_Key,235,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(235),0}, + { &GUID_Key,236,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(236),0}, + { &GUID_Key,237,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(237),0}, + { &GUID_Key,238,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(238),0}, + { &GUID_Key,239,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(239),0}, + { &GUID_Key,240,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(240),0}, + { &GUID_Key,241,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(241),0}, + { &GUID_Key,242,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(242),0}, + { &GUID_Key,243,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(243),0}, + { &GUID_Key,244,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(244),0}, + { &GUID_Key,245,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(245),0}, + { &GUID_Key,246,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(246),0}, + { &GUID_Key,247,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(247),0}, + { &GUID_Key,248,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(248),0}, + { &GUID_Key,249,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(249),0}, + { &GUID_Key,250,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(250),0}, + { &GUID_Key,251,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(251),0}, + { &GUID_Key,252,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(252),0}, + { &GUID_Key,253,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(253),0}, + { &GUID_Key,254,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(254),0}, + { &GUID_Key,255,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(255),0} +}; + +const DIDATAFORMAT c_dfDIKeyboard = { + sizeof(DIDATAFORMAT), + sizeof(DIOBJECTDATAFORMAT), + DIDF_RELAXIS, + 256, + numObjects(dfDIKeyboard), + (LPDIOBJECTDATAFORMAT)dfDIKeyboard +}; _____ Modified: trunk/reactos/lib/dinput/device.c --- trunk/reactos/lib/dinput/device.c 2005-10-07 22:50:26 UTC (rev 18317) +++ trunk/reactos/lib/dinput/device.c 2005-10-08 00:21:29 UTC (rev 18318) @@ -80,7 +80,10 @@ FE(DIDFT_NODATA), FE(DIDFT_FFACTUATOR), FE(DIDFT_FFEFFECTTRIGGER), - FE(DIDFT_OUTPUT) + FE(DIDFT_OUTPUT), + FE(DIDFT_VENDORDEFINED), + FE(DIDFT_ALIAS), + FE(DIDFT_OPTIONAL) #undef FE }; type = (dwFlags & 0xFF0000FF); @@ -290,12 +293,12 @@ int index = 0; DWORD next = 0; - ret = (DataFormat *) HeapAlloc(GetProcessHeap(), 0, sizeof(DataFormat)); + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(DataFormat)); - done = (int *) HeapAlloc(GetProcessHeap(), 0, sizeof(int) * asked_format->dwNumObjs); + done = HeapAlloc(GetProcessHeap(), 0, sizeof(int) * asked_format->dwNumObjs); memset(done, 0, sizeof(int) * asked_format->dwNumObjs); - dt = (DataTransform *) HeapAlloc(GetProcessHeap(), 0, asked_format->dwNumObjs * sizeof(DataTransform)); + dt = HeapAlloc(GetProcessHeap(), 0, asked_format->dwNumObjs * sizeof(DataTransform)); TRACE("Creating DataTransform : \n"); @@ -310,13 +313,18 @@ * the GUID of the Wine object. */ ((asked_format->rgodf[j].pguid == NULL) || + (wine_format->rgodf[i].pguid == NULL) || (IsEqualGUID(wine_format->rgodf[i].pguid, asked_format->rgodf[j].pguid))) && (/* Then check if it accepts any instance id, and if not, if it matches Wine's * instance id. */ - ((asked_format->rgodf[j].dwType & 0x00FFFF00) == DIDFT_ANYINSTANCE) || - (wine_format->rgodf[i].dwType & asked_format->rgodf[j].dwType))) { + (DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == 0xFFFF) || + (DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == 0x00FF) || /* This is mentionned in no DX docs, but it works fine - tested on WinXP */ + (DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == DIDFT_GETINSTANCE(wine_format->rgodf[i].dwType))) + && + ( /* Then if the asked type matches the one Wine provides */ + wine_format->rgodf[i].dwType & asked_format->rgodf[j].dwType)) { done[j] = 1; @@ -329,19 +337,19 @@ TRACE(" * dwType: %08lx\n", asked_format->rgodf[j].dwType); TRACE(" "); _dump_EnumObjects_flags(asked_format->rgodf[j].dwType); TRACE("\n"); - TRACE(" - Wine (%d) :\n", j); + TRACE(" - Wine (%d) :\n", i); TRACE(" * GUID: %s ('%s')\n", - debugstr_guid(wine_format->rgodf[j].pguid), - _dump_dinput_GUID(wine_format->rgodf[j].pguid)); - TRACE(" * Offset: %3ld\n", wine_format->rgodf[j].dwOfs); - TRACE(" * dwType: %08lx\n", wine_format->rgodf[j].dwType); - TRACE(" "); _dump_EnumObjects_flags(wine_format->rgodf[j].dwType); TRACE("\n"); + debugstr_guid(wine_format->rgodf[i].pguid), + _dump_dinput_GUID(wine_format->rgodf[i].pguid)); + TRACE(" * Offset: %3ld\n", wine_format->rgodf[i].dwOfs); + TRACE(" * dwType: %08lx\n", wine_format->rgodf[i].dwType); + TRACE(" "); _dump_EnumObjects_flags(wine_format->rgodf[i].dwType); TRACE("\n"); if (wine_format->rgodf[i].dwType & DIDFT_BUTTON) dt[index].size = sizeof(BYTE); else dt[index].size = sizeof(DWORD); - dt[index].offset_in = wine_format ->rgodf[i].dwOfs; + dt[index].offset_in = wine_format->rgodf[i].dwOfs; if (asked_format->rgodf[j].dwOfs < next) { WARN("bad format: dwOfs=%ld, changing to %ld\n", asked_format->rgodf[j].dwOfs, next); dt[index].offset_out = next; @@ -409,7 +417,7 @@ data = (device_enumobjects_AtoWcb_data*) lpvRef; - memset(&ddtmp, 0, sizeof(DIDEVICEINSTANCEW)); + memset(&ddtmp, 0, sizeof(ddtmp)); ddtmp.dwSize = sizeof(DIDEVICEINSTANCEW); ddtmp.guidType = lpddi->guidType; @@ -749,8 +757,6 @@ { FIXME("(this=%p,%p,%p,0x%08lx): stub!\n", iface, lpCallback, lpvRef, dwFlags); - if (lpCallback) - lpCallback(NULL, lpvRef); return DI_OK; } _____ Modified: trunk/reactos/lib/dinput/dinput.xml --- trunk/reactos/lib/dinput/dinput.xml 2005-10-07 22:50:26 UTC (rev 18317) +++ trunk/reactos/lib/dinput/dinput.xml 2005-10-08 00:21:29 UTC (rev 18318) @@ -1,4 +1,4 @@ -<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" allowwarnings="true"> +<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" warnings="true"> <importlibrary definition="dinput.spec.def" /> <include base="dinput">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/dinput/dinput_main.c --- trunk/reactos/lib/dinput/dinput_main.c 2005-10-07 22:50:26 UTC (rev 18317) +++ trunk/reactos/lib/dinput/dinput_main.c 2005-10-08 00:21:29 UTC (rev 18318) @@ -30,8 +30,6 @@ */ #include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdarg.h> #include <string.h> @@ -53,10 +51,14 @@ static IDirectInput8AVtbl ddi8avt; static IDirectInput8WVtbl ddi8wvt; -/* This array will be filled a dinput.so loading */ -#define MAX_WINE_DINPUT_DEVICES 4 -static dinput_device * dinput_devices[MAX_WINE_DINPUT_DEVICES]; -static int nrof_dinput_devices = 0; +static const struct dinput_device *dinput_devices[] = +{ + &mouse_device, + &keyboard_device, + &joystick_linuxinput_device, + &joystick_linux_device +}; +#define NB_DINPUT_DEVICES (sizeof(dinput_devices)/sizeof(dinput_devices[0])) HINSTANCE DINPUT_instance = NULL; @@ -74,29 +76,7 @@ return TRUE; } -/* register a direct draw driver. We better not use malloc for we are in - * the ELF startup initialisation at this point. - */ -void dinput_register_device(dinput_device *device) { - int i; - /* insert according to priority */ - for (i=0;i<nrof_dinput_devices;i++) { - if (dinput_devices[i]->pref <= device->pref) { - memcpy(dinput_devices+i+1,dinput_devices+i,sizeof(dinput_devices[0])*(nr of_dinput_devices-i)); - dinput_devices[i] = device; - break; - } - } - if (i==nrof_dinput_devices) /* not found, or too low priority */ - dinput_devices[nrof_dinput_devices] = device; - - nrof_dinput_devices++; - - /* increase MAX_DDRAW_DRIVERS if the line below triggers */ - assert(nrof_dinput_devices <= MAX_WINE_DINPUT_DEVICES); -} - /*********************************************************************** ******* * DirectInputCreateEx (DINPUT.@) */ @@ -111,10 +91,10 @@ if (IsEqualGUID(&IID_IDirectInputA,riid) || IsEqualGUID(&IID_IDirectInput2A,riid) || IsEqualGUID(&IID_IDirectInput7A,riid)) { - This = (IDirectInputImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl) ); + This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi7avt; This->ref = 1; - This->version = 1; + This->dwVersion = dwVersion; *ppDI = This; return DI_OK; @@ -123,30 +103,30 @@ if (IsEqualGUID(&IID_IDirectInputW,riid) || IsEqualGUID(&IID_IDirectInput2W,riid) || IsEqualGUID(&IID_IDirectInput7W,riid)) { - This = (IDirectInputImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl) ); + This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi7wvt; This->ref = 1; - This->version = 1; + This->dwVersion = dwVersion; *ppDI = This; return DI_OK; } if (IsEqualGUID(&IID_IDirectInput8A,riid)) { - This = (IDirectInputImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl) ); + This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi8avt; This->ref = 1; - This->version = 8; + This->dwVersion = dwVersion; *ppDI = This; return DI_OK; } if (IsEqualGUID(&IID_IDirectInput8W,riid)) { - This = (IDirectInputImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl) ); + This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi8wvt; This->ref = 1; - This->version = 8; + This->dwVersion = dwVersion; *ppDI = This; return DI_OK; @@ -162,17 +142,10 @@ { IDirectInputImpl* This; TRACE("(0x%08lx,%04lx,%p,%p)\n", (DWORD)hinst,dwVersion,ppDI,punkOuter); - - //trace:dinput:DirectInputCreateA (0x00400000,0500,0x42bafc54,(nil)) - This = (IDirectInputImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl) ); + This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi7avt; This->ref = 1; - if (dwVersion > 0x0700) { - This->version = 8; - } else { - /* We do not differientiate between version 1, 2 and 7 */ - This->version = 1; - } + This->dwVersion = dwVersion; *ppDI = (IDirectInputA*)This; return 0; @@ -185,15 +158,10 @@ { IDirectInputImpl* This; TRACE("(0x%08lx,%04lx,%p,%p)\n", (DWORD)hinst,dwVersion,ppDI,punkOuter); - This = (IDirectInputImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl) ); + This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi7wvt; This->ref = 1; - if (dwVersion >= 0x0800) { - This->version = 8; - } else { - /* We do not differientiate between version 1, 2 and 7 */ - This->version = 1; - } + This->dwVersion = dwVersion; *ppDI = (IDirectInputW*)This; return 0; } @@ -248,22 +216,14 @@ TRACE("(this=%p,0x%04lx '%s',%p,%p,%04lx)\n", This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), lpCallback, pvRef, dwFlags); - - if (nrof_dinput_devices==0){ - scan_mouse(); - scan_keyboard(); - } - TRACE(" flags: "); _dump_EnumDevices_dwFlags(dwFlags); TRACE("\n"); - - for (i = 0; i < nrof_dinput_devices; i++) { + for (i = 0; i < NB_DINPUT_DEVICES; i++) { + if (!dinput_devices[i]->enum_deviceA) continue; for (j = 0, r = -1; r != 0; j++) { devInstance.dwSize = sizeof(devInstance); TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); - - - if ((r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->version, j))) { + if ((r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) return 0; } @@ -283,22 +243,17 @@ DIDEVICEINSTANCEW devInstance; int i, j, r; - if (nrof_dinput_devices==0){ - scan_mouse(); - scan_keyboard(); - } - TRACE("(this=%p,0x%04lx '%s',%p,%p,%04lx)\n", This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), lpCallback, pvRef, dwFlags); TRACE(" flags: "); _dump_EnumDevices_dwFlags(dwFlags); TRACE("\n"); - - for (i = 0; i < nrof_dinput_devices; i++) { + for (i = 0; i < NB_DINPUT_DEVICES; i++) { + if (!dinput_devices[i]->enum_deviceW) continue; for (j = 0, r = -1; r != 0; j++) { devInstance.dwSize = sizeof(devInstance); TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); - if ((r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->version, j))) { + if ((r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) return 0; } @@ -365,15 +320,21 @@ int i; TRACE("(this=%p,%s,%p,%p)\n",This,debugstr_guid(rguid),pdev,punk); - - if (nrof_dinput_devices==0){ - scan_mouse(); - scan_keyboard(); + + if (pdev == NULL) { + WARN("invalid pointer: pdev == NULL\n"); + return E_POINTER; } - + + if (rguid == NULL) { + WARN("invalid pointer: rguid == NULL\n"); + return E_POINTER; + } + /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < nrof_dinput_devices; i++) { + for (i = 0; i < NB_DINPUT_DEVICES; i++) { HRESULT ret; + if (!dinput_devices[i]->create_deviceA) continue; if ((ret = dinput_devices[i]->create_deviceA(This, rguid, NULL, pdev)) == DI_OK) return DI_OK; @@ -389,17 +350,13 @@ IDirectInputImpl *This = (IDirectInputImpl *)iface; HRESULT ret_value = DIERR_DEVICENOTREG; int i; - + TRACE("(this=%p,%s,%p,%p)\n",This,debugstr_guid(rguid),pdev,punk); - if (nrof_dinput_devices==0){ - scan_mouse(); - scan_keyboard(); - } - /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < nrof_dinput_devices; i++) { + for (i = 0; i < NB_DINPUT_DEVICES; i++) { HRESULT ret; + if (!dinput_devices[i]->create_deviceW) continue; if ((ret = dinput_devices[i]->create_deviceW(This, rguid, NULL, pdev)) == DI_OK) return DI_OK; @@ -457,14 +414,10 @@ TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter); - if (nrof_dinput_devices==0){ - scan_mouse(); - scan_keyboard(); - } - /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < nrof_dinput_devices; i++) { + for (i = 0; i < NB_DINPUT_DEVICES; i++) { HRESULT ret; + if (!dinput_devices[i]->create_deviceA) continue; if ((ret = dinput_devices[i]->create_deviceA(This, rguid, riid, (LPDIRECTINPUTDEVICEA*) pvOut)) == DI_OK) return DI_OK; @@ -484,16 +437,10 @@ TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter); - if (nrof_dinput_devices==0){ - scan_mouse(); - scan_keyboard(); - } - - - /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < nrof_dinput_devices; i++) { + for (i = 0; i < NB_DINPUT_DEVICES; i++) { HRESULT ret; + if (!dinput_devices[i]->create_deviceW) continue; if ((ret = dinput_devices[i]->create_deviceW(This, rguid, riid, (LPDIRECTINPUTDEVICEW*) pvOut)) == DI_OK) return DI_OK; _____ Modified: trunk/reactos/lib/dinput/dinput_private.h --- trunk/reactos/lib/dinput/dinput_private.h 2005-10-07 22:50:26 UTC (rev 18317) +++ trunk/reactos/lib/dinput/dinput_private.h 2005-10-08 00:21:29 UTC (rev 18318) @@ -35,24 +35,23 @@ /* Used to have an unique sequence number for all the events */ DWORD evsequence; - int version; + DWORD dwVersion; }; /* Function called by all devices that Wine supports */ -typedef struct dinput_device { - INT pref; +struct dinput_device { const char *name; - BOOL (*enum_deviceA)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, int version, int id); - BOOL (*enum_deviceW)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, int version, int id); + BOOL (*enum_deviceA)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id); + BOOL (*enum_deviceW)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id); HRESULT (*create_deviceA)(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEA* pdev); HRESULT (*create_deviceW)(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEW* pdev); -} dinput_device; +}; -extern void dinput_register_device(dinput_device *device); +extern const struct dinput_device mouse_device; +extern const struct dinput_device keyboard_device; +extern const struct dinput_device joystick_linux_device; +extern const struct dinput_device joystick_linuxinput_device; extern HINSTANCE DINPUT_instance; -void scan_keyboard(); -void scan_mouse(); - #endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */ _____ Modified: trunk/reactos/lib/dinput/joystick_linux.c --- trunk/reactos/lib/dinput/joystick_linux.c 2005-10-07 22:50:26 UTC (rev 18317) +++ trunk/reactos/lib/dinput/joystick_linux.c 2005-10-08 00:21:29 UTC (rev 18318) @@ -28,8 +28,6 @@ #include "config.h" #include "wine/port.h" -#ifdef HAVE_LINUX_22_JOYSTICK_API - #include <stdarg.h> #include <stdio.h> #include <string.h> @@ -55,7 +53,6 @@ #ifdef HAVE_LINUX_JOYSTICK_H # include <linux/joystick.h> #endif -#define JOYDEV "/dev/js" #include "wine/debug.h" #include "wine/unicode.h" @@ -70,6 +67,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); +#ifdef HAVE_LINUX_22_JOYSTICK_API + +#define JOYDEV "/dev/js" + typedef struct { LONG lMin; LONG lMax; @@ -147,7 +148,7 @@ } } -static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, int version, int id) +static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { int fd = -1; char dev[32]; @@ -158,8 +159,8 @@ } if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version < 8)) || - (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 8))) { + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { /* check whether we have a joystick */ sprintf(dev, "%s%d", JOYDEV, id); if ((fd = open(dev,O_RDONLY)) < 0) { @@ -172,7 +173,7 @@ lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_Joystick_GUID; /* we only support traditional joysticks for now */ - if (version >= 8) + if (version >= 0x0800) lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); else lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); @@ -195,7 +196,7 @@ return FALSE; } -static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, int version, int id) +static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { int fd = -1; char name[MAX_PATH]; @@ -208,8 +209,8 @@ } if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version < 8)) || - (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 8))) { + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { /* check whether we have a joystick */ sprintf(dev, "%s%d", JOYDEV, id); if ((fd = open(dev,O_RDONLY)) < 0) { @@ -222,7 +223,7 @@ lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_Joystick_GUID; /* we only support traditional joysticks for now */ - if (version >= 8) + if (version >= 0x0800) lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); else lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); @@ -556,7 +557,7 @@ newDevice->devcaps.dwSize = sizeof(newDevice->devcaps); newDevice->devcaps.dwFlags = DIDC_ATTACHED; - if (newDevice->dinput->version >= 8) + if (newDevice->dinput->dwVersion >= 0x0800) newDevice->devcaps.dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); else newDevice->devcaps.dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); @@ -646,8 +647,7 @@ return DIERR_DEVICENOTREG; } -static dinput_device joydev = { - 10, +const struct dinput_device joystick_linux_device = { "Wine Linux joystick driver", joydev_enum_deviceA, joydev_enum_deviceW, @@ -655,10 +655,6 @@ joydev_create_deviceW }; -DECL_GLOBAL_CONSTRUCTOR(joydev_register) { dinput_register_device(&joydev); } - - - /*********************************************************************** ******* * Joystick */ @@ -717,6 +713,16 @@ TRACE("(%p,%p)\n",This,df); + if (df == NULL) { + WARN("invalid pointer\n"); + return E_POINTER; + } + + if (df->dwSize != sizeof(*df)) { + WARN("invalid argument\n"); + return DIERR_INVALIDPARAM; + } + if (This->acquired) { WARN("acquired\n"); return DIERR_ACQUIRED; @@ -1117,6 +1123,11 @@ TRACE("(%p,%s,%p)\n",This,debugstr_guid(rguid),ph); + if (ph == NULL) { + WARN("invalid parameter: ph == NULL\n"); + return DIERR_INVALIDPARAM; + } + if (TRACE_ON(dinput)) _dump_DIPROPHEADER(ph); @@ -1217,11 +1228,17 @@ TRACE("%p->(%p)\n",iface,lpDIDevCaps); if (lpDIDevCaps == NULL) { - WARN("invalid parameter: lpDIDevCaps = NULL\n"); + WARN("invalid pointer\n"); + return E_POINTER; + } + + size = lpDIDevCaps->dwSize; + + if (!(size == sizeof(DIDEVCAPS) || size == sizeof(DIDEVCAPS_DX3))) { + WARN("invalid parameter\n"); return DIERR_INVALIDPARAM; } - size = lpDIDevCaps->dwSize; CopyMemory(lpDIDevCaps, &This->devcaps, size); lpDIDevCaps->dwSize = size; @@ -1559,6 +1576,11 @@ TRACE("(%p,%p)\n", iface, pdidi); + if (pdidi == NULL) { + WARN("invalid pointer\n"); + return E_POINTER; + } + if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3A)) && (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA))) { WARN("invalid parameter: pdidi->dwSize = %ld != %d or %d\n", @@ -1697,4 +1719,14 @@ }; #undef XCAST +#else /* HAVE_LINUX_22_JOYSTICK_API */ + +const struct dinput_device joystick_linux_device = { + "Wine Linux joystick driver", + NULL, + NULL, + NULL, + NULL +}; + #endif /* HAVE_LINUX_22_JOYSTICK_API */ _____ Modified: trunk/reactos/lib/dinput/joystick_linuxinput.c --- trunk/reactos/lib/dinput/joystick_linuxinput.c 2005-10-07 22:50:26 UTC (rev 18317) +++ trunk/reactos/lib/dinput/joystick_linuxinput.c 2005-10-08 00:21:29 UTC (rev 18318) @@ -22,8 +22,6 @@ #include "config.h" #include "wine/port.h" [truncated at 1000 lines; 1452 more skipped]

19 years, 2 months

[greatlrd] 18317: basic NT4 DirectDraw implemet and it is untested

by greatlrd＠svn.reactos.com

basic NT4 DirectDraw implemet and it is untested - NtGdiDdGetBltStatus - NtGdiDdGetFlipStatus - NtGdiDdSetOverlayPosition Write some code for NtGdiDdDestroySurface and NtGdiDdCreateSurface, we got now basic all nt4 api implemet and unstested for directdraw in the kernel Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-10-07 22:20:50 UTC (rev 18316) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-10-07 22:50:26 UTC (rev 18317) @@ -236,7 +236,7 @@ ) { DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; - /* DD_CREATESURFACEDATA surf; */ + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); if (pDirectDraw == NULL) @@ -245,11 +245,8 @@ if (!(pDirectDraw->DD.dwFlags & DDHAL_CB32_CANCREATESURFACE)) ddRVal = DDHAL_DRIVER_NOTHANDLED; else - { - UNIMPLEMENTED; - /* - ddRVal = pDirectDraw->DD.CreateSurface(&surf); - */ + { + ddRVal = pDirectDraw->DD.CreateSurface(puCreateSurfaceData); } GDIOBJ_UnlockObjByPtr(pDirectDraw); @@ -338,9 +335,18 @@ ddRVal = DDHAL_DRIVER_NOTHANDLED; else { - /* DD_DESTROYSURFACEDATA DestroySurf; */ - UNIMPLEMENTED; - /* ddRVal = pDirectDraw->Surf.DestroySurface(DestroySurf); */ + DD_DESTROYSURFACEDATA DestroySurf; + + /* FIXME + * bRealDestroy + * are we doing right ?? + */ + DestroySurf.lpDD = &pDirectDraw->Global; + + DestroySurf.lpDDSurface = hSurface; // ? + DestroySurf.DestroySurface = pDirectDraw->Surf.DestroySurface; + + ddRVal = pDirectDraw->Surf.DestroySurface(&DestroySurf); } GDIOBJ_UnlockObjByPtr(pDirectDraw); @@ -474,7 +480,46 @@ return ddRVal; } +DWORD STDCALL NtGdiDdGetBltStatus( + HANDLE hSurface, + PDD_GETBLTSTATUSDATA puGetBltStatusData +) +{ + DWORD ddRVal; + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_GETBLTSTATUS)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + ddRVal = pDirectDraw->Surf.GetBltStatus(puGetBltStatusData); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; +} + +DWORD STDCALL NtGdiDdGetFlipStatus( + HANDLE hSurface, + PDD_GETFLIPSTATUSDATA puGetFlipStatusData +) +{ + DWORD ddRVal; + + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_GETFLIPSTATUS)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + ddRVal = pDirectDraw->Surf.GetFlipStatus(puGetFlipStatusData); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; +} + DWORD STDCALL NtGdiDdUpdateOverlay( HANDLE hSurfaceDestination, HANDLE hSurfaceSource, @@ -496,8 +541,28 @@ return ddRVal; } +DWORD STDCALL NtGdiDdSetOverlayPosition( + HANDLE hSurfaceSource, + HANDLE hSurfaceDestination, + PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData +) +{ + DWORD ddRVal; + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDestination, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_SETOVERLAYPOSITION)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + ddRVal = pDirectDraw->Surf.SetOverlayPosition(puSetOverlayPositionData); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; +} + + /*********************************************************************** */ /* SURFACE OBJECT */ /*********************************************************************** */ _____ Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c --- trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-10-07 22:20:50 UTC (rev 18316) +++ trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-10-07 22:50:26 UTC (rev 18317) @@ -203,15 +203,7 @@ } -DWORD STDCALL NtGdiDdGetBltStatus( - HANDLE hSurface, - PDD_GETBLTSTATUSDATA puGetBltStatusData -) -{ - UNIMPLEMENTED - return 0; -} HDC STDCALL NtGdiDdGetDC( HANDLE hSurface, @@ -245,15 +237,7 @@ return 0; } -DWORD STDCALL NtGdiDdGetFlipStatus( - HANDLE hSurface, - PDD_GETFLIPSTATUSDATA puGetFlipStatusData -) -{ - UNIMPLEMENTED - return 0; -} DWORD STDCALL NtGdiDdGetInternalMoCompInfo( HANDLE hDirectDraw, @@ -374,16 +358,7 @@ return 0; } -DWORD STDCALL NtGdiDdSetOverlayPosition( - HANDLE hSurfaceSource, - HANDLE hSurfaceDestination, - PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData -) -{ - UNIMPLEMENTED - return 0; -} VOID STDCALL NtGdiDdUnattachSurface( HANDLE hSurface,

19 years, 2 months

[greatlrd] 18316: Fix hotkeys for En.rc by Harteex, thx Tsk to found this bugs

by greatlrd＠svn.reactos.com

Fix hotkeys for En.rc by Harteex, thx Tsk to found this bugs Modified: trunk/reactos/lib/cpl/access/En.rc _____ Modified: trunk/reactos/lib/cpl/access/En.rc --- trunk/reactos/lib/cpl/access/En.rc 2005-10-07 21:48:12 UTC (rev 18315) +++ trunk/reactos/lib/cpl/access/En.rc 2005-10-07 22:20:50 UTC (rev 18316) @@ -10,17 +10,17 @@ BEGIN GROUPBOX "StickyKeys",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING LTEXT "Use StickyKeys if you want to use Shift, Ctrl, or Alt key by pressing one key at at time.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*P ROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - CHECKBOX "Use StickyKeys",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPS HEETPADDING),14 + CHECKBOX "&Use StickyKeys",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPS HEETPADDING),14 PUSHBUTTON "&Settings",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(5)+2,(15*PROPSHEETPADDING),14 GROUPBOX "FilterKeys",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSH EETPADDING),LABELLINE(7)+2 LTEXT "Use FilterKeys if you want Reactos to ignore brief or repeated keystrokes, or slow the repeat rate.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - CHECKBOX "Use FilterKeys",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROP SHEETPADDING),14 - PUSHBUTTON "&Settings",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(13)+2,(15*PROPSHEETPADDING),14 + CHECKBOX "Use &FilterKeys",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PRO PSHEETPADDING),14 + PUSHBUTTON "S&ettings",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(13)+2,(15*PROPSHEETPADDING),14 GROUPBOX "ToggleKeys",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPS HEETPADDING),LABELLINE(6)+PROPSHEETPADDING - LTEXT "Use ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + LTEXT "Use &ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) CHECKBOX "Use ToggleKeys",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEE TWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) - PUSHBUTTON "&Settings",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(20)+2,(15*PROPSHEETPADDING),14 -// CHECKBOX "Show extra keyboard help in programs",IDC_KEYBOARD_EXTRA + PUSHBUTTON "Setti&ngs",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(20)+2,(15*PROPSHEETPADDING),14 +// CHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA END

19 years, 2 months

[greatlrd] 18315: Fix release build uninitialized

by greatlrd＠svn.reactos.com

Fix release build uninitialized Implemet NtGdiDdAddAttachedSurface untested Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-10-07 21:30:33 UTC (rev 18314) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-10-07 21:48:12 UTC (rev 18315) @@ -328,7 +328,7 @@ BOOL bRealDestroy ) { - DWORD ddRVal; + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); if (pDirectDraw == NULL) @@ -391,10 +391,9 @@ return ddRVal; } - -DWORD STDCALL NtGdiDdSetColorKey( +DWORD STDCALL NtGdiDdUnlock( HANDLE hSurface, - PDD_SETCOLORKEYDATA puSetColorKeyData + PDD_UNLOCKDATA puUnlockData ) { DWORD ddRVal; @@ -403,13 +402,13 @@ if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; - if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_SETCOLORKEY)) + if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_UNLOCK)) ddRVal = DDHAL_DRIVER_NOTHANDLED; else - ddRVal = pDirectDraw->Surf.SetColorKey(puSetColorKeyData); + ddRVal = pDirectDraw->Surf.Unlock(puUnlockData); - GDIOBJ_UnlockObjByPtr(pDirectDraw); - return ddRVal; + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; } DWORD STDCALL NtGdiDdBlt( @@ -430,52 +429,75 @@ ddRVal = pDirectDraw->Surf.Blt(puBltData); GDIOBJ_UnlockObjByPtr(pDirectDraw); - return ddRVal; } -DWORD STDCALL NtGdiDdUpdateOverlay( - HANDLE hSurfaceDestination, - HANDLE hSurfaceSource, - PDD_UPDATEOVERLAYDATA puUpdateOverlayData +DWORD STDCALL NtGdiDdSetColorKey( + HANDLE hSurface, + PDD_SETCOLORKEYDATA puSetColorKeyData ) { DWORD ddRVal; - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDestination, GDI_OBJECT_TYPE_DIRECTDRAW); + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; - if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY)) + if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_SETCOLORKEY)) ddRVal = DDHAL_DRIVER_NOTHANDLED; else - ddRVal = pDirectDraw->Surf.UpdateOverlay(puUpdateOverlayData); + ddRVal = pDirectDraw->Surf.SetColorKey(puSetColorKeyData); GDIOBJ_UnlockObjByPtr(pDirectDraw); - return ddRVal; + return ddRVal; } -DWORD STDCALL NtGdiDdUnlock( + +DWORD STDCALL NtGdiDdAddAttachedSurface( HANDLE hSurface, - PDD_UNLOCKDATA puUnlockData + HANDLE hSurfaceAttached, + PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData ) { DWORD ddRVal; - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceAttached, GDI_OBJECT_TYPE_DIRECTDRAW); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; + if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_ADDATTACHEDSURFACE)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + ddRVal = pDirectDraw->Surf.AddAttachedSurface(puAddAttachedSurfaceData); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; +} + + +DWORD STDCALL NtGdiDdUpdateOverlay( + HANDLE hSurfaceDestination, + HANDLE hSurfaceSource, + PDD_UPDATEOVERLAYDATA puUpdateOverlayData +) +{ + DWORD ddRVal; + + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDestination, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY)) ddRVal = DDHAL_DRIVER_NOTHANDLED; else - ddRVal = pDirectDraw->Surf.Unlock(puUnlockData); + ddRVal = pDirectDraw->Surf.UpdateOverlay(puUpdateOverlayData); - GDIOBJ_UnlockObjByPtr(pDirectDraw); - return ddRVal; + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; } + /*********************************************************************** */ /* SURFACE OBJECT */ /*********************************************************************** */ _____ Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c --- trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-10-07 21:30:33 UTC (rev 18314) +++ trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-10-07 21:48:12 UTC (rev 18315) @@ -69,16 +69,7 @@ return 0; } -DWORD STDCALL NtGdiDdAddAttachedSurface( - HANDLE hSurface, - HANDLE hSurfaceAttached, - PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData -) -{ - UNIMPLEMENTED - return 0; -}

19 years, 2 months

[greatlrd] 18314: make ddraw compile again

by greatlrd＠svn.reactos.com

make ddraw compile again Modified: trunk/reactos/w32api/include/ddk/ddrawint.h _____ Modified: trunk/reactos/w32api/include/ddk/ddrawint.h --- trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-07 20:27:52 UTC (rev 18313) +++ trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-07 21:30:33 UTC (rev 18314) @@ -480,6 +480,8 @@ typedef DWORD (STDCALL *PDD_MAPMEMORY)(PDD_MAPMEMORYDATA); +typedef struct _DD_DESTROYDRIVERDATA *PDD_DESTROYDRIVERDATA; +typedef struct _DD_SETMODEDATA *PDD_SETMODEDATA; typedef DWORD (APIENTRY *PDD_DESTROYDRIVER)(PDD_DESTROYDRIVERDATA); typedef DWORD (APIENTRY *PDD_SETMODE)(PDD_SETMODEDATA);

19 years, 2 months

[greatlrd] 18313: Remove more stub from ntdraw and implement it, (untested) it is alot of stub that have been implemet. fill DD_CALLBACKS right in NtGdiDdCreateDirectDrawObject, and fix party the internal struct.

by greatlrd＠svn.reactos.com

Remove more stub from ntdraw and implement it, (untested) it is alot of stub that have been implemet. fill DD_CALLBACKS right in NtGdiDdCreateDirectDrawObject, and fix party the internal struct. implemet follow but not tested - NtGdiDdCreateSurface, NtGdiDdDestroySurface some part it need fill the info right before it call on DdCreateSurface - NtGdiDdFlip done - NtGdiDdGetScanLine done - NtGdiDdSetColorKey done - NtGdiDdUnlock done - NtGdiDdUpdateOverlay done - NtGdiDdSetExclusiveMode done (need setup the callback) - NtGdiDdLock done Modified: trunk/reactos/subsys/win32k/include/intddraw.h Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c _____ Modified: trunk/reactos/subsys/win32k/include/intddraw.h --- trunk/reactos/subsys/win32k/include/intddraw.h 2005-10-07 20:15:10 UTC (rev 18312) +++ trunk/reactos/subsys/win32k/include/intddraw.h 2005-10-07 20:27:52 UTC (rev 18313) @@ -8,6 +8,7 @@ #define GDI_OBJECT_TYPE_DD_CLIPPER 0x00640000 #define GDI_OBJECT_TYPE_DD_MOTIONCOMP 0x00650000 + typedef struct { DD_SURFACE_LOCAL Local; @@ -22,38 +23,62 @@ { DD_DIRECTDRAW_LOCAL Local; DD_DIRECTDRAW_GLOBAL Global; - // Drv callbacks - PGD_GETDIRECTDRAWINFO DrvGetDirectDrawInfo; - PGD_DISABLEDIRECTDRAW DrvDisableDirectDraw; + // Drv callbacks + PGD_GETDIRECTDRAWINFO DrvGetDirectDrawInfo; + PGD_DISABLEDIRECTDRAW DrvDisableDirectDraw; + PDD_GETDRIVERINFO DdGetDriverInfo; + // DD callbacks - PDD_CREATESURFACE DdCreateSurface; - PDD_SETCOLORKEY DdDrvSetColorKey; // ????? - PDD_WAITFORVERTICALBLANK DdWaitForVerticalBlank; - PDD_CANCREATESURFACE DdCanCreateSurface; - PDD_CREATEPALETTE DdCreatePalette; - PDD_GETSCANLINE DdGetScanLine; - PDD_MAPMEMORY DdMapMemory; + DD_CALLBACKS DD; + // Surface callbacks - PDD_SURFCB_DESTROYSURFACE DdDestroySurface; - PDD_SURFCB_FLIP DdFlip; - PDD_SURFCB_SETCLIPLIST DdSetClipList; - PDD_SURFCB_LOCK DdLock; - PDD_SURFCB_UNLOCK DdUnlock; - PDD_SURFCB_BLT DdBlt; - PDD_SURFCB_SETCOLORKEY DdSetColorKey; - PDD_SURFCB_ADDATTACHEDSURFACE DdAddAttachedSurface; - PDD_SURFCB_GETBLTSTATUS DdGetBltStatus; - PDD_SURFCB_GETFLIPSTATUS DdGetFlipStatus; - PDD_SURFCB_UPDATEOVERLAY DdUpdateOverlay; - PDD_SURFCB_SETOVERLAYPOSITION DdSetOverlayPosition; - PDD_SURFCB_SETPALETTE DdSetPalette; - // Miscellaneous Callback Function - PDD_GETAVAILDRIVERMEMORY DdGetAvailDriverMemory; - // NT callbacks - DD_FREEDRIVERMEMORYDATA DdFreeDriverMemory; + DD_SURFACECALLBACKS Surf; + // Palette callbacks - PDD_PALCB_DESTROYPALETTE DdDestroyPalette; - PDD_PALCB_SETENTRIES DdSetEntries; + DD_PALETTECALLBACKS Pal; + + // Color Control Callback + PDD_COLORCB_COLORCONTROL DdControlColor; + // Miscellaneous Callback + PDD_GETAVAILDRIVERMEMORY DdGetAvailDriverMemory; + // Kernel Callback + PDD_KERNELCB_SYNCSURFACE DdSyncSurfaceData; + PDD_KERNELCB_SYNCVIDEOPORT DdSyncVideoPortData; + // NT-based Callback + PDD_FLIPTOGDISURFACE DdFlipToGDISurface; + PDD_FREEDRIVERMEMORY DdFreeDriverMemory; + PDD_SETEXCLUSIVEMODE DdSetExclusiveMode; + // Motion Compensation + PDD_MOCOMPCB_BEGINFRAME DdMoCompBeginFrame; + PDD_MOCOMPCB_CREATE DdMoCompCreate; + PDD_MOCOMPCB_DESTROY DdMoCompDestroy; + PDD_MOCOMPCB_ENDFRAME DdMoCompEndFrame; + PDD_MOCOMPCB_GETCOMPBUFFINFO DdMoCompGetBuffInfo; + PDD_MOCOMPCB_GETFORMATS DdMoCompGetFormats; + PDD_MOCOMPCB_GETGUIDS DdMoCompGetGuids; + PDD_MOCOMPCB_GETINTERNALINFO DdMoCompGetInternalInfo; + PDD_MOCOMPCB_QUERYSTATUS DdMoCompQueryStatus; + PDD_MOCOMPCB_RENDER DdMoCompRender; + // Video Port Callback + PDD_VPORTCB_CANCREATEVIDEOPORT DdVideoPortCanCreate; + PDD_VPORTCB_COLORCONTROL DdVideoPortColorControl; + PDD_VPORTCB_CREATEVIDEOPORT DdVideoPortCreate; + PDD_VPORTCB_DESTROYVPORT DdVideoPortDestroy; + PDD_VPORTCB_FLIP DdVideoPortFlip; + PDD_VPORTCB_GETBANDWIDTH DdVideoPortGetBandwidth; + PDD_VPORTCB_GETVPORTCONNECT DdVideoPortGetConnectInfo; + PDD_VPORTCB_GETFIELD DdVideoPortGetField; + PDD_VPORTCB_GETFLIPSTATUS DdVideoPortGetFlipStatus; + PDD_VPORTCB_GETINPUTFORMATS DdVideoPortGetInputFormats; + PDD_VPORTCB_GETLINE DdVideoPortGetLine; + PDD_VPORTCB_GETOUTPUTFORMATS DdVideoPortGetOutputFormats; + PDD_VPORTCB_GETSIGNALSTATUS DdVideoPortGetSignalStatus; + PDD_VPORTCB_UPDATE DdVideoPortUpdate; + PDD_VPORTCB_WAITFORSYNC DdVideoPortWaitForSync; + // Notify Callback + //LPDD_NOTIFYCALLBACK NotifyCallback + + // D3D Device context callbacks PD3DNTHAL_CONTEXTCREATECB D3dContextCreate; PD3DNTHAL_CONTEXTDESTROYCB D3dContextDestroy; @@ -63,6 +88,9 @@ PDD_SURFCB_DESTROYSURFACE DdDestroyD3DBuffer; PDD_SURFCB_LOCK DdLockD3DBuffer; PDD_SURFCB_UNLOCK DdUnlockD3DBuffer; + + + } DD_DIRECTDRAW, *PDD_DIRECTDRAW; BOOL INTERNAL_CALL DD_Cleanup(PVOID pDD); _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-10-07 20:15:10 UTC (rev 18312) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-10-07 20:27:52 UTC (rev 18313) @@ -83,53 +83,67 @@ pDirectDraw->DrvGetDirectDrawInfo = pDC->DriverFunctions.GetDirectDrawInfo; pDirectDraw->DrvDisableDirectDraw = pDC->DriverFunctions.DisableDirectDraw; - + + /* DD_CALLBACKS setup */ + pDirectDraw->DD.dwFlags = callbacks.dwFlags; + + /* DestroyDriver Unsuse in win2k or higher */ + if (callbacks.dwFlags & DDHAL_CB32_DESTROYDRIVER) + pDirectDraw->DD.DestroyDriver = callbacks.DestroyDriver; if (callbacks.dwFlags & DDHAL_CB32_CREATESURFACE) - pDirectDraw->DdCreateSurface = callbacks.CreateSurface; + pDirectDraw->DD.CreateSurface = callbacks.CreateSurface; if (callbacks.dwFlags & DDHAL_CB32_SETCOLORKEY) - pDirectDraw->DdDrvSetColorKey = callbacks.SetColorKey; + pDirectDraw->DD.SetColorKey = callbacks.SetColorKey; + if (callbacks.dwFlags & DDHAL_CB32_SETMODE) + pDirectDraw->DD.SetMode = callbacks.SetMode; if (callbacks.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) - pDirectDraw->DdWaitForVerticalBlank = callbacks.WaitForVerticalBlank; + pDirectDraw->DD.WaitForVerticalBlank = callbacks.WaitForVerticalBlank; if (callbacks.dwFlags & DDHAL_CB32_CANCREATESURFACE) - pDirectDraw->DdCanCreateSurface = callbacks.CanCreateSurface; + pDirectDraw->DD.CanCreateSurface = callbacks.CanCreateSurface; if (callbacks.dwFlags & DDHAL_CB32_CREATEPALETTE) - pDirectDraw->DdCreatePalette = callbacks.CreatePalette; + pDirectDraw->DD.CreatePalette = callbacks.CreatePalette; if (callbacks.dwFlags & DDHAL_CB32_GETSCANLINE) - pDirectDraw->DdGetScanLine = callbacks.GetScanLine; + pDirectDraw->DD.GetScanLine = callbacks.GetScanLine; if (callbacks.dwFlags & DDHAL_CB32_MAPMEMORY) - pDirectDraw->DdMapMemory = callbacks.MapMemory; + pDirectDraw->DD.MapMemory = callbacks.MapMemory; + /* Surface Callbacks */ + pDirectDraw->Surf.dwFlags = surface_callbacks.dwFlags; + if (surface_callbacks.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE) - pDirectDraw->DdDestroySurface = surface_callbacks.DestroySurface; + pDirectDraw->Surf.DestroySurface = surface_callbacks.DestroySurface; if (surface_callbacks.dwFlags & DDHAL_SURFCB32_FLIP) - pDirectDraw->DdFlip = surface_callbacks.Flip; + pDirectDraw->Surf.Flip = surface_callbacks.Flip; if (surface_callbacks.dwFlags & DDHAL_SURFCB32_SETCLIPLIST) - pDirectDraw->DdSetClipList = surface_callbacks.SetClipList; + pDirectDraw->Surf.SetClipList = surface_callbacks.SetClipList; if (surface_callbacks.dwFlags & DDHAL_SURFCB32_LOCK) - pDirectDraw->DdLock = surface_callbacks.Lock; + pDirectDraw->Surf.Lock = surface_callbacks.Lock; if (surface_callbacks.dwFlags & DDHAL_SURFCB32_UNLOCK) - pDirectDraw->DdUnlock = surface_callbacks.Unlock; + pDirectDraw->Surf.Unlock = surface_callbacks.Unlock; if (surface_callbacks.dwFlags & DDHAL_SURFCB32_BLT) - pDirectDraw->DdBlt = surface_callbacks.Blt; + pDirectDraw->Surf.Blt = surface_callbacks.Blt; + /* DD Callbacks SetColorKey is same as Surface callback SetColorKey */ if (surface_callbacks.dwFlags & DDHAL_SURFCB32_SETCOLORKEY) - pDirectDraw->DdSetColorKey = surface_callbacks.SetColorKey; + pDirectDraw->Surf.SetColorKey = surface_callbacks.SetColorKey; if (surface_callbacks.dwFlags & DDHAL_SURFCB32_ADDATTACHEDSURFACE) - pDirectDraw->DdAddAttachedSurface = surface_callbacks.AddAttachedSurface; + pDirectDraw->Surf.AddAttachedSurface = surface_callbacks.AddAttachedSurface; if (surface_callbacks.dwFlags & DDHAL_SURFCB32_GETBLTSTATUS) - pDirectDraw->DdGetBltStatus = surface_callbacks.GetBltStatus; + pDirectDraw->Surf.GetBltStatus = surface_callbacks.GetBltStatus; if (surface_callbacks.dwFlags & DDHAL_SURFCB32_GETFLIPSTATUS) - pDirectDraw->DdGetFlipStatus = surface_callbacks.GetFlipStatus; + pDirectDraw->Surf.GetFlipStatus = surface_callbacks.GetFlipStatus; if (surface_callbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY) - pDirectDraw->DdUpdateOverlay = surface_callbacks.UpdateOverlay; + pDirectDraw->Surf.UpdateOverlay = surface_callbacks.UpdateOverlay; if (surface_callbacks.dwFlags & DDHAL_SURFCB32_SETOVERLAYPOSITION) - pDirectDraw->DdSetOverlayPosition = surface_callbacks.SetOverlayPosition; + pDirectDraw->Surf.SetOverlayPosition = surface_callbacks.SetOverlayPosition; if (surface_callbacks.dwFlags & DDHAL_SURFCB32_SETPALETTE) - pDirectDraw->DdSetPalette = surface_callbacks.SetPalette; - + pDirectDraw->Surf.SetPalette = surface_callbacks.SetPalette; + + /* Palette Callbacks */ + pDirectDraw->Pal.dwFlags = palette_callbacks.dwFlags; if (palette_callbacks.dwFlags & DDHAL_PALCB32_DESTROYPALETTE) - pDirectDraw->DdDestroyPalette = palette_callbacks.DestroyPalette; + pDirectDraw->Pal.DestroyPalette = palette_callbacks.DestroyPalette; if (palette_callbacks.dwFlags & DDHAL_PALCB32_SETENTRIES) - pDirectDraw->DdSetEntries = palette_callbacks.SetEntries; + pDirectDraw->Pal.SetEntries = palette_callbacks.SetEntries; GDIOBJ_UnlockObjByPtr(pDirectDraw); DC_UnlockDc(pDC); @@ -204,7 +218,265 @@ return TRUE; } + /*********************************************************************** */ +/* DD CALLBACKS */ +/* FIXME NtGdiDdCreateSurface we do not call to ddCreateSurface */ +/********************************************************************** **/ + +DWORD STDCALL NtGdiDdCreateSurface( + HANDLE hDirectDrawLocal, + HANDLE *hSurface, + DDSURFACEDESC *puSurfaceDescription, + DD_SURFACE_GLOBAL *puSurfaceGlobalData, + DD_SURFACE_LOCAL *puSurfaceLocalData, + DD_SURFACE_MORE *puSurfaceMoreData, + PDD_CREATESURFACEDATA puCreateSurfaceData, + HANDLE *puhSurface +) +{ + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; + /* DD_CREATESURFACEDATA surf; */ + + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (!(pDirectDraw->DD.dwFlags & DDHAL_CB32_CANCREATESURFACE)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + { + UNIMPLEMENTED; + /* + ddRVal = pDirectDraw->DD.CreateSurface(&surf); + */ + } + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; +} + +DWORD STDCALL NtGdiDdWaitForVerticalBlank( + HANDLE hDirectDrawLocal, + PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData +) +{ + DWORD ddRVal; + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (!(pDirectDraw->DD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + ddRVal = pDirectDraw->DD.WaitForVerticalBlank(puWaitForVerticalBlankData); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; +} + +DWORD STDCALL NtGdiDdCanCreateSurface( + HANDLE hDirectDrawLocal, + PDD_CANCREATESURFACEDATA puCanCreateSurfaceData +) +{ + DWORD ddRVal; + + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (!(pDirectDraw->DD.dwFlags & DDHAL_CB32_CANCREATESURFACE)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + ddRVal = pDirectDraw->DD.CanCreateSurface(puCanCreateSurfaceData); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; +} + +DWORD STDCALL NtGdiDdGetScanLine( + HANDLE hDirectDrawLocal, + PDD_GETSCANLINEDATA puGetScanLineData +) +{ + DWORD ddRVal; + + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (!(pDirectDraw->DD.dwFlags & DDHAL_CB32_GETSCANLINE)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + ddRVal = pDirectDraw->DD.GetScanLine(puGetScanLineData); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; +} + + + +/********************************************************************** **/ +/* Surface CALLBACKS */ +/* FIXME */ +/* NtGdiDdDestroySurface */ +/********************************************************************** **/ + +DWORD STDCALL NtGdiDdDestroySurface( + HANDLE hSurface, + BOOL bRealDestroy +) +{ + DWORD ddRVal; + + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + { + /* DD_DESTROYSURFACEDATA DestroySurf; */ + UNIMPLEMENTED; + /* ddRVal = pDirectDraw->Surf.DestroySurface(DestroySurf); */ + } + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; +} + +DWORD STDCALL NtGdiDdFlip( + HANDLE hSurfaceCurrent, + HANDLE hSurfaceTarget, + HANDLE hSurfaceCurrentLeft, + HANDLE hSurfaceTargetLeft, + PDD_FLIPDATA puFlipData +) +{ + DWORD ddRVal; + + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceTarget, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_FLIP)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + ddRVal = pDirectDraw->Surf.Flip(puFlipData); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; +} + +DWORD STDCALL NtGdiDdLock( + HANDLE hSurface, + PDD_LOCKDATA puLockData, + HDC hdcClip +) +{ + DWORD ddRVal; + + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_LOCK)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + ddRVal = pDirectDraw->Surf.Lock(puLockData); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; +} + + +DWORD STDCALL NtGdiDdSetColorKey( + HANDLE hSurface, + PDD_SETCOLORKEYDATA puSetColorKeyData +) +{ + DWORD ddRVal; + + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_SETCOLORKEY)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + ddRVal = pDirectDraw->Surf.SetColorKey(puSetColorKeyData); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; +} + +DWORD STDCALL NtGdiDdBlt( + HANDLE hSurfaceDest, + HANDLE hSurfaceSrc, + PDD_BLTDATA puBltData +) +{ + DWORD ddRVal; + + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDest, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_BLT)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + ddRVal = pDirectDraw->Surf.Blt(puBltData); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + + return ddRVal; + } + +DWORD STDCALL NtGdiDdUpdateOverlay( + HANDLE hSurfaceDestination, + HANDLE hSurfaceSource, + PDD_UPDATEOVERLAYDATA puUpdateOverlayData +) +{ + DWORD ddRVal; + + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDestination, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + ddRVal = pDirectDraw->Surf.UpdateOverlay(puUpdateOverlayData); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; +} + +DWORD STDCALL NtGdiDdUnlock( + HANDLE hSurface, + PDD_UNLOCKDATA puUnlockData +) +{ + DWORD ddRVal; + + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + ddRVal = pDirectDraw->Surf.Unlock(puUnlockData); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + return ddRVal; +} + + +/********************************************************************** **/ /* SURFACE OBJECT */ /*********************************************************************** */ @@ -260,6 +532,13 @@ return GDIOBJ_FreeObj(hSurface, GDI_OBJECT_TYPE_DD_SURFACE); } + + +/********************************************************************** **/ +/* DIRECT DRAW SURFACR END */ +/********************************************************************** **/ + + /* BOOL STDCALL NtGdiDdAttachSurface( HANDLE hSurfaceFrom, @@ -294,18 +573,12 @@ PDD_GETDRIVERINFODATA puGetDriverInfoData) { - DWORD pdwNumHeaps; - VIDEOMEMORY *pvmList = NULL; - DWORD pdwNumFourCC; - DWORD *pdwFourCC = NULL; DWORD ddRVal; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - ddRVal = pDirectDraw->DrvGetDirectDrawInfo( - pDirectDraw->Global.dhpdev,(PDD_HALINFO) puGetDriverInfoData, - &pdwNumHeaps, pvmList, &pdwNumFourCC, pdwFourCC); - + ddRVal = pDirectDraw->DdGetDriverInfo(puGetDriverInfoData); + GDIOBJ_UnlockObjByPtr(pDirectDraw); return ddRVal; @@ -313,33 +586,26 @@ -DWORD STDCALL NtGdiDdWaitForVerticalBlank( - HANDLE hDirectDrawLocal, - PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData -) -{ - DWORD ddRVal; - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - - ddRVal = pDirectDraw->DdWaitForVerticalBlank(puWaitForVerticalBlankData); - GDIOBJ_UnlockObjByPtr(pDirectDraw); - return ddRVal; -} -DWORD STDCALL NtGdiDdCanCreateSurface( + + + + + +DWORD STDCALL NtGdiDdGetAvailDriverMemory( HANDLE hDirectDrawLocal, - PDD_CANCREATESURFACEDATA puCanCreateSurfaceData + PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData ) { DWORD ddRVal; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - ddRVal = pDirectDraw->DdCanCreateSurface(puCanCreateSurfaceData); - + ddRVal = pDirectDraw->DdGetAvailDriverMemory(puGetAvailDriverMemoryData); + GDIOBJ_UnlockObjByPtr(pDirectDraw); return ddRVal; @@ -347,48 +613,21 @@ -DWORD STDCALL NtGdiDdBlt( - HANDLE hSurfaceDest, - HANDLE hSurfaceSrc, - PDD_BLTDATA puBltData -) -{ - DWORD ddRVal; - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDest, GDI_OBJECT_TYPE_DIRECTDRAW); - - puBltData->lpDDDestSurface = hSurfaceDest; - puBltData->lpDDSrcSurface = hSurfaceSrc; - puBltData->lpDD = pDirectDraw->Local.lpGbl; - - ddRVal = pDirectDraw->DdBlt(puBltData); - - GDIOBJ_UnlockObjByPtr(pDirectDraw); - - return ddRVal; -} - - /* FIXME - this call is not implement yet - where to get the pointer DdGetAvailDriverMemory(puGetAvailDriverMemoryData - for the call in NtGdiDdCreateDirectDrawObject `?? - or some where else ?? - */ - -DWORD STDCALL NtGdiDdGetAvailDriverMemory( - HANDLE hDirectDrawLocal, - PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData +DWORD STDCALL NtGdiDdSetExclusiveMode( + HANDLE hDirectDraw, + PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData ) { DWORD ddRVal; - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDraw, GDI_OBJECT_TYPE_DIRECTDRAW); - ddRVal = pDirectDraw->DdGetAvailDriverMemory(puGetAvailDriverMemoryData); - - GDIOBJ_UnlockObjByPtr(pDirectDraw); + ddRVal = pDirectDraw->DdSetExclusiveMode(puSetExclusiveModeData); - return ddRVal; + GDIOBJ_UnlockObjByPtr(pDirectDraw); + + return ddRVal; } _____ Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c --- trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-10-07 20:15:10 UTC (rev 18312) +++ trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-10-07 20:27:52 UTC (rev 18313) @@ -141,16 +141,7 @@ return 0; } -/* -HANDLE STDCALL NtGdiDdCreateDirectDrawObject( - HDC hdc -) -{ - UNIMPLEMENTED - return 0; -} -*/ HANDLE STDCALL NtGdiDdCreateMoComp( HANDLE hDirectDraw, @@ -162,21 +153,7 @@ return 0; } -DWORD STDCALL NtGdiDdCreateSurface( - HANDLE hDirectDraw, - HANDLE *hSurface, - DDSURFACEDESC *puSurfaceDescription, - DD_SURFACE_GLOBAL *puSurfaceGlobalData, - DD_SURFACE_LOCAL *puSurfaceLocalData, - DD_SURFACE_MORE *puSurfaceMoreData, - PDD_CREATESURFACEDATA puCreateSurfaceData, - HANDLE *puhSurface -) -{ - UNIMPLEMENTED - return 0; -} DWORD STDCALL NtGdiDdCreateSurfaceEx( HANDLE hDirectDraw, @@ -189,40 +166,8 @@ return 0; } -/* -HANDLE STDCALL NtGdiDdCreateSurfaceObject( - HANDLE hDirectDrawLocal, - HANDLE hSurface, - PDD_SURFACE_LOCAL puSurfaceLocal, - PDD_SURFACE_MORE puSurfaceMore, - PDD_SURFACE_GLOBAL puSurfaceGlobal, - BOOL bComplete -) -{ - UNIMPLEMENTED - return 0; -} -BOOL STDCALL NtGdiDdDeleteDirectDrawObject( - HANDLE hDirectDrawLocal -) -{ - UNIMPLEMENTED - - return 0; -} - -BOOL STDCALL NtGdiDdDeleteSurfaceObject( - HANDLE hSurface -) -{ - UNIMPLEMENTED - - return 0; -} -*/ - DWORD STDCALL NtGdiDdDestroyD3DBuffer( HANDLE hSurface ) @@ -242,15 +187,7 @@ return 0; } -DWORD STDCALL NtGdiDdDestroySurface( - HANDLE hSurface, - BOOL bRealDestroy -) -{ - UNIMPLEMENTED - return 0; -} DWORD STDCALL NtGdiDdEndMoCompFrame( HANDLE hMoComp, @@ -262,18 +199,7 @@ return 0; } -DWORD STDCALL NtGdiDdFlip( - HANDLE hSurfaceCurrent, - HANDLE hSurfaceTarget, - HANDLE hSurfaceCurrentLeft, - HANDLE hSurfaceTargetLeft, - PDD_FLIPDATA puFlipData -) -{ - UNIMPLEMENTED - return 0; -} DWORD STDCALL NtGdiDdFlipToGDISurface( HANDLE hDirectDraw, @@ -378,26 +304,9 @@ return 0; } -DWORD STDCALL NtGdiDdGetScanLine( - HANDLE hDirectDraw, - PDD_GETSCANLINEDATA puGetScanLineData -) -{ - UNIMPLEMENTED - return 0; -} -DWORD STDCALL NtGdiDdLock( - HANDLE hSurface, - PDD_LOCKDATA puLockData, - HDC hdcClip -) -{ - UNIMPLEMENTED - return 0; -} DWORD STDCALL NtGdiDdLockD3D( HANDLE hSurface, @@ -459,25 +368,9 @@ return 0; } -DWORD STDCALL NtGdiDdSetColorKey( - HANDLE hSurface, - PDD_SETCOLORKEYDATA puSetColorKeyData -) -{ - UNIMPLEMENTED - return 0; -} -DWORD STDCALL NtGdiDdSetExclusiveMode( - HANDLE hDirectDraw, - PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData -) -{ - UNIMPLEMENTED - return 0; -} BOOL STDCALL NtGdiDdSetGammaRamp( HANDLE hDirectDraw, @@ -509,15 +402,7 @@ UNIMPLEMENTED } -DWORD STDCALL NtGdiDdUnlock( - HANDLE hSurface, - PDD_UNLOCKDATA puUnlockData -) -{ - UNIMPLEMENTED - return 0; -} DWORD STDCALL NtGdiDdUnlockD3D( HANDLE hSurface, @@ -529,16 +414,7 @@ return 0; } -DWORD STDCALL NtGdiDdUpdateOverlay( - HANDLE hSurfaceDestination, - HANDLE hSurfaceSource, - PDD_UPDATEOVERLAYDATA puUpdateOverlayData -) -{ - UNIMPLEMENTED - return 0; -} DWORD STDCALL NtGdiDdAlphaBlt(VOID)

19 years, 2 months

[greatlrd] 18312: Updating ddrawint.h header with some new struct and right info.

by greatlrd＠svn.reactos.com

Updating ddrawint.h header with some new struct and right info. Modified: trunk/reactos/w32api/include/ddk/ddrawint.h _____ Modified: trunk/reactos/w32api/include/ddk/ddrawint.h --- trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-07 19:16:14 UTC (rev 18311) +++ trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-07 20:15:10 UTC (rev 18312) @@ -31,6 +31,10 @@ typedef struct _DDVIDEOPORTINFO *LPDDVIDEOPORTINFO; /* should be in dvp.h */ typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL; /* should be defined here once we have dvp.h */ + + + + /*********************************************************************** */ /* Video memory info structures */ /*********************************************************************** */ @@ -475,32 +479,38 @@ } DD_MAPMEMORYDATA, *PDD_MAPMEMORYDATA; typedef DWORD (STDCALL *PDD_MAPMEMORY)(PDD_MAPMEMORYDATA); -typedef struct + + +typedef DWORD (APIENTRY *PDD_DESTROYDRIVER)(PDD_DESTROYDRIVERDATA); +typedef DWORD (APIENTRY *PDD_SETMODE)(PDD_SETMODEDATA); + +typedef struct DD_CALLBACKS { - DWORD dwSize; - DWORD dwFlags; - PVOID Reserved1; - PDD_CREATESURFACE CreateSurface; - PDD_SETCOLORKEY SetColorKey; - PVOID Reserved2; - PDD_WAITFORVERTICALBLANK WaitForVerticalBlank; - PDD_CANCREATESURFACE CanCreateSurface; - PDD_CREATEPALETTE CreatePalette; - PDD_GETSCANLINE GetScanLine; - PDD_MAPMEMORY MapMemory; + DWORD dwSize; + DWORD dwFlags; + PDD_DESTROYDRIVER DestroyDriver; + PDD_CREATESURFACE CreateSurface; + PDD_SETCOLORKEY SetColorKey; + PDD_SETMODE SetMode; + PDD_WAITFORVERTICALBLANK WaitForVerticalBlank; + PDD_CANCREATESURFACE CanCreateSurface; + PDD_CREATEPALETTE CreatePalette; + PDD_GETSCANLINE GetScanLine; + PDD_MAPMEMORY MapMemory; } DD_CALLBACKS, *PDD_CALLBACKS; -enum -{ - DDHAL_CB32_CREATESURFACE = 1<<1, - DDHAL_CB32_SETCOLORKEY = 1<<2, - DDHAL_CB32_WAITFORVERTICALBLANK = 1<<4, - DDHAL_CB32_CANCREATESURFACE = 1<<5, - DDHAL_CB32_CREATEPALETTE = 1<<6, - DDHAL_CB32_GETSCANLINE = 1<<7, - DDHAL_CB32_MAPMEMORY = 1<<31, -}; + +#define DDHAL_CB32_DESTROYDRIVER 0x00000001l +#define DDHAL_CB32_CREATESURFACE 0x00000002l +#define DDHAL_CB32_SETCOLORKEY 0x00000004l +#define DDHAL_CB32_SETMODE 0x00000008l +#define DDHAL_CB32_WAITFORVERTICALBLANK 0x00000010l +#define DDHAL_CB32_CANCREATESURFACE 0x00000020l +#define DDHAL_CB32_CREATEPALETTE 0x00000040l +#define DDHAL_CB32_GETSCANLINE 0x00000080l +#define DDHAL_CB32_MAPMEMORY 0x80000000l + typedef struct { PDD_DIRECTDRAW_GLOBAL lpDD; @@ -1226,7 +1236,42 @@ } DD_MORESURFACECAPS, *PDD_MORESURFACECAPS; +/*********************************************************/ +/* Kernel Callbacks */ +/*********************************************************/ +typedef struct _DD_SYNCSURFACEDATA +{ + PDD_DIRECTDRAW_LOCAL lpDD; + PDD_SURFACE_LOCAL lpDDSurface; + DWORD dwSurfaceOffset; + ULONG_PTR fpLockPtr; + LONG lPitch; + DWORD dwOverlayOffset; + ULONG dwDriverReserved1; + ULONG dwDriverReserved2; + ULONG dwDriverReserved3; + ULONG dwDriverReserved4; + HRESULT ddRVal; +} DD_SYNCSURFACEDATA, *PDD_SYNCSURFACEDATA; +typedef DWORD (STDCALL *PDD_KERNELCB_SYNCSURFACE)(PDD_SYNCSURFACEDATA); +typedef struct _DD_SYNCVIDEOPORTDATA +{ + PDD_DIRECTDRAW_LOCAL lpDD; + PDD_VIDEOPORT_LOCAL lpVideoPort; + DWORD dwOriginOffset; + DWORD dwHeight; + DWORD dwVBIHeight; + ULONG dwDriverReserved1; + ULONG dwDriverReserved2; + ULONG dwDriverReserved3; + HRESULT ddRVal; +} DD_SYNCVIDEOPORTDATA, *PDD_SYNCVIDEOPORTDATA; +typedef DWORD (STDCALL *PDD_KERNELCB_SYNCVIDEOPORT)(PDD_SYNCVIDEOPORTDATA); + + + + #ifdef __cplusplus } /* extern "C" */ #endif

19 years, 2 months

[gedmurphy] 18311: adding traceroute to build.

by gedmurphy＠svn.reactos.com

adding traceroute to build. Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-10-07 15:47:17 UTC (rev 18310) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-10-07 19:16:14 UTC (rev 18311) @@ -202,6 +202,7 @@ apps\utils\net\netstat\netstat.exe 1 apps\utils\net\ping\ping.exe 1 apps\utils\net\telnet\telnet.exe 1 +apps\utils\net\tracert\tracert.exe 1 apps\utils\net\whois\whois.exe 1 apps\utils\ps\ps.exe 1 apps\utils\rosperf\rosperf.exe 1

19 years, 2 months

[ros-diffs] [hpoussin] 18310: Allocate memory even for NULL strings, as we must not return a NULL pointer

by hpoussin＠svn.reactos.com

Allocate memory even for NULL strings, as we must not return a NULL pointer Modified: trunk/reactos/drivers/bus/pci/pdo.c _____ Modified: trunk/reactos/drivers/bus/pci/pdo.c --- trunk/reactos/drivers/bus/pci/pdo.c 2005-10-07 13:09:23 UTC (rev 18309) +++ trunk/reactos/drivers/bus/pci/pdo.c 2005-10-07 15:47:17 UTC (rev 18310) @@ -107,8 +107,11 @@ break; case BusQueryInstanceID: + /* FIXME: RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING flag + * needs to be removed once PciCreateInstanceIDString is fixed + */ Status = RtlDuplicateUnicodeString( - RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE | RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING, &DeviceExtension->InstanceID, &String);

19 years, 2 months

[hpoussin] 18309: - Fill Level field in DEVICE_NODE structure

by hpoussin＠svn.reactos.com

- Fill Level field in DEVICE_NODE structure - Full support of ParentIdPrefix value in registry - Implement IRP_MJ_PNP/IRP_MN_QUERY_CAPABILITIES for PDOs enumerated by Root bus - Add a temporary hack in pci driver as long as Plug and Play is not ready => This would allow to have two identical devices plugged on different buses (for example, two USB mices plugged on different hubs) Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/drivers/bus/pci/pci.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnproot.c _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-10-07 02:28:42 UTC (rev 18308) +++ trunk/reactos/bootdata/hivesys.inf 2005-10-07 13:09:23 UTC (rev 18309) @@ -592,6 +592,7 @@ HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","Service",0x00000000, "Pci" HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","Class",0x00000000,"C omputer" HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","ClassGUID",0x0000000 0,"{4D36E966-E325-11CE-BFC1-08002BE10318}" +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","ParentIdPrefix",0x0 000000,"0000" ;USB UHCI Driver HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00010001,0x000 00001 _____ Modified: trunk/reactos/drivers/bus/pci/pci.c --- trunk/reactos/drivers/bus/pci/pci.c 2005-10-07 02:28:42 UTC (rev 18308) +++ trunk/reactos/drivers/bus/pci/pci.c 2005-10-07 13:09:23 UTC (rev 18309) @@ -258,7 +258,7 @@ return RtlCreateUnicodeString(InstanceID, L"0001"); } else - return RtlCreateUnicodeString(InstanceID, L"0000"); + return RtlCreateUnicodeString(InstanceID, L""); } _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-10-07 02:28:42 UTC (rev 18308) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-10-07 13:09:23 UTC (rev 18309) @@ -5,6 +5,7 @@ * PURPOSE: Initializes the PnP manager * * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * HervÚ Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -24,6 +25,79 @@ PDRIVER_OBJECT IopRootDriverObject; PIO_BUS_TYPE_GUID_LIST IopBusTypeGuidList = NULL; +// Static CRC table +ULONG crc32Table[256] = +{ + 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, + 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, + 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, + 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, + 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, + 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, + 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, + 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, + 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, + 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, + 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, + 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, + 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, + 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, + 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, + 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, + + 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, + 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, + 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, + 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, + 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, + 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, + 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, + 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, + 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, + 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, + 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, + 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, + 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, + 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, + 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, + 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, + + 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, + 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, + 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, + 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, + 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, + 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, + 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, + 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, + 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, + 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, + 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, + 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, + 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, + 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, + 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, + 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, + + 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, + 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, + 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, + 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, + 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, + 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, + 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, + 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, + 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, + 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, + 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, + 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, + 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, + 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, + 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, + 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D, +}; + + /* FUNCTIONS *****************************************************************/ PDEVICE_NODE FASTCALL @@ -632,6 +706,7 @@ } ParentNode->Child = Node; KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); + Node->Level = ParentNode->Level + 1; } *DeviceNode = Node; @@ -1259,6 +1334,115 @@ /* + * IopGetParentIdPrefix + * + * Retrieve (or create) a string which identifies a device. + * + * Parameters + * DeviceNode + * Pointer to device node. + * ParentIdPrefix + * Pointer to the string where is returned the parent node identifier + * + * Remarks + * If the return code is STATUS_SUCCESS, the ParentIdPrefix string is + * valid and its Buffer field is NULL-terminated. The caller needs to + * to free the string with RtlFreeUnicodeString when it is no longer + * needed. + */ + +NTSTATUS +IopGetParentIdPrefix( + PDEVICE_NODE DeviceNode, + PUNICODE_STRING ParentIdPrefix) +{ + ULONG KeyNameBufferLength; + PWSTR KeyNameBuffer = NULL; + PKEY_VALUE_PARTIAL_INFORMATION ParentIdPrefixInformation = NULL; + UNICODE_STRING KeyName; + UNICODE_STRING KeyValue; + UNICODE_STRING ValueName; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hKey = INVALID_HANDLE_VALUE; + PBYTE currentByte; + ULONG crc32 = 0; + ULONG i; + NTSTATUS Status; + + /* HACK: As long as some devices have a NULL device + * instance path, the following test is required :( + */ + if (DeviceNode->Parent->InstancePath.Length == 0) + return STATUS_UNSUCCESSFUL; + + /* 1. Try to retrieve ParentIdPrefix from registry */ + KeyNameBufferLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + MAX_PATH * sizeof(WCHAR); + ParentIdPrefixInformation = ExAllocatePool(PagedPool, KeyNameBufferLength + sizeof(WCHAR)); + if (!ParentIdPrefixInformation) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + KeyNameBuffer = ExAllocatePool(PagedPool, (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length); + if (!KeyNameBuffer) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + wcscpy(KeyNameBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); + wcscat(KeyNameBuffer, DeviceNode->Parent->InstancePath.Buffer); + RtlInitUnicodeString(&KeyName, KeyNameBuffer); + InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); + Status = ZwOpenKey(&hKey, KEY_QUERY_VALUE | KEY_SET_VALUE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + goto cleanup; + RtlInitUnicodeString(&ValueName, L"ParentIdPrefix"); + Status = ZwQueryValueKey( + hKey, &ValueName, + KeyValuePartialInformation, ParentIdPrefixInformation, + KeyNameBufferLength, &KeyNameBufferLength); + if (NT_SUCCESS(Status)) + { + if (ParentIdPrefixInformation->Type != REG_SZ) + Status = STATUS_UNSUCCESSFUL; + goto cleanup; + } + if (Status != STATUS_OBJECT_NAME_NOT_FOUND) + goto cleanup; + + /* 2. Create the ParentIdPrefix value */ + currentByte = (PBYTE)DeviceNode->Parent; + for (i = 0; i < sizeof(DEVICE_NODE); i++, currentByte++) + crc32 = (crc32 >> 8) ^ crc32Table[*currentByte ^ (crc32 & 0xff)]; + crc32 = ~crc32; + KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data; + swprintf(KeyValue.Buffer, L"%lx&%lx", DeviceNode->Parent->Level, crc32); + + /* 3. Try to write the ParentIdPrefix to registry */ + RtlInitUnicodeString(&KeyValue, KeyValue.Buffer); + Status = ZwSetValueKey( + hKey, &ValueName, + 0, REG_SZ, + (PVOID)KeyValue.Buffer, + (wcslen(KeyValue.Buffer) + 1) * sizeof(WCHAR)); + +cleanup: + if (NT_SUCCESS(Status)) + { + /* Duplicate the string to return it */ + KeyValue.Length = KeyValue.MaximumLength = ParentIdPrefixInformation->DataLength; + KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data; + Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &KeyValue, ParentIdPrefix); + } + ExFreePool(ParentIdPrefixInformation); + ExFreePool(KeyNameBuffer); + if (hKey != INVALID_HANDLE_VALUE) + ZwClose(hKey); + return Status; +} + + +/* * IopActionInterrogateDeviceStack * * Retrieve information for all (direct) child nodes of a parent node. @@ -1293,8 +1477,8 @@ USHORT TotalLength; HANDLE InstanceKey = NULL; UNICODE_STRING ValueName; + UNICODE_STRING ParentIdPrefix = { 0 }; DEVICE_CAPABILITIES DeviceCapabilities; - PKEY_VALUE_PARTIAL_INFORMATION ParentPrefixIdInformation = NULL; DPRINT("IopActionInterrogateDeviceStack(%p, %p)\n", DeviceNode, Context); DPRINT("PDO 0x%p\n", DeviceNode->PhysicalDeviceObject); @@ -1366,52 +1550,10 @@ { /* Device has not a unique ID. We need to prepend parent bus unique identifier */ DPRINT("Instance ID is not unique\n"); - if (DeviceNode->Parent->InstancePath.Length > 0) + Status = IopGetParentIdPrefix(DeviceNode, &ParentIdPrefix); + if (!NT_SUCCESS(Status)) { - /* Parent device node exists */ - HANDLE hKey; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - ULONG KeyNameBufferLength; - PWSTR KeyNameBuffer = NULL; - - KeyNameBufferLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + MAX_PATH * sizeof(WCHAR); - ParentPrefixIdInformation = ExAllocatePool(PagedPool, KeyNameBufferLength + sizeof(WCHAR)); - KeyNameBuffer = ExAllocatePool(PagedPool, (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length); - if (ParentPrefixIdInformation && KeyNameBuffer) - { - /* Memory is allocated, let's try to read registry settings */ - wcscpy(KeyNameBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); - wcscat(KeyNameBuffer, DeviceNode->Parent->InstancePath.Buffer); - RtlInitUnicodeString(&KeyName, KeyNameBuffer); - InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwOpenKey(&hKey, KEY_READ, &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - RtlInitUnicodeString(&ValueName, L"ParentIdPrefix"); - Status = ZwQueryValueKey( - hKey, &ValueName, - KeyValuePartialInformation, ParentPrefixIdInformation, - KeyNameBufferLength, &KeyNameBufferLength); - if (NT_SUCCESS(Status)) - { - /* NULL-terminate the string, as we have allocated enough place for it */ - ((PWSTR)ParentPrefixIdInformation->Data)[ParentPrefixIdInformation->Data Length / sizeof(WCHAR)] = 0; - } - else - { - ExFreePool(ParentPrefixIdInformation); - ParentPrefixIdInformation = NULL; - } - ZwClose(hKey); - } - else - { - ExFreePool(ParentPrefixIdInformation); - ParentPrefixIdInformation = NULL; - } - } - ExFreePool(KeyNameBuffer); + DPRINT("IopGetParentIdPrefix() failed (Status 0x%08lx)\n", Status); } } @@ -1427,10 +1569,10 @@ { /* Append the instance id string */ wcscat(InstancePath, L"\\"); - if (ParentPrefixIdInformation && ParentPrefixIdInformation->Type == REG_SZ) + if (ParentIdPrefix.Length > 0) { /* Add information from parent bus device to InstancePath */ - wcscat(InstancePath, (PWSTR)ParentPrefixIdInformation->Data); + wcscat(InstancePath, ParentIdPrefix.Buffer); if (*(PWSTR)IoStatusBlock.Information) wcscat(InstancePath, L"&"); } @@ -1445,7 +1587,7 @@ { DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); } - ExFreePool(ParentPrefixIdInformation); + RtlFreeUnicodeString(&ParentIdPrefix); if (!RtlCreateUnicodeString(&DeviceNode->InstancePath, InstancePath)) { _____ Modified: trunk/reactos/ntoskrnl/io/pnproot.c --- trunk/reactos/ntoskrnl/io/pnproot.c 2005-10-07 02:28:42 UTC (rev 18308) +++ trunk/reactos/ntoskrnl/io/pnproot.c 2005-10-07 13:09:23 UTC (rev 18309) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/pnproot.c @@ -309,6 +308,30 @@ } +static NTSTATUS +PnpRootPdoQueryCapabilities( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + PIO_STACK_LOCATION IrpSp) +{ + PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; + PDEVICE_CAPABILITIES DeviceCapabilities; + + DPRINT("Called\n"); + + DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceCapabilities = IrpSp->Parameters.DeviceCapabilities.Capabilities; + + if (DeviceCapabilities->Version != 1) + return STATUS_UNSUCCESSFUL; + + DeviceCapabilities->UniqueID = TRUE; + /* FIXME: Fill other fields */ + + return STATUS_SUCCESS; +} + + /* * FUNCTION: Handle Plug and Play IRPs for the child device * ARGUMENTS: @@ -353,6 +376,10 @@ Status = PdoQueryResources(DeviceObject, Irp, IrpSp); break; + case IRP_MN_QUERY_CAPABILITIES: + Status = PnpRootPdoQueryCapabilities(DeviceObject, Irp, IrpSp); + break; + case IRP_MN_START_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: case IRP_MN_CANCEL_STOP_DEVICE:

19 years, 2 months

← Newer
1
...
58
59
60
61
62
63
64
...
74
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005