Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 55302: - Remove cruft from CMakeLists.txt - Silence debug flood - Remove debugging code - Add traces for composite device detection - Don't print device descriptor
by janderwald＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: janderwald Date: Sun Jan 29 23:11:21 2012 New Revision: 55302 URL: http://svn.reactos.org/svn/reactos?rev=55302&view=rev Log: - Remove cruft from CMakeLists.txt - Silence debug flood - Remove debugging code - Add traces for composite device detection - Don't print device descriptor Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Sun Jan 29 23:11:21 2012 @@ -364,10 +364,6 @@ LinkQueueHead(AsyncListQueueHead, QueueHead); KeReleaseSpinLock(m_Lock, OldLevel); - EHCI_USBCMD_CONTENT UsbCmd; - m_Hardware->GetCommandRegister(&UsbCmd); - ASSERT(UsbCmd.AsyncEnable == TRUE); - } Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Sun Jan 29 23:11:21 2012 @@ -2,7 +2,7 @@ #define USBEHCI_H__ #include <ntddk.h> -#define YDEBUG +#define NDEBUG #include <debug.h> #include <hubbusif.h> #include <usbbusif.h> Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Sun Jan 29 23:11:21 2012 @@ -817,6 +817,7 @@ // // composite device must have only one configuration // + DPRINT1("IsCompositeDevice bNumConfigurations %x\n", DeviceDescriptor->bNumConfigurations); return FALSE; } @@ -825,6 +826,7 @@ // // composite device must have multiple interfaces // + DPRINT1("IsCompositeDevice bNumInterfaces %x\n", ConfigurationDescriptor->bNumInterfaces); return FALSE; } @@ -835,6 +837,7 @@ // ASSERT(DeviceDescriptor->bDeviceSubClass == 0); ASSERT(DeviceDescriptor->bDeviceProtocol == 0); + DPRINT1("IsCompositeDevice: TRUE\n"); return TRUE; } @@ -845,8 +848,11 @@ // // USB-IF association descriptor // + DPRINT1("IsCompositeDevice: TRUE\n"); return TRUE; } + + DPRINT1("DeviceDescriptor bDeviceClass %x bDeviceSubClass %x bDeviceProtocol %x\n", DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass, DeviceDescriptor->bDeviceProtocol); // // not a composite device @@ -1327,7 +1333,7 @@ goto Cleanup; } - DumpFullConfigurationDescriptor(UsbChildExtension->FullConfigDesc); + //DumpFullConfigurationDescriptor(UsbChildExtension->FullConfigDesc); // // Construct all the strings that will described the device to PNP Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] Sun Jan 29 23:11:21 2012 @@ -29,6 +29,6 @@ endif(MSVC) set_module_type(usbohci kernelmodedriver) -add_importlibs(usbohci ntoskrnl ks drmk hal usbd) +add_importlibs(usbohci ntoskrnl hal usbd) add_cd_file(TARGET usbohci DESTINATION reactos/system32/drivers NO_CAB FOR all)

1 0

[akhaldi] 55301: [RASAPI32_WINETEST] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: akhaldi Date: Sun Jan 29 23:00:48 2012 New Revision: 55301 URL: http://svn.reactos.org/svn/reactos?rev=55301&view=rev Log: [RASAPI32_WINETEST] * Sync to Wine 1.3.37. Modified: trunk/rostests/winetests/rasapi32/rasapi.c Modified: trunk/rostests/winetests/rasapi32/rasapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rasapi32/rasapi… ============================================================================== --- trunk/rostests/winetests/rasapi32/rasapi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rasapi32/rasapi.c [iso-8859-1] Sun Jan 29 23:00:48 2012 @@ -85,7 +85,6 @@ rasDevInfo[0].dwSize = 0; cb = bufsize; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - todo_wine ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); @@ -93,7 +92,6 @@ rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) -1; cb = bufsize; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - todo_wine ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); @@ -101,7 +99,6 @@ rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) +1; cb = bufsize; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - todo_wine ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); @@ -151,7 +148,6 @@ cb = 0; rasDevInfo[0].dwSize = 0; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - todo_wine ok(result == ERROR_INVALID_SIZE || broken(result == ERROR_BUFFER_TOO_SMALL), /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result);

1 0

