Ros-diffs July 2011

ros-diffs@reactos.org

24 participants
517 discussions

[gadamopoulos] 52633: [uxtheme] - Call UXTHEME_InitSystem when user api hooks are installed

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Jul 11 13:28:20 2011 New Revision: 52633 URL: http://svn.reactos.org/svn/reactos?rev=52633&view=rev Log: [uxtheme] - Call UXTHEME_InitSystem when user api hooks are installed Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c [iso-8859-1] Mon Jul 11 13:28:20 2011 @@ -100,6 +100,8 @@ UAH_HOOK_MESSAGE(puah->WndProcArray, WM_THEMECHANGED); UAH_HOOK_MESSAGE(puah->WndProcArray, WM_UAHINIT); + UXTHEME_InitSystem(hDllInst); + return TRUE; }

13 years, 5 months

[gadamopoulos] 52632: [uxtheme] - Move some definitions to a header file

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Jul 11 13:17:39 2011 New Revision: 52632 URL: http://svn.reactos.org/svn/reactos?rev=52632&view=rev Log: [uxtheme] - Move some definitions to a header file Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h (with props) Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h (added) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h [iso-8859-1] Mon Jul 11 13:17:39 2011 @@ -1,0 +1,48 @@ + +typedef struct _DRAW_CONTEXT +{ + HWND hWnd; + HDC hDC; + HTHEME theme; + WINDOWINFO wi; + BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */ + HRGN hRgn; + int CaptionHeight; + + /* for double buffering */ + HDC hDCScreen; + HBITMAP hbmpOld; +} DRAW_CONTEXT, *PDRAW_CONTEXT; + +typedef enum +{ + CLOSEBUTTON, + MAXBUTTON, + MINBUTTON, + HELPBUTTON +} CAPTIONBUTTON; + +/* +The following values specify all possible vutton states +Note that not all of them are documented but it is easy to +find them by opening a theme file +*/ +typedef enum { + BUTTON_NORMAL = 1 , + BUTTON_HOT , + BUTTON_PRESSED , + BUTTON_DISABLED , + BUTTON_INACTIVE +} THEME_BUTTON_STATES; + +#define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \ + ((!(Style & WS_CHILD) && (Style & WS_THICKFRAME) && !(Style & WS_MAXIMIZE)) || \ + ((Style & WS_CHILD) && (ParentStyle & WS_THICKFRAME) && !(ParentStyle & WS_MAXIMIZE) && \ + (WindowRect.right - WindowRect.left == ParentClientRect.right) && \ + (WindowRect.bottom - WindowRect.top == ParentClientRect.bottom))) + +#define HAS_MENU(hwnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) + +#define BUTTON_GAP_SIZE 2 + +#define MENU_BAR_ITEMS_SPACE (12) Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Mon Jul 11 13:17:39 2011 @@ -12,58 +12,11 @@ #include "vfwmsgs.h" #include "uxtheme.h" #include <tmschema.h> +#include "ncthm.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); - -typedef struct _DRAW_CONTEXT -{ - HWND hWnd; - HDC hDC; - HTHEME theme; - WINDOWINFO wi; - BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */ - HRGN hRgn; - int CaptionHeight; - - /* for double buffering */ - HDC hDCScreen; - HBITMAP hbmpOld; -} DRAW_CONTEXT, *PDRAW_CONTEXT; - -typedef enum -{ - CLOSEBUTTON, - MAXBUTTON, - MINBUTTON, - HELPBUTTON -} CAPTIONBUTTON; - -/* -The following values specify all possible vutton states -Note that not all of them are documented but it is easy to -find them by opening a theme file -*/ -typedef enum { - BUTTON_NORMAL = 1 , - BUTTON_HOT , - BUTTON_PRESSED , - BUTTON_DISABLED , - BUTTON_INACTIVE -} THEME_BUTTON_STATES; - -#define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \ - ((!(Style & WS_CHILD) && (Style & WS_THICKFRAME) && !(Style & WS_MAXIMIZE)) || \ - ((Style & WS_CHILD) && (ParentStyle & WS_THICKFRAME) && !(ParentStyle & WS_MAXIMIZE) && \ - (WindowRect.right - WindowRect.left == ParentClientRect.right) && \ - (WindowRect.bottom - WindowRect.top == ParentClientRect.bottom))) - -#define HAS_MENU(hwnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) - -#define BUTTON_GAP_SIZE 2 - -#define MENU_BAR_ITEMS_SPACE (12) HFONT hMenuFont = NULL; HFONT hMenuFontBold = NULL; @@ -1094,4 +1047,4 @@ default: return DefWndProc(hWnd, Msg, wParam, lParam); } -} +}

