Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[tkreuzer] 40196: - Don't delete an object that has a shared reference! - Implement DC_vSelectSurface, that dereferences the old SURFACE and references the new. Use it instead of doing it manually. - Select NULL surface when doing cleanup. - Go back to ASSERT in GDIOBJ_ShareUnlockObjByPtr. Should (hopefully) not be hit anymore. - Add additional functions for tracing shared locks in gdidbg.c. - Add debugprints when leaking objects on process cleanup.
by tkreuzer＠svn.reactos.org 23 Mar '09

23 Mar '09

Author: tkreuzer Date: Tue Mar 24 02:49:00 2009 New Revision: 40196 URL: http://svn.reactos.org/svn/reactos?rev=40196&view=rev Log: - Don't delete an object that has a shared reference! - Implement DC_vSelectSurface, that dereferences the old SURFACE and references the new. Use it instead of doing it manually. - Select NULL surface when doing cleanup. - Go back to ASSERT in GDIOBJ_ShareUnlockObjByPtr. Should (hopefully) not be hit anymore. - Add additional functions for tracing shared locks in gdidbg.c. - Add debugprints when leaking objects on process cleanup. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Tue Mar 24 02:49:00 2009 @@ -278,6 +278,20 @@ extern PPDEVOBJ pPrimarySurface; +VOID +FORCEINLINE +DC_vSelectSurface(PDC pdc, PSURFACE psurfNew) +{ + PSURFACE psurfOld = pdc->dclevel.pSurface; + if (psurfOld) + SURFACE_ShareUnlockSurface(psurfOld); + + if (psurfNew) + GDIOBJ_IncrementShareCount((POBJ)psurfNew); + + pdc->dclevel.pSurface = psurfNew; +} + BOOL FASTCALL IntPrepareDriverIfNeeded(); extern PDEVOBJ PrimarySurface; Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Tue Mar 24 02:49:00 2009 @@ -104,16 +104,13 @@ GDIOBJ_ShareUnlockObjByPtr(POBJ Object) { INT cLocks = InterlockedDecrement((PLONG)&Object->ulShareCount); -// ASSERT(cLocks >= 0); - if (cLocks < 0) - { - DbgPrint("Unlocked object %p, that was not locked!\n", Object->hHmgr); - KdSystemDebugControl(TAG('R', 'o', 's', 'D'), NULL, 20, NULL, 0, NULL, KernelMode); - InterlockedIncrement((PLONG)&Object->ulShareCount); - } + ASSERT(cLocks >= 0); return cLocks; } +#ifdef GDI_DEBUG +ULONG FASTCALL GDIOBJ_IncrementShareCount(POBJ Object); +#else ULONG FORCEINLINE GDIOBJ_IncrementShareCount(POBJ Object) @@ -122,5 +119,6 @@ ASSERT(cLocks >= 1); return cLocks; } +#endif #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Tue Mar 24 02:49:00 2009 @@ -932,7 +932,7 @@ PDC pDC; PDC_ATTR pdcattr; HBITMAP hOrgBmp; - PSURFACE psurfBmp; + PSURFACE psurfBmp, psurfOld; HRGN hVisRgn; BOOLEAN bFailed; PBRUSH pbrush; @@ -961,23 +961,26 @@ return NULL; } + /* Get the handle for the old bitmap */ + psurfOld = pDC->dclevel.pSurface; + hOrgBmp = psurfOld ? psurfOld->BaseObject.hHmgr : NULL; + + /* FIXME: ros hack */ hOrgBmp = pDC->rosdc.hBitmap; pDC->rosdc.hBitmap = hBmp; - /* Release the old bitmap */ - if (pDC->dclevel.pSurface) - SURFACE_ShareUnlockSurface(pDC->dclevel.pSurface); - + /* Release the old bitmap, reference the new */ + DC_vSelectSurface(pDC, psurfBmp); + // If Info DC this is zero and pSurface is moved to DC->pSurfInfo. - pDC->dclevel.pSurface = psurfBmp; psurfBmp->hDC = hDC; // if we're working with a DIB, get the palette // [fixme: only create if the selected palette is null] if (psurfBmp->hSecure) { -// pDC->rosdcbitsPerPixel = psurfBmp->dib->dsBmih.biBitCount; ??? +// pDC->rosdc.bitsPerPixel = psurfBmp->dib->dsBmih.biBitCount; ??? pDC->rosdc.bitsPerPixel = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); } else @@ -985,16 +988,16 @@ pDC->rosdc.bitsPerPixel = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); } + /* FIXME; improve by using a region without a handle and selecting it */ hVisRgn = NtGdiCreateRectRgn(0, 0, psurfBmp->SurfObj.sizlBitmap.cx, psurfBmp->SurfObj.sizlBitmap.cy); - /* Keep a shared reference on the bitmap */ - GDIOBJ_IncrementShareCount((POBJ)psurfBmp); + /* Release the exclusive lock */ SURFACE_UnlockSurface(psurfBmp); - /* Regenerate the XLATEOBJs. */ + /* Regenerate the XLATEOBJs. (hack!) */ pbrush = BRUSH_LockBrush(pdcattr->hbrush); if (pbrush) { Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Tue Mar 24 02:49:00 2009 @@ -140,6 +140,7 @@ PDC pDC = (PDC)ObjectBody; if (pDC->rosdc.DriverName.Buffer) ExFreePoolWithTag(pDC->rosdc.DriverName.Buffer, TAG_DC); + DC_vSelectSurface(pDC, NULL); return TRUE; } @@ -264,7 +265,7 @@ pdc->dhpdev = PrimarySurface.hPDev; if(pUMdhpdev) pUMdhpdev = pdc->dhpdev; // set DHPDEV for device. pdc->ppdev = (PVOID)&PrimarySurface; - pdc->rosdc.hBitmap = (HBITMAP)PrimarySurface.pSurface; + pdc->rosdc.hBitmap = (HBITMAP)PrimarySurface.pSurface; // <- what kind of haxx0ry is that? // ATM we only have one display. pdcattr->ulDirty_ |= DC_PRIMARY_DISPLAY; @@ -310,7 +311,7 @@ */ pdc->dctype = DC_TYPE_INFO; // pdc->pSurfInfo = - pdc->dclevel.pSurface = NULL; + DC_vSelectSurface(pdc, NULL); pdcattr->crBackgroundClr = pdcattr->ulBackgroundClr = RGB(255, 255, 255); pdcattr->crForegroundClr = RGB(0, 0, 0); DC_UnlockDc( pdc ); Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Tue Mar 24 02:49:00 2009 @@ -7,6 +7,7 @@ #define GDI_STACK_LEVELS 12 static ULONG GDIHandleAllocator[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; static ULONG GDIHandleLocker[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; +static ULONG GDIHandleShareLocker[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; static ULONG GDIHandleDeleter[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; struct DbgOpenGDIHandle { @@ -233,7 +234,6 @@ return r; } - #define GDIDBG_TRACECALLER() \ DPRINT1("-> called from:\n"); \ KeRosDumpStackFrames(NULL, 20); @@ -243,6 +243,9 @@ #define GDIDBG_TRACELOCKER(handle) \ DPRINT1("-> locked from:\n"); \ KeRosDumpStackFrames(GDIHandleLocker[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_TRACESHARELOCKER(handle) \ + DPRINT1("-> locked from:\n"); \ + KeRosDumpStackFrames(GDIHandleShareLocker[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); #define GDIDBG_TRACEDELETER(handle) \ DPRINT1("-> deleted from:\n"); \ KeRosDumpStackFrames(GDIHandleDeleter[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); @@ -250,6 +253,8 @@ CaptureStackBackTace((PVOID*)GDIHandleAllocator[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); #define GDIDBG_CAPTURELOCKER(handle) \ CaptureStackBackTace((PVOID*)GDIHandleLocker[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_CAPTURESHARELOCKER(handle) \ + CaptureStackBackTace((PVOID*)GDIHandleShareLocker[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); #define GDIDBG_CAPTUREDELETER(handle) \ CaptureStackBackTace((PVOID*)GDIHandleDeleter[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); #define GDIDBG_DUMPHANDLETABLE() \ @@ -262,13 +267,25 @@ DPRINT1("[%d] Handle 0x%p Locked by 0x%x (we're 0x%x)\n", Attempts, Handle, PrevThread, Thread); \ } +ULONG +FASTCALL +GDIOBJ_IncrementShareCount(POBJ Object) +{ + INT cLocks = InterlockedIncrement((PLONG)&Object->ulShareCount); + GDIDBG_CAPTURESHARELOCKER(Object->hHmgr); + ASSERT(cLocks >= 1); + return cLocks; +} + #else #define GDIDBG_TRACECALLER() #define GDIDBG_TRACEALLOCATOR(index) #define GDIDBG_TRACELOCKER(index) +#define GDIDBG_TRACESHARELOCKER(index) #define GDIDBG_CAPTUREALLOCATOR(index) #define GDIDBG_CAPTURELOCKER(index) +#define GDIDBG_CAPTURESHARELOCKER(index) #define GDIDBG_CAPTUREDELETER(handle) #define GDIDBG_DUMPHANDLETABLE() #define GDIDBG_INITLOOPTRACE() Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Tue Mar 24 02:49:00 2009 @@ -481,6 +481,8 @@ * \return Returns TRUE if succesful. * \return Returns FALSE if the cleanup routine returned FALSE or the object doesn't belong * to the calling process. + * + * \bug This function should return VOID and kill the object no matter what... */ BOOL INTERNAL_CALL GDIOBJ_FreeObjByHandle(HGDIOBJ hObj, DWORD ExpectedType) @@ -537,8 +539,9 @@ Object = Entry->KernelData; - if (Object->cExclusiveLock == 0 || - Object->Tid == (PW32THREAD)PsGetCurrentThreadWin32Thread()) + if ((Object->cExclusiveLock == 0 || + Object->Tid == (PW32THREAD)PsGetCurrentThreadWin32Thread()) && + Object->ulShareCount == 0) { BOOL Ret; PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); @@ -568,6 +571,15 @@ GDIDBG_CAPTUREDELETER(hObj); return Ret; + } + else if (Object->ulShareCount != 0) + { + DPRINT("Object %p, ulShareCount = %d\n", Object->hHmgr, Object->ulShareCount); + GDIDBG_TRACECALLER(); + GDIDBG_TRACESHARELOCKER(GDI_HANDLE_GET_INDEX(hObj)); + (void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId); + /* Don't wait on shared locks */ + return FALSE; } else { @@ -702,8 +714,12 @@ simply ignore this fact here. */ ObjectHandle = (HGDIOBJ)(Index | (Entry->Type << GDI_ENTRY_UPPER_SHIFT)); - if (GDIOBJ_FreeObjByHandle(ObjectHandle, GDI_OBJECT_TYPE_DONTCARE) && - W32Process->GDIObjects == 0) + if (!GDIOBJ_FreeObjByHandle(ObjectHandle, GDI_OBJECT_TYPE_DONTCARE)) + { + DPRINT1("Failed to delete object %p!\n", ObjectHandle); + } + + if (W32Process->GDIObjects == 0) { /* there are no more gdi handles for this process, bail */ break; @@ -723,6 +739,7 @@ GDI_CleanupForProcess(struct _EPROCESS *Process) { PEPROCESS CurrentProcess; + PW32PROCESS W32Process; DPRINT("Starting CleanupForProcess prochandle %x Pid %d\n", Process, Process->UniqueProcessId); CurrentProcess = PsGetCurrentProcess(); @@ -730,6 +747,8 @@ { KeAttachProcess(&Process->Pcb); } + + W32Process = (PW32PROCESS)CurrentProcess->Win32Process; /* Delete objects. Begin with types that are not referenced by other types */ IntDeleteHandlesForProcess(Process, GDILoObjType_LO_DC_TYPE); @@ -749,6 +768,10 @@ #endif DPRINT("Completed cleanup for process %d\n", Process->UniqueProcessId); + if (W32Process->GDIObjects > 0) + { + DPRINT1("Leaking %d handles!\n", W32Process->GDIObjects); + } return TRUE; } @@ -973,11 +996,12 @@ { Object = (POBJ)Entry->KernelData; -#ifdef GDI_DEBUG +GDIDBG_CAPTURESHARELOCKER(HandleIndex); +#ifdef GDI_DEBUG3 if (InterlockedIncrement((PLONG)&Object->ulShareCount) == 1) { memset(GDIHandleLocker[HandleIndex], 0x00, GDI_STACK_LEVELS * sizeof(ULONG)); - RtlCaptureStackBackTrace(1, GDI_STACK_LEVELS, (PVOID*)GDIHandleLocker[HandleIndex], NULL); + RtlCaptureStackBackTrace(1, GDI_STACK_LEVELS, (PVOID*)GDIHandleShareLocker[HandleIndex], NULL); } #else InterlockedIncrement((PLONG)&Object->ulShareCount);

1 0

[cfinck] 40195: Prettify output a bit in case we have no search results :-)
by cfinck＠svn.reactos.org 23 Mar '09

23 Mar '09

Author: cfinck Date: Tue Mar 24 01:28:33 2009 New Revision: 40195 URL: http://svn.reactos.org/svn/reactos?rev=40195&view=rev Log: Prettify output a bit in case we have no search results :-) Modified: branches/danny-web/reactos.org/htdocs/testman/js/index.js.php Modified: branches/danny-web/reactos.org/htdocs/testman/js/index.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/js/index.js.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/js/index.js.php [iso-8859-1] Tue Mar 24 01:28:33 2009 @@ -294,7 +294,7 @@ if(!results.length) { - html += '<tr class="even"><td colspan="5"><?php echo addslashes($testman_langres["noresults"]); ?><\/td><\/tr>'; + html += '<tr class="even"><td colspan="6"><?php echo addslashes($testman_langres["noresults"]); ?><\/td><\/tr>'; } else {

1 0

[cfinck] 40194: Update the testman SQL file
by cfinck＠svn.reactos.org 23 Mar '09

23 Mar '09

Author: cfinck Date: Tue Mar 24 01:24:26 2009 New Revision: 40194 URL: http://svn.reactos.org/svn/reactos?rev=40194&view=rev Log: Update the testman SQL file Modified: branches/danny-web/reactos.org/resources/testman/testman.sql Modified: branches/danny-web/reactos.org/resources/testman/testman.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/resources… ============================================================================== --- branches/danny-web/reactos.org/resources/testman/testman.sql [iso-8859-1] (original) +++ branches/danny-web/reactos.org/resources/testman/testman.sql [iso-8859-1] Tue Mar 24 01:24:26 2009 @@ -10,7 +10,7 @@ `test_id` int(10) unsigned NOT NULL, `suite_id` int(10) unsigned NOT NULL, `log` longtext collate latin1_general_ci NOT NULL, - `count` int(10) unsigned NOT NULL COMMENT 'Number of all executed tests', + `count` int(10) NOT NULL COMMENT 'Number of all executed tests', `todo` int(10) unsigned NOT NULL COMMENT 'Tests marked as TODO', `failures` int(10) unsigned NOT NULL COMMENT 'Number of failed tests', `skipped` int(10) unsigned NOT NULL COMMENT 'Number of skipped tests', @@ -24,6 +24,7 @@ `user_id` bigint(20) unsigned NOT NULL, `revision` int(9) unsigned NOT NULL, `platform` varchar(24) collate latin1_general_ci NOT NULL, + `comment` varchar(255) collate latin1_general_ci default NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

1 0

[cfinck] 40193: Temporarily add cookie_domain() to "subsys_layout.php" to avoid including non-existent RosCMS v3 components till we have a complete RosCMS 4 solution for this
by cfinck＠svn.reactos.org 23 Mar '09

23 Mar '09

Author: cfinck Date: Tue Mar 24 01:05:52 2009 New Revision: 40193 URL: http://svn.reactos.org/svn/reactos?rev=40193&view=rev Log: Temporarily add cookie_domain() to "subsys_layout.php" to avoid including non-existent RosCMS v3 components till we have a complete RosCMS 4 solution for this Modified: branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php Modified: branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/sh… ============================================================================== --- branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php [iso-8859-1] Tue Mar 24 01:05:52 2009 @@ -6,8 +6,25 @@ COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> */ - require_once(ROSCMS_PATH . "inc/utils.php"); - + /* + * This will return the last two components of the server name, with a leading + * dot (i.e. usually .reactos.com or .reactos.org for us). See the PHP docs + * on setcookie() why we need the leading dot. + */ + function cookie_domain() + { + /* Server name might be just an IP address */ + if(preg_match("#[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}#", $_SERVER["SERVER_NAME"])) + return $_SERVER["SERVER_NAME"]; + + /* If it' a DNS address, return the domain name along with the suffix */ + if(preg_match("#(\.[^.]+\.[^.]+$)#", $_SERVER["SERVER_NAME"], $matches)) + return $matches[1]; + + /* Otherwise return nothing */ + return ""; + } + function GetLanguage() { global $lang;

1 0

[spetreolle] 40192: setupapi.CMP_RegisterNotification is not a stub anymore, update cfgmgr32.spec accordingly.
by spetreolle＠svn.reactos.org 23 Mar '09

23 Mar '09

Author: spetreolle Date: Tue Mar 24 01:01:40 2009 New Revision: 40192 URL: http://svn.reactos.org/svn/reactos?rev=40192&view=rev Log: setupapi.CMP_RegisterNotification is not a stub anymore, update cfgmgr32.spec accordingly. Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec [iso-8859-1] Tue Mar 24 01:01:40 2009 @@ -1,5 +1,5 @@ @ stdcall CMP_Init_Detection(long) setupapi.CMP_Init_Detection -@ stub CMP_RegisterNotification # setupapi.CMP_RegisterNotification +@ stdcall CMP_RegisterNotification(ptr ptr long ptr) setupapi.CMP_RegisterNotification @ stdcall CMP_Report_LogOn(long long) setupapi.CMP_Report_LogOn @ stub CMP_UnregisterNotification # setupapi.CMP_UnregisterNotification @ stdcall CMP_WaitNoPendingInstallEvents(long) setupapi.CMP_WaitNoPendingInstallEvents Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Tue Mar 24 01:01:40 2009 @@ -2,7 +2,7 @@ @ stub CMP_GetBlockedDriverInfo @ stub CMP_GetServerSideDeviceInstallFlags @ stdcall CMP_Init_Detection(long) -@ stdcall CMP_RegisterNotification( ptr ptr long ptr) +@ stdcall CMP_RegisterNotification(ptr ptr long ptr) @ stdcall CMP_Report_LogOn(long long) @ stub CMP_UnregisterNotification @ stdcall CMP_WaitNoPendingInstallEvents(long)

1 0

[jmorlan] 40191: Implement %~$PATH:var variable substitution
by jmorlan＠svn.reactos.org 23 Mar '09

23 Mar '09

Author: jmorlan Date: Mon Mar 23 22:54:52 2009 New Revision: 40191 URL: http://svn.reactos.org/svn/reactos?rev=40191&view=rev Log: Implement %~$PATH:var variable substitution Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Mon Mar 23 22:54:52 2009 @@ -891,8 +891,8 @@ } #define GrowIfNecessary(x, y, z) GrowIfNecessary_dbg(x, y, z, __FILE__, __LINE__) -LPCTSTR -GetEnvVarOrSpecial ( LPCTSTR varName ) +LPTSTR +GetEnvVar(LPCTSTR varName) { static LPTSTR ret = NULL; static UINT retlen = 0; @@ -907,20 +907,23 @@ } if ( size ) return ret; + return NULL; +} + +LPCTSTR +GetEnvVarOrSpecial(LPCTSTR varName) +{ + static TCHAR ret[MAX_PATH]; + + LPTSTR var = GetEnvVar(varName); + if (var) + return var; /* env var doesn't exist, look for a "special" one */ /* %CD% */ if (_tcsicmp(varName,_T("cd")) ==0) { - size = GetCurrentDirectory ( retlen, ret ); - if ( size > retlen ) - { - if ( !GrowIfNecessary ( size, &ret, &retlen ) ) - return NULL; - size = GetCurrentDirectory ( retlen, ret ); - } - if ( !size ) - return NULL; + GetCurrentDirectory(MAX_PATH, ret); return ret; } /* %TIME% */ @@ -937,8 +940,6 @@ /* %RANDOM% */ else if (_tcsicmp(varName,_T("random")) ==0) { - if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) - return NULL; /* Get random number */ _itot(rand(),ret,10); return ret; @@ -953,8 +954,6 @@ /* %CMDEXTVERSION% */ else if (_tcsicmp(varName,_T("cmdextversion")) ==0) { - if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) - return NULL; /* Set version number to 2 */ _itot(2,ret,10); return ret; @@ -963,8 +962,6 @@ /* %ERRORLEVEL% */ else if (_tcsicmp(varName,_T("errorlevel")) ==0) { - if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) - return NULL; _itot(nErrorLevel,ret,10); return ret; } @@ -990,6 +987,7 @@ } Modifiers = 0; TCHAR *Format, *FormatEnd; + TCHAR *PathVarName = NULL; LPTSTR Variable; TCHAR *VarEnd; BOOL VariableIsParam0; @@ -1011,17 +1009,31 @@ while (*FormatEnd && _tcschr(ModifierTable, _totlower(*FormatEnd))) FormatEnd++; - /* TODO: check for $PATH: syntax */ - - /* Now backtrack if necessary to get a variable name match */ - while (!(Variable = GetVar(*FormatEnd, &VariableIsParam0))) - { - if (FormatEnd == Format) + if (*FormatEnd == _T('$')) + { + /* $PATH: syntax */ + PathVarName = FormatEnd + 1; + FormatEnd = _tcschr(PathVarName, _T(':')); + if (!FormatEnd) return NULL; - FormatEnd--; - } - - for (; Format < FormatEnd; Format++) + + /* Must be immediately followed by the variable */ + Variable = GetVar(*++FormatEnd, &VariableIsParam0); + if (!Variable) + return NULL; + } + else + { + /* Backtrack if necessary to get a variable name match */ + while (!(Variable = GetVar(*FormatEnd, &VariableIsParam0))) + { + if (FormatEnd == Format) + return NULL; + FormatEnd--; + } + } + + for (; Format < FormatEnd && *Format != _T('$'); Format++) Modifiers |= 1 << (_tcschr(ModifierTable, _totlower(*Format)) - ModifierTable); *pFormat = FormatEnd + 1; @@ -1040,11 +1052,26 @@ memcpy(Result, Variable, (char *)VarEnd - (char *)Variable); Result[VarEnd - Variable] = _T('\0'); - /* For plain %~var with no modifiers, just return the variable without quotes */ - if (Modifiers == 0) + if (PathVarName) + { + /* $PATH: syntax - search the directories listed in the + * specified environment variable for the file */ + LPTSTR PathVar; + FormatEnd[-1] = _T('\0'); + PathVar = GetEnvVar(PathVarName); + FormatEnd[-1] = _T(':'); + if (!PathVar || + !SearchPath(PathVar, Result, NULL, MAX_PATH, FullPath, NULL)) + { + return _T(""); + } + } + else if (Modifiers == 0) + { + /* For plain %~var with no modifiers, just return the variable without quotes */ return Result; - - if (VariableIsParam0) + } + else if (VariableIsParam0) { /* Special case: If the variable is %0 and modifier characters are present, * use the batch file's path (which includes the .bat/.cmd extension) @@ -1141,6 +1168,7 @@ Out += FormatDate(Out, &st, TRUE); *Out++ = _T(' '); Out += FormatTime(Out, &st); + *Out++ = _T(' '); } if (Modifiers & M_SIZE) { @@ -1151,25 +1179,32 @@ } } + /* When using the path-searching syntax or the S modifier, + * at least part of the file path is always included. + * If none of the DPNX modifiers are present, include the full path */ + if (PathVarName || (Modifiers & M_SHORT)) + if ((Modifiers & (M_DRIVE | M_PATH | M_NAME | M_EXT)) == 0) + Modifiers |= M_FULL; + /* Now add the requested parts of the name. - * With the F or S modifiers, add all parts to form the full path. */ + * With the F modifier, add all parts to form the full path. */ Extension = _tcsrchr(Filename, _T('.')); - if (Modifiers & (M_DRIVE | M_FULL | M_SHORT)) + if (Modifiers & (M_DRIVE | M_FULL)) { *Out++ = FixedPath[0]; *Out++ = FixedPath[1]; } - if (Modifiers & (M_PATH | M_FULL | M_SHORT)) + if (Modifiers & (M_PATH | M_FULL)) { memcpy(Out, &FixedPath[2], (char *)Filename - (char *)&FixedPath[2]); Out += Filename - &FixedPath[2]; } - if (Modifiers & (M_NAME | M_FULL | M_SHORT)) + if (Modifiers & (M_NAME | M_FULL)) { while (*Filename && Filename != Extension) *Out++ = *Filename++; } - if (Modifiers & (M_EXT | M_FULL | M_SHORT)) + if (Modifiers & (M_EXT | M_FULL)) { if (Extension) Out = _stpcpy(Out, Extension);

1 0

[arty] 40190: Actually mark irp pending.
by arty＠svn.reactos.org 23 Mar '09

23 Mar '09

Author: arty Date: Mon Mar 23 22:45:21 2009 New Revision: 40190 URL: http://svn.reactos.org/svn/reactos?rev=40190&view=rev Log: Actually mark irp pending. Modified: trunk/reactos/drivers/network/afd/afd/lock.c Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Mon Mar 23 22:45:21 2009 @@ -321,5 +321,7 @@ NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ) { InsertTailList( &FCB->PendingIrpList[Function], &Irp->Tail.Overlay.ListEntry ); + IoMarkIrpPending(Irp); + Irp->IoStatus.Status = STATUS_PENDING; return UnlockAndMaybeComplete( FCB, STATUS_PENDING, Irp, 0, NULL ); }

1 0

[tkreuzer] 40189: GDIOBJ_ShareUnlockObjByPtr: Temporarily don't ASSERT, but print a backtrace when trying to unlock an object that wasn't locked.
by tkreuzer＠svn.reactos.org 23 Mar '09

23 Mar '09

Author: tkreuzer Date: Mon Mar 23 22:11:37 2009 New Revision: 40189 URL: http://svn.reactos.org/svn/reactos?rev=40189&view=rev Log: GDIOBJ_ShareUnlockObjByPtr: Temporarily don't ASSERT, but print a backtrace when trying to unlock an object that wasn't locked. Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Mon Mar 23 22:11:37 2009 @@ -104,7 +104,13 @@ GDIOBJ_ShareUnlockObjByPtr(POBJ Object) { INT cLocks = InterlockedDecrement((PLONG)&Object->ulShareCount); - ASSERT(cLocks >= 0); +// ASSERT(cLocks >= 0); + if (cLocks < 0) + { + DbgPrint("Unlocked object %p, that was not locked!\n", Object->hHmgr); + KdSystemDebugControl(TAG('R', 'o', 's', 'D'), NULL, 20, NULL, 0, NULL, KernelMode); + InterlockedIncrement((PLONG)&Object->ulShareCount); + } return cLocks; }

1 0

[arty] 40188: Formatting only, no change.
by arty＠svn.reactos.org 23 Mar '09

23 Mar '09

Author: arty Date: Mon Mar 23 21:13:17 2009 New Revision: 40188 URL: http://svn.reactos.org/svn/reactos?rev=40188&view=rev Log: Formatting only, no change. Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Mon Mar 23 21:13:17 2009 @@ -43,18 +43,18 @@ } static NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB, - PAFD_RECV_INFO RecvReq, - PUINT TotalBytesCopied ) { + PAFD_RECV_INFO RecvReq, + PUINT TotalBytesCopied ) { UINT i, BytesToCopy = 0, - BytesAvailable = - FCB->Recv.Content - FCB->Recv.BytesUsed; + BytesAvailable = + FCB->Recv.Content - FCB->Recv.BytesUsed; PAFD_MAPBUF Map; NTSTATUS Status; *TotalBytesCopied = 0; AFD_DbgPrint(MID_TRACE,("Called, BytesAvailable = %d\n", - BytesAvailable)); + BytesAvailable)); if( CantReadMore(FCB) ) return STATUS_SUCCESS; if( !BytesAvailable ) return STATUS_PENDING; @@ -62,29 +62,29 @@ Map = (PAFD_MAPBUF)(RecvReq->BufferArray + RecvReq->BufferCount); AFD_DbgPrint(MID_TRACE,("Buffer Count: %d @ %x\n", - RecvReq->BufferCount, - RecvReq->BufferArray)); + RecvReq->BufferCount, + RecvReq->BufferArray)); for( i = 0; - RecvReq->BufferArray && - BytesAvailable && - i < RecvReq->BufferCount; - i++ ) { - BytesToCopy = - MIN( RecvReq->BufferArray[i].len, BytesAvailable ); - - if( Map[i].Mdl ) { - Map[i].BufferAddress = MmMapLockedPages( Map[i].Mdl, KernelMode ); - - AFD_DbgPrint(MID_TRACE,("Buffer %d: %x:%d\n", - i, - Map[i].BufferAddress, - BytesToCopy)); - - RtlCopyMemory( Map[i].BufferAddress, - FCB->Recv.Window + FCB->Recv.BytesUsed, - BytesToCopy ); - - MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); + RecvReq->BufferArray && + BytesAvailable && + i < RecvReq->BufferCount; + i++ ) { + BytesToCopy = + MIN( RecvReq->BufferArray[i].len, BytesAvailable ); + + if( Map[i].Mdl ) { + Map[i].BufferAddress = MmMapLockedPages( Map[i].Mdl, KernelMode ); + + AFD_DbgPrint(MID_TRACE,("Buffer %d: %x:%d\n", + i, + Map[i].BufferAddress, + BytesToCopy)); + + RtlCopyMemory( Map[i].BufferAddress, + FCB->Recv.Window + FCB->Recv.BytesUsed, + BytesToCopy ); + + MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); *TotalBytesCopied += BytesToCopy; @@ -92,31 +92,31 @@ FCB->Recv.BytesUsed += BytesToCopy; BytesAvailable -= BytesToCopy; } - } + } } /* If there's nothing left in our buffer start a new request */ if( FCB->Recv.BytesUsed == FCB->Recv.Content ) { - FCB->Recv.BytesUsed = FCB->Recv.Content = 0; + FCB->Recv.BytesUsed = FCB->Recv.Content = 0; FCB->PollState &= ~AFD_EVENT_RECEIVE; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - - if( !FCB->ReceiveIrp.InFlightRequest ) { - AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); - - Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, - FCB->Connection.Object, - TDI_RECEIVE_NORMAL, - FCB->Recv.Window, - FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, - ReceiveComplete, - FCB ); + PollReeval( FCB->DeviceExt, FCB->FileObject ); + + if( !FCB->ReceiveIrp.InFlightRequest ) { + AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); + + Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, + FCB->Connection.Object, + TDI_RECEIVE_NORMAL, + FCB->Recv.Window, + FCB->Recv.Size, + &FCB->ReceiveIrp.Iosb, + ReceiveComplete, + FCB ); if( Status == STATUS_SUCCESS ) FCB->Recv.Content = FCB->ReceiveIrp.Iosb.Information; HandleEOFOnIrp( FCB, Status, FCB->ReceiveIrp.Iosb.Information ); - } + } } return STATUS_SUCCESS; @@ -159,53 +159,53 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); } } else { - /* Kick the user that receive would be possible now */ - /* XXX Not implemented yet */ - - AFD_DbgPrint(MID_TRACE,("FCB %x Receive data waiting %d\n", - FCB, FCB->Recv.Content)); - /*OskitDumpBuffer( FCB->Recv.Window, FCB->Recv.Content );*/ - - /* Try to clear some requests */ - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { - NextIrpEntry = - RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); - NextIrp = - CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); - RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - - AFD_DbgPrint(MID_TRACE,("RecvReq @ %x\n", RecvReq)); - - Status = TryToSatisfyRecvRequestFromBuffer - ( FCB, RecvReq, &TotalBytesCopied ); - - if( Status == STATUS_PENDING ) { - AFD_DbgPrint(MID_TRACE,("Ran out of data for %x\n", NextIrp)); - InsertHeadList(&FCB->PendingIrpList[FUNCTION_RECV], - &NextIrp->Tail.Overlay.ListEntry); - break; - } else { - AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, - TotalBytesCopied)); - UnlockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, FALSE ); - NextIrp->IoStatus.Status = Status; - NextIrp->IoStatus.Information = TotalBytesCopied; - if( NextIrp == Irp ) { - RetStatus = Status; - RetBytesCopied = TotalBytesCopied; + /* Kick the user that receive would be possible now */ + /* XXX Not implemented yet */ + + AFD_DbgPrint(MID_TRACE,("FCB %x Receive data waiting %d\n", + FCB, FCB->Recv.Content)); + /*OskitDumpBuffer( FCB->Recv.Window, FCB->Recv.Content );*/ + + /* Try to clear some requests */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + NextIrpEntry = + RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); + NextIrp = + CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + AFD_DbgPrint(MID_TRACE,("RecvReq @ %x\n", RecvReq)); + + Status = TryToSatisfyRecvRequestFromBuffer + ( FCB, RecvReq, &TotalBytesCopied ); + + if( Status == STATUS_PENDING ) { + AFD_DbgPrint(MID_TRACE,("Ran out of data for %x\n", NextIrp)); + InsertHeadList(&FCB->PendingIrpList[FUNCTION_RECV], + &NextIrp->Tail.Overlay.ListEntry); + break; + } else { + AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, + TotalBytesCopied)); + UnlockBuffers( RecvReq->BufferArray, + RecvReq->BufferCount, FALSE ); + NextIrp->IoStatus.Status = Status; + NextIrp->IoStatus.Information = TotalBytesCopied; + if( NextIrp == Irp ) { + RetStatus = Status; + RetBytesCopied = TotalBytesCopied; + } + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } } - if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } - } } if( FCB->Recv.Content ) { - FCB->PollState |= AFD_EVENT_RECEIVE; + FCB->PollState |= AFD_EVENT_RECEIVE; } else - FCB->PollState &= ~AFD_EVENT_RECEIVE; + FCB->PollState &= ~AFD_EVENT_RECEIVE; PollReeval( FCB->DeviceExt, FCB->FileObject ); @@ -242,7 +242,7 @@ Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); - return STATUS_CANCELLED; + return STATUS_CANCELLED; } FCB->Recv.Content = Irp->IoStatus.Information; @@ -252,9 +252,9 @@ AFD_DbgPrint(MIN_TRACE,("!!! CLOSED SOCK GOT A RECEIVE COMPLETE !!!\n")); Irp->IoStatus.Status = STATUS_FILE_CLOSED; Irp->IoStatus.Information = 0; - SocketStateUnlock( FCB ); - DestroySocket( FCB ); - return STATUS_FILE_CLOSED; + SocketStateUnlock( FCB ); + DestroySocket( FCB ); + return STATUS_FILE_CLOSED; } else if( FCB->State == SOCKET_STATE_LISTENING ) { AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n")); Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; @@ -276,7 +276,7 @@ NTSTATUS NTAPI AfdConnectedSocketReadData(PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp, BOOLEAN Short) { + PIO_STACK_LOCATION IrpSp, BOOLEAN Short) { NTSTATUS Status = STATUS_INVALID_PARAMETER; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; @@ -292,29 +292,29 @@ AFD_DbgPrint(MID_TRACE,("Called recv on wrong kind of socket (s%x)\n", FCB->State)); return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, - Irp, 0, NULL ); + Irp, 0, NULL ); } if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { - AFD_DbgPrint(MID_TRACE,("Receive on connection-less sockets not implemented\n")); - return UnlockAndMaybeComplete( FCB, STATUS_NOT_IMPLEMENTED, - Irp, 0, NULL ); + AFD_DbgPrint(MID_TRACE,("Receive on connection-less sockets not implemented\n")); + return UnlockAndMaybeComplete( FCB, STATUS_NOT_IMPLEMENTED, + Irp, 0, NULL ); } FCB->EventsFired &= ~AFD_EVENT_RECEIVE; PollReeval( FCB->DeviceExt, FCB->FileObject ); if( !(RecvReq = LockRequest( Irp, IrpSp )) ) - return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, - Irp, 0, NULL ); + return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, + Irp, 0, NULL ); AFD_DbgPrint(MID_TRACE,("Recv flags %x\n", RecvReq->AfdFlags)); RecvReq->BufferArray = LockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, - NULL, NULL, - TRUE, FALSE ); + RecvReq->BufferCount, + NULL, NULL, + TRUE, FALSE ); if( !RecvReq->BufferArray ) { return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, @@ -353,79 +353,79 @@ static NTSTATUS NTAPI SatisfyPacketRecvRequest( PAFD_FCB FCB, PIRP Irp, - PAFD_STORED_DATAGRAM DatagramRecv, - PUINT TotalBytesCopied ) { + PAFD_STORED_DATAGRAM DatagramRecv, + PUINT TotalBytesCopied ) { NTSTATUS Status = STATUS_SUCCESS; PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp ); PAFD_RECV_INFO RecvReq = - IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; UINT BytesToCopy = 0, BytesAvailable = DatagramRecv->Len, AddrLen = 0; PAFD_MAPBUF Map; Map = (PAFD_MAPBUF)(RecvReq->BufferArray + - RecvReq->BufferCount + - EXTRA_LOCK_BUFFERS); + RecvReq->BufferCount + + EXTRA_LOCK_BUFFERS); BytesToCopy = - MIN( RecvReq->BufferArray[0].len, BytesAvailable ); + MIN( RecvReq->BufferArray[0].len, BytesAvailable ); AFD_DbgPrint(MID_TRACE,("BytesToCopy: %d len %d\n", BytesToCopy, - RecvReq->BufferArray[0].len)); + RecvReq->BufferArray[0].len)); if( Map[0].Mdl ) { - /* Copy the address */ - if( Map[1].Mdl && Map[2].Mdl ) { - AFD_DbgPrint(MID_TRACE,("Checking TAAddressCount\n")); - - if( DatagramRecv->Address->TAAddressCount != 1 ) { - AFD_DbgPrint - (MID_TRACE, - ("Wierd address count %d\n", - DatagramRecv->Address->TAAddressCount)); - } - - AFD_DbgPrint(MID_TRACE,("Computing addr len\n")); - - AddrLen = MIN(DatagramRecv->Address->Address->AddressLength + - sizeof(USHORT), - RecvReq->BufferArray[1].len); - - AFD_DbgPrint(MID_TRACE,("Copying %d bytes of address\n", AddrLen)); - - Map[1].BufferAddress = MmMapLockedPages( Map[1].Mdl, KernelMode ); - - AFD_DbgPrint(MID_TRACE,("Done mapping, copying address\n")); - - RtlCopyMemory( Map[1].BufferAddress, - &DatagramRecv->Address->Address->AddressType, - AddrLen ); - - MmUnmapLockedPages( Map[1].BufferAddress, Map[1].Mdl ); - - AFD_DbgPrint(MID_TRACE,("Copying address len\n")); - - Map[2].BufferAddress = MmMapLockedPages( Map[2].Mdl, KernelMode ); - *((PINT)Map[2].BufferAddress) = AddrLen; - MmUnmapLockedPages( Map[2].BufferAddress, Map[2].Mdl ); - } - - AFD_DbgPrint(MID_TRACE,("Mapping data buffer pages\n")); - - Map[0].BufferAddress = MmMapLockedPages( Map[0].Mdl, KernelMode ); - - AFD_DbgPrint(MID_TRACE,("Buffer %d: %x:%d\n", - 0, - Map[0].BufferAddress, - BytesToCopy)); - - /* OskitDumpBuffer - ( FCB->Recv.Window + FCB->Recv.BytesUsed, BytesToCopy ); */ - - RtlCopyMemory( Map[0].BufferAddress, - FCB->Recv.Window + FCB->Recv.BytesUsed, - BytesToCopy ); - - MmUnmapLockedPages( Map[0].BufferAddress, Map[0].Mdl ); + /* Copy the address */ + if( Map[1].Mdl && Map[2].Mdl ) { + AFD_DbgPrint(MID_TRACE,("Checking TAAddressCount\n")); + + if( DatagramRecv->Address->TAAddressCount != 1 ) { + AFD_DbgPrint + (MID_TRACE, + ("Wierd address count %d\n", + DatagramRecv->Address->TAAddressCount)); + } + + AFD_DbgPrint(MID_TRACE,("Computing addr len\n")); + + AddrLen = MIN(DatagramRecv->Address->Address->AddressLength + + sizeof(USHORT), + RecvReq->BufferArray[1].len); + + AFD_DbgPrint(MID_TRACE,("Copying %d bytes of address\n", AddrLen)); + + Map[1].BufferAddress = MmMapLockedPages( Map[1].Mdl, KernelMode ); + + AFD_DbgPrint(MID_TRACE,("Done mapping, copying address\n")); + + RtlCopyMemory( Map[1].BufferAddress, + &DatagramRecv->Address->Address->AddressType, + AddrLen ); + + MmUnmapLockedPages( Map[1].BufferAddress, Map[1].Mdl ); + + AFD_DbgPrint(MID_TRACE,("Copying address len\n")); + + Map[2].BufferAddress = MmMapLockedPages( Map[2].Mdl, KernelMode ); + *((PINT)Map[2].BufferAddress) = AddrLen; + MmUnmapLockedPages( Map[2].BufferAddress, Map[2].Mdl ); + } + + AFD_DbgPrint(MID_TRACE,("Mapping data buffer pages\n")); + + Map[0].BufferAddress = MmMapLockedPages( Map[0].Mdl, KernelMode ); + + AFD_DbgPrint(MID_TRACE,("Buffer %d: %x:%d\n", + 0, + Map[0].BufferAddress, + BytesToCopy)); + + /* OskitDumpBuffer + ( FCB->Recv.Window + FCB->Recv.BytesUsed, BytesToCopy ); */ + + RtlCopyMemory( Map[0].BufferAddress, + FCB->Recv.Window + FCB->Recv.BytesUsed, + BytesToCopy ); + + MmUnmapLockedPages( Map[0].BufferAddress, Map[0].Mdl ); *TotalBytesCopied = BytesToCopy; @@ -446,9 +446,9 @@ NTSTATUS NTAPI PacketSocketRecvComplete( - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context ) { + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context ) { NTSTATUS Status = STATUS_SUCCESS; PAFD_FCB FCB = Context; PIRP NextIrp; @@ -468,105 +468,104 @@ FCB->ReceiveIrp.InFlightRequest = NULL; - if( Irp->Cancel ) { + if( Irp->IoStatus.Status == STATUS_CANCELLED ) { Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); - return STATUS_CANCELLED; + return STATUS_CANCELLED; } if( FCB->State == SOCKET_STATE_CLOSED ) { Irp->IoStatus.Status = STATUS_FILE_CLOSED; Irp->IoStatus.Information = 0; - SocketStateUnlock( FCB ); - DestroySocket( FCB ); - return STATUS_FILE_CLOSED; + SocketStateUnlock( FCB ); + DestroySocket( FCB ); + return STATUS_FILE_CLOSED; } DatagramRecv = ExAllocatePool( NonPagedPool, DGSize ); if( DatagramRecv ) { - DatagramRecv->Len = Irp->IoStatus.Information; - RtlCopyMemory( DatagramRecv->Buffer, FCB->Recv.Window, - DatagramRecv->Len ); - AFD_DbgPrint(MID_TRACE,("Received (A %x)\n", - FCB->AddressFrom->RemoteAddress)); - DatagramRecv->Address = - TaCopyTransportAddress( FCB->AddressFrom->RemoteAddress ); - - if( !DatagramRecv->Address ) Status = STATUS_NO_MEMORY; + DatagramRecv->Len = Irp->IoStatus.Information; + RtlCopyMemory( DatagramRecv->Buffer, FCB->Recv.Window, + DatagramRecv->Len ); + AFD_DbgPrint(MID_TRACE,("Received (A %x)\n", + FCB->AddressFrom->RemoteAddress)); + DatagramRecv->Address = + TaCopyTransportAddress( FCB->AddressFrom->RemoteAddress ); + + if( !DatagramRecv->Address ) Status = STATUS_NO_MEMORY; } else Status = STATUS_NO_MEMORY; if( !NT_SUCCESS( Status ) ) { Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - if( DatagramRecv ) ExFreePool( DatagramRecv ); - SocketStateUnlock( FCB ); - return Status; + if( DatagramRecv ) ExFreePool( DatagramRecv ); + SocketStateUnlock( FCB ); + return Status; } else { - InsertTailList( &FCB->DatagramList, &DatagramRecv->ListEntry ); + InsertTailList( &FCB->DatagramList, &DatagramRecv->ListEntry ); } /* Satisfy as many requests as we can */ while( !IsListEmpty( &FCB->DatagramList ) && - !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { - AFD_DbgPrint(MID_TRACE,("Looping trying to satisfy request\n")); - ListEntry = RemoveHeadList( &FCB->DatagramList ); - DatagramRecv = CONTAINING_RECORD( ListEntry, AFD_STORED_DATAGRAM, - ListEntry ); - ListEntry = RemoveHeadList( &FCB->PendingIrpList[FUNCTION_RECV] ); - NextIrp = CONTAINING_RECORD( ListEntry, IRP, Tail.Overlay.ListEntry ); - NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); - RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - - AFD_DbgPrint(MID_TRACE,("RecvReq: %x, DatagramRecv: %x\n", - RecvReq, DatagramRecv)); - - if( DatagramRecv->Len > RecvReq->BufferArray[0].len && - !(RecvReq->TdiFlags & TDI_RECEIVE_PARTIAL) ) { - InsertHeadList( &FCB->DatagramList, - &DatagramRecv->ListEntry ); - Status = NextIrp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - NextIrp->IoStatus.Information = DatagramRecv->Len; - UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); + !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + AFD_DbgPrint(MID_TRACE,("Looping trying to satisfy request\n")); + ListEntry = RemoveHeadList( &FCB->DatagramList ); + DatagramRecv = CONTAINING_RECORD( ListEntry, AFD_STORED_DATAGRAM, + ListEntry ); + ListEntry = RemoveHeadList( &FCB->PendingIrpList[FUNCTION_RECV] ); + NextIrp = CONTAINING_RECORD( ListEntry, IRP, Tail.Overlay.ListEntry ); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + AFD_DbgPrint(MID_TRACE,("RecvReq: %x, DatagramRecv: %x\n", + RecvReq, DatagramRecv)); + + if( DatagramRecv->Len > RecvReq->BufferArray[0].len && + !(RecvReq->TdiFlags & TDI_RECEIVE_PARTIAL) ) { + InsertHeadList( &FCB->DatagramList, + &DatagramRecv->ListEntry ); + Status = NextIrp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + NextIrp->IoStatus.Information = DatagramRecv->Len; + UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } else { - AFD_DbgPrint(MID_TRACE,("Satisfying\n")); - Status = SatisfyPacketRecvRequest - ( FCB, NextIrp, DatagramRecv, - (PUINT)&NextIrp->IoStatus.Information ); - AFD_DbgPrint(MID_TRACE,("Unlocking\n")); - UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } else { + AFD_DbgPrint(MID_TRACE,("Satisfying\n")); + Status = SatisfyPacketRecvRequest + ( FCB, NextIrp, DatagramRecv, + (PUINT)&NextIrp->IoStatus.Information ); + AFD_DbgPrint(MID_TRACE,("Unlocking\n")); + UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - AFD_DbgPrint(MID_TRACE,("Completing\n")); - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } + AFD_DbgPrint(MID_TRACE,("Completing\n")); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } } if( !IsListEmpty( &FCB->DatagramList ) ) { - AFD_DbgPrint(MID_TRACE,("Signalling\n")); - FCB->PollState |= AFD_EVENT_RECEIVE; + AFD_DbgPrint(MID_TRACE,("Signalling\n")); + FCB->PollState |= AFD_EVENT_RECEIVE; } else - FCB->PollState &= ~AFD_EVENT_RECEIVE; + FCB->PollState &= ~AFD_EVENT_RECEIVE; PollReeval( FCB->DeviceExt, FCB->FileObject ); if( NT_SUCCESS(Irp->IoStatus.Status) ) { - - /* Now relaunch the datagram request */ - Status = TdiReceiveDatagram - ( &FCB->ReceiveIrp.InFlightRequest, - FCB->AddressFile.Object, - 0, - FCB->Recv.Window, - FCB->Recv.Size, - FCB->AddressFrom, - &FCB->ReceiveIrp.Iosb, - PacketSocketRecvComplete, - FCB ); + /* Now relaunch the datagram request */ + Status = TdiReceiveDatagram + ( &FCB->ReceiveIrp.InFlightRequest, + FCB->AddressFile.Object, + 0, + FCB->Recv.Window, + FCB->Recv.Size, + FCB->AddressFrom, + &FCB->ReceiveIrp.Iosb, + PacketSocketRecvComplete, + FCB ); } SocketStateUnlock( FCB ); @@ -576,7 +575,7 @@ NTSTATUS NTAPI AfdPacketSocketReadData(PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp ) { + PIO_STACK_LOCATION IrpSp ) { NTSTATUS Status = STATUS_SUCCESS; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; @@ -592,72 +591,72 @@ /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) - return UnlockAndMaybeComplete - ( FCB, STATUS_INVALID_PARAMETER, Irp, 0, NULL ); + return UnlockAndMaybeComplete + ( FCB, STATUS_INVALID_PARAMETER, Irp, 0, NULL ); if( !(RecvReq = LockRequest( Irp, IrpSp )) ) - return UnlockAndMaybeComplete - ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + return UnlockAndMaybeComplete + ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); AFD_DbgPrint(MID_TRACE,("Recv flags %x\n", RecvReq->AfdFlags)); RecvReq->BufferArray = LockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, - RecvReq->Address, - RecvReq->AddressLength, - TRUE, TRUE ); + RecvReq->BufferCount, + RecvReq->Address, + RecvReq->AddressLength, + TRUE, TRUE ); if( !RecvReq->BufferArray ) { /* access violation in userspace */ return UnlockAndMaybeComplete - ( FCB, STATUS_ACCESS_VIOLATION, Irp, 0, NULL ); + ( FCB, STATUS_ACCESS_VIOLATION, Irp, 0, NULL ); } if( !IsListEmpty( &FCB->DatagramList ) ) { - ListEntry = RemoveHeadList( &FCB->DatagramList ); - DatagramRecv = CONTAINING_RECORD - ( ListEntry, AFD_STORED_DATAGRAM, ListEntry ); - if( DatagramRecv->Len > RecvReq->BufferArray[0].len && - !(RecvReq->TdiFlags & TDI_RECEIVE_PARTIAL) ) { - InsertHeadList( &FCB->DatagramList, - &DatagramRecv->ListEntry ); - Status = Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - Irp->IoStatus.Information = DatagramRecv->Len; - - if( IsListEmpty( &FCB->DatagramList ) ) - FCB->PollState &= ~AFD_EVENT_RECEIVE; - else - FCB->PollState |= AFD_EVENT_RECEIVE; - - PollReeval( FCB->DeviceExt, FCB->FileObject ); - - UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); - - return UnlockAndMaybeComplete - ( FCB, Status, Irp, Irp->IoStatus.Information, NULL ); - } else { - Status = SatisfyPacketRecvRequest - ( FCB, Irp, DatagramRecv, - (PUINT)&Irp->IoStatus.Information ); - - if( IsListEmpty( &FCB->DatagramList ) ) - FCB->PollState &= ~AFD_EVENT_RECEIVE; - else - FCB->PollState |= AFD_EVENT_RECEIVE; - - PollReeval( FCB->DeviceExt, FCB->FileObject ); - - UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); - - return UnlockAndMaybeComplete - ( FCB, Status, Irp, Irp->IoStatus.Information, NULL ); - } + ListEntry = RemoveHeadList( &FCB->DatagramList ); + DatagramRecv = CONTAINING_RECORD + ( ListEntry, AFD_STORED_DATAGRAM, ListEntry ); + if( DatagramRecv->Len > RecvReq->BufferArray[0].len && + !(RecvReq->TdiFlags & TDI_RECEIVE_PARTIAL) ) { + InsertHeadList( &FCB->DatagramList, + &DatagramRecv->ListEntry ); + Status = Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + Irp->IoStatus.Information = DatagramRecv->Len; + + if( IsListEmpty( &FCB->DatagramList ) ) + FCB->PollState &= ~AFD_EVENT_RECEIVE; + else + FCB->PollState |= AFD_EVENT_RECEIVE; + + PollReeval( FCB->DeviceExt, FCB->FileObject ); + + UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); + + return UnlockAndMaybeComplete + ( FCB, Status, Irp, Irp->IoStatus.Information, NULL ); + } else { + Status = SatisfyPacketRecvRequest + ( FCB, Irp, DatagramRecv, + (PUINT)&Irp->IoStatus.Information ); + + if( IsListEmpty( &FCB->DatagramList ) ) + FCB->PollState &= ~AFD_EVENT_RECEIVE; + else + FCB->PollState |= AFD_EVENT_RECEIVE; + + PollReeval( FCB->DeviceExt, FCB->FileObject ); + + UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); + + return UnlockAndMaybeComplete + ( FCB, Status, Irp, Irp->IoStatus.Information, NULL ); + } } else if( RecvReq->AfdFlags & AFD_IMMEDIATE ) { - AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); - Status = STATUS_CANT_WAIT; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); + AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); + Status = STATUS_CANT_WAIT; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } else { - PollReeval( FCB->DeviceExt, FCB->FileObject ); - return LeaveIrpUntilLater( FCB, Irp, FUNCTION_RECV ); - } -} + PollReeval( FCB->DeviceExt, FCB->FileObject ); + return LeaveIrpUntilLater( FCB, Irp, FUNCTION_RECV ); + } +}

1 0

[tkreuzer] 40187: [FORMATTING] Apply indentation of 4 spaces. Misc formatting improvements. Add some FIXME comments, no code change
by tkreuzer＠svn.reactos.org 23 Mar '09

23 Mar '09

Author: tkreuzer Date: Mon Mar 23 20:47:58 2009 New Revision: 40187 URL: http://svn.reactos.org/svn/reactos?rev=40187&view=rev Log: [FORMATTING] Apply indentation of 4 spaces. Misc formatting improvements. Add some FIXME comments, no code change Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/objects/device.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
49
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2009