Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[navaraf] 20156: Fix the path translation in FormatEx (depends on unimplemented GetVolumeNameForVolumeMountPointW function).

by navaraf＠svn.reactos.com

Fix the path translation in FormatEx (depends on unimplemented GetVolumeNameForVolumeMountPointW function). Modified: trunk/reactos/lib/fmifs/fmifs.xml Modified: trunk/reactos/lib/fmifs/format.c _____ Modified: trunk/reactos/lib/fmifs/fmifs.xml --- trunk/reactos/lib/fmifs/fmifs.xml 2005-12-13 23:06:37 UTC (rev 20155) +++ trunk/reactos/lib/fmifs/fmifs.xml 2005-12-13 23:10:34 UTC (rev 20156) @@ -3,6 +3,7 @@ <include base="fmifs">.</include> <define name="_DISABLE_TIDENTS" /> <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0600</define> <library>vfatlib</library> <library>ntdll</library> <library>kernel32</library> _____ Modified: trunk/reactos/lib/fmifs/format.c --- trunk/reactos/lib/fmifs/format.c 2005-12-13 23:06:37 UTC (rev 20155) +++ trunk/reactos/lib/fmifs/format.c 2005-12-13 23:10:34 UTC (rev 20156) @@ -35,8 +35,28 @@ UNICODE_STRING usDriveRoot; UNICODE_STRING usLabel; BOOLEAN Argument = FALSE; + WCHAR VolumeName[MAX_PATH]; + CURDIR CurDir; - RtlInitUnicodeString(&usDriveRoot, DriveRoot); + if (_wcsnicmp(Format, L"FAT", 3) != 0) + { + /* Unknown file system */ + Callback (DONE, /* Command */ + 0, /* DWORD Modifier */ + &Argument); /* Argument */ + } + + if (!GetVolumeNameForVolumeMountPointW(DriveRoot, VolumeName, MAX_PATH) || + !RtlDosPathNameToNtPathName_U(VolumeName, &usDriveRoot, NULL, &CurDir)) + { + /* Report an error. */ + Callback (DONE, /* Command */ + 0, /* DWORD Modifier */ + &Argument); /* Argument */ + + return; + } + RtlInitUnicodeString(&usLabel, Label); if (_wcsnicmp(Format, L"FAT", 3) == 0) @@ -51,14 +71,8 @@ ClusterSize, Callback); VfatCleanup (); + RtlFreeUnicodeString(&usDriveRoot); } - else - { - /* Unknown file system */ - Callback (DONE, /* Command */ - 0, /* DWORD Modifier */ - &Argument); /* Argument */ - } } /* EOF */

18 years, 9 months

[gvg] 20155: Use preferred superglobal

by gvg＠svn.reactos.com

Use preferred superglobal Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_login.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_login.php --- trunk/web/reactos.org/htdocs/roscms/inc/user_login.php 2005-12-13 22:23:08 UTC (rev 20154) +++ trunk/web/reactos.org/htdocs/roscms/inc/user_login.php 2005-12-13 23:06:37 UTC (rev 20155) @@ -290,8 +290,8 @@ exit; } - $rem_adr = $HTTP_SERVER_VARS['REMOTE_ADDR']; - $useragent = $HTTP_SERVER_VARS['HTTP_USER_AGENT']; + $rem_adr = $_SERVER['REMOTE_ADDR']; + $useragent = $_SERVER['HTTP_USER_AGENT']; // Query DB table 'users' and read the login_counter and settings of // the specific user

18 years, 9 months

[gedmurphy] 20154: It's a modal dialog not a window. Close it correctly.

by gedmurphy＠svn.reactos.com

It's a modal dialog not a window. Close it correctly. Modified: trunk/reactos/apps/utils/getfirefox/getfirefox.c _____ Modified: trunk/reactos/apps/utils/getfirefox/getfirefox.c --- trunk/reactos/apps/utils/getfirefox/getfirefox.c 2005-12-13 22:12:01 UTC (rev 20153) +++ trunk/reactos/apps/utils/getfirefox/getfirefox.c 2005-12-13 22:23:08 UTC (rev 20154) @@ -359,14 +359,10 @@ return FALSE; case WM_CLOSE: - DestroyWindow(Dlg); + EndDialog(Dlg, 0); return TRUE; - case WM_DESTROY: - PostQuitMessage(0); - return TRUE; - - default: + default: return FALSE; } }

18 years, 9 months

[gedmurphy] 20153: Missed a tab / space format. Looked ugly in diff

by gedmurphy＠svn.reactos.com

Missed a tab / space format. Looked ugly in diff Modified: trunk/reactos/apps/utils/getfirefox/getfirefox.c _____ Modified: trunk/reactos/apps/utils/getfirefox/getfirefox.c --- trunk/reactos/apps/utils/getfirefox/getfirefox.c 2005-12-13 22:02:43 UTC (rev 20152) +++ trunk/reactos/apps/utils/getfirefox/getfirefox.c 2005-12-13 22:12:01 UTC (rev 20153) @@ -354,7 +354,7 @@ if (wParam == IDCANCEL) { SetWindowLongPtrW(Dlg, GWLP_USERDATA, 1); - PostMessage(Dlg, WM_CLOSE, 0, 0); + PostMessage(Dlg, WM_CLOSE, 0, 0); } return FALSE;

18 years, 9 months

[gedmurphy] 20152: - Close dialog if user clicks cancel or close button is pressed

by gedmurphy＠svn.reactos.com

- Close dialog if user clicks cancel or close button is pressed - Fixes bug 1126 Modified: trunk/reactos/apps/utils/getfirefox/getfirefox.c _____ Modified: trunk/reactos/apps/utils/getfirefox/getfirefox.c --- trunk/reactos/apps/utils/getfirefox/getfirefox.c 2005-12-13 21:48:57 UTC (rev 20151) +++ trunk/reactos/apps/utils/getfirefox/getfirefox.c 2005-12-13 22:02:43 UTC (rev 20152) @@ -354,9 +354,18 @@ if (wParam == IDCANCEL) { SetWindowLongPtrW(Dlg, GWLP_USERDATA, 1); + PostMessage(Dlg, WM_CLOSE, 0, 0); } return FALSE; + case WM_CLOSE: + DestroyWindow(Dlg); + return TRUE; + + case WM_DESTROY: + PostQuitMessage(0); + return TRUE; + default: return FALSE; }

18 years, 9 months

[navaraf] 20151: Add stubs for status indication handlers. Fixes bug #187.

by navaraf＠svn.reactos.com

Add stubs for status indication handlers. Fixes bug #187. Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c _____ Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c --- trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-12-13 21:26:25 UTC (rev 20150) +++ trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-12-13 21:48:57 UTC (rev 20151) @@ -878,6 +878,27 @@ } +VOID +NTAPI +MiniStatus( + IN NDIS_HANDLE MiniportHandle, + IN NDIS_STATUS GeneralStatus, + IN PVOID StatusBuffer, + IN UINT StatusBufferSize) +{ + UNIMPLEMENTED +} + + +VOID +NTAPI +MiniStatusComplete( + IN NDIS_HANDLE MiniportAdapterHandle) +{ + UNIMPLEMENTED +} + + /* * @unimplemented */ @@ -1406,6 +1427,8 @@ Adapter->NdisMiniportBlock.ResetCompleteHandler = MiniResetComplete; Adapter->NdisMiniportBlock.TDCompleteHandler = MiniTransferDataComplete; Adapter->NdisMiniportBlock.PacketIndicateHandler= MiniIndicateReceivePacket; + Adapter->NdisMiniportBlock.StatusHandler = MiniStatus; + Adapter->NdisMiniportBlock.StatusCompleteHandler= MiniStatusComplete; Adapter->NdisMiniportBlock.MediaType = MediaArray[SelectedMediumIndex];

18 years, 9 months

[cwittich] 20150: implemented GetKeyboardLayoutNameW

by cwittich＠svn.reactos.com

implemented GetKeyboardLayoutNameW fixed declaration of NtUserGetKeyboardLayoutName Modified: trunk/reactos/include/win32k/ntuser.h Modified: trunk/reactos/lib/user32/windows/input.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-12-13 20:17:25 UTC (rev 20149) +++ trunk/reactos/include/win32k/ntuser.h 2005-12-13 21:26:25 UTC (rev 20150) @@ -752,10 +752,10 @@ DWORD Unknown0, DWORD Unknown1); -DWORD +BOOL STDCALL NtUserGetKeyboardLayoutName( - DWORD Unknown0); + LPWSTR lpszName); DWORD STDCALL _____ Modified: trunk/reactos/lib/user32/windows/input.c --- trunk/reactos/lib/user32/windows/input.c 2005-12-13 20:17:25 UTC (rev 20149) +++ trunk/reactos/lib/user32/windows/input.c 2005-12-13 21:26:25 UTC (rev 20150) @@ -260,13 +260,12 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL GetKeyboardLayoutNameW(LPWSTR pwszKLID) { - UNIMPLEMENTED; - return FALSE; + return NtUserGetKeyboardLayoutName( pwszKLID ); } _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-12-13 20:17:25 UTC (rev 20149) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-12-13 21:26:25 UTC (rev 20150) @@ -1254,18 +1254,16 @@ return 0; } -DWORD +BOOL STDCALL NtUserGetKeyboardLayoutName( - DWORD lpszName) + LPWSTR lpszName) { UNIMPLEMENTED return 0; } - - HKL FASTCALL UserGetKeyboardLayout( DWORD dwThreadId)

18 years, 9 months

[arty] 20149: Patch to fix bugcheck at exit for various TCP wielding apps. This puts in

by arty＠svn.reactos.com

Patch to fix bugcheck at exit for various TCP wielding apps. This puts in a work item for socket shutdown that decouples the IRP cancel from the actual (PASSIVE_LEVEL) tcp accounting chores. Uses the CHEW static lib that I put in to gather workitem code into one nice sane happy place. It seems like doing the same to loopback.c is detrimental and I suspect that it's due to nasty reentrancy issues in our code. I'll likely adapt chew lib so we can use it there too. Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/net/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/net/tcpip/include/precomp.h Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c Modified: trunk/reactos/drivers/net/tcpip/tcpip.xml _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c --- trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2005-12-13 20:16:50 UTC (rev 20148) +++ trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2005-12-13 20:17:25 UTC (rev 20149) @@ -647,4 +647,34 @@ return STATUS_SUCCESS; } +VOID TCPRemoveIRP( PCONNECTION_ENDPOINT Endpoint, PIRP Irp ) { + PLIST_ENTRY Entry; + PLIST_ENTRY ListHead[4]; + KIRQL OldIrql; + PTDI_BUCKET Bucket; + UINT i = 0; + + ListHead[0] = &Endpoint->ReceiveRequest; + ListHead[1] = &Endpoint->ConnectRequest; + ListHead[2] = &Endpoint->ListenRequest; + ListHead[3] = 0; + + TcpipAcquireSpinLock( &Endpoint->Lock, &OldIrql ); + + for( i = 0; ListHead[i]; i++ ) { + for( Entry = ListHead[i]->Flink; + Entry != ListHead[i]; + Entry = Entry->Flink ) { + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + + if( Bucket->Request.RequestContext == Irp ) { + RemoveEntryList( &Bucket->Entry ); + break; + } + } + } + + TcpipReleaseSpinLock( &Endpoint->Lock, OldIrql ); +} + /* EOF */ _____ Modified: trunk/reactos/drivers/net/tcpip/datalink/lan.c --- trunk/reactos/drivers/net/tcpip/datalink/lan.c 2005-12-13 20:16:50 UTC (rev 20148) +++ trunk/reactos/drivers/net/tcpip/datalink/lan.c 2005-12-13 20:17:25 UTC (rev 20149) @@ -51,11 +51,6 @@ LIST_ENTRY AdapterListHead; KSPIN_LOCK AdapterListLock; -/* Work around being called back into afd at Dpc level */ -KSPIN_LOCK LanWorkLock; -LIST_ENTRY LanWorkList; -WORK_QUEUE_ITEM LanWorkItem; - /* Double complete protection */ KSPIN_LOCK LanSendCompleteLock; LIST_ENTRY LanSendCompleteList; @@ -289,10 +284,9 @@ } } -VOID STDCALL LanReceiveWorker( PVOID Context ) { +VOID LanReceiveWorker( PVOID Context ) { UINT PacketType; - PLIST_ENTRY ListEntry; - PLAN_WQ_ITEM WorkItem; + PLAN_WQ_ITEM WorkItem = (PLAN_WQ_ITEM)Context; PNDIS_PACKET Packet; PLAN_ADAPTER Adapter; UINT BytesTransferred; @@ -301,60 +295,49 @@ TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); - while( (ListEntry = - ExInterlockedRemoveHeadList( &LanWorkList, &LanWorkLock )) ) { - WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); - - TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem)); - - Packet = WorkItem->Packet; - Adapter = WorkItem->Adapter; - BytesTransferred = WorkItem->BytesTransferred; - - ExFreePool( WorkItem ); - - IPPacket.NdisPacket = Packet; - - NdisGetFirstBufferFromPacket(Packet, - &NdisBuffer, - &IPPacket.Header, - &IPPacket.ContigSize, - &IPPacket.TotalSize); - - IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; - /* Determine which upper layer protocol that should receive - this packet and pass it to the correct receive handler */ - - TI_DbgPrint(MID_TRACE, - ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", - IPPacket.ContigSize, IPPacket.TotalSize, - BytesTransferred)); - - PacketType = PC(IPPacket.NdisPacket)->PacketType; - IPPacket.Position = 0; - - TI_DbgPrint - (DEBUG_DATALINK, - ("Ether Type = %x ContigSize = %d Total = %d\n", - PacketType, IPPacket.ContigSize, IPPacket.TotalSize)); - - switch (PacketType) { - case ETYPE_IPv4: - case ETYPE_IPv6: - TI_DbgPrint(MID_TRACE,("Received IP Packet\n")); - IPReceive(Adapter->Context, &IPPacket); - break; - case ETYPE_ARP: - TI_DbgPrint(MID_TRACE,("Received ARP Packet\n")); - ARPReceive(Adapter->Context, &IPPacket); - default: - break; - } - - FreeNdisPacket( Packet ); + Packet = WorkItem->Packet; + Adapter = WorkItem->Adapter; + BytesTransferred = WorkItem->BytesTransferred; + + IPPacket.NdisPacket = Packet; + + NdisGetFirstBufferFromPacket(Packet, + &NdisBuffer, + &IPPacket.Header, + &IPPacket.ContigSize, + &IPPacket.TotalSize); + + IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; + /* Determine which upper layer protocol that should receive + this packet and pass it to the correct receive handler */ + + TI_DbgPrint(MID_TRACE, + ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", + IPPacket.ContigSize, IPPacket.TotalSize, + BytesTransferred)); + + PacketType = PC(IPPacket.NdisPacket)->PacketType; + IPPacket.Position = 0; + + TI_DbgPrint + (DEBUG_DATALINK, + ("Ether Type = %x ContigSize = %d Total = %d\n", + PacketType, IPPacket.ContigSize, IPPacket.TotalSize)); + + switch (PacketType) { + case ETYPE_IPv4: + case ETYPE_IPv6: + TI_DbgPrint(MID_TRACE,("Received IP Packet\n")); + IPReceive(Adapter->Context, &IPPacket); + break; + case ETYPE_ARP: + TI_DbgPrint(MID_TRACE,("Received ARP Packet\n")); + ARPReceive(Adapter->Context, &IPPacket); + default: + break; } - TI_DbgPrint(DEBUG_DATALINK, ("Leaving\n")); - LanReceiveWorkerBusy = FALSE; + + FreeNdisPacket( Packet ); } VOID LanSubmitReceiveWork( @@ -362,34 +345,19 @@ PNDIS_PACKET Packet, NDIS_STATUS Status, UINT BytesTransferred) { - PLAN_WQ_ITEM WQItem; + LAN_WQ_ITEM WQItem; PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; - KIRQL OldIrql; + PVOID LanWorkItem; TI_DbgPrint(DEBUG_DATALINK,("called\n")); - TcpipAcquireSpinLock( &LanWorkLock, &OldIrql ); + WQItem.Packet = Packet; + WQItem.Adapter = Adapter; + WQItem.BytesTransferred = BytesTransferred; - WQItem = ExAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); - if( !WQItem ) { - TcpipReleaseSpinLock( &LanWorkLock, OldIrql ); - return; - } - - WQItem->Packet = Packet; - WQItem->Adapter = Adapter; - WQItem->BytesTransferred = BytesTransferred; - InsertTailList( &LanWorkList, &WQItem->ListEntry ); - if( !LanReceiveWorkerBusy ) { - LanReceiveWorkerBusy = TRUE; - ExQueueWorkItem( &LanWorkItem, CriticalWorkQueue ); - TI_DbgPrint(DEBUG_DATALINK, - ("Work item inserted %x %x\n", &LanWorkItem, WQItem)); - } else { - TI_DbgPrint(DEBUG_DATALINK, - ("LAN WORKER BUSY %x %x\n", &LanWorkItem, WQItem)); - } - TcpipReleaseSpinLock( &LanWorkLock, OldIrql ); + if( !ChewCreate + ( &LanWorkItem, sizeof(LAN_WQ_ITEM), LanReceiveWorker, &WQItem ) ) + ASSERT(0); } VOID STDCALL ProtocolTransferDataComplete( @@ -452,7 +420,6 @@ PNDIS_PACKET NdisPacket; PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; PETH_HEADER EHeader = (PETH_HEADER)HeaderBuffer; - KIRQL OldIrql; TI_DbgPrint(DEBUG_DATALINK, ("Called. (packetsize %d)\n",PacketSize)); @@ -490,12 +457,9 @@ TI_DbgPrint(DEBUG_DATALINK, ("Adapter: %x (MTU %d)\n", Adapter, Adapter->MTU)); - TcpipAcquireSpinLock( &LanWorkLock, &OldIrql ); - NdisStatus = AllocatePacketWithBuffer( &NdisPacket, NULL, PacketSize + HeaderBufferSize ); if( NdisStatus != NDIS_STATUS_SUCCESS ) { - TcpipReleaseSpinLock( &LanWorkLock, OldIrql ); return NDIS_STATUS_NOT_ACCEPTED; } @@ -534,7 +498,6 @@ BytesTransferred = 0; } } - TcpipReleaseSpinLock( &LanWorkLock, OldIrql ); TI_DbgPrint(DEBUG_DATALINK, ("Calling complete\n")); if (NdisStatus != NDIS_STATUS_PENDING) @@ -1369,10 +1332,8 @@ } VOID LANStartup() { - InitializeListHead( &LanWorkList ); InitializeListHead( &LanSendCompleteList ); KeInitializeSpinLock( &LanSendCompleteLock ); - ExInitializeWorkItem( &LanWorkItem, LanReceiveWorker, NULL ); } VOID LANShutdown() { @@ -1380,15 +1341,6 @@ PLAN_WQ_ITEM WorkItem; PLIST_ENTRY ListEntry; - TcpipAcquireSpinLock( &LanWorkLock, &OldIrql ); - while( !IsListEmpty( &LanWorkList ) ) { - ListEntry = RemoveHeadList( &LanWorkList ); - WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); - FreeNdisPacket( WorkItem->Packet ); - ExFreePool( WorkItem ); - } - TcpipReleaseSpinLock( &LanWorkLock, OldIrql ); - KeAcquireSpinLock( &LanSendCompleteLock, &OldIrql ); while( !IsListEmpty( &LanSendCompleteList ) ) { ListEntry = RemoveHeadList( &LanSendCompleteList ); _____ Modified: trunk/reactos/drivers/net/tcpip/include/precomp.h --- trunk/reactos/drivers/net/tcpip/include/precomp.h 2005-12-13 20:16:50 UTC (rev 20148) +++ trunk/reactos/drivers/net/tcpip/include/precomp.h 2005-12-13 20:17:25 UTC (rev 20149) @@ -36,4 +36,4 @@ #include <ports.h> #include <ipifcons.h> #include <ndk/ntndk.h> - +#include <chew/chew.h> _____ Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h --- trunk/reactos/drivers/net/tcpip/include/tcp.h 2005-12-13 20:16:50 UTC (rev 20148) +++ trunk/reactos/drivers/net/tcpip/include/tcp.h 2005-12-13 20:17:25 UTC (rev 20149) @@ -176,4 +176,6 @@ NTSTATUS TCPShutdown( VOID); +VOID TCPRemoveIRP( PCONNECTION_ENDPOINT Connection, PIRP Irp ); + #endif /* __TCP_H */ _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c --- trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-12-13 20:16:50 UTC (rev 20148) +++ trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-12-13 20:17:25 UTC (rev 20149) @@ -135,7 +135,31 @@ TI_DbgPrint(DEBUG_IRP, ("Done Completing IRP\n")); } +typedef struct _DISCONNECT_TYPE { + UINT Type; + PVOID Context; + PIRP Irp; + PFILE_OBJECT FileObject; +} DISCONNECT_TYPE, *PDISCONNECT_TYPE; +VOID DispDoDisconnect( PVOID Data ) { + PDISCONNECT_TYPE DisType = (PDISCONNECT_TYPE)Data; + + TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect\n")); + TCPDisconnect + ( DisType->Context, + DisType->Type, + NULL, + NULL, + DispDataRequestComplete, + DisType->Irp ); + TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect done\n")); + + DispDataRequestComplete(DisType->Irp, STATUS_CANCELLED, 0); + + DispCancelComplete(DisType->FileObject); +} + VOID DDKAPI DispCancelRequest( PDEVICE_OBJECT Device, PIRP Irp) @@ -150,6 +174,8 @@ PTRANSPORT_CONTEXT TranContext; PFILE_OBJECT FileObject; UCHAR MinorFunction; + DISCONNECT_TYPE DisType; + PVOID WorkItem; /*NTSTATUS Status = STATUS_SUCCESS;*/ TI_DbgPrint(DEBUG_IRP, ("Called.\n")); @@ -161,6 +187,8 @@ TI_DbgPrint(DEBUG_IRP, ("IRP at (0x%X) MinorFunction (0x%X) IrpSp (0x%X).\n", Irp, MinorFunction, IrpSp)); + Irp->IoStatus.Status = STATUS_PENDING; + #ifdef DBG if (!Irp->Cancel) TI_DbgPrint(MIN_TRACE, ("Irp->Cancel is FALSE, should be TRUE.\n")); @@ -169,26 +197,22 @@ /* Try canceling the request */ switch(MinorFunction) { case TDI_SEND: - TCPDisconnect - ( TranContext->Handle.ConnectionContext, - TDI_DISCONNECT_RELEASE, - NULL, - NULL, - DispDataRequestComplete, - Irp ); - break; + case TDI_RECEIVE: + DisType.Type = TDI_DISCONNECT_RELEASE | + ((MinorFunction == TDI_RECEIVE) ? TDI_DISCONNECT_ABORT : 0); + DisType.Context = TranContext->Handle.ConnectionContext; + DisType.Irp = Irp; + DisType.FileObject = FileObject; + + TCPRemoveIRP( TranContext->Handle.ConnectionContext, Irp ); - case TDI_RECEIVE: - TCPDisconnect - ( TranContext->Handle.ConnectionContext, - TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE, - NULL, - NULL, - DispDataRequestComplete, - Irp ); + if( !ChewCreate( &WorkItem, sizeof(DISCONNECT_TYPE), + DispDoDisconnect, &DisType ) ) + ASSERT(0); break; case TDI_SEND_DATAGRAM: + Irp->IoStatus.Status = STATUS_CANCELLED; if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_SEND_DATAGRAM, but no address file.\n")); break; @@ -198,6 +222,7 @@ break; case TDI_RECEIVE_DATAGRAM: + Irp->IoStatus.Status = STATUS_CANCELLED; if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_RECEIVE_DATAGRAM, but no address file.\n")); break; @@ -211,10 +236,11 @@ break; } + if( Irp->IoStatus.Status == STATUS_PENDING ) + IoMarkIrpPending(Irp); + IoReleaseCancelSpinLock(Irp->CancelIrql); - DispCancelComplete(FileObject); - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c --- trunk/reactos/drivers/net/tcpip/tcpip/main.c 2005-12-13 20:16:50 UTC (rev 20148) +++ trunk/reactos/drivers/net/tcpip/tcpip/main.c 2005-12-13 20:17:25 UTC (rev 20149) @@ -619,6 +619,8 @@ } TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); #endif + ChewShutdown(); + /* Cancel timer */ KeCancelTimer(&IPTimer); @@ -734,6 +736,8 @@ return Status; } + ChewInit( IPDeviceObject ); + /* Create RawIP device object */ Status = IoCreateDevice(DriverObject, 0, &strRawDeviceName, FILE_DEVICE_NETWORK, 0, FALSE, &RawIPDeviceObject); _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip.xml --- trunk/reactos/drivers/net/tcpip/tcpip.xml 2005-12-13 20:16:50 UTC (rev 20148) +++ trunk/reactos/drivers/net/tcpip/tcpip.xml 2005-12-13 20:17:25 UTC (rev 20149) @@ -9,6 +9,7 @@ <library>oskittcp</library> <library>ndis</library> <library>pseh</library> + <library>chew</library> <library>ntoskrnl</library> <library>hal</library> <directory name="include">

18 years, 9 months

[frik85] 20148: RosCMS update:

by frik85＠svn.reactos.com

RosCMS update: * website status page: fixed translation date Modified: trunk/web/reactos.org/htdocs/roscms/inc/website_status.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/website_status.php --- trunk/web/reactos.org/htdocs/roscms/inc/website_status.php 2005-12-13 19:07:08 UTC (rev 20147) +++ trunk/web/reactos.org/htdocs/roscms/inc/website_status.php 2005-12-13 20:16:50 UTC (rev 20148) @@ -255,18 +255,27 @@ $query_count_lang_item=mysql_query("SELECT COUNT('content_id') FROM `content` - WHERE `content_name` = '".$result_page['content_name']."' + WHERE `content_name` LIKE '".$result_page['content_name']."' AND `content_lang` = '". $result_lang_name["lang_id"] ."' AND `content_active` = 1 AND `content_visible` = 1 AND `content_type` = 'default' ;"); $result_count_lang_item = mysql_fetch_row($query_count_lang_item); + if ($result_count_lang_item[0] != "0" && $result_count_lang_item[0] != "") { + $query_lang_item2=mysql_query("SELECT * + FROM `content` + WHERE `content_name` LIKE '".$result_page['content_name']."' + AND `content_lang` = '". $result_lang_name["lang_id"] ."' + AND `content_active` = 1 + AND `content_visible` = 1 ;"); + $result_lang_item2 = mysql_fetch_array($query_lang_item2); + if ($link_current_line == "true") { - echo '<a href="../?page='.$result_page['content_name'].'&lang='.$result_lang_ name['lang_id'].'">'. $result_page['content_date'] .'</a>'; + echo '<a href="../?page='.$result_page['content_name'].'&lang='.$result_lang_ name['lang_id'].'">'. $result_lang_item2['content_date'] .'</a>'; } else { - echo $result_page['content_date']; + echo $result_lang_item2['content_date']; } } ?></font></div></td>

18 years, 9 months

[navaraf] 20147: Unify the icon and cursor loading code for LoadImage.

by navaraf＠svn.reactos.com

Unify the icon and cursor loading code for LoadImage. Modified: trunk/reactos/lib/user32/windows/bitmap.c _____ Modified: trunk/reactos/lib/user32/windows/bitmap.c --- trunk/reactos/lib/user32/windows/bitmap.c 2005-12-13 18:56:49 UTC (rev 20146) +++ trunk/reactos/lib/user32/windows/bitmap.c 2005-12-13 19:07:08 UTC (rev 20147) @@ -72,7 +72,13 @@ static HANDLE -LoadCursorImage(HINSTANCE hinst, LPCWSTR lpszName, UINT fuLoad) +LoadCursorIconImage( + HINSTANCE hinst, + LPCWSTR lpszName, + INT width, + INT height, + UINT fuLoad, + ULONG uType) { HANDLE hResource; HANDLE h2Resource; @@ -84,27 +90,28 @@ HICON hIcon; ULONG HeaderSize; ULONG ColorCount; + ULONG ColorBits; PVOID Data; CURSORICONDIRENTRY* dirEntry; ICONIMAGE* SafeIconImage; GRPCURSORICONDIR* IconResDir; INT id; ICONIMAGE *ResIcon; - UINT ColorBits; + BOOL Icon = (uType == IMAGE_ICON); if (!(fuLoad & LR_LOADFROMFILE)) { if (hinst == NULL) hinst = User32Instance; - hResource = hfRes = FindResourceW(hinst, lpszName, RT_GROUP_CURSOR); + hResource = hfRes = FindResourceW(hinst, lpszName, + Icon ? RT_GROUP_ICON : RT_GROUP_CURSOR); if (hResource == NULL) return NULL; if (fuLoad & LR_SHARED) { - /* FIXME - pass size! */ - hIcon = NtUserFindExistingCursorIcon(hinst, (HRSRC)hfRes, 0, 0); + hIcon = NtUserFindExistingCursorIcon(hinst, (HRSRC)hfRes, width, height); if (hIcon) return hIcon; } @@ -121,11 +128,13 @@ * Find the best fitting in the IconResDir for this resolution */ - id = LookupIconIdFromDirectoryEx((PBYTE)IconResDir, TRUE, 32, 32, + id = LookupIconIdFromDirectoryEx((PBYTE)IconResDir, Icon, width, height, fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); + + h2Resource = FindResourceW(hinst, MAKEINTRESOURCEW(id), + Icon ? MAKEINTRESOURCEW(RT_ICON) : + MAKEINTRESOURCEW(RT_CURSOR)); - h2Resource = FindResourceW(hinst, MAKEINTRESOURCEW(id), MAKEINTRESOURCEW(RT_CURSOR)); - hResource = LoadResource(hinst, h2Resource); if (hResource == NULL) return NULL; @@ -136,7 +145,7 @@ hIcon = CreateIconFromResourceEx((PBYTE)ResIcon, SizeofResource(hinst, h2Resource), - FALSE, 0x00030000, 32, 32, + Icon, 0x00030000, width, height, fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); if (hIcon && 0 != (fuLoad & LR_SHARED)) { @@ -147,9 +156,17 @@ return hIcon; } + /* + * FIXME: This code is incorrect and is likely to crash in many cases. + * In the file the cursor/icon directory records are stored like + * CURSORICONFILEDIR, but we treat them like CURSORICONDIR. In Wine + * this is solved by creating a fake cursor/icon directory in memory + * and passing that to CURSORICON_FindBestIcon. + */ + if (fuLoad & LR_SHARED) { - DbgPrint("FIXME: need LR_SHARED support for loading cursor images from files\n"); + DbgPrint("FIXME: need LR_SHARED support for loading icon images from files\n"); } hFile = CreateFileW(lpszName, GENERIC_READ, FILE_SHARE_READ, NULL, @@ -174,14 +191,13 @@ return NULL; } - /* - * Get a handle to the screen dc, the icon we create is going to be - * compatable with it. - */ - hScreenDc = CreateICW(NULL, NULL, NULL, NULL); + /* Get a handle to the screen dc, the icon we create is going to be + * compatable with this. */ + hScreenDc = CreateDCW(NULL, NULL, NULL, NULL); if (hScreenDc == NULL) { UnmapViewOfFile(IconDIR); + RtlFreeHeap(GetProcessHeap(), 0, SafeIconImage); return NULL; } @@ -201,9 +217,10 @@ } /* Pick the best size. */ - dirEntry = (CURSORICONDIRENTRY *)CURSORICON_FindBestIcon(IconDIR, 32, 32, ColorBits); + dirEntry = (CURSORICONDIRENTRY *)CURSORICON_FindBestIcon(IconDIR, width, height, ColorBits); if (!dirEntry) { + DeleteDC(hScreenDc); UnmapViewOfFile(IconDIR); return NULL; } @@ -211,165 +228,11 @@ SafeIconImage = RtlAllocateHeap(GetProcessHeap(), 0, dirEntry->dwBytesInRes); if (SafeIconImage == NULL) { + DeleteDC(hScreenDc); UnmapViewOfFile(IconDIR); return NULL; } - memcpy(SafeIconImage, ((PBYTE)IconDIR) + dirEntry->dwImageOffset, dirEntry->dwBytesInRes); - UnmapViewOfFile(IconDIR); - /* At this point we have a copy of the icon image to play with. */ - - SafeIconImage->icHeader.biHeight = SafeIconImage->icHeader.biHeight /2; - - if (SafeIconImage->icHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - BITMAPCOREHEADER* Core = (BITMAPCOREHEADER*)SafeIconImage; - ColorCount = (Core->bcBitCount <= 8) ? (1 << Core->bcBitCount) : 0; - HeaderSize = sizeof(BITMAPCOREHEADER) + ColorCount * sizeof(RGBTRIPLE); - } - else - { - ColorCount = SafeIconImage->icHeader.biClrUsed; - if (ColorCount == 0 && SafeIconImage->icHeader.biBitCount <= 8) - ColorCount = 1 << SafeIconImage->icHeader.biBitCount; - HeaderSize = sizeof(BITMAPINFOHEADER) + ColorCount * sizeof(RGBQUAD); - } - - /* Make data point to the start of the XOR image data. */ - Data = (PBYTE)SafeIconImage + HeaderSize; - - hIcon = ICON_CreateCursorFromData(hScreenDc, Data, SafeIconImage, 32, 32, dirEntry->Info.cursor.wXHotspot, dirEntry->Info.cursor.wYHotspot); - DeleteDC(hScreenDc); - RtlFreeHeap(GetProcessHeap(), 0, SafeIconImage); - - return hIcon; -} - - -static HANDLE -LoadIconImage(HINSTANCE hinst, LPCWSTR lpszName, INT width, INT height, UINT fuLoad) -{ - HANDLE hResource; - HANDLE h2Resource; - HANDLE hfRes; - HANDLE hFile; - HANDLE hSection; - CURSORICONDIR *IconDIR; - HDC hScreenDc; - HICON hIcon; - ULONG HeaderSize; - ULONG ColorCount; - PVOID Data; - CURSORICONDIRENTRY* dirEntry; - ICONIMAGE* SafeIconImage; - GRPCURSORICONDIR* IconResDir; - INT id; - ICONIMAGE *ResIcon; - - if (!(fuLoad & LR_LOADFROMFILE)) - { - if (hinst == NULL) - hinst = User32Instance; - - hResource = hfRes = FindResourceW(hinst, lpszName, RT_GROUP_ICON); - if (hResource == NULL) - return NULL; - - if (fuLoad & LR_SHARED) - { - hIcon = NtUserFindExistingCursorIcon(hinst, (HRSRC)hfRes, width, height); - if (hIcon) - return hIcon; - } - - hResource = LoadResource(hinst, hResource); - if (hResource == NULL) - return NULL; - - IconResDir = LockResource(hResource); - if (IconResDir == NULL) - return NULL; - - /* - * Find the best fitting in the IconResDir for this resolution - */ - - id = LookupIconIdFromDirectoryEx((PBYTE)IconResDir, TRUE, width, height, - fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); - - h2Resource = FindResourceW(hinst, MAKEINTRESOURCEW(id), MAKEINTRESOURCEW(RT_ICON)); - - hResource = LoadResource(hinst, h2Resource); - if (hResource == NULL) - return NULL; - - ResIcon = LockResource(hResource); - if (ResIcon == NULL) - return NULL; - - hIcon = CreateIconFromResourceEx((PBYTE)ResIcon, - SizeofResource(hinst, h2Resource), - TRUE, 0x00030000, width, height, - fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); - if (hIcon && 0 != (fuLoad & LR_SHARED)) - { - NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, (HRSRC)hfRes, - (HRSRC)NULL); - } - - return hIcon; - } - - /* - * FIXME: This code is incorrect and is likely to crash in many cases. - * In the file the cursor/icon directory records are stored like - * CURSORICONFILEDIR, but we treat them like CURSORICONDIR. In Wine - * this is solved by creating a fake cursor/icon directory in memory - * and passing that to CURSORICON_FindBestIcon. - */ - - if (fuLoad & LR_SHARED) - { - DbgPrint("FIXME: need LR_SHARED support for loading icon images from files\n"); - } - - hFile = CreateFileW(lpszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, 0, NULL); - if (hFile == NULL) - return NULL; - - hSection = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); - CloseHandle(hFile); - if (hSection == NULL) - return NULL; - - IconDIR = MapViewOfFile(hSection, FILE_MAP_READ, 0, 0, 0); - CloseHandle(hSection); - if (IconDIR == NULL) - return NULL; - - if (0 != IconDIR->idReserved || - (IMAGE_ICON != IconDIR->idType && IMAGE_CURSOR != IconDIR->idType)) - { - UnmapViewOfFile(IconDIR); - return NULL; - } - - /* Pick the best size. */ - dirEntry = (CURSORICONDIRENTRY *)CURSORICON_FindBestIcon(IconDIR, width, height, 1); - if (!dirEntry) - { - UnmapViewOfFile(IconDIR); - return NULL; - } - - SafeIconImage = RtlAllocateHeap(GetProcessHeap(), 0, dirEntry->dwBytesInRes); - if (SafeIconImage == NULL) - { - UnmapViewOfFile(IconDIR); - return NULL; - } - memcpy(SafeIconImage, ((PBYTE)IconDIR) + dirEntry->dwImageOffset, dirEntry->dwBytesInRes); UnmapViewOfFile(IconDIR); @@ -394,16 +257,6 @@ /* Make data point to the start of the XOR image data. */ Data = (PBYTE)SafeIconImage + HeaderSize; - /* Get a handle to the screen dc, the icon we create is going to be - * compatable with this. */ - hScreenDc = CreateICW(NULL, NULL, NULL, NULL); - if (hScreenDc == NULL) - { - if (fuLoad & LR_LOADFROMFILE) - RtlFreeHeap(GetProcessHeap(), 0, SafeIconImage); - return NULL; - } - hIcon = ICON_CreateIconFromData(hScreenDc, Data, SafeIconImage, width, height, width/2, height/2); RtlFreeHeap(GetProcessHeap(), 0, SafeIconImage); DeleteDC(hScreenDc); @@ -552,9 +405,9 @@ case IMAGE_BITMAP: return LoadBitmapImage(hinst, lpszName, fuLoad); case IMAGE_CURSOR: - return LoadCursorImage(hinst, lpszName, fuLoad); case IMAGE_ICON: - return LoadIconImage(hinst, lpszName, cxDesired, cyDesired, fuLoad); + return LoadCursorIconImage(hinst, lpszName, cxDesired, cyDesired, + fuLoad, uType); default: break; }

18 years, 9 months

← Newer
1
...
32
33
34
35
36
37
38
...
71
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 December 2005