Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[janderwald] 41890: - Implement dynamic unregistration of audio devices - IoGetDeviceProperty expects the PDO, not FDO - Implement IUnregisterSubdevice interface for all port drivers

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Jul 11 21:44:41 2009 New Revision: 41890 URL: http://svn.reactos.org/svn/reactos?rev=41890&view=rev Log: - Implement dynamic unregistration of audio devices - IoGetDeviceProperty expects the PDO, not FDO - Implement IUnregisterSubdevice interface for all port drivers Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c (with props) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -145,6 +145,8 @@ goto cleanup; } + /* store max subdevice count */ + portcls_ext->MaxSubDevices = MaxObjects; /* store the physical device object */ portcls_ext->PhysicalDeviceObject = PhysicalDeviceObject; /* set up the start device function */ @@ -237,6 +239,8 @@ SUBDEVICE_DESCRIPTOR * SubDeviceDescriptor; ULONG Index; UNICODE_STRING RefName; + PSUBDEVICE_ENTRY Entry; + PSYMBOLICLINK_ENTRY SymEntry; DPRINT1("PcRegisterSubdevice DeviceObject %p Name %S Unknown %p\n", DeviceObject, Name, Unknown); ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -276,18 +280,36 @@ return STATUS_UNSUCCESSFUL; } + /* allocate subdevice entry */ + Entry = AllocateItem(NonPagedPool, sizeof(SUBDEVICE_ENTRY), TAG_PORTCLASS); + if (!Entry) + { + /* Insufficient memory */ + SubDevice->lpVtbl->Release(SubDevice); + return STATUS_INSUFFICIENT_RESOURCES; + } + /* add an create item to the device header */ Status = KsAddObjectCreateItemToDeviceHeader(DeviceExt->KsDeviceHeader, PcCreateItemDispatch, (PVOID)SubDevice, Name, NULL); if (!NT_SUCCESS(Status)) { /* failed to attach */ SubDevice->lpVtbl->Release(SubDevice); + FreeItem(Entry, TAG_PORTCLASS); DPRINT1("KsAddObjectCreateItemToDeviceHeader failed with %x\n", Status); return Status; } /* initialize reference string */ RtlInitUnicodeString(&RefName, Name); + + /* initialize subdevice entry */ + Entry->SubDevice = SubDevice; + RtlInitUnicodeString(&Entry->Name, Name); + InitializeListHead(&Entry->SymbolicLinkList); + + /* store subdevice entry */ + InsertTailList(&DeviceExt->SubDeviceList, &Entry->Entry); for(Index = 0; Index < SubDeviceDescriptor->InterfaceCount; Index++) { @@ -300,12 +322,26 @@ &SymbolicLinkName); if (NT_SUCCESS(Status)) { + /* activate device interface */ IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - RtlFreeUnicodeString(&SymbolicLinkName); + /* allocate symbolic link entry */ + SymEntry = AllocateItem(NonPagedPool, sizeof(SYMBOLICLINK_ENTRY), TAG_PORTCLASS); + if (SymEntry) + { + /* initialize symbolic link item */ + RtlInitUnicodeString(&SymEntry->SymbolicLink, SymbolicLinkName.Buffer); + /* store item */ + InsertTailList(&Entry->SymbolicLinkList, &SymEntry->Entry); + } + else + { + /* allocating failed */ + RtlFreeUnicodeString(&SymbolicLinkName); + } } } - /* Release SubDevice reference */ + /* release SubDevice reference */ SubDevice->lpVtbl->Release(SubDevice); return STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -20,8 +20,13 @@ OUT PVOID PropertyBuffer, OUT PULONG ResultLength) { + PPCLASS_DEVICE_EXTENSION DeviceExtension; + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - return IoGetDeviceProperty(DeviceObject, DeviceProperty, BufferLength, PropertyBuffer, ResultLength); + + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)((PDEVICE_OBJECT)DeviceObject)->DeviceExtension; + + return IoGetDeviceProperty(DeviceExtension->PhysicalDeviceObject, DeviceProperty, BufferLength, PropertyBuffer, ResultLength); } /* Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -91,5 +91,6 @@ const GUID IID_IMiniportWaveRT = {0x0f9fc4d6, 0x6061, 0x4f3c, {0xb1, 0xfc, 0x7, 0x5e, 0x35, 0xf7, 0x96, 0xa}}; const GUID IID_IMiniportWaveRTStream = {0x000ac9ab, 0xfaab, 0x4f3d, {0x94, 0x55, 0x6f, 0xf8, 0x30, 0x6a, 0x74, 0xa0}}; const GUID IID_IMiniportWaveRTStreamNotification = {0x23759128, 0x96f1, 0x423b, {0xab, 0x4d, 0x81, 0x63, 0x5b, 0xcf, 0x8c, 0xa1}}; +const GUID IID_IUnregisterSubdevice = {0x16738177, 0xe199, 0x41f9, {0x9a, 0x87, 0xab, 0xb2, 0xa5, 0x43, 0x2f, 0x21}}; +const GUID IID_IUnregisterPhysicalConnection = {0x6c38e231, 0x2a0d, 0x428d, {0x81, 0xf8, 0x07, 0xcc, 0x42, 0x8b, 0xb9, 0xa4}}; - Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -82,6 +82,10 @@ else if (IsEqualGUIDAligned(refiid, &IID_IPortClsVersion)) { return NewPortClsVersion((PPORTCLSVERSION*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) + { + return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -100,6 +100,10 @@ else if (IsEqualGUIDAligned(refiid, &IID_IPortClsVersion)) { return NewPortClsVersion((PPORTCLSVERSION*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) + { + return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -225,6 +225,10 @@ IsEqualGUIDAligned(refiid, &IID_IDrmPort2)) { return NewIDrmPort((PDRMPORT2*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) + { + return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -285,6 +285,10 @@ else if (IsEqualGUIDAligned(refiid, &IID_IPortClsVersion)) { return NewPortClsVersion((PPORTCLSVERSION*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) + { + return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -221,6 +221,10 @@ IsEqualGUIDAligned(refiid, &IID_IDrmPort2)) { return NewIDrmPort((PDRMPORT2*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) + { + return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -49,6 +49,7 @@ <file>resource.c</file> <file>service_group.c</file> <file>undoc.c</file> + <file>unregister.c</file> <file>version.c</file> <file>portcls.rc</file> </module> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -294,6 +294,12 @@ PcIoTimerRoutine( IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); + +NTSTATUS +NTAPI +NewIUnregisterSubdevice( + OUT PUNREGISTERSUBDEVICE *OutDevice); + #define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ PropGeneral, PropInstances, PropIntersection)\ @@ -315,8 +321,17 @@ typedef struct { LIST_ENTRY Entry; - KSOBJECT_HEADER ObjectHeader; -}SUBDEVICE_ENTRY; + UNICODE_STRING SymbolicLink; +}SYMBOLICLINK_ENTRY, *PSYMBOLICLINK_ENTRY; + + +typedef struct +{ + LIST_ENTRY Entry; + ISubdevice *SubDevice; + UNICODE_STRING Name; + LIST_ENTRY SymbolicLinkList; +}SUBDEVICE_ENTRY, *PSUBDEVICE_ENTRY; typedef struct { Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -1,0 +1,172 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/backpln/portcls/unregister.c + * PURPOSE: Unregisters a subdevice + * PROGRAMMER: Johannes Anderwald + */ + +#include "private.h" + +typedef struct +{ + IUnregisterSubdeviceVtbl *lpVtbl; + LONG ref; + +}IUnregisterSubdeviceImpl; + +NTSTATUS +NTAPI +IUnregisterSubdevice_fnQueryInterface( + IUnregisterSubdevice* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IUnregisterSubdeviceImpl * This = (IUnregisterSubdeviceImpl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtbl; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +ULONG +NTAPI +IUnregisterSubdevice_fnAddRef( + IUnregisterSubdevice* iface) +{ + IUnregisterSubdeviceImpl * This = (IUnregisterSubdeviceImpl*)iface; + + return InterlockedIncrement(&This->ref); +} + +ULONG +NTAPI +IUnregisterSubdevice_fnRelease( + IUnregisterSubdevice* iface) +{ + IUnregisterSubdeviceImpl * This = (IUnregisterSubdeviceImpl*)iface; + + InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + return This->ref; +} + +NTSTATUS +NTAPI +IUnregisterSubdevice_fnUnregisterSubdevice( + IUnregisterSubdevice* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN Unknown) +{ + PPCLASS_DEVICE_EXTENSION DeviceExtension; + PLIST_ENTRY Entry; + PSUBDEVICE_ENTRY SubDeviceEntry; + PSYMBOLICLINK_ENTRY SymLinkEntry; + ISubdevice *SubDevice; + ULONG Found; + ULONG Index; + NTSTATUS Status; + + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(DeviceExtension); + + /* look up our undocumented interface */ + Status = Unknown->lpVtbl->QueryInterface(Unknown, &IID_ISubdevice, (LPVOID)&SubDevice); + if (!NT_SUCCESS(Status)) + { + DPRINT1("No ISubdevice interface\n"); + /* the provided port driver doesnt support ISubdevice */ + return STATUS_INVALID_PARAMETER; + } + + Entry = DeviceExtension->SubDeviceList.Flink; + Found = FALSE; + /* loop subdevice entry list and search for the subdevice */ + while(Entry != &DeviceExtension->SubDeviceList) + { + SubDeviceEntry = (PSUBDEVICE_ENTRY)CONTAINING_RECORD(Entry, SUBDEVICE_ENTRY, Entry); + if (SubDeviceEntry->SubDevice == SubDevice) + { + Found = TRUE; + break; + } + Entry = Entry->Flink; + } + /* release the subdevice */ + SubDevice->lpVtbl->Release(SubDevice); + + if (!Found) + return STATUS_NOT_FOUND; + + /* remove subdevice entry */ + RemoveEntryList(&SubDeviceEntry->Entry); + + /* loop our create items and disable the create handler */ + for(Index = 0; Index < DeviceExtension->MaxSubDevices; Index++) + { + if (!RtlCompareUnicodeString(&SubDeviceEntry->Name, &DeviceExtension->CreateItems[Index].ObjectClass, TRUE)) + { + DeviceExtension->CreateItems[Index].Create = NULL; + RtlInitUnicodeString(&DeviceExtension->CreateItems[Index].ObjectClass, NULL); + break; + } + } + + /* now unregister device interfaces */ + while(!IsListEmpty(&SubDeviceEntry->SymbolicLinkList)) + { + /* remove entry */ + Entry = RemoveHeadList(&SubDeviceEntry->SymbolicLinkList); + /* get symlink entry */ + SymLinkEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(Entry, SYMBOLICLINK_ENTRY, Entry); + + /* unregister device interface */ + IoSetDeviceInterfaceState(&SymLinkEntry->SymbolicLink, FALSE); + /* free symbolic link */ + RtlFreeUnicodeString(&SymLinkEntry->SymbolicLink); + /* free sym entry */ + FreeItem(SymLinkEntry, TAG_PORTCLASS); + } + + /* free subdevice entry */ + ExFreePool(SubDeviceEntry); + + return STATUS_SUCCESS; +} + +static IUnregisterSubdeviceVtbl vt_IUnregisterSubdeviceVtbl = +{ + IUnregisterSubdevice_fnQueryInterface, + IUnregisterSubdevice_fnAddRef, + IUnregisterSubdevice_fnRelease, + IUnregisterSubdevice_fnUnregisterSubdevice +}; + +NTSTATUS +NTAPI +NewIUnregisterSubdevice( + OUT PUNREGISTERSUBDEVICE *OutDevice) +{ + IUnregisterSubdeviceImpl * This = AllocateItem(NonPagedPool, sizeof(IUnregisterSubdeviceImpl), TAG_PORTCLASS); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->lpVtbl = &vt_IUnregisterSubdeviceVtbl; + This->ref = 1; + + *OutDevice = (PUNREGISTERSUBDEVICE)&This->lpVtbl; + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 5 months

[jmorlan] 41889: Don't use non-portable %zd format. Instead, use %d and cast the variable to an int to ensure printf can read the argument properly

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sat Jul 11 20:16:39 2009 New Revision: 41889 URL: http://svn.reactos.org/svn/reactos?rev=41889&view=rev Log: Don't use non-portable %zd format. Instead, use %d and cast the variable to an int to ensure printf can read the argument properly Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sat Jul 11 20:16:39 2009 @@ -499,8 +499,8 @@ if ( ModuleHandlerInformations[i].cflags && ModuleHandlerInformations[i].cflags[0] ) { fprintf ( fMakefile, - "MODULETYPE%zd_%sFLAGS:=%s\n", - i, + "MODULETYPE%d_%sFLAGS:=%s\n", + (int)i, "C", ModuleHandlerInformations[i].cflags ); } @@ -508,8 +508,8 @@ if ( ModuleHandlerInformations[i].cflags && ModuleHandlerInformations[i].cflags[0] ) { fprintf ( fMakefile, - "MODULETYPE%zd_%sFLAGS:=%s\n", - i, + "MODULETYPE%d_%sFLAGS:=%s\n", + (int)i, "CXX", ModuleHandlerInformations[i].cflags ); } @@ -517,8 +517,8 @@ if ( ModuleHandlerInformations[i].nasmflags && ModuleHandlerInformations[i].nasmflags[0] ) { fprintf ( fMakefile, - "MODULETYPE%zd_%sFLAGS:=%s\n", - i, + "MODULETYPE%d_%sFLAGS:=%s\n", + (int)i, "NASM", ModuleHandlerInformations[i].nasmflags ); }

15 years, 5 months

[mkupfer] 41888: make status window parts more flexible in size

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sat Jul 11 19:59:46 2009 New Revision: 41888 URL: http://svn.reactos.org/svn/reactos?rev=41888&view=rev Log: make status window parts more flexible in size Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c trunk/reactos/base/applications/taskmgr/taskmgr.h Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Sat Jul 11 19:59:46 2009 @@ -459,9 +459,9 @@ return FALSE; /* Create the status bar panes */ - nParts[0] = 100; - nParts[1] = 210; - nParts[2] = 400; + nParts[0] = STATUS_SIZE1; + nParts[1] = STATUS_SIZE2; + nParts[2] = STATUS_SIZE3; SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM) (LPINT) nParts); /* Create tab pages */ @@ -638,8 +638,8 @@ SendMessageW(hStatusWnd, WM_SIZE, nType, MAKELPARAM(cx,rc.bottom - rc.top)); /* Update the status bar pane sizes */ - nParts[0] = bInMenuLoop ? -1 : 100; - nParts[1] = 210; + nParts[0] = bInMenuLoop ? -1 : STATUS_SIZE1; + nParts[1] = STATUS_SIZE2; nParts[2] = cx; SendMessageW(hStatusWnd, SB_SETPARTS, bInMenuLoop ? 1 : 3, (LPARAM) (LPINT) nParts); @@ -792,8 +792,8 @@ bInMenuLoop = FALSE; /* Update the status bar pane sizes */ GetClientRect(hWnd, &rc); - nParts[0] = 100; - nParts[1] = 210; + nParts[0] = STATUS_SIZE1; + nParts[1] = STATUS_SIZE2; nParts[2] = rc.right; SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM) (LPINT) nParts); SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)L""); Modified: trunk/reactos/base/applications/taskmgr/taskmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.h [iso-8859-1] Sat Jul 11 19:59:46 2009 @@ -47,6 +47,9 @@ #define RUN_PERF_PAGE #define STATUS_WINDOW 2001 +#define STATUS_SIZE1 80 +#define STATUS_SIZE2 210 +#define STATUS_SIZE3 400 typedef struct {

15 years, 5 months

[dchapyshev] 41887: - Fix 3 "kernel32_winetest environ" tests. All environ tests passed now

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Jul 11 18:18:06 2009 New Revision: 41887 URL: http://svn.reactos.org/svn/reactos?rev=41887&view=rev Log: - Fix 3 "kernel32_winetest environ" tests. All environ tests passed now Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] Sat Jul 11 18:18:06 2009 @@ -92,10 +92,18 @@ return FALSE; } - if (*nSize > (KeyInfo->DataLength / sizeof(WCHAR))) + if (lpBuffer && *nSize > (KeyInfo->DataLength / sizeof(WCHAR))) { *nSize = KeyInfo->DataLength / sizeof(WCHAR) - 1; lpBuffer[*nSize] = 0; + } + else + { + RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); + ZwClose(KeyHandle); + *nSize = ReturnSize; + SetLastErrorByStatus(STATUS_BUFFER_OVERFLOW); + return FALSE; } RtlCopyMemory(lpBuffer, KeyInfo->Data, *nSize * sizeof(WCHAR)); @@ -254,7 +262,8 @@ if (!TempBuffer) { - return ERROR_OUTOFMEMORY; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; } AnsiString.MaximumLength = (USHORT)*nSize;

15 years, 5 months

[janderwald] 41886: [KMIXER] - Set KSCREATE_ITEM_WILDCARD flag to receive all requests in one handler -- Kmixer is now back accessible

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Jul 11 17:52:36 2009 New Revision: 41886 URL: http://svn.reactos.org/svn/reactos?rev=41886&view=rev Log: [KMIXER] - Set KSCREATE_ITEM_WILDCARD flag to receive all requests in one handler -- Kmixer is now back accessible Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] Sat Jul 11 17:52:36 2009 @@ -201,7 +201,7 @@ if (Buffer) { /* is the request for a new pin */ - if (!wcsstr(KS_NAME_PIN, Buffer)) + if (wcsstr(Buffer, KS_NAME_PIN)) { Status = CreatePin(Irp); @@ -254,6 +254,7 @@ /* initialize create item struct */ RtlZeroMemory(CreateItem, sizeof(KSOBJECT_CREATE_ITEM)); CreateItem->Create = DispatchCreateKMix; + CreateItem->Flags = KSCREATE_ITEM_WILDCARD; RtlInitUnicodeString(&CreateItem->ObjectClass, L"KMixer"); Status = KsAllocateDeviceHeader(&DeviceExtension->KsDeviceHeader,

15 years, 5 months

[mjmartin] 41885: - NtMapViewOfSection: When referencing the section object by handle, don't assume access mask of SECTION_MAP_READ. Access mask must be determined from page protection attributes passed in Protect parameter. Fixes 5 winetests for kernel32 virtual.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat Jul 11 17:40:56 2009 New Revision: 41885 URL: http://svn.reactos.org/svn/reactos?rev=41885&view=rev Log: - NtMapViewOfSection: When referencing the section object by handle, don't assume access mask of SECTION_MAP_READ. Access mask must be determined from page protection attributes passed in Protect parameter. Fixes 5 winetests for kernel32 virtual. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Jul 11 17:40:56 2009 @@ -3729,6 +3729,7 @@ PMMSUPPORT AddressSpace; NTSTATUS Status = STATUS_SUCCESS; ULONG tmpProtect; + ACCESS_MASK DesiredAccess; /* * Check the protection @@ -3807,8 +3808,27 @@ AddressSpace = &Process->Vm; + /* Convert NT Protection Attr to Access Mask */ + if (Protect == PAGE_READONLY) + { + DesiredAccess = SECTION_MAP_READ; + } + else if (Protect == PAGE_READWRITE) + { + DesiredAccess = SECTION_MAP_WRITE; + } + else if (Protect == PAGE_WRITECOPY) + { + DesiredAccess = SECTION_QUERY; + } + /* FIXME: Handle other Protection Attributes. For now keep previous behavior */ + else + { + DesiredAccess = SECTION_MAP_READ; + } + Status = ObReferenceObjectByHandle(SectionHandle, - SECTION_MAP_READ, + DesiredAccess, MmSectionObjectType, PreviousMode, (PVOID*)(PVOID)&Section,

15 years, 5 months

[dchapyshev] 41884: - Fix one "kernel32_winetest time" test. All time tests passed now

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Jul 11 17:35:38 2009 New Revision: 41884 URL: http://svn.reactos.org/svn/reactos?rev=41884&view=rev Log: - Fix one "kernel32_winetest time" test. All time tests passed now Modified: trunk/reactos/dll/win32/kernel32/misc/time.c Modified: trunk/reactos/dll/win32/kernel32/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/time.c [iso-8859-1] Sat Jul 11 17:35:38 2009 @@ -204,6 +204,27 @@ } /*********************************************************************** + * TIME_TimeZoneID + * + * Calculates whether daylight savings is on now. + * + * PARAMS + * pTzi [in] Timezone info. + * + * RETURNS + * TIME_ZONE_ID_INVALID An error occurred + * TIME_ZONE_ID_UNKNOWN There are no transition time known + * TIME_ZONE_ID_STANDARD Current time is standard time + * TIME_ZONE_ID_DAYLIGHT Current time is daylight savings time + */ +static DWORD TIME_ZoneID( const TIME_ZONE_INFORMATION *pTzi ) +{ + FILETIME ftTime; + GetSystemTimeAsFileTime( &ftTime); + return TIME_CompTimeZoneID( pTzi, &ftTime, FALSE); +} + +/*********************************************************************** * TIME_GetTimezoneBias * * Calculates the local time bias for a given time zone. @@ -534,7 +555,7 @@ return TIME_ZONE_ID_INVALID; } - return(SharedUserData->TimeZoneId); + return TIME_ZoneID(lpTimeZoneInformation); }

15 years, 5 months

[mkupfer] 41883: use application icon for about dialog

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sat Jul 11 17:34:18 2009 New Revision: 41883 URL: http://svn.reactos.org/svn/reactos?rev=41883&view=rev Log: use application icon for about dialog Modified: trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/mplay32/mplay32.rbuild Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sat Jul 11 17:34:18 2009 @@ -641,9 +641,12 @@ break; case IDM_ABOUT: - ShellAbout(hwnd, szAppTitle, 0, 0); - break; - + { + HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN)); + ShellAbout(hwnd, szAppTitle, 0, mplayIcon); + DeleteObject(mplayIcon); + break; + } case IDM_EXIT: PostMessage(hwnd, WM_CLOSE, 0, 0); return 0; Modified: trunk/reactos/base/applications/mplay32/mplay32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.rbuild [iso-8859-1] Sat Jul 11 17:34:18 2009 @@ -5,6 +5,7 @@ <library>comdlg32</library> <library>kernel32</library> <library>user32</library> + <library>gdi32</library> <library>winmm</library> <library>shell32</library> <file>mplay32.c</file>

15 years, 5 months

[ros-arm-bringup] 41882: Fix the signature of tcsrchr. The last prameter is a TCHAR, not a XINT.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jul 11 17:12:09 2009 New Revision: 41882 URL: http://svn.reactos.org/svn/reactos?rev=41882&view=rev Log: Fix the signature of tcsrchr. The last prameter is a TCHAR, not a XINT. Modified: trunk/reactos/lib/sdk/crt/string/tcsrchr.h Modified: trunk/reactos/lib/sdk/crt/string/tcsrchr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/tcsrchr… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/tcsrchr.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/tcsrchr.h [iso-8859-1] Sat Jul 11 17:12:09 2009 @@ -3,7 +3,7 @@ #include <tchar.h> -_TCHAR * _tcsrchr(const _TCHAR * s, _XINT c) +_TCHAR * _tcsrchr(const _TCHAR * s, _TCHAR c) { _TCHAR cc = c; const _TCHAR * sp = (_TCHAR *)0;

15 years, 5 months

[ros-arm-bringup] 41881: Don't build stack-based WINE exception handling on ARM -- we have .pdata

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jul 11 17:11:44 2009 New Revision: 41881 URL: http://svn.reactos.org/svn/reactos?rev=41881&view=rev Log: Don't build stack-based WINE exception handling on ARM -- we have .pdata Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] Sat Jul 11 17:11:44 2009 @@ -52,6 +52,7 @@ #define EH_STACK_INVALID 0x08 #define EH_NESTED_CALL 0x10 +#ifndef _M_ARM static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { frame->Next = (struct _EXCEPTION_REGISTRATION_RECORD *)__readfsdword(0); @@ -64,6 +65,7 @@ __writefsdword(0, (unsigned long)frame->Next); return frame->Next; } +#endif #define __TRY _SEH2_TRY #define __EXCEPT(func) _SEH2_EXCEPT(func(_SEH2_GetExceptionInformation()))

15 years, 5 months

← Newer
1
...
41
42
43
44
45
46
47
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009