13 years, 5 months

[gadamopoulos] 52631: [win32k] -Add a hack to GreStretchBltMask to return TRUE when a dimension is 0. After some investigation it seems that windows returns TRUE in such a case but couldn't investi...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Jul 11 12:59:21 2011 New Revision: 52631 URL: http://svn.reactos.org/svn/reactos?rev=52631&view=rev Log: [win32k] -Add a hack to GreStretchBltMask to return TRUE when a dimension is 0. After some investigation it seems that windows returns TRUE in such a case but couldn't investigate more if this change is really correct. This hack is needed because a drawing operation in uxtheme is aborted when StretchBlt returns FALSE Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/objects/bitblt.c Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Mon Jul 11 12:59:21 2011 @@ -660,7 +660,7 @@ if (0 == WidthDest || 0 == HeightDest || 0 == WidthSrc || 0 == HeightSrc) { EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + return TRUE; } DPRINT("Locking DCs\n");

13 years, 5 months

[cmihail] 52630: [lwIP/IP] - Optimize the way Send and Close handlers work by executing executing the raw lwIP functions directly instead of using lwIP's callback system. This works because the han...

by cmihail＠svn.reactos.org

Author: cmihail Date: Mon Jul 11 12:36:07 2011 New Revision: 52630 URL: http://svn.reactos.org/svn/reactos?rev=52630&view=rev Log: [lwIP/IP] - Optimize the way Send and Close handlers work by executing executing the raw lwIP functions directly instead of using lwIP's callback system. This works because the handlers are executed from lwIP's master thread context - small language optimizations Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c 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] Mon Jul 11 12:36:07 2011 @@ -48,13 +48,6 @@ static VOID -SocketContextCloseWorker(PVOID Context) -{ - LibTCPClose(Context); -} - -static -VOID CompleteBucket(PCONNECTION_ENDPOINT Connection, PTDI_BUCKET Bucket, BOOLEAN Synchronous) { ReferenceObject(Connection); @@ -173,7 +166,7 @@ PIRP Irp; NTSTATUS Status; KIRQL OldIrql; - void *OldSocketContext; + struct tcp_pcb* OldSocketContext; DbgPrint("[IP, TCPAcceptEventHandler] Called\n"); @@ -222,9 +215,9 @@ /* sanity assert...this should never be in anything else but a CLOSED state */ ASSERT(((struct tcp_pcb*)OldSocketContext)->state == CLOSED); - /* free socket context created in FileOpenConnection, as we're using a new - one; we free it asynchornously because otherwise we create a deadlock */ - ChewCreate(SocketContextCloseWorker, OldSocketContext); + + /* free socket context created in FileOpenConnection, as we're using a new one */ + LibTCPClose(OldSocketContext, TRUE); } DereferenceObject(Bucket->AssociatedEndpoint); @@ -279,7 +272,7 @@ Status = TCPTranslateError(LibTCPSend(Connection->SocketContext, SendBuffer, - SendLen)); + SendLen, TRUE)); TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", SendLen)); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] Mon Jul 11 12:36:07 2011 @@ -16,10 +16,10 @@ struct tcp_pcb *LibTCPSocket(void *arg); err_t LibTCPBind(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t port); struct tcp_pcb *LibTCPListen(struct tcp_pcb *pcb, u8_t backlog); -err_t LibTCPSend(struct tcp_pcb *pcb, void *dataptr, u16_t len); +err_t LibTCPSend(struct tcp_pcb *pcb, const void *dataptr, const u16_t len, const int safe); err_t LibTCPConnect(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t port); err_t LibTCPShutdown(struct tcp_pcb *pcb, int shut_rx, int shut_tx); -err_t LibTCPClose(struct tcp_pcb *pcb); +err_t LibTCPClose(struct tcp_pcb *pcb, const int safe); err_t LibTCPGetPeerName(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t *port); err_t LibTCPGetHostName(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t *port); void LibTCPAccept(struct tcp_pcb *pcb, struct tcp_pcb *listen_pcb, void *arg); 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] Mon Jul 11 12:36:07 2011 @@ -437,34 +437,57 @@ } err_t -LibTCPSend(struct tcp_pcb *pcb, void *dataptr, u16_t len) -{ - struct send_callback_msg *msg; +LibTCPSend(struct tcp_pcb *pcb, const void *dataptr, const u16_t len, const int safe) +{ err_t ret; if (!pcb) return ERR_CLSD; - - msg = ExAllocatePool(NonPagedPool, sizeof(struct send_callback_msg)); - if (msg) - { - KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); - msg->Pcb = pcb; - msg->Data = dataptr; - msg->DataLength = len; - - tcpip_callback_with_block(LibTCPSendCallback, msg, 1); - - if (WaitForEventSafely(&msg->Event)) - ret = msg->Error; + + /* + 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(pcb) < len) + { + ret = ERR_INPROGRESS; + } else - ret = ERR_CLSD; - - DbgPrint("LibTCPSend(0x%x)\n", pcb); - - ExFreePool(msg); - + { + ret = tcp_write(pcb, dataptr, len, TCP_WRITE_FLAG_COPY); + tcp_output(pcb); + } + return ret; + } + else + { + struct send_callback_msg *msg; + + msg = ExAllocatePool(NonPagedPool, sizeof(struct send_callback_msg)); + if (msg) + { + KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); + msg->Pcb = pcb; + 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("LibTCPSend(0x%x)\n", pcb); + + ExFreePool(msg); + + return ret; + } } return ERR_MEM; @@ -496,9 +519,7 @@ tcp_recv(msg->Pcb, InternalRecvEventHandler); tcp_sent(msg->Pcb, InternalSendEventHandler); - - //if (msg->Error == ERR_OK) - // msg->Error = ERR_INPROGRESS; + err_t Error = tcp_connect(msg->Pcb, msg->IpAddress, ntohs(msg->Port), InternalConnectEventHandler); msg->Error = Error == ERR_OK ? ERR_INPROGRESS : Error; @@ -648,9 +669,8 @@ } err_t -LibTCPClose(struct tcp_pcb *pcb) -{ - struct close_callback_msg *msg; +LibTCPClose(struct tcp_pcb *pcb, const int safe) +{ err_t ret; DbgPrint("[lwIP, LibTCPClose] Called on pcb = 0x%x\n", pcb); @@ -681,32 +701,58 @@ tcp_accept(pcb, NULL); DbgPrint("[lwIP, LibTCPClose] Attempting to allocate memory for msg\n"); - - msg = ExAllocatePool(NonPagedPool, sizeof(struct close_callback_msg)); - if (msg) - { - DbgPrint("[lwIP, LibTCPClose] Initializing msg->Event\n"); - KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); - - DbgPrint("[lwIP, LibTCPClose] Initializing msg->pcb = 0x%x\n", pcb); - msg->Pcb = pcb; - - DbgPrint("[lwIP, LibTCPClose] Attempting to call LibTCPCloseCallback\n"); - - tcpip_callback_with_block(LibTCPCloseCallback, msg, 1); - - if (WaitForEventSafely(&msg->Event)) - ret = msg->Error; + + /* + 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 (pcb->state == LISTEN) + { + DbgPrint("[lwIP, LibTCPClose] Closing a listener\n"); + ret = tcp_close(pcb); + } else - ret = ERR_CLSD; - - ExFreePool(msg); - - DbgPrint("[lwIP, LibTCPClose] pcb = 0x%x\n", pcb); - - DbgPrint("[lwIP, LibTCPClose] Done\n"); - + { + DbgPrint("[lwIP, LibTCPClose] Aborting a connection\n"); + tcp_abort(pcb); + ret = ERR_OK; + } + return ret; + } + else + { + struct close_callback_msg *msg; + + msg = ExAllocatePool(NonPagedPool, sizeof(struct close_callback_msg)); + if (msg) + { + DbgPrint("[lwIP, LibTCPClose] Initializing msg->Event\n"); + KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); + + DbgPrint("[lwIP, LibTCPClose] Initializing msg->pcb = 0x%x\n", pcb); + msg->Pcb = pcb; + + DbgPrint("[lwIP, LibTCPClose] Attempting to call LibTCPCloseCallback\n"); + + tcpip_callback_with_block(LibTCPCloseCallback, msg, 1); + + if (WaitForEventSafely(&msg->Event)) + ret = msg->Error; + else + ret = ERR_CLSD; + + ExFreePool(msg); + + DbgPrint("[lwIP, LibTCPClose] pcb = 0x%x\n", pcb); + + DbgPrint("[lwIP, LibTCPClose] Done\n"); + + return ret; + } } DbgPrint("[lwIP, LibTCPClose] Failed to allocate memory\n");

13 years, 5 months

[arty] 52629: [CMAKE] Fix my mistake returning the original space, rather than the mapped area.

by arty＠svn.reactos.org

Author: arty Date: Mon Jul 11 07:11:12 2011 New Revision: 52629 URL: http://svn.reactos.org/svn/reactos?rev=52629&view=rev Log: [CMAKE] Fix my mistake returning the original space, rather than the mapped area. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c [iso-8859-1] Mon Jul 11 07:11:12 2011 @@ -678,7 +678,7 @@ NtFreeVirtualMemory(CURRENT_PROCESS, &Base, &RegionSize, MEM_RELEASE); return NULL; } - return &Hdr[1]; + return &MappedHdr[1]; } }

13 years, 5 months

[tkreuzer] 52628: [NTOSKRNL] Implement the "SLIST hack". It checks whether the access to the Next member of the first list item of an iSList caused the exception, this can happen, when a concurrent...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 11 03:36:29 2011 New Revision: 52628 URL: http://svn.reactos.org/svn/reactos?rev=52628&view=rev Log: [NTOSKRNL] Implement the "SLIST hack". It checks whether the access to the Next member of the first list item of an iSList caused the exception, this can happen, when a concurrent thread pops the first entry and frees its memory between the point where the address of the entry is loaded and the access to it. This is done before the call to MmAccessFault to handle the theoretical scenario of a guard page exception being triggered by the fault, which we don't want to be handled. Currently only kernel mode is handled. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Mon Jul 11 03:36:29 2011 @@ -457,6 +457,7 @@ extern VOID __cdecl KiTrap13(VOID); extern VOID __cdecl KiFastCallEntry(VOID); extern VOID NTAPI ExpInterlockedPopEntrySListFault(VOID); +extern VOID NTAPI ExpInterlockedPopEntrySListResume(VOID); extern VOID __cdecl CopyParams(VOID); extern VOID __cdecl ReadBatch(VOID); extern VOID __cdecl FrRestore(VOID); Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Mon Jul 11 03:36:29 2011 @@ -1199,20 +1199,41 @@ #endif } + /* Check for S-LIST fault in kernel mode */ + if (TrapFrame->Eip == (ULONG_PTR)ExpInterlockedPopEntrySListFault) + { + PSLIST_HEADER SListHeader; + + /* Sanity check that the assembly is correct: + This must be mov ebx, [eax] + Followed by cmpxchg8b [ebp] */ + ASSERT((((UCHAR*)TrapFrame->Eip)[0] == 0x8B) && + (((UCHAR*)TrapFrame->Eip)[1] == 0x18) && + (((UCHAR*)TrapFrame->Eip)[2] == 0x0F) && + (((UCHAR*)TrapFrame->Eip)[3] == 0xC7) && + (((UCHAR*)TrapFrame->Eip)[4] == 0x4D) && + (((UCHAR*)TrapFrame->Eip)[5] == 0x00)); + + /* Get the pointer to the SLIST_HEADER */ + SListHeader = (PSLIST_HEADER)TrapFrame->Ebp; + + /* Check if the Next member of the SLIST_HEADER was changed */ + if (SListHeader->Next.Next != (PSLIST_ENTRY)TrapFrame->Eax) + { + /* Restart the operation */ + TrapFrame->Eip = (ULONG_PTR)ExpInterlockedPopEntrySListResume; + + /* Continue execution */ + KiEoiHelper(TrapFrame); + } + } + /* Call the access fault handler */ Status = MmAccessFault(TrapFrame->ErrCode & 1, (PVOID)Cr2, TrapFrame->SegCs & MODE_MASK, TrapFrame); if (NT_SUCCESS(Status)) KiEoiHelper(TrapFrame); - - /* Check for S-LIST fault */ - if (TrapFrame->Eip == (ULONG_PTR)ExpInterlockedPopEntrySListFault) - { - /* Not yet implemented */ - UNIMPLEMENTED; - while (TRUE); - } /* Check for syscall fault */ #if 0

