Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[pschweitzer] 50017: Revert r50016
by pschweitzer＠svn.reactos.org 12 Dec '10

12 Dec '10

Author: pschweitzer Date: Sun Dec 12 22:04:59 2010 New Revision: 50017 URL: http://svn.reactos.org/svn/reactos?rev=50017&view=rev Log: Revert r50016 Removed: trunk/rostests/drivers/kmtest/test Removed: trunk/rostests/drivers/kmtest/test URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/test?rev=5… ============================================================================== (empty)

1 0

[pschweitzer] 50016: Commit test...
by pschweitzer＠svn.reactos.org 12 Dec '10

12 Dec '10

Author: pschweitzer Date: Sun Dec 12 22:03:42 2010 New Revision: 50016 URL: http://svn.reactos.org/svn/reactos?rev=50016&view=rev Log: Commit test... Added: trunk/rostests/drivers/kmtest/test Added: trunk/rostests/drivers/kmtest/test URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/test?rev=5… ============================================================================== (empty)

1 0

[spetreolle] 50015: [ROSTESTS] Delete test file.
by spetreolle＠svn.reactos.org 12 Dec '10

12 Dec '10

Author: spetreolle Date: Sun Dec 12 21:48:05 2010 New Revision: 50015 URL: http://svn.reactos.org/svn/reactos?rev=50015&view=rev Log: [ROSTESTS] Delete test file. Removed: trunk/rostests/lorem ipsum.txt Removed: trunk/rostests/lorem ipsum.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/lorem%20ipsum.txt?rev=500… ============================================================================== --- trunk/rostests/lorem ipsum.txt [iso-8859-1] (original) +++ trunk/rostests/lorem ipsum.txt (removed) @@ -1,3 +1,0 @@ -The standard Lorem Ipsum passage, used since the 1500s - -"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."

1 0

[spetreolle] 50014: [ROSTESTS] Add lorem ipsum test file.
by spetreolle＠svn.reactos.org 12 Dec '10

12 Dec '10

Author: spetreolle Date: Sun Dec 12 21:30:20 2010 New Revision: 50014 URL: http://svn.reactos.org/svn/reactos?rev=50014&view=rev Log: [ROSTESTS] Add lorem ipsum test file. Added: trunk/rostests/lorem ipsum.txt (with props) Added: trunk/rostests/lorem ipsum.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/lorem%20ipsum.txt?rev=500… ============================================================================== --- trunk/rostests/lorem ipsum.txt (added) +++ trunk/rostests/lorem ipsum.txt [iso-8859-1] Sun Dec 12 21:30:20 2010 @@ -1,0 +1,3 @@ +The standard Lorem Ipsum passage, used since the 1500s + +"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." Propchange: trunk/rostests/lorem ipsum.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 50013: Update the rapps database.
by dreimer＠svn.reactos.org 12 Dec '10

12 Dec '10

Author: dreimer Date: Sun Dec 12 18:56:43 2010 New Revision: 50013 URL: http://svn.reactos.org/svn/reactos?rev=50013&view=rev Log: Update the rapps database. Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/ultravnc.txt Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] Sun Dec 12 18:56:43 2010 @@ -2,47 +2,47 @@ [Section] Name = Mozilla Firefox 3.6 -Version = 3.6.12 +Version = 3.6.13 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 8.1M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/e… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 8.0M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/d… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/d… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 8.0M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/e… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 8.0M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/n… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/n… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 8.8M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/p… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/p… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 8.4M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/r… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/r… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 8.4M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/u… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/u… Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Sun Dec 12 18:56:43 2010 @@ -2,13 +2,13 @@ [Section] Name = LibreOffice -Version = 3.3.0 Beta 3 +Version = 3.3.0 RC1 Licence = LGPL Description = Former called OpenOffice. Open Source Office Suite. -Size = 300.0MB +Size = 343.0MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/testing/3.3.0-beta3/win/… +URLDownload = http://download.documentfoundation.org/libreoffice/testing/3.3.0-rc1/win/x8… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Sun Dec 12 18:56:43 2010 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.9.11 +Version = 0.9.12 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 3.0MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.11-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.12-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Sun Dec 12 18:56:43 2010 @@ -2,13 +2,13 @@ [Section] Name = SciTE -Version = 2.22 +Version = 2.23 Licence = Freeware Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. Size = 0.6M Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://kent.dl.sourceforge.net/project/scintilla/SciTE/2.22/Sc222.exe +URLDownload = http://kent.dl.sourceforge.net/project/scintilla/SciTE/2.23/Sc223.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Sun Dec 12 18:56:43 2010 @@ -2,31 +2,31 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.0.10 +Version = 2.0.11 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. Size = 10.1MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.11/win32… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 10.0MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.11/win32… [Section.040a] Description = La suite de Mozilla estÃ¡ viva. Es el primero y Ãºnico navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarÃ¡s. Size = 10.0MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.11/win32… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 10.8MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.11/win32… [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 10.4MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.11/win32… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Sun Dec 12 18:56:43 2010 @@ -2,41 +2,41 @@ [Section] Name = Mozilla Thunderbird -Version = 3.1.6 +Version = 3.1.7 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 9.0M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.7/win3… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 8.8M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.7/win3… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 8.8M URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.7/win3… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 9.7M URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.7/win3… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 9.2M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.7/win3… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 9.2M URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.7/win3… Modified: trunk/reactos/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] Sun Dec 12 18:56:43 2010 @@ -2,13 +2,13 @@ [Section] Name = UltraVNC -Version = 1.0.9.1 +Version = 1.0.9.5 Licence = GPL Description = Open-source VNC client/server. -Size = 2.0MB +Size = 2.1MB Category = 5 URLSite = http://www.uvnc.com/ -URLDownload = http://support1.uvnc.com/download/109/UltraVNC_1.0.9.1_Setup.exe +URLDownload = http://support1.uvnc.com/download/1095/UltraVNC_1.0.9.5_Setup.exe CDPath = none [Section.040a]

1 0

[janderwald] 50012: [KS] - Fix 2 bugs in KsCreateBusEnumObject. It didnt store the allocated device extension and it didnt store the PnpDeviceObject when it was provided by the caller - Implement K...
by janderwald＠svn.reactos.org 11 Dec '10

11 Dec '10

Author: janderwald Date: Sat Dec 11 19:44:15 2010 New Revision: 50012 URL: http://svn.reactos.org/svn/reactos?rev=50012&view=rev Log: [KS] - Fix 2 bugs in KsCreateBusEnumObject. It didnt store the allocated device extension and it didnt store the PnpDeviceObject when it was provided by the caller - Implement KsGetBusEnumIdentifier, KsGetBusEnumPnpDeviceObject Modified: branches/audio-bringup/drivers/ksfilter/ks/api.c Modified: branches/audio-bringup/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/api.c [iso-8859-1] Sat Dec 11 19:44:15 2010 @@ -1743,6 +1743,9 @@ PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; PDEVICE_EXTENSION DeviceExtension; + DPRINT1("KsCreateBusEnumObject %S\n", ServiceRelativePath); + DbgBreakPoint(); + /* calculate sizeof bus enum device extension */ Length = wcslen(BusIdentifier) * sizeof(WCHAR); Length += sizeof(BUS_ENUM_DEVICE_EXTENSION); @@ -1757,6 +1760,9 @@ /* zero device extension */ RtlZeroMemory(BusDeviceExtension, sizeof(BUS_ENUM_DEVICE_EXTENSION)); + /* store bus device extension */ + *((PVOID*)BusDeviceObject->DeviceExtension) = BusDeviceExtension; + /* initialize bus device extension */ wcscpy(BusDeviceExtension->BusIdentifier, BusIdentifier); @@ -1767,7 +1773,7 @@ if (ServiceRelativePath) { /* relative path for devices */ - Length += wcslen(ServiceRelativePath) + 2 * sizeof(WCHAR); + Length += (wcslen(ServiceRelativePath) + 2) * sizeof(WCHAR); } BusDeviceExtension->ServicePath.Length = 0; @@ -1841,6 +1847,11 @@ return STATUS_DEVICE_REMOVED; } + } + else + { + /* directly attach */ + BusDeviceExtension->PnpDeviceObject = PnpDeviceObject; } /* attach device extension */ @@ -1980,7 +1991,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -1988,9 +1999,70 @@ KsGetBusEnumIdentifier( IN PIRP Irp) { - UNIMPLEMENTED - - return STATUS_UNSUCCESSFUL; + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + PIO_STACK_LOCATION IoStack; + ULONG Length; + NTSTATUS Status; + LPWSTR Buffer; + + /* get stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* sanity checks */ + ASSERT(IoStack->DeviceObject); + ASSERT(IoStack->DeviceObject->DeviceExtension); + + /* get bus device extension */ + BusDeviceExtension = *(PBUS_ENUM_DEVICE_EXTENSION*)(IoStack->DeviceObject->DeviceExtension); + + if (!BusDeviceExtension) + { + /* invalid parameter */ + return STATUS_INVALID_PARAMETER; + } + + /* get length */ + Length = (wcslen(BusDeviceExtension->BusIdentifier)+1) * sizeof(WCHAR); + + /* is there an output buffer provided */ + if (IoStack->Parameters.DeviceIoControl.InputBufferLength) + { + if (Length > IoStack->Parameters.DeviceIoControl.InputBufferLength) + { + /* buffer is too small */ + return STATUS_BUFFER_TOO_SMALL; + } + + /* now allocate buffer */ + Buffer = AllocateItem(NonPagedPool, Length); + if (!Buffer) + { + /* no memory */ + Status = STATUS_INSUFFICIENT_RESOURCES; + } + else + { + /* copy bus identifier */ + wcscpy(Buffer, BusDeviceExtension->BusIdentifier); + + /* store buffer */ + Irp->AssociatedIrp.SystemBuffer = Buffer; + + /* set flag that buffer gets copied back */ + Irp->Flags |= IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER | IRP_INPUT_OPERATION; + + /* done */ + Status = STATUS_SUCCESS; + } + } + else + { + /* no buffer provided */ + Status = STATUS_BUFFER_OVERFLOW; + } + + /* done */ + return Status; } /* @@ -2003,12 +2075,13 @@ IN PDEVICE_OBJECT DeviceObject, OUT PDEVICE_OBJECT *FunctionalDeviceObject) { - UNIMPLEMENTED + DPRINT1("KsGetBusEnumParentFDOFromChildPDO\n"); + DbgBreakPoint(); return STATUS_UNSUCCESSFUL; } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -2017,8 +2090,29 @@ IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT *PnpDeviceObject) { - UNIMPLEMENTED - return STATUS_UNSUCCESSFUL; + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + + if (!DeviceObject->DeviceExtension) + { + /* invalid parameter */ + return STATUS_INVALID_PARAMETER; + } + + /* get bus device extension */ + BusDeviceExtension = *(PBUS_ENUM_DEVICE_EXTENSION*)(DeviceObject->DeviceExtension); + + if (!BusDeviceExtension) + { + /* invalid parameter */ + return STATUS_INVALID_PARAMETER; + } + + /* store result */ + *PnpDeviceObject = BusDeviceExtension->PnpDeviceObject; + + + /* done */ + return STATUS_SUCCESS; } /* @@ -2071,6 +2165,8 @@ PIRP Irp) { UNIMPLEMENTED + DPRINT1("KsInstallBusEnumInterface\n"); + DbgBreakPoint(); return STATUS_UNSUCCESSFUL; } @@ -2085,6 +2181,8 @@ OUT PBOOLEAN ChildDevice) { UNIMPLEMENTED + DPRINT1("KsIsBusEnumChildDevice\n"); + DbgBreakPoint(); return STATUS_UNSUCCESSFUL; } @@ -2609,6 +2707,8 @@ IN OUT PIRP Irp) { UNIMPLEMENTED + DPRINT1("KsServiceBusEnumCreateRequest\n"); + DbgBreakPoint(); return STATUS_UNSUCCESSFUL; } @@ -2624,6 +2724,51 @@ IN OUT PIRP Irp) { UNIMPLEMENTED + DPRINT1("KsServiceBusEnumPnpRequest\n"); + DbgBreakPoint(); +/* +KsServiceBusEnumPnpRequest services the following Plug and Play IRPs for an FDO or parent device: + + * + IRP_MN_START_DEVICE + IRP_MN_QUERY_BUS_INFORMATION OK + IRP_MN_QUERY_DEVICE_RELATIONS + IRP_MN_QUERY_STOP_DEVICE + IRP_MN_QUERY_REMOVE_DEVICE + IRP_MN_CANCEL_STOP_DEVICE + IRP_MN_CANCEL_REMOVE_DEVICE + IRP_MN_STOP_DEVICE + IRP_MN_REMOVE_DEVICE +*/ + +/* +Plug and Play IRPs for a PDO or child device: + + * + IRP_MN_START_DEVICE + IRP_MN_QUERY_STOP_DEVICE + IRP_MN_QUERY_REMOVE_DEVICE + IRP_MN_STOP_DEVICE + IRP_MN_REMOVE_DEVICE + IRP_MN_QUERY_DEVICE_RELATIONS (TargetDeviceRelations) + IRP_MN_QUERY_PNP_DEVICE_STATE + IRP_MN_QUERY_ID + IRP_MN_QUERY_INTERFACE + IRP_MN_QUERY_RESOURCES NOP + IRP_MN_QUERY_RESOURCE_REQUIREMENTS NOP + IRP_MN_READ_CONFIG + IRP_MN_WRITE_CONFIG + IRP_MN_QUERY_CAPABILITIES + +*/ +/** + Request: IRP_MN_QUERY_BUS_INFORMATION + : GUID PNP_BUS_INFORMATION + BusTypeGuid: KSMEDIUMSETID_Standard + LegacyBusType: InterfaceTypeUndefined + BusNumber: 0 +*/ + return STATUS_UNSUCCESSFUL; } @@ -2662,6 +2807,9 @@ LUID luid; KSREMOVE_BUS_INTERFACE_CTX Ctx; WORK_QUEUE_ITEM WorkItem; + + DPRINT1("KsRemoveBusEnumInterface\n"); + DbgBreakPoint(); /* get previous mode */ Mode = ExGetPreviousMode();

1 0

[tkreuzer] 50011: [CMAKE] Revert some idl changes from r49286 and r49293, that broke mouse and keyboard in 2nd stage.
by tkreuzer＠svn.reactos.org 11 Dec '10

11 Dec '10

Author: tkreuzer Date: Sat Dec 11 17:04:24 2010 New Revision: 50011 URL: http://svn.reactos.org/svn/reactos?rev=50011&view=rev Log: [CMAKE] Revert some idl changes from r49286 and r49293, that broke mouse and keyboard in 2nd stage. Modified: branches/cmake-bringup/base/system/services/rpcserver.c branches/cmake-bringup/include/reactos/idl/svcctl.idl Modified: branches/cmake-bringup/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi… ============================================================================== --- branches/cmake-bringup/base/system/services/rpcserver.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/services/rpcserver.c [iso-8859-1] Sat Dec 11 17:04:24 2010 @@ -2600,10 +2600,11 @@ /* Function 17 */ DWORD RQueryServiceConfigW( SC_RPC_HANDLE hService, - LPQUERY_SERVICE_CONFIGW lpServiceConfig, + LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGW lpServiceConfig, DWORD cbBufSize, LPBOUNDED_DWORD_8K pcbBytesNeeded) { + LPQUERY_SERVICE_CONFIGW lpServiceConfig = (LPQUERY_SERVICE_CONFIGW)lpBuf; DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; @@ -3777,10 +3778,11 @@ /* Function 29 */ DWORD RQueryServiceConfigA( SC_RPC_HANDLE hService, - LPQUERY_SERVICE_CONFIGA lpServiceConfig, + LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGA lpServiceConfig, DWORD cbBufSize, LPBOUNDED_DWORD_8K pcbBytesNeeded) { + LPQUERY_SERVICE_CONFIGA lpServiceConfig = (LPQUERY_SERVICE_CONFIGA)lpBuf; DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; Modified: branches/cmake-bringup/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/svcctl.idl [iso-8859-1] Sat Dec 11 17:04:24 2010 @@ -434,7 +434,8 @@ /* Function 17 */ DWORD RQueryServiceConfigW( [in] SC_RPC_HANDLE hService, - [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig, + [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, + /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig, */ [in, range(0, 1024*8)] DWORD cbBufSize, [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); @@ -545,7 +546,8 @@ /* Function 29 */ DWORD RQueryServiceConfigA( [in] SC_RPC_HANDLE hService, - [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, + [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, + /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, */ [in, range(0, 1024*8)] DWORD cbBufSize, [out] LPBOUNDED_DWORD_8K pcbBytesNeeded);

1 0

[greatlrd] 50010: update edd_directx_global
by greatlrd＠svn.reactos.org 11 Dec '10

11 Dec '10

Author: greatlrd Date: Sat Dec 11 13:09:06 2010 New Revision: 50010 URL: http://svn.reactos.org/svn/reactos?rev=50010&view=rev Log: update edd_directx_global Modified: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h Modified: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Sat Dec 11 13:09:06 2010 @@ -145,7 +145,7 @@ /* 0x298 */ DD_CALLBACKS ddCallbacks; // 0x298 <-- verified to match Windows XP, ddCallbacks /* 0x2C4 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C4 <-- verified to match Windows XP, ddSurfaceCallbacks /* 0x304 */ DD_PALETTECALLBACKS ddPaletteCallbacks; // 0x304 <-- verified to match Windows XP, ddPaletteCallbacks -/* 0x314 */ ULONG unk_314[46]; +/* 0x314 */ D3DNTHAL_GLOBALDRIVERDATA d3dNtGlobalDriverData; // 0x304 <-- verified to match Windows XP, d3dNtGlobalDriverData /* 0x3D4 */ D3DNTHAL_CALLBACKS d3dNtHalCallbacks; /* 0x460 */ ULONG unk_460[9]; /* 0x47C */ D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2;

1 0

[greatlrd] 50009: remove few debug msg
by greatlrd＠svn.reactos.org 11 Dec '10

11 Dec '10

Author: greatlrd Date: Sat Dec 11 12:26:12 2010 New Revision: 50009 URL: http://svn.reactos.org/svn/reactos?rev=50009&view=rev Log: remove few debug msg Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Sat Dec 11 12:26:12 2010 @@ -283,12 +283,6 @@ DWORD_PTR retVal = 0; PPDEVOBJ PDev = (PPDEVOBJ)hDev; - DPRINT1("ReactX Calling : DxEngGetHdevData DXEGSHDEVDATA : %ld\n", Type); - -#if 1 - DPRINT1("HDEV hDev %08lx\n", hDev); -#endif - switch ( Type ) { case DxEGShDevData_Surface: @@ -372,10 +366,6 @@ default: break; } - -#if 1 - DPRINT1("return value %08lx\n", retVal); -#endif return retVal; @@ -743,7 +733,7 @@ if (pDC) { if (SetType == 1) - { + { if ( Set ) pDC->fs |= DC_FLAG_FULLSCREEN; else

1 0

[greatlrd] 50008: fix few dx bugs and comment how dxg calling order
by greatlrd＠svn.reactos.org 11 Dec '10

11 Dec '10

Author: greatlrd Date: Sat Dec 11 12:24:59 2010 New Revision: 50008 URL: http://svn.reactos.org/svn/reactos?rev=50008&view=rev Log: fix few dx bugs and comment how dxg calling order Modified: branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c Modified: branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c [iso-8859-1] Sat Dec 11 12:24:59 2010 @@ -62,7 +62,7 @@ // pCallBacks->WaitForVerticalBlank = (PDD_WAITFORVERTICALBLANK) DdWaitForVerticalBlank; // pCallBacks->CreatePalette = (PDD_CREATEPALETTE) DdCreatePalette; // pCallBacks->GetScanLine = (PDD_GETSCANLINE) DdGetScanLine; - + /* Unused on Microsoft Windows 2000 and later and should be ignored by the driver. ' pCallBacks->DestroyDriver @@ -76,7 +76,7 @@ memset(pSurfaceCallBacks,0,sizeof(DD_SURFACECALLBACKS)); /* FILL pSurfaceCallBacks with hal stuff */ - // pSurfaceCallBacks->dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); + pSurfaceCallBacks->dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); // DDHAL_SURFCB32_DESTROYSURFACE | // DDHAL_SURFCB32_FLIP | // DDHAL_SURFCB32_LOCK | @@ -111,6 +111,23 @@ return ppdev->bDDInitialized; } +/* + * Note DrvGetDirectDrawInfo + * ms dxg.sys call DrvGetDirectDrawInfo before it call DrvEnableDirectDraw + * so we can not check if the drv have enable the directx or not + * + * Optimze tip ms dxg.sys frist time it call on this api the + * pdwNumHeaps and pdwFourCC is NULL, + * next time it call it have alloc memmory for them + * in the EDD_DIRECTDRAW_GLOBAL in their memory + * pdwFourCC have pool tag 'fddG' and + * pvmList have pool tag 'vddG' + * so we only need fill pHalInfo,pdwNumHeaps,pdwNumFourCCCodes in the + * frist call. + * + * Importet do not forget to fill in pHalInfo->vmiData.pvPrimary if we + * forget that no directx hardware acclartions. + */ BOOL APIENTRY DrvGetDirectDrawInfo( IN DHPDEV dhpdev, @@ -121,39 +138,33 @@ OUT DWORD *pdwFourCC) { PPDEV ppdev = (PPDEV)dhpdev; - DWORD heap = 1; /* we always alloc one heap */ - BOOL bDDrawHeap = FALSE; - - if (ppdev->bDDInitialized == FALSE); - { - return FALSE; - } - - /* Setup heap */ - if ( (ppdev->ScreenWidth < ppdev->MemWidth) || (ppdev->ScreenHeight < ppdev->MemHeight)) - { - bDDrawHeap = TRUE; - heap++; - } - - ppdev->dwHeap = heap; - *pdwNumHeaps = heap; - - /* We do not support other fourcc */ - *pdwNumFourCCCodes = 0; /* - check see if pvmList and pdwFourCC are frist call - or frist. Secon call we fill in pHalInfo info + check see if it is our frist call + if it is fill pHalInfo and pdwNumHeaps and pdwNumFourCCCodes. + + if it our second call we must fill in pdwFourCC or pvmList + if one or two of them have been set. + + But we do not support heap or any fourcc so we skipp it */ - if(!(pvmList && pdwFourCC)) - { + if( (!pvmList) && (!pdwFourCC) ) + { + /* Setup heap */ + ppdev->dwHeap = 0; + *pdwNumHeaps = 0; + + /* We do not support other fourcc */ + *pdwNumFourCCCodes = 0; + + + /* not document ms dxg.sys call this api twice, frist time it call, the pvmList and pdwFourCC is NULL */ RtlZeroMemory(pHalInfo, sizeof(DD_HALINFO)); pHalInfo->dwSize = sizeof(DD_HALINFO); - pHalInfo->ddCaps.dwCaps = DDCAPS_NOHARDWARE; + pHalInfo->ddCaps.dwCaps = 0; /* we do not support all this caps pHalInfo->ddCaps.dwCaps = DDCAPS_BLT | DDCAPS_BLTQUEUE | DDCAPS_BLTCOLORFILL | DDCAPS_READSCANLINE | DDCAPS_BLTSTRETCH | DDCAPS_COLORKEY | DDCAPS_CANBLTSYSMEM; @@ -180,6 +191,8 @@ pHalInfo->ddCaps.dwVidMemTotal = (ppdev->MemHeight - ppdev->ScreenHeight) * ppdev->ScreenDelta; /* fill in some basic info that we need */ + + /* if we do not fill in pHalInfo->vmiData.pvPrimary dxg.sys will not activate the dx */ pHalInfo->vmiData.pvPrimary = ppdev->ScreenPtr; pHalInfo->vmiData.dwDisplayWidth = ppdev->ScreenWidth; pHalInfo->vmiData.dwDisplayHeight = ppdev->ScreenHeight; @@ -203,29 +216,6 @@ } } - /* Now build pvmList info */ - if(pvmList) - { - ppdev->pvmList = pvmList; - - if ( bDDrawHeap == TRUE) - { - pvmList->dwFlags = VIDMEM_ISLINEAR ; - pvmList->fpStart = ppdev->ScreenHeight * ppdev->ScreenDelta; - pvmList->fpEnd = ppdev->MemHeight * ppdev->ScreenDelta - 1; - pvmList->ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - pvmList++; - } - - pvmList->fpStart = 0; - pvmList->fpEnd = (ppdev->MemHeight * ppdev->ScreenDelta) - 1; - pvmList->dwFlags = VIDMEM_ISNONLOCAL | VIDMEM_ISLINEAR | VIDMEM_ISWC; - pvmList->ddsCaps.dwCaps = DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER ; - pvmList->ddsCapsAlt.dwCaps = DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER; - - pvmList = ppdev->pvmList; - } - return TRUE; }

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
37
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 December 2010