Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 33653: Removed unused code from Arc. Removed old saveLevel and hSelf, use DcLevel. Other changes to region and clipping.
by jimtabor＠svn.reactos.org 23 May '08

23 May '08

Author: jimtabor Date: Thu May 22 19:29:08 2008 New Revision: 33653 URL: http://svn.reactos.org/svn/reactos?rev=33653&view=rev Log: Removed unused code from Arc. Removed old saveLevel and hSelf, use DcLevel. Other changes to region and clipping. Modified: trunk/reactos/dll/win32/gdi32/objects/region.c trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Thu May 22 19:29:08 2008 @@ -232,7 +232,7 @@ HRGN hrgn ) { - INT Ret = NtGdiGetRandomRgn(hdc, hrgn, 1); + INT Ret = NtGdiGetRandomRgn(hdc, hrgn, CLIPRGN); // if (Ret) // { // if(GetLayout(hdc) & LAYOUT_RTL) MirrorRgnDC(hdc,(HRGN)Ret, NULL); @@ -248,7 +248,7 @@ GetMetaRgn(HDC hdc, HRGN hrgn) { - return NtGdiGetRandomRgn(hdc,hrgn,2); + return NtGdiGetRandomRgn(hdc, hrgn, METARGN); } /* 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] Thu May 22 19:29:08 2008 @@ -115,7 +115,7 @@ PVOID prfnt; // RFONT* unsigned co_[31]; // CLIPOBJ PVOID pPFFList; // PPFF* - PVOID ClrxFormObj; + PVOID ClrxFormLnk; INT ipfdDevMax; ULONG ulCopyCount; PVOID pSurfInfo; @@ -128,9 +128,6 @@ CLIPOBJ *CombinedClip; XLATEOBJ *XlateBrush; XLATEOBJ *XlatePen; - - INT saveLevel; // DCLEVEL lSaveDepth - HDC hSelf; // DCLEVEL hdcSave Used only for MemoryDC & SaveDC. UNICODE_STRING DriverName; } DC, *PDC; @@ -264,4 +261,5 @@ HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC); + #endif /* not __WIN32K_DC_H */ Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Thu May 22 19:29:08 2008 @@ -37,26 +37,6 @@ IntGdiSetRect(&rc, LeftRect, TopRect, RightRect, BottomRect); IntGdiSetRect(&rc1, XStartArc, YStartArc, XEndArc, YEndArc); - - if (dc->w.flags & DCX_WINDOW) //window rectangle instead of client rectangle - { - HWND hWnd; - PWINDOW_OBJECT Window; - - hWnd = IntWindowFromDC((HDC) dc->BaseObject.hHmgr); - Window = UserGetWindowObject(hWnd); - if(!Window) return FALSE; - - rc.left += Window->Wnd->ClientRect.left; - rc.top += Window->Wnd->ClientRect.top; - rc.right += Window->Wnd->ClientRect.left; - rc.bottom += Window->Wnd->ClientRect.top; - - rc1.left += Window->Wnd->ClientRect.left; - rc1.top += Window->Wnd->ClientRect.top; - rc1.right += Window->Wnd->ClientRect.left; - rc1.bottom += Window->Wnd->ClientRect.top; - } rx = (rc.right - rc.left)/2 - 1; ry = (rc.bottom - rc.top)/2 -1; Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Thu May 22 19:29:08 2008 @@ -225,13 +225,6 @@ return Ret; } -int STDCALL NtGdiGetMetaRgn(HDC hDC, - HRGN hrgn) -{ - UNIMPLEMENTED; - return 0; -} - int STDCALL NtGdiExcludeClipRect(HDC hDC, int LeftRect, int TopRect, @@ -430,10 +423,146 @@ return Result; } +int +FASTCALL +IntGdiSetMetaRgn(PDC pDC) +{ + INT Ret = ERROR; + PROSRGNDATA TempRgn; + + if ( pDC->DcLevel.prgnMeta ) + { + if ( pDC->DcLevel.prgnClip ) + { + TempRgn = REGION_AllocRgnWithHandle(1); + + if (TempRgn) + { + REGION_SetRectRgn(TempRgn, 0, 0, 0, 0); + Ret = IntGdiCombineRgn( TempRgn, + pDC->DcLevel.prgnMeta, + pDC->DcLevel.prgnClip, + RGN_AND); + if ( Ret ) + { + REGION_UnlockRgn(TempRgn); + TempRgn = GDIOBJ_ShareLockObj(TempRgn->BaseObject.hHmgr, + GDI_OBJECT_TYPE_REGION); + + GDIOBJ_ShareUnlockObjByPtr(pDC->DcLevel.prgnMeta); + if (!((PROSRGNDATA)pDC->DcLevel.prgnMeta)->BaseObject.ulShareCount) + REGION_FreeRgn(pDC->DcLevel.prgnMeta); + + pDC->DcLevel.prgnMeta = TempRgn; + + GDIOBJ_ShareUnlockObjByPtr(pDC->DcLevel.prgnClip); + if (!((PROSRGNDATA)pDC->DcLevel.prgnClip)->BaseObject.ulShareCount) + REGION_FreeRgn(pDC->DcLevel.prgnClip); + + pDC->DcLevel.prgnClip = NULL; + + pDC->DC_Flags |= DC_FLAG_DIRTY_RAO; + pDC->erclClip.left = 0; + pDC->erclClip.top = 0; + pDC->erclClip.right = 0; + pDC->erclClip.bottom = 0; + + } + else + REGION_FreeRgn(TempRgn); + } + } + else + Ret = REGION_Complexity(pDC->DcLevel.prgnMeta); + } + else + { + if ( pDC->DcLevel.prgnClip ) + { + Ret = REGION_Complexity(pDC->DcLevel.prgnClip); + pDC->DcLevel.prgnMeta = pDC->DcLevel.prgnClip; + pDC->DcLevel.prgnClip = NULL; + } + else + Ret = SIMPLEREGION; + } + return Ret; +} + + int STDCALL NtGdiSetMetaRgn(HDC hDC) { - UNIMPLEMENTED; - return 0; + INT Ret; + PDC pDC = DC_LockDc(hDC); + + if (!pDC) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return ERROR; + } + Ret = IntGdiSetMetaRgn(pDC); + + DC_UnlockDc(pDC); + return Ret; +} + +INT FASTCALL +NEW_CLIPPING_UpdateGCRegion(PDC pDC) +{ + CLIPOBJ * co; + + if (!pDC->prgnVis) return 0; + + if (pDC->prgnAPI) + { + REGION_FreeRgn(pDC->prgnAPI); + pDC->prgnAPI = REGION_AllocRgnWithHandle(1); + REGION_SetRectRgn(pDC->prgnAPI, 0, 0, 0, 0); + } + + if (pDC->prgnRao) + { + REGION_FreeRgn(pDC->prgnRao); + pDC->prgnRao = REGION_AllocRgnWithHandle(1); + REGION_SetRectRgn(pDC->prgnRao, 0, 0, 0, 0); + } + + if (pDC->DcLevel.prgnMeta && pDC->DcLevel.prgnClip) + { + IntGdiCombineRgn( pDC->prgnAPI, + pDC->DcLevel.prgnClip, + pDC->DcLevel.prgnMeta, + RGN_AND); + } + else + { + if (pDC->DcLevel.prgnClip) + IntGdiCombineRgn( pDC->prgnAPI, + pDC->DcLevel.prgnClip, + NULL, + RGN_COPY); + else if (pDC->DcLevel.prgnMeta) + IntGdiCombineRgn( pDC->prgnAPI, + pDC->DcLevel.prgnMeta, + NULL, + RGN_COPY); + } + + IntGdiCombineRgn( pDC->prgnRao, + pDC->prgnVis, + pDC->prgnAPI, + RGN_AND); + + RtlCopyMemory(&pDC->erclClip, &((PROSRGNDATA)pDC->prgnRao)->rdh.rcBound , sizeof(RECTL)); + pDC->DC_Flags &= ~DC_FLAG_DIRTY_RAO; + +// if (Dc->CombinedClip != NULL) IntEngDeleteClipRegion(Dc->CombinedClip); + + co = IntEngCreateClipRegion( ((PROSRGNDATA)pDC->prgnRao)->rdh.nCount, + (PRECTL)((PROSRGNDATA)pDC->prgnRao)->Buffer, + (PRECTL)&pDC->erclClip); + + return REGION_Complexity(pDC->prgnRao); } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Thu May 22 19:29:08 2008 @@ -107,7 +107,7 @@ if(!nDc_Attr) nDc_Attr = &NewDC->Dc_Attr; /* Copy information from original DC to new DC */ - NewDC->hSelf = hNewDC; + NewDC->DcLevel.hdcSave = hNewDC; NewDC->PDev = OrigDC->PDev; @@ -1001,7 +1001,7 @@ } /* First delete all saved DCs */ - while (DCToDelete->saveLevel) + while (DCToDelete->DcLevel.lSaveDepth) { PDC savedDC; HDC savedHDC; @@ -1013,7 +1013,7 @@ break; } DC_SetNextDC (DCToDelete, DC_GetNextDC (savedDC)); - DCToDelete->saveLevel--; + DCToDelete->DcLevel.lSaveDepth--; DC_UnlockDc( savedDC ); IntGdiDeleteDC(savedHDC, Force); } @@ -1376,7 +1376,7 @@ nDc_Attr->ptlViewportOrg = Dc_Attr->ptlViewportOrg; nDc_Attr->szlViewportExt = Dc_Attr->szlViewportExt; - newdc->saveLevel = 0; + newdc->DcLevel.lSaveDepth = 0; newdc->DC_Type = dc->DC_Type; #if 0 @@ -1518,7 +1518,7 @@ /* FIXME - newdc can be NULL!!!! Don't assert here!!! */ ASSERT( newdc ); - newdc->hSelf = hnewdc; + newdc->DcLevel.hdcSave = hnewdc; IntGdiCopyToSaveState( dc, newdc); DC_UnlockDc( newdc ); @@ -1541,7 +1541,7 @@ { if ( dcs->w.flags & DC_SAVED ) { - IntGdiCopyFromSaveState( dc, dcs, dc->hSelf); + IntGdiCopyFromSaveState( dc, dcs, dc->DcLevel.hdcSave); } else { @@ -1805,16 +1805,16 @@ } if (SaveLevel < 0) - SaveLevel = dc->saveLevel + SaveLevel + 1; - - if(SaveLevel < 0 || dc->saveLevel<SaveLevel) + SaveLevel = dc->DcLevel.lSaveDepth + SaveLevel + 1; + + if(SaveLevel < 0 || dc->DcLevel.lSaveDepth<SaveLevel) { DC_UnlockDc(dc); return FALSE; } success=TRUE; - while (dc->saveLevel >= SaveLevel) + while (dc->DcLevel.lSaveDepth >= SaveLevel) { HDC hdcs = DC_GetNextDC (dc); @@ -1828,7 +1828,7 @@ DC_SetNextDC (dc, DC_GetNextDC (dcs)); dcs->hNext = 0; - if (--dc->saveLevel < SaveLevel) + if (--dc->DcLevel.lSaveDepth < SaveLevel) { DC_UnlockDc( dc ); DC_UnlockDc( dcs ); @@ -1903,7 +1903,7 @@ DC_SetNextDC (dcs, DC_GetNextDC (dc)); DC_SetNextDC (dc, hdcs); - ret = ++dc->saveLevel; + ret = ++dc->DcLevel.lSaveDepth; DC_UnlockDc( dcs ); DC_UnlockDc( dc ); Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Thu May 22 19:29:08 2008 @@ -138,7 +138,7 @@ (pReg)->rdh.nCount = 0; \ (pReg)->rdh.rcBound.left = (pReg)->rdh.rcBound.top = 0; \ (pReg)->rdh.rcBound.right = (pReg)->rdh.rcBound.bottom = 0; \ - (pReg)->rdh.iType = NULLREGION; \ + (pReg)->rdh.iType = RDH_RECTANGLES; \ } #define REGION_NOT_EMPTY(pReg) pReg->rdh.nCount @@ -542,7 +542,7 @@ pReg->rdh.rcBound.top = 0; pReg->rdh.rcBound.right = 0; pReg->rdh.rcBound.bottom = 0; - pReg->rdh.iType = NULLREGION; + pReg->rdh.iType = RDH_RECTANGLES; return; } @@ -570,7 +570,7 @@ pExtents->right = pRect->right; pRect++; } - pReg->rdh.iType = (1 == pReg->rdh.nCount ? SIMPLEREGION : COMPLEXREGION); + pReg->rdh.iType = RDH_RECTANGLES; } // FIXME: This seems to be wrong @@ -724,7 +724,7 @@ rgnDst->rdh.rcBound.top = ((PRECT)rgnDst->Buffer)->top; rgnDst->rdh.rcBound.bottom = ((PRECT)rgnDst->Buffer + j)->bottom; - rgnDst->rdh.iType = (j >= 1) ? COMPLEXREGION : SIMPLEREGION; + rgnDst->rdh.iType = RDH_RECTANGLES; } return TRUE; @@ -1181,11 +1181,6 @@ ASSERT(newReg->Buffer); } } - - if (newReg->rdh.nCount == 0) - newReg->rdh.iType = NULLREGION; - else - newReg->rdh.iType = (newReg->rdh.nCount > 1)? COMPLEXREGION : SIMPLEREGION; if (oldRects != &newReg->rdh.rcBound) ExFreePool(oldRects); @@ -1886,7 +1881,7 @@ return FALSE; } - if (srcObj->rdh.iType == SIMPLEREGION) + if (REGION_Complexity(srcObj) == SIMPLEREGION) { if (!REGION_CreateSimpleFrameRgn(destObj, x, y)) { @@ -2096,7 +2091,7 @@ { if ( !REGION_CopyRegion(destRgn, src1Rgn) ) return ERROR; - result = destRgn->rdh.iType; + result = REGION_Complexity(destRgn); } else { @@ -2117,7 +2112,7 @@ REGION_SubtractRegion(destRgn, src1Rgn, src2Rgn); break; } - result = destRgn->rdh.iType; + result = REGION_Complexity(destRgn); } else if (src2Rgn == NULL) { @@ -2156,7 +2151,7 @@ { if ( !REGION_CopyRegion(destRgn, src1Rgn) ) return ERROR; - result = destRgn->rdh.iType; + result = REGION_Complexity(destRgn); } else { @@ -2179,7 +2174,7 @@ break; } REGION_UnlockRgn(src2Rgn); - result = destRgn->rdh.iType; + result = REGION_Complexity(destRgn); } else if (hSrc2 == NULL) { @@ -2554,7 +2549,7 @@ if (Rgn) { *pRect = Rgn->rdh.rcBound; - ret = Rgn->rdh.iType; + ret = REGION_Complexity(Rgn); return ret; } @@ -2562,7 +2557,21 @@ } -/* See wine, msdn, osr and Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw */ +/* See wine, msdn, osr and Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw + + 1st: http://www.codeproject.com/gdi/cliprgnguide.asp is wrong! + + The intersection of the clip with the meta region is not Rao it's API! + Go back and read 7.2 Clipping pages 418-19: + Rao = API & Vis: + 1) The Rao region is the intersection of the API region and the system region, + named after the Microsoft engineer who initially proposed it. + 2) The Rao region can be calculated from the API region and the system region. + + API: + API region is the intersection of the meta region and the clipping region, + clearly named after the fact that it is controlled by GDI API calls. +*/ INT STDCALL NtGdiGetRandomRgn( HDC hDC, @@ -2584,16 +2593,14 @@ switch (iCode) { - case 1: + case CLIPRGN: hSrc = pDC->w.hClipRgn; +// if (dc->DcLevel.prgnClip) hSrc = ((PROSRGNDATA)dc->DcLevel.prgnClip)->BaseObject.hHmgr; break; - case 2: - //hSrc = dc->hMetaRgn; - DPRINT1("hMetaRgn not implemented\n"); - DC_UnlockDc(pDC); - return -1; + case METARGN: + if (pDC->DcLevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->DcLevel.prgnMeta)->BaseObject.hHmgr; break; - case 3: + case APIRGN: DPRINT1("hMetaRgn not implemented\n"); //hSrc = dc->hMetaClipRgn; if (!hSrc) @@ -2601,9 +2608,11 @@ hSrc = pDC->w.hClipRgn; } //if (!hSrc) rgn = dc->hMetaRgn; +// if (dc->prgnAPI) hSrc = ((PROSRGNDATA)dc->prgnAPI)->BaseObject.hHmgr; break; - case 4: + case SYSRGN: hSrc = pDC->w.hVisRgn; +// if (dc->prgnVis) hSrc = ((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr; break; default: hSrc = 0; @@ -2768,7 +2777,7 @@ } } } - ret = rgn->rdh.iType; + ret = REGION_Complexity(rgn); REGION_UnlockRgn(rgn); return ret; } @@ -2984,7 +2993,7 @@ firstRect->right = rgn->rdh.rcBound.right = RightRect; firstRect->bottom = rgn->rdh.rcBound.bottom = BottomRect; rgn->rdh.nCount = 1; - rgn->rdh.iType = SIMPLEREGION; + rgn->rdh.iType = RDH_RECTANGLES; } else EMPTY_REGION(rgn);

1 0

[cfinck] 33652: Apply the fix from r32705 to C and C++ files as well. This fixes the "rebuild-everything-on-every-change" bug (at least for me) For the record, this is broken since r32595. Note: If you have building problems after this commit when building a single module, please try to revert only my changes from lines 1847 to 1850.
by cfinck＠svn.reactos.org 23 May '08

23 May '08

Author: cfinck Date: Thu May 22 19:11:52 2008 New Revision: 33652 URL: http://svn.reactos.org/svn/reactos?rev=33652&view=rev Log: Apply the fix from r32705 to C and C++ files as well. This fixes the "rebuild-everything-on-every-change" bug (at least for me) For the record, this is broken since r32595. Note: If you have building problems after this commit when building a single module, please try to revert only my changes from lines 1847 to 1850. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Thu May 22 19:11:52 2008 @@ -1350,19 +1350,23 @@ "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule gccRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule gccRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); -Rule gccHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule gccHostRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${host_gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); -Rule gppRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gpp} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); -Rule gppHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${host_gpp} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); @@ -1844,10 +1848,9 @@ if ( rpcDependencies.size () > 0 ) dependencies += " " + v2s ( backend, rpcDependencies, 5 ); fprintf ( fMakefile, - "%s: %s ${%s_precondition} | %s\n", + "%s: %s | %s\n", backend->GetFullName ( *pchFilename ).c_str(), dependencies.c_str(), - module.name.c_str (), backend->GetFullPath ( *pchFilename ).c_str() ); fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); fprintf ( fMakefile,

1 0

[tkreuzer] 33651: fix a cast and indentation
by tkreuzer＠svn.reactos.org 22 May '08

22 May '08

Author: tkreuzer Date: Thu May 22 18:16:35 2008 New Revision: 33651 URL: http://svn.reactos.org/svn/reactos?rev=33651&view=rev Log: fix a cast and indentation Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Thu May 22 18:16:35 2008 @@ -144,15 +144,15 @@ (void) TextIntCreateFontIndirect(&SystemFixedFont, (HFONT*)&StockObjects[SYSTEM_FIXED_FONT]); (void) TextIntCreateFontIndirect(&DefaultGuiFont, (HFONT*)&StockObjects[DEFAULT_GUI_FONT]); - StockObjects[DEFAULT_PALETTE] = (HGDIOBJ*)PALETTE_Init(); + StockObjects[DEFAULT_PALETTE] = (HGDIOBJ)PALETTE_Init(); for (Object = 0; Object < NB_STOCK_OBJECTS; Object++) + { + if (NULL != StockObjects[Object]) { - if (NULL != StockObjects[Object]) - { - GDIOBJ_ConvertToStockObj(&StockObjects[Object]); - } + GDIOBJ_ConvertToStockObj(&StockObjects[Object]); } + } DPRINT("Completed creation of stock objects\n"); }

1 0

[sedwards] 33650: Sync GetTempPathW with current Wine. This should help with some installers the depend on the USERPROFILE variable being present. Does not fix the Word 2003 viewer install but changes the behavior slightly and is more correct.
by sedwards＠svn.reactos.org 22 May '08

22 May '08

Author: sedwards Date: Thu May 22 16:07:41 2008 New Revision: 33650 URL: http://svn.reactos.org/svn/reactos?rev=33650&view=rev Log: Sync GetTempPathW with current Wine. This should help with some installers the depend on the USERPROFILE variable being present. Does not fix the Word 2003 viewer install but changes the behavior slightly and is more correct. Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cu… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] Thu May 22 16:07:41 2008 @@ -166,16 +166,19 @@ LPWSTR path ) { - WCHAR tmp_path[MAX_PATH]; - WCHAR tmp_full_path[MAX_PATH]; - UINT ret; - - TRACE("GetTempPathW(%lu,%p)\n", count, path); - - if (!(ret = GetEnvironmentVariableW( L"TMP", tmp_path, MAX_PATH ))) - if (!(ret = GetEnvironmentVariableW( L"TEMP", tmp_path, MAX_PATH ))) - if (!(ret = GetCurrentDirectoryW( MAX_PATH, tmp_path ))) - return 0; + static const WCHAR tmp[] = { 'T', 'M', 'P', 0 }; + static const WCHAR temp[] = { 'T', 'E', 'M', 'P', 0 }; + static const WCHAR userprofile[] = { 'U','S','E','R','P','R','O','F','I','L','E',0 }; + WCHAR tmp_path[MAX_PATH]; + UINT ret; + + TRACE("%u,%p\n", count, path); + + if (!(ret = GetEnvironmentVariableW( tmp, tmp_path, MAX_PATH )) && + !(ret = GetEnvironmentVariableW( temp, tmp_path, MAX_PATH )) && + !(ret = GetEnvironmentVariableW( userprofile, tmp_path, MAX_PATH )) && + !(ret = GetWindowsDirectoryW( tmp_path, MAX_PATH ))) + return 0; if (ret > MAX_PATH) { @@ -183,7 +186,7 @@ return 0; } - ret = GetFullPathNameW(tmp_path, MAX_PATH, tmp_full_path, NULL); + ret = GetFullPathNameW(tmp_path, MAX_PATH, tmp_path, NULL); if (!ret) return 0; if (ret > MAX_PATH - 2) @@ -192,17 +195,17 @@ return 0; } - if (tmp_full_path[ret-1] != '\\') - { - tmp_full_path[ret++] = '\\'; - tmp_full_path[ret] = '\0'; + if (tmp_path[ret-1] != '\\') + { + tmp_path[ret++] = '\\'; + tmp_path[ret] = '\0'; } ret++; /* add space for terminating 0 */ if (count) { - lstrcpynW(path, tmp_full_path, count); + lstrcpynW(path, tmp_path, count); if (count >= ret) ret--; /* return length without 0 */ else if (count < 4)

1 0

[mpiulachs] 33649: - express PCH location in a more correct way
by mpiulachs＠svn.reactos.org 22 May '08

22 May '08

Author: mpiulachs Date: Thu May 22 15:45:58 2008 New Revision: 33649 URL: http://svn.reactos.org/svn/reactos?rev=33649&view=rev Log: - express PCH location in a more correct way Modified: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild Modified: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/e… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] Thu May 22 15:45:58 2008 @@ -26,6 +26,8 @@ <file>volinfo.c</file> <file>write.c</file> </directory> + <directory name="inc"> + <pch>ext2fsd.h</pch> + </directory> <file>ext2fs.rc</file> - <pch>inc/ext2fsd.h</pch> </module>

1 0

[janderwald] 33648: - add GetTraceEnableFlags prototype
by janderwald＠svn.reactos.org 22 May '08

22 May '08

Author: janderwald Date: Thu May 22 15:26:53 2008 New Revision: 33648 URL: http://svn.reactos.org/svn/reactos?rev=33648&view=rev Log: - add GetTraceEnableFlags prototype Modified: trunk/reactos/include/psdk/evntrace.h Modified: trunk/reactos/include/psdk/evntrace.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntrace.h?re… ============================================================================== --- trunk/reactos/include/psdk/evntrace.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/evntrace.h [iso-8859-1] Thu May 22 15:26:53 2008 @@ -60,6 +60,7 @@ ULONG WMIAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER); TRACEHANDLE WMIAPI GetTraceLoggerHandle(PVOID); +ULONG WMIAPI GetTraceEnableFlags(TRACEHANDLE); #endif /* ENVTRACE_H */

1 0

[fireball] 33647: - Actually remove the exports.
by fireball＠svn.reactos.org 22 May '08

22 May '08

Author: fireball Date: Thu May 22 14:44:43 2008 New Revision: 33647 URL: http://svn.reactos.org/svn/reactos?rev=33647&view=rev Log: - Actually remove the exports. Modified: trunk/reactos/ntoskrnl/ntoskrnl_arm.def trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/ntoskrnl/ntoskrnl_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm.def?… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] Thu May 22 14:44:43 2008 @@ -3,9 +3,6 @@ ; ReactOS Operating System ; EXPORTS -CcRosInitializeFileCache -CcRosReleaseFileCache -CcRosTraceCacheMap CcCanIWrite CcCopyRead CcCopyWrite @@ -960,7 +957,6 @@ READ_REGISTER_BUFFER_UCHAR READ_REGISTER_BUFFER_ULONG READ_REGISTER_BUFFER_USHORT -KiRosPrintAddress KeRosDumpStackFrames RtlAbsoluteToSelfRelativeSD RtlAddAccessAllowedAce Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.def… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Thu May 22 14:44:43 2008 @@ -979,7 +979,6 @@ READ_REGISTER_BUFFER_UCHAR@12 READ_REGISTER_BUFFER_ULONG@12 READ_REGISTER_BUFFER_USHORT@12 -KiRosPrintAddress@4 KeRosDumpStackFrames@8 RtlAbsoluteToSelfRelativeSD@12 RtlAddAccessAllowedAce@16

1 0

[fireball] 33646: Stefan Ginsberg <stefan__100__@hotmail.com> - Remove KiRosPrintAddress export from ntoskrnl_i386.def, and CcRos* apis too. - Make win32k use KeRosDumpStackFrames instead of KiRosPrintAddress.
by fireball＠svn.reactos.org 22 May '08

22 May '08

Author: fireball Date: Thu May 22 14:31:49 2008 New Revision: 33646 URL: http://svn.reactos.org/svn/reactos?rev=33646&view=rev Log: Stefan Ginsberg <stefan__100__(a)hotmail.com> - Remove KiRosPrintAddress export from ntoskrnl_i386.def, and CcRos* apis too. - Make win32k use KeRosDumpStackFrames instead of KiRosPrintAddress. Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.def… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Thu May 22 14:31:49 2008 @@ -3,9 +3,6 @@ ; ReactOS Operating System ; EXPORTS -CcRosInitializeFileCache@16 -CcRosReleaseFileCache@4 -CcRosTraceCacheMap@8 CcCanIWrite@16 CcCopyRead@24 CcCopyWrite@20 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] Thu May 22 14:31:49 2008 @@ -1,6 +1,6 @@ #ifdef GDI_DEBUG -BOOLEAN STDCALL KiRosPrintAddress(PVOID Address); +NTSYSAPI VOID NTAPI KeRosDumpStackFrames(PULONG, ULONG); NTSYSAPI ULONG NTAPI RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); static int leak_reported = 0; @@ -79,14 +79,13 @@ DbgPrint("Worst GDI Handle leak offenders (out of %i unique locations):\n", n); for (i = 0; i < n && h[i].count > 1; i++) { - int j; + /* Print out the allocation count */ DbgPrint(" %i allocs: ", h[i].count); - for (j = 0; j < GDI_STACK_LEVELS; j++) - { - ULONG Addr = GDIHandleAllocator[h[i].idx][j]; - if (!KiRosPrintAddress((PVOID)Addr)) - DbgPrint("<%X>", Addr); - } + + /* Dump the frames */ + KeRosDumpStackFrames(GDIHandleAllocator[h[i].idx], GDI_STACK_LEVELS); + + /* Print new line for better readability */ DbgPrint("\n"); } if (i < n && h[i].count == 1) 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] Thu May 22 14:31:49 2008 @@ -9,14 +9,8 @@ /** INCLUDES ******************************************************************/ #include <w32k.h> - #define NDEBUG #include <debug.h> - -/* FIXME include right header for KeRosDumpStackFrames */ -VOID NTAPI KeRosDumpStackFrames(PULONG, ULONG); - -//#define GDI_DEBUG #define GDI_ENTRY_TO_INDEX(ht, e) \ (((ULONG_PTR)(e) - (ULONG_PTR)&((ht)->Entries[0])) / sizeof(GDI_TABLE_ENTRY)) @@ -83,7 +77,7 @@ static LARGE_INTEGER ShortDelay; /** DEBUGGING *****************************************************************/ - +//#define GDI_DEBUG #include "gdidbg.c" /** INTERNAL FUNCTIONS ********************************************************/

1 0

[janderwald] 33645: - fix integer to string representation - patch by Carlo Bramini - bug 2437
by janderwald＠svn.reactos.org 22 May '08

22 May '08

Author: janderwald Date: Thu May 22 12:40:01 2008 New Revision: 33645 URL: http://svn.reactos.org/svn/reactos?rev=33645&view=rev Log: - fix integer to string representation - patch by Carlo Bramini - bug 2437 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=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Thu May 22 12:40:01 2008 @@ -182,8 +182,7 @@ ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len, BOOL bPutSeperator) { TCHAR temp[32]; - INT c = 0; - INT n = 0; + UINT n, iTarget; if (len <= 1) return 0; @@ -192,24 +191,29 @@ { des[0] = _T('0'); des[1] = _T('\0'); - n = 1; - } - else - { - temp[31] = 0; - while (num.QuadPart > 0) - { - if ((((c + 1) % (nNumberGroups + 1)) == 0) && (bPutSeperator)) - temp[30 - c++] = cThousandSeparator; - temp[30 - c++] = (TCHAR)(num.QuadPart % 10) + _T('0'); - num.QuadPart /= 10; - } - if (c>len) - c=len; - - for (n = 0; n <= c; n++) - des[n] = temp[31 - c + n]; - } + return 1; + } + + n = 0; + iTarget = nNumberGroups; + if (!nNumberGroups) + bPutSeperator = FALSE; + + while (num.QuadPart > 0) + { + if (iTarget == n && bPutSeperator) + { + iTarget += nNumberGroups + 1; + temp[31 - n++] = cThousandSeparator; + } + temp[31 - n++] = (TCHAR)(num.QuadPart % 10) + _T('0'); + num.QuadPart /= 10; + } + if (n > len-1) + n = len-1; + + memcpy(des, temp + 32 - n, n * sizeof(TCHAR)); + des[n] = _T('\0'); return n; }

1 0

[janderwald] 33644: - define _WMI_SOURCE_ macro - include evntrace header - implement stubs for GetTraceLoggerHandle and TraceEvent and also export them
by janderwald＠svn.reactos.org 22 May '08

22 May '08

Author: janderwald Date: Thu May 22 12:23:47 2008 New Revision: 33644 URL: http://svn.reactos.org/svn/reactos?rev=33644&view=rev Log: - define _WMI_SOURCE_ macro - include evntrace header - implement stubs for GetTraceLoggerHandle and TraceEvent and also export them Modified: trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/advapi32/misc/trace.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] Thu May 22 12:23:47 2008 @@ -292,7 +292,7 @@ GetTokenInformation@20 ;GetTraceEnableFlags ;GetTraceEnableLevel -;GetTraceLoggerHandle +GetTraceLoggerHandle@4 GetTrusteeFormA@4 GetTrusteeFormW@4 GetTrusteeNameA@4 @@ -651,7 +651,7 @@ SystemFunction036@8 SystemFunction040@12 SystemFunction041@12 -;TraceEvent +TraceEvent@12 ;TraceEventInstance TraceMessage ;TraceMessageVa Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] Thu May 22 12:23:47 2008 @@ -15,9 +15,11 @@ /* PSDK/NDK Headers */ #define WIN32_NO_STATUS +#define _WMI_SOURCE_ #include <windows.h> #include <accctrl.h> #include <aclapi.h> +#include <evntrace.h> #include <sddl.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> Modified: trunk/reactos/dll/win32/advapi32/misc/trace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/tr… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] Thu May 22 12:23:47 2008 @@ -20,4 +20,40 @@ return ERROR_SUCCESS; } +TRACEHANDLE +WMIAPI +GetTraceLoggerHandle( + PVOID Buffer +) +{ + DPRINT1("GetTraceLoggerHandle stub()\n"); + return (TRACEHANDLE)INVALID_HANDLE_VALUE; +} + + +ULONG +WMIAPI +TraceEvent( + TRACEHANDLE SessionHandle, + PEVENT_TRACE_HEADER EventTrace +) +{ + DPRINT1("TraceEvent stub()\n"); + + if (!SessionHandle || !EventTrace) + { + /* invalid parameters */ + return ERROR_INVALID_PARAMETER; + } + + if (EventTrace->Size != sizeof(EVENT_TRACE_HEADER)) + { + /* invalid parameter */ + return ERROR_INVALID_PARAMETER; + } + + return ERROR_SUCCESS; +} + + /* EOF */

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