Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[pschweitzer] 55047: [MSI_WINETEST] Sync msi_winetest.exe with Wine head
by pschweitzer＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: pschweitzer Date: Sat Jan 21 17:21:57 2012 New Revision: 55047 URL: http://svn.reactos.org/svn/reactos?rev=55047&view=rev Log: [MSI_WINETEST] Sync msi_winetest.exe with Wine head Added: trunk/rostests/winetests/msi/action.c (with props) Modified: trunk/rostests/winetests/msi/CMakeLists.txt trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/format.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/msi.rbuild trunk/rostests/winetests/msi/package.c trunk/rostests/winetests/msi/patch.c trunk/rostests/winetests/msi/record.c trunk/rostests/winetests/msi/source.c trunk/rostests/winetests/msi/suminfo.c trunk/rostests/winetests/msi/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/CMakeLists.… Added: trunk/rostests/winetests/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/action.c?re… Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=55… Modified: trunk/rostests/winetests/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/format.c?re… Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=5… Modified: trunk/rostests/winetests/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.rbuild?… Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… Modified: trunk/rostests/winetests/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/patch.c?rev… Modified: trunk/rostests/winetests/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/record.c?re… Modified: trunk/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/source.c?re… Modified: trunk/rostests/winetests/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/suminfo.c?r… Modified: trunk/rostests/winetests/msi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/testlist.c?…

1 0

[pschweitzer] 55046: [MSI] Sync msi.dll with Wine head
by pschweitzer＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: pschweitzer Date: Sat Jan 21 17:19:12 2012 New Revision: 55046 URL: http://svn.reactos.org/svn/reactos?rev=55046&view=rev Log: [MSI] Sync msi.dll with Wine head Added: trunk/reactos/dll/win32/msi/msiserver.h (with props) trunk/reactos/dll/win32/msi/patch.c (with props) Removed: trunk/reactos/dll/win32/msi/helpers.c trunk/reactos/dll/win32/msi/preview.c trunk/reactos/dll/win32/msi/regsvr.c Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/alter.c trunk/reactos/dll/win32/msi/appsearch.c trunk/reactos/dll/win32/msi/assembly.c trunk/reactos/dll/win32/msi/automation.c trunk/reactos/dll/win32/msi/classes.c trunk/reactos/dll/win32/msi/cond.tab.c trunk/reactos/dll/win32/msi/create.c trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/delete.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/distinct.c trunk/reactos/dll/win32/msi/events.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/font.c trunk/reactos/dll/win32/msi/format.c trunk/reactos/dll/win32/msi/handle.c trunk/reactos/dll/win32/msi/insert.c trunk/reactos/dll/win32/msi/install.c trunk/reactos/dll/win32/msi/media.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.rbuild trunk/reactos/dll/win32/msi/msi.spec trunk/reactos/dll/win32/msi/msi_main.c trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/msiquery.c trunk/reactos/dll/win32/msi/msiserver.idl trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/query.h trunk/reactos/dll/win32/msi/record.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/select.c trunk/reactos/dll/win32/msi/sql.tab.c trunk/reactos/dll/win32/msi/sql.y trunk/reactos/dll/win32/msi/storages.c trunk/reactos/dll/win32/msi/streams.c trunk/reactos/dll/win32/msi/string.c trunk/reactos/dll/win32/msi/suminfo.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/dll/win32/msi/tokenize.c trunk/reactos/dll/win32/msi/update.c trunk/reactos/dll/win32/msi/upgrade.c trunk/reactos/dll/win32/msi/where.c trunk/reactos/include/psdk/msi.h trunk/reactos/include/psdk/msidefs.h trunk/reactos/include/psdk/msiquery.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… Modified: trunk/reactos/dll/win32/msi/alter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/alter.c?rev=… Modified: trunk/reactos/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?… Modified: trunk/reactos/dll/win32/msi/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/assembly.c?r… Modified: trunk/reactos/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c… Modified: trunk/reactos/dll/win32/msi/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/classes.c?re… Modified: trunk/reactos/dll/win32/msi/cond.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/cond.tab.c?r… Modified: trunk/reactos/dll/win32/msi/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/create.c?rev… Modified: trunk/reactos/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev… Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… Modified: trunk/reactos/dll/win32/msi/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/delete.c?rev… Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… Modified: trunk/reactos/dll/win32/msi/distinct.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/distinct.c?r… Modified: trunk/reactos/dll/win32/msi/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/events.c?rev… Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… Modified: trunk/reactos/dll/win32/msi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/font.c?rev=5… Modified: trunk/reactos/dll/win32/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/format.c?rev… Modified: trunk/reactos/dll/win32/msi/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/handle.c?rev… Removed: trunk/reactos/dll/win32/msi/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/helpers.c?re… Modified: trunk/reactos/dll/win32/msi/insert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/insert.c?rev… Modified: trunk/reactos/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?re… Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=55… Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbuild?r… Modified: trunk/reactos/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev… Modified: trunk/reactos/dll/win32/msi/msi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_main.c?r… Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… Modified: trunk/reactos/dll/win32/msi/msiquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiquery.c?r… Added: trunk/reactos/dll/win32/msi/msiserver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.h?… Modified: trunk/reactos/dll/win32/msi/msiserver.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.id… Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… Added: trunk/reactos/dll/win32/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/patch.c?rev=… Removed: trunk/reactos/dll/win32/msi/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/preview.c?re… Modified: trunk/reactos/dll/win32/msi/query.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/query.h?rev=… Modified: trunk/reactos/dll/win32/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/record.c?rev… Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… Removed: trunk/reactos/dll/win32/msi/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/regsvr.c?rev… Modified: trunk/reactos/dll/win32/msi/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/select.c?rev… Modified: trunk/reactos/dll/win32/msi/sql.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.tab.c?re… Modified: trunk/reactos/dll/win32/msi/sql.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.y?rev=55… Modified: trunk/reactos/dll/win32/msi/storages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/storages.c?r… Modified: trunk/reactos/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re… Modified: trunk/reactos/dll/win32/msi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/string.c?rev… Modified: trunk/reactos/dll/win32/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/suminfo.c?re… Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… Modified: trunk/reactos/dll/win32/msi/tokenize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/tokenize.c?r… Modified: trunk/reactos/dll/win32/msi/update.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/update.c?rev… Modified: trunk/reactos/dll/win32/msi/upgrade.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/upgrade.c?re… Modified: trunk/reactos/dll/win32/msi/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/where.c?rev=… Modified: trunk/reactos/include/psdk/msi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msi.h?rev=550… Modified: trunk/reactos/include/psdk/msidefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msidefs.h?rev… Modified: trunk/reactos/include/psdk/msiquery.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msiquery.h?re…

