Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[janderwald] 39143: - Fix registered guids for IPortMidi - Fix InterfaceGuids array in IPortTopology - Add a hack to prevent es1371 driver from crashing

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jan 27 11:54:46 2009 New Revision: 39143 URL: http://svn.reactos.org/svn/reactos?rev=39143&view=rev Log: - Fix registered guids for IPortMidi - Fix InterfaceGuids array in IPortTopology - Add a hack to prevent es1371 driver from crashing Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] Tue Jan 27 11:54:46 2009 @@ -116,7 +116,7 @@ //FIXME // retry with different size on failure - This->Buffer = This->pAdapter->DmaOperations->AllocateCommonBuffer(This->pAdapter, BufferSize, &This->Address, TRUE); + This->Buffer = This->pAdapter->DmaOperations->AllocateCommonBuffer(This->pAdapter, BufferSize, &This->Address, FALSE); if (!This->Buffer) { DPRINT1("IDmaChannelSlave_AllocateBuffer fAllocateCommonBuffer failed \n"); @@ -125,7 +125,7 @@ This->BufferSize = BufferSize; This->AllocatedBufferSize = BufferSize; - DPRINT1("IDmaChannelSlave_fnAllocateBuffer Success Buffer %u Address %ull\n", BufferSize, This->Address); + DPRINT1("IDmaChannelSlave_fnAllocateBuffer Success Buffer %u Address %x %p\n", BufferSize, This->Address, PhysicalAddressConstraint); return STATUS_SUCCESS; } @@ -226,10 +226,19 @@ IDmaChannelSlave_fnPhysicalAdress( IN IDmaChannelSlave * iface) { - IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; - - DPRINT("IDmaChannelSlave_PhysicalAdress: This %p\n", This); - return This->Address; + PHYSICAL_ADDRESS Address; + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + DPRINT("IDmaChannelSlave_PhysicalAdress: This %p Virtuell %p Physical High %x Low %x%\n", This, This->Buffer, This->Address.HighPart, This->Address.LowPart); + +#if 1 + + /// HACK + /// Prevent ES1371 driver from crashing by returning the vaddr instead of physical address + Address.QuadPart = (ULONG_PTR)This->Buffer; +#else + Address.QuadPart = This->Address.QuadPart; +#endif + return Address; } VOID Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c [iso-8859-1] Tue Jan 27 11:54:46 2009 @@ -18,16 +18,19 @@ PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor; }IPortMidiImpl; - static GUID InterfaceGuids[3] = { - { - /// KS_CATEGORY_TOPOLOGY - 0xDDA54A40, 0x1E4C, 0x11D1, {0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00} - }, { /// KS_CATEGORY_AUDIO 0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} + }, + { + /// KS_CATEGORY_RENDER + 0x65E8773E, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} + }, + { + /// KS_CATEGORY_CAPTURE + 0x65E8773D, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} } }; @@ -64,6 +67,11 @@ else if (IsEqualGUIDAligned(refiid, &IID_IPortClsVersion)) { return NewPortClsVersion((PPORTCLSVERSION*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IDrmPort) || + IsEqualGUIDAligned(refiid, &IID_IDrmPort2)) + { + return NewIDrmPort((PDRMPORT2*)Output); } StringFromCLSID(refiid, Buffer); @@ -190,7 +198,7 @@ /* create the subdevice descriptor */ Status = PcCreateSubdeviceDescriptor(&This->SubDeviceDescriptor, - 2, + 3, InterfaceGuids, 0, NULL, 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] Tue Jan 27 11:54:46 2009 @@ -18,7 +18,7 @@ }IPortTopologyImpl; -static GUID InterfaceGuids[3] = +static GUID InterfaceGuids[2] = { { /// KS_CATEGORY_TOPOLOGY

15 years, 9 months

[janderwald] 39142: - Add guids for IPortMidi and IMiniportMidi - Add UNIMPLEMENTED macro to NewPortDMus - Partly implement IPortMidi (based on IPortTopology)

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jan 27 11:38:56 2009 New Revision: 39142 URL: http://svn.reactos.org/svn/reactos?rev=39142&view=rev Log: - Add guids for IPortMidi and IMiniportMidi - Add UNIMPLEMENTED macro to NewPortDMus - Partly implement IPortMidi (based on IPortTopology) Modified: 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_midi.c 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] Tue Jan 27 11:38:56 2009 @@ -24,6 +24,8 @@ const GUID IID_IDrmPort2 = {0x1ACCE59CL, 0x7311, 0x4B6B, {0x9F, 0xBA, 0xCC, 0x3B, 0xA5, 0x9A, 0xCD, 0xCE}}; const GUID IID_IInterruptSync = {0x22C6AC63L, 0x851B, 0x11D0, {0x9A, 0x7F, 0x00, 0xAA, 0x00, 0x38, 0xAC, 0xFE}}; const GUID IID_IPortWavePci = {0xb4c90a50L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; +const GUID IID_IPortMidi = {0xb4c90a40L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; +const GUID IID_IMiniportMidi = {0xb4c90a41L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID IID_IMiniportWavePci = {0xb4c90a52L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID IID_IAdapterPowerManagement = {0x793417D0L, 0x35FE, 0x11D1, {0xAD, 0x08, 0x00, 0xA0, 0xC9, 0x0A, 0xB1, 0xB0}}; 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] Tue Jan 27 11:38:56 2009 @@ -177,6 +177,7 @@ NewPortDMus( OUT PPORT* OutPort) { + UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c [iso-8859-1] Tue Jan 27 11:38:56 2009 @@ -1,8 +1,460 @@ #include "private.h" + +typedef struct +{ + IPortMidiVtbl *lpVtbl; + ISubdeviceVtbl *lpVtblSubDevice; + + LONG ref; + BOOL bInitialized; + + PMINIPORTMIDI pMiniport; + PDEVICE_OBJECT pDeviceObject; + PPINCOUNT pPinCount; + PPOWERNOTIFY pPowerNotify; + PSERVICEGROUP pServiceGroup; + + PPCFILTER_DESCRIPTOR pDescriptor; + PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor; +}IPortMidiImpl; + + +static GUID InterfaceGuids[3] = +{ + { + /// KS_CATEGORY_TOPOLOGY + 0xDDA54A40, 0x1E4C, 0x11D1, {0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00} + }, + { + /// KS_CATEGORY_AUDIO + 0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} + } +}; + +//--------------------------------------------------------------- +// IUnknown interface functions +// + +NTSTATUS +NTAPI +IPortMidi_fnQueryInterface( + IPortMidi* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + WCHAR Buffer[100]; + IPortMidiImpl * This = (IPortMidiImpl*)iface; + + DPRINT1("IPortMidi_fnQueryInterface\n"); + + if (IsEqualGUIDAligned(refiid, &IID_IPortMidi) || + IsEqualGUIDAligned(refiid, &IID_IPort) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtbl; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + else if (IsEqualGUIDAligned(refiid, &IID_ISubdevice)) + { + *Output = &This->lpVtblSubDevice; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + else if (IsEqualGUIDAligned(refiid, &IID_IPortClsVersion)) + { + return NewPortClsVersion((PPORTCLSVERSION*)Output); + } + + StringFromCLSID(refiid, Buffer); + DPRINT1("IPortMidi_fnQueryInterface no iface %S\n", Buffer); + KeBugCheckEx(0, 0, 0, 0, 0); + return STATUS_UNSUCCESSFUL; +} + +ULONG +NTAPI +IPortMidi_fnAddRef( + IPortMidi* iface) +{ + IPortMidiImpl * This = (IPortMidiImpl*)iface; + + return InterlockedIncrement(&This->ref); +} + +ULONG +NTAPI +IPortMidi_fnRelease( + IPortMidi* iface) +{ + IPortMidiImpl * This = (IPortMidiImpl*)iface; + + InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + + +//--------------------------------------------------------------- +// IPort interface functions +// + +NTSTATUS +NTAPI +IPortMidi_fnGetDeviceProperty( + IN IPortMidi * iface, + IN DEVICE_REGISTRY_PROPERTY DeviceRegistryProperty, + IN ULONG BufferLength, + OUT PVOID PropertyBuffer, + OUT PULONG ReturnLength) +{ + IPortMidiImpl * This = (IPortMidiImpl*)iface; + + if (!This->bInitialized) + { + DPRINT("IPortMidi_fnNewRegistryKey called w/o initiazed\n"); + return STATUS_UNSUCCESSFUL; + } + + return IoGetDeviceProperty(This->pDeviceObject, DeviceRegistryProperty, BufferLength, PropertyBuffer, ReturnLength); +} + +NTSTATUS +NTAPI +IPortMidi_fnInit( + IN IPortMidi * iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PUNKNOWN UnknownMiniport, + IN PUNKNOWN UnknownAdapter OPTIONAL, + IN PRESOURCELIST ResourceList) +{ + IMiniportMidi * Miniport; + IServiceGroup * ServiceGroup = NULL; + NTSTATUS Status; + IPortMidiImpl * This = (IPortMidiImpl*)iface; + + DPRINT1("IPortMidi_fnInit entered This %p DeviceObject %p Irp %p UnknownMiniport %p UnknownAdapter %p ResourceList %p\n", + This, DeviceObject, Irp, UnknownMiniport, UnknownAdapter, ResourceList); + + if (This->bInitialized) + { + DPRINT1("IPortMidi_Init called again\n"); + return STATUS_SUCCESS; + } + + Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IMiniportMidi, (PVOID*)&Miniport); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IPortMidi_Init called with invalid IMiniport adapter\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Initialize port object */ + This->pMiniport = Miniport; + This->pDeviceObject = DeviceObject; + This->bInitialized = TRUE; + + /* increment reference on miniport adapter */ + Miniport->lpVtbl->AddRef(Miniport); + + DbgBreakPoint(); + Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface, &ServiceGroup); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IPortMidi_Init failed with %x\n", Status); + This->bInitialized = FALSE; + Miniport->lpVtbl->Release(Miniport); + return Status; + } + + DPRINT1("IMiniportMidi sucessfully init\n"); + + /* get the miniport device descriptor */ + Status = Miniport->lpVtbl->GetDescription(Miniport, &This->pDescriptor); + if (!NT_SUCCESS(Status)) + { + DPRINT1("failed to get description\n"); + Miniport->lpVtbl->Release(Miniport); + This->bInitialized = FALSE; + return Status; + } + + This->pServiceGroup = ServiceGroup; + + /* create the subdevice descriptor */ + Status = PcCreateSubdeviceDescriptor(&This->SubDeviceDescriptor, + 2, + InterfaceGuids, + 0, + NULL, + 0, + NULL, + 0, + 0, + 0, + NULL, + 0, + NULL, + This->pDescriptor); + + + DPRINT1("IPortMidi_fnInit success\n"); + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +IPortMidi_fnNewRegistryKey( + IN IPortMidi * iface, + OUT PREGISTRYKEY *OutRegistryKey, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN ULONG RegistryKeyType, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN ULONG CreateOptions OPTIONAL, + OUT PULONG Disposition OPTIONAL) +{ + IPortMidiImpl * This = (IPortMidiImpl*)iface; + + if (!This->bInitialized) + { + DPRINT("IPortMidi_fnNewRegistryKey called w/o initialized\n"); + return STATUS_UNSUCCESSFUL; + } + return PcNewRegistryKey(OutRegistryKey, + OuterUnknown, + RegistryKeyType, + DesiredAccess, + This->pDeviceObject, + NULL,//FIXME + ObjectAttributes, + CreateOptions, + Disposition); +} + + +VOID +NTAPI +IPortMidi_fnNotify( + IN IPortMidi * iface, + IN PSERVICEGROUP ServiceGroup OPTIONAL) +{ + UNIMPLEMENTED +} + +NTSTATUS +NTAPI +IPortMidi_fnRegisterServiceGroup( + IN IPortMidi * iface, + IN PSERVICEGROUP ServiceGroup) +{ + UNIMPLEMENTED + return STATUS_SUCCESS; +} + +static IPortMidiVtbl vt_IPortMidi = +{ + /* IUnknown methods */ + IPortMidi_fnQueryInterface, + IPortMidi_fnAddRef, + IPortMidi_fnRelease, + /* IPort methods */ + IPortMidi_fnInit, + IPortMidi_fnGetDeviceProperty, + IPortMidi_fnNewRegistryKey, + IPortMidi_fnNotify, + IPortMidi_fnRegisterServiceGroup +}; + +//--------------------------------------------------------------- +// ISubdevice interface +// + +static +NTSTATUS +NTAPI +ISubDevice_fnQueryInterface( + IN ISubdevice *iface, + IN REFIID InterfaceId, + IN PVOID* Interface) +{ + IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); + + return IPortMidi_fnQueryInterface((IPortMidi*)This, InterfaceId, Interface); +} + +static +ULONG +NTAPI +ISubDevice_fnAddRef( + IN ISubdevice *iface) +{ + IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); + + return IPortMidi_fnAddRef((IPortMidi*)This); +} + +static +ULONG +NTAPI +ISubDevice_fnRelease( + IN ISubdevice *iface) +{ + IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); + + return IPortMidi_fnRelease((IPortMidi*)This); +} + +static +NTSTATUS +NTAPI +ISubDevice_fnNewIrpTarget( + IN ISubdevice *iface, + OUT struct IIrpTarget **OutTarget, + IN WCHAR * Name, + IN PUNKNOWN Unknown, + IN POOL_TYPE PoolType, + IN PDEVICE_OBJECT * DeviceObject, + IN PIRP Irp, + IN KSOBJECT_CREATE *CreateObject) +{ + IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); + + DPRINT1("ISubDevice_NewIrpTarget this %p\n", This); + return STATUS_UNSUCCESSFUL; +} + +static +NTSTATUS +NTAPI +ISubDevice_fnReleaseChildren( + IN ISubdevice *iface) +{ + IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); + + DPRINT1("ISubDevice_ReleaseChildren this %p\n", This); + return STATUS_UNSUCCESSFUL; +} + +static +NTSTATUS +NTAPI +ISubDevice_fnGetDescriptor( + IN ISubdevice *iface, + IN SUBDEVICE_DESCRIPTOR ** Descriptor) +{ + IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); + + DPRINT1("ISubDevice_GetDescriptor this %p\n", This); + *Descriptor = This->SubDeviceDescriptor; + return STATUS_SUCCESS; +} + +static +NTSTATUS +NTAPI +ISubDevice_fnDataRangeIntersection( + IN ISubdevice *iface, + IN ULONG PinId, + IN PKSDATARANGE DataRange, + IN PKSDATARANGE MatchingDataRange, + IN ULONG OutputBufferLength, + OUT PVOID ResultantFormat OPTIONAL, + OUT PULONG ResultantFormatLength) +{ + IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); + + DPRINT("ISubDevice_DataRangeIntersection this %p\n", This); + + if (This->pMiniport) + { + return This->pMiniport->lpVtbl->DataRangeIntersection (This->pMiniport, PinId, DataRange, MatchingDataRange, OutputBufferLength, ResultantFormat, ResultantFormatLength); + } + + return STATUS_UNSUCCESSFUL; +} + +static +NTSTATUS +NTAPI +ISubDevice_fnPowerChangeNotify( + IN ISubdevice *iface, + IN POWER_STATE PowerState) +{ + IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); + + if (This->pPowerNotify) + { + This->pPowerNotify->lpVtbl->PowerChangeNotify(This->pPowerNotify, PowerState); + } + + return STATUS_SUCCESS; +} + +static +NTSTATUS +NTAPI +ISubDevice_fnPinCount( + IN ISubdevice *iface, + IN ULONG PinId, + IN OUT PULONG FilterNecessary, + IN OUT PULONG FilterCurrent, + IN OUT PULONG FilterPossible, + IN OUT PULONG GlobalCurrent, + IN OUT PULONG GlobalPossible) +{ + IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); + + if (This->pPinCount) + { + This->pPinCount->lpVtbl->PinCount(This->pPinCount, PinId, FilterNecessary, FilterCurrent, FilterPossible, GlobalCurrent, GlobalPossible); + return STATUS_SUCCESS; + } + + /* FIXME + * scan filter descriptor + */ + return STATUS_UNSUCCESSFUL; +} + +static ISubdeviceVtbl vt_ISubdeviceVtbl = +{ + ISubDevice_fnQueryInterface, + ISubDevice_fnAddRef, + ISubDevice_fnRelease, + ISubDevice_fnNewIrpTarget, + ISubDevice_fnReleaseChildren, + ISubDevice_fnGetDescriptor, + ISubDevice_fnDataRangeIntersection, + ISubDevice_fnPowerChangeNotify, + ISubDevice_fnPinCount +}; + NTSTATUS NewPortMidi( OUT PPORT* OutPort) { - return STATUS_UNSUCCESSFUL; -} + IPortMidiImpl * This; + + This = AllocateItem(NonPagedPool, sizeof(IPortMidiImpl), TAG_PORTCLASS); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->lpVtbl = &vt_IPortMidi; + This->lpVtblSubDevice = &vt_ISubdeviceVtbl; + This->ref = 1; + *OutPort = (PPORT)(&This->lpVtbl); + + DPRINT1("NewPortMidi result %p\n", *OutPort); + + return STATUS_SUCCESS; +}

15 years, 9 months

[janderwald] 39141: - Add macro to avoid warning - Revert my fix to IID_IPortMidi

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jan 27 11:35:34 2009 New Revision: 39141 URL: http://svn.reactos.org/svn/reactos?rev=39141&view=rev Log: - Add macro to avoid warning - Revert my fix to IID_IPortMidi Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Tue Jan 27 11:35:34 2009 @@ -1074,9 +1074,12 @@ */ DEFINE_GUID(IID_IPortMidi, - 0xb4c90a24L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); + 0xb4c90a40L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); DEFINE_GUID(CLSID_PortMidi, 0xb4c90a43L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); + +#undef INTERFACE +#define INTERFACE IPortMidi DECLARE_INTERFACE_(IPortMidi, IPort) {

15 years, 9 months

[cwittich] 39140: -don't load the image in WM_PAINT -return the correct values when handling a window message -free resources -...

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jan 27 11:14:00 2009 New Revision: 39140 URL: http://svn.reactos.org/svn/reactos?rev=39140&view=rev Log: -don't load the image in WM_PAINT -return the correct values when handling a window message -free resources -... Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Tue Jan 27 11:14:00 2009 @@ -24,7 +24,8 @@ HINSTANCE hInstance; SHIMGVW_SETTINGS shiSettings; -WCHAR szOpenFileName[MAX_PATH]; +GpImage *image; +WNDPROC PrevProc = NULL; HWND hDispWnd, hToolBar; @@ -44,23 +45,31 @@ {TBICON_PRINT, IDC_PRINT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, }; +static void pLoadImage(LPWSTR szOpenFileName) +{ + if (GetFileAttributesW(szOpenFileName) == 0xFFFFFFFF) + { + DPRINT1("File %s not found!\n", szOpenFileName); + return; + } + + GdipLoadImageFromFile(szOpenFileName, &image); + if (!image) + { + DPRINT1("GdipLoadImageFromFile() failed\n"); + } +} + static VOID ImageView_DrawImage(HWND hwnd) { GpGraphics *graphics; - GpImage *image; UINT uImgWidth, uImgHeight; UINT height = 0, width = 0, x = 0, y = 0; PAINTSTRUCT ps; RECT rect; HDC hdc; - if (GetFileAttributesW(szOpenFileName) == 0xFFFFFFFF) - { - DPRINT1("File %s not found!\n", szOpenFileName); - return; - } - hdc = BeginPaint(hwnd, &ps); if (!hdc) { @@ -74,20 +83,13 @@ DPRINT1("GdipCreateFromHDC() failed\n"); return; } - - GdipLoadImageFromFile(szOpenFileName, &image); - if (!image) - { - DPRINT1("GdipLoadImageFromFile() failed\n"); - return; - } - + GdipGetImageWidth(image, &uImgWidth); GdipGetImageHeight(image, &uImgHeight); if (GetClientRect(hwnd, &rect)) { - FillRect(hdc, &rect, (HBRUSH)COLOR_WINDOW); + FillRect(hdc, &rect, (HBRUSH)GetStockObject(WHITE_BRUSH)); if ((rect.right == uImgWidth)&&(rect.bottom == uImgHeight)) { @@ -152,7 +154,7 @@ DPRINT("x = %d\ny = %d\nWidth = %d\nHeight = %d\n\nrect.right = %d\nrect.bottom = %d\n\nuImgWidth = %d\nuImgHeight = %d\n", x, y, width, height, rect.right, rect.bottom, uImgWidth, uImgHeight); GdipDrawImageRect(graphics, image, x, y, width, height); } - + GdipDeleteGraphics(graphics); EndPaint(hwnd, &ps); } @@ -260,6 +262,20 @@ return FALSE; } +LRESULT CALLBACK +ImageView_DispWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) +{ + switch (Message) + { + case WM_PAINT: + { + ImageView_DrawImage(hwnd); + return 0L; + } + } + return CallWindowProc(PrevProc, hwnd, Message, wParam, lParam); +} + static VOID ImageView_InitControls(HWND hwnd) { @@ -269,10 +285,13 @@ if (shiSettings.Maximized) ShowWindow(hwnd, SW_MAXIMIZE); - hDispWnd = CreateWindowEx(WS_EX_TRANSPARENT, _T("STATIC"), _T(""), + hDispWnd = CreateWindowEx(0, _T("STATIC"), _T(""), WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, NULL, hInstance, NULL); + SetClassLong(hDispWnd, GCL_STYLE, CS_HREDRAW | CS_VREDRAW); + PrevProc = (WNDPROC) SetWindowLong(hDispWnd, GWL_WNDPROC, (LPARAM) ImageView_DispWndProc); + ImageView_CreateToolBar(hwnd); } @@ -284,9 +303,8 @@ case WM_CREATE: { ImageView_InitControls(hwnd); - } - break; - + return 0L; + } case WM_COMMAND: { switch (wParam) @@ -362,15 +380,8 @@ } } } - } - break; - - case WM_PAINT: - { - ImageView_DrawImage(hDispWnd); - } - break; - + break; + } case WM_SIZING: { LPRECT pRect = (LPRECT)lParam; @@ -379,22 +390,21 @@ if (pRect->bottom-pRect->top < 290) pRect->bottom = pRect->top + 290; - } - break; - + return TRUE; + } case WM_SIZE: { MoveWindow(hDispWnd, 1, 1, LOWORD(lParam)-1, HIWORD(lParam)-35, TRUE); SendMessage(hToolBar, TB_AUTOSIZE, 0, 0); - } - break; - + return 0L; + } case WM_DESTROY: { ImageView_SaveSettings(hwnd); + SetWindowLong(hDispWnd, GWL_WNDPROC, (LPARAM) PrevProc); PostQuitMessage(0); - } - break; + break; + } } return DefWindowProc(hwnd, Message, wParam, lParam); @@ -410,8 +420,6 @@ HWND hMainWnd; MSG msg; - wcscpy(szOpenFileName, szFileName); - if (!ImageView_LoadSettings()) { shiSettings.Maximized = FALSE; @@ -428,6 +436,7 @@ gdiplusStartupInput.SuppressExternalCodecs = 0; GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + pLoadImage(szFileName); // Create the window WndClass.lpszClassName = _T("shimgvw_window"); @@ -442,7 +451,7 @@ LoadString(hInstance, IDS_APPTITLE, szBuf, sizeof(szBuf) / sizeof(TCHAR)); hMainWnd = CreateWindow(_T("shimgvw_window"), szBuf, - WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_VISIBLE | WS_CAPTION, + WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CAPTION, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, NULL, NULL, hInstance, NULL); @@ -457,6 +466,8 @@ DispatchMessageW(&msg); } + if (image) + GdipDisposeImage(image); GdiplusShutdown(gdiplusToken); return -1; }

15 years, 9 months

[janderwald] 39139: - Fix a typo

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jan 27 10:53:18 2009 New Revision: 39139 URL: http://svn.reactos.org/svn/reactos?rev=39139&view=rev Log: - Fix a typo Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Tue Jan 27 10:53:18 2009 @@ -1074,7 +1074,7 @@ */ DEFINE_GUID(IID_IPortMidi, - 0xb4c90a24L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44)); + 0xb4c90a24L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); DEFINE_GUID(CLSID_PortMidi, 0xb4c90a43L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44);

15 years, 9 months

[cfinck] 39138: - Prepend %_ROSBE_ROSSOURCEDIR% to the files and folders when cleaning. This makes sure cleaning also works properly when you're not in the source dir. It also prevents your tree from being totally wiped if you're i.e. on S:\ and your source tree is in S:\reactos. - Set ROS_ARCH already some places before, so we can skip some 'if "%ROS_ARCH%" == ""' checks Thanks to Caemyr for testing.

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Jan 27 10:52:18 2009 New Revision: 39138 URL: http://svn.reactos.org/svn/reactos?rev=39138&view=rev Log: - Prepend %_ROSBE_ROSSOURCEDIR% to the files and folders when cleaning. This makes sure cleaning also works properly when you're not in the source dir. It also prevents your tree from being totally wiped if you're i.e. on S:\ and your source tree is in S:\reactos. - Set ROS_ARCH already some places before, so we can skip some 'if "%ROS_ARCH%" == ""' checks Thanks to Caemyr for testing. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Tue Jan 27 10:52:18 2009 @@ -58,38 +58,30 @@ :: Apply modified obj and out paths for deletion. :: +if "%ROS_ARCH%" == "" ( + set ROS_ARCH=i386 +) + if "%_ROSBE_OBJPATH%" == "" ( - if not "%ROS_ARCH%" == "" ( - set _ROSBE_OBJCLEANPATH=obj-%ROS_ARCH% - ) else ( - set _ROSBE_OBJCLEANPATH=obj-i386 - ) + set _ROSBE_OBJCLEANPATH=%_ROSBE_ROSSOURCEDIR%\obj-%ROS_ARCH% ) else ( set _ROSBE_OBJCLEANPATH=%_ROSBE_OBJPATH% ) if "%_ROSBE_OUTPATH%" == "" ( - if not "%ROS_ARCH%" == "" ( - set _ROSBE_OUTCLEANPATH=output-%ROS_ARCH% - ) else ( - set _ROSBE_OUTCLEANPATH=output-i386 - ) + set _ROSBE_OUTCLEANPATH=%_ROSBE_ROSSOURCEDIR%\output-%ROS_ARCH% ) else ( set _ROSBE_OUTCLEANPATH=%_ROSBE_OUTPATH% ) -if not "%ROS_ARCH%" == "" ( - set _ROSBE_MAKEFILE=makefile-%ROS_ARCH%.auto +if "%ROS_ARCH%" == "i386" ( + set _ROSBE_MAKEFILE=%_ROSBE_ROSSOURCEDIR%\makefile.auto ) else ( - set _ROSBE_MAKEFILE=makefile.auto + set _ROSBE_MAKEFILE=%_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto ) if exist "%_ROSBE_MAKEFILE%" ( del "%_ROSBE_MAKEFILE%" 1> NUL 2> NUL -) - -if "%ROS_ARCH%" == "" ( - set ROS_ARCH=i386 ) if exist "%_ROSBE_OBJCLEANPATH%\." ( @@ -111,8 +103,8 @@ :ROS -if exist "reactos\." ( - rd /s /q "reactos" 1> NUL 2> NUL +if exist "%_ROSBE_ROSSOURCEDIR%\reactos\." ( + rd /s /q "%_ROSBE_ROSSOURCEDIR%\reactos" 1> NUL 2> NUL ) goto :EOF

15 years, 9 months

[janderwald] 39137: - Fix a bug ;)

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jan 27 10:44:08 2009 New Revision: 39137 URL: http://svn.reactos.org/svn/reactos?rev=39137&view=rev Log: - Fix a bug ;) Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Tue Jan 27 10:44:08 2009 @@ -1073,15 +1073,8 @@ IPortMidi Interface */ -#if 0 -#define STATIC_IID_IPortMidi \ - 0xb4c90a43L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44 -DEFINE_GUIDSTRUCT("0xB4C90A43-5791-11d0-86f9-00a0c911b544", IID_IPortMidi); -#define IID_IPortMidi DEFINE_GUIDNAMED(IID_IPortMidi) -#endif - DEFINE_GUID(IID_IPortMidi, - 0xb4c90a40L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); + 0xb4c90a24L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44)); DEFINE_GUID(CLSID_PortMidi, 0xb4c90a43L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); @@ -1236,6 +1229,9 @@ #undef INTERFACE #define INTERFACE IMiniportMidiStream +DEFINE_GUID(IID_IMiniportMidiStream, + 0xb4c90a42L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); + DECLARE_INTERFACE_(IMiniportMidiStream, IUnknown) { DEFINE_ABSTRACT_UNKNOWN() @@ -1265,6 +1261,9 @@ */ #undef INTERFACE #define INTERFACE IMiniportMidi + +DEFINE_GUID(IID_IMiniportMidi, + 0xb4c90a41L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); DECLARE_INTERFACE_(IMiniportMidi, IMiniport) { @@ -1276,6 +1275,8 @@ IN PRESOURCELIST ResourceList, IN PPORTMIDI Port, OUT PSERVICEGROUP* ServiceGroup) PURE; + + STDMETHOD_(void, Service)(THIS) PURE; STDMETHOD_(NTSTATUS, NewStream)(THIS_ OUT PMINIPORTMIDISTREAM Stream, @@ -1286,7 +1287,6 @@ IN PKSDATAFORMAT DataFormat, OUT PSERVICEGROUP* ServiceGroup) PURE; - STDMETHOD_(void, Service)(THIS) PURE; }; typedef IMiniportMidi *PMINIPORTMIDI;

15 years, 9 months

[tkreuzer] 39136: kd64: Move KdpSysGetVersion into arch-specific file

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 27 10:26:30 2009 New Revision: 39136 URL: http://svn.reactos.org/svn/reactos?rev=39136&view=rev Log: kd64: Move KdpSysGetVersion into arch-specific file Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kd-amd64.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kd-i386.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kd-amd64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kd-amd64.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kd-amd64.c [iso-8859-1] Tue Jan 27 10:26:30 2009 @@ -13,6 +13,20 @@ #include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) +{ + /* Copy the version block */ + RtlCopyMemory(Version, &KdVersionBlock, sizeof(DBGKD_GET_VERSION64)); + +Version->PsLoadedModuleList = &KeLoaderBlock->LoadOrderListHead; + + Version->Flags = DBGKD_VERS_FLAG_PTR64 | DBGKD_VERS_FLAG_DATA; + Version->KdSecondaryVersion = KD_SECONDARY_VERSION_AMD64_CONTEXT; + +} VOID NTAPI @@ -149,7 +163,7 @@ PreviousMode, SecondChanceException); } - +FrLdrDbgPrint("leave KdpTrap\n"); /* Return TRUE or FALSE to caller */ return Status; } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kd-i386.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kd-i386.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kd-i386.c [iso-8859-1] Tue Jan 27 10:26:30 2009 @@ -13,6 +13,14 @@ #include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) +{ + /* Copy the version block */ + RtlCopyMemory(Version, &KdVersionBlock, sizeof(DBGKD_GET_VERSION64)); +} VOID NTAPI Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Tue Jan 27 10:26:30 2009 @@ -208,14 +208,6 @@ VOID NTAPI -KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) -{ - /* Copy the version block */ - RtlCopyMemory(Version, &KdVersionBlock, sizeof(DBGKD_GET_VERSION64)); -} - -VOID -NTAPI KdpGetVersion(IN PDBGKD_MANIPULATE_STATE64 State) { STRING Header; @@ -226,8 +218,6 @@ /* Get the version block */ KdpSysGetVersion(&State->u.GetVersion64); - -//State->u.GetVersion64.PsLoadedModuleList = &KeLoaderBlock->LoadOrderListHead; /* Fill out the state */ State->ApiNumber = DbgKdGetVersionApi;

15 years, 9 months

[cwittich] 39135: -don't delete a DC return from BeginPaint -DPRINT1 -> DPRINT

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jan 27 10:01:47 2009 New Revision: 39135 URL: http://svn.reactos.org/svn/reactos?rev=39135&view=rev Log: -don't delete a DC return from BeginPaint -DPRINT1 -> DPRINT Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Tue Jan 27 10:01:47 2009 @@ -72,7 +72,6 @@ if (!graphics) { DPRINT1("GdipCreateFromHDC() failed\n"); - DeleteDC(hdc); return; } @@ -80,7 +79,6 @@ if (!image) { DPRINT1("GdipLoadImageFromFile() failed\n"); - DeleteDC(hdc); return; } @@ -151,11 +149,10 @@ } } - DPRINT1("x = %d\ny = %d\nWidth = %d\nHeight = %d\n\nrect.right = %d\nrect.bottom = %d\n\nuImgWidth = %d\nuImgHeight = %d", x, y, width, height, rect.right, rect.bottom, uImgWidth, uImgHeight); + DPRINT("x = %d\ny = %d\nWidth = %d\nHeight = %d\n\nrect.right = %d\nrect.bottom = %d\n\nuImgWidth = %d\nuImgHeight = %d\n", x, y, width, height, rect.right, rect.bottom, uImgWidth, uImgHeight); GdipDrawImageRect(graphics, image, x, y, width, height); } - DeleteDC(hdc); EndPaint(hwnd, &ps); }

15 years, 9 months

[gschneider] 39134: Update IntEngCreateSrcMonoXlate parameter names and function call with brush colors after logic changes of r38633. Based on the patch of Evgeny Boltik <bstsoft AT narod DOT ru>, see bug #4070 for more info. Fixes inverted colors when using hatched brushes.

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue Jan 27 09:36:07 2009 New Revision: 39134 URL: http://svn.reactos.org/svn/reactos?rev=39134&view=rev Log: Update IntEngCreateSrcMonoXlate parameter names and function call with brush colors after logic changes of r38633. Based on the patch of Evgeny Boltik <bstsoft AT narod DOT ru>, see bug #4070 for more info. Fixes inverted colors when using hatched brushes. Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/include/inteng.h trunk/reactos/subsystems/win32/win32k/objects/brush.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Tue Jan 27 09:36:07 2009 @@ -358,8 +358,8 @@ XLATEOBJ* FASTCALL IntEngCreateSrcMonoXlate(HPALETTE PaletteDest, - ULONG ForegroundColor, - ULONG BackgroundColor) + ULONG Color0, + ULONG Color1) { XLATEOBJ *XlateObj; XLATEGDI *XlateGDI; @@ -404,8 +404,8 @@ XlateGDI->BlueShift = CalculateShift(RGB(0x00, 0x00, 0xFF)) - CalculateShift(XlateGDI->BlueMask); /* Yes, that's how Windows works, ... */ - XlateObj->pulXlate[1] = ShiftAndMask(XlateGDI, BackgroundColor); - XlateObj->pulXlate[0] = ShiftAndMask(XlateGDI, ForegroundColor); + XlateObj->pulXlate[1] = ShiftAndMask(XlateGDI, Color1); + XlateObj->pulXlate[0] = ShiftAndMask(XlateGDI, Color0); if (XlateObj->iDstType == PAL_INDEXED) { Modified: trunk/reactos/subsystems/win32/win32k/include/inteng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/inteng.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/inteng.h [iso-8859-1] Tue Jan 27 09:36:07 2009 @@ -114,8 +114,8 @@ XLATEOBJ* FASTCALL IntEngCreateSrcMonoXlate(HPALETTE PaletteDest, - ULONG ForegroundColor, - ULONG BackgroundColor); + ULONG Color0, + ULONG Color1); HPALETTE FASTCALL IntEngGetXlatePalette(XLATEOBJ *XlateObj, Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Tue Jan 27 09:36:07 2009 @@ -153,7 +153,7 @@ if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; if (Dc->w.bitsPerPixel != 1) - Result = IntEngCreateSrcMonoXlate(hPalette, BrushObj->BrushAttr.lbColor, Dc_Attr->crBackgroundClr); + Result = IntEngCreateSrcMonoXlate(hPalette, Dc_Attr->crBackgroundClr, BrushObj->BrushAttr.lbColor); } else if (BrushObj->flAttrs & GDIBRUSH_IS_DIB) {

15 years, 9 months

← Newer
1
...
9
10
11
12
13
14
15
...
76
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 January 2009