Ros-diffs May 2013

ros-diffs@reactos.org

16 participants
234 discussions

[akhaldi] 59050: [MSHTML_WINETEST] * Skip some tests that result in timeouts. ROSTESTS-113 ROSTESTS-114
by akhaldi＠svn.reactos.org 20 May '13

20 May '13

Author: akhaldi Date: Mon May 20 11:17:23 2013 New Revision: 59050 URL: http://svn.reactos.org/svn/reactos?rev=59050&view=rev Log: [MSHTML_WINETEST] * Skip some tests that result in timeouts. ROSTESTS-113 ROSTESTS-114 Modified: trunk/rostests/winetests/mshtml/activex.c trunk/rostests/winetests/mshtml/htmldoc.c Modified: trunk/rostests/winetests/mshtml/activex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/activex.… ============================================================================== --- trunk/rostests/winetests/mshtml/activex.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/activex.c [iso-8859-1] Mon May 20 11:17:23 2013 @@ -2435,10 +2435,14 @@ /* Set in DoVerb */ CHECK_CALLED(InPlaceObject_GetWindow); CHECK_CALLED(SetObjectRects); - +#if ROSTESTS_114_IS_FIXED test_ui_activate(); test_container(notif_doc); test_object_elem(notif_doc); +#endif + win_skip("Skipping test_ui_activate(). ROSTESTS-114.\n"); + win_skip("Skipping test_container(notif_doc). ROSTESTS-114.\n"); + win_skip("Skipping test_object_elem(notif_doc). ROSTESTS-114.\n"); SET_EXPECT(UIDeactivate); SET_EXPECT(Invoke_ENABLED); @@ -2553,7 +2557,10 @@ CHECK_CALLED(FindConnectionPoint); CHECK_CALLED(Advise); +#if ROSTESTS_114_IS_FIXED test_event_call(); +#endif + win_skip("Skipping test_event_call(). ROSTESTS-114.\n"); SET_EXPECT(InPlaceDeactivate); SET_EXPECT(Close); Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Mon May 20 11:17:23 2013 @@ -7574,10 +7574,18 @@ test_HTMLDocument(TRUE, TRUE); test_HTMLDocument_StreamLoad(); test_HTMLDocument_StreamInitNew(); +#if ROSTESTS_113_IS_FIXED test_editing_mode(FALSE); +#endif + win_skip("Skipping test_editing_mode(FALSE). ROSTESTS-113.\n"); test_editing_mode(TRUE); +#if ROSTESTS_113_IS_FIXED test_HTMLDocument_http(FALSE); test_HTMLDocument_http(TRUE); +#endif + win_skip("Skipping test_HTMLDocument_http(FALSE). ROSTESTS-113.\n"); + win_skip("Skipping test_HTMLDocument_http(TRUE). ROSTESTS-113.\n"); + test_UIActivate(FALSE, FALSE, FALSE); test_UIActivate(FALSE, TRUE, FALSE); test_UIActivate(FALSE, TRUE, TRUE);

1 0

[janderwald] 59049: [HIDCLASS] - Fix double irp completion bug in hidclass - Hidclass now properly initializes and works in WinServer2003 - Tested excessively by Vic (Blame him ; ))
by janderwald＠svn.reactos.org 19 May '13

19 May '13

Author: janderwald Date: Sun May 19 21:33:08 2013 New Revision: 59049 URL: http://svn.reactos.org/svn/reactos?rev=59049&view=rev Log: [HIDCLASS] - Fix double irp completion bug in hidclass - Hidclass now properly initializes and works in WinServer2003 - Tested excessively by Vic (Blame him ;)) Modified: trunk/reactos/drivers/hid/hidclass/fdo.c Modified: trunk/reactos/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/fdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] Sun May 19 21:33:08 2013 @@ -182,23 +182,74 @@ IoStack->DeviceObject = DeviceObject; // + // sanity check + // + ASSERT(CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction] != NULL); + + // + // call minidriver (hidusb) + // + Status = CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp); + + // + // wait for the request to finish + // + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + // + // update status + // + Status = Irp->IoStatus.Status; + } + + // + // done + // + return Status; +} + +NTSTATUS +HidClassFDO_DispatchRequest( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + + // + // get device extension + // + CommonDeviceExtension = DeviceObject->DeviceExtension; + + ASSERT(Irp->CurrentLocation > 0); + + // + // create stack location + // + IoSetNextIrpStackLocation(Irp); + + // + // get next stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // store device object + // + IoStack->DeviceObject = DeviceObject; + + // + // sanity check + // + ASSERT(CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction] != NULL); + + // // call driver // - DPRINT("IoStack MajorFunction %x MinorFunction %x\n", IoStack->MajorFunction, IoStack->MinorFunction); Status = CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp); - - // - // wait for the request to finish - // - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - - // - // update status - // - Status = Irp->IoStatus.Status; - } // // done @@ -620,14 +671,8 @@ // // dispatch to mini driver // - IoSkipCurrentIrpStackLocation(Irp); - Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); - - // - // complete request - // - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCopyCurrentIrpStackLocationToNext(Irp); + Status = HidClassFDO_DispatchRequest(DeviceObject, Irp); return Status; } }

1 0

[akhaldi] 59048: [MSHTML_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 19 May '13

19 May '13

Author: akhaldi Date: Sun May 19 21:22:21 2013 New Revision: 59048 URL: http://svn.reactos.org/svn/reactos?rev=59048&view=rev Log: [MSHTML_WINETEST] * Sync with Wine 1.5.26. Added: trunk/rostests/winetests/mshtml/activex.c (with props) trunk/rostests/winetests/mshtml/events.html (with props) trunk/rostests/winetests/mshtml/exectest.html (with props) trunk/rostests/winetests/mshtml/externscr.js (with props) trunk/rostests/winetests/mshtml/style.c (with props) trunk/rostests/winetests/mshtml/test_tlb.idl (with props) trunk/rostests/winetests/mshtml/vbtest.html (with props) Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt trunk/rostests/winetests/mshtml/dom.c trunk/rostests/winetests/mshtml/events.c trunk/rostests/winetests/mshtml/htmldoc.c trunk/rostests/winetests/mshtml/htmllocation.c trunk/rostests/winetests/mshtml/jstest.html trunk/rostests/winetests/mshtml/misc.c trunk/rostests/winetests/mshtml/protocol.c trunk/rostests/winetests/mshtml/rsrc.rc trunk/rostests/winetests/mshtml/script.c trunk/rostests/winetests/mshtml/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/CMakeLis… Added: trunk/rostests/winetests/mshtml/activex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/activex.… Modified: trunk/rostests/winetests/mshtml/dom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/dom.c?re… Modified: trunk/rostests/winetests/mshtml/events.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/events.c… Added: trunk/rostests/winetests/mshtml/events.html URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/events.h… Added: trunk/rostests/winetests/mshtml/exectest.html URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/exectest… Added: trunk/rostests/winetests/mshtml/externscr.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/externsc… Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… Modified: trunk/rostests/winetests/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmlloca… Modified: trunk/rostests/winetests/mshtml/jstest.html URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/jstest.h… Modified: trunk/rostests/winetests/mshtml/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/misc.c?r… Modified: trunk/rostests/winetests/mshtml/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/protocol… Modified: trunk/rostests/winetests/mshtml/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/rsrc.rc?… Modified: trunk/rostests/winetests/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/script.c… Added: trunk/rostests/winetests/mshtml/style.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/style.c?… Added: trunk/rostests/winetests/mshtml/test_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/test_tlb… Modified: trunk/rostests/winetests/mshtml/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/testlist… Added: trunk/rostests/winetests/mshtml/vbtest.html URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/vbtest.h…

1 0

[akhaldi] 59047: [MSHTML] * Sync with Wine 1.5.26 and update Wine gecko package to 1.9. [PSDK] * Update mshtmdid.h and mshtml.idl. [APPWIZ] * Import the new way of handling Wine gecko package. [BOO...
by akhaldi＠svn.reactos.org 19 May '13

19 May '13

Author: akhaldi Date: Sun May 19 21:21:20 2013 New Revision: 59047 URL: http://svn.reactos.org/svn/reactos?rev=59047&view=rev Log: [MSHTML] * Sync with Wine 1.5.26 and update Wine gecko package to 1.9. [PSDK] * Update mshtmdid.h and mshtml.idl. [APPWIZ] * Import the new way of handling Wine gecko package. [BOOTDATA/PACKAGES] * Account for the new Wine gecko package slipstreaming. Added: trunk/reactos/dll/cpl/appwiz/addons.c (with props) trunk/reactos/dll/win32/mshtml/binding.h (with props) trunk/reactos/dll/win32/mshtml/htmlattr.c (with props) trunk/reactos/dll/win32/mshtml/htmlembed.c (with props) trunk/reactos/dll/win32/mshtml/htmlhead.c (with props) trunk/reactos/dll/win32/mshtml/htmllink.c (with props) trunk/reactos/dll/win32/mshtml/htmlmeta.c (with props) trunk/reactos/dll/win32/mshtml/htmlobject.c (with props) trunk/reactos/dll/win32/mshtml/htmlscript.h (with props) trunk/reactos/dll/win32/mshtml/htmlstorage.c (with props) trunk/reactos/dll/win32/mshtml/htmlstyleelem.c (with props) trunk/reactos/dll/win32/mshtml/htmltablecell.c (with props) trunk/reactos/dll/win32/mshtml/ifacewrap.c (with props) trunk/reactos/dll/win32/mshtml/ipwindow.c (with props) trunk/reactos/dll/win32/mshtml/mshtml_classes.idl (with props) trunk/reactos/dll/win32/mshtml/mshtml_classes.rgs (with props) trunk/reactos/dll/win32/mshtml/npplugin.c (with props) trunk/reactos/dll/win32/mshtml/pluginhost.c (with props) trunk/reactos/dll/win32/mshtml/pluginhost.h (with props) trunk/reactos/dll/win32/mshtml/propbag.c (with props) Removed: trunk/reactos/dll/win32/mshtml/install.c Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/dll/cpl/appwiz/CMakeLists.txt trunk/reactos/dll/cpl/appwiz/appwiz.c trunk/reactos/dll/cpl/appwiz/appwiz.h trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/appwiz/createlink.c 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/he-IL.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/pt-BR.rc trunk/reactos/dll/cpl/appwiz/lang/ro-RO.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/win32/mshtml/Bg.rc trunk/reactos/dll/win32/mshtml/CMakeLists.txt trunk/reactos/dll/win32/mshtml/Da.rc trunk/reactos/dll/win32/mshtml/De.rc trunk/reactos/dll/win32/mshtml/En.rc trunk/reactos/dll/win32/mshtml/Es.rc trunk/reactos/dll/win32/mshtml/Fi.rc trunk/reactos/dll/win32/mshtml/Fr.rc trunk/reactos/dll/win32/mshtml/He.rc trunk/reactos/dll/win32/mshtml/Hu.rc trunk/reactos/dll/win32/mshtml/It.rc trunk/reactos/dll/win32/mshtml/Ja.rc trunk/reactos/dll/win32/mshtml/Ko.rc trunk/reactos/dll/win32/mshtml/Lt.rc trunk/reactos/dll/win32/mshtml/Nl.rc trunk/reactos/dll/win32/mshtml/No.rc trunk/reactos/dll/win32/mshtml/Pl.rc trunk/reactos/dll/win32/mshtml/Pt.rc trunk/reactos/dll/win32/mshtml/Ro.rc trunk/reactos/dll/win32/mshtml/Ru.rc trunk/reactos/dll/win32/mshtml/Si.rc trunk/reactos/dll/win32/mshtml/Sv.rc trunk/reactos/dll/win32/mshtml/Tr.rc trunk/reactos/dll/win32/mshtml/Uk.rc trunk/reactos/dll/win32/mshtml/Zh.rc trunk/reactos/dll/win32/mshtml/conpoint.c trunk/reactos/dll/win32/mshtml/dispex.c trunk/reactos/dll/win32/mshtml/editor.c trunk/reactos/dll/win32/mshtml/hlink.c trunk/reactos/dll/win32/mshtml/htmlanchor.c trunk/reactos/dll/win32/mshtml/htmlbody.c trunk/reactos/dll/win32/mshtml/htmlcomment.c trunk/reactos/dll/win32/mshtml/htmlcurstyle.c trunk/reactos/dll/win32/mshtml/htmldoc.c trunk/reactos/dll/win32/mshtml/htmldoc3.c trunk/reactos/dll/win32/mshtml/htmldoc5.c trunk/reactos/dll/win32/mshtml/htmlelem.c trunk/reactos/dll/win32/mshtml/htmlelem2.c trunk/reactos/dll/win32/mshtml/htmlelem3.c trunk/reactos/dll/win32/mshtml/htmlelemcol.c trunk/reactos/dll/win32/mshtml/htmlevent.c trunk/reactos/dll/win32/mshtml/htmlevent.h trunk/reactos/dll/win32/mshtml/htmlform.c trunk/reactos/dll/win32/mshtml/htmlframe.c trunk/reactos/dll/win32/mshtml/htmlframebase.c trunk/reactos/dll/win32/mshtml/htmlgeneric.c trunk/reactos/dll/win32/mshtml/htmliframe.c trunk/reactos/dll/win32/mshtml/htmlimg.c trunk/reactos/dll/win32/mshtml/htmlinput.c trunk/reactos/dll/win32/mshtml/htmllocation.c trunk/reactos/dll/win32/mshtml/htmlnode.c trunk/reactos/dll/win32/mshtml/htmloption.c trunk/reactos/dll/win32/mshtml/htmlscreen.c trunk/reactos/dll/win32/mshtml/htmlscript.c trunk/reactos/dll/win32/mshtml/htmlselect.c trunk/reactos/dll/win32/mshtml/htmlstyle.c trunk/reactos/dll/win32/mshtml/htmlstyle.h trunk/reactos/dll/win32/mshtml/htmlstyle2.c trunk/reactos/dll/win32/mshtml/htmlstyle3.c trunk/reactos/dll/win32/mshtml/htmlstylesheet.c trunk/reactos/dll/win32/mshtml/htmltable.c trunk/reactos/dll/win32/mshtml/htmltablerow.c trunk/reactos/dll/win32/mshtml/htmltextarea.c trunk/reactos/dll/win32/mshtml/htmltextcont.c trunk/reactos/dll/win32/mshtml/htmltextnode.c trunk/reactos/dll/win32/mshtml/htmlwindow.c trunk/reactos/dll/win32/mshtml/loadopts.c trunk/reactos/dll/win32/mshtml/main.c trunk/reactos/dll/win32/mshtml/mshtml.inf trunk/reactos/dll/win32/mshtml/mshtml.spec trunk/reactos/dll/win32/mshtml/mshtml_private.h trunk/reactos/dll/win32/mshtml/mutation.c trunk/reactos/dll/win32/mshtml/navigate.c trunk/reactos/dll/win32/mshtml/nsembed.c trunk/reactos/dll/win32/mshtml/nsevents.c trunk/reactos/dll/win32/mshtml/nsiface.idl trunk/reactos/dll/win32/mshtml/nsio.c trunk/reactos/dll/win32/mshtml/nsservice.c trunk/reactos/dll/win32/mshtml/olecmd.c trunk/reactos/dll/win32/mshtml/oleobj.c trunk/reactos/dll/win32/mshtml/olewnd.c trunk/reactos/dll/win32/mshtml/omnavigator.c trunk/reactos/dll/win32/mshtml/persist.c trunk/reactos/dll/win32/mshtml/protocol.c trunk/reactos/dll/win32/mshtml/resource.h trunk/reactos/dll/win32/mshtml/rsrc.rc trunk/reactos/dll/win32/mshtml/script.c trunk/reactos/dll/win32/mshtml/secmgr.c trunk/reactos/dll/win32/mshtml/selection.c trunk/reactos/dll/win32/mshtml/service.c trunk/reactos/dll/win32/mshtml/task.c trunk/reactos/dll/win32/mshtml/txtrange.c trunk/reactos/dll/win32/mshtml/view.c trunk/reactos/include/psdk/mshtmdid.h trunk/reactos/include/psdk/mshtml.idl trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/dll/cpl/appwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/CMakeLists.… Added: trunk/reactos/dll/cpl/appwiz/addons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/addons.c?re… 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.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… 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/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/he-IL.… 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/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pt-BR.… Modified: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ro-RO.… 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.… Modified: trunk/reactos/dll/cpl/appwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resource.h?… Modified: trunk/reactos/dll/win32/mshtml/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Bg.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/CMakeList… Modified: trunk/reactos/dll/win32/mshtml/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Da.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/De.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/En.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Es.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Fi.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Fr.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/He.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Hu.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/It.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Ja.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Ko.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Lt.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Nl.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/No.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Pl.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Pt.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Ro.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Ru.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Si.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Sv.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Tr.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Uk.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Zh.rc?rev… Added: trunk/reactos/dll/win32/mshtml/binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/binding.h… Modified: trunk/reactos/dll/win32/mshtml/conpoint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/conpoint.… Modified: trunk/reactos/dll/win32/mshtml/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/dispex.c?… Modified: trunk/reactos/dll/win32/mshtml/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/editor.c?… Modified: trunk/reactos/dll/win32/mshtml/hlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/hlink.c?r… Modified: trunk/reactos/dll/win32/mshtml/htmlanchor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlancho… Added: trunk/reactos/dll/win32/mshtml/htmlattr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlattr.… Modified: trunk/reactos/dll/win32/mshtml/htmlbody.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlbody.… Modified: trunk/reactos/dll/win32/mshtml/htmlcomment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlcomme… Modified: trunk/reactos/dll/win32/mshtml/htmlcurstyle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlcurst… Modified: trunk/reactos/dll/win32/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc.c… Modified: trunk/reactos/dll/win32/mshtml/htmldoc3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc3.… Modified: trunk/reactos/dll/win32/mshtml/htmldoc5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc5.… Modified: trunk/reactos/dll/win32/mshtml/htmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem.… Modified: trunk/reactos/dll/win32/mshtml/htmlelem2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem2… Modified: trunk/reactos/dll/win32/mshtml/htmlelem3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem3… Modified: trunk/reactos/dll/win32/mshtml/htmlelemcol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelemc… Added: trunk/reactos/dll/win32/mshtml/htmlembed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlembed… Modified: trunk/reactos/dll/win32/mshtml/htmlevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlevent… Modified: trunk/reactos/dll/win32/mshtml/htmlevent.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlevent… Modified: trunk/reactos/dll/win32/mshtml/htmlform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlform.… Modified: trunk/reactos/dll/win32/mshtml/htmlframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlframe… Modified: trunk/reactos/dll/win32/mshtml/htmlframebase.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlframe… Modified: trunk/reactos/dll/win32/mshtml/htmlgeneric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlgener… Added: trunk/reactos/dll/win32/mshtml/htmlhead.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlhead.… Modified: trunk/reactos/dll/win32/mshtml/htmliframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlifram… Modified: trunk/reactos/dll/win32/mshtml/htmlimg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlimg.c… Modified: trunk/reactos/dll/win32/mshtml/htmlinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlinput… Added: trunk/reactos/dll/win32/mshtml/htmllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmllink.… Modified: trunk/reactos/dll/win32/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmllocat… Added: trunk/reactos/dll/win32/mshtml/htmlmeta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlmeta.… Modified: trunk/reactos/dll/win32/mshtml/htmlnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlnode.… Added: trunk/reactos/dll/win32/mshtml/htmlobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlobjec… Modified: trunk/reactos/dll/win32/mshtml/htmloption.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmloptio… Modified: trunk/reactos/dll/win32/mshtml/htmlscreen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlscree… Modified: trunk/reactos/dll/win32/mshtml/htmlscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlscrip… Added: trunk/reactos/dll/win32/mshtml/htmlscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlscrip… Modified: trunk/reactos/dll/win32/mshtml/htmlselect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlselec… Added: trunk/reactos/dll/win32/mshtml/htmlstorage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstora… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Added: trunk/reactos/dll/win32/mshtml/htmlstyleelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstylesheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmltable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable… Added: trunk/reactos/dll/win32/mshtml/htmltablecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable… Modified: trunk/reactos/dll/win32/mshtml/htmltablerow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable… Modified: trunk/reactos/dll/win32/mshtml/htmltextarea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltexta… Modified: trunk/reactos/dll/win32/mshtml/htmltextcont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltextc… Modified: trunk/reactos/dll/win32/mshtml/htmltextnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltextn… Modified: trunk/reactos/dll/win32/mshtml/htmlwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlwindo… Added: trunk/reactos/dll/win32/mshtml/ifacewrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/ifacewrap… Removed: trunk/reactos/dll/win32/mshtml/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/install.c… Added: trunk/reactos/dll/win32/mshtml/ipwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/ipwindow.… Modified: trunk/reactos/dll/win32/mshtml/loadopts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/loadopts.… Modified: trunk/reactos/dll/win32/mshtml/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/main.c?re… Modified: trunk/reactos/dll/win32/mshtml/mshtml.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml.in… Modified: trunk/reactos/dll/win32/mshtml/mshtml.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml.sp… Added: trunk/reactos/dll/win32/mshtml/mshtml_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_cl… Added: trunk/reactos/dll/win32/mshtml/mshtml_classes.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_cl… Modified: trunk/reactos/dll/win32/mshtml/mshtml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_pr… Modified: trunk/reactos/dll/win32/mshtml/mutation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mutation.… Modified: trunk/reactos/dll/win32/mshtml/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/navigate.… Added: trunk/reactos/dll/win32/mshtml/npplugin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/npplugin.… Modified: trunk/reactos/dll/win32/mshtml/nsembed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsembed.c… Modified: trunk/reactos/dll/win32/mshtml/nsevents.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsevents.… Modified: trunk/reactos/dll/win32/mshtml/nsiface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsiface.i… Modified: trunk/reactos/dll/win32/mshtml/nsio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsio.c?re… Modified: trunk/reactos/dll/win32/mshtml/nsservice.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsservice… Modified: trunk/reactos/dll/win32/mshtml/olecmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/olecmd.c?… Modified: trunk/reactos/dll/win32/mshtml/oleobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/oleobj.c?… Modified: trunk/reactos/dll/win32/mshtml/olewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/olewnd.c?… Modified: trunk/reactos/dll/win32/mshtml/omnavigator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/omnavigat… Modified: trunk/reactos/dll/win32/mshtml/persist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/persist.c… Added: trunk/reactos/dll/win32/mshtml/pluginhost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/pluginhos… Added: trunk/reactos/dll/win32/mshtml/pluginhost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/pluginhos… Added: trunk/reactos/dll/win32/mshtml/propbag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/propbag.c… Modified: trunk/reactos/dll/win32/mshtml/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/protocol.… Modified: trunk/reactos/dll/win32/mshtml/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/resource.… Modified: trunk/reactos/dll/win32/mshtml/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/rsrc.rc?r… Modified: trunk/reactos/dll/win32/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/script.c?… Modified: trunk/reactos/dll/win32/mshtml/secmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/secmgr.c?… Modified: trunk/reactos/dll/win32/mshtml/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/selection… Modified: trunk/reactos/dll/win32/mshtml/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/service.c… Modified: trunk/reactos/dll/win32/mshtml/task.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/task.c?re… Modified: trunk/reactos/dll/win32/mshtml/txtrange.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/txtrange.… Modified: trunk/reactos/dll/win32/mshtml/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/view.c?re… Modified: trunk/reactos/include/psdk/mshtmdid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtmdid.h?re… Modified: trunk/reactos/include/psdk/mshtml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtml.idl?re… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 59046: [SYSSETUP] * Register vbscript.dll.
by akhaldi＠svn.reactos.org 19 May '13

19 May '13

Author: akhaldi Date: Sun May 19 21:10:55 2013 New Revision: 59046 URL: http://svn.reactos.org/svn/reactos?rev=59046&view=rev Log: [SYSSETUP] * Register vbscript.dll. Modified: trunk/reactos/media/inf/syssetup.inf Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Sun May 19 21:10:55 2013 @@ -52,6 +52,7 @@ 11,,hhctrl.ocx,1 11,,hlink.dll,1 11,,hnetcfg.dll,1 +11,,ieframe.dll,1 11,,inetcomm.dll,1 11,,inseng.dll,1 11,,itss.dll,1 @@ -91,12 +92,12 @@ 11,,softpub.dll,1 11,,sti.dll,1 11,,urlmon.dll,3 +11,,vbscript.dll,1 11,,windowscodecs.dll,1 11,,winhttp.dll,1 11,,wininet.dll,2 11,,wintrust.dll,1 11,,wuapi.dll,1 -11,,ieframe.dll,1 [TypeLibraries] stdole2.tlb

1 0

[janderwald] 59045: [HIDCLASS] - Remove assert
by janderwald＠svn.reactos.org 19 May '13

19 May '13

Author: janderwald Date: Sun May 19 19:05:38 2013 New Revision: 59045 URL: http://svn.reactos.org/svn/reactos?rev=59045&view=rev Log: [HIDCLASS] - Remove assert Modified: trunk/reactos/drivers/hid/hidclass/pdo.c Modified: trunk/reactos/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/pdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] Sun May 19 19:05:38 2013 @@ -570,7 +570,6 @@ case IRP_MN_QUERY_INTERFACE: { DPRINT1("[HIDCLASS] PDO IRP_MN_QUERY_INTERFACE not implemented\n"); - ASSERT(FALSE); // // do nothing

1 0

[janderwald] 59044: [MOUHID] - Cleanup code - Fix distinguation between relative and absolute mice - Tested by Timo (Blame him ; ))
by janderwald＠svn.reactos.org 19 May '13

19 May '13

Author: janderwald Date: Sun May 19 17:29:15 2013 New Revision: 59044 URL: http://svn.reactos.org/svn/reactos?rev=59044&view=rev Log: [MOUHID] - Cleanup code - Fix distinguation between relative and absolute mice - Tested by Timo (Blame him ;)) Modified: trunk/reactos/drivers/hid/mouhid/mouhid.c trunk/reactos/drivers/hid/mouhid/mouhid.h Modified: trunk/reactos/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.… ============================================================================== --- trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] Sun May 19 17:29:15 2013 @@ -30,6 +30,7 @@ MOUSE_BUTTON_5_UP }; + VOID MouHid_GetButtonMove( IN PMOUHID_DEVICE_EXTENSION DeviceExtension, @@ -43,8 +44,10 @@ *LastX = 0; *LastY = 0; - /* get scaled usage value x */ - Status = HidP_GetScaledUsageValue(HidP_Input, + if (!DeviceExtension->MouseAbsolute) + { + /* get scaled usage value x */ + Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_X, @@ -52,16 +55,17 @@ DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); - if (Status != HIDP_STATUS_SUCCESS) - { - /* FIXME: handle more errors */ - if (Status == HIDP_STATUS_BAD_LOG_PHY_VALUES) + + if (Status != HIDP_STATUS_SUCCESS) { - /* FIXME: assume it operates in absolute mode */ - DeviceExtension->MouseAbsolute = TRUE; - - /* get unscaled value */ - Status = HidP_GetUsageValue(HidP_Input, + /* FIXME: handle more errors */ + if (Status == HIDP_STATUS_BAD_LOG_PHY_VALUES) + { + /* FIXME: assume it operates in absolute mode */ + DeviceExtension->MouseAbsolute = TRUE; + + /* get unscaled value */ + Status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_X, @@ -70,18 +74,45 @@ DeviceExtension->Report, DeviceExtension->ReportLength); - /* FIXME handle error */ - ASSERT(Status == HIDP_STATUS_SUCCESS); - - /* absolute pointing devices values need be in range 0 - 0xffff */ - ASSERT(DeviceExtension->ValueCapsX.LogicalMax > 0); - - *LastX = (ValueX * 0xFFFF) / DeviceExtension->ValueCapsX.LogicalMax; + /* FIXME handle error */ + ASSERT(Status == HIDP_STATUS_SUCCESS); + + /* absolute pointing devices values need be in range 0 - 0xffff */ + ASSERT(DeviceExtension->ValueCapsX.LogicalMax > 0); + ASSERT(DeviceExtension->ValueCapsX.LogicalMax > DeviceExtension->ValueCapsX.LogicalMin); + + /* convert to logical range */ + *LastX = (ValueX * VIRTUAL_SCREEN_SIZE_X) / DeviceExtension->ValueCapsX.LogicalMax; + } } } - - /* get scaled usage value y */ - Status = HidP_GetScaledUsageValue(HidP_Input, + else + { + /* get unscaled value */ + Status = HidP_GetUsageValue(HidP_Input, + HID_USAGE_PAGE_GENERIC, + HIDP_LINK_COLLECTION_UNSPECIFIED, + HID_USAGE_GENERIC_X, + &ValueX, + DeviceExtension->PreparsedData, + DeviceExtension->Report, + DeviceExtension->ReportLength); + + /* FIXME handle error */ + ASSERT(Status == HIDP_STATUS_SUCCESS); + + /* absolute pointing devices values need be in range 0 - 0xffff */ + ASSERT(DeviceExtension->ValueCapsX.LogicalMax > 0); + ASSERT(DeviceExtension->ValueCapsX.LogicalMax > DeviceExtension->ValueCapsX.LogicalMin); + + /* convert to logical range */ + *LastX = (ValueX * VIRTUAL_SCREEN_SIZE_X) / DeviceExtension->ValueCapsX.LogicalMax; + } + + if (!DeviceExtension->MouseAbsolute) + { + /* get scaled usage value y */ + Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_Y, @@ -89,16 +120,17 @@ DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); - if (Status != HIDP_STATUS_SUCCESS) - { - // FIXME: handle more errors - if (Status == HIDP_STATUS_BAD_LOG_PHY_VALUES) + + if (Status != HIDP_STATUS_SUCCESS) { - // assume it operates in absolute mode - DeviceExtension->MouseAbsolute = TRUE; - - // get unscaled value - Status = HidP_GetUsageValue(HidP_Input, + // FIXME: handle more errors + if (Status == HIDP_STATUS_BAD_LOG_PHY_VALUES) + { + // assume it operates in absolute mode + DeviceExtension->MouseAbsolute = TRUE; + + // get unscaled value + Status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_Y, @@ -107,13 +139,39 @@ DeviceExtension->Report, DeviceExtension->ReportLength); - /* FIXME handle error */ - ASSERT(Status == HIDP_STATUS_SUCCESS); - - /* absolute pointing devices values need be in range 0 - 0xffff */ - ASSERT(DeviceExtension->ValueCapsY.LogicalMax); - *LastY = (ValueY * 0xFFFF) / DeviceExtension->ValueCapsY.LogicalMax; + /* FIXME handle error */ + ASSERT(Status == HIDP_STATUS_SUCCESS); + + /* absolute pointing devices values need be in range 0 - 0xffff */ + ASSERT(DeviceExtension->ValueCapsY.LogicalMax > 0); + ASSERT(DeviceExtension->ValueCapsY.LogicalMax > DeviceExtension->ValueCapsY.LogicalMin); + + /* convert to logical range */ + *LastY = (ValueY * VIRTUAL_SCREEN_SIZE_Y) / DeviceExtension->ValueCapsY.LogicalMax; + } } + } + else + { + // get unscaled value + Status = HidP_GetUsageValue(HidP_Input, + HID_USAGE_PAGE_GENERIC, + HIDP_LINK_COLLECTION_UNSPECIFIED, + HID_USAGE_GENERIC_Y, + &ValueY, + DeviceExtension->PreparsedData, + DeviceExtension->Report, + DeviceExtension->ReportLength); + + /* FIXME handle error */ + ASSERT(Status == HIDP_STATUS_SUCCESS); + + /* absolute pointing devices values need be in range 0 - 0xffff */ + ASSERT(DeviceExtension->ValueCapsY.LogicalMax > 0); + ASSERT(DeviceExtension->ValueCapsY.LogicalMax > DeviceExtension->ValueCapsY.LogicalMin); + + /* convert to logical range */ + *LastY = (ValueY * VIRTUAL_SCREEN_SIZE_Y) / DeviceExtension->ValueCapsY.LogicalMax; } } @@ -323,7 +381,7 @@ DeviceExtension->Report[3] & 0xFF, DeviceExtension->Report[4] & 0xFF, DeviceExtension->Report[5] & 0xFF, DeviceExtension->Report[6] & 0xFF); - DPRINT("[MOUHID] LastX %ld LastY %ld Flags %x ButtonData %x\n", MouseInputData.LastX, MouseInputData.LastY, MouseInputData.ButtonFlags, MouseInputData.ButtonData); + DPRINT("[MOUHID] LastX %ld LastY %ld Flags %x ButtonFlags %x ButtonData %x\n", MouseInputData.LastX, MouseInputData.LastY, MouseInputData.Flags, MouseInputData.ButtonFlags, MouseInputData.ButtonData); /* dispatch mouse action */ MouHid_DispatchInputData(DeviceExtension, &MouseInputData); @@ -888,6 +946,14 @@ } } + /* check if mice is absolute */ + if (DeviceExtension->ValueCapsY.LogicalMax > DeviceExtension->ValueCapsY.LogicalMin || + DeviceExtension->ValueCapsX.LogicalMax > DeviceExtension->ValueCapsX.LogicalMin) + { + /* mice is absolute */ + DeviceExtension->MouseAbsolute = TRUE; + } + /* completed successfully */ return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.… ============================================================================== --- trunk/reactos/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/mouhid/mouhid.h [iso-8859-1] Sun May 19 17:29:15 2013 @@ -132,6 +132,8 @@ } MOUHID_DEVICE_EXTENSION, *PMOUHID_DEVICE_EXTENSION; #define WHEEL_DELTA 120 +#define VIRTUAL_SCREEN_SIZE_X (65536) +#define VIRTUAL_SCREEN_SIZE_Y (65536) NTSTATUS MouHid_InitiateRead(

1 0

[akhaldi] 59043: [PSDK] * Update shdeprecated.idl.
by akhaldi＠svn.reactos.org 19 May '13

19 May '13

Author: akhaldi Date: Sun May 19 14:38:17 2013 New Revision: 59043 URL: http://svn.reactos.org/svn/reactos?rev=59043&view=rev Log: [PSDK] * Update shdeprecated.idl. Modified: trunk/reactos/include/psdk/shdeprecated.idl Modified: trunk/reactos/include/psdk/shdeprecated.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shdeprecated.… ============================================================================== --- trunk/reactos/include/psdk/shdeprecated.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shdeprecated.idl [iso-8859-1] Sun May 19 14:38:17 2013 @@ -19,13 +19,114 @@ */ import "objidl.idl"; +import "ocidl.idl"; +import "shtypes.idl"; +import "shobjidl.idl"; +import "hlink.idl"; +import "exdisp.idl"; + +cpp_quote("#define TLOG_BACK -1") +cpp_quote("#define TLOG_FORE 1") + +cpp_quote("#define TLMENUF_INCLUDECURRENT 0x00000001") +cpp_quote("#define TLMENUF_CHECKCURRENT (TLMENUF_INCLUDECURRENT | 0x00000002)") +cpp_quote("#define TLMENUF_BACK 0x00000010") +cpp_quote("#define TLMENUF_FORE 0x00000020") +cpp_quote("#define TLMENUF_BACKANDFORTH (TLMENUF_BACK | TLMENUF_FORE | TLMENUF_INCLUDECURRENT)") + +typedef void *CIE4ConnectionPoint; [ + local, object, - local, - uuid(5836fb00-8187-11cf-a12b-00aa004ae837) + uuid(0D7D1D00-6FC0-11D0-A974-00C04FD705A2) ] -interface IShellService : IUnknown +interface IExpDispSupport : IUnknown { - HRESULT SetOwner( [in] IUnknown *pUnk ); -} + HRESULT FindCIE4ConnectionPoint( + REFIID riid, + CIE4ConnectionPoint **ppccp); + + HRESULT OnTranslateAccelerator( + MSG *pMsg, + DWORD grfModifiers); + + HRESULT OnInvoke( + DISPID dispidMember, + REFIID iid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pdispparams, + VARIANT *pVarResult, + EXCEPINFO *pexcepinfo, + UINT *puArgErr); +}; + + +enum { + SBSC_HIDE = 0, + SBSC_SHOW = 1, + SBSC_TOGGLE = 2, + SBSC_QUERY = 3 +}; + +cpp_quote("#define BSF_REGISTERASDROPTARGET 0x00000001") +cpp_quote("#define BSF_THEATERMODE 0x00000002") +cpp_quote("#define BSF_NOLOCALFILEWARNING 0x00000010") +cpp_quote("#define BSF_UISETBYAUTOMATION 0x00000100") +cpp_quote("#define BSF_RESIZABLE 0x00000200") +cpp_quote("#define BSF_CANMAXIMIZE 0x00000400") +cpp_quote("#define BSF_TOPBROWSER 0x00000800") +cpp_quote("#define BSF_NAVNOHISTORY 0x00001000") +cpp_quote("#define BSF_HTMLNAVCANCELED 0x00002000") +cpp_quote("#define BSF_DONTSHOWNAVCANCELPAGE 0x00004000") +cpp_quote("#define BSF_SETNAVIGATABLECODEPAGE 0x00008000") +cpp_quote("#define BSF_DELEGATEDNAVIGATION 0x00010000") +cpp_quote("#define BSF_TRUSTEDFORACTIVEX 0x00020000") + +cpp_quote("#define HLNF_CALLERUNTRUSTED 0x00200000") +cpp_quote("#define HLNF_TRUSTEDFORACTIVEX 0x00400000") +cpp_quote("#define HLNF_DISABLEWINDOWRESTRICTIONS 0x00800000") +cpp_quote("#define HLNF_TRUSTFIRSTDOWNLOAD 0x01000000") +cpp_quote("#define HLNF_UNTRUSTEDFORDOWNLOAD 0x02000000") +cpp_quote("#define SHHLNF_NOAUTOSELECT 0x04000000") +cpp_quote("#define SHHLNF_WRITENOHISTORY 0x08000000") +cpp_quote("#define HLNF_EXTERNALNAVIGATE 0x10000000") +cpp_quote("#define HLNF_ALLOW_AUTONAVIGATE 0x20000000") +cpp_quote("#define HLNF_NEWWINDOWSMANAGED 0x80000000") + + +enum { + SECURELOCK_NOCHANGE = -1, + SECURELOCK_SET_UNSECURE = 0, + SECURELOCK_SET_MIXED = 1, + SECURELOCK_SET_SECUREUNKNOWNBIT = 2, + SECURELOCK_SET_SECURE40BIT = 3, + SECURELOCK_SET_SECURE56BIT = 4, + SECURELOCK_SET_FORTEZZA = 5, + SECURELOCK_SET_SECURE128BIT = 6, + SECURELOCK_FIRSTSUGGEST = 7, + SECURELOCK_SUGGEST_UNSECURE = SECURELOCK_FIRSTSUGGEST, + SECURELOCK_SUGGEST_MIXED = 8, + SECURELOCK_SUGGEST_SECUREUNKNOWNBIT = 9, + SECURELOCK_SUGGEST_SECURE40BIT = 10, + SECURELOCK_SUGGEST_SECURE56BIT = 11, + SECURELOCK_SUGGEST_FORTEZZA = 12, + SECURELOCK_SUGGEST_SECURE128BIT = 13, +}; + + + +cpp_quote("#define VIEW_PRIORITY_RESTRICTED 0x00000070") +cpp_quote("#define VIEW_PRIORITY_CACHEHIT 0x00000050") +cpp_quote("#define VIEW_PRIORITY_STALECACHEHIT 0x00000045") +cpp_quote("#define VIEW_PRIORITY_USEASDEFAULT 0x00000043") +cpp_quote("#define VIEW_PRIORITY_SHELLEXT 0x00000040") +cpp_quote("#define VIEW_PRIORITY_CACHEMISS 0x00000030") +cpp_quote("#define VIEW_PRIORITY_INHERIT 0x00000020") +cpp_quote("#define VIEW_PRIORITY_SHELLEXT_ASBACKUP 0x0015") +cpp_quote("#define VIEW_PRIORITY_DESPERATE 0x00000010") +cpp_quote("#define VIEW_PRIORITY_NONE 0x00000000") + + +cpp_quote("#define ITB_VIEW ((UINT)-1)")

1 0

[akhaldi] 59042: [UUID] * Add CATID_SafeForInitializing and SID_VariantConversion.
by akhaldi＠svn.reactos.org 19 May '13

19 May '13

Author: akhaldi Date: Sun May 19 14:30:10 2013 New Revision: 59042 URL: http://svn.reactos.org/svn/reactos?rev=59042&view=rev Log: [UUID] * Add CATID_SafeForInitializing and SID_VariantConversion. Modified: trunk/reactos/lib/sdk/uuid/ieguids.c trunk/reactos/lib/sdk/uuid/otherguids.c Modified: trunk/reactos/lib/sdk/uuid/ieguids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/ieguids.c?rev… ============================================================================== --- trunk/reactos/lib/sdk/uuid/ieguids.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/ieguids.c [iso-8859-1] Sun May 19 14:30:10 2013 @@ -11,6 +11,7 @@ DEFINE_GUID(CLSID_StdHlinkBrowseContext, 0x79eac9d1, 0xbaf9, 0x11ce, 0x8c, 0x82, 0x00, 0xaa,0x00,0x4b,0xa9,0x0b); DEFINE_GUID(SID_SContainerDispatch, 0xb722be00,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70); DEFINE_GUID(CGID_DocHostCommandHandler,0xf38bc242,0xb950,0x11d1,0x89,0x18,0x00,0xc0,0x4f,0xc2,0xc8,0x36); +DEFINE_GUID(CATID_SafeForInitializing, 0x7dd95802,0x9882,0x11cf,0x9f,0xa9,0x00,0xaa,0x00,0x6c,0x42,0xc4); //SID_SVersionHost //CGID_InternetExplorer @@ -44,7 +45,6 @@ //IID_IImgCtx //CLSID_IImgCtx //CATID_DesignTimeUIActivatableControl -//CATID_SafeForInitializing //CATID_InternetAware //CATID_PersistsToPropertyBag //CATID_PersistsToFile Modified: trunk/reactos/lib/sdk/uuid/otherguids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/otherguids.c?… ============================================================================== --- trunk/reactos/lib/sdk/uuid/otherguids.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/otherguids.c [iso-8859-1] Sun May 19 14:30:10 2013 @@ -52,3 +52,5 @@ DEFINE_GUID(CLSID_StdFont, 0x0BE35203, 0x8F91, 0x11CE, 0x9D,0xE3, 0x00,0xAA,0x00,0x4B,0xB8,0x51); DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); + +DEFINE_GUID(SID_VariantConversion, 0x1f101481,0xbccd,0x11d0,0x93,0x36,0x00,0xa0,0xc9,0xd,0xca,0xa9);

1 0

[akhaldi] 59041: [DXSDK] * We no longer need amvideo.h. * Update amvideo.idl.
by akhaldi＠svn.reactos.org 19 May '13

19 May '13

Author: akhaldi Date: Sun May 19 13:52:15 2013 New Revision: 59041 URL: http://svn.reactos.org/svn/reactos?rev=59041&view=rev Log: [DXSDK] * We no longer need amvideo.h. * Update amvideo.idl. Removed: trunk/reactos/include/dxsdk/amvideo.h Modified: trunk/reactos/include/dxsdk/amvideo.idl Removed: trunk/reactos/include/dxsdk/amvideo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amvideo.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/amvideo.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/amvideo.h (removed) @@ -1,260 +0,0 @@ -/* - * amvideo.h - * - * DirectX header - * - * Copyright Magnus Olsen (magnus(a)greatlord.com) - */ - -#ifndef __AMVIDEO__ -#define __AMVIDEO__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <ddraw.h> - -#define AMDDS_NONE 0x00 -#define AMDDS_DCIPS 0x01 -#define AMDDS_PS 0x02 -#define AMDDS_RGBOVR 0x04 -#define AMDDS_YUVOVR 0x08 -#define AMDDS_RGBOFF 0x10 -#define AMDDS_YUVOFF 0x20 -#define AMDDS_RGBFLP 0x40 -#define AMDDS_YUVFLP 0x80 -#define AMDDS_ ALL 0xFF -#define AMDDS_DEFAULT AMDDS_ALL -#define AMDDS_YUV (AMDDS_YUVOFF | AMDDS_YUVOVR | AMDDS_YUVFLP) -#define AMDDS_RGB (AMDDS_RGBOFF | AMDDS_RGBOVR | AMDDS_RGBFLP) -#define AMDDS_PRIMARY (AMDDS_DCIPS | AMDDS_PS) -#define iPALETTE_COLORS 256 -#define iEGA_COLORS 16 -#define iMASK_COLORS 3 -#define iTRUECOLOR 16 -#define iRED 0 -#define iGREEN 1 -#define iBLUE 2 -#define iPALETTE 8 -#define iMAXBITS 8 - -typedef struct tag_TRUECOLORINFO -{ - DWORD dwBitMasks[iMASK_COLORS]; - RGBQUAD bmiColors[iPALETTE_COLORS]; -} TRUECOLORINFO; - - -typedef struct tagVIDEOINFOHEADER -{ - RECT rcSource; - RECT rcTarget; - DWORD dwBitRate; - DWORD dwBitErrorRate; - REFERENCE_TIME AvgTimePerFrame; - BITMAPINFOHEADER bmiHeader; -} VIDEOINFOHEADER; - - -typedef struct tagVIDEOINFO -{ - RECT rcSource; - RECT rcTarget; - DWORD dwBitRate; - DWORD dwBitErrorRate; - REFERENCE_TIME AvgTimePerFrame; - BITMAPINFOHEADER bmiHeader; - union - { - RGBQUAD bmiColors[iPALETTE_COLORS]; - DWORD dwBitMasks[iMASK_COLORS]; - TRUECOLORINFO TrueColorInfo; - }; -} VIDEOINFO; - -typedef struct tagMPEG1VIDEOINFO -{ - VIDEOINFOHEADER hdr; - DWORD dwStartTimeCode; - DWORD cbSequenceHeader; - BYTE bSequenceHeader[1]; -} MPEG1VIDEOINFO; - -typedef struct tagAnalogVideoInfo -{ - RECT rcSource; - RECT rcTarget; - DWORD dwActiveWidth; - DWORD dwActiveHeight; - REFERENCE_TIME AvgTimePerFrame; -} ANALOGVIDEOINFO; - -#define TRUECOLOR(PBMIH) ((TRUECOLORINFO *)(((LPBYTE)&((PBMIH)->bmiHeader)) + (PBMIH)->bmiHeader.biSize)) -#define COLORS(PBMIH) ((RGBQUAD *)(((LPBYTE)&((PBMIH)->bmiHeader)) + (PBMIH)->bmiHeader.biSize)) -#define BITMASKS(PBMIH) ((DWORD *)(((LPBYTE)&((PBMIH)->bmiHeader)) + (PBMIH)->bmiHeader.biSize)) - -#define SIZE_EGA_PALETTE (iEGA_COLORS * sizeof(RGBQUAD)) -#define SIZE_PALETTE (iPALETTE_COLORS * sizeof(RGBQUAD)) -#define SIZE_MASKS (iMASK_COLORS * sizeof(DWORD)) -#define SIZE_PREHEADER (FIELD_OFFSET(VIDEOINFOHEADER,bmiHeader)) -#define SIZE_VIDEOHEADER (sizeof(BITMAPINFOHEADER) + SIZE_PREHEADER) - -#define WIDTHBYTES(BTIS) ((DWORD)(((BTIS)+31) & (~31)) / 8) -#define DIBWIDTHBYTES(BI) (DWORD)(BI).biBitCount) * (DWORD)WIDTHBYTES((DWORD)(BI).biWidth -#define _DIBSIZE(BI) (DIBWIDTHBYTES(BI) * (DWORD)(BI).biHeight) -#define DIBSIZE(BI) ((BI).biHeight < 0 ? (-1)*(_DIBSIZE(BI)) : _DIBSIZE(BI)) - -#define BIT_MASKS_MATCH(PBMIH1,PBMIH2) \ - ((PBMIH2)->dwBitMasks[iGREEN] == (PBMIH1)->dwBitMasks[iGREEN]) && \ - (((PBMIH2)->dwBitMasks[iRED] == (PBMIH1)->dwBitMasks[iRED]) && \ - ((PBMIH2)->dwBitMasks[iBLUE] == (PBMIH1)->dwBitMasks[iBLUE])) - -#define RESET_MASKS(PBMIH) (ZeroMemory((PVOID)(PBMIH)->dwBitFields,SIZE_MASKS)) -#define RESET_HEADER(PBMIH) (ZeroMemory((PVOID)(PBMIH),SIZE_VIDEOHEADER)) -#define RESET_PALETTE(PBMIH) (ZeroMemory((PVOID)(PBMIH)->bmiColors,SIZE_PALETTE)); -#define PALETTISED(PBMIH) ((PBMIH)->bmiHeader.biBitCount <= iPALETTE) -#define PALETTE_ENTRIES(PBMIH) ((DWORD) 1 << (PBMIH)->bmiHeader.biBitCount) -#define HEADER(pVideoInfo) (&(((VIDEOINFOHEADER *) (pVideoInfo))->bmiHeader)) -#define MAX_SIZE_MPEG1_SEQUENCE_INFO 140 -#define MPEG1_SEQUENCE_INFO(pv) ((const BYTE *)(pv)->bSequenceHeader) -#define SIZE_MPEG1VIDEOINFO(pv) (FIELD_OFFSET(MPEG1VIDEOINFO, bSequenceHeader[0]) + \ - (pv)->cbSequenceHeader) - -#undef INTERFACE -#define INTERFACE IDirectDrawVideo - -DECLARE_INTERFACE_(IDirectDrawVideo, IUnknown) -{ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(GetSwitches)(THIS_ DWORD *pSwitches) PURE; - STDMETHOD(SetSwitches)(THIS_ DWORD Switches) PURE; - STDMETHOD(GetCaps)(THIS_ DDCAPS *pCaps) PURE; - STDMETHOD(GetEmulatedCaps)(THIS_ DDCAPS *pCaps) PURE; - STDMETHOD(GetSurfaceDesc)(THIS_ DDSURFACEDESC *pSurfaceDesc) PURE; - STDMETHOD(GetFourCCCodes)(THIS_ DWORD *pCount,DWORD *pCodes) PURE; - STDMETHOD(SetDirectDraw)(THIS_ LPDIRECTDRAW pDirectDraw) PURE; - STDMETHOD(GetDirectDraw)(THIS_ LPDIRECTDRAW *ppDirectDraw) PURE; - STDMETHOD(GetSurfaceType)(THIS_ DWORD *pSurfaceType) PURE; - STDMETHOD(SetDefault)(THIS) PURE; - STDMETHOD(UseScanLine)(THIS_ long UseScanLine) PURE; - STDMETHOD(CanUseScanLine)(THIS_ long *UseScanLine) PURE; - STDMETHOD(UseOverlayStretch)(THIS_ long UseOverlayStretch) PURE; - STDMETHOD(CanUseOverlayStretch)(THIS_ long *UseOverlayStretch) PURE; - STDMETHOD(UseWhenFullScreen)(THIS_ long UseWhenFullScreen) PURE; - STDMETHOD(WillUseFullScreen)(THIS_ long *UseWhenFullScreen) PURE; -}; - - -#undef INTERFACE -#define INTERFACE IFullScreenVideo - -DECLARE_INTERFACE_(IFullScreenVideo, IUnknown) -{ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(CountModes)(THIS_ long *pModes) PURE; - STDMETHOD(GetModeInfo)(THIS_ long Mode,long *pWidth,long *pHeight,long *pDepth) PURE; - STDMETHOD(GetCurrentMode)(THIS_ long *pMode) PURE; - STDMETHOD(IsModeAvailable)(THIS_ long Mode) PURE; - STDMETHOD(IsModeEnabled)(THIS_ long Mode) PURE; - STDMETHOD(SetEnabled)(THIS_ long Mode,long bEnabled) PURE; - STDMETHOD(GetClipFactor)(THIS_ long *pClipFactor) PURE; - STDMETHOD(SetClipFactor)(THIS_ long ClipFactor) PURE; - STDMETHOD(SetMessageDrain)(THIS_ HWND hwnd) PURE; - STDMETHOD(GetMessageDrain)(THIS_ HWND *hwnd) PURE; - STDMETHOD(SetMonitor)(THIS_ long Monitor) PURE; - STDMETHOD(GetMonitor)(THIS_ long *Monitor) PURE; - STDMETHOD(HideOnDeactivate)(THIS_ long Hide) PURE; - STDMETHOD(IsHideOnDeactivate)(THIS) PURE; - STDMETHOD(SetCaption)(THIS_ BSTR strCaption) PURE; - STDMETHOD(GetCaption)(THIS_ BSTR *pstrCaption) PURE; - STDMETHOD(SetDefault)(THIS) PURE; -}; - -#undef INTERFACE -#define INTERFACE IQualProp - -DECLARE_INTERFACE_(IQualProp, IUnknown) -{ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(get_FramesDroppedInRenderer)(THIS_ int *pcFrames) PURE; - STDMETHOD(get_FramesDrawn)(THIS_ int *pcFramesDrawn) PURE; - STDMETHOD(get_AvgFrameRate)(THIS_ int *piAvgFrameRate) PURE; - STDMETHOD(get_Jitter)(THIS_ int *iJitter) PURE; - STDMETHOD(get_AvgSyncOffset)(THIS_ int *piAvg) PURE; - STDMETHOD(get_DevSyncOffset)(THIS_ int *piDev) PURE; -}; - - -#undef INTERFACE -#define INTERFACE IBaseVideoMixer - -DECLARE_INTERFACE_(IBaseVideoMixer, IUnknown) -{ - STDMETHOD(SetLeadPin)(THIS_ int iPin) PURE; - STDMETHOD(GetLeadPin)(THIS_ int *piPin) PURE; - STDMETHOD(GetInputPinCount)(THIS_ int *piPinCount) PURE; - STDMETHOD(IsUsingClock)(THIS_ int *pbValue) PURE; - STDMETHOD(SetUsingClock)(THIS_ int bValue) PURE; - STDMETHOD(GetClockPeriod)(THIS_ int *pbValue) PURE; - STDMETHOD(SetClockPeriod)(THIS_ int bValue) PURE; -}; - -#undef INTERFACE -#define INTERFACE IFullScreenVideoEx - -DECLARE_INTERFACE_(IFullScreenVideoEx, IFullScreenVideo) -{ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(CountModes)(THIS_ long *pModes) PURE; - STDMETHOD(GetModeInfo)(THIS_ long Mode,long *pWidth,long *pHeight,long *pDepth) PURE; - STDMETHOD(GetCurrentMode)(THIS_ long *pMode) PURE; - STDMETHOD(IsModeAvailable)(THIS_ long Mode) PURE; - STDMETHOD(IsModeEnabled)(THIS_ long Mode) PURE; - STDMETHOD(SetEnabled)(THIS_ long Mode,long bEnabled) PURE; - STDMETHOD(GetClipFactor)(THIS_ long *pClipFactor) PURE; - STDMETHOD(SetClipFactor)(THIS_ long ClipFactor) PURE; - STDMETHOD(SetMessageDrain)(THIS_ HWND hwnd) PURE; - STDMETHOD(GetMessageDrain)(THIS_ HWND *hwnd) PURE; - STDMETHOD(SetMonitor)(THIS_ long Monitor) PURE; - STDMETHOD(GetMonitor)(THIS_ long *Monitor) PURE; - STDMETHOD(HideOnDeactivate)(THIS_ long Hide) PURE; - STDMETHOD(IsHideOnDeactivate)(THIS) PURE; - STDMETHOD(SetCaption)(THIS_ BSTR strCaption) PURE; - STDMETHOD(GetCaption)(THIS_ BSTR *pstrCaption) PURE; - STDMETHOD(SetDefault)(THIS) PURE; - STDMETHOD(SetAcceleratorTable)(THIS_ HWND hwnd,HACCEL hAccel) PURE; - STDMETHOD(GetAcceleratorTable)(THIS_ HWND *phwnd,HACCEL *phAccel) PURE; - STDMETHOD(KeepPixelAspectRatio)(THIS_ long KeepAspect) PURE; - STDMETHOD(IsKeepPixelAspectRatio)(THIS_ long *pKeepAspect) PURE; -}; - - - - -typedef enum -{ - AM_PROPERTY_FRAMESTEP_STEP = 0x01, - AM_PROPERTY_FRAMESTEP_CANCEL = 0x02, - AM_PROPERTY_FRAMESTEP_CANSTEP = 0x03, - AM_PROPERTY_FRAMESTEP_CANSTEPMULTIPLE = 0x04 -} AM_PROPERTY_FRAMESTEP; - -typedef struct _AM_FRAMESTEP_STEP -{ - DWORD dwFramesToStep; -} AM_FRAMESTEP_STEP; - -#ifdef __cplusplus -} -#endif -#endif - Modified: trunk/reactos/include/dxsdk/amvideo.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amvideo.idl?… ============================================================================== --- trunk/reactos/include/dxsdk/amvideo.idl [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/amvideo.idl [iso-8859-1] Sun May 19 13:52:15 2013 @@ -21,7 +21,7 @@ /* trick widl into thinking that it knows the DirectDraw types * as there is no IDL file for them (yet) */ cpp_quote("#if 0") -typedef void * LPDIRECTDRAW; +interface IDirectDraw; typedef void DDSURFACEDESC,DDCAPS; typedef DWORD RGBQUAD; typedef LONGLONG REFERENCE_TIME; @@ -61,7 +61,7 @@ [ object, - uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a), + /* uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a) conflicts with uuids.h */ pointer_default(unique), local ] @@ -73,8 +73,8 @@ HRESULT GetEmulatedCaps([out] DDCAPS *pCaps); HRESULT GetSurfaceDesc([out] DDSURFACEDESC * pSurfaceDesc); HRESULT GetFourCCCodes([out] DWORD * pCount, [out] DWORD * pCodes); - HRESULT SetDirectDraw([in] LPDIRECTDRAW pDirectDraw); - HRESULT GetDirectDraw([out] LPDIRECTDRAW * ppDirectDraw); + HRESULT SetDirectDraw([in] IDirectDraw *ddraw); + HRESULT GetDirectDraw([out] IDirectDraw **ddraw); HRESULT GetSurfaceType([out] DWORD * pSurfaceType); HRESULT SetDefault(); HRESULT UseScanLine([in] long UseScanLine); @@ -87,7 +87,7 @@ [ object, - uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3), + /* uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3) conflicts with uuids.h */ pointer_default(unique), local ] @@ -103,7 +103,7 @@ [ object, - uuid(dd1d7110-7836-11cf-bf47-00aa0055595a), + /* uuid(dd1d7110-7836-11cf-bf47-00aa0055595a) conflicts with uuids.h */ pointer_default(unique) ] interface IFullScreenVideo : IUnknown @@ -129,7 +129,7 @@ [ object, - uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6), + /* uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6) conflicts with uuids.h */ pointer_default(unique), local ] @@ -144,7 +144,7 @@ [ object, - uuid(61ded640-e912-11ce-a099-00aa00479a58), + /* uuid(61ded640-e912-11ce-a099-00aa00479a58) conflicts with uuids.h */ pointer_default(unique), local ] @@ -204,7 +204,7 @@ RGBQUAD bmiColors[iPALETTE_COLORS]; DWORD dwBitMasks[iMASK_COLORS]; TRUECOLORINFO TrueColorInfo; - } DUMMYUNIONNAME; + }; } VIDEOINFO; typedef struct tagMPEG1VIDEOINFO

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2013