13 years, 5 months

[cgutman] 52627: [OSKITTCP] - Fix a crash that occurs during BitTorrent downloads - The official BitTorrent client works now

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jul 11 02:44:32 2011 New Revision: 52627 URL: http://svn.reactos.org/svn/reactos?rev=52627&view=rev Log: [OSKITTCP] - Fix a crash that occurs during BitTorrent downloads - The official BitTorrent client works now Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Mon Jul 11 02:44:32 2011 @@ -550,6 +550,12 @@ OSKLock(); inp = (struct inpcb *)so->so_pcb; + if (!inp) + { + OSKUnlock(); + return OSK_ESHUTDOWN; + } + inp->inp_laddr.s_addr = LocalAddress; inp->inp_lport = LocalPort; inp->inp_faddr.s_addr = RemoteAddress; @@ -572,6 +578,12 @@ OSKLock(); inp = (struct inpcb *)so->so_pcb; + if (!inp) + { + OSKUnlock(); + return OSK_ESHUTDOWN; + } + *LocalAddress = inp->inp_laddr.s_addr; *LocalPort = inp->inp_lport; *RemoteAddress = inp->inp_faddr.s_addr;

13 years, 5 months

[ion] 52626: [NTDLL]: Always compile your code before comitting, like my cat used to say.

by ion＠svn.reactos.org

Author: ion Date: Mon Jul 11 01:22:01 2011 New Revision: 52626 URL: http://svn.reactos.org/svn/reactos?rev=52626&view=rev Log: [NTDLL]: Always compile your code before comitting, like my cat used to say. Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=52626&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Mon Jul 11 01:22:01 2011 @@ -167,7 +167,7 @@ RtlGetCurrentDirectory_U(IN ULONG MaximumLength, IN PWSTR Buffer) { - ULONG Length; + ULONG Length, Bytes; PCURDIR CurDir; PWSTR CurDirName; DPRINT("RtlGetCurrentDirectory %lu %p\n", MaximumLength, Buffer); @@ -183,7 +183,7 @@ /* Check for x:\ vs x:\path\foo (note the trailing slash) */ Bytes = Length * sizeof(WCHAR); - if ((Length <= 1) || (CurDirName[Length - 2] == ":")) + if ((Length <= 1) || (CurDirName[Length - 2] == L':')) { /* Check if caller does not have enough space */ if (MaximumLength <= Bytes) @@ -211,7 +211,7 @@ ASSERT(Buffer[Length - 1] == L'\\'); /* Again check for our two cases (drive root vs path) */ - if ((Length <= 1) || (Buffer[Length - 2] != ":")) + if ((Length <= 1) || (Buffer[Length - 2] != L':')) { /* Replace the trailing slash with a null */ Buffer[Length - 1] = UNICODE_NULL;

13 years, 5 months

[ion] 52625: [NTDLL]: Reimplement RtlGetCurrentDirectory_U... I couldn't even understand what the old version was doing. This one is at least commented and makes more sense.

by ion＠svn.reactos.org

Author: ion Date: Mon Jul 11 01:13:34 2011 New Revision: 52625 URL: http://svn.reactos.org/svn/reactos?rev=52625&view=rev Log: [NTDLL]: Reimplement RtlGetCurrentDirectory_U... I couldn't even understand what the old version was doing. This one is at least commented and makes more sense. Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=52625&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Mon Jul 11 01:13:34 2011 @@ -159,49 +159,75 @@ return 0; } - /* * @implemented */ -ULONG NTAPI -RtlGetCurrentDirectory_U(ULONG MaximumLength, - PWSTR Buffer) -{ - ULONG Length; - PCURDIR cd; - - DPRINT ("RtlGetCurrentDirectory %lu %p\n", MaximumLength, Buffer); - - RtlAcquirePebLock(); - - cd = (PCURDIR)&(NtCurrentPeb ()->ProcessParameters->CurrentDirectory.DosPath); - Length = cd->DosPath.Length / sizeof(WCHAR); - if (cd->DosPath.Buffer[Length - 1] == L'\\' && - cd->DosPath.Buffer[Length - 2] != L':') - Length--; - - DPRINT ("cd->DosPath.Buffer %S Length %lu\n", - cd->DosPath.Buffer, Length); - - if (MaximumLength / sizeof(WCHAR) > Length) - { - memcpy (Buffer, - cd->DosPath.Buffer, - Length * sizeof(WCHAR)); - Buffer[Length] = 0; - } - else - { - Length++; - } - - RtlReleasePebLock (); - - DPRINT ("CurrentDirectory %S\n", Buffer); - - return (Length * sizeof(WCHAR)); -} - +ULONG +NTAPI +RtlGetCurrentDirectory_U(IN ULONG MaximumLength, + IN PWSTR Buffer) +{ + ULONG Length; + PCURDIR CurDir; + PWSTR CurDirName; + DPRINT("RtlGetCurrentDirectory %lu %p\n", MaximumLength, Buffer); + + /* Lock the PEB to get the current directory */ + RtlAcquirePebLock(); + CurDir = &NtCurrentPeb()->ProcessParameters->CurrentDirectory; + + /* Get the buffer and character length */ + CurDirName = CurDir->DosPath.Buffer; + Length = CurDir->DosPath.Length / sizeof(WCHAR); + ASSERT((CurDirName != NULL) && (Length > 0)); + + /* Check for x:\ vs x:\path\foo (note the trailing slash) */ + Bytes = Length * sizeof(WCHAR); + if ((Length <= 1) || (CurDirName[Length - 2] == ":")) + { + /* Check if caller does not have enough space */ + if (MaximumLength <= Bytes) + { + /* Call has no space for it, fail, add the trailing slash */ + RtlReleasePebLock(); + return Bytes + sizeof(L'\\'); + } + } + else + { + /* Check if caller does not have enough space */ + if (MaximumLength <= Bytes) + { + /* Call has no space for it, fail */ + RtlReleasePebLock(); + return Bytes; + } + } + + /* Copy the buffer since we seem to have space */ + RtlCopyMemory(Buffer, CurDirName, Bytes); + + /* The buffer should end with a path separator */ + ASSERT(Buffer[Length - 1] == L'\\'); + + /* Again check for our two cases (drive root vs path) */ + if ((Length <= 1) || (Buffer[Length - 2] != ":")) + { + /* Replace the trailing slash with a null */ + Buffer[Length - 1] = UNICODE_NULL; + --Length; + } + else + { + /* Append the null char since there's no trailing slash */ + Buffer[Length] = UNICODE_NULL; + } + + /* Release PEB lock */ + RtlReleasePebLock(); + DPRINT("CurrentDirectory %S\n", Buffer); + return Length * sizeof(WCHAR); +} /* * @implemented

13 years, 5 months

[ion] 52624: [RTL]: RtlDetermineDosPathNameType_U Path is not optional. Checked build ASSERTs if not present. Also, \\? is valid, not only \\., so this should fix a bunch of incorrect path determin...

by ion＠svn.reactos.org

Author: ion Date: Mon Jul 11 00:47:44 2011 New Revision: 52624 URL: http://svn.reactos.org/svn/reactos?rev=52624&view=rev Log: [RTL]: RtlDetermineDosPathNameType_U Path is not optional. Checked build ASSERTs if not present. Also, \\? is valid, not only \\., so this should fix a bunch of incorrect path determinations. Aren't there supposed to be unit tests for these things?! Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=52624&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Mon Jul 11 00:47:44 2011 @@ -66,32 +66,29 @@ * @implemented * */ -ULONG NTAPI -RtlDetermineDosPathNameType_U(PCWSTR Path) -{ - DPRINT("RtlDetermineDosPathNameType_U %S\n", Path); - - if (Path == NULL) - { - return RtlPathTypeUnknown; - } - - if (IS_PATH_SEPARATOR(Path[0])) - { - if (!IS_PATH_SEPARATOR(Path[1])) return RtlPathTypeRooted; /* \xxx */ - if (Path[2] != L'.') return RtlPathTypeUncAbsolute; /* \\xxx */ - if (IS_PATH_SEPARATOR(Path[3])) return RtlPathTypeLocalDevice; /* \\.\xxx */ - if (Path[3]) return RtlPathTypeUncAbsolute; /* \\.xxxx */ - - return RtlPathTypeRootLocalDevice; /* \\. */ - } - else - { - if (!Path[0] || Path[1] != L':') return RtlPathTypeRelative; /* xxx */ - if (IS_PATH_SEPARATOR(Path[2])) return RtlPathTypeDriveAbsolute; /* x:\xxx */ - - return RtlPathTypeDriveRelative; /* x:xxx */ - } +ULONG +NTAPI +RtlDetermineDosPathNameType_U(IN PCWSTR Path) +{ + DPRINT("RtlDetermineDosPathNameType_U %S\n", Path); + ASSERT(Path != NULL); + + if (IS_PATH_SEPARATOR(Path[0])) + { + if (!IS_PATH_SEPARATOR(Path[1])) return RtlPathTypeRooted; /* \xxx */ + if ((Path[2] != L'.') && (Path[2] != L'?')) return RtlPathTypeUncAbsolute;/* \\xxx */ + if (IS_PATH_SEPARATOR(Path[3])) return RtlPathTypeLocalDevice; /* \\.\xxx */ + if (Path[3]) return RtlPathTypeUncAbsolute; /* \\.xxxx */ + + return RtlPathTypeRootLocalDevice; /* \\. */ + } + else + { + if (!(Path[0]) || (Path[1] != L':')) return RtlPathTypeRelative; /* xxx */ + if (IS_PATH_SEPARATOR(Path[2])) return RtlPathTypeDriveAbsolute; /* x:\xxx */ + + return RtlPathTypeDriveRelative; /* x:xxx */ + } }

13 years, 5 months

← Newer
1
...
36
37
38
39
40
41
42
...
52
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 July 2011