1 0

[janderwald] 55045: [USBHUB] - Silence traces
by janderwald＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: janderwald Date: Sat Jan 21 17:07:01 2012 New Revision: 55045 URL: http://svn.reactos.org/svn/reactos?rev=55045&view=rev Log: [USBHUB] - Silence traces Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Sat Jan 21 17:07:01 2012 @@ -191,7 +191,7 @@ // // Set the real device handle // - DPRINT("UsbdDeviceHandle %x, ChildDeviceHandle %x\n", Urb->UrbHeader.UsbdDeviceHandle, ChildDeviceExtension->UsbDeviceHandle); + //DPRINT("UsbdDeviceHandle %x, ChildDeviceHandle %x\n", Urb->UrbHeader.UsbdDeviceHandle, ChildDeviceExtension->UsbDeviceHandle); Urb->UrbHeader.UsbdDeviceHandle = ChildDeviceExtension->UsbDeviceHandle; Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] Sat Jan 21 17:07:01 2012 @@ -155,7 +155,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("Usbhub: DispatchInternalDeviceControl\n"); + //DPRINT1("Usbhub: DispatchInternalDeviceControl\n"); if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) return USBHUB_IrpStub(DeviceObject, Irp); else

1 0

[janderwald] 55044: [HIDCLASS] - Fix typo
by janderwald＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: janderwald Date: Sat Jan 21 17:02:16 2012 New Revision: 55044 URL: http://svn.reactos.org/svn/reactos?rev=55044&view=rev Log: [HIDCLASS] - Fix typo Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] Sat Jan 21 17:02:16 2012 @@ -184,8 +184,8 @@ // // single tlc device // - Offset = swprintf(&Buffer[Offset], L"HID\\Vix_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber) + 1; - Offset += swprintf(&Buffer[Offset], L"HID\\Vix_%04x&Pid_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID) + 1; + Offset = swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber) + 1; + Offset += swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID) + 1; } //

1 0

[rharabien] 55043: [USER32] - Fix loading of MENUEX resources
by rharabien＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: rharabien Date: Sat Jan 21 13:55:09 2012 New Revision: 55043 URL: http://svn.reactos.org/svn/reactos?rev=55043&view=rev Log: [USER32] - Fix loading of MENUEX resources Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sat Jan 21 13:55:09 2012 @@ -2068,14 +2068,15 @@ * Parse an extended menu resource and add items to the menu. * Return a pointer to the end of the resource. */ -static LPCSTR MENUEX_ParseResource( LPCSTR res, HMENU hMenu) +static LPCSTR MENUEX_ParseResource(LPCSTR res, HMENU hMenu) { WORD resinfo; - do { - MENUITEMINFOW mii; - + MENUITEMINFOW mii; + + do + { mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE | MIIM_ID | MIIM_FTYPE; + mii.fMask = MIIM_STATE | MIIM_ID | MIIM_TYPE; mii.fType = GET_DWORD(res); res += sizeof(DWORD); mii.fState = GET_DWORD(res); @@ -2086,7 +2087,8 @@ res += sizeof(WORD); /* Align the text on a word boundary. */ res += (~((UINT_PTR)res - 1)) & 1; - mii.dwTypeData = (LPWSTR) res; + mii.dwTypeData = (LPWSTR)res; + mii.cch = strlenW(mii.dwTypeData); res += (1 + strlenW(mii.dwTypeData)) * sizeof(WCHAR); /* Align the following fields on a dword boundary. */ res += (~((UINT_PTR)res - 1)) & 3; @@ -2094,25 +2096,32 @@ TRACE("Menu item: [%08x,%08x,%04x,%04x,%S]\n", mii.fType, mii.fState, mii.wID, resinfo, mii.dwTypeData); - if (resinfo & 1) { /* Pop-up? */ - /* DWORD helpid = GET_DWORD(res); FIXME: use this. */ + if (resinfo & 1) /* Pop-up? */ + { + /* DWORD helpid = GET_DWORD(res); FIXME: use this. */ res += sizeof(DWORD); mii.hSubMenu = CreatePopupMenu(); if (!mii.hSubMenu) + { + ERR("CreatePopupMenu failed\n"); return NULL; - if (!(res = MENUEX_ParseResource(res, mii.hSubMenu))) { + } + + if (!(res = MENUEX_ParseResource(res, mii.hSubMenu))) + { + ERR("MENUEX_ParseResource failed\n"); DestroyMenu(mii.hSubMenu); return NULL; } mii.fMask |= MIIM_SUBMENU; mii.fType |= MF_POPUP; - mii.wID = (UINT) mii.hSubMenu; - } - else if(!*mii.dwTypeData && !(mii.fType & MF_SEPARATOR)) - { + mii.wID = (UINT)mii.hSubMenu; + } + else if (!mii.dwTypeData[0]) mii.fType |= MF_SEPARATOR; - } - InsertMenuItemW(hMenu, -1, MF_BYPOSITION, &mii); + + if (!InsertMenuItemW(hMenu, -1, MF_BYPOSITION, &mii)) + ERR("InsertMenuItemW failed\n"); } while (!(resinfo & MF_END)); return res; } @@ -4807,7 +4816,7 @@ } return hMenu; default: - DbgPrint("LoadMenuIndirectW(): version %d not supported.\n", version); + ERR("Menu template version %d not supported.\n", version); return 0; } }

1 0

[cgutman] 55042: [USB-BRINGUP-TRUNK] - Don't do any special checks for AddDevice; a failure check is enough
by cgutman＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: cgutman Date: Sat Jan 21 04:17:22 2012 New Revision: 55042 URL: http://svn.reactos.org/svn/reactos?rev=55042&view=rev Log: [USB-BRINGUP-TRUNK] - Don't do any special checks for AddDevice; a failure check is enough Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/p… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat Jan 21 04:17:22 2012 @@ -102,16 +102,7 @@ return Status; } - /* Check if driver added a FDO above the PDO */ Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); - if (Fdo == DeviceNode->PhysicalDeviceObject) - { - /* FIXME: What do we do? Unload the driver or just disable the device? */ - DPRINT1("An FDO was not attached\n"); - ObDereferenceObject(Fdo); - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - return STATUS_UNSUCCESSFUL; - } /* Check if we have a ACPI device (needed for power management) */ if (Fdo->DeviceType == FILE_DEVICE_ACPI)

1 0

[cgutman] 55041: [USB-BRINGUP-TRUNK] - Open a file handle to the port driver like Windows does - USB mice are working now
by cgutman＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: cgutman Date: Sat Jan 21 02:59:46 2012 New Revision: 55041 URL: http://svn.reactos.org/svn/reactos?rev=55041&view=rev Log: [USB-BRINGUP-TRUNK] - Open a file handle to the port driver like Windows does - USB mice are working now Modified: branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.c branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.h branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.c branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.h Modified: branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/input… ============================================================================== --- branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Sat Jan 21 02:59:46 2012 @@ -824,6 +824,72 @@ return Status; } +static NTSTATUS NTAPI +ClassPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PPORT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + + switch (IrpSp->MinorFunction) + { + case IRP_MN_START_DEVICE: + Status = ForwardIrpAndWait(DeviceObject, Irp); + if (NT_SUCCESS(Status)) + { + InitializeObjectAttributes(&ObjectAttributes, + &DeviceExtension->InterfaceName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + Status = ZwOpenFile(&DeviceExtension->FileHandle, + FILE_READ_DATA, + &ObjectAttributes, + &Iosb, + 0, + 0); + if (!NT_SUCCESS(Status)) + DeviceExtension->FileHandle = NULL; + } + else + DeviceExtension->FileHandle = NULL; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + + case IRP_MN_REMOVE_DEVICE: + case IRP_MN_STOP_DEVICE: + if (DeviceExtension->FileHandle) + { + ZwClose(DeviceExtension->FileHandle); + DeviceExtension->FileHandle = NULL; + } + Status = STATUS_SUCCESS; + break; + + default: + Status = Irp->IoStatus.Status; + break; + } + + Irp->IoStatus.Status = Status; + if (NT_SUCCESS(Status)) + { + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->LowerDevice, Irp); + } + else + { + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } +} + static VOID NTAPI ClassStartIo( IN PDEVICE_OBJECT DeviceObject, @@ -1021,6 +1087,7 @@ DriverObject->MajorFunction[IRP_MJ_CLOSE] = ClassClose; DriverObject->MajorFunction[IRP_MJ_CLEANUP] = ClassCleanup; DriverObject->MajorFunction[IRP_MJ_READ] = ClassRead; + DriverObject->MajorFunction[IRP_MJ_PNP] = ClassPnp; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ClassDeviceControl; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = ForwardIrpAndForget; DriverObject->DriverStartIo = ClassStartIo; Modified: branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/input… ============================================================================== --- branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.h [iso-8859-1] Sat Jan 21 02:59:46 2012 @@ -48,6 +48,7 @@ PORT_DEVICE_STATE PnpState; PDEVICE_OBJECT LowerDevice; PDEVICE_OBJECT ClassDO; + HANDLE FileHandle; UNICODE_STRING InterfaceName; } PORT_DEVICE_EXTENSION, *PPORT_DEVICE_EXTENSION; Modified: branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/input… ============================================================================== --- branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.c [iso-8859-1] Sat Jan 21 02:59:46 2012 @@ -800,6 +800,72 @@ return Status; } +static NTSTATUS NTAPI +ClassPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PPORT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + + switch (IrpSp->MinorFunction) + { + case IRP_MN_START_DEVICE: + Status = ForwardIrpAndWait(DeviceObject, Irp); + if (NT_SUCCESS(Status)) + { + InitializeObjectAttributes(&ObjectAttributes, + &DeviceExtension->InterfaceName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + Status = ZwOpenFile(&DeviceExtension->FileHandle, + FILE_READ_DATA, + &ObjectAttributes, + &Iosb, + 0, + 0); + if (!NT_SUCCESS(Status)) + DeviceExtension->FileHandle = NULL; + } + else + DeviceExtension->FileHandle = NULL; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + + case IRP_MN_REMOVE_DEVICE: + case IRP_MN_STOP_DEVICE: + if (DeviceExtension->FileHandle) + { + ZwClose(DeviceExtension->FileHandle); + DeviceExtension->FileHandle = NULL; + } + Status = STATUS_SUCCESS; + break; + + default: + Status = Irp->IoStatus.Status; + break; + } + + Irp->IoStatus.Status = Status; + if (NT_SUCCESS(Status)) + { + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->LowerDevice, Irp); + } + else + { + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } +} + static VOID NTAPI ClassStartIo( IN PDEVICE_OBJECT DeviceObject, @@ -993,6 +1059,7 @@ DriverObject->MajorFunction[IRP_MJ_CLOSE] = ClassClose; DriverObject->MajorFunction[IRP_MJ_CLEANUP] = ClassCleanup; DriverObject->MajorFunction[IRP_MJ_READ] = ClassRead; + DriverObject->MajorFunction[IRP_MJ_PNP] = ClassPnp; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ClassDeviceControl; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = ForwardIrpAndForget; DriverObject->DriverStartIo = ClassStartIo; Modified: branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/input… ============================================================================== --- branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.h [iso-8859-1] Sat Jan 21 02:59:46 2012 @@ -48,6 +48,7 @@ PORT_DEVICE_STATE PnpState; PDEVICE_OBJECT LowerDevice; PDEVICE_OBJECT ClassDO; + HANDLE FileHandle; UNICODE_STRING InterfaceName; } PORT_DEVICE_EXTENSION, *PPORT_DEVICE_EXTENSION;

1 0

[janderwald] 55040: [HIDCLASS] - Remove superflous asserts
by janderwald＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: janderwald Date: Sat Jan 21 01:56:02 2012 New Revision: 55040 URL: http://svn.reactos.org/svn/reactos?rev=55040&view=rev Log: [HIDCLASS] - Remove superflous asserts Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] Sat Jan 21 01:56:02 2012 @@ -132,7 +132,6 @@ // store result // DPRINT1("NewBuffer %S\n", NewBuffer); - ASSERT(FALSE); Irp->IoStatus.Information = (ULONG_PTR)NewBuffer; return STATUS_SUCCESS; } @@ -272,7 +271,6 @@ // // store result // - ASSERT(FALSE); Irp->IoStatus.Information = (ULONG_PTR)Ptr; return STATUS_SUCCESS; }

1 0

[janderwald] 55039: [USB-BRINGUP] - Fix build of hidparse
by janderwald＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: janderwald Date: Sat Jan 21 01:48:30 2012 New Revision: 55039 URL: http://svn.reactos.org/svn/reactos?rev=55039&view=rev Log: [USB-BRINGUP] - Fix build of hidparse Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.h branches/usb-bringup-trunk/lib/drivers/hidparser/api.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c [iso-8859-1] Sat Jan 21 01:48:30 2012 @@ -333,11 +333,6 @@ HID_PARSER Parser; // - // sanity check - // - ASSERT(ReportType == HidP_Input || ReportType == HidP_Output || ReportType == HidP_Feature); - - // // init parser // HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, NULL, &Parser); @@ -345,7 +340,7 @@ // // translate usage pages // - return HidParser_TranslateUsageAndPagesToI8042ScanCodes(Parser, UsageListLength, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); + return HidParser_TranslateUsageAndPagesToI8042ScanCodes(&Parser, ChangedUsageList, UsageListLength, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); } Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.h [iso-8859-1] Sat Jan 21 01:48:30 2012 @@ -7,4 +7,5 @@ #include <hidpi.h> #define NDEBUG #include <debug.h> -#include "hidparser.h" +#include "hidparser.h" +#include <stdio.h> Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/api.c [iso-8859-1] Sat Jan 21 01:48:30 2012 @@ -101,7 +101,6 @@ { PHID_PARSER_CONTEXT ParserContext; ULONG Index; - ULONG ReportCount = 0; // // get parser context @@ -863,7 +862,6 @@ PHID_PARSER_CONTEXT ParserContext; ULONG Index; PHID_REPORT Report; - ULONG ItemCount = 0; USHORT CurrentUsagePage; PHID_REPORT_ITEM ReportItem; ULONG Data; @@ -1017,7 +1015,7 @@ // // is this a key break // - if (KeyAction == HidP_KeyboardBreak) + if (KeyAction == HidP_Keyboard_Break) { // // add break Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c [iso-8859-1] Sat Jan 21 01:48:30 2012 @@ -49,7 +49,7 @@ OUT PHIDP_DEVICE_DESC DeviceDescription) { HIDPARSER_STATUS ParserStatus; - ULONG CollectionCount, ReportCount; + ULONG CollectionCount; ULONG Index; // Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h [iso-8859-1] Sat Jan 21 01:48:30 2012 @@ -330,6 +330,7 @@ NTSTATUS NTAPI HidParser_TranslateUsageAndPagesToI8042ScanCodes( + IN PHID_PARSER Parser, IN PUSAGE_AND_PAGE ChangedUsageList, IN ULONG UsageListLength, IN HIDP_KEYBOARD_DIRECTION KeyAction, @@ -418,6 +419,16 @@ IN OUT PCHAR Report, IN ULONG ReportLength); + +HIDPARSER_STATUS +HidParser_TranslateUsage( + IN PHID_PARSER Parser, + IN USAGE Usage, + IN HIDP_KEYBOARD_DIRECTION KeyAction, + IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, + IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, + IN PVOID InsertCodesContext); + HIDAPI NTSTATUS NTAPI Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h [iso-8859-1] Sat Jan 21 01:48:30 2012 @@ -4,6 +4,7 @@ #include <assert.h> #include <pshpack1.h> #include "hidparser.h" +#include <ntddkbd.h> /* * Copyright 2007, Haiku, Inc. All Rights Reserved.

1 0

[cgutman] 55038: [USB-BRINGUP-TRUNK] - Fix HID class installation
by cgutman＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: cgutman Date: Sat Jan 21 01:44:10 2012 New Revision: 55038 URL: http://svn.reactos.org/svn/reactos?rev=55038&view=rev Log: [USB-BRINGUP-TRUNK] - Fix HID class installation Modified: branches/usb-bringup-trunk/media/inf/input.inf branches/usb-bringup-trunk/media/inf/syssetup.inf Modified: branches/usb-bringup-trunk/media/inf/input.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/inp… ============================================================================== --- branches/usb-bringup-trunk/media/inf/input.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/media/inf/input.inf [iso-8859-1] Sat Jan 21 01:44:10 2012 @@ -10,13 +10,13 @@ DefaultDestDir = 12 HID_Inst.CopyFilesDLL.NT = 11 -[HIDClassReg] -HKR,,,,%HID.ClassName% -HKR,,Icon,,-24 -HKR,,NoInstallClass,,1 +[HIDClass.NT.AddReg] +HKR,,,0,%HID.ClassName% +HKR,,Icon,0,"-24" +HKR,,NoInstallClass,0,1 [ClassInstall32.NT] -Addreg=HIDClassReg +AddReg=HIDClass.NT.AddReg [Manufacturer] %StdMfg% = StdMfg Modified: branches/usb-bringup-trunk/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/sys… ============================================================================== --- branches/usb-bringup-trunk/media/inf/syssetup.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/media/inf/syssetup.inf [iso-8859-1] Sat Jan 21 01:44:10 2012 @@ -11,6 +11,7 @@ fdc.inf hal.inf hdc.inf +input.inf keyboard.inf machine.inf msmouse.inf

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
56
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 January 2012