Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 45293: [Win32k] - Add back removed window dce support routine. Fixed list handling and implemented thread cleanup for dces.
by jimtabor＠svn.reactos.org 28 Jan '10

28 Jan '10

Author: jimtabor Date: Thu Jan 28 02:00:09 2010 New Revision: 45293 URL: http://svn.reactos.org/svn/reactos?rev=45293&view=rev Log: [Win32k] - Add back removed window dce support routine. Fixed list handling and implemented thread cleanup for dces. Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] Thu Jan 28 02:00:09 2010 @@ -61,5 +61,7 @@ VOID FASTCALL DceResetActiveDCEs(PWINDOW_OBJECT Window); void FASTCALL DceFreeClassDCE(HDC); HWND FASTCALL UserGethWnd(HDC,PWNDOBJ*); +void FASTCALL DceFreeWindowDCE(PWINDOW_OBJECT); +void FASTCALL DceFreeThreadDCE(PTHREADINFO); #endif /* _WIN32K_DCE_H */ Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Thu Jan 28 02:00:09 2010 @@ -288,6 +288,7 @@ DPRINT("Destroying W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); Win32Thread->TIF_flags |= TIF_INCLEANUP; + DceFreeThreadDCE(Win32Thread); HOOK_DestroyThreadHooks(Thread); UnregisterThreadHotKeys(Thread); /* what if this co_ func crash in umode? what will clean us up then? */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Thu Jan 28 02:00:09 2010 @@ -1111,8 +1111,6 @@ END_CLEANUP; } - - static INT FASTCALL UserScrollDC(HDC hDC, INT dx, INT dy, const RECTL *prcScroll, @@ -1207,9 +1205,6 @@ return Result; } - - - /* * NtUserScrollDC @@ -1217,10 +1212,15 @@ * Status * @implemented */ - BOOL APIENTRY -NtUserScrollDC(HDC hDC, INT dx, INT dy, const RECT *prcUnsafeScroll, - const RECT *prcUnsafeClip, HRGN hrgnUpdate, LPRECT prcUnsafeUpdate) +NtUserScrollDC( + HDC hDC, + INT dx, + INT dy, + const RECT *prcUnsafeScroll, + const RECT *prcUnsafeClip, + HRGN hrgnUpdate, + LPRECT prcUnsafeUpdate) { DECLARE_RETURN(DWORD); RECTL rcScroll, rcClip, rcUpdate; @@ -1258,10 +1258,13 @@ RETURN(FALSE); } - Result = UserScrollDC(hDC, dx, dy, - prcUnsafeScroll? &rcScroll : 0, - prcUnsafeClip? &rcClip : 0, hrgnUpdate, - prcUnsafeUpdate? &rcUpdate : NULL); + Result = UserScrollDC( hDC, + dx, + dy, + prcUnsafeScroll? &rcScroll : 0, + prcUnsafeClip? &rcClip : 0, + hrgnUpdate, + prcUnsafeUpdate? &rcUpdate : NULL); if(Result == ERROR) { /* FIXME: Only if hRgnUpdate is invalid we should SetLastError(ERROR_INVALID_HANDLE) */ @@ -1303,8 +1306,15 @@ */ DWORD APIENTRY -NtUserScrollWindowEx(HWND hWnd, INT dx, INT dy, const RECT *prcUnsafeScroll, - const RECT *prcUnsafeClip, HRGN hrgnUpdate, LPRECT prcUnsafeUpdate, UINT flags) +NtUserScrollWindowEx( + HWND hWnd, + INT dx, + INT dy, + const RECT *prcUnsafeScroll, + const RECT *prcUnsafeClip, + HRGN hrgnUpdate, + LPRECT prcUnsafeUpdate, + UINT flags) { RECTL rcScroll, rcClip, rcCaret, rcUpdate; INT Result; @@ -1378,7 +1388,14 @@ rcCaret = rcScroll; hwndCaret = co_IntFixCaret(Window, &rcCaret, flags); - Result = UserScrollDC(hDC, dx, dy, &rcScroll, &rcClip, hrgnOwn, prcUnsafeUpdate? &rcUpdate : NULL); + Result = UserScrollDC( hDC, + dx, + dy, + &rcScroll, + &rcClip, + hrgnOwn, + prcUnsafeUpdate? &rcUpdate : NULL); + UserReleaseDC(Window, hDC, FALSE); /* Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] Thu Jan 28 02:00:09 2010 @@ -47,6 +47,8 @@ return NULL; } + VisRgn = NULL; + if (ClientArea) { VisRgn = IntSysCreateRectRgnIndirect(&Window->Wnd->rcClient); @@ -71,13 +73,14 @@ CurrentWindow->state & WINDOWSTATUS_DESTROYED ) { DPRINT1("ATM the Current Window or Parent is dead!\n"); + if (VisRgn) REGION_FreeRgnByHandle(VisRgn); return NULL; } CurrentWnd = CurrentWindow->Wnd; if (!CurrentWnd || !(CurrentWnd->style & WS_VISIBLE)) { - REGION_FreeRgnByHandle(VisRgn); + if (VisRgn) REGION_FreeRgnByHandle(VisRgn); return NULL; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Thu Jan 28 02:00:09 2010 @@ -19,9 +19,10 @@ /* GLOBALS *******************************************************************/ /* NOTE - I think we should store this per window station (including gdi objects) */ - -static PDCE FirstDce = NULL; -//static INT DCECount = 0; // Count of DCE in system. +/* Answer: No, use the DCE pMonitor to compare with! */ + +static LIST_ENTRY LEDce; +static INT DCECount = 0; // Count of DCE in system. #define DCX_CACHECOMPAREMASK (DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN | \ DCX_NORESETATTRS | DCX_LOCKWINDOWUPDATE | \ @@ -51,6 +52,7 @@ defaultDCstate->pdcattr = &defaultDCstate->dcattr; DC_vCopyState(dc, defaultDCstate, TRUE); DC_UnlockDc( dc ); + InitializeListHead(&LEDce); } return hDC; } @@ -90,7 +92,8 @@ ExFreePoolWithTag(pDce, TAG_PDCE); return NULL; } - + DCECount++; + DPRINT("Alloc DCE's! %d\n",DCECount); pDce->hwndCurrent = (Window ? Window->hSelf : NULL); pDce->pwndOrg = Wnd; pDce->pwndClip = Wnd; @@ -99,15 +102,7 @@ pDce->hrgnSavedVis = NULL; pDce->ppiOwner = NULL; - KeEnterCriticalRegion(); - if (FirstDce == NULL) - { - FirstDce = pDce; - InitializeListHead(&FirstDce->List); - } - else - InsertTailList(&FirstDce->List, &pDce->List); - KeLeaveCriticalRegion(); + InsertTailList(&LEDce, &pDce->List); DCU_SetDcUndeletable(pDce->hDC); @@ -204,7 +199,6 @@ } /* restore previous visible region */ - if ((dce->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) && ((dce->DCXFlags & DCX_CACHE) || EndPaint)) { @@ -213,30 +207,48 @@ if (dce->DCXFlags & DCX_CACHE) { - if (!(dce->DCXFlags & DCX_NORESETATTRS)) - { - /* make the DC clean so that SetDCState doesn't try to update the vis rgn */ - IntGdiSetHookFlags(dce->hDC, DCHF_VALIDATEVISRGN); - - // Clean the DC - if (!IntGdiCleanDC(dce->hDC)) return 0; - - if (dce->DCXFlags & DCX_DCEDIRTY) - { - /* don't keep around invalidated entries - * because SetDCState() disables hVisRgn updates - * by removing dirty bit. */ - dce->hwndCurrent = 0; - dce->DCXFlags &= DCX_CACHE; - dce->DCXFlags |= DCX_DCEEMPTY; - } - } - dce->DCXFlags &= ~DCX_DCEBUSY; - DPRINT("Exit!!!!! DCX_CACHE!!!!!! hDC-> %x \n", dce->hDC); - if (!IntGdiSetDCOwnerEx( dce->hDC, GDI_OBJ_HMGR_NONE, FALSE)) - return 0; - dce->ptiOwner = NULL; // Reset ownership. - dce->ppiOwner = NULL; + if (!(dce->DCXFlags & DCX_NORESETATTRS)) + { + /* make the DC clean so that SetDCState doesn't try to update the vis rgn */ + IntGdiSetHookFlags(dce->hDC, DCHF_VALIDATEVISRGN); + + // Clean the DC + if (!IntGdiCleanDC(dce->hDC)) return 0; + + if (dce->DCXFlags & DCX_DCEDIRTY) + { + /* don't keep around invalidated entries + * because SetDCState() disables hVisRgn updates + * by removing dirty bit. */ + dce->hwndCurrent = 0; + dce->DCXFlags &= DCX_CACHE; + dce->DCXFlags |= DCX_DCEEMPTY; + } + } + dce->DCXFlags &= ~DCX_DCEBUSY; + DPRINT("Exit!!!!! DCX_CACHE!!!!!! hDC-> %x \n", dce->hDC); + if (!IntGdiSetDCOwnerEx( dce->hDC, GDI_OBJ_HMGR_NONE, FALSE)) + return 0; + dce->ptiOwner = NULL; // Reset ownership. + dce->ppiOwner = NULL; + +#if 0 // Need to research and fix before this is a "growing" issue. + if (++DCECache > 32) + { + pLE = LEDce.Flink; + pDCE = CONTAINING_RECORD(pLE, DCE, List); + do + { + if (!(pDCE->DCXFlags & DCX_DCEBUSY)) + { /* Free the unused cache DCEs. */ + pDCE = DceFreeDCE(pDCE, TRUE); + if (!pDCE) break; + continue; + } + } + while (pLE != &LEDce ); + } +#endif } return 1; // Released! } @@ -335,6 +347,7 @@ PWND Wnd = NULL; HDC hDC = NULL; PPROCESSINFO ppi; + PLIST_ENTRY pLE; if (NULL == Window) { @@ -445,7 +458,8 @@ DCE* DceEmpty = NULL; DCE* DceUnused = NULL; KeEnterCriticalRegion(); - Dce = FirstDce; + pLE = LEDce.Flink; + Dce = CONTAINING_RECORD(pLE, DCE, List); do { // The reason for this you may ask? @@ -471,8 +485,10 @@ break; } } - Dce = (PDCE)Dce->List.Flink; - } while (Dce != FirstDce); + pLE = Dce->List.Flink; + Dce = CONTAINING_RECORD(pLE, DCE, List); + } + while (pLE != &LEDce); KeLeaveCriticalRegion(); Dce = (DceEmpty == NULL) ? DceUnused : DceEmpty; @@ -488,14 +504,17 @@ else // If we are here, we are POWNED or having CLASS. { KeEnterCriticalRegion(); - Dce = FirstDce; + pLE = LEDce.Flink; + Dce = CONTAINING_RECORD(pLE, DCE, List); do { // Check for Window handle than HDC match for CLASS. if ((Dce->hwndCurrent == Window->hSelf) || (Dce->hDC == hDC)) break; - Dce = (PDCE)Dce->List.Flink; - } while (Dce != FirstDce); + pLE = Dce->List.Flink; + Dce = CONTAINING_RECORD(pLE, DCE, List); + } + while (pLE != &LEDce); KeLeaveCriticalRegion(); if ( (Flags & (DCX_INTERSECTRGN|DCX_EXCLUDERGN)) && @@ -526,11 +545,10 @@ http://www.reactos.org/archives/public/ros-dev/2008-July/010498.html http://www.reactos.org/archives/public/ros-dev/2008-July/010499.html */ - if ((Dce != FirstDce)) + if (pLE != &LEDce) { RemoveEntryList(&Dce->List); - InsertHeadList(&FirstDce->List, &Dce->List); - FirstDce = Dce; + InsertHeadList(&LEDce, &Dce->List); } /* Introduced in rev 6691 and modified later. */ @@ -595,15 +613,13 @@ DceFreeDCE(PDCE pdce, BOOLEAN Force) { DCE *ret; + PLIST_ENTRY pLE; BOOL Hit = FALSE; if (NULL == pdce) return NULL; - ret = (PDCE) pdce->List.Flink; - -#if 0 /* FIXME */ - SetDCHook(pdce->hDC, NULL, 0L); -#endif + pLE = pdce->List.Flink; + ret = CONTAINING_RECORD(pLE, DCE, List); if (Force && !GDIOBJ_OwnedByCurrentProcess(pdce->hDC)) { @@ -625,6 +641,7 @@ if (pdce->hrgnClip && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) { REGION_FreeRgnByHandle(pdce->hrgnClip); + pdce->hrgnClip = NULL; } RemoveEntryList(&pdce->List); @@ -632,47 +649,158 @@ if (IsListEmpty(&pdce->List)) { DPRINT1("List is Empty! DCE! -> %x\n" , pdce); - FirstDce = NULL; - ret = NULL; + return NULL; } ExFreePoolWithTag(pdce, TAG_PDCE); + DCECount--; + DPRINT("Freed DCE's! %d \n", DCECount); + return ret; +} + +/*********************************************************************** + * DceFreeWindowDCE + * + * Remove owned DCE and reset unreleased cache DCEs. + */ +void FASTCALL +DceFreeWindowDCE(PWINDOW_OBJECT Window) +{ + PDCE pDCE; + PLIST_ENTRY pLE; + + if (DCECount <= 0) + { + DPRINT1("No Entry!\n"); + return; + } + + pLE = LEDce.Flink; + pDCE = CONTAINING_RECORD(pLE, DCE, List); + do + { + if (!pDCE) break; + if (IsListEmpty(&pDCE->List)) break; + if (pDCE->hwndCurrent == Window->hSelf) + { + if (!(pDCE->DCXFlags & DCX_CACHE)) /* owned or Class DCE*/ + { + if (Window->Wnd->pcls->style & CS_CLASSDC) /* Test Class first */ + { + if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) /* Class DCE*/ + DceDeleteClipRgn(pDCE); + // Update and reset Vis Rgn and clear the dirty bit. + // Should release VisRgn than reset it to default. + DceUpdateVisRgn(pDCE, Window, pDCE->DCXFlags); + pDCE->DCXFlags = DCX_DCEEMPTY|DCX_CACHE; + pDCE->hwndCurrent = 0; + + DPRINT("POWNED DCE going Cheap!! DCX_CACHE!! hDC-> %x \n", pDCE->hDC); + if (!IntGdiSetDCOwnerEx( pDCE->hDC, GDI_OBJ_HMGR_NONE, FALSE)) + return; + /* Do not change owner so thread can clean up! */ + } + else if (Window->Wnd->pcls->style & CS_OWNDC) /* owned DCE*/ + { + pDCE = DceFreeDCE(pDCE, FALSE); + if (!pDCE) break; + continue; + } + else + { + ASSERT(FALSE); + } + } + else + { + if (pDCE->DCXFlags & DCX_DCEBUSY) /* shared cache DCE */ + { + /* FIXME: AFAICS we are doing the right thing here so + * this should be a DPRINT. But this is best left as an ERR + * because the 'application error' is likely to come from + * another part of Wine (i.e. it's our fault after all). + * We should change this to DPRINT when ReactOS is more stable + * (for 1.0?). + */ + DPRINT1("[%p] GetDC() without ReleaseDC()!\n", Window->hSelf); + DceReleaseDC(pDCE, FALSE); + } + pDCE->DCXFlags |= DCX_DCEEMPTY; + pDCE->hwndCurrent = 0; + } + } + pLE = pDCE->List.Flink; + pDCE = CONTAINING_RECORD(pLE, DCE, List); + } + while (pLE != &LEDce); } void FASTCALL DceFreeClassDCE(HDC hDC) { - PDCE pDCE = FirstDce; - KeEnterCriticalRegion(); + PDCE pDCE; + PLIST_ENTRY pLE; + pLE = LEDce.Flink; + pDCE = CONTAINING_RECORD(pLE, DCE, List); + do { if(!pDCE) break; if (pDCE->hDC == hDC) { - pDCE = DceFreeDCE(pDCE, FALSE); - if(!pDCE) break; + pDCE = DceFreeDCE(pDCE, TRUE); // Might have gone cheap! + if (!pDCE) break; continue; } - pDCE = (PDCE)pDCE->List.Flink; - } while (pDCE != FirstDce); - KeLeaveCriticalRegion(); + pLE = pDCE->List.Flink; + pDCE = CONTAINING_RECORD(pLE, DCE, List); + } + while (pLE != &LEDce); +} + +void FASTCALL +DceFreeThreadDCE(PTHREADINFO pti) +{ + PDCE pDCE; + PLIST_ENTRY pLE; + pLE = LEDce.Flink; + pDCE = CONTAINING_RECORD(pLE, DCE, List); + + do + { + if(!pDCE) break; + if (pDCE->ptiOwner == pti) + { + if (pDCE->DCXFlags & DCX_CACHE) + { + pDCE = DceFreeDCE(pDCE, TRUE); + if (!pDCE) break; + continue; + } + } + pLE = pDCE->List.Flink; + pDCE = CONTAINING_RECORD(pLE, DCE, List); + } + while (pLE != &LEDce); } VOID FASTCALL DceEmptyCache(VOID) { - PDCE pDCE = FirstDce; - KeEnterCriticalRegion(); + PDCE pDCE; + PLIST_ENTRY pLE; + pLE = LEDce.Flink; + pDCE = CONTAINING_RECORD(pLE, DCE, List); + do { if(!pDCE) break; pDCE = DceFreeDCE(pDCE, TRUE); if(!pDCE) break; - } while (pDCE != FirstDce); - KeLeaveCriticalRegion(); - FirstDce = NULL; + } + while (pLE != &LEDce); } VOID FASTCALL @@ -683,16 +811,19 @@ PWINDOW_OBJECT CurrentWindow; INT DeltaX; INT DeltaY; + PLIST_ENTRY pLE; if (NULL == Window) { return; } - pDCE = FirstDce; + pLE = LEDce.Flink; + pDCE = CONTAINING_RECORD(pLE, DCE, List); if(!pDCE) return; // Another null test! do { if(!pDCE) break; + if(pLE == &LEDce) break; if (0 == (pDCE->DCXFlags & DCX_DCEEMPTY)) { if (Window->hSelf == pDCE->hwndCurrent) @@ -704,7 +835,8 @@ CurrentWindow = UserGetWindowObject(pDCE->hwndCurrent); if (NULL == CurrentWindow) { - pDCE = (PDCE) pDCE->List.Flink; + pLE = pDCE->List.Flink; + pDCE = CONTAINING_RECORD(pLE, DCE, List); continue; } } @@ -712,7 +844,8 @@ if (!GDIOBJ_ValidateHandle(pDCE->hDC, GDI_OBJECT_TYPE_DC) || (dc = DC_LockDc(pDCE->hDC)) == NULL) { - pDCE = (PDCE) pDCE->List.Flink; + pLE = pDCE->List.Flink; + pDCE = CONTAINING_RECORD(pLE, DCE, List); continue; } if (Window == CurrentWindow || IntIsChildWindow(Window, CurrentWindow)) @@ -751,17 +884,21 @@ // UserDerefObject(CurrentWindow); } } - pDCE =(PDCE) pDCE->List.Flink; - } while (pDCE != FirstDce); + pLE = pDCE->List.Flink; + pDCE = CONTAINING_RECORD(pLE, DCE, List); + } + while (pLE != &LEDce); } HWND FASTCALL IntWindowFromDC(HDC hDc) { DCE *Dce; + PLIST_ENTRY pLE; HWND Ret = NULL; - KeEnterCriticalRegion(); - Dce = FirstDce; + + pLE = LEDce.Flink; + Dce = CONTAINING_RECORD(pLE, DCE, List); do { if(Dce->hDC == hDc) @@ -769,9 +906,10 @@ Ret = Dce->hwndCurrent; break; } - Dce = (PDCE)Dce->List.Flink; - } while (Dce != FirstDce); - KeLeaveCriticalRegion(); + pLE = Dce->List.Flink; + Dce = CONTAINING_RECORD(pLE, DCE, List); + } + while (pLE != &LEDce); return Ret; } @@ -779,12 +917,13 @@ UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc, BOOL EndPaint) { PDCE dce; + PLIST_ENTRY pLE; INT nRet = 0; BOOL Hit = FALSE; DPRINT("%p %p\n", Window, hDc); - dce = FirstDce; - KeEnterCriticalRegion(); + pLE = LEDce.Flink; + dce = CONTAINING_RECORD(pLE, DCE, List); do { if(!dce) break; @@ -793,11 +932,10 @@ Hit = TRUE; break; } - - dce = (PDCE) dce->List.Flink; - } - while (dce != FirstDce ); - KeLeaveCriticalRegion(); + pLE = dce->List.Flink; + dce = CONTAINING_RECORD(pLE, DCE, List); + } + while (pLE != &LEDce ); if ( Hit && (dce->DCXFlags & DCX_DCEBUSY)) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Jan 28 02:00:09 2010 @@ -478,6 +478,7 @@ Window->SystemMenu = (HMENU)0; } + DceFreeWindowDCE(Window); /* Always do this to catch orphaned DCs */ #if 0 /* FIXME */ WINPROC_FreeProc(Window->winproc, WIN_PROC_WINDOW);

1 0

[tkreuzer] 45292: fix a typo
by tkreuzer＠svn.reactos.org 28 Jan '10

28 Jan '10

Author: tkreuzer Date: Thu Jan 28 01:59:40 2010 New Revision: 45292 URL: http://svn.reactos.org/svn/reactos?rev=45292&view=rev Log: fix a typo Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/cos.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/cos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/cos.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/cos.c [iso-8859-1] Thu Jan 28 01:59:40 2010 @@ -45,7 +45,7 @@ result = 0; #if (PRECISION >= 10) - result += 1./(1.*2*3*4*5*6*7*8*9*10*11*12*13*14*15*16*17*18*20); + result += 1./(1.*2*3*4*5*6*7*8*9*10*11*12*13*14*15*16*17*18*19*20); result *= x2; #endif #if (PRECISION >= 9)

1 0

[cgutman] 45291: - Merge aicom-network-branch (still without the NDIS stuff) - Fixes some nasty bugs and hacks in our TCP implementation
by cgutman＠svn.reactos.org 28 Jan '10

28 Jan '10

Author: cgutman Date: Thu Jan 28 01:24:00 2010 New Revision: 45291 URL: http://svn.reactos.org/svn/reactos?rev=45291&view=rev Log: - Merge aicom-network-branch (still without the NDIS stuff) - Fixes some nasty bugs and hacks in our TCP implementation Added: trunk/reactos/lib/drivers/oskittcp/include/osenv.h (with props) trunk/reactos/lib/drivers/oskittcp/oskittcp/osenv.c (with props) Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/proc.h trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c trunk/reactos/lib/drivers/oskittcp/oskittcp/sleep.c trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_subr.c trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Thu Jan 28 01:24:00 2010 @@ -24,11 +24,14 @@ NewState & SEL_ACCEPT ? 'A' : 'a', NewState & SEL_WRITE ? 'W' : 'w')); + /* If this socket is missing its socket context, that means that it + * has been created as a new connection in sonewconn but not accepted + * yet. We can safely ignore event notifications on these sockets. + * Once they are accepted, they will get a socket context and we will + * be able to process them. + */ if (!Connection) - { - //ASSERT(FALSE); return 0; - } TI_DbgPrint(DEBUG_TCP,("Called: NewState %x (Conn %x) (Change %x)\n", NewState, Connection, Modified: trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h [iso-8859-1] Thu Jan 28 01:24:00 2010 @@ -36,7 +36,7 @@ #ifndef _SYS_MALLOC_H_ #define _SYS_MALLOC_H_ -#ifndef OSKIT +#if !defined(OSKIT) || defined(__REACTOS__) #define KMEMSTATS #endif @@ -288,7 +288,6 @@ #define MALLOC(space, cast, size, type, flags) \ (space) = (cast)fbsd_malloc((u_long)(size), __FILE__, __LINE__, type, flags) #define FREE(addr, type) fbsd_free((caddr_t)(addr), __FILE__, __LINE__, type) - #else /* do not collect statistics */ #define MALLOC(space, cast, size, type, flags) { \ register struct kmembuckets *kbp = &bucket[BUCKETINDX(size)]; \ Modified: trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/proc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/proc.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/proc.h [iso-8859-1] Thu Jan 28 01:24:00 2010 @@ -65,7 +65,11 @@ #include <sys/socketvar.h> #ifdef OSKIT +#ifndef __REACTOS__ #include <oskit/dev/dev.h> +#else +#include <osenv.h> +#endif #endif /* Added: trunk/reactos/lib/drivers/oskittcp/include/osenv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/osenv.h (added) +++ trunk/reactos/lib/drivers/oskittcp/include/osenv.h [iso-8859-1] Thu Jan 28 01:24:00 2010 @@ -1,0 +1,14 @@ +#ifndef OSENV_H +#define OSENV_H + +static __inline void osenv_intr_enable(void) {} +static __inline void osenv_intr_disable(void) {} + +void oskit_bufio_addref(void *buf); +void oskit_bufio_release(void *buf); +void* oskit_bufio_create(int len); +void oskit_bufio_map(void *srcbuf, void**dstbuf, int off, int len); + +#define osenv_sleeprec_t void* + +#endif Propchange: trunk/reactos/lib/drivers/oskittcp/include/osenv.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild [iso-8859-1] Thu Jan 28 01:24:00 2010 @@ -3,6 +3,7 @@ <module name="oskittcp" type="staticlibrary"> <define name="__NTDRIVER__"/> <define name="KERNEL"/> + <define name="OSKIT"/> <include base="oskittcp">include/freebsd</include> <include base="oskittcp">include/freebsd/sys/include</include> <include base="oskittcp">include/freebsd/src/sys</include> @@ -22,6 +23,7 @@ <file>ip_output.c</file> <file>kern_clock.c</file> <file>kern_subr.c</file> + <file>osenv.c</file> <file>param.c</file> <file>radix.c</file> <file>random.c</file> 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] Thu Jan 28 01:24:00 2010 @@ -48,8 +48,6 @@ void InitOskitTCP() { OS_DbgPrint(OSK_MID_TRACE,("Init Called\n")); KeInitializeSpinLock(&OSKLock); - OS_DbgPrint(OSK_MID_TRACE,("MB Init\n")); - mbinit(); OS_DbgPrint(OSK_MID_TRACE,("Rawip Init\n")); rip_init(); raw_init(); @@ -403,7 +401,7 @@ so->so_state |= SS_NBIO | SS_ISCONNECTED; so->so_q = so->so_q0 = NULL; - so->so_qlen = 0; + so->so_qlen = so->so_q0len = 0; so->so_head = 0; so->so_connection = context; Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] Thu Jan 28 01:24:00 2010 @@ -393,6 +393,7 @@ error = OtcpEvent.PacketSend( OtcpEvent.ClientData, (OSK_PCHAR)new_m->m_data, new_m->m_len ); m_free( new_m ); + m_freem( m ); goto done; } #else @@ -532,6 +533,7 @@ error = OtcpEvent.PacketSend( OtcpEvent.ClientData, (OSK_PCHAR)new_m->m_data, new_m->m_len ); m_free( new_m ); + m_freem( m ); } OS_DbgPrint(OSK_MID_TRACE,("Error from upper layer: %d\n", error)); Added: trunk/reactos/lib/drivers/oskittcp/oskittcp/osenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/osenv.c (added) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/osenv.c [iso-8859-1] Thu Jan 28 01:24:00 2010 @@ -1,0 +1,45 @@ +#include "oskittcp.h" + +unsigned oskit_freebsd_cpl; + +/* We have to store a reference count somewhere so we + * don't free a buffer being referenced in another mbuf. + * I just decided to add an extra char to the beginning of + * the buffer and store the reference count there. I doubt the ref count + * will ever even get close to 0xFF so we should be ok. Remember that + * only one thread can ever be inside oskit due to OSKLock so this should + * be safe. + */ + +void oskit_bufio_addref(void *buf) +{ + unsigned char* fullbuf = ((unsigned char*)buf) - sizeof(char); + +#if DBG + if (fullbuf[0] == 0xFF) + panic("oskit_bufio_addref: ref count overflow"); +#endif + + fullbuf[0]++; +} +void oskit_bufio_release(void *buf) +{ + unsigned char* fullbuf = ((unsigned char*)buf) - sizeof(char); + + if (--fullbuf[0] == 0) + free(fullbuf, 0); +} +void* oskit_bufio_create(int len) +{ + unsigned char* fullbuf = malloc(len + sizeof(char), __FILE__, __LINE__); + if (fullbuf == NULL) + return NULL; + + fullbuf[0] = 1; + + return (void*)(fullbuf + sizeof(char)); +} +void oskit_bufio_map(void *srcbuf, void**dstbuf, int off, int len) +{ + *dstbuf = srcbuf; +} Propchange: trunk/reactos/lib/drivers/oskittcp/oskittcp/osenv.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/sleep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/sleep.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/sleep.c [iso-8859-1] Thu Jan 28 01:24:00 2010 @@ -91,53 +91,3 @@ /* Start a clock we can use for timeouts */ } - -extern unsigned bio_imask; /* group of interrupts masked with splbio() */ -extern unsigned cpl; /* current priority level mask */ -extern volatile unsigned idelayed; /* interrupts to become pending */ -extern volatile unsigned ipending; /* active interrupts masked by cpl */ -extern unsigned net_imask; /* group of interrupts masked with splimp() */ -extern unsigned stat_imask; /* interrupts masked with splstatclock() */ -extern unsigned tty_imask; /* group of interrupts masked with spltty() */ - -/* - * ipending has to be volatile so that it is read every time it is accessed - * in splx() and spl0(), but we don't want it to be read nonatomically when - * it is changed. Pretending that ipending is a plain int happens to give - * suitable atomic code for "ipending |= constant;". - */ -#define setdelayed() (*(unsigned *)&ipending |= loadandclear(&idelayed)) -#define setsoftast() (*(unsigned *)&ipending |= SWI_AST_PENDING) -#define setsoftclock() (*(unsigned *)&ipending |= SWI_CLOCK_PENDING) -#define setsoftnet() (*(unsigned *)&ipending |= SWI_NET_PENDING) -#define setsofttty() (*(unsigned *)&ipending |= SWI_TTY_PENDING) - -#define schedsofttty() (*(unsigned *)&idelayed |= SWI_TTY_PENDING) - -#define GENSPL(name, set_cpl) \ -static __inline int name(void) \ -{ \ - unsigned x; \ - \ - __asm __volatile("" : : : "memory"); \ - x = cpl; \ - set_cpl; \ - return (x); \ -} - -void splz(void) { - OS_DbgPrint(OSK_MID_TRACE,("Called SPLZ\n")); -} - -/* - * functions to save and restore the current cpl - */ -void save_cpl(unsigned *x) -{ - *x = cpl; -} - -void restore_cpl(unsigned x) -{ - cpl = x; -} Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c [iso-8859-1] Thu Jan 28 01:24:00 2010 @@ -708,38 +708,8 @@ ((struct ip *)ti)->ip_off |= IP_DF; } #endif - /* - * XXX: It seems that osktittcp expects that packets are - * synchronously processed. The current implementation feeds - * oskittcp with the packets asynchronously. That's not a - * problem normally when the packets are transfered over - * network, but it starts to be a problem when it comes to - * loopback packets. - * The ACK bits are set in tcp_input which calls tcp_output and - * expects them to be cleared before further processing. - * Instead tcp_output calls ip_output which produces a packet - * and ends up in tcp_input and we're stuck in infinite loop. - * Normally the flags are masked out at the end of this function - * and the incomming packets are processed then, but since - * currently the loopback packet is delivered during the - * ip_output call, the function end is never reached... - */ -#ifdef __REACTOS__ - tp->t_flags &= ~(TF_ACKNOW|TF_DELACK); -#endif error = ip_output(m, tp->t_inpcb->inp_options, &tp->t_inpcb->inp_route, so->so_options & SO_DONTROUTE, 0); -#ifdef __REACTOS__ - /* We allocated m, so we are responsible for freeing it. If the mbuf - contains a pointer to an external datablock, we (or rather, m_copy) - didn't allocate it but pointed it to the data to send. So we have - to cheat a little bit and keep M_FREE from freeing the external - data block */ - while (NULL != m) { - m->m_flags &= ~M_EXT; - m = m_free(m); - } -#endif } if (error) { out: Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_subr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_subr.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_subr.c [iso-8859-1] Thu Jan 28 01:24:00 2010 @@ -163,7 +163,6 @@ tcp_seq ack, seq; int flags; { - struct mbuf *n; register int tlen; int win = 0; struct route *ro = 0; @@ -222,18 +221,6 @@ tcp_trace(TA_OUTPUT, 0, tp, ti, 0); #endif (void) ip_output(m, NULL, ro, 0, NULL); -#ifdef __REACTOS__ - /* We allocated m, so we are responsible for freeing it. If the mbuf - contains a pointer to an external datablock, we (or rather, m_copy) - didn't allocate it but pointed it to the data to send. So we have - to cheat a little bit and keep M_FREE from freeing the external - data block */ - while (NULL != m) { - m->m_flags &= ~M_EXT; - MFREE(m, n); - m = n; - } -#endif } /* Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c [iso-8859-1] Thu Jan 28 01:24:00 2010 @@ -663,7 +663,7 @@ return (n); } -#ifndef OSKIT +#if !defined(OSKIT) || defined(__REACTOS__) /* currently not OS Kit approved, and shouldn't be needed in the first place */ /*

1 0

[tkreuzer] 45290: [CRT] - implement generic C version of cos(). On amd64 machines it will compile into very optimized SSE2 code. No need to use assembly.
by tkreuzer＠svn.reactos.org 27 Jan '10

27 Jan '10

Author: tkreuzer Date: Thu Jan 28 00:42:34 2010 New Revision: 45290 URL: http://svn.reactos.org/svn/reactos?rev=45290&view=rev Log: [CRT] - implement generic C version of cos(). On amd64 machines it will compile into very optimized SSE2 code. No need to use assembly. Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/cos.c (with props) Removed: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/cos.S Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Thu Jan 28 00:42:34 2010 @@ -161,13 +161,13 @@ <file>jn_yn.c</file>--> </if> <if property="ARCH" value="amd64"> + <file>cos.c</file> <directory name="amd64"> <file>alldiv.S</file> <file>atan.S</file> <file>atan2.S</file> <file>ceil.S</file> <file>ceilf.S</file> - <file>cos.S</file> <file>exp.S</file> <file>fabs.S</file> <file>floor.S</file> Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Thu Jan 28 00:42:34 2010 @@ -64,7 +64,6 @@ <file>atan.S</file> <file>atan2.S</file> <file>ceil.S</file> - <file>cos.S</file> <file>exp.S</file> <file>fabs.S</file> <file>floor.S</file> Removed: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/cos.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/cos.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/cos.S (removed) @@ -1,21 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of cos - * FILE: lib/sdk/crt/math/amd64/cos.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <ndk/amd64/asm.h> -#include <ndk/amd64/asmmacro.S> - -.intel_syntax noprefix - - -.proc cos - UNIMPLEMENTED cos - ret - -.endproc Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/cos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/cos.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/cos.c [iso-8859-1] Thu Jan 28 00:42:34 2010 @@ -1,0 +1,89 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT + * FILE: lib/crt/math/cos.c + * PURPOSE: Generic C Implementation of cos + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#define PRECISION 9 +#define M_PI 3.141592653589793238462643 + +static double cos_off_tbl[] = {0.0, -M_PI/2., 0, -M_PI/2.}; +static double cos_sign_tbl[] = {1,-1,-1,1}; + +double +cos(double x) +{ + int quadrant; + double x2, result; + + /* Calculate the quadrant */ + quadrant = x * (2./M_PI); + + /* Get offset inside quadrant */ + x = x - quadrant * (M_PI/2.); + + /* Normalize quadrant to [0..3] */ + quadrant = quadrant & 0x3; + + /* Fixup value for the generic function */ + x += cos_off_tbl[quadrant]; + + /* Calculate the negative of the square of x */ + x2 = - (x * x); + + /* This is an unrolled taylor series using <PRECISION> iterations + * Example with 4 iterations: + * result = 1 - x^2/2! + x^4/4! - x^6/6! + x^8/8! + * To save multiplications and to keep the precision high, it's performed + * like this: + * result = 1 - x^2 * (1/2! - x^2 * (1/4! - x^2 * (1/6! - x^2 * (1/8!)))) + */ + + /* Start with 0, compiler will optimize this away */ + result = 0; + +#if (PRECISION >= 10) + result += 1./(1.*2*3*4*5*6*7*8*9*10*11*12*13*14*15*16*17*18*20); + result *= x2; +#endif +#if (PRECISION >= 9) + result += 1./(1.*2*3*4*5*6*7*8*9*10*11*12*13*14*15*16*17*18); + result *= x2; +#endif +#if (PRECISION >= 8) + result += 1./(1.*2*3*4*5*6*7*8*9*10*11*12*13*14*15*16); + result *= x2; +#endif +#if (PRECISION >= 7) + result += 1./(1.*2*3*4*5*6*7*8*9*10*11*12*13*14); + result *= x2; +#endif +#if (PRECISION >= 6) + result += 1./(1.*2*3*4*5*6*7*8*9*10*11*12); + result *= x2; +#endif +#if (PRECISION >= 5) + result += 1./(1.*2*3*4*5*6*7*8*9*10); + result *= x2; +#endif + result += 1./(1.*2*3*4*5*6*7*8); + result *= x2; + + result += 1./(1.*2*3*4*5*6); + result *= x2; + + result += 1./(1.*2*3*4); + result *= x2; + + result += 1./(1.*2); + result *= x2; + + result += 1; + + /* Apply correct sign */ + result *= cos_sign_tbl[quadrant]; + + return result; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/cos.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 45289: Not that nice, but it works well ; -) Thx to Colin for noticing that I accidentally write some vars globally which should not be...
by dreimer＠svn.reactos.org 27 Jan '10

27 Jan '10

Author: dreimer Date: Wed Jan 27 23:25:06 2010 New Revision: 45289 URL: http://svn.reactos.org/svn/reactos?rev=45289&view=rev Log: Not that nice, but it works well ;-) Thx to Colin for noticing that I accidentally write some vars globally which should not be... Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Wed Jan 27 23:25:06 2010 @@ -25,25 +25,33 @@ # Check if the user set any custom filenames or pathes, otherwise locally set the appropriate variables. if ("$ENV:ROS_AUTOMAKE" -eq "") { - $ENV:ROS_AUTOMAKE = "makefile-$ENV:ROS_ARCH.auto" + $ROS_AUTOMAKE = "makefile-$ENV:ROS_ARCH.auto" + } else { + $ROS_AUTOMAKE = $ENV:ROS_AUTOMAKE } if ("$ENV:ROS_INTERMEDIATE" -eq "") { - $ENV:ROS_INTERMEDIATE = "obj-$ENV:ROS_ARCH" + $ROS_INTERMEDIATE = "obj-$ENV:ROS_ARCH" + } else { + $ROS_INTERMEDIATE = $ENV:ROS_INTERMEDIATE } if ("$ENV:ROS_OUTPUT" -eq "") { - $ENV:ROS_OUTPUT = "output-$ENV:ROS_ARCH" + $ROS_OUTPUT = "output-$ENV:ROS_ARCH" + } else { + $ROS_OUTPUT = $ENV:ROS_OUTPUT } if ("$ENV:ROS_CDOUTPUT" -eq "") { - $ENV:ROS_CDOUTPUT = "reactos" + $ROS_CDOUTPUT = "reactos" + } else { + $ROS_CDOUTPUT = $ENV:ROS_CDOUTPUT } - if ((Test-Path "$ENV:ROS_INTERMEDIATE\.") -and (Test-Path "$ENV:ROS_OUTPUT\.")) { + if ((Test-Path "$ROS_INTERMEDIATE\.") -and (Test-Path "$ROS_OUTPUT\.")) { "Cleaning ReactOS $ENV:ROS_ARCH source directory..." - $null = (Remove-Item "$ENV:ROS_AUTOMAKE" -force) - $null = (Remove-Item "$ENV:ROS_INTERMEDIATE" -recurse -force) - $null = (Remove-Item "$ENV:ROS_OUTPUT" -recurse -force) - $null = (Remove-Item "$ENV:ROS_CDOUTPUT" -recurse -force) + $null = (Remove-Item "$ROS_AUTOMAKE" -force) + $null = (Remove-Item "$ROS_INTERMEDIATE" -recurse -force) + $null = (Remove-Item "$ROS_OUTPUT" -recurse -force) + $null = (Remove-Item "$ROS_CDOUTPUT" -recurse -force) "Done cleaning ReactOS $ENV:ROS_ARCH source directory." } else {

1 0

[dreimer] 45288: Update piperead to Version 0.3 (Jan Roeloffzen)
by dreimer＠svn.reactos.org 27 Jan '10

27 Jan '10

Author: dreimer Date: Wed Jan 27 23:13:26 2010 New Revision: 45288 URL: http://svn.reactos.org/svn/reactos?rev=45288&view=rev Log: Update piperead to Version 0.3 (Jan Roeloffzen) Modified: trunk/reactos/tools/pipetools/piperead.cpp Modified: trunk/reactos/tools/pipetools/piperead.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pipetools/piperead.c… ============================================================================== --- trunk/reactos/tools/pipetools/piperead.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/pipetools/piperead.cpp [iso-8859-1] Wed Jan 27 23:13:26 2010 @@ -8,9 +8,12 @@ #define WIN32_LEAN_AND_MEAN +#include <errno.h> #include <windows.h> #include <stdio.h> +#define PIPEREAD_VERSION "0.3" +#define PIPEREAD_NOPIPE (-101) // This definition currently missing in MinGW. #ifndef FILE_FLAG_FIRST_PIPE_INSTANCE @@ -42,7 +45,6 @@ DWORD error = GetLastError(); if (error == ERROR_PIPE_LISTENING) { - fprintf(stderr,"INVALID_HANDLE_VALUE\n"); Sleep(1000); } else if (error == ERROR_BROKEN_PIPE) { CloseHandle(hPipe); @@ -71,6 +73,7 @@ return 0; } + static int pipeClient(char *path) { HANDLE hPipe=INVALID_HANDLE_VALUE; @@ -96,9 +99,18 @@ break; // Exit if an error other than ERROR_PIPE_BUSY occurs. - if (GetLastError() != ERROR_PIPE_BUSY) { - fprintf(stderr,"Could not open pipe. Error=%lu\n", GetLastError() ); - res = -1; + Err = GetLastError(); + if (Err != ERROR_PIPE_BUSY) { + if (ERROR_FILE_NOT_FOUND == Err) + { + res = PIPEREAD_NOPIPE; + return res; + } + else + { + fprintf(stderr,"Could not open pipe %s. Error=%lu\n", path, Err ); + res = -1; + } break; } @@ -134,7 +146,6 @@ if ( ! fSuccess) { fprintf(stderr, "ReadFile from pipe failed. Error=%lu\n", GetLastError() ); - res = -5; } if (hPipe != INVALID_HANDLE_VALUE) @@ -144,8 +155,29 @@ } +static int fileClient(const char *path) +{ + int res = 0; + FILE *fin; + int c; + + setvbuf(stdout, NULL, _IONBF, 0); + if (!(fin = fopen(path, "r"))) { + fprintf(stderr,"Could not fopen %s (%s)\n", path, strerror(errno) ); + return -1; + } + + while ((c = fgetc(fin)) != EOF) { + fputc(c, stdout); + } + + fclose(fin); + return res; +} + void usage(void) { + fprintf(stderr, "piperead " PIPEREAD_VERSION "\n\n"); fprintf(stderr, "Usage: piperead [-c] <named pipe>\n"); fprintf(stderr, "-c means Client mode\n"); fprintf(stderr, "Example: piperead -c \\\\.\\pipe\\kdbg | log2lines -c\n\n"); @@ -193,6 +225,9 @@ if ( clientMode ) { res = pipeClient(path); + if (res == PIPEREAD_NOPIPE) { + res = fileClient(pipe_name); + } } else { res = pipeServer(path); }

1 0

[dreimer] 45287: Update log2lines to Version 1.11 (Jan Roeloffzen) Bug 4342 - Added -P Pipeline option for Powershell support, see below - Renaming some structs to avoid potential naming conflicts with windows.h - stdin/out -> stdIn/Out for redirecting - Fixed potential mem leak - A little more tracing and cleanup Updated piperead (Jan Roeloffzen) Bug 5146 - Added Pipe client function, based on msdn example - Improved option handling (try piperead -h) - logging, error handling - Integrated in bu
by dreimer＠svn.reactos.org 27 Jan '10

27 Jan '10

Author: dreimer Date: Wed Jan 27 20:03:52 2010 New Revision: 45287 URL: http://svn.reactos.org/svn/reactos?rev=45287&view=rev Log: Update log2lines to Version 1.11 (Jan Roeloffzen) Bug 4342 - Added -P Pipeline option for Powershell support, see below - Renaming some structs to avoid potential naming conflicts with windows.h - stdin/out -> stdIn/Out for redirecting - Fixed potential mem leak - A little more tracing and cleanup Updated piperead (Jan Roeloffzen) Bug 5146 - Added Pipe client function, based on msdn example - Improved option handling (try piperead -h) - logging, error handling - Integrated in build (pipetools.mak) Added: trunk/reactos/tools/pipetools/pipetools.mak (with props) Modified: trunk/reactos/tools/pipetools/piperead.cpp trunk/reactos/tools/rsym/log2lines.c trunk/reactos/tools/tools.mak Modified: trunk/reactos/tools/pipetools/piperead.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pipetools/piperead.c… ============================================================================== --- trunk/reactos/tools/pipetools/piperead.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/pipetools/piperead.cpp [iso-8859-1] Wed Jan 27 20:03:52 2010 @@ -2,13 +2,10 @@ // piperead.cpp // // Martin Fuchs, 30.11.2003 -// - -// -// Invoke as: "piperead [pipe_name]", -// for example: "piperead com_1" -// - +// +// Jan Roeloffzen, 26.1.2010 +// Pipe client, based on msdn example + #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -21,24 +18,15 @@ #endif +#define BUFSIZE 1024 + static void print_error(DWORD win32_error) { fprintf(stderr, "WIN32 error %lu\n", win32_error); } - -int main(int argc, char** argv) -{ - char path[MAX_PATH]; - const char* pipe_name; - - if (argc > 1) - pipe_name = *++argv; - else - pipe_name = "com_1"; - - sprintf(path, "\\\\.\\pipe\\%s", pipe_name); - +static int pipeServer(char *path) +{ HANDLE hPipe = CreateNamedPipe(path, PIPE_ACCESS_DUPLEX|FILE_FLAG_FIRST_PIPE_INSTANCE, PIPE_WAIT|PIPE_TYPE_BYTE, 1, 4096, 4096, 30000, NULL); if (hPipe == INVALID_HANDLE_VALUE) { @@ -48,23 +36,26 @@ for(;;) { DWORD read; - BYTE buffer[1024]; + BYTE buffer[BUFSIZE]; if (!ReadFile(hPipe, buffer, sizeof(buffer), &read, NULL)) { DWORD error = GetLastError(); - if (error == ERROR_PIPE_LISTENING) + if (error == ERROR_PIPE_LISTENING) { + fprintf(stderr,"INVALID_HANDLE_VALUE\n"); Sleep(1000); - else if (error == ERROR_BROKEN_PIPE) { + } else if (error == ERROR_BROKEN_PIPE) { CloseHandle(hPipe); hPipe = CreateNamedPipe(path, PIPE_ACCESS_DUPLEX|FILE_FLAG_FIRST_PIPE_INSTANCE, PIPE_WAIT|PIPE_TYPE_BYTE, 1, 4096, 4096, 30000, NULL); if (hPipe == INVALID_HANDLE_VALUE) { + fprintf(stderr,"INVALID_HANDLE_VALUE\n"); print_error(GetLastError()); return 1; } } else { + fprintf(stderr,"error %lu\n",error); print_error(error); break; } @@ -79,3 +70,132 @@ return 0; } + +static int pipeClient(char *path) +{ + HANDLE hPipe=INVALID_HANDLE_VALUE; + TCHAR chBuf[BUFSIZE]; + BOOL fSuccess = FALSE; + DWORD cbRead; + DWORD Err; + int res = 0; + + setvbuf(stdout, NULL, _IONBF, 0); + while (1) { + hPipe = CreateFile( + path, // pipe name + GENERIC_READ, + 0, // no sharing + NULL, // default security attributes + OPEN_EXISTING, // opens existing pipe + 0, // default attributes + NULL); // no template file + + // Break if the pipe handle is valid. + if (hPipe != INVALID_HANDLE_VALUE) + break; + + // Exit if an error other than ERROR_PIPE_BUSY occurs. + if (GetLastError() != ERROR_PIPE_BUSY) { + fprintf(stderr,"Could not open pipe. Error=%lu\n", GetLastError() ); + res = -1; + break; + } + + // All pipe instances are busy, so wait for 20 seconds. + if ( ! WaitNamedPipe(path, 20000)) { + fprintf(stderr,"Could not open pipe: 20 second wait timed out."); + res = -2; + break; + } + } + + if (!res) do { + fSuccess = ReadFile( + hPipe, // pipe handle + chBuf, // buffer to receive reply + BUFSIZE, // size of buffer + &cbRead, // number of bytes read + NULL); // not overlapped + + if ( ! fSuccess ) { + Err = GetLastError(); + if ( Err == ERROR_MORE_DATA ) { + fSuccess = TRUE; + } else { + fprintf(stderr, "ReadFile: Error %lu \n", Err ); + res = -9; + break; + } + } + + fwrite(chBuf,1,cbRead,stdout); + } while ( fSuccess); + + if ( ! fSuccess) { + fprintf(stderr, "ReadFile from pipe failed. Error=%lu\n", GetLastError() ); + res = -5; + } + + if (hPipe != INVALID_HANDLE_VALUE) + CloseHandle(hPipe); + + return res; + +} + +void usage(void) +{ + fprintf(stderr, "Usage: piperead [-c] <named pipe>\n"); + fprintf(stderr, "-c means Client mode\n"); + fprintf(stderr, "Example: piperead -c \\\\.\\pipe\\kdbg | log2lines -c\n\n"); +} + +int main(int argc, char** argv) +{ + char path[MAX_PATH]; + const char* pipe_name; + const char* clientMode; + int res = 0; + + pipe_name = "com_1"; + clientMode = NULL; + switch (argc) { + case 3: + clientMode = *++argv; + if (strcmp(clientMode,"-c") != 0) { + clientMode = NULL; + fprintf(stderr,"Invalid option: %s\n", clientMode); + res = -6; + } + //fall through + case 2: + pipe_name = *++argv; + if (strcmp(pipe_name,"-h") == 0) { + res = -7; + } + break; + default: + res = -8; + break; + } + if (res) { + usage(); + return res; + } + + if ( pipe_name[0] == '\\' ) { + //assume caller specified full path + sprintf(path, "%s", pipe_name); + } else { + sprintf(path, "\\\\.\\pipe\\%s", pipe_name); + } + + if ( clientMode ) { + res = pipeClient(path); + } else { + res = pipeServer(path); + } + + return res; +} Added: trunk/reactos/tools/pipetools/pipetools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pipetools/pipetools.… ============================================================================== --- trunk/reactos/tools/pipetools/pipetools.mak (added) +++ trunk/reactos/tools/pipetools/pipetools.mak [iso-8859-1] Wed Jan 27 20:03:52 2010 @@ -1,0 +1,47 @@ +PIPETOOLS_BASE = $(TOOLS_BASE)$(SEP)pipetools +PIPETOOLS_BASE_ = $(PIPETOOLS_BASE)$(SEP) +PIPETOOLS_INT = $(INTERMEDIATE_)$(PIPETOOLS_BASE) +PIPETOOLS_INT_ = $(PIPETOOLS_INT)$(SEP) +PIPETOOLS_OUT = $(OUTPUT_)$(PIPETOOLS_BASE) +PIPETOOLS_OUT_ = $(PIPETOOLS_OUT)$(SEP) + +$(PIPETOOLS_INT): | $(TOOLS_INT) + $(ECHO_MKDIR) + ${mkdir} $@ + +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(PIPETOOLS_OUT): | $(TOOLS_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif + + +PIPETOOLS_TARGET = \ + $(PIPETOOLS_OUT_)piperead$(EXEPOSTFIX) + +PIPETOOLS_SOURCES = \ + $(PIPETOOLS_BASE_)piperead.cpp + +PIPETOOLS_OBJECTS = \ + $(addprefix $(INTERMEDIATE_), $(PIPETOOLS_SOURCES:.cpp=.o)) + +PIPETOOLS_HOST_CFLAGS = $(TOOLS_CFLAGS) + +PIPETOOLS_HOST_LFLAGS = $(TOOLS_LFLAGS) + +.PHONY: pipetools +pipetools: $(PIPETOOLS_TARGET) + +$(PIPETOOLS_TARGET): $(PIPETOOLS_OBJECTS) | $(PIPETOOLS_OUT) + $(ECHO_HOSTLD) + ${host_gcc} $(PIPETOOLS_OBJECTS) $(PIPETOOLS_HOST_LFLAGS) -o $@ + +$(PIPETOOLS_INT_)piperead.o: $(PIPETOOLS_BASE_)piperead.cpp | $(PIPETOOLS_INT) + $(ECHO_HOSTCC) + ${host_gcc} $(PIPETOOLS_HOST_CFLAGS) -c $< -o $@ + + +.PHONY: pipetools_clean +pipetools_clean: + -@$(rm) $(PIPETOOLS_TARGET) $(PIPETOOLS_OBJECTS) 2>$(NUL) +clean: pipetools_clean Propchange: trunk/reactos/tools/pipetools/pipetools.mak ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/tools/rsym/log2lines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/log2lines.c?rev… ============================================================================== --- trunk/reactos/tools/rsym/log2lines.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/log2lines.c [iso-8859-1] Wed Jan 27 20:03:52 2010 @@ -11,7 +11,7 @@ #include "rsym.h" -#define LOG2LINES_VERSION "1.9" +#define LOG2LINES_VERSION "1.11" /* Assume if an offset > ABS_TRESHOLD, then it must be absolute */ #define ABS_TRESHOLD 0x00400000L @@ -27,6 +27,8 @@ #define CACHEFILE "log2lines.cache" #define TRKBUILDPREFIX "bootcd-" #define SVN_PREFIX "/trunk/reactos/" +#define KDBG_PROMPT "kdbg>" +#define PIPEREAD_CMD "piperead -c" #if defined (__DJGPP__) || defined (__WIN32__) @@ -96,13 +98,13 @@ struct entry_struct *pnext; }; -typedef struct entry_struct LIST_ENTRY; +typedef struct entry_struct LIST_MEMBER; struct list_struct { off_t st_size; - LIST_ENTRY *phead; - LIST_ENTRY *ptail; + LIST_MEMBER *phead; + LIST_MEMBER *ptail; }; struct summ_struct @@ -149,7 +151,7 @@ static LINEINFO lastLine; static REVINFO revinfo; -static char *optchars = "bcd:fFhl:mMrR:sS:tTuUvz:"; +static char *optchars = "bcd:fFhl:mMP:rR:sS:tTuUvz:"; static int opt_buffered = 0; // -b static int opt_help = 0; // -h static int opt_force = 0; // -f @@ -158,6 +160,7 @@ static int opt_console = 0; // -c static int opt_mark = 0; // -m static int opt_Mark = 0; // -M +static char *opt_Pipe = NULL; // -P static int opt_raw = 0; // -r static int opt_stats = 0; // -s static int opt_Source = 0; // -S <opt_Source>[+<opt_SrcPlus>][,<sources_path>] @@ -172,6 +175,8 @@ static char opt_7z[MAX_PATH]; // -z <opt_7z> static char opt_scanned[LINESIZE]; // all scanned options static FILE *logFile = NULL; +static FILE *stdIn = NULL; +static FILE *stdOut = NULL; static char *cache_name; static char *tmp_name; @@ -220,6 +225,7 @@ return res; } +#if 0 static FILE * rfopen(char *path, char *mode) { @@ -232,12 +238,13 @@ f = fopen(tmppath, mode); return f; } - -static LIST_ENTRY * +#endif + +static LIST_MEMBER * entry_lookup(LIST *list, char *name) { - LIST_ENTRY *pprev = NULL; - LIST_ENTRY *pnext; + LIST_MEMBER *pprev = NULL; + LIST_MEMBER *pnext; if (!name || !name[0]) return NULL; @@ -261,8 +268,8 @@ return NULL; } -static LIST_ENTRY * -entry_delete(LIST_ENTRY *pentry) +static LIST_MEMBER * +entry_delete(LIST_MEMBER *pentry) { if (!pentry) return NULL; @@ -272,8 +279,8 @@ return NULL; } -static LIST_ENTRY * -entry_insert(LIST *list, LIST_ENTRY *pentry) +static LIST_MEMBER * +entry_insert(LIST *list, LIST_MEMBER *pentry) { if (!pentry) return NULL; @@ -286,10 +293,10 @@ } #if 0 -static LIST_ENTRY * -entry_remove(LIST *list, LIST_ENTRY *pentry) -{ - LIST_ENTRY *pprev = NULL, *p = NULL; +static LIST_MEMBER * +entry_remove(LIST *list, LIST_MEMBER *pentry) +{ + LIST_MEMBER *pprev = NULL, *p = NULL; if (!pentry) return NULL; @@ -320,17 +327,17 @@ } #endif -static LIST_ENTRY * +static LIST_MEMBER * cache_entry_create(char *Line) { - LIST_ENTRY *pentry; + LIST_MEMBER *pentry; char *s = NULL; int l; if (!Line) return NULL; - pentry = malloc(sizeof(LIST_ENTRY)); + pentry = malloc(sizeof(LIST_MEMBER)); if (!pentry) return NULL; @@ -372,10 +379,10 @@ } -static LIST_ENTRY * +static LIST_MEMBER * sources_entry_create(LIST *list, char *path, char *prefix) { - LIST_ENTRY *pentry; + LIST_MEMBER *pentry; char *s = NULL; int l; @@ -384,7 +391,7 @@ if (!prefix) prefix = ""; - pentry = malloc(sizeof(LIST_ENTRY)); + pentry = malloc(sizeof(LIST_MEMBER)); if (!pentry) return NULL; @@ -988,7 +995,7 @@ read_cache(void) { FILE *fr; - LIST_ENTRY *pentry; + LIST_MEMBER *pentry; char *Line = NULL; int result = 0; @@ -1117,7 +1124,7 @@ translate_file(const char *cpath, size_t offset, char *toString) { size_t base = 0; - LIST_ENTRY *pentry = NULL; + LIST_MEMBER *pentry = NULL; int res = 0; char *path, *dpath; @@ -1552,6 +1559,11 @@ " -m Prefix (mark) each translated line with '* '.\n\n" " -M Prefix (mark) each NOT translated line with '? '.\n" " ( Only for lines of the form: <IMAGENAME:ADDRESS> )\n\n" +" -P <cmd line>\n" +" Pipeline command line. Spawn <cmd line> and pipeline its output to\n" +" log2lines (as stdin). This is for shells lacking support of (one of):\n" +" - Input file redirection.\n" +" - Pipelining byte streams, needed for the -c option.\n\n" " -r Raw output without translation.\n\n" " -R <cmd>\n" " Revision commands interfacing with SVN. <cmd> is one of:\n" @@ -1632,6 +1644,8 @@ " log2lines -c < \\\\.\\pipe\\kdbg\n\n" " Use kdbg debugger via console, and append copy to logFile:\n" " log2lines -c -l dbg.log < \\\\.\\pipe\\kdbg\n\n" +" Same as above, but for PowerShell:\n" +" log2lines -c -l dbg.log -P \"piperead -c \\\\.\\pipe\\kdbg\"\n\n" " Use kdbg debugger to send output to logfile:\n" " log2lines < \\\\.\\pipe\\kdbg > dbg.log\n\n" " Re-translate a debug log:\n" @@ -1868,6 +1882,8 @@ int i; char *s; + stdIn = stdin; + stdOut = stdout; strcpy(opt_dir, ""); strcpy(sources_path, ""); if ((s = getenv(SOURCES_ENV))) @@ -1876,9 +1892,20 @@ strcpy(opt_scanned, ""); for (i = 1; i < argc; i++) { + if (strcmp(argv[i],"-P")==0) + { + //Because its argument can contain spaces we cant use getopt(), a known bug: + if (i+1 < argc) + { + free(opt_Pipe); + opt_Pipe = malloc(LINESIZE); + strcpy(opt_Pipe, argv[i+1]); + } + } strcat(opt_scanned, argv[i]); strcat(opt_scanned, " "); } + l2l_dbg(4,"opt_scanned=[%s]\n",opt_scanned); strcpy(opt_logFile, ""); strcpy(opt_7z, CMD_7Z); @@ -1927,8 +1954,13 @@ case 'r': opt_raw++; break; + case 'P': + optCount++; + //just count, see above + break; case 'R': optCount++; + free(opt_Revision); opt_Revision = malloc(LINESIZE); sscanf(optarg, "%s", opt_Revision); break; @@ -2001,8 +2033,7 @@ return 0; read_cache(); - - l2l_dbg(3, "Cache read complete\n"); + l2l_dbg(4, "Cache read complete\n"); if (*opt_logFile) { @@ -2024,6 +2055,22 @@ return 2; } } + l2l_dbg(4, "opt_logFile processed\n"); + + if (opt_Pipe) + { + l2l_dbg(3, "Command line: \"%s\"\n",opt_Pipe); + + if (!(stdIn = POPEN(opt_Pipe, "r"))) + { + stdIn = stdin; //restore + l2l_dbg(0, "Could not popen '%s' (%s)\n", opt_Pipe, strerror(errno)); + free(opt_Pipe); opt_Pipe = NULL; + } + + free(opt_Pipe); opt_Pipe = NULL; + } + l2l_dbg(4, "opt_Pipe processed\n"); if (argc > 1) { // translate {<exefile> <offset>} @@ -2043,7 +2090,7 @@ l2l_dbg(2, "translating %s %s\n", exefile, offset); translate_file(exefile, my_atoi(offset), Line); printf("%s\n", Line); - report(stdout); + report(stdOut); } else { @@ -2061,11 +2108,14 @@ } else { // translate logging from stdin - translate_files(stdin, stdout); + translate_files(stdIn, stdOut); } if (logFile) fclose(logFile); + if (opt_Pipe) + PCLOSE(stdIn); + return res; } Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=45287&… ============================================================================== --- trunk/reactos/tools/tools.mak [iso-8859-1] (original) +++ trunk/reactos/tools/tools.mak [iso-8859-1] Wed Jan 27 20:03:52 2010 @@ -44,6 +44,7 @@ include tools/buildno/buildno.mak include tools/gendib/gendib.mak include tools/rsym/log2lines.mak +include tools/pipetools/pipetools.mak include tools/nci/nci.mak ifeq ($(ARCH),powerpc) include tools/ofw_interface/ofw_interface.mak

1 0

[dreimer] 45286: - Add piperead to the setup. - Update ChangeLog.txt - Sync clean.ps1 to Colin's changes.
by dreimer＠svn.reactos.org 27 Jan '10

27 Jan '10

Author: dreimer Date: Wed Jan 27 19:52:35 2010 New Revision: 45286 URL: http://svn.reactos.org/svn/reactos?rev=45286&view=rev Log: - Add piperead to the setup. - Update ChangeLog.txt - Sync clean.ps1 to Colin's changes. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Wed Jan 27 19:52:35 2010 @@ -22,45 +22,32 @@ function rembin { # Check if we have any binaries to clean, if so, clean them. - # Apply modified obj and out paths for deletion. + # Check if the user set any custom filenames or pathes, otherwise locally set the appropriate variables. - if ("$_ROSBE_OBJPATH" -eq "") { - $OBJCLEANPATH = "obj-$ENV:ROS_ARCH" - } else { - $OBJCLEANPATH = "$_ROSBE_OBJPATH" + if ("$ENV:ROS_AUTOMAKE" -eq "") { + $ENV:ROS_AUTOMAKE = "makefile-$ENV:ROS_ARCH.auto" + } + if ("$ENV:ROS_INTERMEDIATE" -eq "") { + $ENV:ROS_INTERMEDIATE = "obj-$ENV:ROS_ARCH" + } + if ("$ENV:ROS_OUTPUT" -eq "") { + $ENV:ROS_OUTPUT = "output-$ENV:ROS_ARCH" + } + if ("$ENV:ROS_CDOUTPUT" -eq "") { + $ENV:ROS_CDOUTPUT = "reactos" } - if ("$_ROSBE_OUTPATH" -eq "") { - $OUTCLEANPATH = "output-$ENV:ROS_ARCH" - } else { - $OUTCLEANPATH = "$_ROSBE_OUTPATH" - } + if ((Test-Path "$ENV:ROS_INTERMEDIATE\.") -and (Test-Path "$ENV:ROS_OUTPUT\.")) { + "Cleaning ReactOS $ENV:ROS_ARCH source directory..." - if ("$ENV:ROS_ARCH" -eq "i386") { - $MAKEFILE = "makefile.auto" - } else { - $MAKEFILE = "makefile-$ENV:ROS_ARCH.auto" - } + $null = (Remove-Item "$ENV:ROS_AUTOMAKE" -force) + $null = (Remove-Item "$ENV:ROS_INTERMEDIATE" -recurse -force) + $null = (Remove-Item "$ENV:ROS_OUTPUT" -recurse -force) + $null = (Remove-Item "$ENV:ROS_CDOUTPUT" -recurse -force) - if (Test-Path "$MAKEFILE") { - $null = (Remove-Item "$MAKEFILE" -force) - } - - if (Test-Path "$OBJCLEANPATH") { - "Cleaning ReactOS $ENV:ROS_ARCH source directory..." - if (Test-Path "$OBJCLEANPATH") { - $null = (Remove-Item "$OBJCLEANPATH" -recurse -force) - } - if (Test-Path "$OUTCLEANPATH") { - $null = (Remove-Item "$OUTCLEANPATH" -recurse -force) - } "Done cleaning ReactOS $ENV:ROS_ARCH source directory." } else { "ERROR: There is no $ENV:ROS_ARCH compiler output to clean." - } - - if (Test-Path "reactos") { - $null = (Remove-Item "reactos" -recurse -force) } } Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Wed Jan 27 19:52:35 2010 @@ -1,12 +1,16 @@ *** Jan XXth, 2010 - RosBE 1.5 Released -- Updated Binutils to 2.20.51-20091222 (snapshot) -- Updated GCC to 4.4.2 (including backported GCC r153606) +- Updated Binutils to 2.20.51-20091222 (snapshot) (Colin Finck) +- Updated GCC to 4.4.3 (including backported GCC r153606) (Colin Finck) + * gmp 4.4.3 + * mpfr 2.4.2 - Updated MinGW Runtime to 3.17 (Daniel Reimer) - Updated w32api to 3.14 (Daniel Reimer) - Updated NSIS to 2.46 (Daniel Reimer) -- Added Remake command (Daniel Reimer) -- Replaced raddr2line with log2lines v1.9 (Daniel Reimer) +- Added Remake Command (Daniel Reimer) +- Added kdbg Command (Jan Roeloffzen, Daniel Reimer) +- Replaced raddr2line with log2lines v1.11 (Jan Roeloffzen, Daniel Reimer) +- Added piperead Tool for log2lines fully working in Powershell (Jan Roeloffzen, Daniel Reimer) - Added a chinese translation to the options tool (Elton Chung) - Added ARM Arch support to RosBE (Daniel Reimer) - Added ARM Settings to options.exe, too (Daniel Reimer) @@ -17,6 +21,16 @@ - Merge the 32 bit and 64 bit options tool in one file (Daniel Reimer) - PS1 options script now waits for options.exe closing and then immediately sets all options active (Daniel Reimer) - Tidy up existant and add more Target Compiler Paths (Daniel Reimer) +- Reworked clean command to be more restrictive and secure + and being able to clean other repos except the main one (Colin Finck, Daniel Reimer) +- Clean up from some app calls where the app's path is in the PATH Var (Daniel Reimer) +- Cleaned up Host-GCC Path being added twice to the PATH Var (Daniel Reimer) +- Work on the Update Script: (Daniel Reimer) + * Theres no need for a loading routine for 7z.exe anymore. Its included in RosBE now + * Added some Status Messages telling if stuff succeeded or not +- Removed the address translation from the raddr2line script. Its done in the tools now (Daniel Reimer) +- Fixed the Core detection in makex for PS. Added a global setting to the variable + containing the number of cores. (Daniel Reimer) *** Oct 26th, 2009 - RosBE 1.4.5 Released Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed Jan 27 19:52:35 2010 @@ -270,6 +270,7 @@ SetOverwrite try File /r Components\Tools\echoh.exe File /r Components\Tools\log2lines.exe + File /r Components\Tools\piperead.exe File /r Components\Tools\chkslash.exe SectionEnd

1 0

[dreimer] 45285: - Added a global setting to the variable containing the number of cores. It never reached the place it was needed. No, this does not fix makex on the new gcc... - Hopefully fixed kdbg on PS. TBD: - Port Colin's changes to clean.ps1. - Find out, why makex fails on both PS and CMD...
by dreimer＠svn.reactos.org 27 Jan '10

27 Jan '10

Author: dreimer Date: Wed Jan 27 16:36:07 2010 New Revision: 45285 URL: http://svn.reactos.org/svn/reactos?rev=45285&view=rev Log: - Added a global setting to the variable containing the number of cores. It never reached the place it was needed. No, this does not fix makex on the new gcc... - Hopefully fixed kdbg on PS. TBD: - Port Colin's changes to clean.ps1. - Find out, why makex fails on both PS and CMD... Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/kdbg.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Wed Jan 27 16:36:07 2010 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/Clean.ps1 # PURPOSE: Clean the ReactOS source directory. -# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> # $host.ui.RawUI.WindowTitle = "Cleaning..." Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Wed Jan 27 16:36:07 2010 @@ -3,8 +3,8 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/RosBE.ps1 # PURPOSE: This script provides/sets up various build environments for -# ReactOS. Currently it provides a GCC 4.1.3 build environment. -# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +# ReactOS. Currently it provides a GCC 4.4.3 build environment. +# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> # $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" @@ -52,7 +52,7 @@ # Get the number of CPUs in the system so we know how many jobs to execute. # To modify the number used, see the cpucount usage for getting to know about the possible options -$_ROSBE_MAKEX_JOBS = (gwmi win32_processor).numberofcores + 1 +$global:_ROSBE_MAKEX_JOBS = (gwmi win32_processor).numberofcores + 1 $ENV:CCACHE_DIR = "$ENV:APPDATA\RosBE\.ccache" $ENV:C_INCLUDE_PATH = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/kdbg.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/kdbg.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/kdbg.ps1 [iso-8859-1] Wed Jan 27 16:36:07 2010 @@ -24,6 +24,6 @@ "Now Start your VM with COM1 set to \\.\pipe\kdbg" read-host 'Press any key to continue . . .' -log2lines -c $LOGFILE < \\.\pipe\kdbg +log2lines -c $LOGFILE -P "piperead -c \\.\pipe\kdbg" $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"

1 0

[cgutman] 45284: - Fix a potential buffer overrun and null pointer dereference
by cgutman＠svn.reactos.org 27 Jan '10

27 Jan '10

Author: cgutman Date: Wed Jan 27 09:49:48 2010 New Revision: 45284 URL: http://svn.reactos.org/svn/reactos?rev=45284&view=rev Log: - Fix a potential buffer overrun and null pointer dereference Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/interface.c Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Wed Jan 27 09:49:48 2010 @@ -401,7 +401,7 @@ so->so_state |= SS_NBIO | SS_ISCONNECTED; so->so_q = so->so_q0 = NULL; - so->so_qlen = 0; + so->so_qlen = so->so_q0len = 0; so->so_head = 0; so->so_connection = context;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs