Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 42701: - Add sound schemes keys
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 16:16:08 2009 New Revision: 42701 URL: http://svn.reactos.org/svn/reactos?rev=42701&view=rev Log: - Add sound schemes keys Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] Sat Aug 15 16:16:08 2009 @@ -1504,4 +1504,99 @@ HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" HKCU,Software\Wine\MSHTML,"GeckoCabDir",0x00020000,"%SystemRoot%\" +; Sound Schemes +HKCU,"AppEvents\Schemes","",0x00000000,".Default" +HKCU,"AppEvents\Schemes\Apps",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default","",0x00000000,"ReactOS" +HKCU,"AppEvents\Schemes\Apps\.Default","DispFileName",0x00000000,"@mmsys.cpl,-5856" +HKCU,"AppEvents\Schemes\Apps\.Default\.Default",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\.Default\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\.Default\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\AppGPFault",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\AppGPFault\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\AppGPFault\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Close",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\Close\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Close\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\CriticalBatteryAlarm",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\CriticalBatteryAlarm\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\CriticalBatteryAlarm\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceConnect",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceConnect\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceConnect\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceDisconnect",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceDisconnect\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceDisconnect\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceFail",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceFail\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceFail\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\LowBatteryAlarm",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\LowBatteryAlarm\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\LowBatteryAlarm\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\MailBeep",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\MailBeep\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\MailBeep\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Maximize",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\Maximize\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Maximize\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\MenuCommand",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\MenuCommand\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\MenuCommand\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\MenuPopup",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\MenuPopup\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\MenuPopup\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Minimize",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\Minimize\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Minimize\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Open",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\Open\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Open\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\PrintComplete",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\PrintComplete\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\PrintComplete\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\RestoreDown",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\RestoreDown\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\RestoreDown\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\RestoreUp",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\RestoreUp\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\RestoreUp\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemAsterisk",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\SystemAsterisk\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemAsterisk\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemExclamation",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\SystemExclamation\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemExclamation\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemExit",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\SystemExit\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemExit\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemHand",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\SystemHand\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemHand\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemNotification",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\SystemNotification\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemNotification\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemQuestion",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\SystemQuestion\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemQuestion\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Current","",0x00020000,"%SystemRoot%\media\ReactOS_LogOn.wav" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Default","",0x00020000,"%SystemRoot%\media\ReactOS_LogOn.wav" +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\Explorer","",0x00000002,"ReactOS Explorer" +HKCU,"AppEvents\Schemes\Apps\Explorer","DispFileName",0x00000000,"@mmsys.cpl,-5854" +HKCU,"AppEvents\Schemes\Apps\Explorer\EmptyRecycleBin",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\Explorer\EmptyRecycleBin\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\Explorer\EmptyRecycleBin\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\Explorer\Navigating",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\Explorer\Navigating\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\Explorer\Navigating\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Names",,0x00000012 +HKCU,"AppEvents\Schemes\Names\.Default","",0x00000002,"ReactOS Default" +HKCU,"AppEvents\Schemes\Names\.None","",0x00000002,"No sounds" + ; EOF Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Sat Aug 15 16:16:08 2009 @@ -1522,4 +1522,99 @@ HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" HKCU,Software\Wine\MSHTML,"GeckoCabDir",0x00020000,"%SystemRoot%\" +; Sound Schemes +HKCU,"AppEvents\Schemes","",0x00000000,".Default" +HKCU,"AppEvents\Schemes\Apps",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default","",0x00000000,"ReactOS" +HKCU,"AppEvents\Schemes\Apps\.Default","DispFileName",0x00000000,"@mmsys.cpl,-5856" +HKCU,"AppEvents\Schemes\Apps\.Default\.Default",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\.Default\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\.Default\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\AppGPFault",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\AppGPFault\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\AppGPFault\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Close",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\Close\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Close\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\CriticalBatteryAlarm",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\CriticalBatteryAlarm\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\CriticalBatteryAlarm\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceConnect",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceConnect\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceConnect\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceDisconnect",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceDisconnect\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceDisconnect\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceFail",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceFail\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\DeviceFail\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\LowBatteryAlarm",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\LowBatteryAlarm\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\LowBatteryAlarm\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\MailBeep",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\MailBeep\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\MailBeep\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Maximize",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\Maximize\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Maximize\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\MenuCommand",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\MenuCommand\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\MenuCommand\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\MenuPopup",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\MenuPopup\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\MenuPopup\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Minimize",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\Minimize\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Minimize\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Open",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\Open\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\Open\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\PrintComplete",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\PrintComplete\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\PrintComplete\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\RestoreDown",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\RestoreDown\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\RestoreDown\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\RestoreUp",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\RestoreUp\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\RestoreUp\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemAsterisk",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\SystemAsterisk\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemAsterisk\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemExclamation",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\SystemExclamation\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemExclamation\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemExit",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\SystemExit\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemExit\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemHand",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\SystemHand\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemHand\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemNotification",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\SystemNotification\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemNotification\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemQuestion",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\SystemQuestion\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemQuestion\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Current","",0x00020000,"%SystemRoot%\media\ReactOS_LogOn.wav" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Default","",0x00020000,"%SystemRoot%\media\ReactOS_LogOn.wav" +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\Explorer","",0x00000002,"ReactOS Explorer" +HKCU,"AppEvents\Schemes\Apps\Explorer","DispFileName",0x00000000,"@mmsys.cpl,-5854" +HKCU,"AppEvents\Schemes\Apps\Explorer\EmptyRecycleBin",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\Explorer\EmptyRecycleBin\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\Explorer\EmptyRecycleBin\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\Explorer\Navigating",,0x00000012 +HKCU,"AppEvents\Schemes\Apps\Explorer\Navigating\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\Explorer\Navigating\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Names",,0x00000012 +HKCU,"AppEvents\Schemes\Names\.Default","",0x00000002,"ReactOS Default" +HKCU,"AppEvents\Schemes\Names\.None","",0x00000002,"No sounds" + ; EOF

1 0

[dchapyshev] 42700: - Add bcrypt, xmllite and hnetcfg from Wine
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 15:55:40 2009 New Revision: 42700 URL: http://svn.reactos.org/svn/reactos?rev=42700&view=rev Log: - Add bcrypt, xmllite and hnetcfg from Wine Added: trunk/reactos/dll/win32/bcrypt/ (with props) trunk/reactos/dll/win32/bcrypt/bcrypt.rbuild (with props) trunk/reactos/dll/win32/bcrypt/bcrypt.spec (with props) trunk/reactos/dll/win32/bcrypt/bcrypt_main.c (with props) trunk/reactos/dll/win32/bcrypt/version.rc (with props) trunk/reactos/dll/win32/hnetcfg/ (with props) trunk/reactos/dll/win32/hnetcfg/apps.c (with props) trunk/reactos/dll/win32/hnetcfg/hnetcfg.c (with props) trunk/reactos/dll/win32/hnetcfg/hnetcfg.rbuild (with props) trunk/reactos/dll/win32/hnetcfg/hnetcfg.spec (with props) trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h (with props) trunk/reactos/dll/win32/hnetcfg/manager.c (with props) trunk/reactos/dll/win32/hnetcfg/policy.c (with props) trunk/reactos/dll/win32/hnetcfg/profile.c (with props) trunk/reactos/dll/win32/hnetcfg/regsvr.c (with props) trunk/reactos/dll/win32/xmllite/ (with props) trunk/reactos/dll/win32/xmllite/xmllite.rbuild (with props) trunk/reactos/dll/win32/xmllite/xmllite.spec (with props) trunk/reactos/dll/win32/xmllite/xmllite_main.c (with props) trunk/reactos/include/psdk/icftypes.idl (with props) trunk/reactos/include/psdk/netfw.idl (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/include/psdk/psdk.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=427… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -108,6 +108,7 @@ <property name="BASEADDRESS_SXS" value="0x6e160000" /> <property name="BASEADDRESS_SCHANNEL" value="0x6e360000" /> <property name="BASEADDRESS_COMPSTUI" value="0x6ec10000" /> + <property name="BASEADDRESS_HNETCFG" value="0x6edb0000" /> <property name="BASEADDRESS_CLB" value="0x6f2b0000" /> <property name="BASEADDRESS_JSCRIPT" value="0x6fe80000" /> <property name="BASEADDRESS_FONTEXT" value="0x6f7b0000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -257,6 +257,7 @@ dll\win32\authz\authz.dll 1 dll\win32\avicap32\avicap32.dll 1 dll\win32\avifil32\avifil32.dll 1 +dll\win32\bcrypt\bcrypt.dll 1 dll\win32\beepmidi\beepmidi.dll 1 dll\win32\browseui\browseui.dll 1 dll\win32\cabinet\cabinet.dll 1 @@ -289,6 +290,7 @@ dll\win32\hhctrl.ocx\hhctrl.ocx 1 dll\win32\hid\hid.dll 1 dll\win32\hlink\hlink.dll 1 +dll\win32\hnetcfg\hnetcfg.dll 1 dll\win32\httpapi\httpapi.dll 1 dll\win32\iccvid\iccvid.dll 1 dll\win32\icmp\icmp.dll 1 @@ -459,6 +461,7 @@ dll\win32\xinput1_2\xinput1_2.dll 1 dll\win32\xinput1_3\xinput1_3.dll 1 dll\win32\xinput9_1_0\xinput9_1_0.dll 1 +dll\win32\xmllite\xmllite.dll 1 dll\win32\winmm\midimap\midimap.dll 1 dll\win32\wdmaud.drv\wdmaud.drv 1 Propchange: trunk/reactos/dll/win32/bcrypt/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Aug 15 15:55:40 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/bcrypt/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/bcrypt/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/bcrypt/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/bcrypt/bcrypt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/bcrypt.rb… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/bcrypt.rbuild (added) +++ trunk/reactos/dll/win32/bcrypt/bcrypt.rbuild [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,10 @@ +<module name="bcrypt" type="win32dll" installbase="system32" installname="bcrypt.dll" allowwarnings="true"> + <importlibrary definition="bcrypt.spec" /> + <include base="bcrypt">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>wine</library> + <library>kernel32</library> + <file>bcrypt_main.c</file> + <file>version.rc</file> +</module> Propchange: trunk/reactos/dll/win32/bcrypt/bcrypt.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/bcrypt/bcrypt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/bcrypt.sp… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/bcrypt.spec (added) +++ trunk/reactos/dll/win32/bcrypt/bcrypt.spec [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,58 @@ +@ stub BCryptAddContextFunction +@ stub BCryptAddContextFunctionProvider +@ stub BCryptCloseAlgorithmProvider +@ stub BCryptConfigureContext +@ stub BCryptConfigureContextFunction +@ stub BCryptCreateContext +@ stub BCryptCreateHash +@ stub BCryptDecrypt +@ stub BCryptDeleteContext +@ stub BCryptDeriveKey +@ stub BCryptDestroyHash +@ stub BCryptDestroyKey +@ stub BCryptDestroySecret +@ stub BCryptDuplicateHash +@ stub BCryptDuplicateKey +@ stub BCryptEncrypt +@ stub BCryptEnumAlgorithms +@ stub BCryptEnumContextFunctionProviders +@ stub BCryptEnumContextFunctions +@ stub BCryptEnumContexts +@ stub BCryptEnumProviders +@ stub BCryptEnumRegisteredProviders +@ stub BCryptExportKey +@ stub BCryptFinalizeKeyPair +@ stub BCryptFinishHash +@ stub BCryptFreeBuffer +@ stub BCryptGenRandom +@ stub BCryptGenerateKeyPair +@ stub BCryptGenerateSymmetricKey +@ stub BCryptGetFipsAlgorithmMode +@ stub BCryptGetProperty +@ stub BCryptHashData +@ stub BCryptImportKey +@ stub BCryptImportKeyPair +@ stub BCryptOpenAlgorithmProvider +@ stub BCryptQueryContextConfiguration +@ stub BCryptQueryContextFunctionConfiguration +@ stub BCryptQueryContextFunctionProperty +@ stub BCryptQueryProviderRegistration +@ stub BCryptRegisterConfigChangeNotify +@ stub BCryptRegisterProvider +@ stub BCryptRemoveContextFunction +@ stub BCryptRemoveContextFunctionProvider +@ stub BCryptResolveProviders +@ stub BCryptSecretAgreement +@ stub BCryptSetAuditingInterface +@ stub BCryptSetContextFunctionProperty +@ stub BCryptSetProperty +@ stub BCryptSignHash +@ stub BCryptUnregisterConfigChangeNotify +@ stub BCryptUnregisterProvider +@ stub BCryptVerifySignature +@ stub GetAsymmetricEncryptionInterface +@ stub GetCipherInterface +@ stub GetHashInterface +@ stub GetRngInterface +@ stub GetSecretAgreementInterface +@ stub GetSignatureInterface Propchange: trunk/reactos/dll/win32/bcrypt/bcrypt.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/bcrypt/bcrypt_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/bcrypt_ma… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/bcrypt_main.c (added) +++ trunk/reactos/dll/win32/bcrypt/bcrypt_main.c [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,40 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" +#include "wine/debug.h" + +#include "winbase.h" + +WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("fdwReason %u\n", fdwReason); + + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/bcrypt/bcrypt_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/bcrypt/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/version.r… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/version.rc (added) +++ trunk/reactos/dll/win32/bcrypt/version.rc [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,26 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Crypto Library" +#define WINE_FILENAME_STR "bcrypt.dll" +#define WINE_FILEVERSION 6,0,6000,16386 +#define WINE_FILEVERSION_STR "6.0.6000.16386" +#define WINE_PRODUCTVERSION 6,0,6000,16386 +#define WINE_PRODUCTVERSION_STR "6.0.6000.16386" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/bcrypt/version.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/hnetcfg/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Aug 15 15:55:40 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/hnetcfg/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/hnetcfg/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/hnetcfg/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/hnetcfg/apps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/apps.c?r… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/apps.c (added) +++ trunk/reactos/dll/win32/hnetcfg/apps.c [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,500 @@ +/* + * Copyright 2009 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "netfw.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "hnetcfg_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); + +typedef struct fw_app +{ + const INetFwAuthorizedApplicationVtbl *vtbl; + LONG refs; +} fw_app; + +static inline fw_app *impl_from_INetFwAuthorizedApplication( INetFwAuthorizedApplication *iface ) +{ + return (fw_app *)((char *)iface - FIELD_OFFSET( fw_app, vtbl )); +} + +static ULONG WINAPI fw_app_AddRef( + INetFwAuthorizedApplication *iface ) +{ + fw_app *fw_app = impl_from_INetFwAuthorizedApplication( iface ); + return InterlockedIncrement( &fw_app->refs ); +} + +static ULONG WINAPI fw_app_Release( + INetFwAuthorizedApplication *iface ) +{ + fw_app *fw_app = impl_from_INetFwAuthorizedApplication( iface ); + LONG refs = InterlockedDecrement( &fw_app->refs ); + if (!refs) + { + TRACE("destroying %p\n", fw_app); + HeapFree( GetProcessHeap(), 0, fw_app ); + } + return refs; +} + +static HRESULT WINAPI fw_app_QueryInterface( + INetFwAuthorizedApplication *iface, + REFIID riid, + void **ppvObject ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_INetFwAuthorizedApplication ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + INetFwAuthorizedApplication_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI fw_app_GetTypeInfoCount( + INetFwAuthorizedApplication *iface, + UINT *pctinfo ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p %p\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_app_GetTypeInfo( + INetFwAuthorizedApplication *iface, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_app_GetIDsOfNames( + INetFwAuthorizedApplication *iface, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_app_Invoke( + INetFwAuthorizedApplication *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_app_get_Name( + INetFwAuthorizedApplication *iface, + BSTR *name ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p, %p\n", This, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_app_put_Name( + INetFwAuthorizedApplication *iface, + BSTR name ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p, %s\n", This, debugstr_w(name)); + return S_OK; +} + +static HRESULT WINAPI fw_app_get_ProcessImageFileName( + INetFwAuthorizedApplication *iface, + BSTR *imageFileName ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p, %p\n", This, imageFileName); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_app_put_ProcessImageFileName( + INetFwAuthorizedApplication *iface, + BSTR imageFileName ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p, %s\n", This, debugstr_w(imageFileName)); + return S_OK; +} + +static HRESULT WINAPI fw_app_get_IpVersion( + INetFwAuthorizedApplication *iface, + NET_FW_IP_VERSION *ipVersion ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p, %p\n", This, ipVersion); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_app_put_IpVersion( + INetFwAuthorizedApplication *iface, + NET_FW_IP_VERSION ipVersion ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p, %u\n", This, ipVersion); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_app_get_Scope( + INetFwAuthorizedApplication *iface, + NET_FW_SCOPE *scope ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p, %p\n", This, scope); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_app_put_Scope( + INetFwAuthorizedApplication *iface, + NET_FW_SCOPE scope ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p, %u\n", This, scope); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_app_get_RemoteAddresses( + INetFwAuthorizedApplication *iface, + BSTR *remoteAddrs ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p, %p\n", This, remoteAddrs); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_app_put_RemoteAddresses( + INetFwAuthorizedApplication *iface, + BSTR remoteAddrs ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p, %s\n", This, debugstr_w(remoteAddrs)); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_app_get_Enabled( + INetFwAuthorizedApplication *iface, + VARIANT_BOOL *enabled ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p, %p\n", This, enabled); + + *enabled = VARIANT_FALSE; + return S_OK; +} + +static HRESULT WINAPI fw_app_put_Enabled( + INetFwAuthorizedApplication *iface, + VARIANT_BOOL enabled ) +{ + fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + + FIXME("%p, %d\n", This, enabled); + return E_NOTIMPL; +} + +static const struct INetFwAuthorizedApplicationVtbl fw_app_vtbl = +{ + fw_app_QueryInterface, + fw_app_AddRef, + fw_app_Release, + fw_app_GetTypeInfoCount, + fw_app_GetTypeInfo, + fw_app_GetIDsOfNames, + fw_app_Invoke, + fw_app_get_Name, + fw_app_put_Name, + fw_app_get_ProcessImageFileName, + fw_app_put_ProcessImageFileName, + fw_app_get_IpVersion, + fw_app_put_IpVersion, + fw_app_get_Scope, + fw_app_put_Scope, + fw_app_get_RemoteAddresses, + fw_app_put_RemoteAddresses, + fw_app_get_Enabled, + fw_app_put_Enabled +}; + +HRESULT NetFwAuthorizedApplication_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + fw_app *fa; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + fa = HeapAlloc( GetProcessHeap(), 0, sizeof(*fa) ); + if (!fa) return E_OUTOFMEMORY; + + fa->vtbl = &fw_app_vtbl; + fa->refs = 1; + + *ppObj = &fa->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} +typedef struct fw_apps +{ + const INetFwAuthorizedApplicationsVtbl *vtbl; + LONG refs; +} fw_apps; + +static inline fw_apps *impl_from_INetFwAuthorizedApplications( INetFwAuthorizedApplications *iface ) +{ + return (fw_apps *)((char *)iface - FIELD_OFFSET( fw_apps, vtbl )); +} + +static ULONG WINAPI fw_apps_AddRef( + INetFwAuthorizedApplications *iface ) +{ + fw_apps *fw_apps = impl_from_INetFwAuthorizedApplications( iface ); + return InterlockedIncrement( &fw_apps->refs ); +} + +static ULONG WINAPI fw_apps_Release( + INetFwAuthorizedApplications *iface ) +{ + fw_apps *fw_apps = impl_from_INetFwAuthorizedApplications( iface ); + LONG refs = InterlockedDecrement( &fw_apps->refs ); + if (!refs) + { + TRACE("destroying %p\n", fw_apps); + HeapFree( GetProcessHeap(), 0, fw_apps ); + } + return refs; +} + +static HRESULT WINAPI fw_apps_QueryInterface( + INetFwAuthorizedApplications *iface, + REFIID riid, + void **ppvObject ) +{ + fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_INetFwAuthorizedApplications ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + INetFwAuthorizedApplications_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI fw_apps_GetTypeInfoCount( + INetFwAuthorizedApplications *iface, + UINT *pctinfo ) +{ + fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); + + FIXME("%p %p\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_apps_GetTypeInfo( + INetFwAuthorizedApplications *iface, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo ) +{ + fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); + + FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_apps_GetIDsOfNames( + INetFwAuthorizedApplications *iface, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId ) +{ + fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); + + FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_apps_Invoke( + INetFwAuthorizedApplications *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr ) +{ + fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); + + FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_apps_get_Count( + INetFwAuthorizedApplications *iface, + LONG *count ) +{ + fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); + + FIXME("%p, %p\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_apps_Add( + INetFwAuthorizedApplications *iface, + INetFwAuthorizedApplication *app ) +{ + fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); + + FIXME("%p, %p\n", This, app); + return S_OK; +} + +static HRESULT WINAPI fw_apps_Remove( + INetFwAuthorizedApplications *iface, + BSTR imageFileName ) +{ + fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); + + FIXME("%p, %s\n", This, debugstr_w(imageFileName)); + return S_OK; +} + +static HRESULT WINAPI fw_apps_Item( + INetFwAuthorizedApplications *iface, + BSTR imageFileName, + INetFwAuthorizedApplication **app ) +{ + fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); + + TRACE("%p, %s, %p\n", This, debugstr_w(imageFileName), app); + return NetFwAuthorizedApplication_create( NULL, (void **)app ); +} + +static HRESULT WINAPI fw_apps_get__NewEnum( + INetFwAuthorizedApplications *iface, + IUnknown **newEnum ) +{ + fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); + + FIXME("%p, %p\n", This, newEnum); + return E_NOTIMPL; +} + +static const struct INetFwAuthorizedApplicationsVtbl fw_apps_vtbl = +{ + fw_apps_QueryInterface, + fw_apps_AddRef, + fw_apps_Release, + fw_apps_GetTypeInfoCount, + fw_apps_GetTypeInfo, + fw_apps_GetIDsOfNames, + fw_apps_Invoke, + fw_apps_get_Count, + fw_apps_Add, + fw_apps_Remove, + fw_apps_Item, + fw_apps_get__NewEnum +}; + +HRESULT NetFwAuthorizedApplications_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + fw_apps *fa; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + fa = HeapAlloc( GetProcessHeap(), 0, sizeof(*fa) ); + if (!fa) return E_OUTOFMEMORY; + + fa->vtbl = &fw_apps_vtbl; + fa->refs = 1; + + *ppObj = &fa->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} Propchange: trunk/reactos/dll/win32/hnetcfg/apps.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hnetcfg/hnetcfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.c (added) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.c [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,152 @@ +/* + * Copyright (C) 2007 Jeff Latimer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "netfw.h" + +#include "wine/debug.h" +#include "hnetcfg_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); + +typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); + +typedef struct +{ + const struct IClassFactoryVtbl *vtbl; + fnCreateInstance pfnCreateInstance; +} hnetcfg_cf; + +static inline hnetcfg_cf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return (hnetcfg_cf *)((char *)iface - FIELD_OFFSET( hnetcfg_cf, vtbl )); +} + +static HRESULT WINAPI hnetcfg_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI hnetcfg_cf_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI hnetcfg_cf_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI hnetcfg_cf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOuter, + REFIID riid, LPVOID *ppobj ) +{ + hnetcfg_cf *This = impl_from_IClassFactory( iface ); + HRESULT r; + IUnknown *punk; + + TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + if (pOuter) + return CLASS_E_NOAGGREGATION; + + r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk ); + if (FAILED(r)) + return r; + + r = IUnknown_QueryInterface( punk, riid, ppobj ); + if (FAILED(r)) + return r; + + IUnknown_Release( punk ); + return r; +} + +static HRESULT WINAPI hnetcfg_cf_LockServer( IClassFactory *iface, BOOL dolock ) +{ + FIXME("(%p)->(%d)\n", iface, dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl hnetcfg_cf_vtbl = +{ + hnetcfg_cf_QueryInterface, + hnetcfg_cf_AddRef, + hnetcfg_cf_Release, + hnetcfg_cf_CreateInstance, + hnetcfg_cf_LockServer +}; + +static hnetcfg_cf fw_manager_cf = { &hnetcfg_cf_vtbl, NetFwMgr_create }; +static hnetcfg_cf fw_app_cf = { &hnetcfg_cf_vtbl, NetFwAuthorizedApplication_create }; + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved); + + switch(fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) +{ + IClassFactory *cf = NULL; + + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + if (IsEqualGUID( rclsid, &CLSID_NetFwMgr )) + { + cf = (IClassFactory *)&fw_manager_cf.vtbl; + } + else if (IsEqualGUID( rclsid, &CLSID_NetFwAuthorizedApplication )) + { + cf = (IClassFactory *)&fw_app_cf.vtbl; + } + + if (!cf) return CLASS_E_CLASSNOTAVAILABLE; + return IClassFactory_QueryInterface( cf, iid, ppv ); +} + +HRESULT WINAPI DllCanUnloadNow( void ) +{ + FIXME("\n"); + return S_FALSE; +} Propchange: trunk/reactos/dll/win32/hnetcfg/hnetcfg.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hnetcfg/hnetcfg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.rbuild (added) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.rbuild [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,18 @@ +<module name="hnetcfg" type="win32dll" baseaddress="${BASEADDRESS_HNETCFG}" installbase="system32" installname="hnetcfg.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="hnetcfg.spec" /> + <include base="hnetcfg">.</include> + <include base="ReactOS">include/reactos/wine</include> + <redefine name="_WIN32_WINNT">0x600</redefine> + <define name="__WINESRC__" /> + <library>wine</library> + <library>ole32</library> + <library>advapi32</library> + <library>kernel32</library> + <file>apps.c</file> + <file>hnetcfg.c</file> + <file>manager.c</file> + <file>policy.c</file> + <file>profile.c</file> + <file>regsvr.c</file> +</module> Propchange: trunk/reactos/dll/win32/hnetcfg/hnetcfg.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hnetcfg/hnetcfg.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.spec (added) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.spec [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject( ptr ptr ptr ) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Propchange: trunk/reactos/dll/win32/hnetcfg/hnetcfg.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg_… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h (added) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,23 @@ +/* + * Copyright 2009 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +HRESULT NetFwMgr_create(IUnknown *, LPVOID *); +HRESULT NetFwPolicy_create(IUnknown *, LPVOID *); +HRESULT NetFwProfile_create(IUnknown *, LPVOID *); +HRESULT NetFwAuthorizedApplication_create(IUnknown *, LPVOID *); +HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *); Propchange: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hnetcfg/manager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/manager.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/manager.c (added) +++ trunk/reactos/dll/win32/hnetcfg/manager.c [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,240 @@ +/* + * Copyright 2009 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "initguid.h" +#include "ole2.h" +#include "netfw.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "hnetcfg_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); + +typedef struct fw_manager +{ + const INetFwMgrVtbl *vtbl; + LONG refs; +} fw_manager; + +static inline fw_manager *impl_from_INetFwMgr( INetFwMgr *iface ) +{ + return (fw_manager *)((char *)iface - FIELD_OFFSET( fw_manager, vtbl )); +} + +static ULONG WINAPI fw_manager_AddRef( + INetFwMgr *iface ) +{ + fw_manager *fw_manager = impl_from_INetFwMgr( iface ); + return InterlockedIncrement( &fw_manager->refs ); +} + +static ULONG WINAPI fw_manager_Release( + INetFwMgr *iface ) +{ + fw_manager *fw_manager = impl_from_INetFwMgr( iface ); + LONG refs = InterlockedDecrement( &fw_manager->refs ); + if (!refs) + { + TRACE("destroying %p\n", fw_manager); + HeapFree( GetProcessHeap(), 0, fw_manager ); + } + return refs; +} + +static HRESULT WINAPI fw_manager_QueryInterface( + INetFwMgr *iface, + REFIID riid, + void **ppvObject ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_INetFwMgr ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + INetFwMgr_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI fw_manager_GetTypeInfoCount( + INetFwMgr *iface, + UINT *pctinfo ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p %p\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_GetTypeInfo( + INetFwMgr *iface, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_GetIDsOfNames( + INetFwMgr *iface, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_Invoke( + INetFwMgr *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_get_LocalPolicy( + INetFwMgr *iface, + INetFwPolicy **localPolicy ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + TRACE("%p, %p\n", This, localPolicy); + return NetFwPolicy_create( NULL, (void **)localPolicy ); +} + +static HRESULT WINAPI fw_manager_get_CurrentProfileType( + INetFwMgr *iface, + NET_FW_PROFILE_TYPE *profileType ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p, %p\n", This, profileType); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_RestoreDefaults( + INetFwMgr *iface ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_IsPortAllowed( + INetFwMgr *iface, + BSTR imageFileName, + NET_FW_IP_VERSION ipVersion, + LONG portNumber, + BSTR localAddress, + NET_FW_IP_PROTOCOL ipProtocol, + VARIANT *allowed, + VARIANT *restricted ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p, %s, %u, %d, %s, %u, %p, %p\n", This, debugstr_w(imageFileName), + ipVersion, portNumber, debugstr_w(localAddress), ipProtocol, allowed, restricted); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_IsIcmpTypeAllowed( + INetFwMgr *iface, + NET_FW_IP_VERSION ipVersion, + BSTR localAddress, + BYTE type, + VARIANT *allowed, + VARIANT *restricted ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p, %u, %s, %u, %p, %p\n", This, ipVersion, debugstr_w(localAddress), + type, allowed, restricted); + return E_NOTIMPL; +} + +static const struct INetFwMgrVtbl fw_manager_vtbl = +{ + fw_manager_QueryInterface, + fw_manager_AddRef, + fw_manager_Release, + fw_manager_GetTypeInfoCount, + fw_manager_GetTypeInfo, + fw_manager_GetIDsOfNames, + fw_manager_Invoke, + fw_manager_get_LocalPolicy, + fw_manager_get_CurrentProfileType, + fw_manager_RestoreDefaults, + fw_manager_IsPortAllowed, + fw_manager_IsIcmpTypeAllowed +}; + +HRESULT NetFwMgr_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + fw_manager *fm; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + fm = HeapAlloc( GetProcessHeap(), 0, sizeof(*fm) ); + if (!fm) return E_OUTOFMEMORY; + + fm->vtbl = &fw_manager_vtbl; + fm->refs = 1; + + *ppObj = &fm->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} Propchange: trunk/reactos/dll/win32/hnetcfg/manager.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hnetcfg/policy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/policy.c… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/policy.c (added) +++ trunk/reactos/dll/win32/hnetcfg/policy.c [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,196 @@ +/* + * Copyright 2009 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "netfw.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "hnetcfg_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); + +typedef struct fw_policy +{ + const INetFwPolicyVtbl *vtbl; + LONG refs; +} fw_policy; + +static inline fw_policy *impl_from_INetFwPolicy( INetFwPolicy *iface ) +{ + return (fw_policy *)((char *)iface - FIELD_OFFSET( fw_policy, vtbl )); +} + +static ULONG WINAPI fw_policy_AddRef( + INetFwPolicy *iface ) +{ + fw_policy *fw_policy = impl_from_INetFwPolicy( iface ); + return InterlockedIncrement( &fw_policy->refs ); +} + +static ULONG WINAPI fw_policy_Release( + INetFwPolicy *iface ) +{ + fw_policy *fw_policy = impl_from_INetFwPolicy( iface ); + LONG refs = InterlockedDecrement( &fw_policy->refs ); + if (!refs) + { + TRACE("destroying %p\n", fw_policy); + HeapFree( GetProcessHeap(), 0, fw_policy ); + } + return refs; +} + +static HRESULT WINAPI fw_policy_QueryInterface( + INetFwPolicy *iface, + REFIID riid, + void **ppvObject ) +{ + fw_policy *This = impl_from_INetFwPolicy( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_INetFwPolicy ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + INetFwPolicy_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI fw_policy_GetTypeInfoCount( + INetFwPolicy *iface, + UINT *pctinfo ) +{ + fw_policy *This = impl_from_INetFwPolicy( iface ); + + FIXME("%p %p\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_policy_GetTypeInfo( + INetFwPolicy *iface, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo ) +{ + fw_policy *This = impl_from_INetFwPolicy( iface ); + + FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_policy_GetIDsOfNames( + INetFwPolicy *iface, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId ) +{ + fw_policy *This = impl_from_INetFwPolicy( iface ); + + FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_policy_Invoke( + INetFwPolicy *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr ) +{ + fw_policy *This = impl_from_INetFwPolicy( iface ); + + FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_policy_get_CurrentProfile( + INetFwPolicy *iface, + INetFwProfile **profile ) +{ + fw_policy *This = impl_from_INetFwPolicy( iface ); + + TRACE("%p, %p\n", This, profile); + return NetFwProfile_create( NULL, (void **)profile ); +} + +static HRESULT WINAPI fw_policy_GetProfileByType( + INetFwPolicy *iface, + NET_FW_PROFILE_TYPE profileType, + INetFwProfile **profile ) +{ + fw_policy *This = impl_from_INetFwPolicy( iface ); + + FIXME("%p, %u, %p\n", This, profileType, profile); + return E_NOTIMPL; +} + +static const struct INetFwPolicyVtbl fw_policy_vtbl = +{ + fw_policy_QueryInterface, + fw_policy_AddRef, + fw_policy_Release, + fw_policy_GetTypeInfoCount, + fw_policy_GetTypeInfo, + fw_policy_GetIDsOfNames, + fw_policy_Invoke, + fw_policy_get_CurrentProfile, + fw_policy_GetProfileByType +}; + +HRESULT NetFwPolicy_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + fw_policy *fp; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); + if (!fp) return E_OUTOFMEMORY; + + fp->vtbl = &fw_policy_vtbl; + fp->refs = 1; + + *ppObj = &fp->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} Propchange: trunk/reactos/dll/win32/hnetcfg/policy.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hnetcfg/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/profile.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/profile.c (added) +++ trunk/reactos/dll/win32/hnetcfg/profile.c [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,329 @@ +/* + * Copyright 2009 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "netfw.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "hnetcfg_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); + +typedef struct fw_profile +{ + const INetFwProfileVtbl *vtbl; + LONG refs; +} fw_profile; + +static inline fw_profile *impl_from_INetFwProfile( INetFwProfile *iface ) +{ + return (fw_profile *)((char *)iface - FIELD_OFFSET( fw_profile, vtbl )); +} + +static ULONG WINAPI fw_profile_AddRef( + INetFwProfile *iface ) +{ + fw_profile *fw_profile = impl_from_INetFwProfile( iface ); + return InterlockedIncrement( &fw_profile->refs ); +} + +static ULONG WINAPI fw_profile_Release( + INetFwProfile *iface ) +{ + fw_profile *fw_profile = impl_from_INetFwProfile( iface ); + LONG refs = InterlockedDecrement( &fw_profile->refs ); + if (!refs) + { + TRACE("destroying %p\n", fw_profile); + HeapFree( GetProcessHeap(), 0, fw_profile ); + } + return refs; +} + +static HRESULT WINAPI fw_profile_QueryInterface( + INetFwProfile *iface, + REFIID riid, + void **ppvObject ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_INetFwProfile ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + INetFwProfile_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI fw_profile_GetTypeInfoCount( + INetFwProfile *iface, + UINT *pctinfo ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p %p\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_GetTypeInfo( + INetFwProfile *iface, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_GetIDsOfNames( + INetFwProfile *iface, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_Invoke( + INetFwProfile *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_get_Type( + INetFwProfile *iface, + NET_FW_PROFILE_TYPE *type ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p, %p\n", This, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_get_FirewallEnabled( + INetFwProfile *iface, + VARIANT_BOOL *enabled ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p, %p\n", This, enabled); + + *enabled = VARIANT_FALSE; + return S_OK; +} + +static HRESULT WINAPI fw_profile_put_FirewallEnabled( + INetFwProfile *iface, + VARIANT_BOOL enabled ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p, %d\n", This, enabled); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_get_ExceptionsNotAllowed( + INetFwProfile *iface, + VARIANT_BOOL *notAllowed ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p, %p\n", This, notAllowed); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_put_ExceptionsNotAllowed( + INetFwProfile *iface, + VARIANT_BOOL notAllowed ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p, %d\n", This, notAllowed); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_get_NotificationsDisabled( + INetFwProfile *iface, + VARIANT_BOOL *disabled ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p, %p\n", This, disabled); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_put_NotificationsDisabled( + INetFwProfile *iface, + VARIANT_BOOL disabled ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p, %d\n", This, disabled); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_get_UnicastResponsesToMulticastBroadcastDisabled( + INetFwProfile *iface, + VARIANT_BOOL *disabled ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p, %p\n", This, disabled); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_put_UnicastResponsesToMulticastBroadcastDisabled( + INetFwProfile *iface, + VARIANT_BOOL disabled ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p, %d\n", This, disabled); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_get_RemoteAdminSettings( + INetFwProfile *iface, + INetFwRemoteAdminSettings **remoteAdminSettings ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p, %p\n", This, remoteAdminSettings); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_get_IcmpSettings( + INetFwProfile *iface, + INetFwIcmpSettings **icmpSettings ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p, %p\n", This, icmpSettings); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_get_GloballyOpenPorts( + INetFwProfile *iface, + INetFwOpenPorts **openPorts ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p, %p\n", This, openPorts); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_get_Services( + INetFwProfile *iface, + INetFwServices **Services ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + FIXME("%p, %p\n", This, Services); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_profile_get_AuthorizedApplications( + INetFwProfile *iface, + INetFwAuthorizedApplications **apps ) +{ + fw_profile *This = impl_from_INetFwProfile( iface ); + + TRACE("%p, %p\n", This, apps); + return NetFwAuthorizedApplications_create( NULL, (void **)apps ); +} + +static const struct INetFwProfileVtbl fw_profile_vtbl = +{ + fw_profile_QueryInterface, + fw_profile_AddRef, + fw_profile_Release, + fw_profile_GetTypeInfoCount, + fw_profile_GetTypeInfo, + fw_profile_GetIDsOfNames, + fw_profile_Invoke, + fw_profile_get_Type, + fw_profile_get_FirewallEnabled, + fw_profile_put_FirewallEnabled, + fw_profile_get_ExceptionsNotAllowed, + fw_profile_put_ExceptionsNotAllowed, + fw_profile_get_NotificationsDisabled, + fw_profile_put_NotificationsDisabled, + fw_profile_get_UnicastResponsesToMulticastBroadcastDisabled, + fw_profile_put_UnicastResponsesToMulticastBroadcastDisabled, + fw_profile_get_RemoteAdminSettings, + fw_profile_get_IcmpSettings, + fw_profile_get_GloballyOpenPorts, + fw_profile_get_Services, + fw_profile_get_AuthorizedApplications +}; + +HRESULT NetFwProfile_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + fw_profile *fp; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); + if (!fp) return E_OUTOFMEMORY; + + fp->vtbl = &fw_profile_vtbl; + fp->refs = 1; + + *ppObj = &fp->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} Propchange: trunk/reactos/dll/win32/hnetcfg/profile.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hnetcfg/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/regsvr.c (added) +++ trunk/reactos/dll/win32/hnetcfg/regsvr.c [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,430 @@ +/* + * self-registerable dll functions for hnetcfg.dll + * + * Copyright (C) 2003 John K. Hohm + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "winerror.h" +#include "objbase.h" +#include "netfw.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); + +/* + * Near the bottom of this file are the exported DllRegisterServer and + * DllUnregisterServer, which make all this worthwhile. + */ + +/*********************************************************************** + * interface for self-registering + */ +struct regsvr_interface +{ + IID const *iid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + IID const *base_iid; /* can be NULL to omit */ + int num_methods; /* can be <0 to omit */ + CLSID const *ps_clsid; /* can be NULL to omit */ + CLSID const *ps_clsid32; /* can be NULL to omit */ +}; + +static HRESULT register_interfaces(struct regsvr_interface const *list); +static HRESULT unregister_interfaces(struct regsvr_interface const *list); + +struct regsvr_coclass +{ + CLSID const *clsid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + LPCSTR ips; /* can be NULL to omit */ + LPCSTR ips32; /* can be NULL to omit */ + LPCSTR ips32_tmodel; /* can be NULL to omit */ + LPCSTR clsid_str; /* can be NULL to omit */ + LPCSTR progid; /* can be NULL to omit */ +}; + +static HRESULT register_coclasses(struct regsvr_coclass const *list); +static HRESULT unregister_coclasses(struct regsvr_coclass const *list); + +/*********************************************************************** + * static string constants + */ +static WCHAR const interface_keyname[10] = { + 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; +static WCHAR const base_ifa_keyname[14] = { + 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', + 'e', 0 }; +static WCHAR const num_methods_keyname[11] = { + 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; +static WCHAR const ps_clsid_keyname[15] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', 0 }; +static WCHAR const ps_clsid32_keyname[17] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', '3', '2', 0 }; +static WCHAR const clsid_keyname[6] = { + 'C', 'L', 'S', 'I', 'D', 0 }; +static WCHAR const ips_keyname[13] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + 0 }; +static WCHAR const ips32_keyname[15] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + '3', '2', 0 }; +static WCHAR const progid_keyname[7] = { + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static char const tmodel_valuename[] = "ThreadingModel"; + +/*********************************************************************** + * static helper functions + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); +static LONG register_key_defvalueW(HKEY base, WCHAR const *name, + WCHAR const *value); +static LONG register_key_defvalueA(HKEY base, WCHAR const *name, + char const *value); + +/*********************************************************************** + * register_interfaces + */ +static HRESULT register_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &interface_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + HKEY iid_key; + + StringFromGUID2(list->iid, buf, 39); + res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &iid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_interface_key; + + if (list->name) { + res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->base_iid) { + res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (0 <= list->num_methods) { + static WCHAR const fmt[3] = { '%', 'd', 0 }; + HKEY key; + + res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + + sprintfW(buf, fmt, list->num_methods); + res = RegSetValueExW(key, NULL, 0, REG_SZ, + (CONST BYTE*)buf, + (lstrlenW(buf) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid) { + res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid32) { + res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + error_close_iid_key: + RegCloseKey(iid_key); + } + +error_close_interface_key: + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_interfaces + */ +static HRESULT unregister_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, + KEY_READ | KEY_WRITE, &interface_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->iid, buf, 39); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + } + + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * register_coclasses + */ +static HRESULT register_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + HKEY clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->name) { + res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips) { + res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips32) { + HKEY ips32_key; + + res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &ips32_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->ips32, + lstrlenA(list->ips32) + 1); + if (res == ERROR_SUCCESS && list->ips32_tmodel) + res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, + (CONST BYTE*)list->ips32_tmodel, + strlen(list->ips32_tmodel) + 1); + RegCloseKey(ips32_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->clsid_str) { + res = register_key_defvalueA(clsid_key, clsid_keyname, + list->clsid_str); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->progid) { + HKEY progid_key; + + res = register_key_defvalueA(clsid_key, progid_keyname, + list->progid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->progid, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_key_defvalueW(progid_key, clsid_keyname, buf); + RegCloseKey(progid_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + error_close_clsid_key: + RegCloseKey(clsid_key); + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_coclasses + */ +static HRESULT unregister_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, + KEY_READ | KEY_WRITE, &coclass_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->clsid, buf, 39); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->progid) { + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * regsvr_key_guid + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid) +{ + WCHAR buf[39]; + + StringFromGUID2(guid, buf, 39); + return register_key_defvalueW(base, name, buf); +} + +/*********************************************************************** + * regsvr_key_defvalueW + */ +static LONG register_key_defvalueW( + HKEY base, + WCHAR const *name, + WCHAR const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + (lstrlenW(value) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_key_defvalueA + */ +static LONG register_key_defvalueA( + HKEY base, + WCHAR const *name, + char const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + lstrlenA(value) + 1); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * coclass list + */ +static struct regsvr_coclass const coclass_list[] = { + { &CLSID_NetFwMgr, + "NetFwMgr", + NULL, + "hnetcfg.dll", + "Both" + }, + { &CLSID_NetFwAuthorizedApplication, + "NetFwAuthorizedApplication", + NULL, + "hnetcfg.dll", + "Both" + }, + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * interface list + */ +static struct regsvr_interface const interface_list[] = { + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * DllRegisterServer (INETCOMM.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = register_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = register_interfaces(interface_list); + return hr; +} + +/*********************************************************************** + * DllUnregisterServer (INETCOMM.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = unregister_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = unregister_interfaces(interface_list); + return hr; +} Propchange: trunk/reactos/dll/win32/hnetcfg/regsvr.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -31,6 +31,9 @@ <directory name="avifil32"> <xi:include href="avifil32/avifil32.rbuild" /> </directory> +<directory name="bcrypt"> + <xi:include href="bcrypt/bcrypt.rbuild" /> +</directory> <directory name="beepmidi"> <xi:include href="beepmidi/beepmidi.rbuild" /> </directory> @@ -127,6 +130,9 @@ <directory name="hlink"> <xi:include href="hlink/hlink.rbuild" /> </directory> +<directory name="hnetcfg"> + <xi:include href="hnetcfg/hnetcfg.rbuild" /> +</directory> <directory name="httpapi"> <xi:include href="httpapi/httpapi.rbuild" /> </directory> @@ -643,4 +649,7 @@ <directory name="xinput9_1_0"> <xi:include href="xinput9_1_0/xinput9_1_0.rbuild" /> </directory> +<directory name="xmllite"> + <xi:include href="xmllite/xmllite.rbuild" /> +</directory> </group> Propchange: trunk/reactos/dll/win32/xmllite/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Aug 15 15:55:40 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/xmllite/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/xmllite/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/xmllite/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/xmllite/xmllite.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/xmllite.… ============================================================================== --- trunk/reactos/dll/win32/xmllite/xmllite.rbuild (added) +++ trunk/reactos/dll/win32/xmllite/xmllite.rbuild [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,9 @@ +<module name="xmllite" type="win32dll" installbase="system32" installname="xmllite.dll" allowwarnings="true"> + <importlibrary definition="xmllite.spec" /> + <include base="xmllite">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>wine</library> + <library>kernel32</library> + <file>xmllite_main.c</file> +</module> Propchange: trunk/reactos/dll/win32/xmllite/xmllite.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xmllite/xmllite.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/xmllite.… ============================================================================== --- trunk/reactos/dll/win32/xmllite/xmllite.spec (added) +++ trunk/reactos/dll/win32/xmllite/xmllite.spec [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,6 @@ +@ stub CreateXmlReader +@ stub CreateXmlReaderInputWithEncodingCodePage +@ stub CreateXmlReaderInputWithEncodingName +@ stub CreateXmlWriter +@ stub CreateXmlWriterOutputWithEncodingCodePage +@ stub CreateXmlWriterOutputWithEncodingName Propchange: trunk/reactos/dll/win32/xmllite/xmllite.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xmllite/xmllite_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/xmllite_… ============================================================================== --- trunk/reactos/dll/win32/xmllite/xmllite_main.c (added) +++ trunk/reactos/dll/win32/xmllite/xmllite_main.c [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,47 @@ +/* + * XML parsing library + * + * Copyright 2009 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xmllite); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/xmllite/xmllite_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/icftypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/icftypes.idl?… ============================================================================== --- trunk/reactos/include/psdk/icftypes.idl (added) +++ trunk/reactos/include/psdk/icftypes.idl [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,69 @@ +/* + * Types for the ICF api + * + * Copyright 2007 Jeff Latimer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +import "wtypes.idl"; + +typedef enum NET_FW_PROFILE_TYPE_ +{ + NET_FW_PROFILE_DOMAIN, + NET_FW_PROFILE_STANDARD, + NET_FW_PROFILE_CURRENT, + NET_FW_PROFILE_TYPE_MAX +} NET_FW_PROFILE_TYPE; + +typedef enum NET_FW_IP_VERSION_ +{ + NET_FW_IP_VERSION_V4, + NET_FW_IP_VERSION_V6, + NET_FW_IP_VERSION_ANY, + NET_FW_IP_VERSION_MAX +} NET_FW_IP_VERSION; + +typedef enum NET_FW_POLICY_TYPE_ +{ + NET_FW_POLICY_GROUP, + NET_FW_POLICY_LOCAL, + NET_FW_POLICY_EFFECTIVE, + NET_FW_POLICY_TYPE_MAX +} NET_FW_POLICY_TYPE; + +typedef enum NET_FW_SCOPE_ +{ + NET_FW_SCOPE_ALL, + NET_FW_SCOPE_LOCAL_SUBNET, + NET_FW_SCOPE_CUSTOM, + NET_FW_SCOPE_MAX +} NET_FW_SCOPE; + +typedef enum NET_FW_SERVICE_TYPE_ +{ + NET_FW_SERVICE_FILE_AND_PRINT, + NET_FW_SERVICE_UPNP, + NET_FW_SERVICE_REMOTE_DESKTOP, + NET_FW_SERVICE_NONE, + NET_FW_SERVICE_TYPE_MAX +} NET_FW_SERVICE_TYPE; + +typedef enum NET_FW_IP_PROTOCOL_ +{ + NET_FW_IP_PROTOCOL_TCP = 6, + NET_FW_IP_PROTOCOL_UDP = 17 +} NET_FW_IP_PROTOCOL; Propchange: trunk/reactos/include/psdk/icftypes.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/netfw.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netfw.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/netfw.idl (added) +++ trunk/reactos/include/psdk/netfw.idl [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -1,0 +1,470 @@ +/* + * Copyright 2007 Jeff Latimer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + ***************************************************************************** + * + * The firewall management interface + * + */ + +import "icftypes.idl"; +import "oaidl.idl"; + +[ + object, + uuid(A6207B2E-7CDD-426A-951E-5E1CBC5AFEAD), + dual +] +interface INetFwIcmpSettings : IDispatch +{ + [id(1), propget] + HRESULT AllowOutboundDestinationUnreachable([out, retval] VARIANT_BOOL* allow); + + [id(1), propput] + HRESULT AllowOutboundDestinationUnreachable( [in] VARIANT_BOOL allow ); + + [id(2), propget] + HRESULT AllowRedirect( [out, retval] VARIANT_BOOL* allow ); + + [id(2), propput] + HRESULT AllowRedirect( [in] VARIANT_BOOL allow ); + + [id(3), propget] + HRESULT AllowInboundEchoRequest( [out, retval] VARIANT_BOOL* allow ); + + [id(3), propput] + HRESULT AllowInboundEchoRequest( [in] VARIANT_BOOL allow ); + + [id(4), propget] + HRESULT AllowOutboundTimeExceeded( [out, retval] VARIANT_BOOL* allow ); + + [id(4), propput] + HRESULT AllowOutboundTimeExceeded( [in] VARIANT_BOOL allow ); + + [id(5), propget] + HRESULT AllowOutboundParameterProblem( [out, retval] VARIANT_BOOL* allow ); + + [id(5), propput] + HRESULT AllowOutboundParameterProblem( [in] VARIANT_BOOL allow ); + + [id(6), propget] + HRESULT AllowOutboundSourceQuench( [out, retval] VARIANT_BOOL* allow ); + + [id(6), propput] + HRESULT AllowOutboundSourceQuench( [in] VARIANT_BOOL allow ); + + [id(7), propget] + HRESULT AllowInboundRouterRequest( [out, retval] VARIANT_BOOL* allow ); + + [id(7), propput] + HRESULT AllowInboundRouterRequest( [in] VARIANT_BOOL allow ); + + [id(8), propget] + HRESULT AllowInboundTimestampRequest( [out, retval] VARIANT_BOOL* allow ); + + [id(8), propput] + HRESULT AllowInboundTimestampRequest( [in] VARIANT_BOOL allow ); + + [id(9), propget] + HRESULT AllowInboundMaskRequest( [out, retval] VARIANT_BOOL* allow ); + + [id(9), propput] + HRESULT AllowInboundMaskRequest( [in] VARIANT_BOOL allow ); + + [id(10), propget] + HRESULT AllowOutboundPacketTooBig( [out, retval] VARIANT_BOOL* allow ); + + [id(10), propput] + HRESULT AllowOutboundPacketTooBig( [in] VARIANT_BOOL allow ); +} + +[ + object, + uuid(E0483BA0-47FF-4D9C-A6D6-7741D0B195F7), + dual +] +interface INetFwOpenPort : IDispatch +{ + [id(1), propget] + HRESULT Name( [out, retval] BSTR* name ); + + [id(1), propput] + HRESULT Name( [in] BSTR name ); + + [id(2), propget] + HRESULT IpVersion( [out, retval] NET_FW_IP_VERSION* ipVersion ); + + [id(2), propput] + HRESULT IpVersion( [in] NET_FW_IP_VERSION ipVersion ); + + [id(3), propget] + HRESULT Protocol( [out, retval] NET_FW_IP_PROTOCOL* ipProtocol ); + + [id(3), propput] + HRESULT Protocol( [in] NET_FW_IP_PROTOCOL ipProtocol ); + + [id(4), propget] + HRESULT Port( [out, retval] LONG* portNumber ); + + [id(4), propput] + HRESULT Port( [in] LONG portNumber ); + + [id(5), propget] + HRESULT Scope( [out, retval] NET_FW_SCOPE* scope ); + + [id(5), propput] + HRESULT Scope( [in] NET_FW_SCOPE scope ); + + [id(6), propget] + HRESULT RemoteAddresses( [out, retval] BSTR* remoteAddrs ); + + [id(6), propput] + HRESULT RemoteAddresses( [in] BSTR remoteAddrs ); + + [id(7), propget] + HRESULT Enabled( [out, retval] VARIANT_BOOL* enabled ); + + [id(7), propput] + HRESULT Enabled( [in] VARIANT_BOOL enabled ); + + [id(8), propget] + HRESULT BuiltIn( [out, retval] VARIANT_BOOL* builtIn ); +} + +[ + object, + uuid(C0E9D7FA-E07E-430A-B19A-090CE82D92E2), + dual +] +interface INetFwOpenPorts : IDispatch +{ + [id(1), propget] + HRESULT Count( [out, retval] long* count ); + + [id(2)] + HRESULT Add( [in] INetFwOpenPort* port ); + + [id(3)] + HRESULT Remove( [in] LONG portNumber, [in] NET_FW_IP_PROTOCOL ipProtocol ); + + [id(4)] + HRESULT Item( [in] LONG portNumber, [in] NET_FW_IP_PROTOCOL ipProtocol, + [out, retval] INetFwOpenPort** openPort ); + + [id(DISPID_NEWENUM), propget, restricted] + HRESULT _NewEnum( [out, retval] IUnknown** newEnum ); +} + +[ + object, + uuid(79FD57C8-908E-4A36-9888-D5B3F0A444CF), + dual +] +interface INetFwService : IDispatch +{ + [id(1), propget] + HRESULT Name( [out, retval] BSTR* name ); + + [id(2), propget] + HRESULT Type( [out, retval] NET_FW_SERVICE_TYPE* type ); + + [id(3), propget] + HRESULT Customized( [out, retval] VARIANT_BOOL* customized ); + + [id(4), propget] + HRESULT IpVersion( [out, retval] NET_FW_IP_VERSION* ipVersion ); + + [id(4), propput] + HRESULT IpVersion( [in] NET_FW_IP_VERSION ipVersion ); + + [id(5), propget] + HRESULT Scope( [out, retval] NET_FW_SCOPE* scope ); + + [id(5), propput] + HRESULT Scope( [in] NET_FW_SCOPE scope ); + + [id(6), propget] + HRESULT RemoteAddresses( [out, retval] BSTR* remoteAddrs ); + + [id(6), propput] + HRESULT RemoteAddresses( [in] BSTR remoteAddrs ); + + [id(7), propget] + HRESULT Enabled( [out, retval] VARIANT_BOOL* enabled ); + + [id(7), propput] + HRESULT Enabled( [in] VARIANT_BOOL enabled ); + + [id(8), propget] + HRESULT GloballyOpenPorts( [out, retval] INetFwOpenPorts** openPorts ); +} + +[ + object, + uuid(79649BB4-903E-421B-94C9-79848E79F6EE), + dual +] +interface INetFwServices : IDispatch +{ + [id(1), propget] + HRESULT Count( [out, retval] long* count ); + + [id(2)] + HRESULT Item( [in] NET_FW_SERVICE_TYPE svcType, + [out, retval] INetFwService** service ); + + [id(DISPID_NEWENUM), propget, restricted] + HRESULT _NewEnum( [out, retval] IUnknown** newEnum ); +} + +[ + object, + uuid(B5E64FFA-C2C5-444E-A301-FB5E00018050), + dual +] +interface INetFwAuthorizedApplication : IDispatch +{ + [id(1), propget] + HRESULT Name( [out, retval] BSTR* name ); + + [id(1), propput] + HRESULT Name( [in] BSTR name ); + + [id(2), propget] + HRESULT ProcessImageFileName( [out, retval] BSTR* imageFileName ); + + [id(2), propput] + HRESULT ProcessImageFileName( [in] BSTR imageFileName ); + + [id(3), propget] + HRESULT IpVersion( [out, retval] NET_FW_IP_VERSION* ipVersion ); + + [id(3), propput] + HRESULT IpVersion( [in] NET_FW_IP_VERSION ipVersion ); + + [id(4), propget] + HRESULT Scope( [out, retval] NET_FW_SCOPE* scope ); + + [id(4), propput] + HRESULT Scope( [in] NET_FW_SCOPE scope ); + + [id(5), propget] + HRESULT RemoteAddresses( [out, retval] BSTR* remoteAddrs ); + + [id(5), propput] + HRESULT RemoteAddresses( [in] BSTR remoteAddrs ); + + [id(6), propget] + HRESULT Enabled( [out, retval] VARIANT_BOOL* enabled ); + + [id(6), propput] + HRESULT Enabled( [in] VARIANT_BOOL enabled ); +} + +[ + object, + uuid(D4BECDDF-6F73-4A83-B832-9C66874CD20E), + dual +] +interface INetFwRemoteAdminSettings : IDispatch +{ + [id(1), propget] + HRESULT IpVersion( [out, retval] NET_FW_IP_VERSION* ipVersion ); + + [id(1), propput] + HRESULT IpVersion( [in] NET_FW_IP_VERSION ipVersion ); + + [id(2), propget] + HRESULT Scope( [out, retval] NET_FW_SCOPE* scope ); + + [id(2), propput] + HRESULT Scope( [in] NET_FW_SCOPE scope ); + + [id(3), propget] + HRESULT RemoteAddresses( [out, retval] BSTR* remoteAddrs ); + + [id(3), propput] + HRESULT RemoteAddresses( [in] BSTR remoteAddrs ); + + [id(4), propget] + HRESULT Enabled( [out, retval] VARIANT_BOOL* enabled ); + + [id(4), propput] + HRESULT Enabled( [in] VARIANT_BOOL enabled ); +} + + +[ + object, + uuid(644EFD52-CCF9-486C-97A2-39F352570B30), + dual +] +interface INetFwAuthorizedApplications : IDispatch +{ + [id(1), propget] + HRESULT Count( [out, retval] long* count ); + + [id(2)] + HRESULT Add( [in] INetFwAuthorizedApplication* app ); + + [id(3)] + HRESULT Remove( [in] BSTR imageFileName ); + + [id(4)] + HRESULT Item( [in] BSTR imageFileName, + [out, retval] INetFwAuthorizedApplication** app ); + + [id(DISPID_NEWENUM), propget, restricted] + HRESULT _NewEnum( [out, retval] IUnknown** newEnum ); +} + +[ + object, + uuid(174A0DDA-E9F9-449D-993B-21AB667CA456), + dual +] +interface INetFwProfile : IDispatch +{ + [id(1), propget] + HRESULT Type( [out, retval] NET_FW_PROFILE_TYPE* type ); + + [id(2), propget] + HRESULT FirewallEnabled( [out, retval] VARIANT_BOOL* enabled ); + + [id(2), propput] + HRESULT FirewallEnabled( [in] VARIANT_BOOL enabled ); + + [id(3), propget] + HRESULT ExceptionsNotAllowed( [out, retval] VARIANT_BOOL* notAllowed ); + + [id(3), propput] + HRESULT ExceptionsNotAllowed( [in] VARIANT_BOOL notAllowed ); + + [id(4), propget] + HRESULT NotificationsDisabled( [out, retval] VARIANT_BOOL* disabled ); + + [id(4), propput] + HRESULT NotificationsDisabled( [in] VARIANT_BOOL disabled ); + + [id(5), propget] + HRESULT UnicastResponsesToMulticastBroadcastDisabled( [out, retval] VARIANT_BOOL* disabled ); + + [id(5), propput] + HRESULT UnicastResponsesToMulticastBroadcastDisabled( [in] VARIANT_BOOL disabled ); + + [id(6), propget] + HRESULT RemoteAdminSettings( [out, retval] INetFwRemoteAdminSettings** remoteAdminSettings ); + + [id(7), propget] + HRESULT IcmpSettings( [out, retval] INetFwIcmpSettings** icmpSettings ); + + [id(8), propget] + HRESULT GloballyOpenPorts( [out, retval] INetFwOpenPorts** openPorts ); + + [id(9), propget] + HRESULT Services( [out, retval] INetFwServices** services ); + + [id(10), propget] + HRESULT AuthorizedApplications( [out, retval] INetFwAuthorizedApplications** apps ); +} + +[ + object, + uuid(D46D2478-9AC9-4008-9DC7-5563CE5536CC), + dual +] +interface INetFwPolicy : IDispatch +{ + [id(1), propget] + HRESULT CurrentProfile( [out, retval] INetFwProfile** profile ); + + [id(2)] + HRESULT GetProfileByType( [in] NET_FW_PROFILE_TYPE profileType, + [out, retval] INetFwProfile** profile ); +} + +[ + object, + uuid(F7898AF5-CAC4-4632-A2EC-DA06E5111AF2), + dual +] +interface INetFwMgr : IDispatch +{ + [id(1), propget] + HRESULT LocalPolicy( [out, retval] INetFwPolicy** localPolicy ); + + [id(2), propget] + HRESULT CurrentProfileType( [out, retval] NET_FW_PROFILE_TYPE* profileType ); + + [id(3)] + HRESULT RestoreDefaults(); + + [id(4)] + HRESULT IsPortAllowed( [in] BSTR imageFileName, [in] NET_FW_IP_VERSION ipVersion, + [in] LONG portNumber, [in] BSTR localAddress, + [in] NET_FW_IP_PROTOCOL ipProtocol, [out] VARIANT* allowed, + [out] VARIANT* restricted ); + + [id(5)] + HRESULT IsIcmpTypeAllowed( [in] NET_FW_IP_VERSION ipVersion, [in] BSTR localAddress, + [in] BYTE type, [out] VARIANT* allowed, + [out] VARIANT* restricted ); +} + +[ + uuid(DB4F3345-3EF8-45ED-B976-25A6D3B81B71), + version(1.0) +] +library NetFwPublicTypeLib +{ + importlib("stdole2.tlb"); + interface INetFwRemoteAdminSettings; + interface INetFwIcmpSettings; + interface INetFwOpenPort; + interface INetFwOpenPorts; + interface INetFwService; + interface INetFwServices; + interface INetFwAuthorizedApplication; + interface INetFwAuthorizedApplications; + interface INetFwProfile; + interface INetFwPolicy; + interface INetFwMgr; + + [ + uuid(0CA545C6-37AD-4A6C-BF92-9F7610067EF5) + ] + coclass NetFwOpenPort + { + [default] interface INetFwOpenPort; + } + + [ + uuid(EC9846B3-2762-4A6B-A214-6ACB603462D2) + ] + coclass NetFwAuthorizedApplication + { + [default] interface INetFwAuthorizedApplication; + } + + [ + uuid(304CE942-6E39-40D8-943A-B913C40C9CD4) + ] + coclass NetFwMgr + { + [default] interface INetFwMgr; + } +} Propchange: trunk/reactos/include/psdk/netfw.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… ============================================================================== --- trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -16,6 +16,7 @@ <file>hlink.idl</file> <file>htiframe.idl</file> <file>iads.idl</file> + <file>icftypes.idl</file> <file>imnact.idl</file> <file>imnxport.idl</file> <file>indexsrv.idl</file> @@ -26,6 +27,7 @@ <file>mstask.idl</file> <file>msxml.idl</file> <file>msxml2.idl</file> + <file>netfw.idl</file> <file>oaidl.idl</file> <file>objidl.idl</file> <file>objsafe.idl</file> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Aug 15 15:55:40 2009 @@ -43,6 +43,7 @@ reactos/dll/win32/advpack # Autosync reactos/dll/win32/atl # Autosync reactos/dll/win32/avifil32 # Autosync +reactos/dll/win32/bcrypt # Autosync reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Autosync reactos/dll/win32/clusapi # Autosync @@ -61,6 +62,7 @@ reactos/dll/win32/gdiplus # Autosync reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/hlink # Autosync +reactos/dll/win32/hnetcfg # Autosync reactos/dll/win32/httpapi # Autosync reactos/dll/win32/iccvid # Autosync reactos/dll/win32/icmp # Synced to Wine-0_9_10 @@ -177,6 +179,7 @@ reactos/dll/win32/xinput1_2 # Autosync reactos/dll/win32/xinput1_3 # Autosync reactos/dll/win32/xinput9_1_0 # Autosync +reactos/dll/win32/xmllite # Autosync ReactOS shares the following programs with Winehq.

1 0

[janderwald] 42699: - Implement KsGetFirstChild, KsGetNextSibling - Implement IKsFilter_fnAddProcessPin, IKsFilter_fnRemoveProcessPin - Remove old code for attaching so that it works with KsGetFirstChild - Implement attach of filter factories to the device header - Unimplement a few functions which were wrong - Implement KsDispatchSpecificProperty
by janderwald＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: janderwald Date: Sat Aug 15 15:45:06 2009 New Revision: 42699 URL: http://svn.reactos.org/svn/reactos?rev=42699&view=rev Log: - Implement KsGetFirstChild, KsGetNextSibling - Implement IKsFilter_fnAddProcessPin, IKsFilter_fnRemoveProcessPin - Remove old code for attaching so that it works with KsGetFirstChild - Implement attach of filter factories to the device header - Unimplement a few functions which were wrong - Implement KsDispatchSpecificProperty Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/filterfactory.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/ksfunc.h trunk/reactos/drivers/ksfilter/ks/ksiface.h trunk/reactos/drivers/ksfilter/ks/kstypes.h trunk/reactos/drivers/ksfilter/ks/pin.c trunk/reactos/drivers/ksfilter/ks/property.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Sat Aug 15 15:45:06 2009 @@ -1891,7 +1891,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI PVOID @@ -1899,12 +1899,19 @@ KsGetFirstChild( IN PVOID Object) { - UNIMPLEMENTED - return NULL; -} - -/* - @unimplemented + PKSBASIC_HEADER BasicHeader; + + /* get the basic header */ + BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)Object - sizeof(KSBASIC_HEADER)); + + /* type has to be either a device or a filter factory */ + ASSERT(BasicHeader->Type == KsObjectTypeDevice || BasicHeader->Type == KsObjectTypeFilterFactory); + + return (PVOID)BasicHeader->FirstChild.Filter; +} + +/* + @implemented */ KSDDKAPI PVOID @@ -1912,8 +1919,15 @@ KsGetNextSibling( IN PVOID Object) { - UNIMPLEMENTED - return NULL; + PKSBASIC_HEADER BasicHeader; + + /* get the basic header */ + BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)Object - sizeof(KSBASIC_HEADER)); + + ASSERT(BasicHeader->Type == KsObjectTypeDevice || BasicHeader->Type == KsObjectTypeFilterFactory || + BasicHeader->Type == KsObjectTypeFilter || BasicHeader->Type == KsObjectTypePin); + + return (PVOID)BasicHeader->Next.Pin; } /* Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Sat Aug 15 15:45:06 2009 @@ -32,6 +32,9 @@ PFNKSFILTERPOWER Wake; ULONG *PinInstanceCount; + PKSPIN * FirstPin; + KSPROCESSPIN_INDEXENTRY ProcessPinIndex; + }IKsFilterImpl; const GUID IID_IKsControl = {0x28F54685L, 0x06FD, 0x11D2, {0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; @@ -284,8 +287,43 @@ IKsFilter * iface, IN PKSPROCESSPIN ProcessPin) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PKSPROCESSPIN *Pins; + IKsFilterImpl * This = (IKsFilterImpl*)CONTAINING_RECORD(iface, IKsFilterImpl, lpVtbl); + + /* first acquire processing mutex */ + KeWaitForSingleObject(&This->ProcessingMutex, Executive, KernelMode, FALSE, NULL); + + /* allocate new pins array */ + Pins = AllocateItem(NonPagedPool, sizeof(PKSPROCESSPIN) * (This->ProcessPinIndex.Count + 1)); + + /* check if allocation succeeded */ + if (Pins) + { + if (This->ProcessPinIndex.Count) + { + /* copy old pin index */ + RtlMoveMemory(Pins, This->ProcessPinIndex.Pins, sizeof(PKSPROCESSPIN) * This->ProcessPinIndex.Count); + } + + /* add new process pin */ + Pins[This->ProcessPinIndex.Count] = ProcessPin; + + /* free old process pin */ + FreeItem(This->ProcessPinIndex.Pins); + + /* store new process pin index */ + This->ProcessPinIndex.Pins = Pins; + This->ProcessPinIndex.Count++; + } + + /* release process mutex */ + KeReleaseMutex(&This->ProcessingMutex, FALSE); + + if (Pins) + return STATUS_SUCCESS; + else + return STATUS_INSUFFICIENT_RESOURCES; + } NTSTATUS @@ -294,8 +332,33 @@ IKsFilter * iface, IN PKSPROCESSPIN ProcessPin) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + ULONG Index; + IKsFilterImpl * This = (IKsFilterImpl*)CONTAINING_RECORD(iface, IKsFilterImpl, lpVtbl); + + /* first acquire processing mutex */ + KeWaitForSingleObject(&This->ProcessingMutex, Executive, KernelMode, FALSE, NULL); + + /* iterate through process pin index array and search for the process pin to be removed */ + for(Index = 0; Index < This->ProcessPinIndex.Count; Index++) + { + if (This->ProcessPinIndex.Pins[Index] == ProcessPin) + { + /* found process pin */ + if (Index + 1 < This->ProcessPinIndex.Count) + { + /* erase entry */ + RtlMoveMemory(&This->ProcessPinIndex.Pins[Index], &This->ProcessPinIndex.Pins[Index+1], This->ProcessPinIndex.Count - Index - 1); + } + /* decrement process pin count */ + This->ProcessPinIndex.Count--; + } + } + + /* release process mutex */ + KeReleaseMutex(&This->ProcessingMutex, FALSE); + + /* done */ + return STATUS_SUCCESS; } BOOL @@ -437,8 +500,8 @@ /* complete irp */ IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* remove our instance from the filter factory */ - This->FilterFactory->lpVtbl->RemoveFilterInstance(This->FilterFactory, Filter); + /* FIXME remove our instance from the filter factory */ + ASSERT(0); /* free object header */ KsFreeObjectHeader(This->ObjectHeader); @@ -726,6 +789,15 @@ return STATUS_INSUFFICIENT_RESOURCES; } + /* allocate first pin array */ + This->FirstPin = AllocateItem(NonPagedPool, sizeof(PKSPIN) * FilterDescriptor->PinDescriptorsCount); + if(!This->FirstPin) + { + FreeItem(This->PinDescriptors); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* allocate pin descriptor array */ This->PinDescriptors = AllocateItem(NonPagedPool, sizeof(KSPIN_DESCRIPTOR) * FilterDescriptor->PinDescriptorsCount); if(!This->PinDescriptors) @@ -852,6 +924,50 @@ return STATUS_SUCCESS; } + +NTSTATUS +IKsFilter_AddPin( + IKsFilter * Filter, + PKSPIN Pin) +{ + PKSPIN NextPin, CurPin; + PKSBASIC_HEADER BasicHeader; + IKsFilterImpl * This = (IKsFilterImpl*)Filter; + + /* sanity check */ + ASSERT(Pin->Id < This->PinDescriptorCount); + + if (This->FirstPin[Pin->Id] == NULL) + { + /* welcome first pin */ + This->FirstPin[Pin->Id] = Pin; + return STATUS_SUCCESS; + } + + /* get first pin */ + CurPin = This->FirstPin[Pin->Id]; + + do + { + /* get next instantiated pin */ + NextPin = KsPinGetNextSiblingPin(CurPin); + if (!NextPin) + break; + + NextPin = CurPin; + + }while(NextPin != NULL); + + /* get basic header */ + BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)CurPin - sizeof(KSBASIC_HEADER)); + + /* store pin */ + BasicHeader->Next.Pin = Pin; + + return STATUS_SUCCESS; +} + + NTSTATUS NTAPI IKsFilter_DispatchCreatePin( @@ -920,6 +1036,54 @@ return STATUS_UNSUCCESSFUL; } + +VOID +IKsFilter_AttachFilterToFilterFactory( + IKsFilterImpl * This, + PKSFILTERFACTORY FilterFactory) +{ + PKSBASIC_HEADER BasicHeader; + PKSFILTER Filter; + + + /* get filter factory basic header */ + BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)FilterFactory - sizeof(KSBASIC_HEADER)); + + /* sanity check */ + ASSERT(BasicHeader->Type == KsObjectTypeFilterFactory); + + if (BasicHeader->FirstChild.FilterFactory == NULL) + { + /* welcome first instantiated filter */ + BasicHeader->FirstChild.Filter = &This->Filter; + return; + } + + /* set to first entry */ + Filter = BasicHeader->FirstChild.Filter; + + do + { + /* get basic header */ + BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)Filter - sizeof(KSBASIC_HEADER)); + /* sanity check */ + ASSERT(BasicHeader->Type == KsObjectTypeFilter); + + if (BasicHeader->Next.Filter) + { + /* iterate to next filter factory */ + Filter = BasicHeader->Next.Filter; + } + else + { + /* found last entry */ + break; + } + }while(FilterFactory); + + /* attach filter factory */ + BasicHeader->Next.Filter = &This->Filter; +} NTSTATUS NTAPI @@ -1016,10 +1180,6 @@ InitializeListHead(&This->Header.EventList); KeInitializeSpinLock(&This->Header.EventListLock); - - - - /* allocate the stream descriptors */ Status = IKsFilter_CreateDescriptors(This, (PKSFILTER_DESCRIPTOR)Factory->FilterDescriptor); if (!NT_SUCCESS(Status)) @@ -1030,17 +1190,6 @@ return Status; } - /* now add the filter instance to the filter factory */ - Status = iface->lpVtbl->AddFilterInstance(iface, (IKsFilter*)&This->lpVtbl); - - if (!NT_SUCCESS(Status)) - { - /* failed to add filter */ - FreeItem(This); - FreeItem(CreateItem); - return Status; - } - /* does the filter have a filter dispatch */ if (Factory->FilterDescriptor->Dispatch) { @@ -1054,9 +1203,6 @@ { /* driver failed to initialize */ DPRINT1("Driver: Status %x\n", Status); - - /* remove filter instance from filter factory */ - iface->lpVtbl->RemoveFilterInstance(iface, (IKsFilter*)&This->lpVtbl); /* free filter instance */ FreeItem(This); @@ -1081,6 +1227,8 @@ This->ObjectHeader->Unknown = (PUNKNOWN)&This->lpVtbl; This->ObjectHeader->ObjectType = (PVOID)&This->Filter; + /* attach filter to filter factory */ + IKsFilter_AttachFilterToFilterFactory(This, This->Header.Parent.KsFilterFactory); /* completed initialization */ return Status; @@ -1205,6 +1353,7 @@ ULONG *PinInstanceCount; KSPIN_DESCRIPTOR_EX * PinDescriptorsEx; KSPIN_DESCRIPTOR * PinDescriptors; + PKSPIN *FirstPin; IKsFilterImpl * This = (IKsFilterImpl*)CONTAINING_RECORD(Filter, IKsFilterImpl, Filter); /* calculate existing count */ @@ -1234,6 +1383,17 @@ return STATUS_INSUFFICIENT_RESOURCES; } + /* allocate first pin array */ + FirstPin = AllocateItem(NonPagedPool, sizeof(PKSPIN) * Count); + if (!FirstPin) + { + /* not enough memory */ + FreeItem(PinDescriptorsEx); + FreeItem(PinInstanceCount); + FreeItem(PinDescriptors); + return STATUS_INSUFFICIENT_RESOURCES; + } + /* now copy all fields */ if (Count > 1) { @@ -1241,11 +1401,13 @@ RtlMoveMemory(PinDescriptorsEx, This->Filter.Descriptor->PinDescriptors, max(This->Filter.Descriptor->PinDescriptorSize, sizeof(KSPIN_DESCRIPTOR_EX)) * This->PinDescriptorCount); RtlMoveMemory(PinInstanceCount, This->PinInstanceCount, This->PinDescriptorCount * sizeof(ULONG)); RtlMoveMemory(PinDescriptors, This->PinDescriptors, sizeof(KSPIN_DESCRIPTOR) * This->PinDescriptorCount); + RtlMoveMemory(FirstPin, This->FirstPin, sizeof(PKSPIN) * This->PinDescriptorCount); /* now free old descriptors */ FreeItem(This->PinInstanceCount); FreeItem((PVOID)This->Filter.Descriptor->PinDescriptors); FreeItem(This->PinDescriptors); + FreeItem(This->FirstPin); } /* add new pin factory */ @@ -1258,6 +1420,7 @@ This->PinDescriptors = PinDescriptors; This->PinInstanceCount = PinInstanceCount; + This->FirstPin = FirstPin; /* store new pin id */ *PinID = This->PinDescriptorCount; @@ -1304,7 +1467,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI PKSPIN @@ -1313,8 +1476,16 @@ IN PKSFILTER Filter, IN ULONG PinId) { - UNIMPLEMENTED - return NULL; + IKsFilterImpl * This = (IKsFilterImpl*)CONTAINING_RECORD(Filter, IKsFilterImpl, Filter); + + if (PinId >= This->PinDescriptorCount) + { + /* index is out of bounds */ + return NULL; + } + + /* return first pin index */ + return This->FirstPin[PinId]; } /* Modified: trunk/reactos/drivers/ksfilter/ks/filterfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] Sat Aug 15 15:45:06 2009 @@ -21,16 +21,7 @@ PFNKSFILTERFACTORYPOWER WakeCallback; LIST_ENTRY SymbolicLinkList; - LIST_ENTRY FilterInstanceList; }IKsFilterFactoryImpl; - -typedef struct -{ - LIST_ENTRY Entry; - IKsFilter *FilterInstance; -}FILTER_INSTANCE_ENTRY, *PFILTER_INSTANCE_ENTRY; - - VOID NTAPI @@ -153,6 +144,47 @@ IKsFilterFactoryImpl * This = (IKsFilterFactoryImpl*)CONTAINING_RECORD(iface, IKsFilterFactoryImpl, lpVtbl); return KspSetDeviceInterfacesState(&This->SymbolicLinkList, Enable); +} + +VOID +IKsFilterFactory_AttachFilterFactoryToDeviceHeader( + IKsFilterFactoryImpl * This, + PKSIDEVICE_HEADER DeviceHeader) +{ + PKSBASIC_HEADER BasicHeader; + PKSFILTERFACTORY FilterFactory; + + if (DeviceHeader->BasicHeader.FirstChild.FilterFactory == NULL) + { + /* first attached filter factory */ + DeviceHeader->BasicHeader.FirstChild.FilterFactory = &This->FilterFactory; + return; + } + + /* set to first entry */ + FilterFactory = DeviceHeader->BasicHeader.FirstChild.FilterFactory; + + do + { + /* get basic header */ + BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)FilterFactory - sizeof(KSBASIC_HEADER)); + /* sanity check */ + ASSERT(BasicHeader->Type == KsObjectTypeFilterFactory); + + if (BasicHeader->Next.FilterFactory) + { + /* iterate to next filter factory */ + FilterFactory = BasicHeader->Next.FilterFactory; + } + else + { + /* found last entry */ + break; + } + }while(FilterFactory); + + /* attach filter factory */ + BasicHeader->Next.FilterFactory = &This->FilterFactory; } NTSTATUS @@ -196,7 +228,6 @@ InitializeListHead(&This->SymbolicLinkList); - InitializeListHead(&This->FilterInstanceList); /* initialize filter factory control mutex */ KeInitializeMutex(&This->Header.ControlMutex, 0); @@ -273,60 +304,11 @@ } } + /* attach filterfactory to device header */ + IKsFilterFactory_AttachFilterFactoryToDeviceHeader(This, DeviceExtension->DeviceHeader); /* return result */ return Status; -} - -NTSTATUS -NTAPI -IKsFilterFactory_fnAddFilterInstance( - IKsFilterFactory * iface, - IN IKsFilter *FilterInstance) -{ - PFILTER_INSTANCE_ENTRY Entry; - IKsFilterFactoryImpl * This = (IKsFilterFactoryImpl*)CONTAINING_RECORD(iface, IKsFilterFactoryImpl, lpVtbl); - - /* allocate filter instance entry */ - Entry = AllocateItem(NonPagedPool, sizeof(FILTER_INSTANCE_ENTRY)); - if (!Entry) - return STATUS_INSUFFICIENT_RESOURCES; - - /* initialize filter instance entry */ - Entry->FilterInstance = FilterInstance; - - /* insert entry */ - InsertTailList(&This->FilterInstanceList, &Entry->Entry); - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -IKsFilterFactory_fnRemoveFilterInstance( - IKsFilterFactory * iface, - IN IKsFilter *FilterInstance) -{ - PFILTER_INSTANCE_ENTRY InstanceEntry; - PLIST_ENTRY Entry; - IKsFilterFactoryImpl * This = (IKsFilterFactoryImpl*)CONTAINING_RECORD(iface, IKsFilterFactoryImpl, lpVtbl); - - /* point to first entry */ - Entry = This->FilterInstanceList.Flink; - - while(Entry != &This->FilterInstanceList) - { - InstanceEntry = (PFILTER_INSTANCE_ENTRY)CONTAINING_RECORD(Entry, FILTER_INSTANCE_ENTRY, Entry); - if (InstanceEntry->FilterInstance == FilterInstance) - { - /* found entry */ - RemoveEntryList(&InstanceEntry->Entry); - FreeItem(InstanceEntry); - return STATUS_SUCCESS; - } - } - - /* entry not in list! */ - return STATUS_NOT_FOUND; } static IKsFilterFactoryVtbl vt_IKsFilterFactoryVtbl = @@ -336,9 +318,7 @@ IKsFilterFactory_fnRelease, IKsFilterFactory_fnGetStruct, IKsFilterFactory_fnSetDeviceClassesState, - IKsFilterFactory_fnInitialize, - IKsFilterFactory_fnAddFilterInstance, - IKsFilterFactory_fnRemoveFilterInstance + IKsFilterFactory_fnInitialize }; Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Sat Aug 15 15:45:06 2009 @@ -112,20 +112,6 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; -} - -/* - @unimplemented -*/ -KSDDKAPI -NTSTATUS -NTAPI -KsDispatchSpecificProperty( - IN PIRP Irp, - IN PFNKSHANDLER Handler) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; } /* Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Sat Aug 15 15:45:06 2009 @@ -117,12 +117,17 @@ NTSTATUS KspCreatePin( IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, + IN PIRP Irp, IN PKSDEVICE KsDevice, - IN IKsFilterFactory * FilterFactory, + IN IKsFilterFactory * FilterFactory, IN IKsFilter* Filter, IN PKSPIN_CONNECT Connect, IN KSPIN_DESCRIPTOR_EX* Descriptor); + +NTSTATUS +IKsFilter_AddPin( + IKsFilter * Filter, + PKSPIN Pin); NTSTATUS KspAddCreateItemToList( Modified: trunk/reactos/drivers/ksfilter/ks/ksiface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksifac… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksiface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksiface.h [iso-8859-1] Sat Aug 15 15:45:06 2009 @@ -237,12 +237,6 @@ IN PFNKSFILTERFACTORYPOWER SleepCallback OPTIONAL, IN PFNKSFILTERFACTORYPOWER WakeCallback OPTIONAL, OUT PKSFILTERFACTORY *FilterFactory OPTIONAL)PURE; - - STDMETHOD_(NTSTATUS, AddFilterInstance)(THIS_ - IN IKsFilter *Filter)PURE; - - STDMETHOD_(NTSTATUS, RemoveFilterInstance)(THIS_ - IN IKsFilter *Filter)PURE; }; Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Sat Aug 15 15:45:06 2009 @@ -62,13 +62,26 @@ KMUTEX ControlMutex; LIST_ENTRY EventList; KSPIN_LOCK EventListLock; - union { PKSDEVICE KsDevice; PKSFILTERFACTORY KsFilterFactory; PKSFILTER KsFilter; }Parent; + + union + { + PKSFILTERFACTORY FilterFactory; + PKSFILTER Filter; + PKSPIN Pin; + }Next; + + union + { + PKSFILTERFACTORY FilterFactory; + PKSFILTER Filter; + }FirstChild; + }KSBASIC_HEADER, *PKSBASIC_HEADER; typedef struct Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Sat Aug 15 15:45:06 2009 @@ -25,6 +25,7 @@ KSBASIC_HEADER BasicHeader; KSPIN Pin; PKSIOBJECT_HEADER ObjectHeader; + KSPROCESSPIN ProcessPin; LIST_ENTRY Entry; IKsPinVtbl *lpVtbl; @@ -370,17 +371,15 @@ } /* - @implemented + @unimplemented */ PDEVICE_OBJECT NTAPI KsPinGetConnectedPinDeviceObject( IN PKSPIN Pin) { - IKsPinImpl * This = (IKsPinImpl*)CONTAINING_RECORD(Pin, IKsPinImpl, Pin); - - /* return related file object */ - return IoGetRelatedDeviceObject(This->FileObject); + UNIMPLEMENTED + return NULL; } /* @@ -391,11 +390,12 @@ KsPinGetConnectedPinFileObject( IN PKSPIN Pin) { + UNIMPLEMENTED return NULL; } /* - @implemented + @unimplemented */ NTSTATUS NTAPI @@ -404,14 +404,8 @@ IN const GUID* InterfaceId, OUT PVOID* Interface) { - IKsPin * KsPin; - IKsPinImpl * This = (IKsPinImpl*)CONTAINING_RECORD(Pin, IKsPinImpl, Pin); - - /* get pin interface */ - KsPin = (IKsPin*)&This->lpVtbl; - - /* query pin interface for the requested interface */ - return KsPin->lpVtbl->QueryInterface(KsPin, InterfaceId, Interface); + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; } /* @@ -1186,6 +1180,30 @@ This->ObjectHeader->Unknown = (PUNKNOWN)&This->lpVtbl; This->ObjectHeader->ObjectType = (PVOID)&This->Pin; + /* setup process pin */ + This->ProcessPin.Pin = &This->Pin; + This->ProcessPin.StreamPointer = (PKSSTREAM_POINTER)This->LeadingEdgeStreamPointer; + + if (!Descriptor->Dispatch || !Descriptor->Dispatch->Process) + { + /* the pin is part of filter-centric processing filter + * add process pin to filter + */ + + Status = Filter->lpVtbl->AddProcessPin(Filter, &This->ProcessPin); + if (!NT_SUCCESS(Status)) + { + /* failed to add process pin */ + KsFreeObjectBag((KSOBJECT_BAG)This->Pin.Bag); + KsFreeObjectHeader(&This->ObjectHeader); + + /* return failure code */ + return Status; + } + } + + /* FIXME add pin instance to filter instance */ + /* does the driver have a pin dispatch */ if (Descriptor->Dispatch && Descriptor->Dispatch->Create) { @@ -1204,7 +1222,5 @@ return Status; } - /* FIXME add pin instance to filter instance */ - return Status; } Modified: trunk/reactos/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] Sat Aug 15 15:45:06 2009 @@ -200,7 +200,7 @@ /* - @unimplemented + @implemented */ KSDDKAPI BOOLEAN @@ -280,3 +280,22 @@ } return FALSE; } + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsDispatchSpecificProperty( + IN PIRP Irp, + IN PFNKSHANDLER Handler) +{ + PIO_STACK_LOCATION IoStack; + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + return Handler(Irp, IoStack->Parameters.DeviceIoControl.Type3InputBuffer, Irp->UserBuffer); +} +

1 0

[janderwald] 42698: - Add dmksctrl.h - Add KsPinGetNextSiblingPin prototype
by janderwald＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: janderwald Date: Sat Aug 15 15:38:15 2009 New Revision: 42698 URL: http://svn.reactos.org/svn/reactos?rev=42698&view=rev Log: - Add dmksctrl.h - Add KsPinGetNextSiblingPin prototype Added: trunk/reactos/include/ddk/dmksctrl.h (with props) Modified: trunk/reactos/include/psdk/ks.h Added: trunk/reactos/include/ddk/dmksctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmksctrl.h?rev… ============================================================================== --- trunk/reactos/include/ddk/dmksctrl.h (added) +++ trunk/reactos/include/ddk/dmksctrl.h [iso-8859-1] Sat Aug 15 15:38:15 2009 @@ -1,0 +1,43 @@ +#ifndef _IKsControl_ +#define _IKsControl_ + +#undef INTERFACE +#define INTERFACE IKsControl +DECLARE_INTERFACE_(IKsControl, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + + /*IKsControl*/ + STDMETHOD(KsProperty)( + THIS_ + IN PKSPROPERTY Property, + IN ULONG PropertyLength, + IN OUT LPVOID PropertyData, + IN ULONG DataLength, + OUT ULONG* BytesReturned + ) PURE; + STDMETHOD(KsMethod)( + THIS_ + IN PKSMETHOD Method, + IN ULONG MethodLength, + IN OUT LPVOID MethodData, + IN ULONG DataLength, + OUT ULONG* BytesReturned + ) PURE; + STDMETHOD(KsEvent)( + THIS_ + IN PKSEVENT Event OPTIONAL, + IN ULONG EventLength, + IN OUT LPVOID EventData, + IN ULONG DataLength, + OUT ULONG* BytesReturned + ) PURE; +}; + +#endif + + + Propchange: trunk/reactos/include/ddk/dmksctrl.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4269… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Sat Aug 15 15:38:15 2009 @@ -3203,6 +3203,11 @@ IN PKSPIN Pin ); +KSDDKAPI PKSPIN NTAPI +KsPinGetNextSiblingPin( + IN PKSPIN Pin + ); + /* Does this belong here? */

1 0

[fireball] 42697: - Update mouse pointer code from trunk. Color cursors aren't supported due to absence of EXLATEOBJs.
by fireball＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: fireball Date: Sat Aug 15 14:59:07 2009 New Revision: 42697 URL: http://svn.reactos.org/svn/reactos?rev=42697&view=rev Log: - Update mouse pointer code from trunk. Color cursors aren't supported due to absence of EXLATEOBJs. Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c [iso-8859-1] Sat Aug 15 14:59:07 2009 @@ -13,7 +13,6 @@ #include <debug.h> #define TAG_MOUSE TAG('M', 'O', 'U', 'S') /* mouse */ -#define GDIDEV(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev)) /* PUBLIC FUNCTIONS **********************************************************/ @@ -59,7 +58,7 @@ ptlSave.y = rclDest.top - pt.y; GrepBitBltEx(psoDest, - pgp->psurfSave, + &pgp->psurfSave->SurfObj, NULL, NULL, NULL, @@ -108,7 +107,7 @@ rclPointer.bottom = min(pgp->Size.cy, psoDest->sizlBitmap.cy - pt.y); /* Copy the pixels under the cursor to temporary surface. */ - GrepBitBltEx(pgp->psurfSave, + GrepBitBltEx(&pgp->psurfSave->SurfObj, psoDest, NULL, NULL, @@ -125,8 +124,8 @@ if (pgp->psurfColor) { GrepBitBltEx(psoDest, - pgp->psurfColor, - pgp->psurfMask, + &pgp->psurfColor->SurfObj, + &pgp->psurfMask->SurfObj, NULL, pgp->XlateObject, &rclSurf, @@ -140,7 +139,7 @@ else { GrepBitBltEx(psoDest, - pgp->psurfMask, + &pgp->psurfMask->SurfObj, NULL, NULL, pgp->XlateObject, @@ -155,7 +154,7 @@ rclPointer.top += pgp->Size.cy; GrepBitBltEx(psoDest, - pgp->psurfMask, + &pgp->psurfMask->SurfObj, NULL, NULL, pgp->XlateObject, @@ -272,55 +271,65 @@ { PDEVOBJ *ppdev; GDIPOINTER *pgp; - PBYTE Bits; - SIZEL Size; LONG lDelta; HBITMAP hbmp; + RECTL rcl; ASSERT(pso); ppdev = GDIDEV(pso); pgp = &ppdev->Pointer; + if (psoColor) + { + pgp->Size.cx = psoColor->sizlBitmap.cx; + pgp->Size.cy = psoColor->sizlBitmap.cy; + if (psoMask) + { + // CHECKME: Is this really required? if we have a color surface, + // we only need the AND part of the mask. + /* Check if the sizes match as they should */ + if (psoMask->sizlBitmap.cx != psoColor->sizlBitmap.cx || + psoMask->sizlBitmap.cy != psoColor->sizlBitmap.cy * 2) + { + DPRINT("Sizes of mask (%ld,%ld) and color (%ld,%ld) don't match\n", + psoMask->sizlBitmap.cx, psoMask->sizlBitmap.cy, + psoColor->sizlBitmap.cx, psoColor->sizlBitmap.cy); +// return SPS_ERROR; + } + } + } + else if (psoMask) + { + pgp->Size.cx = psoMask->sizlBitmap.cx; + pgp->Size.cy = psoMask->sizlBitmap.cy / 2; + } + IntHideMousePointer(ppdev, pso); if (pgp->psurfColor) { - /* FIXME: let GDI allocate/free memory */ - EngFreeMem(pgp->psurfColor->pvBits); - pgp->psurfColor->pvBits = 0; - - EngDeleteSurface(pgp->psurfColor->hsurf); + EngDeleteSurface(pgp->psurfColor->BaseObject.hHmgr); SURFACE_ShareUnlock(pgp->psurfColor); pgp->psurfColor = NULL; } if (pgp->psurfMask) { - /* FIXME: let GDI allocate/free memory */ - EngFreeMem(pgp->psurfMask->pvBits); - pgp->psurfMask->pvBits = 0; - - EngDeleteSurface(pgp->psurfMask->hsurf); + EngDeleteSurface(pgp->psurfMask->BaseObject.hHmgr); SURFACE_ShareUnlock(pgp->psurfMask); pgp->psurfMask = NULL; } if (pgp->psurfSave != NULL) { - EngDeleteSurface(pgp->psurfSave->hsurf); + EngDeleteSurface(pgp->psurfSave->BaseObject.hHmgr); SURFACE_ShareUnlock(pgp->psurfSave); pgp->psurfSave = NULL; } - if (pgp->XlateObject != NULL) - { - EngDeleteXlate(pgp->XlateObject); - pgp->XlateObject = NULL; - } - /* See if we are being asked to hide the pointer. */ - if (psoMask == NULL) + if (psoMask == NULL && psoColor == NULL) { return SPS_ACCEPT_NOEXCLUDE; } @@ -328,113 +337,94 @@ pgp->HotSpot.x = xHot; pgp->HotSpot.y = yHot; - if (x != -1) - { - ptlPointer.x = x; - ptlPointer.y = y; - } - - pgp->Size.cx = abs(psoMask->lDelta) << 3; - pgp->Size.cy = (psoMask->cjBits / abs(psoMask->lDelta)) >> 1; - - if (psoColor != NULL) - { - /* FIXME: let GDI allocate/free memory */ - Bits = EngAllocMem(0, psoColor->cjBits, TAG_MOUSE); - if (Bits == NULL) - { - return SPS_ERROR; - } - - memcpy(Bits, psoColor->pvBits, psoColor->cjBits); - - hbmp = EngCreateBitmap(pgp->Size, - psoColor->lDelta, - psoColor->iBitmapFormat, - psoColor->lDelta < 0 ? 0 : BMF_TOPDOWN, - Bits); - - pgp->psurfColor = EngLockSurface(hbmp); - } - else - { - pgp->psurfColor = NULL; - } - - Size.cx = pgp->Size.cx; - Size.cy = pgp->Size.cy << 1; - Bits = EngAllocMem(0, psoMask->cjBits, TAG_MOUSE); - if (Bits == NULL) - { - return SPS_ERROR; - } - - memcpy(Bits, psoMask->pvBits, psoMask->cjBits); - - hbmp = EngCreateBitmap(Size, - psoMask->lDelta, - psoMask->iBitmapFormat, - psoMask->lDelta < 0 ? 0 : BMF_TOPDOWN, - Bits); - - pgp->psurfMask = EngLockSurface(hbmp); - - /* Create an XLATEOBJ that will be used for drawing masks. - * FIXME: We should get this in pxlo parameter! */ - if (pxlo == NULL) - { - HPALETTE BWPalette, DestPalette; - ULONG BWColors[] = {0, 0xFFFFFF}; - - BWPalette = EngCreatePalette(PAL_INDEXED, sizeof(BWColors) / sizeof(ULONG), - BWColors, 0, 0, 0); - - DestPalette = ppdev->DevInfo.hpalDefault; - pgp->XlateObject = IntEngCreateXlate(0, 0, - DestPalette, BWPalette); - EngDeletePalette(BWPalette); - } - else - { - pgp->XlateObject = pxlo; - } + /* Calculate lDelta for our surfaces. */ + lDelta = DIB_GetDIBWidthBytes(pgp->Size.cx, + BitsPerFormat(pso->iBitmapFormat)); + + rcl.left = 0; + rcl.top = 0; + rcl.right = pgp->Size.cx; + rcl.bottom = pgp->Size.cy; /* Create surface for saving the pixels under the cursor. */ - switch (pso->iBitmapFormat) - { - case BMF_1BPP: - lDelta = pgp->Size.cx >> 3; - break; - case BMF_4BPP: - lDelta = pgp->Size.cx >> 1; - break; - case BMF_8BPP: - lDelta = pgp->Size.cx; - break; - case BMF_16BPP: - lDelta = pgp->Size.cx << 1; - break; - case BMF_24BPP: - lDelta = pgp->Size.cx * 3; - break; - case BMF_32BPP: - lDelta = pgp->Size.cx << 2; - break; - default: - lDelta = 0; - break; - } - hbmp = EngCreateBitmap(pgp->Size, lDelta, pso->iBitmapFormat, BMF_TOPDOWN | BMF_NOZEROINIT, NULL); - - pgp->psurfSave = EngLockSurface(hbmp); + pgp->psurfSave = SURFACE_ShareLock(hbmp); + + /* Create a mask surface */ + if (psoMask) + { + //EXLATEOBJ exlo; + PPALETTE ppal; + + hbmp = EngCreateBitmap(psoMask->sizlBitmap, + lDelta, + pso->iBitmapFormat, + BMF_TOPDOWN | BMF_NOZEROINIT, + NULL); + pgp->psurfMask = SURFACE_ShareLock(hbmp); + + if(pgp->psurfMask) + { + ppal = PALETTE_LockPalette(ppdev->DevInfo.hpalDefault); + /*EXLATEOBJ_vInitialize(&exlo, + &gpalMono, + ppal, + 0, + RGB(0xff,0xff,0xff), + RGB(0,0,0));*/ + + rcl.bottom = psoMask->sizlBitmap.cy; + GreCopyBits(&pgp->psurfMask->SurfObj, + psoMask, + NULL, + NULL,//&exlo.xlo, + &rcl, + (POINTL*)&rcl); + + //EXLATEOBJ_vCleanup(&exlo); + if (ppal) + PALETTE_UnlockPalette(ppal); + } + } + else + { + pgp->psurfMask = NULL; + } + + /* Create a color surface */ + if (psoColor) + { + hbmp = EngCreateBitmap(psoColor->sizlBitmap, + lDelta, + pso->iBitmapFormat, + BMF_TOPDOWN | BMF_NOZEROINIT, + NULL); + pgp->psurfColor = SURFACE_ShareLock(hbmp); + if (pgp->psurfColor) + { + rcl.bottom = psoColor->sizlBitmap.cy; + GreCopyBits(&pgp->psurfColor->SurfObj, + psoColor, + NULL, + pxlo, + &rcl, + (POINTL*)&rcl); + } + } + else + { + pgp->psurfColor = NULL; + } if (x != -1) { + ptlPointer.x = x; + ptlPointer.y = y; + IntShowMousePointer(ppdev, pso); if (prcl != NULL) @@ -444,8 +434,11 @@ prcl->right = prcl->left + pgp->Size.cx; prcl->bottom = prcl->top + pgp->Size.cy; } - } else if (prcl != NULL) + } + else if (prcl != NULL) + { prcl->left = prcl->top = prcl->right = prcl->bottom = -1; + } return SPS_ACCEPT_NOEXCLUDE; } Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] Sat Aug 15 14:59:07 2009 @@ -26,7 +26,6 @@ SURFACE_UnlockBitmapBits(pSurf); } - ULONG NTAPI GreSetPointerShape( IN SURFOBJ *pso, @@ -41,9 +40,9 @@ IN FLONG fl) { ULONG ulResult = SPS_DECLINE; + SURFACE *pSurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); PFN_DrvSetPointerShape pfnSetPointerShape; - PPDEVOBJ ppdev = &PrimarySurface; - SURFACE *pSurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); + PPDEVOBJ ppdev = GDIDEV(pso); pfnSetPointerShape = GDIDEVFUNCS(pso).SetPointerShape; @@ -96,128 +95,83 @@ NTAPI GreSetCursor(ICONINFO* NewCursor, PSYSTEM_CURSORINFO CursorInfo) { - SURFOBJ *pso; - SURFACE *MaskBmpObj = NULL; - HBITMAP hMask = 0; - SURFOBJ *soMask = NULL, *soColor = NULL; - XLATEOBJ *XlateObj = NULL; - ULONG Status; + SURFOBJ *pso; + HBITMAP hbmMask, hbmColor; + PSURFACE psurfMask, psurfColor; + XLATEOBJ *XlateObj = NULL; + ULONG Status; - pso = EngLockSurface(PrimarySurface.pSurface); + pso = EngLockSurface(PrimarySurface.pSurface); - if (!NewCursor) - { - if (CursorInfo->ShowingCursor) - { + if (!NewCursor) + { + if (CursorInfo->ShowingCursor) + { DPRINT("Removing pointer!\n"); /* Remove the cursor if it was displayed */ GreMovePointer(pso, -1, -1, NULL); - } + } + CursorInfo->ShowingCursor = 0; + EngUnlockSurface(pso); + return TRUE; + } - CursorInfo->ShowingCursor = 0; + CursorInfo->ShowingCursor = TRUE; + CursorInfo->CurrentCursorObject = *NewCursor; - EngUnlockSurface(pso); + hbmMask = NewCursor->hbmMask; + hbmColor = NewCursor->hbmColor; - return TRUE; - } + /* Lock the mask bitmap */ + if (hbmMask) + psurfMask = SURFACE_ShareLock(hbmMask); + else + psurfMask = NULL; - MaskBmpObj = SURFACE_Lock(NewCursor->hbmMask); - if (MaskBmpObj) - { - const int maskBpp = BitsPerFormat(MaskBmpObj->SurfObj.iBitmapFormat); - SURFACE_Unlock(MaskBmpObj); - if (maskBpp != 1) - { - DPRINT1("SetCursor: The Mask bitmap must have 1BPP!\n"); - EngUnlockSurface(pso); - return FALSE; - } - - if ((PrimarySurface.DevInfo.flGraphicsCaps2 & GCAPS2_ALPHACURSOR) && - pso->iBitmapFormat >= BMF_16BPP && - pso->iBitmapFormat <= BMF_32BPP) - { - /* FIXME - Create a color pointer, only 32bit bitmap, set alpha bits! - Do not pass a mask bitmap to DrvSetPointerShape()! - Create a XLATEOBJ that describes the colors of the bitmap. */ - DPRINT1("SetCursor: (Colored) alpha cursors are not supported!\n"); - } - else - { - if(NewCursor->hbmColor) - { - /* FIXME - Create a color pointer, create only one 32bit bitmap! - Do not pass a mask bitmap to DrvSetPointerShape()! - Create a XLATEOBJ that describes the colors of the bitmap. - (16bit bitmaps are propably allowed) */ - DPRINT1("SetCursor: Cursors with colors are not supported!\n"); - } - else - { - MaskBmpObj = SURFACE_Lock((HSURF)NewCursor->hbmMask); - if(MaskBmpObj) - { - RECTL DestRect = {0, 0, MaskBmpObj->SurfObj.sizlBitmap.cx, MaskBmpObj->SurfObj.sizlBitmap.cy}; - POINTL SourcePoint = {0, 0}; - - /* - * NOTE: For now we create the cursor in top-down bitmap, - * because VMware driver rejects it otherwise. This should - * be fixed later. - */ - hMask = EngCreateBitmap( - MaskBmpObj->SurfObj.sizlBitmap, abs(MaskBmpObj->SurfObj.lDelta), - MaskBmpObj->SurfObj.iBitmapFormat, BMF_TOPDOWN, - NULL); - if ( !hMask ) - { - SURFACE_Unlock(MaskBmpObj); - EngUnlockSurface(pso); - return FALSE; - } - soMask = EngLockSurface((HSURF)hMask); - GreCopyBits(soMask, &MaskBmpObj->SurfObj, NULL, NULL, - &DestRect, &SourcePoint); - SURFACE_Unlock(MaskBmpObj); - } - } - } - CursorInfo->ShowingCursor = TRUE; - CursorInfo->CurrentCursorObject = *NewCursor; - } - else - { - CursorInfo->ShowingCursor = FALSE; - } + /* Check for color bitmap */ + if (hbmColor) + { + /* We have one, lock it */ + psurfColor = SURFACE_ShareLock(hbmColor); + + if (psurfColor) + { + /* Create an XLATEOBJ, no mono support */ + //EXLATEOBJ_vInitialize(&exlo, psurfColor->ppal, psurf->ppal, 0, 0, 0); + UNIMPLEMENTED; + } + } + else + psurfColor = NULL; Status = GreSetPointerShape(pso, - soMask, - soColor, - XlateObj, - NewCursor->xHotspot, - NewCursor->yHotspot, - CursorInfo->CursorPos.x, - CursorInfo->CursorPos.y, - NULL, - SPS_CHANGE); + psurfMask ? &psurfMask->SurfObj : NULL, + psurfColor ? &psurfColor->SurfObj : NULL, + XlateObj, + NewCursor->xHotspot, + NewCursor->yHotspot, + CursorInfo->CursorPos.x, + CursorInfo->CursorPos.y, + NULL, + SPS_CHANGE); if (Status != SPS_ACCEPT_NOEXCLUDE) { DPRINT1("GreSetPointerShape returned %lx\n", Status); } - if(hMask) - { - EngUnlockSurface(soMask); - EngDeleteSurface((HSURF)hMask); - } - if(XlateObj) - { - EngDeleteXlate(XlateObj); - } + /* Cleanup */ + if (psurfColor) + { + //EXLATEOBJ_vCleanup(&exlo); + SURFACE_ShareUnlock(psurfColor); + } - EngUnlockSurface(pso); + if (psurfMask) + SURFACE_ShareUnlock(psurfMask); - return TRUE; + EngUnlockSurface(pso); + + return TRUE; } Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h [iso-8859-1] Sat Aug 15 14:59:07 2009 @@ -15,8 +15,8 @@ SIZEL Size; POINTL HotSpot; XLATEOBJ *XlateObject; - SURFOBJ *psurfColor; - SURFOBJ *psurfMask; - SURFOBJ *psurfSave; + SURFACE *psurfColor; + SURFACE *psurfMask; + SURFACE *psurfSave; RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ } GDIPOINTER, *PGDIPOINTER; Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h [iso-8859-1] Sat Aug 15 14:59:07 2009 @@ -37,6 +37,7 @@ BOOL APIENTRY SURFACE_Cleanup(PVOID ObjectBody); +#define GDIDEV(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev)) #define GDIDEVFUNCS(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev))->DriverFunctions #define SURFACE_Lock(hBMObj) \ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sat Aug 15 14:59:07 2009 @@ -37,10 +37,10 @@ /* Eng and GRE stuff */ #include <driver.h> #include <engevent.h> +#include <gdiobj.h> +#include <surfobj.h> #include <cursor.h> #include <devobj.h> -#include <gdiobj.h> -#include <surfobj.h> #include <brushobj.h> #include <dc.h> #include <palobj.h>

1 0

[sginsberg] 42696: - Update the winesync script to define _WINE for shared DLLs to simplify syncing -- reported by Herve
by sginsberg＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: sginsberg Date: Sat Aug 15 14:45:28 2009 New Revision: 42696 URL: http://svn.reactos.org/svn/reactos?rev=42696&view=rev Log: - Update the winesync script to define _WINE for shared DLLs to simplify syncing -- reported by Herve Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=42696&r1=… ============================================================================== --- trunk/tools/wineimport.cmd [iso-8859-1] (original) +++ trunk/tools/wineimport.cmd [iso-8859-1] Sat Aug 15 14:45:28 2009 @@ -153,6 +153,7 @@ IF "%WINE_IS_EXE%" == "0" ( ECHO ^<include base="ReactOS"^>include/reactos/wine^</include^> ECHO ^<define name="__WINESRC__" /^> + ECHO ^<define name="_WINE" /^> ) SET WINE_FULL_LINE= SET WINE_END_PREC_LINE=

1 0

[dchapyshev] 42695: - Define APPLICATION_DATEBASE_URL
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 13:41:56 2009 New Revision: 42695 URL: http://svn.reactos.org/svn/reactos?rev=42695&view=rev Log: - Define APPLICATION_DATEBASE_URL Modified: trunk/reactos/base/applications/rapps/available.c trunk/reactos/base/applications/rapps/rapps.h Modified: trunk/reactos/base/applications/rapps/available.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/av… ============================================================================== --- trunk/reactos/base/applications/rapps/available.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/available.c [iso-8859-1] Sat Aug 15 13:41:56 2009 @@ -76,7 +76,7 @@ if (hFind == INVALID_HANDLE_VALUE) { if (GetFileAttributesW(szCabPath) == 0xFFFFFFFF) - DownloadApplicationsDB(L"http://opendn.org/rappmgr.cab"); + DownloadApplicationsDB(APPLICATION_DATEBASE_URL); ExtractFilesFromCab(szCabPath, szAppsPath); hFind = FindFirstFileW(szPath, &FindFileData); Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Sat Aug 15 13:41:56 2009 @@ -8,6 +8,8 @@ #include <wchar.h> #include "resource.h" + +#define APPLICATION_DATEBASE_URL L"http://opendn.org/rappmgr.cab" #define SPLIT_WIDTH 4 #define MAX_STR_LEN 256

1 0

[dchapyshev] 42694: - Add README.ENG - Change rapps.cab to rappmgr.cab (in CreateCabFile.bat)
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 13:36:44 2009 New Revision: 42694 URL: http://svn.reactos.org/svn/reactos?rev=42694&view=rev Log: - Add README.ENG - Change rapps.cab to rappmgr.cab (in CreateCabFile.bat) Added: trunk/reactos/base/applications/rapps/README.ENG (with props) Modified: trunk/reactos/base/applications/rapps/CreateCabFile.bat Modified: trunk/reactos/base/applications/rapps/CreateCabFile.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/Cr… ============================================================================== --- trunk/reactos/base/applications/rapps/CreateCabFile.bat [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CreateCabFile.bat [iso-8859-1] Sat Aug 15 13:36:44 2009 @@ -1,1 +1,1 @@ -e:\cabman.exe -M raw -S rapps.cab \rapps\*.txt +c:\cabman.exe -M raw -S rappmgr.cab \rapps\*.txt Added: trunk/reactos/base/applications/rapps/README.ENG URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/RE… ============================================================================== --- trunk/reactos/base/applications/rapps/README.ENG (added) +++ trunk/reactos/base/applications/rapps/README.ENG [iso-8859-1] Sat Aug 15 13:36:44 2009 @@ -1,0 +1,54 @@ +ADDING DOWNLOADABLE PROGRAMMS + +For an each programm would be creacted an INI alike syntax. +Also an each field is language inhdepended and individual, an URL's to a source programm is +also maybe different or even nonexisting for anothers languages. +For instance a programm 1C which is mostly interested only for russian users and have no +reason for peoples living in another countries. + +The File Overview: + +[Section] +Name = program name +RegName = Name in registry +Version = 1.1.1 +Licence = GPL +Description = Description +Size = 10 mb +Category = 5 +URLSite = http://www.site.com/ +URLDownload = http://ftp.site.com/pub/installer.exe +CDPath = ; Ïîêà íå èñïîëüçóåòñÿ + +[Section.0419] ; 0419 - for Russian language +Description = Description in Russian language + + +Obligatory fields are: Name, Category, URLDownload +Other fields to fill not necessarily. + +Categories list: +1 - Audio +2 - Video +3 - Graphics +4 - Games +5 - Internet +6 - Office +7 - Development +8 - Edutainment +9 - Engineering +10 - Finance +11 - Science +12 - Tools +13 - Drivers +14 - Libraries +15 - Other + +The list downloadable programms is keeping on a server and updating from a server +automatically at first time thes programm is running! +For generating a list of a programm (usually a CAB archive), could be used a batch file CreateCabFile.bat +After downloading (at first time the programm runs around), this file is placing +in the same folder where downloaded programm located to future usage them. +If in some cases an unpacked file is moved, deleted or not exist, then the procedure +to create a new one would be repeated. +If the CAB file is moved, deleted or not exist, then it would be downloaded again. Propchange: trunk/reactos/base/applications/rapps/README.ENG ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 42693: - Remove appwiz-new - Simplify appwiz (appwiz now starts rapps.exe)
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 13:14:07 2009 New Revision: 42693 URL: http://svn.reactos.org/svn/reactos?rev=42693&view=rev Log: - Remove appwiz-new - Simplify appwiz (appwiz now starts rapps.exe) Removed: trunk/reactos/dll/cpl/appwiz-new/ trunk/reactos/dll/cpl/appwiz/add.c trunk/reactos/dll/cpl/appwiz/remove.c trunk/reactos/dll/cpl/appwiz/resources/reactos.ico trunk/reactos/dll/cpl/appwiz/resources/updates.ico trunk/reactos/dll/cpl/appwiz/rossetup.c trunk/reactos/dll/cpl/appwiz/updates.c Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c trunk/reactos/dll/cpl/appwiz/appwiz.h trunk/reactos/dll/cpl/appwiz/appwiz.rbuild trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc trunk/reactos/dll/cpl/appwiz/lang/en-US.rc trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc trunk/reactos/dll/cpl/appwiz/resource.h trunk/reactos/dll/cpl/cpl.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/cpl/appwiz/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/add.c?rev=4… Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?re… Modified: trunk/reactos/dll/cpl/appwiz/appwiz.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.h?re… Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rbui… Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… Modified: trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/bg-BG.… Modified: trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.… Modified: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/de-DE.… Modified: trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/el-GR.… Modified: trunk/reactos/dll/cpl/appwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/en-US.… Modified: trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/es-ES.… Modified: trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/fr-FR.… Modified: trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/it-IT.… Modified: trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/no-NO.… Modified: trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… Modified: trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/sk-SK.… Modified: trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/uk-UA.… Modified: trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/zh-CN.… Removed: trunk/reactos/dll/cpl/appwiz/remove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/remove.c?re… Modified: trunk/reactos/dll/cpl/appwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resource.h?… Removed: trunk/reactos/dll/cpl/appwiz/resources/reactos.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/r… Removed: trunk/reactos/dll/cpl/appwiz/resources/updates.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/u… Removed: trunk/reactos/dll/cpl/appwiz/rossetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rossetup.c?… Removed: trunk/reactos/dll/cpl/appwiz/updates.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/updates.c?r… Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=426…

1 0

[dchapyshev] 42692: - Add rapps.exe to bootcd - Add msgsm32.acm to bootcd - Add some optional modules - Remove downloader.exe and downloader.xml
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 12:19:50 2009 New Revision: 42692 URL: http://svn.reactos.org/svn/reactos?rev=42692&view=rev Log: - Add rapps.exe to bootcd - Add msgsm32.acm to bootcd - Add some optional modules - Remove downloader.exe and downloader.xml Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Aug 15 12:19:50 2009 @@ -42,8 +42,6 @@ base\applications\cmdutils\more\more.exe 1 base\applications\cmdutils\xcopy\xcopy.exe 1 base\applications\control\control.exe 1 -base\applications\downloader\downloader.exe 1 -base\applications\downloader\downloader.xml 1 base\applications\dxdiag\dxdiag.exe 1 base\applications\fontview\fontview.exe 1 base\applications\mscutils\devmgmt\devmgmt.exe 1 @@ -71,6 +69,7 @@ base\applications\network\whois\whois.exe 1 base\applications\notepad\notepad.exe 1 base\applications\paint\paint.exe 1 +base\applications\rapps\rapps.exe 1 base\applications\regedit\regedit.exe 4 base\applications\regedit\clb\clb.dll 1 base\applications\regedt32\regedt32.exe 1 @@ -332,6 +331,7 @@ dll\win32\msftedit\msftedit.dll 1 dll\win32\msg711.acm\msg711.acm 1 dll\win32\msgina\msgina.dll 1 +dll\win32\msgsm32.acm\msgsm32.acm 1 dll\win32\mshtml\mshtml.dll 1 dll\win32\mshtml.tlb\mshtml.tlb 1 dll\win32\msi\msi.dll 1 @@ -661,9 +661,13 @@ modules\optional\kvmnet.sys 2 optional modules\optional\mfc42.dll 1 optional modules\optional\mfc42u.dll 1 optional +modules\optional\mfc71.dll 1 optional +modules\optional\mfc71u.dll 1 optional modules\optional\msvbvm50.dll 1 optional modules\optional\msvbvm60.dll 1 optional modules\optional\msvcirt.dll 1 optional +modules\optional\msvcp71.dll 1 optional +modules\optional\msvcr71.dll 1 optional modules\optional\Systema.ttf 3 optional modules\optional\vmx_fb.dll 1 optional modules\optional\vmx_mode.dll 1 optional

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs