Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[cgutman] 40723: - Fix build
by cgutman＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: cgutman Date: Wed Apr 29 02:39:36 2009 New Revision: 40723 URL: http://svn.reactos.org/svn/reactos?rev=40723&view=rev Log: - Fix build Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Wed Apr 29 02:39:36 2009 @@ -103,7 +103,7 @@ while( !IsListEmpty( &Connection->ReceiveRequest ) ) { OSK_UINT RecvLen = 0, Received = 0; - OSK_PCHAR RecvBuffer = 0; + PVOID RecvBuffer = 0; Entry = RemoveHeadList( &Connection->ReceiveRequest ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); @@ -163,7 +163,7 @@ while( !IsListEmpty( &Connection->SendRequest ) ) { OSK_UINT SendLen = 0, Sent = 0; - OSK_PCHAR SendBuffer = 0; + PVOID SendBuffer = 0; Entry = RemoveHeadList( &Connection->SendRequest ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); @@ -677,7 +677,7 @@ ULONG ReceiveFlags, PTCP_COMPLETION_ROUTINE Complete, PVOID Context ) { - OSK_PCHAR DataBuffer; + PVOID DataBuffer; UINT DataLen, Received = 0; NTSTATUS Status; PTDI_BUCKET Bucket;

1 0

[cgutman] 40722: - Wait for NdisMFreeSharedMemoryPassive to complete before returning See issue #4428 for more details.
by cgutman＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: cgutman Date: Wed Apr 29 02:30:23 2009 New Revision: 40722 URL: http://svn.reactos.org/svn/reactos?rev=40722&view=rev Log: - Wait for NdisMFreeSharedMemoryPassive to complete before returning See issue #4428 for more details. Modified: trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/ndis/ndis/memory.c Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Wed Apr 29 02:30:23 2009 @@ -71,6 +71,7 @@ BOOLEAN Cached; PNDIS_MINIPORT_BLOCK Adapter; PVOID Context; + PKEVENT Event; } MINIPORT_SHARED_MEMORY, *PMINIPORT_SHARED_MEMORY; /* A structure of WrapperConfigurationContext (not compatible with the Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] Wed Apr 29 02:30:23 2009 @@ -181,6 +181,7 @@ */ { PMINIPORT_SHARED_MEMORY Memory = (PMINIPORT_SHARED_MEMORY)Context; + PRKEVENT Event = Memory->Event; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -191,6 +192,10 @@ Memory->VirtualAddress, Memory->Cached); ExFreePool(Memory); + + KeSetEvent(Event, + IO_NO_INCREMENT, + FALSE); } @@ -221,6 +226,7 @@ HANDLE ThreadHandle; PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PMINIPORT_SHARED_MEMORY Memory; + KEVENT Event; NDIS_DbgPrint(MAX_TRACE,("Called.\n")); @@ -234,15 +240,25 @@ NDIS_DbgPrint(MID_TRACE, ("Insufficient resources\n")); return; } + + KeInitializeEvent(&Event, NotificationEvent, FALSE); Memory->AdapterObject = Adapter->NdisMiniportBlock.SystemAdapterObject; Memory->Length = Length; Memory->PhysicalAddress = PhysicalAddress; Memory->VirtualAddress = VirtualAddress; Memory->Cached = Cached; + Memory->Adapter = &Adapter->NdisMiniportBlock; + Memory->Event = &Event; PsCreateSystemThread(&ThreadHandle, THREAD_ALL_ACCESS, 0, 0, 0, NdisMFreeSharedMemoryPassive, Memory); ZwClose(ThreadHandle); + + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); } VOID

1 0

[cgutman] 40721: - Only call NdisMEthIndicateReceiveComplete once per batch of packets - Slight performance increase
by cgutman＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: cgutman Date: Wed Apr 29 02:04:12 2009 New Revision: 40721 URL: http://svn.reactos.org/svn/reactos?rev=40721&view=rev Log: - Only call NdisMEthIndicateReceiveComplete once per batch of packets - Slight performance increase Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Wed Apr 29 02:04:12 2009 @@ -95,6 +95,8 @@ } if(Data & CSR0_RINT) { + BOOLEAN IndicatedData = FALSE; + DPRINT("receive interrupt\n"); while(1) @@ -135,7 +137,8 @@ DPRINT("Indicating a %d-byte packet (index %d)\n", ByteCount, Adapter->CurrentReceiveDescriptorIndex); NdisMEthIndicateReceive(Adapter->MiniportAdapterHandle, 0, Buffer, 14, Buffer+14, ByteCount-14, ByteCount-14); - NdisMEthIndicateReceiveComplete(Adapter->MiniportAdapterHandle); + + IndicatedData = TRUE; RtlZeroMemory(Descriptor, sizeof(RECEIVE_DESCRIPTOR)); Descriptor->RBADR = @@ -148,6 +151,9 @@ Adapter->Statistics.RcvGoodFrames++; } + + if (IndicatedData) + NdisMEthIndicateReceiveComplete(Adapter->MiniportAdapterHandle); } if(Data & CSR0_TINT) {

1 0

[cgutman] 40720: - Remove BINARY_COMPATIBLE concept - We should always use NDIS functions
by cgutman＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: cgutman Date: Wed Apr 29 00:42:55 2009 New Revision: 40720 URL: http://svn.reactos.org/svn/reactos?rev=40720&view=rev Log: - Remove BINARY_COMPATIBLE concept - We should always use NDIS functions Modified: trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=407… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Wed Apr 29 00:42:55 2009 @@ -70,15 +70,6 @@ #if defined(NDIS51) && !defined(NDIS_PROTOCOL_MAJOR_VERSION) && !defined(NDIS_PROTOCOL_MINOR_VERSION) #define NDIS_PROTOCOL_MAJOR_VERSION 5 #define NDIS_PROTOCOL_MINOR_VERSION 1 -#endif - -#if defined(NDIS_MINIPORT_DRIVER) && !defined(BINARY_COMPATIBLE) -#define BINARY_COMPATIBLE 1 -#endif - -#if !defined(_M_IX86) && BINARY_COMPATIBLE -#undef BINARY_COMPATIBLE -#define BINARY_COMPATIBLE 0 #endif #if 1 @@ -1721,8 +1712,6 @@ NdisFreeBuffer( IN PNDIS_BUFFER Buffer); -#if BINARY_COMPATIBLE - NDISAPI VOID DDKAPI @@ -1755,93 +1744,6 @@ IN PNDIS_BUFFER Buffer, OUT PUINT Offset, OUT PUINT Length); - -#else - -/* - * VOID - * NdisGetBufferPhysicalArraySize( - * IN PNDIS_BUFFER Buffer, - * OUT PUINT ArraySize); - */ -#define NdisGetBufferPhysicalArraySize(Buffer, \ - ArraySize) \ -{ \ - (*(ArraySize) = NDIS_BUFFER_TO_SPAN_PAGES(Buffer)) \ -} - -/* - * VOID - * NdisGetFirstBufferFromPacket( - * IN PNDIS_PACKET _Packet, - * OUT PNDIS_BUFFER * _FirstBuffer, - * OUT PVOID * _FirstBufferVA, - * OUT PUINT _FirstBufferLength, - * OUT PUINT _TotalBufferLength) - */ -#define NdisGetFirstBufferFromPacket(_Packet, \ - _FirstBuffer, \ - _FirstBufferVA, \ - _FirstBufferLength, \ - _TotalBufferLength) \ -{ \ - PNDIS_BUFFER _Buffer; \ - \ - _Buffer = (_Packet)->Private.Head; \ - *(_FirstBuffer) = _Buffer; \ - if (_Buffer != NULL) \ - { \ - *(_FirstBufferVA) = MmGetSystemAddressForMdl(_Buffer); \ - *(_FirstBufferLength) = MmGetMdlByteCount(_Buffer); \ - _Buffer = _Buffer->Next; \ - *(_TotalBufferLength) = *(_FirstBufferLength); \ - while (_Buffer != NULL) { \ - *(_TotalBufferLength) += MmGetMdlByteCount(_Buffer); \ - _Buffer = _Buffer->Next; \ - } \ - } \ - else \ - { \ - *(_FirstBufferVA) = 0; \ - *(_FirstBufferLength) = 0; \ - *(_TotalBufferLength) = 0; \ - } \ -} - -/* - * VOID - * NdisQueryBuffer( - * IN PNDIS_BUFFER Buffer, - * OUT PVOID *VirtualAddress OPTIONAL, - * OUT PUINT Length) - */ -#define NdisQueryBuffer(Buffer, \ - VirtualAddress, \ - Length) \ -{ \ - if (ARGUMENT_PRESENT(VirtualAddress)) \ - *((PVOID*)VirtualAddress) = MmGetSystemAddressForMdl(Buffer); \ - \ - *((PUINT)Length) = MmGetMdlByteCount(Buffer); \ -} - - -/* - * VOID - * NdisQueryBufferOffset( - * IN PNDIS_BUFFER Buffer, - * OUT PUINT Offset, - * OUT PUINT Length); - */ -#define NdisQueryBufferOffset(Buffer, \ - Offset, \ - Length) \ -{ \ - *((PUINT)Offset) = MmGetMdlByteOffset(Buffer); \ - *((PUINT)Length) = MmGetMdlByteCount(Buffer); \ -} - -#endif /* BINARY_COMPATIBLE */ /* * PVOID @@ -2259,8 +2161,6 @@ /* Memory management routines */ -#if BINARY_COMPATIBLE - NDISAPI VOID DDKAPI @@ -2274,29 +2174,6 @@ DDKAPI NdisDestroyLookaheadBufferFromSharedMemory( IN PVOID pLookaheadBuffer); - -#else - -/* - * VOID - * NdisCreateLookaheadBufferFromSharedMemory( - * IN PVOID pSharedMemory, - * IN UINT LookaheadLength, - * OUT PVOID *pLookaheadBuffer) - */ -#define NdisCreateLookaheadBufferFromSharedMemory(_pSharedMemory, \ - _LookaheadLength, \ - _pLookaheadBuffer) \ - ((*(_pLookaheadBuffer)) = (_pSharedMemory)) - -/* - * VOID - * NdisDestroyLookaheadBufferFromSharedMemory( - * IN PVOID pLookaheadBuffer) - */ -#define NdisDestroyLookaheadBufferFromSharedMemory(_pLookaheadBuffer) - -#endif #if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM) || defined(_M_PPC) @@ -2654,8 +2531,6 @@ /* Spin lock reoutines */ -#if BINARY_COMPATIBLE - NDISAPI VOID DDKAPI @@ -2691,60 +2566,6 @@ DDKAPI NdisDprReleaseSpinLock( IN PNDIS_SPIN_LOCK SpinLock); - -#else - -/* - * VOID - * NdisAllocateSpinLock( - * IN PNDIS_SPIN_LOCK SpinLock); - */ -#define NdisAllocateSpinLock(_SpinLock) \ - KeInitializeSpinLock(&(_SpinLock)->SpinLock) - -/* - * VOID - * NdisFreeSpinLock( - * IN PNDIS_SPIN_LOCK SpinLock); - */ -#define NdisFreeSpinLock(_SpinLock) - -/* - * VOID - * NdisAcquireSpinLock( - * IN PNDIS_SPIN_LOCK SpinLock); - */ -#define NdisAcquireSpinLock(_SpinLock) \ - KeAcquireSpinLock(&(_SpinLock)->SpinLock, &(_SpinLock)->OldIrql) - -/* - * VOID - * NdisReleaseSpinLock( - * IN PNDIS_SPIN_LOCK SpinLock); - */ -#define NdisReleaseSpinLock(_SpinLock) \ - KeReleaseSpinLock(&(_SpinLock)->SpinLock, (_SpinLock)->OldIrql) - -/* - * VOID - * NdisDprAcquireSpinLock( - * IN PNDIS_SPIN_LOCK SpinLock); - */ -#define NdisDprAcquireSpinLock(_SpinLock) \ -{ \ - KeAcquireSpinLockAtDpcLevel(&(_SpinLock)->SpinLock); \ - (_SpinLock)->OldIrql = DISPATCH_LEVEL; \ -} - -/* - * VOID - * NdisDprReleaseSpinLock( - * IN PNDIS_SPIN_LOCK SpinLock); - */ -#define NdisDprReleaseSpinLock(_SpinLock) \ - KeReleaseSpinLockFromDpcLevel(&(_SpinLock)->SpinLock) - -#endif /* BINARY_COMPATIBLE */ /* I/O routines */ @@ -3046,24 +2867,11 @@ */ #define NdisStallExecution KeStallExecutionProcessor -#if BINARY_COMPATIBLE - NDISAPI VOID DDKAPI NdisGetCurrentSystemTime( IN PLARGE_INTEGER pSystemTime); - -#else - -/* - * VOID - * NdisGetCurrentSystemTime( - * IN PLARGE_INTEGER pSystemTime); - */ -#define NdisGetCurrentSystemTime KeQuerySystemTime - -#endif NDISAPI CCHAR

1 0

[cwittich] 40719: sync msxml3 with wine 1.1.20
by cwittich＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: cwittich Date: Tue Apr 28 23:57:36 2009 New Revision: 40719 URL: http://svn.reactos.org/svn/reactos?rev=40719&view=rev Log: sync msxml3 with wine 1.1.20 Modified: trunk/reactos/dll/win32/msxml3/cdata.c trunk/reactos/dll/win32/msxml3/comment.c trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/httprequest.c trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/nodelist.c trunk/reactos/dll/win32/msxml3/nodemap.c trunk/reactos/dll/win32/msxml3/parseerror.c trunk/reactos/dll/win32/msxml3/queryresult.c trunk/reactos/dll/win32/msxml3/schema.c trunk/reactos/dll/win32/msxml3/text.c trunk/reactos/dll/win32/msxml3/xmldoc.c trunk/reactos/dll/win32/msxml3/xmlelem.c trunk/reactos/include/psdk/msxml.idl trunk/reactos/include/psdk/msxml2.idl Modified: trunk/reactos/dll/win32/msxml3/cdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/cdata.c?r… ============================================================================== --- trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -517,12 +517,12 @@ static HRESULT WINAPI domcdata_get_length( IXMLDOMCDATASection *iface, - long *len) + LONG *len) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; TRACE("%p\n", iface); @@ -543,12 +543,12 @@ static HRESULT WINAPI domcdata_substringData( IXMLDOMCDATASection *iface, - long offset, long count, BSTR *p) + LONG offset, LONG count, BSTR *p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; HRESULT hr = S_FALSE; TRACE("%p\n", iface); @@ -618,14 +618,14 @@ static HRESULT WINAPI domcdata_insertData( IXMLDOMCDATASection *iface, - long offset, BSTR p) + LONG offset, BSTR p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pXmlContent; BSTR sNewString; HRESULT hr = S_FALSE; - long nLength = 0, nLengthP = 0; + LONG nLength = 0, nLengthP = 0; xmlChar *str = NULL; TRACE("%p\n", This); @@ -688,7 +688,7 @@ static HRESULT WINAPI domcdata_deleteData( IXMLDOMCDATASection *iface, - long offset, long count) + LONG offset, LONG count) { FIXME("\n"); return E_NOTIMPL; @@ -696,7 +696,7 @@ static HRESULT WINAPI domcdata_replaceData( IXMLDOMCDATASection *iface, - long offset, long count, BSTR p) + LONG offset, LONG count, BSTR p) { FIXME("\n"); return E_NOTIMPL; @@ -704,7 +704,7 @@ static HRESULT WINAPI domcdata_splitText( IXMLDOMCDATASection *iface, - long offset, IXMLDOMText **txtNode) + LONG offset, IXMLDOMText **txtNode) { FIXME("\n"); return E_NOTIMPL; Modified: trunk/reactos/dll/win32/msxml3/comment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/comment.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -511,12 +511,12 @@ static HRESULT WINAPI domcomment_get_length( IXMLDOMComment *iface, - long *len) + LONG *len) { domcomment *This = impl_from_IXMLDOMComment( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; TRACE("%p\n", iface); @@ -537,12 +537,12 @@ static HRESULT WINAPI domcomment_substringData( IXMLDOMComment *iface, - long offset, long count, BSTR *p) + LONG offset, LONG count, BSTR *p) { domcomment *This = impl_from_IXMLDOMComment( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; HRESULT hr = S_FALSE; TRACE("%p\n", iface); @@ -626,14 +626,14 @@ static HRESULT WINAPI domcomment_insertData( IXMLDOMComment *iface, - long offset, BSTR p) + LONG offset, BSTR p) { domcomment *This = impl_from_IXMLDOMComment( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pXmlContent; BSTR sNewString; HRESULT hr = S_FALSE; - long nLength = 0, nLengthP = 0; + LONG nLength = 0, nLengthP = 0; xmlChar *str = NULL; TRACE("%p\n", This); @@ -696,7 +696,7 @@ static HRESULT WINAPI domcomment_deleteData( IXMLDOMComment *iface, - long offset, long count) + LONG offset, LONG count) { FIXME("\n"); return E_NOTIMPL; @@ -704,7 +704,7 @@ static HRESULT WINAPI domcomment_replaceData( IXMLDOMComment *iface, - long offset, long count, BSTR p) + LONG offset, LONG count, BSTR p) { FIXME("\n"); return E_NOTIMPL; Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -1521,7 +1521,7 @@ static HRESULT WINAPI domdoc_get_readyState( IXMLDOMDocument2 *iface, - long* value ) + LONG *value ) { FIXME("\n"); return E_NOTIMPL; Modified: trunk/reactos/dll/win32/msxml3/httprequest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/httpreque… ============================================================================== --- trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -213,7 +213,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI httprequest_get_status(IXMLHTTPRequest *iface, long *plStatus) +static HRESULT WINAPI httprequest_get_status(IXMLHTTPRequest *iface, LONG *plStatus) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); @@ -267,7 +267,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI httprequest_get_readyState(IXMLHTTPRequest *iface, long *plState) +static HRESULT WINAPI httprequest_get_readyState(IXMLHTTPRequest *iface, LONG *plState) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -388,7 +388,7 @@ if ( !out ) return E_INVALIDARG; - /* if we dont have a doc, use our parent. */ + /* if we don't have a doc, use our parent. */ if(node && !node->doc && node->parent) node->doc = node->parent->doc; Modified: trunk/reactos/dll/win32/msxml3/nodelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodelist.… ============================================================================== --- trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -198,14 +198,14 @@ static HRESULT WINAPI xmlnodelist_get_item( IXMLDOMNodeList* iface, - long index, + LONG index, IXMLDOMNode** listItem) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); xmlNodePtr curr; - long nodeIndex = 0; - - TRACE("%p %ld\n", This, index); + LONG nodeIndex = 0; + + TRACE("%p %d\n", This, index); if(!listItem) return E_INVALIDARG; @@ -230,11 +230,11 @@ static HRESULT WINAPI xmlnodelist_get_length( IXMLDOMNodeList* iface, - long* listLength) + LONG* listLength) { xmlNodePtr curr; - long nodeCount = 0; + LONG nodeCount = 0; xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); Modified: trunk/reactos/dll/win32/msxml3/nodemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodemap.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/nodemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/nodemap.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -44,7 +44,7 @@ const struct ISupportErrorInfoVtbl *lpSEIVtbl; LONG ref; IXMLDOMNode *node; - long iterator; + LONG iterator; } xmlnodemap; static inline xmlnodemap *impl_from_IXMLDOMNamedNodeMap( IXMLDOMNamedNodeMap *iface ) @@ -329,15 +329,15 @@ static HRESULT WINAPI xmlnodemap_get_item( IXMLDOMNamedNodeMap *iface, - long index, + LONG index, IXMLDOMNode** listItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlNodePtr node; xmlAttrPtr curr; - long attrIndex; - - TRACE("%p %ld\n", This, index); + LONG attrIndex; + + TRACE("%p %d\n", This, index); *listItem = NULL; @@ -361,12 +361,12 @@ static HRESULT WINAPI xmlnodemap_get_length( IXMLDOMNamedNodeMap *iface, - long* listLength) + LONG *listLength) { xmlNodePtr node; xmlAttrPtr first; xmlAttrPtr curr; - long attrCount; + LONG attrCount; xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); @@ -423,9 +423,9 @@ xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlNodePtr node; xmlAttrPtr curr; - long attrIndex; - - TRACE("%p %ld\n", This, This->iterator); + LONG attrIndex; + + TRACE("%p %d\n", This, This->iterator); *nextItem = NULL; @@ -451,7 +451,7 @@ { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - TRACE("%p %ld\n", This, This->iterator); + TRACE("%p %d\n", This, This->iterator); This->iterator = 0; Modified: trunk/reactos/dll/win32/msxml3/parseerror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/parseerro… ============================================================================== --- trunk/reactos/dll/win32/msxml3/parseerror.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/parseerror.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -191,7 +191,7 @@ static HRESULT WINAPI parseError_get_errorCode( IXMLDOMParseError *iface, - long *code ) + LONG *code ) { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); TRACE("(%p)->(%p)\n", This, code); @@ -238,7 +238,7 @@ static HRESULT WINAPI parseError_get_line( IXMLDOMParseError *iface, - long *line ) + LONG *line ) { FIXME("\n"); return E_NOTIMPL; @@ -246,7 +246,7 @@ static HRESULT WINAPI parseError_get_linepos( IXMLDOMParseError *iface, - long *linepos ) + LONG *linepos ) { FIXME("\n"); return E_NOTIMPL; @@ -254,7 +254,7 @@ static HRESULT WINAPI parseError_get_filepos( IXMLDOMParseError *iface, - long *filepos ) + LONG *filepos ) { FIXME("\n"); return E_NOTIMPL; Modified: trunk/reactos/dll/win32/msxml3/queryresult.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/queryresu… ============================================================================== --- trunk/reactos/dll/win32/msxml3/queryresult.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/queryresult.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -212,12 +212,12 @@ static HRESULT WINAPI queryresult_get_item( IXMLDOMNodeList* iface, - long index, + LONG index, IXMLDOMNode** listItem) { queryresult *This = impl_from_IXMLDOMNodeList( iface ); - TRACE("%p %ld\n", This, index); + TRACE("%p %d\n", This, index); if(!listItem) return E_INVALIDARG; @@ -235,7 +235,7 @@ static HRESULT WINAPI queryresult_get_length( IXMLDOMNodeList* iface, - long* listLength) + LONG* listLength) { queryresult *This = impl_from_IXMLDOMNodeList( iface ); Modified: trunk/reactos/dll/win32/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/schema.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -189,13 +189,13 @@ return E_NOTIMPL; } -static HRESULT WINAPI schema_cache_get_length( IXMLDOMSchemaCollection *iface, long *length ) -{ - FIXME("stub\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI schema_cache_get_namespaceURI( IXMLDOMSchemaCollection *iface, long index, BSTR *len ) +static HRESULT WINAPI schema_cache_get_length( IXMLDOMSchemaCollection *iface, LONG *length ) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI schema_cache_get_namespaceURI( IXMLDOMSchemaCollection *iface, LONG index, BSTR *len ) { FIXME("stub\n"); return E_NOTIMPL; Modified: trunk/reactos/dll/win32/msxml3/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/text.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/text.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -519,12 +519,12 @@ static HRESULT WINAPI domtext_get_length( IXMLDOMText *iface, - long *len) + LONG *len) { domtext *This = impl_from_IXMLDOMText( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; TRACE("%p\n", iface); @@ -545,12 +545,12 @@ static HRESULT WINAPI domtext_substringData( IXMLDOMText *iface, - long offset, long count, BSTR *p) + LONG offset, LONG count, BSTR *p) { domtext *This = impl_from_IXMLDOMText( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; HRESULT hr = S_FALSE; TRACE("%p\n", iface); @@ -620,14 +620,14 @@ static HRESULT WINAPI domtext_insertData( IXMLDOMText *iface, - long offset, BSTR p) + LONG offset, BSTR p) { domtext *This = impl_from_IXMLDOMText( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pXmlContent; BSTR sNewString; HRESULT hr = S_FALSE; - long nLength = 0, nLengthP = 0; + LONG nLength = 0, nLengthP = 0; xmlChar *str = NULL; TRACE("%p\n", This); @@ -690,7 +690,7 @@ static HRESULT WINAPI domtext_deleteData( IXMLDOMText *iface, - long offset, long count) + LONG offset, LONG count) { FIXME("\n"); return E_NOTIMPL; @@ -698,7 +698,7 @@ static HRESULT WINAPI domtext_replaceData( IXMLDOMText *iface, - long offset, long count, BSTR p) + LONG offset, LONG count, BSTR p) { FIXME("\n"); return E_NOTIMPL; @@ -706,7 +706,7 @@ static HRESULT WINAPI domtext_splitText( IXMLDOMText *iface, - long offset, IXMLDOMText **txtNode) + LONG offset, IXMLDOMText **txtNode) { FIXME("\n"); return E_NOTIMPL; Modified: trunk/reactos/dll/win32/msxml3/xmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmldoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmldoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmldoc.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -419,7 +419,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI xmldoc_get_readyState(IXMLDocument *iface, long *p) +static HRESULT WINAPI xmldoc_get_readyState(IXMLDocument *iface, LONG *p) { FIXME("(%p, %p): stub\n", iface, p); return E_NOTIMPL; @@ -455,7 +455,7 @@ return E_NOTIMPL; } -static xmlElementType type_msxml_to_libxml(long type) +static xmlElementType type_msxml_to_libxml(LONG type) { switch (type) { Modified: trunk/reactos/dll/win32/msxml3/xmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlelem.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmlelem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmlelem.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -333,7 +333,7 @@ return XMLElementCollection_create((IUnknown *)iface, This->node->children, (LPVOID *)p); } -static long type_libxml_to_msxml(xmlElementType type) +static LONG type_libxml_to_msxml(xmlElementType type) { switch (type) { @@ -356,7 +356,7 @@ return XMLELEMTYPE_OTHER; } -static HRESULT WINAPI xmlelem_get_type(IXMLElement *iface, long *p) +static HRESULT WINAPI xmlelem_get_type(IXMLElement *iface, LONG *p) { xmlelem *This = impl_from_IXMLElement(iface); @@ -366,7 +366,7 @@ return E_INVALIDARG; *p = type_libxml_to_msxml(This->node->type); - TRACE("returning %ld\n", *p); + TRACE("returning %d\n", *p); return S_OK; } @@ -408,13 +408,13 @@ } static HRESULT WINAPI xmlelem_addChild(IXMLElement *iface, IXMLElement *pChildElem, - long lIndex, long lreserved) + LONG lIndex, LONG lreserved) { xmlelem *This = impl_from_IXMLElement(iface); xmlelem *childElem = impl_from_IXMLElement(pChildElem); xmlNodePtr child; - TRACE("(%p, %p, %ld, %ld)\n", iface, pChildElem, lIndex, lreserved); + TRACE("(%p, %p, %d, %d)\n", iface, pChildElem, lIndex, lreserved); if (lIndex == 0) child = xmlAddChild(This->node, childElem->node); @@ -582,13 +582,13 @@ return E_NOTIMPL; } -static HRESULT WINAPI xmlelem_collection_put_length(IXMLElementCollection *iface, long v) -{ - TRACE("(%p, %ld)\n", iface, v); +static HRESULT WINAPI xmlelem_collection_put_length(IXMLElementCollection *iface, LONG v) +{ + TRACE("(%p, %d)\n", iface, v); return E_FAIL; } -static HRESULT WINAPI xmlelem_collection_get_length(IXMLElementCollection *iface, long *p) +static HRESULT WINAPI xmlelem_collection_get_length(IXMLElementCollection *iface, LONG *p) { xmlelem_collection *This = impl_from_IXMLElementCollection(iface); Modified: trunk/reactos/include/psdk/msxml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/msxml.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msxml.idl [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -37,10 +37,10 @@ interface IXMLElementCollection : IDispatch { [propput, id(DISPID_XMLELEMENTCOLLECTION_LENGTH)] - HRESULT length( [in] long v ); + HRESULT length( [in] LONG v ); [propget, id(DISPID_XMLELEMENTCOLLECTION_LENGTH)] - HRESULT length( [retval, out] long *p ); + HRESULT length( [retval, out] LONG *p ); [propget, id(DISPID_XMLELEMENTCOLLECTION_NEWENUM)] HRESULT _newEnum( [retval, out] IUnknown ** ppUnk ); @@ -86,7 +86,7 @@ HRESULT children( [retval, out] IXMLElementCollection **p ); [propget, id(DISPID_XMLELEMENT_TYPE)] - HRESULT type( [retval, out] long *p ); + HRESULT type( [retval, out] LONG *p ); [propget, id(DISPID_XMLELEMENT_TEXT)] HRESULT text( [retval, out] BSTR *p ); @@ -97,8 +97,8 @@ [id(DISPID_XMLELEMENT_ADDCHILD)] HRESULT addChild( [in] IXMLElement *pChildElem, - [in] long lIndex, - [in] long lreserved ); + [in] LONG lIndex, + [in] LONG lreserved ); [id(DISPID_XMLELEMENT_REMOVECHILD)] HRESULT removeChild( @@ -134,7 +134,7 @@ HRESULT mimeType( [retval, out] BSTR *p ); [propget, id(DISPID_XMLDOCUMENT_READYSTATE)] - HRESULT readyState( [retval, out] long *p ); + HRESULT readyState( [retval, out] LONG *p ); [propget, id(DISPID_XMLDOCUMENT_CHARSET)] HRESULT charset( [retval, out] BSTR *p ); @@ -191,7 +191,7 @@ HRESULT children([retval, out] IXMLElementCollection **pp); [propget, id(DISPID_XMLELEMENT_TYPE)] - HRESULT type([retval, out] long *plType); + HRESULT type([retval, out] LONG *plType); [propget, id(DISPID_XMLELEMENT_TEXT)] HRESULT text([retval, out] BSTR *p); @@ -202,8 +202,8 @@ [id(DISPID_XMLELEMENT_ADDCHILD)] HRESULT addChild( [in] IXMLElement2 *pChildElem, - [in] long lIndex, - [in] long lReserved); + [in] LONG lIndex, + [in] LONG lReserved); [id(DISPID_XMLELEMENT_REMOVECHILD)] HRESULT removeChild([in]IXMLElement2 *pChildElem); @@ -241,7 +241,7 @@ HRESULT mimeType([retval, out] BSTR *p); [propget, id(DISPID_XMLDOCUMENT_READYSTATE)] - HRESULT readyState([retval, out]long *pl); + HRESULT readyState([retval, out]LONG *pl); [propget, id(DISPID_XMLDOCUMENT_CHARSET)] HRESULT charset([retval, out]BSTR *p); Modified: trunk/reactos/include/psdk/msxml2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re… ============================================================================== --- trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -327,7 +327,7 @@ [retval, out] VARIANT_BOOL *pbool); [propget, id(DISPID_READYSTATE)] - HRESULT readyState([retval, out] long *value); + HRESULT readyState([retval, out] LONG *value); [propget, id(DISPID_XMLDOM_DOCUMENT_PARSEERROR)] HRESULT parseError([retval, out] IXMLDOMParseError **err); @@ -404,10 +404,10 @@ [propget, id(DISPID_XMLDOM_SCHEMACOLLECTION_LENGTH)] HRESULT length( - [retval, out] long *length); + [retval, out] LONG *length); [propget, id(DISPID_VALUE)] - HRESULT namespaceURI([in] long index, [out, retval] BSTR *len); + HRESULT namespaceURI([in] LONG index, [out, retval] BSTR *len); [id(DISPID_XMLDOM_SCHEMACOLLECTION_ADDCOLLECTION)] HRESULT addCollection( @@ -456,10 +456,10 @@ interface IXMLDOMNodeList : IDispatch { [propget, id(DISPID_VALUE)] - HRESULT item([in] long lIndex, [retval, out] IXMLDOMNode **outNode); + HRESULT item([in] LONG lIndex, [retval, out] IXMLDOMNode **outNode); [propget, id(DISPID_DOM_NODELIST_LENGTH)] - HRESULT length([retval, out] long *lLength); + HRESULT length([retval, out] LONG *lLength); [id(DISPID_XMLDOM_NODELIST_NEXTNODE)] HRESULT nextNode( @@ -545,10 +545,10 @@ [retval, out] IXMLDOMNode **outNode); [propget, id(DISPID_VALUE)] - HRESULT item([in] long lIndex, [retval, out] IXMLDOMNode **outNode); + HRESULT item([in] LONG lIndex, [retval, out] IXMLDOMNode **outNode); [propget, id(DISPID_DOM_NODELIST_LENGTH)] - HRESULT length([retval, out] long *lLength); + HRESULT length([retval, out] LONG *lLength); [id(DISPID_XMLDOM_NAMEDNODEMAP_GETQUALIFIEDITEM)] HRESULT getQualifiedItem( @@ -596,12 +596,12 @@ HRESULT data([in] BSTR data); [propget, id(DISPID_DOM_DATA_LENGTH)] - HRESULT length([retval, out] long *len); + HRESULT length([retval, out] LONG *len); [id(DISPID_DOM_DATA_SUBSTRING)] HRESULT substringData( - [in] long offset, - [in] long count, + [in] LONG offset, + [in] LONG count, [retval, out] BSTR *p); [id(DISPID_DOM_DATA_APPEND)] @@ -610,18 +610,18 @@ [id(DISPID_DOM_DATA_INSERT)] HRESULT insertData( - [in] long offset, + [in] LONG offset, [in] BSTR p); [id(DISPID_DOM_DATA_DELETE)] HRESULT deleteData( - [in] long offset, - [in] long count); + [in] LONG offset, + [in] LONG count); [id(DISPID_DOM_DATA_REPLACE)] HRESULT replaceData( - [in] long offset, - [in] long count, + [in] LONG offset, + [in] LONG count, [in] BSTR p); } @@ -699,7 +699,7 @@ { [id(DISPID_DOM_TEXT_SPLITTEXT)] HRESULT splitText( - [in] long offset, + [in] LONG offset, [retval, out] IXMLDOMText **txtNode); } @@ -819,32 +819,32 @@ [id(DISPID_XTLRUNTIME_UNIQUEID)] HRESULT uniqueID( [in]IXMLDOMNode *pNode, - [retval, out]long *pID); + [retval, out]LONG *pID); [id(DISPID_XTLRUNTIME_DEPTH)] HRESULT depth( [in] IXMLDOMNode *pNode, - [retval, out]long * pDepth); + [retval, out]LONG * pDepth); [id(DISPID_XTLRUNTIME_CHILDNUMBER)] HRESULT childNumber( [in]IXMLDOMNode *pNode, - [retval, out] long *pNumber); + [retval, out] LONG *pNumber); [id(DISPID_XTLRUNTIME_ANCESTORCHILDNUMBER)] HRESULT ancestorChildNumber( [in]BSTR bstr, [in]IXMLDOMNode *pNode, - [retval, out]long *pNumber); + [retval, out]LONG *pNumber); [id(DISPID_XTLRUNTIME_ABSOLUTECHILDNUMBER)] HRESULT absoluteChildNumber( [in]IXMLDOMNode *pNode, - [retval, out]long *pNumber); + [retval, out]LONG *pNumber); [id(DISPID_XTLRUNTIME_FORMATINDEX)] HRESULT formatIndex( - [in] long lIndex, + [in] LONG lIndex, [in] BSTR bstr, [retval, out]BSTR *pbstr); @@ -925,7 +925,7 @@ HRESULT reset(); [propget, id(DISPID_XMLDOM_PROCESSOR_READYSTATE)] - HRESULT readyState([retval, out] long *pstate); + HRESULT readyState([retval, out] LONG *pstate); [id(DISPID_XMLDOM_PROCESSOR_ADDPARAMETER)] HRESULT addParameter( @@ -990,7 +990,7 @@ HRESULT abort(); [propget, id(7)] - HRESULT status([out, retval] long *pStatus); + HRESULT status([out, retval] LONG *pStatus); [propget, id(8)] HRESULT statusText([out, retval] BSTR *pStatus); @@ -1008,7 +1008,7 @@ HRESULT responseStream([out, retval] VARIANT *pBody); [propget, id(13)] - HRESULT readyState([out, retval] long *pState); + HRESULT readyState([out, retval] LONG *pState); [propput, id(14)] HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); @@ -1022,7 +1022,7 @@ interface IXMLDOMParseError : IDispatch { [propget, id(DISPID_VALUE)] - HRESULT errorCode([retval, out] long *errCode); + HRESULT errorCode([retval, out] LONG *errCode); [propget, id(DISPID_DOM_ERROR_URL)] HRESULT url([retval, out] BSTR *p); @@ -1034,13 +1034,13 @@ HRESULT srcText([retval, out] BSTR *p); [propget, id(DISPID_DOM_ERROR_LINE)] - HRESULT line([retval, out] long *lineNo); + HRESULT line([retval, out] LONG *lineNo); [propget, id(DISPID_DOM_ERROR_LINEPOS)] - HRESULT linepos([retval, out] long * linePos); + HRESULT linepos([retval, out] LONG * linePos); [propget, id(DISPID_DOM_ERROR_FILEPOS)] - HRESULT filepos([retval, out] long * filePos); + HRESULT filepos([retval, out] LONG * filePos); } [ @@ -1690,21 +1690,21 @@ { [id(DISPID_SAX_ERRORHANDLER_ERROR)] HRESULT error( - [in] IVBSAXLocator * locator, + [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, - [in] long errorCode); + [in] LONG errorCode); [id(DISPID_SAX_ERRORHANDLER_FATALERROR)] HRESULT fatalError( [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, - [in] long errorCode); + [in] LONG errorCode); [id(DISPID_SAX_ERRORHANDLER_IGNORABLEWARNING)] HRESULT ignorableWarning( [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, - [in] long errorCode); + [in] LONG errorCode); }; [

1 0

[dgoette] 395: move compatdb rewrite to his own branch
by dgoette＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: dgoette Date: Tue Apr 28 23:53:35 2009 New Revision: 395 URL: http://svn.reactos.org/svn/reactos?rev=395&view=rev Log: move compatdb rewrite to his own branch Added: branches/compat/ (props changed) - copied from r394, branches/danny-web/www/www.reactos.org/compat/ Removed: branches/danny-web/www/www.reactos.org/compat/ Propchange: branches/compat/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk/web/reactos.org/htdocs/compat:288-336,343-346

1 0

[cwittich] 40718: sync cryptui with wine 1.1.20
by cwittich＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: cwittich Date: Tue Apr 28 23:48:23 2009 New Revision: 40718 URL: http://svn.reactos.org/svn/reactos?rev=40718&view=rev Log: sync cryptui with wine 1.1.20 Modified: trunk/reactos/dll/win32/cryptui/main.c Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] Tue Apr 28 23:48:23 2009 @@ -3337,7 +3337,7 @@ DWORD size; RECT rc; LVCOLUMNW column; - PurposeSelection purposeSelection; + PurposeSelection purposeSelection = PurposeEnableAll; GetWindowRect(lv, &rc); column.mask = LVCF_WIDTH;

1 0

[dgoette] 394: * cleanup folders * start to write a new listing page (for names, categories, ...), internally implemented with filters
by dgoette＠svn.reactos.org 28 Apr '09

28 Apr '09

1 0

[fireball] 40717: - Fix writing of BootConfig to the registry (previously, it wrote contents of DEVICE_NODE structure and caused nonpaged pool overrea). Similar error a few lines below was fixed by hpoussin in r15691.
by fireball＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: fireball Date: Tue Apr 28 15:39:54 2009 New Revision: 40717 URL: http://svn.reactos.org/svn/reactos?rev=40717&view=rev Log: - Fix writing of BootConfig to the registry (previously, it wrote contents of DEVICE_NODE structure and caused nonpaged pool overrea). Similar error a few lines below was fixed by hpoussin in r15691. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Tue Apr 28 15:39:54 2009 @@ -747,7 +747,7 @@ &KeyName, 0, REG_RESOURCE_LIST, - &DeviceNode->BootResources, + DeviceNode->BootResources, ListSize); } }

1 0

[janderwald] 40716: - Silence a few debug prints - The IrpQueue functions are called at DISPATCH_LEVEL, therefore use KeAcquireSpinLockAtDpcLevel instead - Fix multiple bugs when using IrpQueue tag functions
by janderwald＠svn.reactos.org 27 Apr '09

27 Apr '09

Author: janderwald Date: Tue Apr 28 03:16:49 2009 New Revision: 40716 URL: http://svn.reactos.org/svn/reactos?rev=40716&view=rev Log: - Silence a few debug prints - The IrpQueue functions are called at DISPATCH_LEVEL, therefore use KeAcquireSpinLockAtDpcLevel instead - Fix multiple bugs when using IrpQueue tag functions Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] Tue Apr 28 03:16:49 2009 @@ -177,7 +177,7 @@ BOOL Success; IInterruptSyncImpl * This = (IInterruptSyncImpl*)ServiceContext; - DPRINT("IInterruptServiceRoutine Mode %u\n", This->Mode); + //DPRINT("IInterruptServiceRoutine Mode %u\n", This->Mode); if (This->Mode == InterruptSyncModeNormal) { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Tue Apr 28 03:16:49 2009 @@ -33,17 +33,12 @@ KSPIN_CONNECT *ConnectDetails; PKSDATAFORMAT_WAVEFORMATEX DataFormat; - PIRP_MAPPING FirstMap; - PIRP_MAPPING LastMap; - KSPIN_LOCK Lock; LIST_ENTRY ListHead; PVOID LastTag; - BOOL OutOfMapping; + ULONG OutOfMapping; ULONG MaxFrameSize; - - BOOL LastMappingFailed; }IIrpQueueImpl; @@ -128,7 +123,7 @@ This->ConnectDetails = ConnectDetails; This->DataFormat = (PKSDATAFORMAT_WAVEFORMATEX)DataFormat; This->MaxFrameSize = FrameSize; - This->LastTag = (PVOID)0x12345678; + This->LastTag = NULL; InitializeListHead(&This->ListHead); KeInitializeSpinLock(&This->Lock); @@ -158,17 +153,15 @@ if (This->MaxFrameSize) { Mapping->NumTags = max((Mapping->Header->DataUsed / This->MaxFrameSize) + 1, 1); - Mapping->Tag = AllocateItem(NonPagedPool, sizeof(PVOID) * This->NumMappings, TAG_PORTCLASS); + Mapping->Tag = AllocateItem(NonPagedPool, sizeof(PVOID) * Mapping->NumTags, TAG_PORTCLASS); + Mapping->ReferenceCount = Mapping->NumTags; } This->NumDataAvailable += Mapping->Header->DataUsed; DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Irp %p\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Irp); - /* FIXME use InterlockedCompareExchangePointer */ - if (InterlockedCompareExchange((volatile long *)&This->FirstMap, (LONG)Mapping, (LONG)0) != 0) - ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock); - + ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock); (void)InterlockedIncrement((volatile long*)&This->NumMappings); if (Irp) @@ -188,17 +181,28 @@ OUT PUCHAR * Buffer, OUT PULONG BufferSize) { - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - - if (!This->FirstMap) - { - This->LastMappingFailed = TRUE; + + PIRP_MAPPING CurMapping; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + PLIST_ENTRY CurEntry; + + KeAcquireSpinLockAtDpcLevel(&This->Lock); + + + CurEntry = This->ListHead.Flink; + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + if (CurEntry == &This->ListHead) + { + KeReleaseSpinLockFromDpcLevel(&This->Lock); + This->OutOfMapping = TRUE; return STATUS_UNSUCCESSFUL; } - *Buffer = (PUCHAR)This->FirstMap->Header->Data + This->CurrentOffset; - *BufferSize = This->FirstMap->Header->DataUsed - This->CurrentOffset; - This->LastMappingFailed = FALSE; + *Buffer = (PUCHAR)CurMapping->Header->Data + This->CurrentOffset; + *BufferSize = CurMapping->Header->DataUsed - This->CurrentOffset; + This->OutOfMapping = FALSE; + + KeReleaseSpinLockFromDpcLevel(&This->Lock); return STATUS_SUCCESS; } @@ -210,21 +214,22 @@ IN IIrpQueue *iface, IN ULONG BytesWritten) { - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - PIRP_MAPPING Mapping, CurMapping; + PLIST_ENTRY CurEntry; + PIRP_MAPPING CurMapping; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; This->CurrentOffset += BytesWritten; This->NumDataAvailable -= BytesWritten; - if (This->FirstMap->Header->DataUsed <=This->CurrentOffset) + CurEntry = This->ListHead.Flink; + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + + if (CurMapping->Header->DataUsed <= This->CurrentOffset) { This->CurrentOffset = 0; - Mapping = (PIRP_MAPPING)ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); - CurMapping = This->FirstMap; - - (void)InterlockedExchangePointer((PVOID volatile*)&This->FirstMap, (PVOID)Mapping); + + (void)ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); InterlockedDecrement(&This->NumMappings); - FreeMappingRoutine(CurMapping); } @@ -304,45 +309,37 @@ OUT PULONG ByteCount, OUT PULONG Flags) { - KIRQL OldIrql; PIRP_MAPPING CurMapping; PIRP_MAPPING Result; PLIST_ENTRY CurEntry; ULONG Index; + ULONG Offset; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; *Flags = 0; Result = NULL; - KeAcquireSpinLock(&This->Lock, &OldIrql); + KeAcquireSpinLockAtDpcLevel(&This->Lock); CurEntry = This->ListHead.Flink; + if (CurEntry == &This->ListHead) + { + KeReleaseSpinLockFromDpcLevel(&This->Lock); + This->OutOfMapping = TRUE; + return STATUS_UNSUCCESSFUL; + } + while (CurEntry != &This->ListHead) { CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); for(Index = 0; Index < CurMapping->NumTags; Index++) { - if (This->LastTag == (PVOID)0x12345678) - { - CurMapping->Tag[Index] = Tag; - CurMapping->ReferenceCount++; - Result = CurMapping; - if (Index + 1 == CurMapping->NumTags - 1) - { - /* indicate end of packet */ - *Flags = 1; - } - break; - } - - if (CurMapping->Tag[Index] == This->LastTag) { if (Index + 1 < CurMapping->NumTags) { CurMapping->Tag[Index+1] = Tag; - CurMapping->ReferenceCount++; Result = CurMapping; if (Index + 1 == CurMapping->NumTags - 1) @@ -350,6 +347,11 @@ /* indicate end of packet */ *Flags = 1; } + Offset = (Index + 1) * This->MaxFrameSize; + ASSERT(Result->Header->DataUsed > Offset); + *VirtualAddress = (PUCHAR)Result->Header->Data + Offset; + *PhysicalAddress = MmGetPhysicalAddress(*VirtualAddress); + *ByteCount = min(Result->Header->DataUsed - Offset, This->MaxFrameSize); break; } @@ -357,30 +359,23 @@ if (&This->ListHead == CurEntry) { This->OutOfMapping = TRUE; - break; + KeReleaseSpinLockFromDpcLevel(&This->Lock); + return STATUS_UNSUCCESSFUL; } Result = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); Result->Tag[0] = Tag; - Result->ReferenceCount++; + *VirtualAddress = (PUCHAR)Result->Header->Data; + *PhysicalAddress = MmGetPhysicalAddress(*VirtualAddress); + *ByteCount = min(Result->Header->DataUsed, This->MaxFrameSize); break; } } CurEntry = CurEntry->Flink; } - KeReleaseSpinLock(&This->Lock, OldIrql); - if (!Result) - { - This->LastMappingFailed = TRUE; - return STATUS_UNSUCCESSFUL; - } - - Result->Tag = Tag; - *PhysicalAddress = MmGetPhysicalAddress(Result->Header->Data); - *VirtualAddress = Result->Header->Data; - *ByteCount = Result->Header->DataUsed; + KeReleaseSpinLockFromDpcLevel(&This->Lock); This->LastTag = Tag; - This->LastMappingFailed = FALSE; + This->OutOfMapping = FALSE; return STATUS_SUCCESS; } @@ -390,13 +385,12 @@ IN IIrpQueue *iface, IN PVOID Tag) { - KIRQL OldIrql; PIRP_MAPPING CurMapping; PLIST_ENTRY CurEntry; ULONG Index; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - KeAcquireSpinLock(&This->Lock, &OldIrql); + KeAcquireSpinLockAtDpcLevel(&This->Lock); CurEntry = This->ListHead.Flink; while (CurEntry != &This->ListHead) @@ -427,7 +421,7 @@ CurEntry = CurEntry->Flink; } - KeReleaseSpinLock(&This->Lock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&This->Lock); } BOOL @@ -436,7 +430,7 @@ IN IIrpQueue *iface) { IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - return This->LastMappingFailed; + return This->OutOfMapping; } static IIrpQueueVtbl vt_IIrpQueue = Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] Tue Apr 28 03:16:49 2009 @@ -202,7 +202,7 @@ ASSERT_IRQL(DISPATCH_LEVEL); Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); - DPRINT("Position %llu Status %x\n", Position, Status); + DPRINT("Position %ull Status %x\n", Position, Status); This->Stream->lpVtbl->Service(This->Stream); } 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] Tue Apr 28 03:16:49 2009 @@ -226,7 +226,7 @@ IServiceSink* iface) { IPortWavePciImpl * This = (IPortWavePciImpl*)CONTAINING_RECORD(iface, IPortWavePciImpl, lpVtblServiceSink); - DPRINT("IServiceSink_fnRequestService entered\n"); + //DPRINT("IServiceSink_fnRequestService entered\n"); if (This->Miniport) { This->Miniport->lpVtbl->Service(This->Miniport); @@ -576,9 +576,9 @@ IN IPortWavePci * iface, IN PSERVICEGROUP ServiceGroup) { - IPortWavePciImpl * This = (IPortWavePciImpl*)iface; - - DPRINT("IPortWavePci_fnNotify entered %p, ServiceGroup %p\n", This, ServiceGroup); + //IPortWavePciImpl * This = (IPortWavePciImpl*)iface; + + //DPRINT("IPortWavePci_fnNotify entered %p, ServiceGroup %p\n", This, ServiceGroup); if (ServiceGroup) {

1 0

← Newer
1
2
3
4
5
6
7
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009