Ros-diffs August 2010

ros-diffs@reactos.org

14 participants
282 discussions

[mjmartin] 48632: [ntoskrnl/ps] - When deleting a Process remove the Process from the MmProcessList. Fixes random NonPaged Pool corruptions. Thanks aicom for assistance.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat Aug 28 00:26:02 2010 New Revision: 48632 URL: http://svn.reactos.org/svn/reactos?rev=48632&view=rev Log: [ntoskrnl/ps] - When deleting a Process remove the Process from the MmProcessList. Fixes random NonPaged Pool corruptions. Thanks aicom for assistance. Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=486… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Sat Aug 28 00:26:02 2010 @@ -300,6 +300,8 @@ /* Detach */ KeUnstackDetachProcess(&ApcState); + + RemoveEntryList(&Process->MmProcessLinks); /* Completely delete the Address Space */ MmDeleteProcessAddressSpace(Process);

14 years

[mjmartin] 48631: [ntoskrnl/ps] - Acquire and Release RundownProtection on the Parent Pocess not the newly created Pcess when setting the SectionObject.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Fri Aug 27 22:18:10 2010 New Revision: 48631 URL: http://svn.reactos.org/svn/reactos?rev=48631&view=rev Log: [ntoskrnl/ps] - Acquire and Release RundownProtection on the Parent Pocess not the newly created Pcess when setting the SectionObject. Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Fri Aug 27 22:18:10 2010 @@ -469,14 +469,14 @@ if (Parent != PsInitialSystemProcess) { /* It's not, so acquire the process rundown */ - if (ExAcquireRundownProtection(&Process->RundownProtect)) + if (ExAcquireRundownProtection(&Parent->RundownProtect)) { /* If the parent has a section, use it */ SectionObject = Parent->SectionObject; if (SectionObject) ObReferenceObject(SectionObject); /* Release process rundown */ - ExReleaseRundownProtection(&Process->RundownProtect); + ExReleaseRundownProtection(&Parent->RundownProtect); } /* If we don't have a section object */

14 years

[tkreuzer] 48630: [WIN32K] - Rework EngSetPointerShape, to first allocate the neccessary surfaces, before deleting the old ones. Also check in IntShowMousePointer if a saving surface is present. Th...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 27 10:57:54 2010 New Revision: 48630 URL: http://svn.reactos.org/svn/reactos?rev=48630&view=rev Log: [WIN32K] - Rework EngSetPointerShape, to first allocate the neccessary surfaces, before deleting the old ones. Also check in IntShowMousePointer if a saving surface is present. This way a failure to allocate a surface will not result in a crash, but keep the old mouse pointer. See issue #5402 for more details. Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Fri Aug 27 10:57:54 2010 @@ -208,6 +208,9 @@ } pgp->Enabled = TRUE; + + /* Check if we have any mouse pointer */ + if (!pgp->psurfSave) return; /* Calculate pointer coordinates */ pt.x = ppdev->ptlPointer.x - pgp->HotSpot.x; @@ -318,42 +321,117 @@ { PDEVOBJ *ppdev; GDIPOINTER *pgp; - LONG lDelta; - HBITMAP hbmp; - RECTL rcl; + LONG lDelta = 0; + HBITMAP hbmSave = NULL, hbmColor = NULL, hbmMask = NULL; + PSURFACE psurfSave = NULL, psurfColor = NULL, psurfMask = NULL; + RECTL rectl; + SIZEL sizel = {0, 0}; ASSERT(pso); ppdev = GDIDEV(pso); pgp = &ppdev->Pointer; + /* Do we have any bitmap at all? */ + if (psoColor || psoMask) + { + /* Get the size of the new pointer */ + if (psoColor) + { + sizel.cx = psoColor->sizlBitmap.cx; + sizel.cy = psoColor->sizlBitmap.cy; + } + else// if (psoMask) + { + sizel.cx = psoMask->sizlBitmap.cx; + sizel.cy = psoMask->sizlBitmap.cy / 2; + } + + rectl.left = 0; + rectl.top = 0; + rectl.right = sizel.cx; + rectl.bottom = sizel.cy; + + /* Calculate lDelta for our surfaces. */ + lDelta = DIB_GetDIBWidthBytes(sizel.cx, + BitsPerFormat(pso->iBitmapFormat)); + + /* Create a bitmap for saving the pixels under the cursor. */ + hbmSave = EngCreateBitmap(sizel, + lDelta, + pso->iBitmapFormat, + BMF_TOPDOWN | BMF_NOZEROINIT, + NULL); + psurfSave = SURFACE_ShareLockSurface(hbmSave); + if (!psurfSave) goto failure; + } + if (psoColor) { - pgp->Size.cx = psoColor->sizlBitmap.cx; - pgp->Size.cy = psoColor->sizlBitmap.cy; - if (psoMask) - { - // CHECKME: Is this really required? if we have a color surface, - // we only need the AND part of the mask. - /* Check if the sizes match as they should */ - if (psoMask->sizlBitmap.cx != psoColor->sizlBitmap.cx || - psoMask->sizlBitmap.cy != psoColor->sizlBitmap.cy * 2) - { - DPRINT("Sizes of mask (%ld,%ld) and color (%ld,%ld) don't match\n", - psoMask->sizlBitmap.cx, psoMask->sizlBitmap.cy, - psoColor->sizlBitmap.cx, psoColor->sizlBitmap.cy); -// return SPS_ERROR; - } - } - } - else if (psoMask) - { - pgp->Size.cx = psoMask->sizlBitmap.cx; - pgp->Size.cy = psoMask->sizlBitmap.cy / 2; - } - + /* Color bitmap must have the same format as the dest surface */ + if (psoColor->iBitmapFormat != pso->iBitmapFormat) goto failure; + + /* Create a bitmap to copy the color bitmap to */ + hbmColor = EngCreateBitmap(psoColor->sizlBitmap, + lDelta, + pso->iBitmapFormat, + BMF_TOPDOWN | BMF_NOZEROINIT, + NULL); + psurfColor = SURFACE_ShareLockSurface(hbmColor); + if (!psurfColor) goto failure; + + /* Now copy the given bitmap */ + rectl.bottom = psoColor->sizlBitmap.cy; + IntEngCopyBits(&psurfColor->SurfObj, + psoColor, + NULL, + pxlo, + &rectl, + (POINTL*)&rectl); + } + + /* Create a mask surface */ + if (psoMask) + { + EXLATEOBJ exlo; + PPALETTE ppal; + + /* Create a bitmap for the mask */ + hbmMask = EngCreateBitmap(psoMask->sizlBitmap, + lDelta, + pso->iBitmapFormat, + BMF_TOPDOWN | BMF_NOZEROINIT, + NULL); + psurfMask = SURFACE_ShareLockSurface(hbmMask); + if (!psurfMask) goto failure; + + /* Initialize an EXLATEOBJ */ + ppal = PALETTE_LockPalette(ppdev->devinfo.hpalDefault); + EXLATEOBJ_vInitialize(&exlo, + &gpalMono, + ppal, + 0, + RGB(0xff,0xff,0xff), + RGB(0,0,0)); + + /* Copy the mask bitmap */ + rectl.bottom = psoMask->sizlBitmap.cy; + IntEngCopyBits(&psurfMask->SurfObj, + psoMask, + NULL, + &exlo.xlo, + &rectl, + (POINTL*)&rectl); + + /* Cleanup */ + EXLATEOBJ_vCleanup(&exlo); + if (ppal) PALETTE_UnlockPalette(ppal); + } + + /* Hide mouse pointer */ IntHideMousePointer(ppdev, pso); + /* Free old color bitmap */ if (pgp->psurfColor) { EngDeleteSurface(pgp->psurfColor->BaseObject.hHmgr); @@ -361,6 +439,7 @@ pgp->psurfColor = NULL; } + /* Free old mask bitmap */ if (pgp->psurfMask) { EngDeleteSurface(pgp->psurfMask->BaseObject.hHmgr); @@ -368,7 +447,8 @@ pgp->psurfMask = NULL; } - if (pgp->psurfSave != NULL) + /* Free old save bitmap */ + if (pgp->psurfSave) { EngDeleteSurface(pgp->psurfSave->BaseObject.hHmgr); SURFACE_ShareUnlockSurface(pgp->psurfSave); @@ -378,94 +458,17 @@ /* See if we are being asked to hide the pointer. */ if (psoMask == NULL && psoColor == NULL) { + /* We're done */ return SPS_ACCEPT_NOEXCLUDE; } + /* Now set the new cursor */ + pgp->psurfColor = psurfColor; + pgp->psurfMask = psurfMask; + pgp->psurfSave = psurfSave; pgp->HotSpot.x = xHot; pgp->HotSpot.y = yHot; - - /* Calculate lDelta for our surfaces. */ - lDelta = DIB_GetDIBWidthBytes(pgp->Size.cx, - BitsPerFormat(pso->iBitmapFormat)); - - rcl.left = 0; - rcl.top = 0; - rcl.right = pgp->Size.cx; - rcl.bottom = pgp->Size.cy; - - /* Create surface for saving the pixels under the cursor. */ - hbmp = EngCreateBitmap(pgp->Size, - lDelta, - pso->iBitmapFormat, - BMF_TOPDOWN | BMF_NOZEROINIT, - NULL); - pgp->psurfSave = SURFACE_ShareLockSurface(hbmp); - - /* Create a mask surface */ - if (psoMask) - { - EXLATEOBJ exlo; - PPALETTE ppal; - - hbmp = EngCreateBitmap(psoMask->sizlBitmap, - lDelta, - pso->iBitmapFormat, - BMF_TOPDOWN | BMF_NOZEROINIT, - NULL); - pgp->psurfMask = SURFACE_ShareLockSurface(hbmp); - - if(pgp->psurfMask) - { - ppal = PALETTE_LockPalette(ppdev->devinfo.hpalDefault); - EXLATEOBJ_vInitialize(&exlo, - &gpalMono, - ppal, - 0, - RGB(0xff,0xff,0xff), - RGB(0,0,0)); - - rcl.bottom = psoMask->sizlBitmap.cy; - IntEngCopyBits(&pgp->psurfMask->SurfObj, - psoMask, - NULL, - &exlo.xlo, - &rcl, - (POINTL*)&rcl); - - EXLATEOBJ_vCleanup(&exlo); - if (ppal) - PALETTE_UnlockPalette(ppal); - } - } - else - { - pgp->psurfMask = NULL; - } - - /* Create a color surface */ - if (psoColor) - { - hbmp = EngCreateBitmap(psoColor->sizlBitmap, - lDelta, - pso->iBitmapFormat, - BMF_TOPDOWN | BMF_NOZEROINIT, - NULL); - pgp->psurfColor = SURFACE_ShareLockSurface(hbmp); - if (pgp->psurfColor) - { - rcl.bottom = psoColor->sizlBitmap.cy; - IntEngCopyBits(&pgp->psurfColor->SurfObj, - psoColor, - NULL, - pxlo, - &rcl, - (POINTL*)&rcl); - } - } - else - { - pgp->psurfColor = NULL; - } + pgp->Size = sizel; if (x != -1) { @@ -488,6 +491,17 @@ } return SPS_ACCEPT_NOEXCLUDE; + +failure: + /* Cleanup surfaces */ + if (hbmMask) EngDeleteSurface(hbmMask); + if (psurfMask) SURFACE_ShareUnlockSurface(psurfMask); + if (hbmColor) EngDeleteSurface(hbmColor); + if (psurfColor) SURFACE_ShareUnlockSurface(psurfColor); + if (hbmSave) EngDeleteSurface(hbmSave); + if (psurfSave) SURFACE_ShareUnlockSurface(psurfSave); + + return SPS_ERROR; } /*

14 years

[tkreuzer] 48629: [USER32] - Revert r47238 as requested by Giannis: "this commit breaks any program that wants to subclass mdi client windows"

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 27 10:20:25 2010 New Revision: 48629 URL: http://svn.reactos.org/svn/reactos?rev=48629&view=rev Log: [USER32] - Revert r47238 as requested by Giannis: "this commit breaks any program that wants to subclass mdi client windows" Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Fri Aug 27 10:20:25 2010 @@ -342,18 +342,6 @@ POINT mPos[2]; UINT id = 0; HWND top_child; - PWND WndParent; - PCLS pcls; - - if(!(WndParent = ValidateHwnd(hWndParent)) || - !(pcls = DesktopPtrToUser(WndParent->pcls))) - return 0; - - if (pcls->fnid != FNID_MDICLIENT) - { - ERR("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent); - return 0; - } /* lpParams of WM_[NC]CREATE is different for MDI children. * MDICREATESTRUCT members have the originally passed values. @@ -466,24 +454,6 @@ POINT mPos[2]; UINT id = 0; HWND top_child; - PWND WndParent; - PCLS pcls; - - WndParent = ValidateHwnd(hWndParent); - - if(!WndParent) - return 0; - - pcls = DesktopPtrToUser(WndParent->pcls); - - if(!pcls) - return 0; - - if (pcls->fnid != FNID_MDICLIENT) - { - ERR("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent); - return 0; - } /* lpParams of WM_[NC]CREATE is different for MDI children. * MDICREATESTRUCT members have the originally passed values.

14 years

[cgutman] 48628: [OSKITTCP] - Only tell the caller how much we sent/received if it completed successfully - Set SO_DONTROUTE on accepted sockets too - Disable the core routing code - Make our MSS c...

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 27 04:46:04 2010 New Revision: 48628 URL: http://svn.reactos.org/svn/reactos?rev=48628&view=rev Log: [OSKITTCP] - Only tell the caller how much we sent/received if it completed successfully - Set SO_DONTROUTE on accepted sockets too - Disable the core routing code - Make our MSS calculation much better by sharing the existing code Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c trunk/reactos/lib/drivers/oskittcp/oskittcp/route.c trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.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] Fri Aug 27 04:46:04 2010 @@ -114,6 +114,12 @@ DbgPrint ( line ); } +void InitializeSocketFlags(struct socket *so) +{ + so->so_state |= SS_NBIO; + so->so_options |= SO_DONTROUTE; +} + /* From uipc_syscalls.c */ int OskitTCPSocket( void *context, @@ -128,8 +134,7 @@ int error = socreate(domain, &so, type, proto); if( !error ) { so->so_connection = context; - so->so_state |= SS_NBIO; - so->so_options |= SO_DONTROUTE; + InitializeSocketFlags(so); *aso = so; } OSKUnlock(); @@ -171,7 +176,7 @@ &tcp_flags ); OSKUnlock(); - *OutLen = Len - uio.uio_resid; + if (error == 0) *OutLen = Len - uio.uio_resid; return error; } @@ -318,7 +323,7 @@ error = sosend( socket, NULL, &uio, NULL, NULL, 0 ); OSKUnlock(); - *OutLen = Len - uio.uio_resid; + if (error == 0) *OutLen = Len - uio.uio_resid; return error; } @@ -400,7 +405,8 @@ if (error) goto out; - so->so_state |= SS_NBIO | SS_ISCONNECTED; + InitializeSocketFlags(so); + so->so_state |= SS_ISCONNECTED; so->so_q = so->so_q0 = NULL; so->so_qlen = so->so_q0len = 0; so->so_head = 0; Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/route.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/route.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/route.c [iso-8859-1] Fri Aug 27 04:46:04 2010 @@ -106,6 +106,7 @@ int report; u_long ignflags; { +#ifndef __REACTOS__ register struct radix_node_head *rnh = rt_tables[dst->sa_family]; register struct rtentry *rt; register struct radix_node *rn; @@ -142,6 +143,9 @@ } splx(s); return (newrt); +#else + return NULL; +#endif } void Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] Fri Aug 27 04:46:04 2010 @@ -1973,31 +1973,26 @@ struct tcpcb *tp; int offer; { +#ifndef __REACTOS__ register struct rtentry *rt; struct ifnet *ifp = NULL; - register int rtt, mss; + struct rmxp_tao *taop; + register int rtt; +#endif + register int mss; u_long bufsize; struct inpcb *inp; struct socket *so; - struct rmxp_tao *taop; int origoffer = offer; inp = tp->t_inpcb; + so = inp->inp_socket; +#ifndef __REACTOS__ if ((rt = tcp_rtlookup(inp)) == NULL) { -#ifndef __REACTOS__ tp->t_maxopd = tp->t_maxseg = tcp_mssdflt; -#else - if (offer < tcp_mssdflt) - tp->t_maxopd = tp->t_maxseg = tcp_mssdflt; - else - tp->t_maxopd = tp->t_maxseg = min(offer, tcp_mssopt(tp)); -#endif return; } -#ifndef __REACTOS__ ifp = rt->rt_ifp; -#endif - so = inp->inp_socket; taop = rmx_taop(rt->rt_rmx); /* @@ -2006,6 +2001,7 @@ */ if (offer == -1) offer = taop->tao_mssopt; +#endif /* * Offer == 0 means that there was no MSS on the SYN segment, * in this case we use tcp_mssdflt. @@ -2020,6 +2016,7 @@ * funny things may happen in tcp_output. */ offer = max(offer, 64); +#ifndef __REACTOS__ taop->tao_mssopt = offer; /* @@ -2060,6 +2057,10 @@ if (!in_localaddr(inp->inp_faddr)) mss = min(mss, tcp_mssdflt); } +#else + mss = tcp_mssopt(tp); + mss = min(mss, tcp_mssdflt); +#endif mss = min(mss, offer); /* * maxopd stores the maximum length of data AND options @@ -2097,7 +2098,7 @@ * number of mss units; if the mss is larger than * the socket buffer, decrease the mss. */ -#ifdef RTV_SPIPE +#if defined(RTV_SPIPE) && !defined(__REACTOS__) if ((bufsize = rt->rt_rmx.rmx_sendpipe) == 0) #endif bufsize = so->so_snd.sb_hiwat; @@ -2111,7 +2112,7 @@ } tp->t_maxseg = mss; -#ifdef RTV_RPIPE +#if defined(RTV_RPIPE) && !defined(__REACTOS__) if ((bufsize = rt->rt_rmx.rmx_recvpipe) == 0) #endif bufsize = so->so_rcv.sb_hiwat; @@ -2121,12 +2122,15 @@ bufsize = sb_max; (void)sbreserve(&so->so_rcv, bufsize); } +#ifndef __REACTOS__ /* * Don't force slow-start on local network. */ if (!in_localaddr(inp->inp_faddr)) +#endif tp->snd_cwnd = mss; +#ifndef __REACTOS__ if (rt->rt_rmx.rmx_ssthresh) { /* * There's some sort of gateway or interface @@ -2137,6 +2141,7 @@ tp->snd_ssthresh = max(2 * mss, rt->rt_rmx.rmx_ssthresh); tcpstat.tcps_usedssthresh++; } +#endif } /*

14 years

[cfinck] 48627: Fix building on newer Linux systems (particularly Fedora 13) Thanks to James, Sylvain and ErVito for testing! See http://reactos.org/pipermail/ros-dev/2010-August/013338.html for mo...

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Aug 26 18:33:46 2010 New Revision: 48627 URL: http://svn.reactos.org/svn/reactos?rev=48627&view=rev Log: Fix building on newer Linux systems (particularly Fedora 13) Thanks to James, Sylvain and ErVito for testing! See http://reactos.org/pipermail/ros-dev/2010-August/013338.html for more details Modified: trunk/reactos/tools/cabman/cabinet.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Thu Aug 26 18:33:46 2010 @@ -20,10 +20,9 @@ #include <string.h> #if !defined(WIN32) # include <dirent.h> -#endif -#if defined(__FreeBSD__) || defined(__APPLE__) # include <sys/stat.h> -#endif // __FreeBSD__ +# include <sys/types.h> +#endif #include "cabinet.h" #include "raw.h" #include "mszip.h"

14 years

[tkreuzer] 48626: [NTOSKRNL] - Fix to PpSetCustomTargetEvent(), not to make caller wait forever in case it provided an event it waits for - Patch by Pierre Schweitzer

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Aug 26 15:25:33 2010 New Revision: 48626 URL: http://svn.reactos.org/svn/reactos?rev=48626&view=rev Log: [NTOSKRNL] - Fix to PpSetCustomTargetEvent(), not to make caller wait forever in case it provided an event it waits for - Patch by Pierre Schweitzer Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Thu Aug 26 15:25:33 2010 @@ -132,12 +132,25 @@ ASSERT(NotificationStructure != NULL); ASSERT(DeviceObject != NULL); + if (SyncEvent) + { + ASSERT(SyncStatus); + *SyncStatus = STATUS_PENDING; + } + /* That call is totally wrong but notifications handler must be fixed first */ IopNotifyPlugPlayNotification(DeviceObject, EventCategoryTargetDeviceChange, &GUID_PNP_CUSTOM_NOTIFICATION, NotificationStructure, NULL); + + if (SyncEvent) + { + KeSetEvent(SyncEvent, IO_NO_INCREMENT, FALSE); + *SyncStatus = STATUS_SUCCESS; + } + return STATUS_SUCCESS; }

14 years

[tkreuzer] 48625: Fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Aug 26 02:48:03 2010 New Revision: 48625 URL: http://svn.reactos.org/svn/reactos?rev=48625&view=rev Log: Fix build Modified: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild Modified: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ntdll_apit… ============================================================================== --- trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] Thu Aug 26 02:48:03 2010 @@ -8,7 +8,7 @@ <library>pseh</library> <file>testlist.c</file> - <file>RtlInitializeBitmap.c</file> + <file>RtlInitializeBitMap.c</file> <file>ZwContinue.c</file> <if property="ARCH" value="i386"> <directory name="i386">

14 years

[cgutman] 48624: [OSKITTCP] - Prevent multiple wakeups for the same event which caused nasty problems for the SEL_FIN event because we dereferenced our connection context 3 times which not only cau...

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Aug 26 02:29:38 2010 New Revision: 48624 URL: http://svn.reactos.org/svn/reactos?rev=48624&view=rev Log: [OSKITTCP] - Prevent multiple wakeups for the same event which caused nasty problems for the SEL_FIN event because we dereferenced our connection context 3 times which not only caused the connection endpoint to be freed while holding its spin lock but made the reference count negative [TCPIP] - Disassociate the address file from the connection endpoint before dereferencing/closing it to avoid a double dereference of the address file (not as harmful in this case as in the connection endpoint case) [IP] - Dereference the connection endpoint again if it was associated with an address file as the connection endpoint to fix a reference leak Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket2.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Thu Aug 26 02:29:38 2010 @@ -379,9 +379,15 @@ LockObject(AddrFile, &OldIrql); /* We have to close this connection because we started it */ if( AddrFile->Listener ) + { + AddrFile->Listener->AddressFile = NULL; TCPClose( AddrFile->Listener ); + } if( AddrFile->Connection ) + { + AddrFile->Connection->AddressFile = NULL; DereferenceObject( AddrFile->Connection ); + } UnlockObject(AddrFile, OldIrql); DereferenceObject(AddrFile); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Thu Aug 26 02:29:38 2010 @@ -234,7 +234,10 @@ /* If the socket is dead, remove the reference we added for oskit */ if (Connection->SignalState & SEL_FIN) + { + Connection->SocketContext = NULL; DereferenceObject(Connection); + } } VOID ConnectionFree(PVOID Object) { @@ -663,17 +666,15 @@ KIRQL OldIrql; NTSTATUS Status; PVOID Socket; - - /* We don't rely on SocketContext == NULL for socket - * closure anymore but we still need it to determine - * if we caused the closure - */ + PADDRESS_FILE AddressFile = NULL; + PCONNECTION_ENDPOINT AddressConnection = NULL; + LockObject(Connection, &OldIrql); Socket = Connection->SocketContext; Connection->SocketContext = NULL; /* Don't try to close again if the other side closed us already */ - if (!(Connection->SignalState & SEL_FIN)) + if (Socket) { /* We need to close here otherwise oskit will never indicate * SEL_FIN and we will never fully close the connection */ @@ -693,11 +694,26 @@ } if (Connection->AddressFile) - DereferenceObject(Connection->AddressFile); + { + LockObjectAtDpcLevel(Connection->AddressFile); + if (Connection->AddressFile->Connection == Connection) + { + AddressConnection = Connection->AddressFile->Connection; + Connection->AddressFile->Connection = NULL; + } + UnlockObjectFromDpcLevel(Connection->AddressFile); + + AddressFile = Connection->AddressFile; + Connection->AddressFile = NULL; + } UnlockObject(Connection, OldIrql); DereferenceObject(Connection); + if (AddressConnection) + DereferenceObject(AddressConnection); + if (AddressFile) + DereferenceObject(AddressFile); return Status; } Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket2.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket2.c [iso-8859-1] Thu Aug 26 02:29:38 2010 @@ -118,8 +118,10 @@ wakeup(so, (caddr_t)&head->so_timeo); } else { wakeup(so, (caddr_t)&so->so_timeo); +#ifndef __REACTOS__ sorwakeup(so); sowwakeup(so); +#endif } } @@ -131,8 +133,10 @@ so->so_state &= ~SS_ISCONNECTING; so->so_state |= (SS_ISDISCONNECTING|SS_CANTRCVMORE|SS_CANTSENDMORE); wakeup(so, (caddr_t)&so->so_timeo); +#ifndef __REACTOS__ sowwakeup(so); sorwakeup(so); +#endif } void @@ -144,8 +148,10 @@ so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING); so->so_state |= (SS_CANTRCVMORE|SS_CANTSENDMORE); wakeup(so, (caddr_t)&so->so_timeo); +#ifndef __REACTOS__ sowwakeup(so); sorwakeup(so); +#endif } /* @@ -192,7 +198,9 @@ return ((struct socket *)0); } if (connstatus) { +#ifndef __REACTOS__ sorwakeup(head); +#endif wakeup(head, (caddr_t)&head->so_timeo); so->so_state |= connstatus; }

14 years

[tkreuzer] 48623: [NTDLL_APITEST] - Add a test for RtlInitializeBitMap.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Aug 26 02:29:19 2010 New Revision: 48623 URL: http://svn.reactos.org/svn/reactos?rev=48623&view=rev Log: [NTDLL_APITEST] - Add a test for RtlInitializeBitMap. Added: trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c (with props) Modified: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild trunk/rostests/apitests/ntdll/testlist.c Added: trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlInitial… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c (added) +++ trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c [iso-8859-1] Thu Aug 26 02:29:19 2010 @@ -1,0 +1,44 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for RtlInitializeBitmap + * PROGRAMMERS: Timo Kreuzer + */ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <wine/test.h> +#include <ndk/ntndk.h> + +void Test_RtlInitializeBitmap() +{ + RTL_BITMAP Bitmap; + ULONG Buffer[5]; + + Buffer[0] = 0x12345; + Buffer[1] = 0x23456; + Buffer[2] = 0x34567; + Buffer[3] = 0x45678; + Buffer[4] = 0x56789; + + RtlInitializeBitMap(&Bitmap, Buffer, 19); + ok(Bitmap.Buffer == Buffer, "Buffer=%p\n", Bitmap.Buffer); + ok(Bitmap.SizeOfBitMap == 19, "SizeOfBitMap=%ld\n", Bitmap.SizeOfBitMap); + + ok(Buffer[0] == 0x12345, "Buffer[0] == 0x%lx\n", Buffer[0]); + ok(Buffer[1] == 0x23456, "Buffer[1] == 0x%lx\n", Buffer[1]); + ok(Buffer[2] == 0x34567, "Buffer[2] == 0x%lx\n", Buffer[2]); + ok(Buffer[3] == 0x45678, "Buffer[3] == 0x%lx\n", Buffer[3]); + ok(Buffer[4] == 0x56789, "Buffer[4] == 0x%lx\n", Buffer[4]); + + RtlInitializeBitMap(&Bitmap, 0, -100); + ok(Bitmap.Buffer == 0, "Buffer=%p\n", Bitmap.Buffer); + ok(Bitmap.SizeOfBitMap == -100, "SizeOfBitMap=%ld\n", Bitmap.SizeOfBitMap); + +} + +START_TEST(RtlInitializeBitMap) +{ + Test_RtlInitializeBitmap(); +} + Propchange: trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ntdll_apit… ============================================================================== --- trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] Thu Aug 26 02:29:19 2010 @@ -8,6 +8,7 @@ <library>pseh</library> <file>testlist.c</file> + <file>RtlInitializeBitmap.c</file> <file>ZwContinue.c</file> <if property="ARCH" value="i386"> <directory name="i386"> Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Thu Aug 26 02:29:19 2010 @@ -5,10 +5,12 @@ #define STANDALONE #include "wine/test.h" +extern void func_RtlInitializeBitMap(void); extern void func_ZwContinue(void); const struct test winetest_testlist[] = { + { "RtlInitializeBitMap", func_RtlInitializeBitMap }, { "ZwContinue", func_ZwContinue }, { 0, 0 }

14 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2010