[akhaldi] 55300: [RASAPI32] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: akhaldi Date: Sun Jan 29 23:00:39 2012 New Revision: 55300 URL: http://svn.reactos.org/svn/reactos?rev=55300&view=rev Log: [RASAPI32] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/rasapi32/rasapi.c trunk/reactos/dll/win32/rasapi32/rasapi32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rasapi32/rasapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rasapi.… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rasapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasapi32/rasapi.c [iso-8859-1] Sun Jan 29 23:00:39 2012 @@ -250,6 +250,10 @@ return ERROR_INVALID_PARAMETER; FIXME("(%p,%p,%p),stub!\n",lpRasDevinfo,lpcb,lpcDevices); + + if(lpRasDevinfo && lpRasDevinfo->dwSize != sizeof(RASDEVINFOA)) + return ERROR_INVALID_SIZE; + if (!lpRasDevinfo || (*lpcb < sizeof(RASDEVINFOA))) { *lpcb = sizeof(RASDEVINFOA); return ERROR_BUFFER_TOO_SMALL; Modified: trunk/reactos/dll/win32/rasapi32/rasapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rasapi3… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rasapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasapi32/rasapi32.spec [iso-8859-1] Sun Jan 29 23:00:39 2012 @@ -21,7 +21,7 @@ @ stdcall RasEnumDevicesA(ptr ptr ptr) @ stdcall RasEnumDevicesW(ptr ptr ptr) @ stdcall RasEnumEntriesA(str str ptr ptr ptr) -@ stdcall RasEnumEntriesW(str str ptr ptr ptr) +@ stdcall RasEnumEntriesW(wstr wstr ptr ptr ptr) @ stub RasEnumEntriesWow @ stdcall RasGetAutodialAddressA(str ptr ptr ptr ptr) @ stdcall RasGetAutodialAddressW(wstr ptr ptr ptr ptr) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jan 29 23:00:39 2012 @@ -136,7 +136,7 @@ reactos/dll/win32/printui # Synced to Wine-1.3.37 reactos/dll/win32/pstorec # Synced to Wine-1.3.37 reactos/dll/win32/query # Synced to Wine-1.3.37 -reactos/dll/win32/rasapi32 # Autosync +reactos/dll/win32/rasapi32 # Synced to Wine-1.3.37 reactos/dll/win32/resutils # Autosync reactos/dll/win32/riched20 # Autosync reactos/dll/win32/riched32 # Autosync

1 0

[cgutman] 55299: [USETUP] - Fix the ordering of disks in the 1st stage setup list - Search for the active partition on the selected install disk instead of the first disk
by cgutman＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: cgutman Date: Sun Jan 29 22:54:57 2012 New Revision: 55299 URL: http://svn.reactos.org/svn/reactos?rev=55299&view=rev Log: [USETUP] - Fix the ordering of disks in the 1st stage setup list - Search for the active partition on the selected install disk instead of the first disk Modified: branches/usb-bringup-trunk/base/setup/usetup/partlist.c Modified: branches/usb-bringup-trunk/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/base/setup/us… ============================================================================== --- branches/usb-bringup-trunk/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/base/setup/usetup/partlist.c [iso-8859-1] Sun Jan 29 22:54:57 2012 @@ -875,7 +875,7 @@ GetDriverName (DiskEntry); - InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry, BiosDiskNumber); + InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry, DiskNumber); /* * Allocate a buffer for 26 logical drives (2 entries each == 52) @@ -2377,9 +2377,8 @@ } #endif - DiskEntry = CONTAINING_RECORD (List->DiskListHead.Flink, - DISKENTRY, - ListEntry); + /* Choose the currently selected disk */ + DiskEntry = List->CurrentDisk; /* Check for empty partition list */ if (IsListEmpty (&DiskEntry->PartListHead)) @@ -2440,7 +2439,7 @@ List->ActiveBootPartitionNumber = i; DPRINT("Found bootable partition disk %d, drive letter %c\n", - DiskEntry->BiosDiskNumber, PartEntry->DriveLetter[i]); + DiskEntry->DiskNumber, PartEntry->DriveLetter[i]); break; }

1 0

[akhaldi] 55298: [QUERY] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: akhaldi Date: Sun Jan 29 22:39:18 2012 New Revision: 55298 URL: http://svn.reactos.org/svn/reactos?rev=55298&view=rev Log: [QUERY] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/query/CMakeLists.txt trunk/reactos/dll/win32/query/query.rbuild trunk/reactos/dll/win32/query/query.spec trunk/reactos/dll/win32/query/query_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/query/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/query/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/query/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/query/CMakeLists.txt [iso-8859-1] Sun Jan 29 22:39:18 2012 @@ -1,6 +1,8 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__WINESRC__) +add_definitions( + -D__WINESRC__ + -DCOM_NO_WINDOWS_H) spec2def(query.dll query.spec) Modified: trunk/reactos/dll/win32/query/query.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/query/query.rbui… ============================================================================== --- trunk/reactos/dll/win32/query/query.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/query/query.rbuild [iso-8859-1] Sun Jan 29 22:39:18 2012 @@ -4,6 +4,7 @@ <include base="query">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="COM_NO_WINDOWS_H" /> <file>query_main.c</file> <library>wine</library> <library>uuid</library> Modified: trunk/reactos/dll/win32/query/query.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/query/query.spec… ============================================================================== --- trunk/reactos/dll/win32/query/query.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/query/query.spec [iso-8859-1] Sun Jan 29 22:39:18 2012 @@ -33,7 +33,7 @@ @ stub InitializeFILTERPerformanceData @ stub _LoadBHIFilter@16 @ stub LoadBinaryFilter -@ stub LoadIFilter +@ stdcall LoadIFilter(wstr ptr ptr) @ stub LoadTextFilter @ stub LocateCatalogs @ stdcall LocateCatalogsA(str long ptr ptr ptr ptr) Modified: trunk/reactos/dll/win32/query/query_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/query/query_main… ============================================================================== --- trunk/reactos/dll/win32/query/query_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/query/query_main.c [iso-8859-1] Sun Jan 29 22:39:18 2012 @@ -98,3 +98,10 @@ iBm, pwszMachine, pcMachine, pwszCat, pcCat); return CI_E_NOT_RUNNING; } + +HRESULT WINAPI LoadIFilter(WCHAR const *pwcsPath, IUnknown *pUnkOuter, void **ppIUnk) +{ + FIXME("%s %p %p\n", debugstr_w(pwcsPath), pUnkOuter, ppIUnk); + *ppIUnk = NULL; + return E_NOTIMPL; +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jan 29 22:39:18 2012 @@ -135,7 +135,7 @@ reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.3.37 reactos/dll/win32/pstorec # Synced to Wine-1.3.37 -reactos/dll/win32/query # Autosync +reactos/dll/win32/query # Synced to Wine-1.3.37 reactos/dll/win32/rasapi32 # Autosync reactos/dll/win32/resutils # Autosync reactos/dll/win32/riched20 # Autosync

1 0

[akhaldi] 55297: [PSTOREC] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: akhaldi Date: Sun Jan 29 22:24:35 2012 New Revision: 55297 URL: http://svn.reactos.org/svn/reactos?rev=55297&view=rev Log: [PSTOREC] * Sync to Wine 1.3.37. Added: trunk/reactos/dll/win32/pstorec/pstorec.rgs (with props) Modified: trunk/reactos/dll/win32/pstorec/pstorec.c trunk/reactos/dll/win32/pstorec/rsrc.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/pstorec/pstorec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] Sun Jan 29 22:24:35 2012 @@ -33,9 +33,14 @@ typedef struct { - const IPStoreVtbl *lpVtbl; + IPStore IPStore_iface; LONG ref; } PStore_impl; + +static inline PStore_impl *impl_from_IPStore(IPStore *iface) +{ + return CONTAINING_RECORD(iface, PStore_impl, IPStore_iface); +} BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) { @@ -62,7 +67,7 @@ REFIID riid, LPVOID *ppvObj) { - PStore_impl *This = (PStore_impl *)iface; + PStore_impl *This = impl_from_IPStore(iface); TRACE("%p %s\n",This,debugstr_guid(riid)); @@ -87,7 +92,7 @@ */ static ULONG WINAPI PStore_fnAddRef(IPStore* iface) { - PStore_impl *This = (PStore_impl *)iface; + PStore_impl *This = impl_from_IPStore(iface); TRACE("%p %u\n", This, This->ref); @@ -99,7 +104,7 @@ */ static ULONG WINAPI PStore_fnRelease(IPStore* iface) { - PStore_impl *This = (PStore_impl *)iface; + PStore_impl *This = impl_from_IPStore(iface); LONG ref; TRACE("%p %u\n", This, This->ref); @@ -359,7 +364,7 @@ if( !ips ) return E_OUTOFMEMORY; - ips->lpVtbl = &pstores_vtbl; + ips->IPStore_iface.lpVtbl = &pstores_vtbl; ips->ref = 1; *ppProvider = (IPStore*) ips; Added: trunk/reactos/dll/win32/pstorec/pstorec.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec.rgs (added) +++ trunk/reactos/dll/win32/pstorec/pstorec.rgs [iso-8859-1] Sun Jan 29 22:24:35 2012 @@ -1,0 +1,20 @@ +HKCR +{ + NoRemove Typelib + { + NoRemove '{5A6F1EBD-2DB1-11D0-8C39-00C04FD9126B}' + { + '1.0' = s 'PStore 1.0 Type Library' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '0' + } + } + } + NoRemove Interface + { + } + NoRemove CLSID + { + } +} Propchange: trunk/reactos/dll/win32/pstorec/pstorec.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/pstorec/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/pstorec/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/rsrc.rc [iso-8859-1] Sun Jan 29 22:24:35 2012 @@ -27,3 +27,5 @@ /* @makedep: pstorec_tlb.tlb */ 1 TYPELIB pstorec_tlb.tlb + +2 WINE_REGISTRY pstorec.rgs Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jan 29 22:24:35 2012 @@ -134,7 +134,7 @@ reactos/dll/win32/pidgen # Autosync reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.3.37 -reactos/dll/win32/pstorec # Autosync +reactos/dll/win32/pstorec # Synced to Wine-1.3.37 reactos/dll/win32/query # Autosync reactos/dll/win32/rasapi32 # Autosync reactos/dll/win32/resutils # Autosync

1 0

[akhaldi] 55296: [PRINTUI] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: akhaldi Date: Sun Jan 29 21:39:30 2012 New Revision: 55296 URL: http://svn.reactos.org/svn/reactos?rev=55296&view=rev Log: [PRINTUI] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/printui/printui.c trunk/reactos/dll/win32/printui/printui.rc trunk/reactos/dll/win32/printui/printui_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/printui/printui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui.… ============================================================================== --- trunk/reactos/dll/win32/printui/printui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/printui/printui.c [iso-8859-1] Sun Jan 29 21:39:30 2012 @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(printui); -HINSTANCE PRINTUI_hInstance = NULL; +static HINSTANCE PRINTUI_hInstance = NULL; /* ################################# */ Modified: trunk/reactos/dll/win32/printui/printui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui.… ============================================================================== --- trunk/reactos/dll/win32/printui/printui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/printui/printui.rc [iso-8859-1] Sun Jan 29 21:39:30 2012 @@ -19,9 +19,6 @@ * */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #include "winver.h" #define WINE_FILENAME_STR "printui.dll" Modified: trunk/reactos/dll/win32/printui/printui_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui_… ============================================================================== --- trunk/reactos/dll/win32/printui/printui_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/printui/printui_private.h [iso-8859-1] Sun Jan 29 21:39:30 2012 @@ -63,10 +63,4 @@ LPWSTR options[OPT_MAX]; BOOL flags[FLAG_MAX]; } context_t; - - -/* ## DLL-wide Globals ## */ -extern HINSTANCE PRINTUI_hInstance; - - #endif Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jan 29 21:39:30 2012 @@ -133,7 +133,7 @@ reactos/dll/win32/pdh # Autosync reactos/dll/win32/pidgen # Autosync reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Autosync +reactos/dll/win32/printui # Synced to Wine-1.3.37 reactos/dll/win32/pstorec # Autosync reactos/dll/win32/query # Autosync reactos/dll/win32/rasapi32 # Autosync

1 0

[akhaldi] 55295: [WTSAPI32] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: akhaldi Date: Sun Jan 29 21:29:40 2012 New Revision: 55295 URL: http://svn.reactos.org/svn/reactos?rev=55295&view=rev Log: [WTSAPI32] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] Sun Jan 29 21:29:40 2012 @@ -56,6 +56,24 @@ } /************************************************************ + * WTSConnectSessionA (WTSAPI32.@) + */ +BOOL WINAPI WTSConnectSessionA(ULONG LogonId, ULONG TargetLogonId, PSTR pPassword, BOOL bWait) +{ + FIXME("Stub %d %d (%s) %d\n", LogonId, TargetLogonId, debugstr_a(pPassword), bWait); + return TRUE; +} + +/************************************************************ + * WTSConnectSessionW (WTSAPI32.@) + */ +BOOL WINAPI WTSConnectSessionW(ULONG LogonId, ULONG TargetLogonId, PWSTR pPassword, BOOL bWait) +{ + FIXME("Stub %d %d (%s) %d\n", LogonId, TargetLogonId, debugstr_w(pPassword), bWait); + return TRUE; +} + +/************************************************************ * WTSDisconnectSession (WTSAPI32.@) */ BOOL WINAPI WTSDisconnectSession(HANDLE hServer, DWORD SessionId, BOOL bWait) @@ -99,6 +117,25 @@ } /************************************************************ + * WTSEnumerateServersA (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateServersA(LPSTR pDomainName, DWORD Reserved, DWORD Version, PWTS_SERVER_INFOA *ppServerInfo, DWORD *pCount) +{ + FIXME("Stub %s 0x%08x 0x%08x %p %p\n", debugstr_a(pDomainName), Reserved, Version, ppServerInfo, pCount); + return FALSE; +} + +/************************************************************ + * WTSEnumerateServersW (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateServersW(LPWSTR pDomainName, DWORD Reserved, DWORD Version, PWTS_SERVER_INFOW *ppServerInfo, DWORD *pCount) +{ + FIXME("Stub %s 0x%08x 0x%08x %p %p\n", debugstr_w(pDomainName), Reserved, Version, ppServerInfo, pCount); + return FALSE; +} + + +/************************************************************ * WTSEnumerateEnumerateSessionsA (WTSAPI32.@) */ BOOL WINAPI WTSEnumerateSessionsA(HANDLE hServer, DWORD Reserved, DWORD Version, @@ -138,7 +175,6 @@ void WINAPI WTSFreeMemory(PVOID pMemory) { FIXME("Stub %p\n", pMemory); - return; } /************************************************************ @@ -206,6 +242,230 @@ } /************************************************************ + * WTSQueryUserToken (WTSAPI32.@) + */ +BOOL WINAPI WTSQueryUserToken(ULONG session_id, PHANDLE token) +{ + FIXME("%u %p\n", session_id, token); + return FALSE; +} + +/************************************************************ + * WTSQueryUserConfigA (WTSAPI32.@) + */ +BOOL WINAPI WTSQueryUserConfigA(LPSTR pServerName, LPSTR pUserName, WTS_CONFIG_CLASS WTSConfigClass, LPSTR *ppBuffer, DWORD *pBytesReturned) +{ + FIXME("Stub (%s) (%s) 0x%08x %p %p\n", debugstr_a(pServerName), debugstr_a(pUserName), WTSConfigClass, + ppBuffer, pBytesReturned); + return FALSE; +} + +/************************************************************ + * WTSQueryUserConfigW (WTSAPI32.@) + */ +BOOL WINAPI WTSQueryUserConfigW(LPWSTR pServerName, LPWSTR pUserName, WTS_CONFIG_CLASS WTSConfigClass, LPWSTR *ppBuffer, DWORD *pBytesReturned) +{ + FIXME("Stub (%s) (%s) 0x%08x %p %p\n", debugstr_w(pServerName), debugstr_w(pUserName), WTSConfigClass, + ppBuffer, pBytesReturned); + return FALSE; +} + + +/************************************************************ + * WTSRegisterSessionNotification (WTSAPI32.@) + */ +BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) +{ + FIXME("Stub %p 0x%08x\n", hWnd, dwFlags); + return TRUE; +} + +/************************************************************ + * WTSRegisterSessionNotification (WTSAPI32.@) + */ +BOOL WINAPI WTSRegisterSessionNotificationEx(HANDLE hServer, HWND hWnd, DWORD dwFlags) +{ + FIXME("Stub %p %p 0x%08x\n", hServer, hWnd, dwFlags); + return FALSE; +} + + +/************************************************************ + * WTSSendMessageA (WTSAPI32.@) + */ +BOOL WINAPI WTSSendMessageA(HANDLE hServer, DWORD SessionId, LPSTR pTitle, DWORD TitleLength, LPSTR pMessage, + DWORD MessageLength, DWORD Style, DWORD Timeout, DWORD *pResponse, BOOL bWait) +{ + FIXME("Stub %p 0x%08x (%s) %d (%s) %d 0x%08x %d %p %d\n", hServer, SessionId, debugstr_a(pTitle), TitleLength, debugstr_a(pMessage), MessageLength, Style, Timeout, pResponse, bWait); + return FALSE; +} + +/************************************************************ + * WTSSendMessageW (WTSAPI32.@) + */ +BOOL WINAPI WTSSendMessageW(HANDLE hServer, DWORD SessionId, LPWSTR pTitle, DWORD TitleLength, LPWSTR pMessage, + DWORD MessageLength, DWORD Style, DWORD Timeout, DWORD *pResponse, BOOL bWait) +{ + FIXME("Stub %p 0x%08x (%s) %d (%s) %d 0x%08x %d %p %d\n", hServer, SessionId, debugstr_w(pTitle), TitleLength, debugstr_w(pMessage), MessageLength, Style, Timeout, pResponse, bWait); + return FALSE; +} + +/************************************************************ + * WTSSetUserConfigA (WTSAPI32.@) + */ +BOOL WINAPI WTSSetUserConfigA(LPSTR pServerName, LPSTR pUserName, WTS_CONFIG_CLASS WTSConfigClass, LPSTR pBuffer, DWORD DataLength) +{ + FIXME("Stub (%s) (%s) 0x%08x %p %d\n", debugstr_a(pServerName), debugstr_a(pUserName), WTSConfigClass,pBuffer, DataLength); + return FALSE; +} + +/************************************************************ + * WTSSetUserConfigW (WTSAPI32.@) + */ +BOOL WINAPI WTSSetUserConfigW(LPWSTR pServerName, LPWSTR pUserName, WTS_CONFIG_CLASS WTSConfigClass, LPWSTR pBuffer, DWORD DataLength) +{ + FIXME("Stub (%s) (%s) 0x%08x %p %d\n", debugstr_w(pServerName), debugstr_w(pUserName), WTSConfigClass,pBuffer, DataLength); + return FALSE; +} + +/************************************************************ + * WTSShutdownSystem (WTSAPI32.@) + */ +BOOL WINAPI WTSShutdownSystem(HANDLE hServer, DWORD ShutdownFlag) +{ + FIXME("Stub %p 0x%08x\n", hServer,ShutdownFlag); + return FALSE; +} + +/************************************************************ + * WTSStartRemoteControlSessionA (WTSAPI32.@) + */ +BOOL WINAPI WTSStartRemoteControlSessionA(LPSTR pTargetServerName, ULONG TargetLogonId, BYTE HotkeyVk, USHORT HotkeyModifiers) +{ + FIXME("Stub (%s) %d %d %d\n", debugstr_a(pTargetServerName), TargetLogonId, HotkeyVk, HotkeyModifiers); + return FALSE; +} + +/************************************************************ + * WTSStartRemoteControlSessionW (WTSAPI32.@) + */ +BOOL WINAPI WTSStartRemoteControlSessionW(LPWSTR pTargetServerName, ULONG TargetLogonId, BYTE HotkeyVk, USHORT HotkeyModifiers) +{ + FIXME("Stub (%s) %d %d %d\n", debugstr_w(pTargetServerName), TargetLogonId, HotkeyVk, HotkeyModifiers); + return FALSE; +} + +/************************************************************ + * WTSStopRemoteControlSession (WTSAPI32.@) + */ +BOOL WINAPI WTSStopRemoteControlSession(ULONG LogonId) +{ + FIXME("Stub %d\n", LogonId); + return FALSE; +} + +/************************************************************ + * WTSTerminateProcess (WTSAPI32.@) + */ +BOOL WINAPI WTSTerminateProcess(HANDLE hServer, DWORD ProcessId, DWORD ExitCode) +{ + FIXME("Stub %p %d %d\n", hServer, ProcessId, ExitCode); + return FALSE; +} + +/************************************************************ + * WTSUnRegisterSessionNotification (WTSAPI32.@) + */ +BOOL WINAPI WTSUnRegisterSessionNotification(HWND hWnd) +{ + FIXME("Stub %p\n", hWnd); + return FALSE; +} + +/************************************************************ + * WTSUnRegisterSessionNotification (WTSAPI32.@) + */ +BOOL WINAPI WTSUnRegisterSessionNotificationEx(HANDLE hServer, HWND hWnd) +{ + FIXME("Stub %p %p\n", hServer, hWnd); + return FALSE; +} + + +/************************************************************ + * WTSVirtualChannelClose (WTSAPI32.@) + */ +BOOL WINAPI WTSVirtualChannelClose(HANDLE hChannelHandle) +{ + FIXME("Stub %p\n", hChannelHandle); + return FALSE; +} + +/************************************************************ + * WTSVirtualChannelOpen (WTSAPI32.@) + */ +HANDLE WINAPI WTSVirtualChannelOpen(HANDLE hServer, DWORD SessionId, LPSTR pVirtualName) +{ + FIXME("Stub %p %d (%s)\n", hServer, SessionId, debugstr_a(pVirtualName)); + return NULL; +} + +/************************************************************ + * WTSVirtualChannelOpen (WTSAPI32.@) + */ +HANDLE WINAPI WTSVirtualChannelOpenEx(DWORD SessionId, LPSTR pVirtualName, DWORD flags) +{ + FIXME("Stub %d (%s) %d\n", SessionId, debugstr_a(pVirtualName), flags); + return NULL; +} + +/************************************************************ + * WTSVirtualChannelPurgeInput (WTSAPI32.@) + */ +BOOL WINAPI WTSVirtualChannelPurgeInput(HANDLE hChannelHandle) +{ + FIXME("Stub %p\n", hChannelHandle); + return FALSE; +} + +/************************************************************ + * WTSVirtualChannelPurgeOutput (WTSAPI32.@) + */ +BOOL WINAPI WTSVirtualChannelPurgeOutput(HANDLE hChannelHandle) +{ + FIXME("Stub %p\n", hChannelHandle); + return FALSE; +} + + +/************************************************************ + * WTSVirtualChannelQuery (WTSAPI32.@) + */ +BOOL WINAPI WTSVirtualChannelQuery(HANDLE hChannelHandle, WTS_VIRTUAL_CLASS WtsVirtualClass, PVOID *ppBuffer, DWORD *pBytesReturned) +{ + FIXME("Stub %p %d %p %p\n", hChannelHandle, WtsVirtualClass, ppBuffer, pBytesReturned); + return FALSE; +} + +/************************************************************ + * WTSVirtualChannelRead (WTSAPI32.@) + */ +BOOL WINAPI WTSVirtualChannelRead(HANDLE hChannelHandle, ULONG TimeOut, PCHAR Buffer, ULONG BufferSize, PULONG pBytesRead) +{ + FIXME("Stub %p %d %p %d %p\n", hChannelHandle, TimeOut, Buffer, BufferSize, pBytesRead); + return FALSE; +} + +/************************************************************ + * WTSVirtualChannelWrite (WTSAPI32.@) + */ +BOOL WINAPI WTSVirtualChannelWrite(HANDLE hChannelHandle, PCHAR Buffer, ULONG Length, PULONG pBytesWritten) +{ + FIXME("Stub %p %p %d %p\n", hChannelHandle, Buffer, Length, pBytesWritten); + return FALSE; +} + +/************************************************************ * WTSWaitSystemEvent (WTSAPI32.@) */ BOOL WINAPI WTSWaitSystemEvent(HANDLE hServer, DWORD Mask, DWORD* Flags) @@ -214,30 +474,3 @@ FIXME("Stub %p 0x%08x %p\n", hServer, Mask, Flags); return FALSE; } - -/************************************************************ - * WTSRegisterSessionNotification (WTSAPI32.@) - */ -BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) -{ - FIXME("Stub %p 0x%08x\n", hWnd, dwFlags); - return FALSE; -} - -/************************************************************ - * WTSUnRegisterSessionNotification (WTSAPI32.@) - */ -BOOL WINAPI WTSUnRegisterSessionNotification(HWND hWnd) -{ - FIXME("Stub %p\n", hWnd); - return FALSE; -} - -/************************************************************ - * WTSQueryUserToken (WTSAPI32.@) - */ -BOOL WINAPI WTSQueryUserToken(ULONG session_id, PHANDLE token) -{ - FIXME("%u %p\n", session_id, token); - return FALSE; -} Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec [iso-8859-1] Sun Jan 29 21:29:40 2012 @@ -1,35 +1,43 @@ @ stdcall WTSCloseServer(long) +@ stdcall WTSConnectSessionA(long long ptr long) +@ stdcall WTSConnectSessionW(long long ptr long) @ stdcall WTSDisconnectSession(long long long) @ stdcall WTSEnumerateProcessesA(long long long ptr ptr) @ stdcall WTSEnumerateProcessesW(long long long ptr ptr) -@ stub WTSEnumerateServersA -@ stub WTSEnumerateServersW +@ stdcall WTSEnumerateServersA(ptr long long ptr ptr) +@ stdcall WTSEnumerateServersW(ptr long long ptr ptr) @ stdcall WTSEnumerateSessionsA(long long long ptr ptr) @ stdcall WTSEnumerateSessionsW(long long long ptr ptr) @ stdcall WTSFreeMemory(ptr) -@ stdcall WTSLogoffSession(ptr long long) +@ stdcall WTSLogoffSession(long long long) @ stdcall WTSOpenServerA(ptr) @ stdcall WTSOpenServerW(ptr) @ stdcall WTSQuerySessionInformationA(long long long ptr ptr) @ stdcall WTSQuerySessionInformationW(long long long ptr ptr) -@ stub WTSQueryUserConfigA -@ stub WTSQueryUserConfigW +@ stdcall WTSQueryUserConfigA(ptr ptr long ptr ptr) +@ stdcall WTSQueryUserConfigW(ptr ptr long ptr ptr) @ stdcall WTSQueryUserToken(long ptr) @ stdcall WTSRegisterSessionNotification(long long) -@ stub WTSSendMessageA -@ stub WTSSendMessageW +@ stdcall WTSRegisterSessionNotificationEx(long long long) +@ stdcall WTSSendMessageA(long long ptr long ptr long long long ptr long) +@ stdcall WTSSendMessageW(long long ptr long ptr long long long ptr long) @ stub WTSSetSessionInformationA @ stub WTSSetSessionInformationW -@ stub WTSSetUserConfigA -@ stub WTSSetUserConfigW -@ stub WTSShutdownSystem -@ stub WTSTerminateProcess +@ stdcall WTSSetUserConfigA(ptr ptr long ptr long) +@ stdcall WTSSetUserConfigW(ptr ptr long ptr long) +@ stdcall WTSShutdownSystem(long long) +@ stdcall WTSStartRemoteControlSessionA(ptr long long long) +@ stdcall WTSStartRemoteControlSessionW(ptr long long long) +@ stdcall WTSStopRemoteControlSession(long) +@ stdcall WTSTerminateProcess(long long long) @ stdcall WTSUnRegisterSessionNotification(long) -@ stub WTSVirtualChannelClose -@ stub WTSVirtualChannelOpen -@ stub WTSVirtualChannelPurgeInput -@ stub WTSVirtualChannelPurgeOutput -@ stub WTSVirtualChannelQuery -@ stub WTSVirtualChannelRead -@ stub WTSVirtualChannelWrite +@ stdcall WTSUnRegisterSessionNotificationEx(long long) +@ stdcall WTSVirtualChannelClose(long) +@ stdcall WTSVirtualChannelOpen(long long ptr) +@ stdcall WTSVirtualChannelOpenEx(long ptr long) +@ stdcall WTSVirtualChannelPurgeInput(long) +@ stdcall WTSVirtualChannelPurgeOutput(long) +@ stdcall WTSVirtualChannelQuery(long long ptr ptr) +@ stdcall WTSVirtualChannelRead(long long ptr long ptr) +@ stdcall WTSVirtualChannelWrite(long ptr long ptr) @ stdcall WTSWaitSystemEvent(long long ptr) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jan 29 21:29:40 2012 @@ -180,7 +180,7 @@ reactos/dll/win32/wintrust # Autosync reactos/dll/win32/wldap32 # Autosync reactos/dll/win32/wmi # Autosync -reactos/dll/win32/wtsapi32 # Forked +reactos/dll/win32/wtsapi32 # Synced to Wine-1.3.37 reactos/dll/win32/wuapi # Autosync reactos/dll/win32/xinput1_1 # Autosync reactos/dll/win32/xinput1_2 # Autosync

1 0

[janderwald] 55294: [USBEHCI] - Enable device as pci bus master - Fixes hanging of Vmware USB EHCI controller - Revert changes from 55293 from usb_queue - Currently crashes when usbstor wants to re...
by janderwald＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: janderwald Date: Sun Jan 29 20:34:46 2012 New Revision: 55294 URL: http://svn.reactos.org/svn/reactos?rev=55294&view=rev Log: [USBEHCI] - Enable device as pci bus master - Fixes hanging of Vmware USB EHCI controller - Revert changes from 55293 from usb_queue - Currently crashes when usbstor wants to receive descriptors Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Sun Jan 29 20:34:46 2012 @@ -226,14 +226,42 @@ return STATUS_SUCCESS; } - if (!(PciConfig.Command & PCI_ENABLE_BUS_MASTER)) - { - DPRINT1("PCI Configuration shows this as a non Bus Mastering device!\n"); - } - m_VendorID = PciConfig.VendorID; m_DeviceID = PciConfig.DeviceID; + + if (PciConfig.Command & PCI_ENABLE_BUS_MASTER) + { + // + // master is enabled + // + return STATUS_SUCCESS; + } + + DPRINT1("PCI Configuration shows this as a non Bus Mastering device! Enabling...\n"); + + PciConfig.Command |= PCI_ENABLE_BUS_MASTER; + BusInterface.SetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &PciConfig, 0, PCI_COMMON_HDR_LENGTH); + + BytesRead = (*BusInterface.GetBusData)(BusInterface.Context, + PCI_WHICHSPACE_CONFIG, + &PciConfig, + 0, + PCI_COMMON_HDR_LENGTH); + + if (BytesRead != PCI_COMMON_HDR_LENGTH) + { + DPRINT1("Failed to get pci config information!\n"); + ASSERT(FALSE); + return STATUS_SUCCESS; + } + + if (!(PciConfig.Command & PCI_ENABLE_BUS_MASTER)) + { + PciConfig.Command |= PCI_ENABLE_BUS_MASTER; + DPRINT1("Failed to enable master\n"); + return STATUS_UNSUCCESSFUL; + } return STATUS_SUCCESS; } Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Sun Jan 29 20:34:46 2012 @@ -368,8 +368,6 @@ m_Hardware->GetCommandRegister(&UsbCmd); ASSERT(UsbCmd.AsyncEnable == TRUE); - m_Hardware->SetAsyncListRegister(QueueHead->PhysicalAddr); - } Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Sun Jan 29 20:34:46 2012 @@ -2,7 +2,7 @@ #define USBEHCI_H__ #include <ntddk.h> -#define NDEBUG +#define YDEBUG #include <debug.h> #include <hubbusif.h> #include <usbbusif.h>

1 0

[janderwald] 55293: [USBEHCI] - Update async address everytime a new queue head is added as specified in EHCI spec section 3.2 - Add more checks - Vmware EHCI not yet working
by janderwald＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: janderwald Date: Sun Jan 29 17:30:31 2012 New Revision: 55293 URL: http://svn.reactos.org/svn/reactos?rev=55293&view=rev Log: [USBEHCI] - Update async address everytime a new queue head is added as specified in EHCI spec section 3.2 - Add more checks - Vmware EHCI not yet working Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Sun Jan 29 17:30:31 2012 @@ -301,6 +301,15 @@ // Description: releases the device lock virtual void ReleaseDeviceLock(KIRQL OldLevel) = 0; + + // set command + virtual void SetCommandRegister(struct _EHCI_USBCMD_CONTENT *UsbCmd) = 0; + + // get command + virtual void GetCommandRegister(struct _EHCI_USBCMD_CONTENT *UsbCmd) = 0; + + + }; typedef IUSBHardwareDevice *PUSBHARDWAREDEVICE; Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Sun Jan 29 17:30:31 2012 @@ -141,6 +141,11 @@ // Status = InitializeSyncSchedule(Hardware, MemManager); + // + // store hardware object + // + m_Hardware = Hardware; + return Status; } @@ -358,6 +363,13 @@ KeAcquireSpinLock(m_Lock, &OldLevel); LinkQueueHead(AsyncListQueueHead, QueueHead); KeReleaseSpinLock(m_Lock, OldLevel); + + EHCI_USBCMD_CONTENT UsbCmd; + m_Hardware->GetCommandRegister(&UsbCmd); + ASSERT(UsbCmd.AsyncEnable == TRUE); + + m_Hardware->SetAsyncListRegister(QueueHead->PhysicalAddr); + } @@ -419,6 +431,7 @@ // // Link the LIST_ENTRYs // + ASSERT(IsListEmpty(&HeadQueueHead->LinkedQueueHeads)); InsertTailList(&HeadQueueHead->LinkedQueueHeads, &NewQueueHead->LinkedQueueHeads); // @@ -426,6 +439,7 @@ // Entry = NewQueueHead->LinkedQueueHeads.Blink; LastQueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + ASSERT(LastQueueHead == HeadQueueHead); LastQueueHead->HorizontalLinkPointer = (NewQueueHead->PhysicalAddr | QH_TYPE_QH); // @@ -435,6 +449,11 @@ NextQueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); ASSERT(NextQueueHead == HeadQueueHead); NewQueueHead->HorizontalLinkPointer = (NextQueueHead->PhysicalAddr | QH_TYPE_QH); + + // + // head queue head must be halted + // + PC_ASSERT(HeadQueueHead->Token.Bits.Halted == TRUE); } // Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Sun Jan 29 17:30:31 2012 @@ -767,7 +767,14 @@ // link transfer descriptors to queue head // QueueHead->NextPointer = m_TransferDescriptors[0]->PhysicalAddr; - +/* + if (m_TransferBufferMDL) + QueueHead->AlternateNextPointer = m_TransferDescriptors[2]->PhysicalAddr; + else + QueueHead->AlternateNextPointer = m_TransferDescriptors[1]->PhysicalAddr; + + QueueHead->EndPointCapabilities.InterruptScheduleMask = 0x0; +*/ // // store result //

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs