Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[gschneider] 42896: CreateMetaFileW: Free memory on error

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Aug 24 01:09:55 2009 New Revision: 42896 URL: http://svn.reactos.org/svn/reactos?rev=42896&view=rev Log: CreateMetaFileW: Free memory on error Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/me… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/metafile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/metafile.c [iso-8859-1] Mon Aug 24 01:09:55 2009 @@ -160,6 +160,7 @@ (LPTSTR*) &lpszFile)) { // MFDRV_DeleteDC( dc->physDev ); + LocalFree(pmfDC); return NULL; } @@ -167,12 +168,14 @@ CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) { // MFDRV_DeleteDC( dc->physDev ); + LocalFree(pmfDC); return NULL; } if (!WriteFile( hFile, &pmfDC->mh, sizeof(pmfDC->mh), NULL, NULL )) { // MFDRV_DeleteDC( dc->physDev ); + LocalFree(pmfDC); return NULL; } pmfDC->hFile = hFile;

15 years, 4 months

[janderwald] 42895: - fix build #2

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Aug 24 01:05:23 2009 New Revision: 42895 URL: http://svn.reactos.org/svn/reactos?rev=42895&view=rev Log: - fix build #2 Modified: trunk/reactos/dll/directx/ksuser/ksuser.c Modified: trunk/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] Mon Aug 24 01:05:23 2009 @@ -177,7 +177,7 @@ *--*/ KSDDKAPI -NTSTATUS +DWORD NTAPI KsCreatePin(HANDLE FilterHandle, PKSPIN_CONNECT Connect,

15 years, 4 months

[gschneider] 42894: Handle failed memory allocation

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Aug 24 01:03:55 2009 New Revision: 42894 URL: http://svn.reactos.org/svn/reactos?rev=42894&view=rev Log: Handle failed memory allocation Modified: trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Mon Aug 24 01:03:55 2009 @@ -395,6 +395,10 @@ res = GetTextFaceW(hdc, 0, NULL); nameW = HeapAlloc( GetProcessHeap(), 0, res * 2 ); + if (nameW == NULL) + { + return 0; + } GetTextFaceW( hdc, res, nameW ); if (name)

15 years, 4 months

[janderwald] 42893: - try fix build

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Aug 24 00:56:06 2009 New Revision: 42893 URL: http://svn.reactos.org/svn/reactos?rev=42893&view=rev Log: - try fix build Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4289… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Aug 24 00:56:06 2009 @@ -3097,13 +3097,6 @@ Event Functions */ -KSDDKAPI NTSTATUS NTAPI -KsCreatePin( - IN HANDLE FilterHandle, - IN PKSPIN_CONNECT Connect, - IN ACCESS_MASK DesiredAccess, - OUT PHANDLE ConnectionHandle); - #if defined(_NTDDK_) #define KSPROBE_STREAMREAD 0x00000000 @@ -3219,7 +3212,12 @@ Connectivity Functions */ - +KSDDKAPI NTSTATUS NTAPI +KsCreatePin( + IN HANDLE FilterHandle, + IN PKSPIN_CONNECT Connect, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE ConnectionHandle); KSDDKAPI NTSTATUS NTAPI KsValidateConnectRequest( @@ -3701,6 +3699,18 @@ NTAPI KsPinGetConnectedPinFileObject( IN PKSPIN Pin + ); + +#else + +KSDDKAPI +DWORD +WINAPI +KsCreatePin( + IN HANDLE FilterHandle, + IN PKSPIN_CONNECT Connect, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE ConnectionHandle );

15 years, 4 months

[janderwald] 42892: [KS] - Fix a few bugs in KsPinPropertyHandler & KsTopologyPropertyHandler [PORTCLS] - Implement retrieving KSPROPSETID's - Register KSCATEGORY_AUDIO_DEVICE as a temporary hack untill sysaudio is able to register device interfaces (bug 4556) Ks Studio is now able to instantiate audio filters on ReactOS

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Aug 24 00:50:09 2009 New Revision: 42892 URL: http://svn.reactos.org/svn/reactos?rev=42892&view=rev Log: [KS] - Fix a few bugs in KsPinPropertyHandler & KsTopologyPropertyHandler [PORTCLS] - Implement retrieving KSPROPSETID's - Register KSCATEGORY_AUDIO_DEVICE as a temporary hack untill sysaudio is able to register device interfaces (bug 4556) Ks Studio is now able to instantiate audio filters on ReactOS Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Mon Aug 24 00:50:09 2009 @@ -194,6 +194,8 @@ PVOID Buffer; PKSDATARANGE_AUDIO *WaveFormatOut; PKSDATAFORMAT_WAVEFORMATEX WaveFormatIn; + PULONG GuidBuffer; + static WCHAR Speaker[] = {L"PC-Speaker"}; IoStack = IoGetCurrentIrpStackLocation(Irp); Buffer = Irp->UserBuffer; @@ -243,7 +245,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + Irp->IoStatus.Status = STATUS_MORE_ENTRIES; break; } @@ -270,19 +272,30 @@ break; } - Size = sizeof(KSMULTIPLE_ITEM) + sizeof(KSPIN_INTERFACE) * Descriptor[Pin->PinId].InterfacesCount; - - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) - { - Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + /* calculate size */ + Size = sizeof(KSMULTIPLE_ITEM); + Size += max(1, Descriptor[Pin->PinId].InterfacesCount) * sizeof(KSPIN_INTERFACE); + + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Irp->IoStatus.Status = STATUS_MORE_ENTRIES; break; } Item = (KSMULTIPLE_ITEM*)Buffer; Item->Size = Size; - Item->Count = Descriptor[Pin->PinId].InterfacesCount; - RtlMoveMemory((PVOID)(Item + 1), Descriptor[Pin->PinId].Interfaces, Descriptor[Pin->PinId].InterfacesCount * sizeof(KSDATARANGE)); + + if (Descriptor[Pin->PinId].InterfacesCount) + { + Item->Count = Descriptor[Pin->PinId].InterfacesCount; + RtlMoveMemory((PVOID)(Item + 1), Descriptor[Pin->PinId].Interfaces, Descriptor[Pin->PinId].InterfacesCount * sizeof(KSPIN_INTERFACE)); + } + else + { + Item->Count = 1; + RtlMoveMemory((PVOID)(Item + 1), &StandardPinInterface, sizeof(KSPIN_INTERFACE)); + } Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Size; @@ -296,18 +309,30 @@ break; } - Size = sizeof(KSMULTIPLE_ITEM) + sizeof(KSPIN_MEDIUM) * Descriptor[Pin->PinId].MediumsCount; - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) - { - Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + /* calculate size */ + Size = sizeof(KSMULTIPLE_ITEM); + Size += max(1, Descriptor[Pin->PinId].MediumsCount) * sizeof(KSPIN_MEDIUM); + + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Irp->IoStatus.Status = STATUS_MORE_ENTRIES; break; } Item = (KSMULTIPLE_ITEM*)Buffer; Item->Size = Size; - Item->Count = Descriptor[Pin->PinId].MediumsCount; - RtlMoveMemory((PVOID)(Item + 1), Descriptor[Pin->PinId].Mediums, Descriptor[Pin->PinId].MediumsCount * sizeof(KSDATARANGE)); + + if (Descriptor[Pin->PinId].MediumsCount) + { + Item->Count = Descriptor[Pin->PinId].MediumsCount; + RtlMoveMemory((PVOID)(Item + 1), Descriptor[Pin->PinId].Mediums, Descriptor[Pin->PinId].MediumsCount * sizeof(KSPIN_MEDIUM)); + } + else + { + Item->Count = 1; + RtlMoveMemory((PVOID)(Item + 1), &StandardPinMedium, sizeof(KSPIN_MEDIUM)); + } Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Size; @@ -366,16 +391,19 @@ break; } - Size = sizeof(GUID); - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) - { - Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - break; - } - - - RtlMoveMemory(Buffer, &Descriptor[Pin->PinId].Name, sizeof(GUID)); + GuidBuffer = Buffer; + Size = sizeof(Speaker); + + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Irp->IoStatus.Status = STATUS_MORE_ENTRIES; + break; + } + + RtlMoveMemory(GuidBuffer, Speaker, sizeof(Speaker)); + + //RtlMoveMemory(Buffer, &Descriptor[Pin->PinId].Name, sizeof(GUID)); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Size; break; Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Mon Aug 24 00:50:09 2009 @@ -176,7 +176,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Status = STATUS_BUFFER_TOO_SMALL; + Status = STATUS_MORE_ENTRIES; break; } @@ -184,7 +184,10 @@ Item->Size = Size; Item->Count = Topology->CategoriesCount; - RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->Categories, Topology->CategoriesCount * sizeof(GUID)); + if (Topology->CategoriesCount) + { + RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->Categories, Topology->CategoriesCount * sizeof(GUID)); + } Irp->IoStatus.Information = Size; Status = STATUS_SUCCESS; break; @@ -194,7 +197,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Status = STATUS_BUFFER_TOO_SMALL; + Status = STATUS_MORE_ENTRIES; break; } @@ -203,6 +206,10 @@ Item->Count = Topology->TopologyNodesCount; RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->TopologyNodes, Topology->TopologyNodesCount * sizeof(GUID)); + if (Topology->TopologyNodesCount) + { + RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->TopologyNodes, Topology->TopologyNodesCount * sizeof(GUID)); + } Irp->IoStatus.Information = Size; Status = STATUS_SUCCESS; break; @@ -212,7 +219,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Status = STATUS_BUFFER_TOO_SMALL; + Status = STATUS_MORE_ENTRIES; break; } @@ -220,7 +227,11 @@ Item->Size = Size; Item->Count = Topology->TopologyConnectionsCount; - RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->TopologyConnections, Topology->TopologyConnectionsCount * sizeof(KSTOPOLOGY_CONNECTION)); + if (Topology->TopologyConnections) + { + RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->TopologyConnections, Topology->TopologyConnectionsCount * sizeof(KSTOPOLOGY_CONNECTION)); + } + Irp->IoStatus.Information = Size; Status = STATUS_SUCCESS; break; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Mon Aug 24 00:50:09 2009 @@ -165,6 +165,18 @@ IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) + { + DPRINT1("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); + + Irp->IoStatus.Status = STATUS_SUCCESS; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + + ASSERT(IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY); return PcPropertyHandler(Irp, This->Descriptor); 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] Mon Aug 24 00:50:09 2009 @@ -21,6 +21,7 @@ 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 GUID_NULL ={0x00000000L, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; const GUID IID_IPortTopology = {0xb4c90a30L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; 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] Mon Aug 24 00:50:09 2009 @@ -31,7 +31,7 @@ GUID KSPROPERTY_SETID_Topology = {0x720D4AC0L, 0x7533, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; -static GUID InterfaceGuids[3] = +static GUID InterfaceGuids[4] = { { /// KSCATEGORY_RENDER @@ -42,9 +42,14 @@ 0x65E8773DL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} }, { - /// KS_CATEGORY_AUDIO + //KS_CATEGORY_AUDIO 0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} - } + }, + { + ///KSCATEGORY_AUDIO_DEVICE + 0xFBF6F530L, 0x07B9, 0x11D2, {0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88} + } + }; DEFINE_KSPROPERTY_TOPOLOGYSET(PortFilterWaveCyclicTopologySet, TopologyPropertyHandler); @@ -363,7 +368,7 @@ /* create the subdevice descriptor */ Status = PcCreateSubdeviceDescriptor(&This->SubDeviceDescriptor, - 3, + 4, InterfaceGuids, 0, NULL, 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] Mon Aug 24 00:50:09 2009 @@ -302,6 +302,9 @@ DEFINE_KSPROPERTY_ITEM_PIN_INTERFACES(PropGeneral),\ DEFINE_KSPROPERTY_ITEM_PIN_MEDIUMS(PropGeneral),\ DEFINE_KSPROPERTY_ITEM_PIN_COMMUNICATION(PropGeneral),\ + DEFINE_KSPROPERTY_ITEM_PIN_GLOBALCINSTANCES(PropGeneral),\ + DEFINE_KSPROPERTY_ITEM_PIN_NECESSARYINSTANCES(PropGeneral),\ + DEFINE_KSPROPERTY_ITEM_PIN_PHYSICALCONNECTION(PropGeneral),\ DEFINE_KSPROPERTY_ITEM_PIN_CATEGORY(PropGeneral),\ DEFINE_KSPROPERTY_ITEM_PIN_NAME(PropGeneral),\ DEFINE_KSPROPERTY_ITEM_PIN_CONSTRAINEDDATARANGES(PropGeneral),\ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Mon Aug 24 00:50:09 2009 @@ -409,6 +409,68 @@ return STATUS_UNSUCCESSFUL; } +NTSTATUS +PcCountProperties( + IN PIRP Irp, + IN PSUBDEVICE_DESCRIPTOR Descriptor) +{ + ULONG Properties; + ULONG Index, Offset; + PIO_STACK_LOCATION IoStack; + LPGUID Guid; + + /* count property items */ + Properties = Descriptor->FilterPropertySet.FreeKsPropertySetOffset; + + if (Descriptor->DeviceDescriptor->AutomationTable) + { + Properties = Descriptor->DeviceDescriptor->AutomationTable->PropertyCount; + } + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* store output size */ + Irp->IoStatus.Information = sizeof(GUID) * Properties; + + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(GUID) * Properties) + { + /* buffer too small */ + Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_BUFFER_OVERFLOW; + } + + /* get output buffer */ + Guid = Irp->UserBuffer; + + + /* copy property guids from filter */ + Offset = 0; + for(Index = 0; Index < Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) + { + RtlMoveMemory(&Guid[Offset], Descriptor->FilterPropertySet.Properties[Index].Set, sizeof(GUID)); + Offset++; + } + + if (Descriptor->DeviceDescriptor->AutomationTable) + { + /* copy property guids from driver */ + for(Index = 0; Index < Descriptor->DeviceDescriptor->AutomationTable->PropertyCount; Index++) + { + RtlMoveMemory(&Guid[Offset], Descriptor->DeviceDescriptor->AutomationTable->Properties[Index].Set, sizeof(GUID)); + Offset++; + } + } + + /* done */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI @@ -428,6 +490,12 @@ Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; ASSERT(Property); + + if (IsEqualGUIDAligned(&Property->Set, &GUID_NULL) && Property->Id == 0 && Property->Flags == KSPROPERTY_TYPE_SETSUPPORT) + { + return PcCountProperties(Irp, Descriptor); + } + /* check properties provided by the driver */ if (Descriptor->DeviceDescriptor->AutomationTable) @@ -478,7 +546,7 @@ else { RtlStringFromGUID(&Property->Set, &GuidString); - DPRINT1("Unhandeled property: Set %S Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); + DPRINT1("Unhandeled property: Set %S Id %u Flags %x InputLength %u OutputLength %u\n", GuidString.Buffer, Property->Id, Property->Flags, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); RtlFreeUnicodeString(&GuidString); }

15 years, 4 months

[gschneider] 42891: Pass a zero instead of dereferencing a null pointer when copying one region

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Aug 24 00:47:32 2009 New Revision: 42891 URL: http://svn.reactos.org/svn/reactos?rev=42891&view=rev Log: Pass a zero instead of dereferencing a null pointer when copying one region Modified: trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Mon Aug 24 00:47:32 2009 @@ -111,7 +111,7 @@ if (phRgn) phRgn = (HRGN *)hRgnex; else { - CombineRgn(hRgn, hRgnex, *phRgn, RGN_COPY); + CombineRgn(hRgn, hRgnex, 0, RGN_COPY); DeleteObject(hRgnex); } Ret = 1;

15 years, 4 months

[janderwald] 42890: - Fix KSPROPERTY_TOPOLOGY enumeration

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Aug 24 00:31:30 2009 New Revision: 42890 URL: http://svn.reactos.org/svn/reactos?rev=42890&view=rev Log: - Fix KSPROPERTY_TOPOLOGY enumeration Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4289… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Aug 24 00:31:30 2009 @@ -607,15 +607,12 @@ DEFINE_GUIDSTRUCT("720D4AC0-7533-11D0-A5D6-28DB04C10000", KSPROPSETID_Topology); #define KSPROPSETID_Topology DEFINE_GUIDNAMED(KSPROPSETID_Topology) -typedef enum -{ +typedef enum { KSPROPERTY_TOPOLOGY_CATEGORIES, + KSPROPERTY_TOPOLOGY_NODES, KSPROPERTY_TOPOLOGY_CONNECTIONS, - KSPROPERTY_TOPOLOGY_NAME, - KSPROPERTY_TOPOLOGY_NODES + KSPROPERTY_TOPOLOGY_NAME } KSPROPERTY_TOPOLOGY; - - /* =============================================================== Property Sets for audio drivers - TODO @@ -3099,6 +3096,14 @@ /* =============================================================== Event Functions */ + +KSDDKAPI NTSTATUS NTAPI +KsCreatePin( + IN HANDLE FilterHandle, + IN PKSPIN_CONNECT Connect, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE ConnectionHandle); + #if defined(_NTDDK_) #define KSPROBE_STREAMREAD 0x00000000 @@ -3214,12 +3219,7 @@ Connectivity Functions */ -KSDDKAPI NTSTATUS NTAPI -KsCreatePin( - IN HANDLE FilterHandle, - IN PKSPIN_CONNECT Connect, - IN ACCESS_MASK DesiredAccess, - OUT PHANDLE ConnectionHandle); + KSDDKAPI NTSTATUS NTAPI KsValidateConnectRequest(

15 years, 4 months

[gschneider] 42889: - Fix two inverted pointer checks, found by Amine Khaldi - Add, correct implemented comment

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Aug 23 23:55:24 2009 New Revision: 42889 URL: http://svn.reactos.org/svn/reactos?rev=42889&view=rev Log: - Fix two inverted pointer checks, found by Amine Khaldi - Add, correct implemented comment Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] Sun Aug 23 23:55:24 2009 @@ -38,7 +38,11 @@ return retValue; } -FD_GLYPHSET* WINAPI +/* + * @implemented + */ +FD_GLYPHSET* +WINAPI EngComputeGlyphSet(INT nCodePage,INT nFirstChar,INT cChars) { FD_GLYPHSET * ntfd_glyphset; @@ -46,13 +50,12 @@ ntfd_glyphset = NtGdiEngComputeGlyphSet(nCodePage,nFirstChar,cChars); - if (!ntfd_glyphset) + if (ntfd_glyphset) { if (ntfd_glyphset->cjThis) { myfd_glyphset = GlobalAlloc(0,ntfd_glyphset->cjThis); - - if (!myfd_glyphset) + if (myfd_glyphset) { if (copy_my_glyphset(myfd_glyphset,ntfd_glyphset,ntfd_glyphset->cjThis) == FALSE) { Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Sun Aug 23 23:55:24 2009 @@ -1700,7 +1700,7 @@ * */ /* - * @unimplemented + * @implemented */ BOOL WINAPI

15 years, 4 months

[dgorbachev] 42888: A consistent indentation style is the hobgoblin of little minds.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Aug 23 23:45:41 2009 New Revision: 42888 URL: http://svn.reactos.org/svn/reactos?rev=42888&view=rev Log: A consistent indentation style is the hobgoblin of little minds. Modified: trunk/reactos/ReactOS-i386.rbuild Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=42… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Sun Aug 23 23:45:41 2009 @@ -24,13 +24,13 @@ <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> </if> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </group> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </group> <group linkerset="ld"> <linkerflag>-disable-stdcall-fixup</linkerflag> </group> - + <directory name="base"> <xi:include href="base/base.rbuild" /> </directory>

15 years, 4 months

[dgorbachev] 42887: - Remove wrong "m" constraints from some places; - relax constraints ("q" -> "r") when possible; - remove "memory" clobbers from __readfsXXX functions, probably shouldn't be there; - no movq instruction on x86_32; - bswap's operand must be a register.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Aug 23 23:41:05 2009 New Revision: 42887 URL: http://svn.reactos.org/svn/reactos?rev=42887&view=rev Log: - Remove wrong "m" constraints from some places; - relax constraints ("q" -> "r") when possible; - remove "memory" clobbers from __readfsXXX functions, probably shouldn't be there; - no movq instruction on x86_32; - bswap's operand must be a register. Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sun Aug 23 23:41:05 2009 @@ -600,49 +600,49 @@ __INTRIN_INLINE void __writegsbyte(const unsigned long Offset, const unsigned char Data) { - __asm__ __volatile__("movb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("movb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE void __writegsword(const unsigned long Offset, const unsigned short Data) { - __asm__ __volatile__("movw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("movw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE void __writegsdword(const unsigned long Offset, const unsigned long Data) { - __asm__ __volatile__("movl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("movl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE void __writegsqword(const unsigned long Offset, const unsigned __int64 Data) { - __asm__ __volatile__("movq %q[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("movq %q[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE unsigned char __readgsbyte(const unsigned long Offset) { unsigned char value; - __asm__ __volatile__("movb %%gs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__ __volatile__("movb %%gs:%a[Offset], %b[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } __INTRIN_INLINE unsigned short __readgsword(const unsigned long Offset) { unsigned short value; - __asm__ __volatile__("movw %%gs:%a[Offset], %w[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__ __volatile__("movw %%gs:%a[Offset], %w[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } __INTRIN_INLINE unsigned long __readgsdword(const unsigned long Offset) { unsigned long value; - __asm__ __volatile__("movl %%gs:%a[Offset], %k[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__ __volatile__("movl %%gs:%a[Offset], %k[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } __INTRIN_INLINE unsigned __int64 __readgsqword(const unsigned long Offset) { unsigned __int64 value; - __asm__ __volatile__("movq %%gs:%a[Offset], %q[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__ __volatile__("movq %%gs:%a[Offset], %q[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } @@ -663,22 +663,22 @@ __INTRIN_INLINE void __addgsbyte(const unsigned long Offset, const unsigned char Data) { - __asm__ __volatile__("addb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("addb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE void __addgsword(const unsigned long Offset, const unsigned short Data) { - __asm__ __volatile__("addw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("addw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE void __addgsdword(const unsigned long Offset, const unsigned int Data) { - __asm__ __volatile__("addl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("addl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE void __addgsqword(const unsigned long Offset, const unsigned __int64 Data) { - __asm__ __volatile__("addq %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("addq %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } #else @@ -690,32 +690,32 @@ __INTRIN_INLINE void __writefsword(const unsigned long Offset, const unsigned short Data) { - __asm__ __volatile__("movw %w[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("movw %w[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE void __writefsdword(const unsigned long Offset, const unsigned long Data) { - __asm__ __volatile__("movl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); + __asm__ __volatile__("movl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } __INTRIN_INLINE unsigned char __readfsbyte(const unsigned long Offset) { unsigned char value; - __asm__ __volatile__("movb %%fs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "irm" (Offset) : "memory"); + __asm__ __volatile__("movb %%fs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "ir" (Offset)); return value; } __INTRIN_INLINE unsigned short __readfsword(const unsigned long Offset) { unsigned short value; - __asm__ __volatile__("movw %%fs:%a[Offset], %w[value]" : [value] "=q" (value) : [Offset] "irm" (Offset) : "memory"); + __asm__ __volatile__("movw %%fs:%a[Offset], %w[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } __INTRIN_INLINE unsigned long __readfsdword(const unsigned long Offset) { unsigned long value; - __asm__ __volatile__("movl %%fs:%a[Offset], %k[value]" : [value] "=q" (value) : [Offset] "irm" (Offset) : "memory"); + __asm__ __volatile__("movl %%fs:%a[Offset], %k[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } @@ -924,7 +924,7 @@ __INTRIN_INLINE unsigned long _byteswap_ulong(unsigned long value) { unsigned long retval; - __asm__("bswapl %[retval]" : [retval] "=rm" (retval) : "[retval]" (value)); + __asm__("bswapl %[retval]" : [retval] "=r" (retval) : "[retval]" (value)); return retval; } @@ -932,7 +932,7 @@ __INTRIN_INLINE unsigned __int64 _byteswap_uint64(unsigned __int64 value) { unsigned __int64 retval; - __asm__("bswapq %[retval]" : [retval] "=rm" (retval) : "[retval]" (value)); + __asm__("bswapq %[retval]" : [retval] "=r" (retval) : "[retval]" (value)); return retval; } #else @@ -948,7 +948,7 @@ retval.int64part = value; __asm__("bswapl %[lowpart]\n" "bswapl %[hipart]\n" - : [lowpart] "=rm" (retval.hipart), [hipart] "=rm" (retval.lowpart) : "[lowpart]" (retval.lowpart), "[hipart]" (retval.hipart) ); + : [lowpart] "=r" (retval.hipart), [hipart] "=r" (retval.lowpart) : "[lowpart]" (retval.lowpart), "[hipart]" (retval.hipart) ); return retval.int64part; } #endif @@ -1112,85 +1112,85 @@ __INTRIN_INLINE void __writecr0(const unsigned __int64 Data) { - __asm__("mov %[Data], %%cr0" : : [Data] "q" (Data) : "memory"); + __asm__("mov %[Data], %%cr0" : : [Data] "r" (Data) : "memory"); } __INTRIN_INLINE void __writecr3(const unsigned __int64 Data) { - __asm__("mov %[Data], %%cr3" : : [Data] "q" (Data) : "memory"); + __asm__("mov %[Data], %%cr3" : : [Data] "r" (Data) : "memory"); } __INTRIN_INLINE void __writecr4(const unsigned __int64 Data) { - __asm__("mov %[Data], %%cr4" : : [Data] "q" (Data) : "memory"); + __asm__("mov %[Data], %%cr4" : : [Data] "r" (Data) : "memory"); } #ifdef _M_AMD64 __INTRIN_INLINE void __writecr8(const unsigned __int64 Data) { - __asm__("mov %[Data], %%cr8" : : [Data] "q" (Data) : "memory"); + __asm__("mov %[Data], %%cr8" : : [Data] "r" (Data) : "memory"); } __INTRIN_INLINE unsigned __int64 __readcr0(void) { unsigned __int64 value; - __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=r" (value)); return value; } __INTRIN_INLINE unsigned __int64 __readcr2(void) { unsigned __int64 value; - __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=r" (value)); return value; } __INTRIN_INLINE unsigned __int64 __readcr3(void) { unsigned __int64 value; - __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=r" (value)); return value; } __INTRIN_INLINE unsigned __int64 __readcr4(void) { unsigned __int64 value; - __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=r" (value)); return value; } __INTRIN_INLINE unsigned __int64 __readcr8(void) { unsigned __int64 value; - __asm__ __volatile__("movq %%cr8, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%cr8, %q[value]" : [value] "=r" (value)); return value; } #else __INTRIN_INLINE unsigned long __readcr0(void) { unsigned long value; - __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=r" (value)); return value; } __INTRIN_INLINE unsigned long __readcr2(void) { unsigned long value; - __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=r" (value)); return value; } __INTRIN_INLINE unsigned long __readcr3(void) { unsigned long value; - __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=r" (value)); return value; } __INTRIN_INLINE unsigned long __readcr4(void) { unsigned long value; - __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=r" (value)); return value; } #endif @@ -1202,28 +1202,28 @@ switch (reg) { case 0: - __asm__ __volatile__("movq %%dr0, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr0, %q[value]" : [value] "=r" (value)); break; case 1: - __asm__ __volatile__("movq %%dr1, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr1, %q[value]" : [value] "=r" (value)); break; case 2: - __asm__ __volatile__("movq %%dr2, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr2, %q[value]" : [value] "=r" (value)); break; case 3: - __asm__ __volatile__("movq %%dr3, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr3, %q[value]" : [value] "=r" (value)); break; case 4: - __asm__ __volatile__("movq %%dr4, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr4, %q[value]" : [value] "=r" (value)); break; case 5: - __asm__ __volatile__("movq %%dr5, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr5, %q[value]" : [value] "=r" (value)); break; case 6: - __asm__ __volatile__("movq %%dr6, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr6, %q[value]" : [value] "=r" (value)); break; case 7: - __asm__ __volatile__("movq %%dr7, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("movq %%dr7, %q[value]" : [value] "=r" (value)); break; } return value; @@ -1234,28 +1234,28 @@ switch (reg) { case 0: - __asm__("movq %q[value], %%dr0" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr0" : : [value] "r" (value) : "memory"); break; case 1: - __asm__("movq %q[value], %%dr1" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr1" : : [value] "r" (value) : "memory"); break; case 2: - __asm__("movq %q[value], %%dr2" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr2" : : [value] "r" (value) : "memory"); break; case 3: - __asm__("movq %q[value], %%dr3" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr3" : : [value] "r" (value) : "memory"); break; case 4: - __asm__("movq %q[value], %%dr4" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr4" : : [value] "r" (value) : "memory"); break; case 5: - __asm__("movq %q[value], %%dr5" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr5" : : [value] "r" (value) : "memory"); break; case 6: - __asm__("movq %q[value], %%dr6" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr6" : : [value] "r" (value) : "memory"); break; case 7: - __asm__("movq %q[value], %%dr7" : : [value] "q" (value) : "memory"); + __asm__("movq %q[value], %%dr7" : : [value] "r" (value) : "memory"); break; } } @@ -1266,28 +1266,28 @@ switch (reg) { case 0: - __asm__ __volatile__("movq %%dr0, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr0, %[value]" : [value] "=r" (value)); break; case 1: - __asm__ __volatile__("movq %%dr1, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr1, %[value]" : [value] "=r" (value)); break; case 2: - __asm__ __volatile__("movq %%dr2, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr2, %[value]" : [value] "=r" (value)); break; case 3: - __asm__ __volatile__("movq %%dr3, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr3, %[value]" : [value] "=r" (value)); break; case 4: - __asm__ __volatile__("movq %%dr4, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr4, %[value]" : [value] "=r" (value)); break; case 5: - __asm__ __volatile__("movq %%dr5, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr5, %[value]" : [value] "=r" (value)); break; case 6: - __asm__ __volatile__("movq %%dr6, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr6, %[value]" : [value] "=r" (value)); break; case 7: - __asm__ __volatile__("movq %%dr7, %q[value]" : [value] "=q" (value)); + __asm__ __volatile__("mov %%dr7, %[value]" : [value] "=r" (value)); break; } return value; @@ -1298,28 +1298,28 @@ switch (reg) { case 0: - __asm__("movq %q[value], %%dr0" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr0" : : [value] "r" (value) : "memory"); break; case 1: - __asm__("movq %q[value], %%dr1" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr1" : : [value] "r" (value) : "memory"); break; case 2: - __asm__("movq %q[value], %%dr2" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr2" : : [value] "r" (value) : "memory"); break; case 3: - __asm__("movq %q[value], %%dr3" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr3" : : [value] "r" (value) : "memory"); break; case 4: - __asm__("movq %q[value], %%dr4" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr4" : : [value] "r" (value) : "memory"); break; case 5: - __asm__("movq %q[value], %%dr5" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr5" : : [value] "r" (value) : "memory"); break; case 6: - __asm__("movq %q[value], %%dr6" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr6" : : [value] "r" (value) : "memory"); break; case 7: - __asm__("movq %q[value], %%dr7" : : [value] "q" (value) : "memory"); + __asm__("mov %[value], %%dr7" : : [value] "r" (value) : "memory"); break; } }

15 years, 4 months

← Newer
1
...
6
7
8
9
10
11
12
...
66
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 August 2009