Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 53039: [IP] - Correct the error number comments for lwIP 1.4.0 - Translate ERR_WOULDBLOCK - Translate ERR_IF and ERR_CONN to a more accurate status [LWIP] - Remove another debug print
by cgutman＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: cgutman Date: Tue Aug 2 23:46:32 2011 New Revision: 53039 URL: http://svn.reactos.org/svn/reactos?rev=53039&view=rev Log: [IP] - Correct the error number comments for lwIP 1.4.0 - Translate ERR_WOULDBLOCK - Translate ERR_IF and ERR_CONN to a more accurate status [LWIP] - Remove another debug print Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Tue Aug 2 23:46:32 2011 @@ -200,16 +200,17 @@ case ERR_BUF: Status = STATUS_BUFFER_TOO_SMALL; break; //-2 case ERR_TIMEOUT: Status = STATUS_TIMEOUT; break; // -3 case ERR_RTE: Status = STATUS_NETWORK_UNREACHABLE; break; //-4 - case ERR_ABRT: Status = STATUS_LOCAL_DISCONNECT; break; //-5 - case ERR_RST: Status = STATUS_REMOTE_DISCONNECT; break; //-6 - case ERR_CLSD: Status = STATUS_FILE_CLOSED; break; //-7 - case ERR_CONN: Status = STATUS_UNSUCCESSFUL; break; //-8 (FIXME) - case ERR_VAL: Status = STATUS_INVALID_PARAMETER; break; //-9 - case ERR_ARG: Status = STATUS_INVALID_PARAMETER; break; //-10 - case ERR_USE: Status = STATUS_ADDRESS_ALREADY_EXISTS; break; //-11 - case ERR_IF: Status = STATUS_NETWORK_UNREACHABLE; break; //-12 - case ERR_ISCONN: Status = STATUS_UNSUCCESSFUL; break; //-13 (FIXME) - case ERR_INPROGRESS: Status = STATUS_PENDING; return Status; //-14 + case ERR_INPROGRESS: Status = STATUS_PENDING; return Status; //-5 + case ERR_VAL: Status = STATUS_INVALID_PARAMETER; break; //-6 + case ERR_WOULDBLOCK: Status = STATUS_CANT_WAIT; break; //-7 + case ERR_USE: Status = STATUS_ADDRESS_ALREADY_EXISTS; break; //-8 + case ERR_ISCONN: Status = STATUS_UNSUCCESSFUL; break; //-9 (FIXME) + case ERR_ABRT: Status = STATUS_LOCAL_DISCONNECT; break; //-10 + case ERR_RST: Status = STATUS_REMOTE_DISCONNECT; break; //-11 + case ERR_CLSD: Status = STATUS_FILE_CLOSED; break; //-12 + case ERR_CONN: Status = STATUS_INVALID_CONNECTION; break; //-13 + case ERR_ARG: Status = STATUS_INVALID_PARAMETER; break; //-14 + case ERR_IF: Status = STATUS_UNEXPECTED_NETWORK_ERROR; break; //-15 default: DbgPrint("Invalid error value: %d\n", err); ASSERT(FALSE); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Tue Aug 2 23:46:32 2011 @@ -236,9 +236,6 @@ void InternalErrorEventHandler(void *arg, const err_t err) { - DbgPrint("[lwIP, InternalErrorEventHandler] ErrorEvent(0x%x, %d)\n", - arg, (unsigned int)err); - /* Make sure the socket didn't get closed */ if (!arg) return;

1 0

[osiejka] 53038: [CSRSRV] - don't hack the dll entry point name. Patch by Thomas Faber
by osiejka＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: osiejka Date: Tue Aug 2 22:54:30 2011 New Revision: 53038 URL: http://svn.reactos.org/svn/reactos?rev=53038&view=rev Log: [CSRSRV] - don't hack the dll entry point name. Patch by Thomas Faber Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild trunk/reactos/subsystems/win32/csrss/csrsrv/init.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt [iso-8859-1] Tue Aug 2 22:54:30 2011 @@ -19,11 +19,6 @@ set_module_type(csrsrv nativedll) -if(MSVC) -set_entrypoint(csrsrv DllMainCRTStartup) -endif() - - add_importlibs(csrsrv ntdll smdll) add_pch(csrsrv srv.h) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild [iso-8859-1] Tue Aug 2 22:54:30 2011 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="csrsrv" type="nativedll" installbase="system32" installname="csrsrv.dll"> +<module name="csrsrv" type="nativedll" entrypoint="DllMain@12" installbase="system32" installname="csrsrv.dll"> <importlibrary definition="csrsrv.spec" /> <include base="csrsrv">.</include> <include base="csrss">.</include> Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Tue Aug 2 22:54:30 2011 @@ -778,9 +778,9 @@ BOOL NTAPI -DllMainCRTStartup(HANDLE hDll, - DWORD dwReason, - LPVOID lpReserved) +DllMain(HANDLE hDll, + DWORD dwReason, + LPVOID lpReserved) { /* We don't do much */ UNREFERENCED_PARAMETER(hDll);

1 0

[cgutman] 53037: [NETSHELL] - Fix icon handle leaks in the network status taskbar icon
by cgutman＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: cgutman Date: Tue Aug 2 22:18:57 2011 New Revision: 53037 URL: http://svn.reactos.org/svn/reactos?rev=53037&view=rev Log: [NETSHELL] - Fix icon handle leaks in the network status taskbar icon Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Tue Aug 2 22:18:57 2011 @@ -251,6 +251,9 @@ } Shell_NotifyIconW(NIM_MODIFY, &nid); + + if (nid.uFlags & NIF_ICON) + DestroyIcon(nid.hIcon); pContext->dwInOctets = IfEntry.dwInOctets; pContext->dwOutOctets = IfEntry.dwOutOctets; @@ -1002,7 +1005,7 @@ ZeroMemory(&nid, sizeof(nid)); nid.cbSize = sizeof(nid); nid.uID = Index++; - nid.uFlags = NIF_ICON | NIF_MESSAGE; + nid.uFlags = NIF_MESSAGE; nid.u.uVersion = 3; nid.uCallbackMessage = WM_SHOWSTATUSDLG; nid.hWnd = hwndDlg; @@ -1022,6 +1025,8 @@ else if (pProps->Status == NCS_CONNECTED) nid.hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE)); + if (nid.hIcon) + nid.uFlags |= NIF_ICON; wcscpy(nid.szTip, pProps->pszwName); nid.uFlags |= NIF_TIP; @@ -1043,6 +1048,9 @@ { CoTaskMemFree(pItem); } + + if (nid.uFlags & NIF_ICON) + DestroyIcon(nid.hIcon); } } }while(hr == S_OK);

1 0

[ekohl] 53036: [SERVICES] - If a service will be started and another service is already running in the same image, send a start command instead of starting the process again. This enables us to run...
by ekohl＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: ekohl Date: Tue Aug 2 20:37:48 2011 New Revision: 53036 URL: http://svn.reactos.org/svn/reactos?rev=53036&view=rev Log: [SERVICES] - If a service will be started and another service is already running in the same image, send a start command instead of starting the process again. This enables us to run multiple services within a single process, like svchost.exe. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Tue Aug 2 20:37:48 2011 @@ -217,6 +217,8 @@ /* Increment the run counter */ pServiceImage->dwImageRunCount++; } + + DPRINT("pServiceImage->dwImageRunCount: %lu\n", pServiceImage->dwImageRunCount); /* Link the service image to the service */ pService->lpImage = pServiceImage; @@ -1080,6 +1082,13 @@ DWORD dwProcessId; DPRINT("ScmStartUserModeService(%p)\n", Service); + + /* If the image is already running ... */ + if (Service->lpImage->dwImageRunCount > 1) + { + /* ... just send a start command */ + return ScmSendStartCommand(Service, argc, argv); + } StartupInfo.cb = sizeof(StartupInfo); StartupInfo.lpReserved = NULL;

1 0

[cmihail] 53035: [lwIP] - Remove debug prints
by cmihail＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: cmihail Date: Tue Aug 2 20:03:57 2011 New Revision: 53035 URL: http://svn.reactos.org/svn/reactos?rev=53035&view=rev Log: [lwIP] - Remove debug prints Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c [iso-8859-1] Tue Aug 2 20:03:57 2011 @@ -324,9 +324,6 @@ tcp_err_fn errf; #endif /* LWIP_CALLBACK_API */ void *errf_arg; - - DbgPrint("tcp_abandon: called on pcb = 0x%x\n", pcb); - DbgPrint("tcp_abandon: pcb->state = %s\n", tcp_state_str[pcb->state]); /* pcb->state LISTEN not allowed here */ LWIP_ASSERT("don't call tcp_abort/tcp_abandon for listen-pcbs", @@ -920,7 +917,6 @@ tcp_active_pcbs = pcb->next; } - DbgPrint("tcp_slowtmr: removing pcb 0x%x\n", pcb); TCP_EVENT_ERR(pcb->errf, pcb->callback_arg, ERR_ABRT); if (pcb_reset) { tcp_rst(pcb->snd_nxt, pcb->rcv_nxt, &pcb->local_ip, &pcb->remote_ip, @@ -1434,7 +1430,6 @@ void tcp_pcb_remove(struct tcp_pcb **pcblist, struct tcp_pcb *pcb) { - DbgPrint("tcp_pcb_remove: Removing pcb = 0x%x\n", pcb); TCP_RMV(pcblist, pcb); tcp_pcb_purge(pcb); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c [iso-8859-1] Tue Aug 2 20:03:57 2011 @@ -339,14 +339,12 @@ end. We then call the error callback to inform the application that the connection is dead before we deallocate the PCB. */ - DbgPrint("tcp_input: removing pcb = 0x%x in state %s with TF_RESET\n", pcb, tcp_state_str[pcb->state]); TCP_EVENT_ERR(pcb->errf, pcb->callback_arg, ERR_RST); tcp_pcb_remove(&tcp_active_pcbs, pcb); memp_free(MEMP_TCP_PCB, pcb); } else if (recv_flags & TF_CLOSED) { /* The connection has been closed and we will deallocate the PCB. */ - DbgPrint("tcp_input: removing pcb = 0x%x with TF_CLOSED\n", pcb); tcp_pcb_remove(&tcp_active_pcbs, pcb); memp_free(MEMP_TCP_PCB, pcb); } else { @@ -438,7 +436,6 @@ pbuf_free(p); } - DbgPrint("tcp_input: done\n"); LWIP_ASSERT("tcp_input: tcp_pcbs_sane()", tcp_pcbs_sane()); PERF_STOP("tcp_input"); }

1 0

[cgutman] 53034: [TCPIP] - Remove some more debugging [IP] - Only print a message if the operation failed
by cgutman＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: cgutman Date: Tue Aug 2 19:52:25 2011 New Revision: 53034 URL: http://svn.reactos.org/svn/reactos?rev=53034&view=rev Log: [TCPIP] - Remove some more debugging [IP] - Only print a message if the operation failed Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Tue Aug 2 19:52:25 2011 @@ -282,8 +282,6 @@ TDI_REQUEST Request; NTSTATUS Status; - DbgPrint("[TCPIP, TiCloseFileObject] Called\n"); - IrpSp = IoGetCurrentIrpStackLocation(Irp); Context = IrpSp->FileObject->FsContext; if (!Context) @@ -295,7 +293,6 @@ switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { case TDI_TRANSPORT_ADDRESS_FILE: - DbgPrint("[TCPIP, TiCloseFileObject] Closing address file\n"); Request.Handle.AddressHandle = Context->Handle.AddressHandle; Status = FileCloseAddress(&Request); break; @@ -311,14 +308,11 @@ break; default: - DbgPrint("Unknown type %d\n", (ULONG_PTR)IrpSp->FileObject->FsContext2); Status = STATUS_INVALID_PARAMETER; break; } Irp->IoStatus.Status = Status; - - DbgPrint("[TCPIP, TiCloseFileObject] Leaving. Status = 0x%x\n", Status); return Irp->IoStatus.Status; } Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Tue Aug 2 19:52:25 2011 @@ -195,7 +195,7 @@ switch (err) { - case ERR_OK: Status = STATUS_SUCCESS; break; //0 + case ERR_OK: Status = STATUS_SUCCESS; return Status; //0 case ERR_MEM: Status = STATUS_INSUFFICIENT_RESOURCES; break; //-1 case ERR_BUF: Status = STATUS_BUFFER_TOO_SMALL; break; //-2 case ERR_TIMEOUT: Status = STATUS_TIMEOUT; break; // -3 @@ -209,7 +209,7 @@ case ERR_USE: Status = STATUS_ADDRESS_ALREADY_EXISTS; break; //-11 case ERR_IF: Status = STATUS_NETWORK_UNREACHABLE; break; //-12 case ERR_ISCONN: Status = STATUS_UNSUCCESSFUL; break; //-13 (FIXME) - case ERR_INPROGRESS: Status = STATUS_PENDING; break; //-14 + case ERR_INPROGRESS: Status = STATUS_PENDING; return Status; //-14 default: DbgPrint("Invalid error value: %d\n", err); ASSERT(FALSE); @@ -217,8 +217,8 @@ break; } - DbgPrint("TCPTranslateError: %d -> %x\n", (unsigned int)err, Status); - + DbgPrint("TCP operation failed: 0x%x (%d)\n", Status, err); + return Status; }

1 0

[cmihail] 53033: [TCPIP] - Remove debug prints - Modify error code translations [lwIP] - Fix race conditions caused by checking the SocketContexts of connections from outside the lwIP main thread c...
by cmihail＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: cmihail Date: Tue Aug 2 19:20:40 2011 New Revision: 53033 URL: http://svn.reactos.org/svn/reactos?rev=53033&view=rev Log: [TCPIP] - Remove debug prints - Modify error code translations [lwIP] - Fix race conditions caused by checking the SocketContexts of connections from outside the lwIP main thread context - Don't explicitly remove callbacks from pcbs (no reason to do apperently) - Use pbuf_free_callback (which can be safely called from outside the lwIP main thread context) instead of pbuf_free Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/if.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rosmem.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/sys_arch.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Tue Aug 2 19:20:40 2011 @@ -20,8 +20,6 @@ PTDI_CONNECTION_INFORMATION WhoIsConnecting; PTA_IP_ADDRESS RemoteAddress; struct ip_addr ipaddr; - - DbgPrint("[IP, TCPCheckPeerForAccept] Called\n"); if (Request->RequestFlags & TDI_QUERY_ACCEPT) DbgPrint("TDI_QUERY_ACCEPT NOT SUPPORTED!!!\n"); @@ -39,8 +37,6 @@ RemoteAddress->Address[0].Address[0].in_addr = ipaddr.addr; - DbgPrint("[IP, TCPCheckPeerForAccept] Leaving. Status %x\n", Status); - return Status; } @@ -60,7 +56,6 @@ ASSERT_KM_POINTER(Connection->AddressFile); TI_DbgPrint(DEBUG_TCP,("[IP, TCPListen] Called\n")); - DbgPrint("[IP, TCPListen] Called\n"); TI_DbgPrint(DEBUG_TCP, ("Connection->SocketContext %x\n", Connection->SocketContext)); @@ -99,7 +94,6 @@ UnlockObject(Connection, OldIrql); TI_DbgPrint(DEBUG_TCP,("[IP, TCPListen] Leaving. Status = %x\n", Status)); - DbgPrint("[IP, TCPListen] Leaving. Status = %x\n", Status); return Status; } @@ -112,8 +106,6 @@ PTDI_BUCKET Bucket; KIRQL OldIrql; BOOLEAN Found = FALSE; - - DbgPrint("[IP, TCPAbortListenForSocket] Called\n"); LockObject(Listener, &OldIrql); @@ -136,9 +128,6 @@ UnlockObject(Listener, OldIrql); - DbgPrint("[IP, TCPAbortListenForSocket] Leaving. Status = %s\n", - Found == TRUE ? "TRUE" : "FALSE"); - return Found; } @@ -151,8 +140,6 @@ NTSTATUS Status; PTDI_BUCKET Bucket; KIRQL OldIrql; - - DbgPrint("[IP, TCPAccept] Called\n"); LockObject(Listener, &OldIrql); @@ -175,6 +162,5 @@ UnlockObject(Listener, OldIrql); - DbgPrint("[IP, TCPAccept] Leaving. Status = %x\n", Status); return Status; } Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Tue Aug 2 19:20:40 2011 @@ -69,9 +69,7 @@ PLIST_ENTRY Entry; ReferenceObject(Connection); - - DbgPrint("[IP, FlushAllQueues] Flushing recv/all with status: 0x%x for Connection = 0x%x\n", Status, Connection); - + while ((Entry = ExInterlockedRemoveHeadList(&Connection->ReceiveRequest, &Connection->Lock))) { Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); @@ -91,7 +89,6 @@ // if (Status == STATUS_SUCCESS) { - DbgPrint("[IP, FlushAllQueues] Flushed recv only after graceful closure\n"); DereferenceObject(Connection); return; } @@ -102,8 +99,6 @@ Bucket->Status = Status; Bucket->Information = 0; - - DbgPrint("[IP, FlushAllQueues] Completing Listen request for Connection = 0x%x\n", Bucket->AssociatedEndpoint); DereferenceObject(Bucket->AssociatedEndpoint); CompleteBucket(Connection, Bucket, FALSE); @@ -129,15 +124,11 @@ Bucket->Status = Status; Bucket->Information = 0; - - DbgPrint("[IP, FlushAllQueues] Completing Connection request for Connection = 0x%x\n", Bucket->AssociatedEndpoint); - - CompleteBucket(Connection, Bucket, FALSE); - } - - DereferenceObject(Connection); - - DbgPrint("[IP, FlushAllQueues] Leaving\n"); + + CompleteBucket(Connection, Bucket, FALSE); + } + + DereferenceObject(Connection); } VOID @@ -145,21 +136,15 @@ { PCONNECTION_ENDPOINT Connection = (PCONNECTION_ENDPOINT)arg; const NTSTATUS status = TCPTranslateError(err); - - DbgPrint("[IP, TCPFinEventHandler] Called for Connection( 0x%x )-> SocketContext = pcb (0x%x)\n", Connection, Connection->SocketContext); /* Only clear the pointer if the shutdown was caused by an error */ if (err != ERR_OK) { - /* We're already closed by the error so we don't want to call lwip_close */ - DbgPrint("[IP, TCPFinEventHandler] MAKING Connection( 0x%x )-> SocketContext = pcb (0x%x) NULL\n", Connection, Connection->SocketContext); - + /* We're got closed by the error so remove the PCB pointer */ Connection->SocketContext = NULL; } FlushAllQueues(Connection, status); - - DbgPrint("[IP, TCPFinEventHandler] Done\n"); } VOID @@ -171,9 +156,7 @@ PIRP Irp; NTSTATUS Status; KIRQL OldIrql; - - DbgPrint("[IP, TCPAcceptEventHandler] Called\n"); - + ReferenceObject(Connection); while ((Entry = ExInterlockedRemoveHeadList(&Connection->ListenRequest, &Connection->Lock))) @@ -194,16 +177,9 @@ Bucket->Status = Status; Bucket->Information = 0; - - DbgPrint("[IP, TCPAcceptEventHandler] Completing accept event %x\n", Status); - + if (Status == STATUS_SUCCESS) { - DbgPrint("[IP, TCPAcceptEventHandler] newpcb->state = %s, listen_pcb->state = %s, newpcb = 0x%x\n", - tcp_state_str[newpcb->state], - tcp_state_str[((PTCP_PCB)Connection->SocketContext)->state], - newpcb); - LockObject(Bucket->AssociatedEndpoint, &OldIrql); /* sanity assert...this should never be in anything else but a CLOSED state */ @@ -217,13 +193,10 @@ LibTCPAccept(newpcb, (PTCP_PCB)Connection->SocketContext, Bucket->AssociatedEndpoint); - DbgPrint("[IP, TCPAcceptEventHandler] Trying to unlock Bucket->AssociatedEndpoint\n"); UnlockObject(Bucket->AssociatedEndpoint, OldIrql); } DereferenceObject(Bucket->AssociatedEndpoint); - - DbgPrint("[IP, TCPAcceptEventHandler] Done!\n"); CompleteBucket(Connection, Bucket, FALSE); } @@ -241,8 +214,6 @@ NTSTATUS Status; PMDL Mdl; - DbgPrint("[IP, TCPSendEventHandler] Called\n"); - ReferenceObject(Connection); while ((Entry = ExInterlockedRemoveHeadList(&Connection->SendRequest, &Connection->Lock))) @@ -262,8 +233,6 @@ TI_DbgPrint(DEBUG_TCP, ("Writing %d bytes to %x\n", SendLen, SendBuffer)); - DbgPrint("[IP, TCPSendEventHandler] Sending out &d bytes on pcb = 0x%x\n", - Connection->SocketContext); TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); TI_DbgPrint @@ -292,16 +261,12 @@ Bucket->Status = Status; Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? SendLen : 0; - - DbgPrint("Completing send req %x\n", Status); - + CompleteBucket(Connection, Bucket, FALSE); } } DereferenceObject(Connection); - - DbgPrint("[IP, TCPSendEventHandler] Leaving\n"); } u32_t @@ -319,9 +284,7 @@ ASSERT(p); ReferenceObject(Connection); - - DbgPrint("[IP, TCPRecvEventHandler] Called\n"); - + if ((Entry = ExInterlockedRemoveHeadList(&Connection->ReceiveRequest, &Connection->Lock))) { Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); @@ -345,9 +308,6 @@ for (Received = 0; Received < RecvLen; Received += p->len, p = p->next) { - DbgPrint("[IP, TCPRecvEventHandler] 0x%x: Copying %d bytes to 0x%x from 0x%x\n", - p, p->len, ((PUCHAR)RecvBuffer) + Received, p->payload); - RtlCopyMemory(RecvBuffer + Received, p->payload, p->len); } @@ -360,8 +320,6 @@ } DereferenceObject(Connection); - - DbgPrint("[IP, TCPRecvEventHandler] Leaving\n"); return Received; } @@ -372,9 +330,7 @@ PCONNECTION_ENDPOINT Connection = (PCONNECTION_ENDPOINT)arg; PTDI_BUCKET Bucket; PLIST_ENTRY Entry; - - DbgPrint("[IP, TCPConnectEventHandler] Called\n"); - + ReferenceObject(Connection); while ((Entry = ExInterlockedRemoveHeadList(&Connection->ConnectRequest, &Connection->Lock))) @@ -384,13 +340,9 @@ Bucket->Status = TCPTranslateError(err); Bucket->Information = 0; - - DbgPrint("[IP, TCPConnectEventHandler] Completing connection request! (0x%x)\n", err); - - CompleteBucket(Connection, Bucket, FALSE); - } - - DbgPrint("[IP, TCPConnectEventHandler] Done\n"); - - DereferenceObject(Connection); -} + + CompleteBucket(Connection, Bucket, FALSE); + } + + DereferenceObject(Connection); +} Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Tue Aug 2 19:20:40 2011 @@ -25,8 +25,6 @@ /* The caller frees the pbuf struct */ - DbgPrint("[IP, TCPSendDataCallback] Sending data out on %c%c\n", netif->name[0], netif->name[1]); - if (((*(u8_t*)p->payload) & 0xF0) == 0x40) { Header = p->payload; @@ -39,21 +37,18 @@ } else { - DbgPrint("[IP, TCPSendDataCallback] FAIL EINVAL 1\n"); - return EINVAL; + return ERR_IF; } if (!(NCE = RouteGetRouteToDestination(&RemoteAddress))) { - DbgPrint("[IP, TCPSendDataCallback] FAIL EINVAL 2\n"); - return EINVAL; + return ERR_RTE; } NdisStatus = AllocatePacketWithBuffer(&Packet.NdisPacket, NULL, p->tot_len); if (NdisStatus != NDIS_STATUS_SUCCESS) { - DbgPrint("[IP, TCPSendDataCallback] FAIL ENOBUFS\n"); - return ENOBUFS; + return ERR_MEM; } GetDataPtr(Packet.NdisPacket, 0, (PCHAR*)&Packet.Header, &Packet.ContigSize); @@ -71,9 +66,8 @@ if (!NT_SUCCESS(IPSendDatagram(&Packet, NCE, TCPPacketSendComplete, NULL))) { - DbgPrint("[IP, TCPSendDataCallback] FAIL EINVAL 3\n"); FreeNdisPacket(Packet.NdisPacket); - return EINVAL; + return ERR_IF; } return 0; Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Tue Aug 2 19:20:40 2011 @@ -29,8 +29,6 @@ KIRQL OldIrql; TI_DbgPrint(DEBUG_TCP, ("Freeing TCP Endpoint\n")); - - DbgPrint("CONNECTION ENDPOINT: Freeing 0x%x\n", Object); TcpipAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql); RemoveEntryList(&Connection->ListEntry); @@ -85,9 +83,6 @@ TI_DbgPrint(DEBUG_TCP,("[IP, TCPSocket] Called: Connection %x, Family %d, Type %d, " "Proto %d, sizeof(CONNECTION_ENDPOINT) = %d\n", Connection, Family, Type, Proto, sizeof(CONNECTION_ENDPOINT))); - DbgPrint("[IP, TCPSocket] Called: Connection 0x%x, Family %d, Type %d, " - "Proto %d, sizeof(CONNECTION_ENDPOINT) = %d\n", - Connection, Family, Type, Proto, sizeof(CONNECTION_ENDPOINT)); Connection->SocketContext = LibTCPSocket(Connection); if (Connection->SocketContext) @@ -95,12 +90,9 @@ else Status = STATUS_INSUFFICIENT_RESOURCES; - DbgPrint("[IP, TCPSocket] Connection->SocketContext = 0x%x\n", Connection->SocketContext); - UnlockObject(Connection, OldIrql); TI_DbgPrint(DEBUG_TCP,("[IP, TCPSocket] Leaving. Status = 0x%x\n", Status)); - DbgPrint("[IP, TCPSocket] Leaving. Status = 0x%x\n", Status); return Status; } @@ -111,8 +103,6 @@ PVOID Socket; LockObject(Connection, &OldIrql); - - DbgPrint("[IP, TCPClose] Called for Connection( 0x%x )->SocketConext( 0x%x )\n", Connection, Connection->SocketContext); Socket = Connection->SocketContext; @@ -124,12 +114,8 @@ { FlushAllQueues(Connection, STATUS_CANCELLED); - DbgPrint("[IP, TCPClose] Socket (pcb) = 0x%x\n", Socket); - LibTCPClose(Connection, FALSE); } - - DbgPrint("[IP, TCPClose] Leaving\n"); UnlockObject(Connection, OldIrql); @@ -147,15 +133,11 @@ * This is the low level interface for receiving TCP data */ { - DbgPrint("[IP, TCPReceive] Called. Got packet from network stack\n"); - TI_DbgPrint(DEBUG_TCP,("Sending packet %d (%d) to lwIP\n", IPPacket->TotalSize, IPPacket->HeaderSize)); LibIPInsertPacket(Interface->TCPContext, IPPacket->Header, IPPacket->TotalSize); - - DbgPrint("[IP, TCPReceive] Leaving\n"); } NTSTATUS TCPStartup(VOID) @@ -217,7 +199,7 @@ case ERR_MEM: Status = STATUS_INSUFFICIENT_RESOURCES; break; //-1 case ERR_BUF: Status = STATUS_BUFFER_TOO_SMALL; break; //-2 case ERR_TIMEOUT: Status = STATUS_TIMEOUT; break; // -3 - case ERR_RTE: Status = STATUS_HOST_UNREACHABLE; break; //-4 + case ERR_RTE: Status = STATUS_NETWORK_UNREACHABLE; break; //-4 case ERR_ABRT: Status = STATUS_LOCAL_DISCONNECT; break; //-5 case ERR_RST: Status = STATUS_REMOTE_DISCONNECT; break; //-6 case ERR_CLSD: Status = STATUS_FILE_CLOSED; break; //-7 @@ -302,8 +284,6 @@ &bindaddr, Connection->AddressFile->Port)); - DbgPrint("LibTCPBind: 0x%x\n", Status); - if (NT_SUCCESS(Status)) { /* Check if we had an unspecified port */ @@ -340,8 +320,6 @@ Status = TCPTranslateError(LibTCPConnect(Connection, &connaddr, RemotePort)); - - DbgPrint("LibTCPConnect: 0x%x\n", Status); } } @@ -382,11 +360,8 @@ else { /* We already got closed by the other side so just return success */ - DbgPrint("[IP, TCPDisconnect] Socket was alraedy clsoed on the other side\n"); Status = STATUS_SUCCESS; } - - DbgPrint("LibTCPShutdown: %x\n", Status); UnlockObject(Connection, OldIrql); @@ -413,9 +388,6 @@ TI_DbgPrint(DEBUG_TCP,("[IP, TCPReceiveData] Called for %d bytes (on socket %x)\n", ReceiveLength, Connection->SocketContext)); - DbgPrint("[IP, TCPReceiveData] Called for %d bytes (on Connection->SocketContext = 0x%x)\n", - ReceiveLength, Connection->SocketContext); - NdisQueryBuffer(Buffer, &DataBuffer, &DataLen); Status = LibTCPGetDataFromConnectionQueue(Connection, DataBuffer, DataLen, &Received); @@ -450,9 +422,6 @@ { (*BytesReceived) = Received; } - - DbgPrint("[IP, TCPReceiveData] Leaving. Status = %s\n", - Status == STATUS_PENDING? "STATUS_PENDING" : "STATUS_SUCCESS"); return Status; } @@ -478,15 +447,12 @@ TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Connection = %x\n", Connection)); TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Connection->SocketContext = %x\n", Connection->SocketContext)); - DbgPrint("[IP, TCPSendData] Called\n"); Status = TCPTranslateError(LibTCPSend(Connection, BufferData, SendLength, FALSE)); - DbgPrint("[IP, TCPSendData] LibTCPSend: 0x%x\n", Status); - TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Send: %x, %d\n", Status, SendLength)); /* Keep this request around ... there was no data yet */ @@ -519,8 +485,6 @@ TI_DbgPrint(DEBUG_TCP, ("[IP, TCPSendData] Leaving. Status = %x\n", Status)); - DbgPrint("[IP, TCPSendData] Leaving. Status = %x\n", Status); - return Status; } @@ -577,8 +541,6 @@ UnlockObject(Connection, OldIrql); AddressIP->Address[0].Address[0].in_addr = ipaddr.addr; - - DbgPrint("LibTCPGetXXXName: 0x%x\n", Status); return Status; } Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c [iso-8859-1] Tue Aug 2 19:20:40 2011 @@ -324,6 +324,9 @@ tcp_err_fn errf; #endif /* LWIP_CALLBACK_API */ void *errf_arg; + + DbgPrint("tcp_abandon: called on pcb = 0x%x\n", pcb); + DbgPrint("tcp_abandon: pcb->state = %s\n", tcp_state_str[pcb->state]); /* pcb->state LISTEN not allowed here */ LWIP_ASSERT("don't call tcp_abort/tcp_abandon for listen-pcbs", @@ -917,6 +920,7 @@ tcp_active_pcbs = pcb->next; } + DbgPrint("tcp_slowtmr: removing pcb 0x%x\n", pcb); TCP_EVENT_ERR(pcb->errf, pcb->callback_arg, ERR_ABRT); if (pcb_reset) { tcp_rst(pcb->snd_nxt, pcb->rcv_nxt, &pcb->local_ip, &pcb->remote_ip, @@ -1430,6 +1434,7 @@ void tcp_pcb_remove(struct tcp_pcb **pcblist, struct tcp_pcb *pcb) { + DbgPrint("tcp_pcb_remove: Removing pcb = 0x%x\n", pcb); TCP_RMV(pcblist, pcb); tcp_pcb_purge(pcb); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rosmem.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rosmem.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rosmem.c [iso-8859-1] Tue Aug 2 19:20:40 2011 @@ -28,7 +28,6 @@ void free(void *mem) { - //DbgPrint("ROSMEM: free 0x%x\n", mem); ExFreePoolWithTag(mem, LWIP_TAG); } Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Tue Aug 2 19:20:40 2011 @@ -41,11 +41,10 @@ while (!IsListEmpty(&Connection->PacketQueue)) { - DbgPrint("[lwIP, LibTCPEmptyQueue] Removed packet off queue++++\n"); - Entry = RemoveHeadList(&Connection->PacketQueue); qp = CONTAINING_RECORD(Entry, QUEUE_ENTRY, ListEntry); + /* We're in the tcpip thread here so this is safe */ pbuf_free(qp->p); ExFreePoolWithTag(qp, LWIP_TAG); @@ -84,8 +83,6 @@ if (!IsListEmpty(&Connection->PacketQueue)) { - DbgPrint("[lwIP, LibTCPGetDataFromConnectionQueue] Getting packet off the queue\n"); - qp = LibTCPDequeuePacket(Connection); p = qp->p; @@ -93,22 +90,18 @@ for ((*Received) = 0; (*Received) < RecvLen; (*Received) += p->len, p = p->next) { - DbgPrint("[lwIP, LibTCPGetDataFromConnectionQueue] 0x%x: Copying %d bytes to 0x%x from 0x%x\n", - p, p->len, ((PUCHAR)RecvBuffer) + (*Received), p->payload); - RtlCopyMemory(RecvBuffer + (*Received), p->payload, p->len); } - // reenable this later - pbuf_free(qp->p); + /* Use this special pbuf free callback function because we're outside tcpip thread */ + pbuf_free_callback(qp->p); + ExFreePoolWithTag(qp, LWIP_TAG); Status = STATUS_SUCCESS; } else { - DbgPrint("[lwIP, LibTCPGetPacketFromQueue] Queue is EMPTY\n"); - Status = STATUS_PENDING; } @@ -144,17 +137,10 @@ err_t InternalSendEventHandler(void *arg, PTCP_PCB pcb, const u16_t space) { - DbgPrint("[lwIP, InternalSendEventHandler] SendEvent (0x%x, 0x%x, %d)\n", - arg, pcb, (unsigned int)space); - - ASSERT(pcb->sent != 0); - /* Make sure the socket didn't get closed */ if (!arg) return ERR_OK; TCPSendEventHandler(arg, space); - - DbgPrint("[lwIP, InternalSendEventHandler] Done\n"); return ERR_OK; } @@ -165,35 +151,23 @@ { u32_t len; - DbgPrint("[lwIP, InternalRecvEventHandler] RecvEvent (0x%x, pcb = 0x%x, pbuf = 0x%x, err = %d)\n", - arg, pcb, p, (unsigned int)err); - - ASSERT(pcb->recv != NULL); - /* Make sure the socket didn't get closed */ if (!arg) { if (p) pbuf_free(p); - DbgPrint("[lwIP, InternalRecvEventHandler] Done ERR_OK 0 - socket got closed on us\n"); - return ERR_OK; } if (p) { - DbgPrint("[lwIP, InternalRecvEventHandler] RECV - p:0x%x p->payload:0x%x p->len:%d p->tot_len:%d\n", - p, p->payload, p->len, p->tot_len); - len = TCPRecvEventHandler(arg, p); if (len == p->tot_len) { tcp_recved(pcb, len); pbuf_free(p); - - DbgPrint("[lwIP, InternalRecvEventHandler] Done ERR_OK 1\n"); return ERR_OK; } @@ -204,20 +178,16 @@ tcp_recved(pcb, len); /* Possible memory leak of pbuf here? */ - DbgPrint("[lwIP, InternalRecvEventHandler] Done ERR_OK 2\n"); return ERR_OK; } else { - /* We want lwIP to store the pbuf on its queue for later */ - DbgPrint("[lwIP, InternalRecvEventHandler] Done ERR_TIMEOUT queuing pbuf\n"); - LibTCPEnqueuePacket((PCONNECTION_ENDPOINT)arg, p); tcp_recved(pcb, p->tot_len); - return ERR_OK;//ERR_TIMEOUT;// + return ERR_OK; } } else if (err == ERR_OK) @@ -228,8 +198,6 @@ */ TCPFinEventHandler(arg, ERR_OK); } - - DbgPrint("[lwIP, InternalRecvEventHandler] Done ERR_OK 3\n"); return ERR_OK; } @@ -238,15 +206,9 @@ err_t InternalAcceptEventHandler(void *arg, PTCP_PCB newpcb, const err_t err) { - DbgPrint("[lwIP, InternalAcceptEventHandler] AcceptEvent arg = 0x%x, newpcb = 0x%x, err = %d\n", - arg, newpcb, (unsigned int)err); - /* Make sure the socket didn't get closed */ if (!arg) return ERR_ABRT; - - DbgPrint("[lwIP, InternalAcceptEventHandler] newpcb->state = %s\n", - tcp_state_str[newpcb->state]); TCPAcceptEventHandler(arg, newpcb); @@ -261,16 +223,11 @@ err_t InternalConnectEventHandler(void *arg, PTCP_PCB pcb, const err_t err) { - DbgPrint("[lwIP, InternalConnectEventHandler] ConnectEvent (0x%x, pcb = 0x%x, err = %d)\n", - arg, pcb, (unsigned int)err); - /* Make sure the socket didn't get closed */ if (!arg) return ERR_OK; TCPConnectEventHandler(arg, err); - - DbgPrint("[lwIP, InternalConnectEventHandler] Done\n"); return ERR_OK; } @@ -307,12 +264,8 @@ struct socket_callback_msg *msg = arg; ASSERT(msg); - - DbgPrint("[lwIP, LibTCPSocketCallback] Called\n"); msg->NewPcb = tcp_new(); - - DbgPrint("[lwIP, LibTCPSocketCallback] Assigned new pcb = 0x%x\n", msg->NewPcb); if (msg->NewPcb) { @@ -328,8 +281,6 @@ { struct socket_callback_msg *msg = ExAllocatePool(NonPagedPool, sizeof(struct socket_callback_msg)); struct tcp_pcb *ret; - - DbgPrint("[lwIP, LibTCPSocket] Called\n"); if (msg) { @@ -343,16 +294,10 @@ else ret = NULL; - DbgPrint("[lwIP, LibTCPSocket] Connection( 0x%x )->SocketContext = pcb( 0x%x )\n", arg, ret); - - DbgPrint("[lwIP, LibTCPSocket] Done\n"); - ExFreePool(msg); return ret; } - - DbgPrint("[lwIP, LibTCPSocket] Done\n"); return NULL; } @@ -379,10 +324,17 @@ ASSERT(msg); + if (!msg->Connection->SocketContext) + { + msg->Error = ERR_CLSD; + goto done; + } + msg->Error = tcp_bind((PTCP_PCB)msg->Connection->SocketContext, msg->IpAddress, ntohs(msg->Port)); +done: KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); } @@ -391,11 +343,6 @@ { struct bind_callback_msg *msg; err_t ret; - - if (!Connection->SocketContext) - return ERR_CLSD; - - DbgPrint("[lwIP, LibTCPBind] Called\n"); msg = ExAllocatePool(NonPagedPool, sizeof(struct bind_callback_msg)); if (msg) @@ -412,10 +359,6 @@ else ret = ERR_CLSD; - DbgPrint("[lwIP, LibTCPBind] pcb = 0x%x\n", Connection->SocketContext); - - DbgPrint("[lwIP, LibTCPBind] Done\n"); - ExFreePool(msg); return ret; @@ -444,8 +387,12 @@ struct listen_callback_msg *msg = arg; ASSERT(msg); - - DbgPrint("[lwIP, LibTCPListenCallback] Called\n"); + + if (!msg->Connection->SocketContext) + { + msg->NewPcb = NULL; + goto done; + } msg->NewPcb = tcp_listen_with_backlog((PTCP_PCB)msg->Connection->SocketContext, msg->Backlog); @@ -453,9 +400,8 @@ { tcp_accept(msg->NewPcb, InternalAcceptEventHandler); } - - DbgPrint("[lwIP, LibTCPListenCallback] Done\n"); - + +done: KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); } @@ -464,11 +410,6 @@ { struct listen_callback_msg *msg; PTCP_PCB ret; - - DbgPrint("[lwIP, LibTCPListen] Called on pcb = 0x%x\n", Connection->SocketContext); - - if (!Connection->SocketContext) - return NULL; msg = ExAllocatePool(NonPagedPool, sizeof(struct listen_callback_msg)); if (msg) @@ -483,11 +424,6 @@ ret = msg->NewPcb; else ret = NULL; - - DbgPrint("[lwIP, LibTCPListen] pcb = 0x%x, newpcb = 0x%x, sizeof(pcb) = %d \n", - Connection->SocketContext, ret, sizeof(struct tcp_pcb)); - - DbgPrint("[lwIP, LibTCPListen] Done\n"); ExFreePool(msg); @@ -519,6 +455,12 @@ ASSERT(msg); + if (!msg->Connection->SocketContext) + { + msg->Error = ERR_CLSD; + goto done; + } + if (tcp_sndbuf((PTCP_PCB)msg->Connection->SocketContext) < msg->DataLength) { msg->Error = ERR_INPROGRESS; @@ -533,6 +475,7 @@ tcp_output((PTCP_PCB)msg->Connection->SocketContext); } +done: KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); } @@ -540,54 +483,29 @@ LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, const int safe) { err_t ret; - - if (!Connection->SocketContext) - return ERR_CLSD; - - /* - If we're being called from a handler it means we're in the conetxt of teh tcpip - main thread. Therefore we don't have to queue our request via a callback and we - can execute immediately. - */ - if (safe) - { - if (tcp_sndbuf((PTCP_PCB)Connection->SocketContext) < len) - { - ret = ERR_INPROGRESS; - } - else - { - ret = tcp_write((PTCP_PCB)Connection->SocketContext, dataptr, len, TCP_WRITE_FLAG_COPY); - tcp_output((PTCP_PCB)Connection->SocketContext); - } - + struct send_callback_msg *msg; + + msg = ExAllocatePool(NonPagedPool, sizeof(struct send_callback_msg)); + if (msg) + { + KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); + msg->Connection = Connection; + msg->Data = dataptr; + msg->DataLength = len; + + if (safe) + LibTCPSendCallback(msg); + else + tcpip_callback_with_block(LibTCPSendCallback, msg, 1); + + if (WaitForEventSafely(&msg->Event)) + ret = msg->Error; + else + ret = ERR_CLSD; + + ExFreePool(msg); + return ret; - } - else - { - struct send_callback_msg *msg; - - msg = ExAllocatePool(NonPagedPool, sizeof(struct send_callback_msg)); - if (msg) - { - KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); - msg->Connection = Connection; - msg->Data = dataptr; - msg->DataLength = len; - - tcpip_callback_with_block(LibTCPSendCallback, msg, 1); - - if (WaitForEventSafely(&msg->Event)) - ret = msg->Error; - else - ret = ERR_CLSD; - - DbgPrint("[lwIP, LibTCPSend] pcb = 0x%x\n", Connection->SocketContext); - - ExFreePool(msg); - - return ret; - } } return ERR_MEM; @@ -612,10 +530,14 @@ LibTCPConnectCallback(void *arg) { struct connect_callback_msg *msg = arg; - - DbgPrint("[lwIP, LibTCPConnectCallback] Called\n"); ASSERT(arg); + + if (!msg->Connection->SocketContext) + { + msg->Error = ERR_CLSD; + goto done; + } tcp_recv((PTCP_PCB)msg->Connection->SocketContext, InternalRecvEventHandler); tcp_sent((PTCP_PCB)msg->Connection->SocketContext, InternalSendEventHandler); @@ -626,9 +548,8 @@ msg->Error = Error == ERR_OK ? ERR_INPROGRESS : Error; +done: KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); - - DbgPrint("[lwIP, LibTCPConnectCallback] Done\n"); } err_t @@ -636,11 +557,6 @@ { struct connect_callback_msg *msg; err_t ret; - - DbgPrint("[lwIP, LibTCPConnect] Called\n"); - - if (!Connection->SocketContext) - return ERR_CLSD; msg = ExAllocatePool(NonPagedPool, sizeof(struct connect_callback_msg)); if (msg) @@ -660,10 +576,6 @@ ret = ERR_CLSD; ExFreePool(msg); - - DbgPrint("[lwIP, LibTCPConnect] pcb = 0x%x\n", Connection->SocketContext); - - DbgPrint("[lwIP, LibTCPConnect] Done\n"); return ret; } @@ -690,6 +602,12 @@ LibTCPShutdownCallback(void *arg) { struct shutdown_callback_msg *msg = arg; + + if (!msg->Connection->SocketContext) + { + msg->Error = ERR_CLSD; + goto done; + } /* We check here if the pcb is in state ESTABLISHED or SYN_RECV because otherwise @@ -706,6 +624,7 @@ else msg->Error = ERR_OK; +done: KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); } @@ -714,19 +633,7 @@ { struct shutdown_callback_msg *msg; err_t ret; - - DbgPrint("[lwIP, LibTCPShutdown] Called on pcb = 0x%x, rx = %d, tx = %d\n", - Connection->SocketContext, shut_rx, shut_tx); - - if (!Connection->SocketContext) - { - DbgPrint("[lwIP, LibTCPShutdown] Done... NO pcb\n"); - return ERR_CLSD; - } - - DbgPrint("[lwIP, LibTCPShutdown] pcb->state = %s\n", - tcp_state_str[((PTCP_PCB)Connection->SocketContext)->state]); - + msg = ExAllocatePool(NonPagedPool, sizeof(struct shutdown_callback_msg)); if (msg) { @@ -745,8 +652,6 @@ ExFreePool(msg); - DbgPrint("[lwIP, LibTCPShutdown] Done\n"); - return ret; } @@ -767,55 +672,29 @@ static void -CloseCallbacks(struct tcp_pcb *pcb) -{ - tcp_arg(pcb, NULL); - /* - if this pcb is not in LISTEN state then it has - valid recv, send and err callbacks to cancel - */ - if (pcb->state != LISTEN) - { - tcp_recv(pcb, NULL); - tcp_sent(pcb, NULL); - tcp_err(pcb, NULL); - } - - tcp_accept(pcb, NULL); -} - -static -void LibTCPCloseCallback(void *arg) { struct close_callback_msg *msg = arg; - DbgPrint("[lwIP, LibTCPCloseCallback] pcb = 0x%x\n", (PTCP_PCB)msg->Connection->SocketContext); - if (!msg->Connection->SocketContext) { - DbgPrint("[lwIP, LibTCPCloseCallback] NULL pcb...bail, bail!!!\n"); - msg->Error = ERR_OK; - return; - } - - CloseCallbacks((PTCP_PCB)msg->Connection->SocketContext); + goto done; + } LibTCPEmptyQueue(msg->Connection); if (((PTCP_PCB)msg->Connection->SocketContext)->state == LISTEN) { - DbgPrint("[lwIP, LibTCPCloseCallback] Closing a listener\n"); msg->Error = tcp_close((PTCP_PCB)msg->Connection->SocketContext); } else { - DbgPrint("[lwIP, LibTCPCloseCallback] Aborting a connection\n"); tcp_abort((PTCP_PCB)msg->Connection->SocketContext); msg->Error = ERR_OK; } +done: KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); } @@ -823,79 +702,36 @@ LibTCPClose(PCONNECTION_ENDPOINT Connection, const int safe) { err_t ret; - - DbgPrint("[lwIP, LibTCPClose] Called on pcb = 0x%x\n", Connection->SocketContext); - - if (!Connection->SocketContext) - { - DbgPrint("[lwIP, LibTCPClose] Done... NO pcb\n"); - return ERR_CLSD; - } - - DbgPrint("[lwIP, LibTCPClose] pcb->state = %s\n", - tcp_state_str[((PTCP_PCB)Connection->SocketContext)->state]); - - /* - If we're being called from a handler it means we're in the conetxt of teh tcpip - main thread. Therefore we don't have to queue our request via a callback and we - can execute immediately. - */ - if (safe) - { - CloseCallbacks((PTCP_PCB)Connection->SocketContext); - - LibTCPEmptyQueue(Connection); - - if ( ((PTCP_PCB)Connection->SocketContext)->state == LISTEN ) - { - DbgPrint("[lwIP, LibTCPClose] Closing a listener\n"); - ret = tcp_close((PTCP_PCB)Connection->SocketContext); - } - else - { - DbgPrint("[lwIP, LibTCPClose] Aborting a connection\n"); - tcp_abort((PTCP_PCB)Connection->SocketContext); - ret = ERR_OK; - } - + struct close_callback_msg *msg; + + msg = ExAllocatePool(NonPagedPool, sizeof(struct close_callback_msg)); + if (msg) + { + KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); + + msg->Connection = Connection; + + if (safe) + LibTCPCloseCallback(msg); + else + tcpip_callback_with_block(LibTCPCloseCallback, msg, 1); + + if (WaitForEventSafely(&msg->Event)) + ret = msg->Error; + else + ret = ERR_CLSD; + + ExFreePool(msg); + return ret; } - else - { - struct close_callback_msg *msg; - - msg = ExAllocatePool(NonPagedPool, sizeof(struct close_callback_msg)); - if (msg) - { - KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); - - msg->Connection = Connection; - - tcpip_callback_with_block(LibTCPCloseCallback, msg, 1); - - if (WaitForEventSafely(&msg->Event)) - ret = msg->Error; - else - ret = ERR_CLSD; - - ExFreePool(msg); - - DbgPrint("[lwIP, LibTCPClose] Done\n"); - - return ret; - } - } - - DbgPrint("[lwIP, LibTCPClose] Failed to allocate memory\n"); - + return ERR_MEM; } void LibTCPAccept(PTCP_PCB pcb, struct tcp_pcb *listen_pcb, void *arg) { - DbgPrint("[lwIP, LibTCPAccept] Called. (pcb, arg) = (0x%x, 0x%x)\n", pcb, arg); - ASSERT(arg); tcp_arg(pcb, NULL); @@ -905,40 +741,28 @@ tcp_arg(pcb, arg); tcp_accepted(listen_pcb); - - DbgPrint("[lwIP, LibTCPAccept] Done\n"); } err_t LibTCPGetHostName(PTCP_PCB pcb, struct ip_addr *const ipaddr, u16_t *const port) { - DbgPrint("[lwIP, LibTCPGetHostName] Called. pcb = (0x%x)\n", pcb); - if (!pcb) return ERR_CLSD; *ipaddr = pcb->local_ip; *port = pcb->local_port; - DbgPrint("[lwIP, LibTCPGetHostName] Got host port: %d\n", *port); - - DbgPrint("[lwIP, LibTCPGetHostName] Done\n"); - return ERR_OK; } err_t LibTCPGetPeerName(PTCP_PCB pcb, struct ip_addr * const ipaddr, u16_t * const port) -{ - DbgPrint("[lwIP, LibTCPGetPeerName] pcb = (0x%x)\n", pcb); - +{ if (!pcb) return ERR_CLSD; *ipaddr = pcb->remote_ip; *port = pcb->remote_port; - DbgPrint("[lwIP, LibTCPGetPeerName] Got remote port: %d\n", *port); - return ERR_OK; } Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/sys_arch.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/sys_arch.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/sys_arch.c [iso-8859-1] Tue Aug 2 19:20:40 2011 @@ -94,10 +94,6 @@ LargeTimeout.QuadPart = Int32x32To64(timeout, -10000); KeQuerySystemTime(&PreWaitTime); - - // FIXME: This is a hack to increase the throughput. Once this is done - // the right way it should definately be removed. - //timeout = 5; Status = KeWaitForMultipleObjects(2, WaitObjects, @@ -107,17 +103,12 @@ FALSE, timeout != 0 ? &LargeTimeout : NULL, NULL); - - //DbgPrint("[+[+[+[ sys_arch_sem_wait ]+]+]+] timeout = %d\n", timeout); - if (Status == STATUS_WAIT_0) { KeQuerySystemTime(&PostWaitTime); TimeDiff = PostWaitTime.QuadPart - PreWaitTime.QuadPart; TimeDiff /= 10000; - //DbgPrint("[+[+[+[ sys_arch_sem_wait ]+]+]+] TimeDiff = %llu\n", TimeDiff); - return TimeDiff; } else if (Status == STATUS_WAIT_1) @@ -130,8 +121,6 @@ return 0; } - - //DbgPrint("[+[+[+[ sys_arch_sem_wait ]+]+]+] SYS_ARCH_TIMEOUT\n"); return SYS_ARCH_TIMEOUT; } @@ -196,9 +185,6 @@ PLIST_ENTRY Entry; KIRQL OldIrql; PVOID WaitObjects[] = {&mbox->Event, &TerminationEvent}; - - //timeout = 0; - //DbgPrint("[[[[[ sys_arch_mbox_fetch ]]]]] %d\n", timeout); LargeTimeout.QuadPart = Int32x32To64(timeout, -10000); @@ -213,8 +199,6 @@ timeout != 0 ? &LargeTimeout : NULL, NULL); - //DbgPrint("[ [ [ [ sys_arch_mbox_fetch ] ] ] ] timeout = %d\n", timeout); - if (Status == STATUS_WAIT_0) { KeAcquireSpinLock(&mbox->Lock, &OldIrql); @@ -234,8 +218,6 @@ KeQuerySystemTime(&PostWaitTime); TimeDiff = PostWaitTime.QuadPart - PreWaitTime.QuadPart; TimeDiff /= 10000; - - //DbgPrint("[ [ [ [ sys_arch_mbox_fetch ] ] ] ] TimeDiff = %llu\n", TimeDiff); return TimeDiff; } @@ -249,8 +231,6 @@ return 0; } - - //DbgPrint("[ [ [ [ sys_arch_mbox_fetch ] ] ] ] SYS_ARCH_TIMEOUT\n"); return SYS_ARCH_TIMEOUT; } @@ -276,7 +256,7 @@ NTAPI LwipThreadMain(PVOID Context) { - thread_t Container = Context; + thread_t Container = (thread_t)Context; KIRQL OldIrql; ExInterlockedInsertHeadList(&ThreadListHead, &Container->ListEntry, &ThreadListLock); @@ -324,9 +304,8 @@ void sys_init(void) -{ +{ KeInitializeSpinLock(&ThreadListLock); - InitializeListHead(&ThreadListHead); KeQuerySystemTime(&StartTime);

1 0

[rharabien] 53032: [WIN32K] - Fix a typo. Spotted by Giannis Adamopoulos
by rharabien＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: rharabien Date: Tue Aug 2 16:29:33 2011 New Revision: 53032 URL: http://svn.reactos.org/svn/reactos?rev=53032&view=rev Log: [WIN32K] - Fix a typo. Spotted by Giannis Adamopoulos Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Tue Aug 2 16:29:33 2011 @@ -1759,7 +1759,7 @@ { LONG cx = UserGetSystemMetrics(SM_CXSMICON); LONG cy = UserGetSystemMetrics(SM_CYSMICON); - LONG x = Rect.left - cx/2 + 1 + (Rect.bottom - Rect.left)/2; + LONG x = Rect.left - cx/2 + 1 + (Rect.bottom - Rect.top)/2; // this is really what Window does LONG y = (Rect.top + Rect.bottom)/2 - cy/2; // center UserDrawIconEx(hDc, x, y, pIcon, cx, cy, 0, NULL, DI_NORMAL); }

1 0

[rharabien] 53031: [WIN32K] - Make UserDrawCaption much more simple and compatible with Windows. It supports now icon given in parameter places text and icon in valid position. Fixes Start button i...
by rharabien＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: rharabien Date: Tue Aug 2 16:22:39 2011 New Revision: 53031 URL: http://svn.reactos.org/svn/reactos?rev=53031&view=rev Log: [WIN32K] - Make UserDrawCaption much more simple and compatible with Windows. It supports now icon given in parameter places text and icon in valid position. Fixes Start button icon in explorer_new. - Uncomment two function in win32k. I used one of them in UserDrawCaptionText and seems to work - Add debug print to NtGdiPatBlt Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Tue Aug 2 16:22:39 2011 @@ -1579,110 +1579,78 @@ END_CLEANUP; } - -BOOL -UserDrawSysMenuButton( - PWND pWnd, - HDC hDc, - RECTL *lpRc, - BOOL Down) -{ - HICON hIcon; - PCURICON_OBJECT pIcon; - - ASSERT(pWnd && lpRc); - - /* Get the icon to draw. We don't care about WM_GETICON here. */ - - hIcon = pWnd->pcls->hIconSm; - - if(!hIcon) - { - DPRINT("Wnd class has no small icon.\n"); - hIcon = pWnd->pcls->hIcon; - } - - if(!hIcon) - { - DPRINT("Wnd class hasn't any icon.\n"); - //FIXME: Draw "winlogo" icon. - return FALSE; - } - - if(!(pIcon = UserGetCurIconObject(hIcon))) - { - DPRINT1("UserGetCurIconObject() failed!\n"); - return FALSE; - } - - return UserDrawIconEx(hDc, lpRc->left, lpRc->top, pIcon, - UserGetSystemMetrics(SM_CXSMICON), - UserGetSystemMetrics(SM_CYSMICON), - 0, NULL, DI_NORMAL); -} - BOOL UserDrawCaptionText( HDC hDc, const PUNICODE_STRING Text, const RECTL *lpRc, - UINT uFlags) -{ - HFONT hOldFont = NULL, hFont = NULL; + UINT uFlags, + HFONT hFont) +{ + HFONT hOldFont = NULL; COLORREF OldTextColor; NONCLIENTMETRICSW nclm; NTSTATUS Status; - #ifndef NDEBUG + BOOLEAN bDeleteFont = FALSE; + SIZE Size; +#ifndef NDEBUG INT i; - DPRINT("%s:", __FUNCTION__); + DPRINT(""); // print filename and line no. for(i = 0; i < Text->Length/sizeof(WCHAR); i++) DbgPrint("%C", Text->Buffer[i]); DbgPrint(", %d\n", Text->Length/sizeof(WCHAR)); - #endif +#endif nclm.cbSize = sizeof(nclm); if(!UserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &nclm, 0)) { - DPRINT1("%s: UserSystemParametersInfo() failed!\n", __FUNCTION__); + DPRINT1("UserSystemParametersInfo() failed!\n"); return FALSE; } + if (!hFont) + { + if(uFlags & DC_SMALLCAP) + Status = TextIntCreateFontIndirect(&nclm.lfSmCaptionFont, &hFont); + else + Status = TextIntCreateFontIndirect(&nclm.lfCaptionFont, &hFont); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("TextIntCreateFontIndirect() failed! Status: 0x%x\n", Status); + return FALSE; + } + + bDeleteFont = TRUE; + } + IntGdiSetBkMode(hDc, TRANSPARENT); - - if(uFlags & DC_SMALLCAP) - Status = TextIntCreateFontIndirect(&nclm.lfSmCaptionFont, &hFont); - else Status = TextIntCreateFontIndirect(&nclm.lfCaptionFont, &hFont); - - if(!NT_SUCCESS(Status)) - { - DPRINT1("%s: TextIntCreateFontIndirect() failed! Status: 0x%x\n", - __FUNCTION__, Status); - return FALSE; - } hOldFont = NtGdiSelectFont(hDc, hFont); if(!hOldFont) { - DPRINT1("%s: SelectFont() failed!\n", __FUNCTION__); - GreDeleteObject(hFont); - return FALSE; + DPRINT1("SelectFont() failed!\n"); + /* Don't fail */ } if(uFlags & DC_INBUTTON) OldTextColor = IntGdiSetTextColor(hDc, IntGetSysColor(COLOR_BTNTEXT)); - else OldTextColor = IntGdiSetTextColor(hDc, IntGetSysColor(uFlags & DC_ACTIVE + else + OldTextColor = IntGdiSetTextColor(hDc, IntGetSysColor(uFlags & DC_ACTIVE ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT)); //FIXME: If string doesn't fit to rc, truncate it and add ellipsis. - - GreExtTextOutW(hDc, lpRc->left, - lpRc->top, 0, NULL, Text->Buffer, - Text->Length/sizeof(WCHAR), NULL, 0); + GreGetTextExtentW(hDc, Text->Buffer, Text->Length/sizeof(WCHAR), &Size, 0); + GreExtTextOutW(hDc, + lpRc->left, (lpRc->top + lpRc->bottom)/2 - Size.cy/2, + 0, NULL, Text->Buffer, Text->Length/sizeof(WCHAR), NULL, 0); IntGdiSetTextColor(hDc, OldTextColor); - NtGdiSelectFont(hDc, hOldFont); - GreDeleteObject(hFont); + if (hOldFont) + NtGdiSelectFont(hDc, hOldFont); + if (bDeleteFont) + GreDeleteObject(hFont); return TRUE; } @@ -1693,51 +1661,17 @@ RECTL *lpRc, HFONT hFont, HICON hIcon, - const PUNICODE_STRING str, + const PUNICODE_STRING Str, UINT uFlags) { BOOL Ret = FALSE; - HBITMAP hMemBmp = NULL, hOldBmp = NULL; - HBRUSH hOldBrush = NULL; - HDC hMemDc = NULL; - ULONG Height; - UINT VCenter = 0, Padding = 0; - RECTL r = *lpRc; - LONG ButtonWidth, IconWidth; + HBRUSH hBgBrush, hOldBrush = NULL; + RECTL Rect = *lpRc; BOOL HasIcon; - //ASSERT(pWnd != NULL); - RECTL_vMakeWellOrdered(lpRc); - hMemBmp = NtGdiCreateCompatibleBitmap(hDc, - lpRc->right - lpRc->left, - lpRc->bottom - lpRc->top); - - if(!hMemBmp) - { - DPRINT1("%s: NtGdiCreateCompatibleBitmap() failed!\n", __FUNCTION__); - return FALSE; - } - - hMemDc = NtGdiCreateCompatibleDC(hDc); - if(!hMemDc) - { - DPRINT1("%s: NtGdiCreateCompatibleDC() failed!\n", __FUNCTION__); - goto cleanup; - } - - hOldBmp = NtGdiSelectBitmap(hMemDc, hMemBmp); - if(!hOldBmp) - { - DPRINT1("%s: NtGdiSelectBitmap() failed!\n", __FUNCTION__); - goto cleanup; - } - - Height = UserGetSystemMetrics(SM_CYCAPTION) - 1; - VCenter = (lpRc->bottom - lpRc->top) / 2; - Padding = VCenter - (Height / 2); - - if ((!hIcon) && (pWnd != NULL)) + + if (!hIcon && pWnd != NULL) { HasIcon = (uFlags & DC_ICON) && (pWnd->style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP) && !(pWnd->ExStyle & WS_EX_DLGMODALFRAME) @@ -1746,203 +1680,114 @@ else HasIcon = (hIcon != 0); - IconWidth = UserGetSystemMetrics(SM_CXSIZE) + Padding; - - r.left = Padding; - r.right = r.left + (lpRc->right - lpRc->left); - r.top = Padding; - r.bottom = r.top + (Height / 2); - // Draw the caption background - if(uFlags & DC_INBUTTON) - { - hOldBrush = NtGdiSelectBrush(hMemDc, - IntGetSysColorBrush(COLOR_3DFACE)); + if((uFlags & DC_GRADIENT) && !(uFlags & DC_INBUTTON)) + { + static GRADIENT_RECT gcap = {0, 1}; + TRIVERTEX Vertices[2]; + COLORREF Colors[2]; + + Colors[0] = IntGetSysColor((uFlags & DC_ACTIVE) ? + COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION); + + Colors[1] = IntGetSysColor((uFlags & DC_ACTIVE) ? + COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION); + + Vertices[0].x = Rect.left; + Vertices[0].y = Rect.top; + Vertices[0].Red = (WORD)Colors[0]<<8; + Vertices[0].Green = (WORD)Colors[0] & 0xFF00; + Vertices[0].Blue = (WORD)(Colors[0]>>8) & 0xFF00; + Vertices[0].Alpha = 0; + + Vertices[1].x = Rect.right; + Vertices[1].y = Rect.bottom; + Vertices[1].Red = (WORD)Colors[1]<<8; + Vertices[1].Green = (WORD)Colors[1] & 0xFF00; + Vertices[1].Blue = (WORD)(Colors[1]>>8) & 0xFF00; + Vertices[1].Alpha = 0; + + if(!GreGradientFill(hDc, Vertices, 2, &gcap, 1, GRADIENT_FILL_RECT_H)) + { + DPRINT1("GreGradientFill() failed!\n"); + goto cleanup; + } + } + else + { + if(uFlags & DC_INBUTTON) + hBgBrush = IntGetSysColorBrush(COLOR_3DFACE); + else if(uFlags & DC_ACTIVE) + hBgBrush = IntGetSysColorBrush(COLOR_ACTIVECAPTION); + else + hBgBrush = IntGetSysColorBrush(COLOR_INACTIVECAPTION); + + hOldBrush = NtGdiSelectBrush(hDc, hBgBrush); if(!hOldBrush) { - DPRINT1("%s: NtGdiSelectBrush() failed!\n", __FUNCTION__); + DPRINT1("NtGdiSelectBrush() failed!\n"); goto cleanup; } - if(!NtGdiPatBlt(hMemDc, 0, 0, - lpRc->right - lpRc->left, - lpRc->bottom - lpRc->top, + if(!NtGdiPatBlt(hDc, Rect.left, Rect.top, + Rect.right - Rect.left, + Rect.bottom - Rect.top, PATCOPY)) { - DPRINT1("%s: NtGdiPatBlt() failed!\n", __FUNCTION__); + DPRINT1("NtGdiPatBlt() failed!\n"); goto cleanup; } - - if(HasIcon) r.left+=IconWidth; - } - else - { - r.right = (lpRc->right - lpRc->left); - if(uFlags & DC_SMALLCAP) - ButtonWidth = UserGetSystemMetrics(SM_CXSMSIZE) - 2; - else ButtonWidth = UserGetSystemMetrics(SM_CXSIZE) - 2; - - hOldBrush = NtGdiSelectBrush(hMemDc, - IntGetSysColorBrush(uFlags & DC_ACTIVE ? - COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION)); - - if(!hOldBrush) - { - DPRINT1("%s: NtGdiSelectBrush() failed!\n", __FUNCTION__); - goto cleanup; - } - - if(HasIcon && (uFlags & DC_GRADIENT)) - { - NtGdiPatBlt(hMemDc, 0, 0, - IconWidth+1, - lpRc->bottom - lpRc->top, - PATCOPY); - r.left+=IconWidth; - } - else - { - NtGdiPatBlt(hMemDc, 0, 0, - lpRc->right - lpRc->left, - lpRc->bottom - lpRc->top, - PATCOPY); - } - - if(uFlags & DC_GRADIENT) - { - static GRADIENT_RECT gcap = {0, 1}; - TRIVERTEX vert[2]; - COLORREF Colors[2]; - - if (pWnd != NULL) - { - if(pWnd->style & WS_SYSMENU) - { - r.right -= 3 + ButtonWidth; - if(!(uFlags & DC_SMALLCAP)) - { - if(pWnd->style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) - r.right -= 2 + 2 * ButtonWidth; - else r.right -= 2; - r.right -= 2; - } - - //Draw buttons background - if(!NtGdiSelectBrush(hMemDc, - IntGetSysColorBrush(uFlags & DC_ACTIVE ? - COLOR_GRADIENTACTIVECAPTION:COLOR_GRADIENTINACTIVECAPTION))) - { - DPRINT1("%s: NtGdiSelectBrush() failed!\n", __FUNCTION__); - goto cleanup; - } - - NtGdiPatBlt(hMemDc, - r.right, - 0, - lpRc->right - lpRc->left - r.right, - lpRc->bottom - lpRc->top, - PATCOPY); - } - } - - Colors[0] = IntGetSysColor((uFlags & DC_ACTIVE) ? - COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION); - - Colors[1] = IntGetSysColor((uFlags & DC_ACTIVE) ? - COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION); - - vert[0].x = r.left; - vert[0].y = 0; - vert[0].Red = (WORD)Colors[0]<<8; - vert[0].Green = (WORD)Colors[0] & 0xFF00; - vert[0].Blue = (WORD)(Colors[0]>>8) & 0xFF00; - vert[0].Alpha = 0; - - vert[1].x = r.right; - vert[1].y = lpRc->bottom - lpRc->top; - vert[1].Red = (WORD)Colors[1]<<8; - vert[1].Green = (WORD)Colors[1] & 0xFF00; - vert[1].Blue = (WORD)(Colors[1]>>8) & 0xFF00; - vert[1].Alpha = 0; - - if(!GreGradientFill(hMemDc, vert, 2, &gcap, - 1, GRADIENT_FILL_RECT_H)) - { - DPRINT1("%s: IntGdiGradientFill() failed!\n", __FUNCTION__); - } - - } //if(uFlags & DC_GRADIENT) - } - - if(HasIcon) - { - r.top ++; - r.left -= --IconWidth; - /* FIXME: Draw the Icon when pWnd == NULL but hIcon is valid */ - if (pWnd != NULL) - UserDrawSysMenuButton(pWnd, hMemDc, &r, FALSE); - - r.left += IconWidth; - r.top --; - } - - r.top ++; - r.left += 2; - - r.bottom = r.top + Height; + } + + /* Draw icon */ + if (HasIcon) + { + PCURICON_OBJECT pIcon = NULL; + + if (!hIcon && pWnd) + { + hIcon = pWnd->pcls->hIconSm; // FIXME: Windows does not do that + if(!hIcon) + hIcon = pWnd->pcls->hIcon; + } + + if (hIcon) + pIcon = UserGetCurIconObject(hIcon); + + if (pIcon) + { + LONG cx = UserGetSystemMetrics(SM_CXSMICON); + LONG cy = UserGetSystemMetrics(SM_CYSMICON); + LONG x = Rect.left - cx/2 + 1 + (Rect.bottom - Rect.left)/2; + LONG y = (Rect.top + Rect.bottom)/2 - cy/2; // center + UserDrawIconEx(hDc, x, y, pIcon, cx, cy, 0, NULL, DI_NORMAL); + } + } + + if (hIcon) + Rect.left += Rect.bottom - Rect.top; if((uFlags & DC_TEXT)) { - if(!(uFlags & DC_GRADIENT)) - { - r.right = (lpRc->right - lpRc->left); - - if(uFlags & DC_SMALLCAP) - ButtonWidth = UserGetSystemMetrics(SM_CXSMSIZE) - 2; - else ButtonWidth = UserGetSystemMetrics(SM_CXSIZE) - 2; - - if ((pWnd != NULL) && (pWnd->style & WS_SYSMENU)) - { - r.right -= 3 + ButtonWidth; - if(! (uFlags & DC_SMALLCAP)) - { - if(pWnd->style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) - r.right -= 2 + 2 * ButtonWidth; - else r.right -= 2; - r.right -= 2; - } - } - } - - /* FIXME: hFont isn't handled */ - if (str) - UserDrawCaptionText(hMemDc, str, &r, uFlags); - else if (pWnd != NULL) + Rect.left += 2; + + if (Str) + UserDrawCaptionText(hDc, Str, &Rect, uFlags, hFont); + else if (pWnd != NULL) // FIXME: Windows does not do that { UNICODE_STRING ustr; ustr.Buffer = pWnd->strName.Buffer; ustr.Length = pWnd->strName.Length; ustr.MaximumLength = pWnd->strName.MaximumLength; - UserDrawCaptionText(hMemDc, &ustr, &r, uFlags); - } - } - - if(!NtGdiBitBlt(hDc, lpRc->left, lpRc->top, - lpRc->right - lpRc->left, lpRc->bottom - lpRc->top, - hMemDc, 0, 0, SRCCOPY, 0, 0)) - { - DPRINT1("%s: NtGdiBitBlt() failed!\n", __FUNCTION__); - goto cleanup; + UserDrawCaptionText(hDc, &ustr, &Rect, uFlags, hFont); + } } Ret = TRUE; cleanup: - if (hOldBrush) NtGdiSelectBrush(hMemDc, hOldBrush); - if (hOldBmp) NtGdiSelectBitmap(hMemDc, hOldBmp); - if (hMemBmp) GreDeleteObject(hMemBmp); - if (hMemDc) NtGdiDeleteObjectApp(hMemDc); + if (hOldBrush) NtGdiSelectBrush(hDc, hOldBrush); return Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Tue Aug 2 16:22:39 2011 @@ -903,6 +903,7 @@ if (dc->dctype == DC_TYPE_INFO) { DC_UnlockDc(dc); + DPRINT1("NtGdiPatBlt on info DC!\n"); /* Yes, Windows really returns TRUE in this case */ return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Tue Aug 2 16:22:39 2011 @@ -15,7 +15,6 @@ /** Functions *****************************************************************/ -#if 0 /* flOpts : GetTextExtentPoint32W = 0 @@ -135,7 +134,6 @@ DC_UnlockDc(pdc); return Result; } -#endif DWORD APIENTRY

1 0

[gadamopoulos] 53030: [win32k] - HACK RegisterClass in order to let comctl32 re-register built in classes. This is needed in order to fix themes and will keep it till we find a way to do it properl...
by gadamopoulos＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: gadamopoulos Date: Tue Aug 2 13:59:13 2011 New Revision: 53030 URL: http://svn.reactos.org/svn/reactos?rev=53030&view=rev Log: [win32k] - HACK RegisterClass in order to let comctl32 re-register built in classes. This is needed in order to fix themes and will keep it till we find a way to do it properly. (of course this breaks class wine tests as well) Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/class.c Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Tue Aug 2 13:59:13 2011 @@ -1295,8 +1295,9 @@ if (lpwcx->style & CS_GLOBALCLASS) { + /* HACK: allow global classes to be re-registered*/ Class = IntFindClass( ClassAtom, - NULL, + lpwcx->hInstance, &pi->pclsPublicList, NULL);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs