Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[fireball] 50424: - Substitute rcVcPort by a ptlDCOrig, like in trunk. - Pass window origin in a call to RosGdiSetWindow(), which fixes drawing broken in a previous commit.
by fireball＠svn.reactos.org 18 Jan '11

18 Jan '11

Author: fireball Date: Tue Jan 18 17:03:28 2011 New Revision: 50424 URL: http://svn.reactos.org/svn/reactos?rev=50424&view=rev Log: - Substitute rcVcPort by a ptlDCOrig, like in trunk. - Pass window origin in a call to RosGdiSetWindow(), which fixes drawing broken in a previous commit. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -104,6 +104,8 @@ INT CDECL RosDrv_ExtEscape( PDC_ATTR pdcattr, INT escape, INT in_count, LPCVOID in_data, INT out_count, LPVOID out_data ) { + POINTL ptOrigin; + switch(escape) { case NTDRV_ESCAPE: @@ -117,8 +119,10 @@ const struct ntdrv_escape_set_drawable *data = in_data; pdcattr->dc_rect = data->dc_rect; - - RosGdiSetWindow(pdcattr->hKernelDC, data->drawable, data->clip_children); + ptOrigin.x = data->drawable_rect.left; + ptOrigin.y = data->drawable_rect.top; + + RosGdiSetWindow(pdcattr->hKernelDC, data->drawable, data->clip_children, ptOrigin); TRACE( "SET_DRAWABLE hdc %p dc_rect %s drawable_rect %s\n", pdcattr->hdc, wine_dbgstr_rect(&data->dc_rect), wine_dbgstr_rect(&data->drawable_rect) ); Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -60,7 +60,7 @@ struct ntdrv_escape_set_drawable { enum ntdrv_escape_codes code; /* escape code (NTDRV_SET_DRAWABLE) */ - SWM_WINDOW_ID drawable; + SWM_WINDOW_ID drawable; BOOL clip_children;/* ClipByChildren or IncludeInferiors */ RECT dc_rect; /* DC rectangle relative to drawable */ RECT drawable_rect;/* Drawable rectangle relative to screen */ Modified: branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -100,7 +100,7 @@ int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd); COLORREF APIENTRY RosGdiSetTextColor( HDC physDev, COLORREF color ); -VOID APIENTRY RosGdiSetWindow( HDC physDev, SWM_WINDOW_ID Wid, BOOL clipChildren ); +VOID APIENTRY RosGdiSetWindow( HDC physDev, SWM_WINDOW_ID Wid, BOOL clipChildren, POINTL ptOrigin ); /* enum.c */ int APIENTRY RosGdiChoosePixelFormat(HDC physDev, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -150,9 +150,8 @@ DPRINT("Creating a memory DC %x\n", hNewDC); pNewDC->dclevel.pSurface = SURFACE_ShareLockSurface(StockObjects[DEFAULT_BITMAP]); - /* Set DC rectangles */ - pNewDC->rcVport.left = 0; pNewDC->rcVport.top = 0; - pNewDC->rcVport.right = 1; pNewDC->rcVport.bottom = 1; + /* Set DC origin */ + pNewDC->ptlDCOrig.x = 0; pNewDC->ptlDCOrig.y = 0; pNewDC->pWindow = NULL; } @@ -161,11 +160,9 @@ DPRINT("Creating a display DC %x\n", hNewDC); pNewDC->dclevel.pSurface = SURFACE_ShareLockSurface(PrimarySurface.pSurface); - /* Set DC rectangles */ - pNewDC->rcVport.left = 0; - pNewDC->rcVport.top = 0; - pNewDC->rcVport.right = PrimarySurface.gdiinfo.ulHorzRes; - pNewDC->rcVport.bottom = PrimarySurface.gdiinfo.ulVertRes; + /* Set DC origin */ + pNewDC->ptlDCOrig.x = 0; + pNewDC->ptlDCOrig.y = 0; pNewDC->pWindow = &SwmRoot; } @@ -237,11 +234,9 @@ /* Select it */ pDC->dclevel.pSurface = pSurface; - /* Set DC rectangles */ - pDC->rcVport.left = 0; - pDC->rcVport.top = 0; - pDC->rcVport.right = pSurface->SurfObj.sizlBitmap.cx; - pDC->rcVport.bottom = pSurface->SurfObj.sizlBitmap.cy; + /* Set DC origin */ + pDC->ptlDCOrig.x = 0; + pDC->ptlDCOrig.y = 0; /* Update clipping to reflect changes in the surface */ RosGdiUpdateClipping(pDC, FALSE); @@ -593,14 +588,14 @@ for (i=0; i<count; i++) { RECTL_vOffsetRect(&pSafeRects[i], - pDC->rcVport.left, - pDC->rcVport.top); + pDC->ptlDCOrig.x, + pDC->ptlDCOrig.y); } /* Offset bounding rect */ RECTL_vOffsetRect(&rcSafeBounds, - pDC->rcVport.left, - pDC->rcVport.top); + pDC->ptlDCOrig.x, + pDC->ptlDCOrig.y); /* Delete old clipping region */ if (pDC->Clipping) @@ -668,7 +663,7 @@ return color; } -VOID APIENTRY RosGdiSetWindow(HDC physDev, SWM_WINDOW_ID Wid, BOOL clipChildren) +VOID APIENTRY RosGdiSetWindow(HDC physDev, SWM_WINDOW_ID Wid, BOOL clipChildren, POINTL ptOrigin) { PDC pDC; @@ -682,9 +677,10 @@ if (Wid) { pDC->pWindow = SwmGetWindowById(Wid); - RECTL_vSetRect(&pDC->rcVport, - pDC->pWindow->Window.left, pDC->pWindow->Window.top, - pDC->pWindow->Window.right, pDC->pWindow->Window.bottom); + //PDC->ptlDCOrig.x = pDC->pWindow->Window.left; + //PDC->ptlDCOrig.y = pDC->pWindow->Window.top + pDC->ptlDCOrig = ptOrigin; + DPRINT("hdc %x set window hwnd %x\n", physDev, pDC->pWindow->hwnd); } else Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -24,10 +24,10 @@ pDC = DC_LockDc(physDev); /* Add DC origin */ - left += pDC->rcVport.left; - top += pDC->rcVport.top; - right += pDC->rcVport.left; - bottom += pDC->rcVport.top; + left += pDC->ptlDCOrig.x; + top += pDC->ptlDCOrig.y; + right += pDC->ptlDCOrig.x; + bottom += pDC->ptlDCOrig.y; GreEllipse(pDC, left, top, right, bottom); @@ -60,8 +60,8 @@ } /* Add DC origin */ - Pt.x = XStart + dc->rcVport.left; - Pt.y = YStart + dc->rcVport.top; + Pt.x = XStart + dc->ptlDCOrig.x; + Pt.y = YStart + dc->ptlDCOrig.y; /* Call GRE routine */ Ret = GreFloodFill(dc, &Pt, Color, FillType); @@ -107,10 +107,10 @@ pt[1].x = x2; pt[1].y = y2; /* Add DC origin */ - pt[0].x += pDC->rcVport.left; - pt[0].y += pDC->rcVport.top; - pt[1].x += pDC->rcVport.left; - pt[1].y += pDC->rcVport.top; + pt[0].x += pDC->ptlDCOrig.x; + pt[0].y += pDC->ptlDCOrig.y; + pt[1].x += pDC->ptlDCOrig.x; + pt[1].y += pDC->ptlDCOrig.y; GreLineTo(&pDC->dclevel.pSurface->SurfObj, pDC->CombinedClip, @@ -135,14 +135,14 @@ pDC = DC_LockDc(physDev); /* Add DC origin */ - left += pDC->rcVport.left; - top += pDC->rcVport.top; - right += pDC->rcVport.left; - bottom += pDC->rcVport.top; - xstart += pDC->rcVport.left; - ystart += pDC->rcVport.top; - xend += pDC->rcVport.left; - yend += pDC->rcVport.top; + left += pDC->ptlDCOrig.x; + top += pDC->ptlDCOrig.y; + right += pDC->ptlDCOrig.x; + bottom += pDC->ptlDCOrig.y; + xstart += pDC->ptlDCOrig.x; + ystart += pDC->ptlDCOrig.y; + xend += pDC->ptlDCOrig.x; + yend += pDC->ptlDCOrig.y; GrepArc(pDC, left, top, right, bottom, xstart, ystart, xend, yend, arc); @@ -207,8 +207,8 @@ } /* Calculate bounding rect and offset points data */ - pPoints[0].x += pDC->rcVport.left; - pPoints[0].y += pDC->rcVport.top; + pPoints[0].x += pDC->ptlDCOrig.x; + pPoints[0].y += pDC->ptlDCOrig.y; rcBound.left = pPoints[0].x; rcBound.right = pPoints[0].x; @@ -217,8 +217,8 @@ for (i=1; i<count; i++) { - pPoints[i].x += pDC->rcVport.left; - pPoints[i].y += pDC->rcVport.top; + pPoints[i].x += pDC->ptlDCOrig.x; + pPoints[i].y += pDC->ptlDCOrig.y; rcBound.left = min(rcBound.left, pPoints[i].x); rcBound.right = max(rcBound.right, pPoints[i].x); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -274,20 +274,14 @@ DestRect.right = XDest+WidthDst; DestRect.bottom = YDest+HeightDst; - DestRect.left += pDest->rcVport.left; - DestRect.top += pDest->rcVport.top; - DestRect.right += pDest->rcVport.left; - DestRect.bottom += pDest->rcVport.top; + RECTL_vOffsetRect(&DestRect, pDest->ptlDCOrig.x, pDest->ptlDCOrig.y); SrcRect.left = XSrc; SrcRect.top = YSrc; SrcRect.right = XSrc+WidthSrc; SrcRect.bottom = YSrc+HeightSrc; - SrcRect.left += pSrc->rcVport.left; - SrcRect.top += pSrc->rcVport.top; - SrcRect.right += pSrc->rcVport.left; - SrcRect.bottom += pSrc->rcVport.top; + RECTL_vOffsetRect(&SrcRect, pSrc->ptlDCOrig.x, pSrc->ptlDCOrig.y); /* Create the XLATEOBJ. */ EXLATEOBJ_vInitXlateFromDCs(&exlo, pSrc, pDest); @@ -324,18 +318,15 @@ DestRect.right = XDest+Width; DestRect.bottom = YDest+Height; - DestRect.left += pDest->rcVport.left; - DestRect.top += pDest->rcVport.top; - DestRect.right += pDest->rcVport.left; - DestRect.bottom += pDest->rcVport.top; + RECTL_vOffsetRect(&DestRect, pDest->ptlDCOrig.x, pDest->ptlDCOrig.y); SourcePoint.x = XSrc; SourcePoint.y = YSrc; if (pSrc) { - SourcePoint.x += pSrc->rcVport.left; - SourcePoint.y += pSrc->rcVport.top; + SourcePoint.x += pSrc->ptlDCOrig.x; + SourcePoint.y += pSrc->ptlDCOrig.y; } /* Create the XLATEOBJ. */ @@ -406,10 +397,7 @@ DestRect.bottom = YLeft + 1; } - DestRect.left += pDC->rcVport.left; - DestRect.top += pDC->rcVport.top; - DestRect.right += pDC->rcVport.left; - DestRect.bottom += pDC->rcVport.top; + RECTL_vOffsetRect(&DestRect, pDC->ptlDCOrig.x, pDC->ptlDCOrig.y); BrushOrigin.x = pDC->dclevel.ptlBrushOrigin.x; BrushOrigin.y = pDC->dclevel.ptlBrushOrigin.y; @@ -469,10 +457,7 @@ DestRect.right = XOriginDest+WidthDest; DestRect.bottom = YOriginDest+HeightDest; - DestRect.left += DCDest->rcVport.left; - DestRect.top += DCDest->rcVport.top; - DestRect.right += DCDest->rcVport.left; - DestRect.bottom += DCDest->rcVport.top; + RECTL_vOffsetRect(&DestRect, DCDest->ptlDCOrig.x, DCDest->ptlDCOrig.y); SourceRect.left = XOriginSrc; SourceRect.top = YOriginSrc; @@ -480,12 +465,7 @@ SourceRect.bottom = YOriginSrc+HeightSrc; if (UsesSource) - { - SourceRect.left += DCSrc->rcVport.left; - SourceRect.top += DCSrc->rcVport.top; - SourceRect.right += DCSrc->rcVport.left; - SourceRect.bottom += DCSrc->rcVport.top; - } + RECTL_vOffsetRect(&SourceRect, DCSrc->ptlDCOrig.x, DCSrc->ptlDCOrig.y); BrushOrigin.x = DCDest->dclevel.ptlBrushOrigin.x; BrushOrigin.y = DCDest->dclevel.ptlBrushOrigin.y; @@ -1125,8 +1105,8 @@ rcDest.left = XDest; rcDest.top = YDest; - rcDest.left += pDC->rcVport.left; - rcDest.top += pDC->rcVport.top; + rcDest.left += pDC->ptlDCOrig.x; + rcDest.top += pDC->ptlDCOrig.y; rcDest.right = rcDest.left + Width; rcDest.bottom = rcDest.top + Height; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -225,8 +225,8 @@ for(idx = 0; idx < count; idx++) { sharp_glyph_fn(pDC, - pDC->rcVport.left + x + offset.x, - pDC->rcVport.top + y + offset.y, + pDC->ptlDCOrig.x + x + offset.x, + pDC->ptlDCOrig.y + y + offset.y, formatEntry->bitmaps[wstr[idx]], &formatEntry->gis[wstr[idx]], &pTextPen); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -115,10 +115,10 @@ Mix = ROP2_TO_MIX(R2_COPYPEN);/*pdcattr->jROP2*/ for (i=0; i<count-1; i++) { - ptLine[0].x = ptPoints[i].x + pDC->rcVport.left; - ptLine[0].y = ptPoints[i].y + pDC->rcVport.top; - ptLine[1].x = ptPoints[i+1].x + pDC->rcVport.left; - ptLine[1].y = ptPoints[i+1].y + pDC->rcVport.top; + ptLine[0].x = ptPoints[i].x + pDC->ptlDCOrig.x; + ptLine[0].y = ptPoints[i].y + pDC->ptlDCOrig.y; + ptLine[1].x = ptPoints[i+1].x + pDC->ptlDCOrig.x; + ptLine[1].y = ptPoints[i+1].y + pDC->ptlDCOrig.y; DestRect.left = min(ptLine[0].x, ptLine[1].x); DestRect.top = min(ptLine[0].y, ptLine[1].y); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -32,10 +32,10 @@ MIX Mix; POINTL BrushOrigin; - DestRect.left = LeftRect + pDC->rcVport.left; - DestRect.right = RightRect + pDC->rcVport.left; - DestRect.top = TopRect + pDC->rcVport.top; - DestRect.bottom = BottomRect + pDC->rcVport.top; + DestRect.left = LeftRect + pDC->ptlDCOrig.x; + DestRect.right = RightRect + pDC->ptlDCOrig.x; + DestRect.top = TopRect + pDC->ptlDCOrig.y; + DestRect.bottom = BottomRect + pDC->ptlDCOrig.y; BrushOrigin.x = pDC->dclevel.ptlBrushOrigin.x; BrushOrigin.y = pDC->dclevel.ptlBrushOrigin.y; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -825,8 +825,8 @@ SURFOBJ *pso; /* Offset coordinate by DC origin */ - x += pDC->rcVport.left; - y += pDC->rcVport.top; + x += pDC->ptlDCOrig.x; + y += pDC->ptlDCOrig.y; /* If point is outside the combined clipping region - return error */ if (!RECTL_bPointInRect(&pDC->CombinedClip->rclBounds, x, y)) Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -31,8 +31,7 @@ EBRUSHOBJ eboFill; EBRUSHOBJ eboLine; - /* Origins and extents */ - RECTL rcVport; + POINTL ptlDCOrig; /* Combined clipping region */ struct region *Clipping; Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -627,10 +627,10 @@ if (SwmWin->Entry.Blink != &SwmWindows) { /* Create a whole screen region */ - rcScreen.left = 0; - rcScreen.top = 0; - rcScreen.right = pDC->rcVport.right; - rcScreen.bottom = pDC->rcVport.bottom; + rcScreen.left = SwmRoot.Window.left; + rcScreen.top = SwmRoot.Window.top; + rcScreen.right = SwmRoot.Window.right; + rcScreen.bottom = SwmRoot.Window.bottom; /* Free user clipping, if any */ if (pDC->Clipping) free_region(pDC->Clipping);

1 0

[spetreolle] 50423: [CMAKE] Convert wsock32 to spec.
by spetreolle＠svn.reactos.org 18 Jan '11

18 Jan '11

Author: spetreolle Date: Tue Jan 18 15:02:26 2011 New Revision: 50423 URL: http://svn.reactos.org/svn/reactos?rev=50423&view=rev Log: [CMAKE] Convert wsock32 to spec. Added: branches/cmake-bringup/dll/win32/wsock32/wsock32.spec (with props) Removed: branches/cmake-bringup/dll/win32/wsock32/wsock32.def Modified: branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32… ============================================================================== --- branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] Tue Jan 18 15:02:26 2011 @@ -1,11 +1,8 @@ set_unicode() -add_library(wsock32 SHARED stubs.c wsock32.rc wsock32.def) - -if(NOT MSVC) - set_source_files_properties(wsock32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +spec2def(wsock32.dll wsock32.spec) +add_library(wsock32 SHARED stubs.c wsock32.rc wsock32.def ${CMAKE_CURRENT_BINARY_DIR}/wsock32.def) set_module_type(wsock32 win32dll) Removed: branches/cmake-bringup/dll/win32/wsock32/wsock32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32… ============================================================================== --- branches/cmake-bringup/dll/win32/wsock32/wsock32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wsock32/wsock32.def (removed) @@ -1,78 +1,0 @@ -LIBRARY wsock32.dll - -EXPORTS -accept=ws2_32.accept @1 -bind=ws2_32.bind @2 -closesocket=ws2_32.closesocket @3 -connect=ws2_32.connect @4 -getpeername=ws2_32.getpeername @5 -getsockname=ws2_32.getsockname @6 -getsockopt(a)20=ws2_32.getsockopt @7 -htonl=ws2_32.htonl @8 -htons=ws2_32.htons @9 -inet_addr=ws2_32.inet_addr @10 -inet_ntoa=ws2_32.inet_ntoa @11 -ioctlsocket=ws2_32.ioctlsocket @12 -listen=ws2_32.listen @13 -ntohl=ws2_32.ntohl @14 -ntohs=ws2_32.ntohs @15 -recv(a)16=ws2_32.recv @16 -recvfrom(a)24=ws2_32.recvfrom @17 -select=ws2_32.select @18 -send=ws2_32.send @19 -sendto=ws2_32.sendto @20 -setsockopt(a)20=ws2_32.setsockopt @21 -shutdown=ws2_32.shutdown @22 -socket=ws2_32.socket @23 -MigrateWinsockConfiguration=MSWSOCK.MigrateWinsockConfiguration @24 -gethostbyaddr=ws2_32.gethostbyaddr @51 -gethostbyname=ws2_32.gethostbyname @52 -getprotobyname=ws2_32.getprotobyname @53 -getprotobynumber=ws2_32.getprotobynumber @54 -getservbyname=ws2_32.getservbyname @55 -getservbyport=ws2_32.getservbyport @56 -gethostname=ws2_32.gethostname @57 -WSAAsyncSelect=ws2_32.WSAAsyncSelect @101 -WSAAsyncGetHostByAddr=ws2_32.WSAAsyncGetHostByAddr @102 -WSAAsyncGetHostByName=ws2_32.WSAAsyncGetHostByName @103 -WSAAsyncGetProtoByNumber=ws2_32.WSAAsyncGetProtoByNumber @104 -WSAAsyncGetProtoByName=ws2_32.WSAAsyncGetProtoByName @105 -WSAAsyncGetServByPort=ws2_32.WSAAsyncGetServByPort @106 -WSAAsyncGetServByName=ws2_32.WSAAsyncGetServByName @107 -WSACancelAsyncRequest=ws2_32.WSACancelAsyncRequest @108 -WSASetBlockingHook=ws2_32.WSASetBlockingHook @109 -WSAUnhookBlockingHook=ws2_32.WSAUnhookBlockingHook @110 -WSAGetLastError=ws2_32.WSAGetLastError @111 -WSASetLastError=ws2_32.WSASetLastError @112 -WSACancelBlockingCall=ws2_32.WSACancelBlockingCall @113 -WSAIsBlocking=ws2_32.WSAIsBlocking @114 -WSAStartup=ws2_32.WSAStartup @115 -WSACleanup=ws2_32.WSACleanup @116 -__WSAFDIsSet=ws2_32.__WSAFDIsSet @151 -WEP=ws2_32.WEP @500 -WSApSetPostRoutine=ws2_32.WSApSetPostRoutine @1000 -inet_network=MSWSOCK.inet_network @1100 -getnetbyname=MSWSOCK.getnetbyname @1101 -rcmd=MSWSOCK.rcmd @1102 -rexec=MSWSOCK.rexec @1103 -rresvport=MSWSOCK.rresvport @1104 -sethostname=MSWSOCK.sethostname @1105 -dn_expand=MSWSOCK.dn_expand @1106 -WSARecvEx=MSWSOCK.WSARecvEx @1107 -s_perror=MSWSOCK.s_perror @1108 -GetAddressByNameA=MSWSOCK.GetAddressByNameA @1109 -GetAddressByNameW=MSWSOCK.GetAddressByNameW @1110 -EnumProtocolsA=MSWSOCK.EnumProtocolsA @1111 -EnumProtocolsW=MSWSOCK.EnumProtocolsW @1112 -GetTypeByNameA=MSWSOCK.GetTypeByNameA @1113 -GetTypeByNameW=MSWSOCK.GetTypeByNameW @1114 -GetNameByTypeA=MSWSOCK.GetNameByTypeA @1115 -GetNameByTypeW=MSWSOCK.GetNameByTypeW @1116 -SetServiceA=MSWSOCK.SetServiceA @1117 -SetServiceW=MSWSOCK.SetServiceW @1118 -GetServiceA=MSWSOCK.GetServiceA @1119 -GetServiceW=MSWSOCK.GetServiceW @1120 -NPLoadNameSpaces=MSWSOCK.NPLoadNameSpaces @1130 -TransmitFile=MSWSOCK.TransmitFile @1140 -AcceptEx=MSWSOCK.AcceptEx @1141 -GetAcceptExSockaddrs=MSWSOCK.GetAcceptExSockaddrs @1142 Added: branches/cmake-bringup/dll/win32/wsock32/wsock32.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32… ============================================================================== --- branches/cmake-bringup/dll/win32/wsock32/wsock32.spec (added) +++ branches/cmake-bringup/dll/win32/wsock32/wsock32.spec [iso-8859-1] Tue Jan 18 15:02:26 2011 @@ -1,0 +1,84 @@ +1 stdcall accept(long ptr ptr) ws2_32.accept +2 stdcall bind(long ptr long) ws2_32.bind +3 stdcall closesocket(long) ws2_32.closesocket +4 stdcall connect(long ptr long) ws2_32.connect +5 stdcall getpeername(long ptr ptr) ws2_32.getpeername +6 stdcall getsockname(long ptr ptr) ws2_32.getsockname +7 stdcall getsockopt(long long long ptr ptr) ws2_32.getsockopt +8 stdcall htonl(long) ws2_32.htonl +9 stdcall htons(long) ws2_32.htons +10 stdcall ioctlsocket(long long ptr) ws2_32.ioctlsocket +11 stdcall inet_addr(str) ws2_32.inet_addr +12 stdcall inet_ntoa(ptr) ws2_32.inet_ntoa +13 stdcall listen(long long) ws2_32.listen +14 stdcall ntohl(long) ws2_32.ntohl +15 stdcall ntohs(long) ws2_32.ntohs +16 stdcall recv(long ptr long long) ws2_32.recv +17 stdcall recvfrom(long ptr long long ptr ptr) ws2_32.recvfrom +18 stdcall select(long ptr ptr ptr ptr) ws2_32.select +19 stdcall send(long ptr long long) ws2_32.send +20 stdcall sendto(long ptr long long ptr long) ws2_32.sendto +21 stdcall setsockopt(long long long ptr long) ws2_32.setsockopt +22 stdcall shutdown(long long) ws2_32.shutdown +23 stdcall socket(long long long) ws2_32.socket +24 stdcall MigrateWinsockConfiguration(long long long) mswsock.MigrateWinsockConfiguration + +51 stdcall gethostbyaddr(ptr long long) ws2_32.gethostbyaddr +52 stdcall gethostbyname(str) ws2_32.gethostbyname +53 stdcall getprotobyname(str) ws2_32.getprotobyname +54 stdcall getprotobynumber(long) ws2_32.getprotobynumber +55 stdcall getservbyname(str str) ws2_32.getservbyname +56 stdcall getservbyport(long str) ws2_32.getservbyport +57 stdcall gethostname(ptr long) ws2_32.gethostname + +101 stdcall WSAAsyncSelect(long long long long) ws2_32.WSAAsyncSelect +102 stdcall WSAAsyncGetHostByAddr(long long ptr long long ptr long) ws2_32.WSAAsyncGetHostByAddr +103 stdcall WSAAsyncGetHostByName(long long str ptr long) ws2_32.WSAAsyncGetHostByName +104 stdcall WSAAsyncGetProtoByNumber(long long long ptr long) ws2_32.WSAAsyncGetProtoByNumber +105 stdcall WSAAsyncGetProtoByName(long long str ptr long) ws2_32.WSAAsyncGetProtoByName +106 stdcall WSAAsyncGetServByPort(long long long str ptr long) ws2_32.WSAAsyncGetServByPort +107 stdcall WSAAsyncGetServByName(long long str str ptr long) ws2_32.WSAAsyncGetServByName +108 stdcall WSACancelAsyncRequest(long) ws2_32.WSACancelAsyncRequest +109 stdcall WSASetBlockingHook(ptr) ws2_32.WSASetBlockingHook +110 stdcall WSAUnhookBlockingHook() ws2_32.WSAUnhookBlockingHook +111 stdcall WSAGetLastError() ws2_32.WSAGetLastError +112 stdcall WSASetLastError(long) ws2_32.WSASetLastError +113 stdcall WSACancelBlockingCall() ws2_32.WSACancelBlockingCall +114 stdcall WSAIsBlocking() ws2_32.WSAIsBlocking +115 stdcall WSAStartup(long ptr) ws2_32.WSAStartup +116 stdcall WSACleanup() ws2_32.WSACleanup + +151 stdcall __WSAFDIsSet(long ptr) ws2_32.__WSAFDIsSet + +500 stdcall WEP() ws2_32.WEP + +1000 stdcall WSApSetPostRoutine(ptr) ws2_32.WSApSetPostRoutine + +1100 stdcall inet_network(ptr) MSWSOCK.inet_network +1101 stdcall getnetbyname(ptr) MSWSOCK.getnetbyname +1102 stdcall rcmd(ptr long ptr ptr ptr ptr) MSWSOCK.rcmd +1103 stdcall rexec(ptr long ptr ptr ptr ptr) MSWSOCK.rexec +1104 stdcall rresvport(ptr) MSWSOCK.rresvport +1105 stdcall sethostname(ptr long) MSWSOCK.sethostname +1106 stdcall dn_expand(ptr ptr ptr ptr long) MSWSOCK.dn_expand +1107 stdcall WSARecvEx(long ptr long ptr) MSWSOCK.WSARecvEx +1108 stdcall s_perror(ptr) MSWSOCK.s_perror +1109 stdcall GetAddressByNameA(long ptr ptr ptr long ptr ptr ptr ptr ptr) MSWSOCK.GetAddressByNameA +1110 stdcall GetAddressByNameW(long ptr ptr ptr long ptr ptr ptr ptr ptr) MSWSOCK.GetAddressByNameW +1111 stdcall EnumProtocolsA(ptr ptr ptr) MSWSOCK.EnumProtocolsA +1112 stdcall EnumProtocolsW(ptr ptr ptr) MSWSOCK.EnumProtocolsW +1113 stdcall GetTypeByNameA(ptr ptr) MSWSOCK.GetTypeByNameA +1114 stdcall GetTypeByNameW(ptr ptr) MSWSOCK.GetTypeByNameW +1115 stdcall GetNameByTypeA(ptr ptr long) MSWSOCK.GetNameByTypeA +1116 stdcall GetNameByTypeW(ptr ptr long) MSWSOCK.GetNameByTypeW +1117 stdcall SetServiceA(long long long ptr ptr ptr) MSWSOCK.SetServiceA +1118 stdcall SetServiceW(long long long ptr ptr ptr) MSWSOCK.SetServiceW +1119 stdcall GetServiceA(long ptr ptr long ptr ptr ptr) MSWSOCK.GetServiceA +1120 stdcall GetServiceW(long ptr ptr long ptr ptr ptr) MSWSOCK.GetServiceW +1130 stdcall NPLoadNameSpaces(ptr ptr ptr) MSWSOCK.NPLoadNameSpaces +1140 stdcall TransmitFile(long long long long ptr ptr long) MSWSOCK.TransmitFile +1141 stdcall AcceptEx(long long ptr long long long ptr ptr) MSWSOCK.AcceptEx +1142 stdcall GetAcceptExSockaddrs(ptr long long long ptr ptr ptr ptr) MSWSOCK.GetAcceptExSockaddrs + + + Propchange: branches/cmake-bringup/dll/win32/wsock32/wsock32.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 50422: - Remove unneeded events code, definitions, types. - Rename RosGdiGetDC() to RosGdiSetWindow(), to be consistent with the current model which was discussed so hot in #reactos-dev....
by fireball＠svn.reactos.org 18 Jan '11

18 Jan '11

Author: fireball Date: Tue Jan 18 12:47:07 2011 New Revision: 50422 URL: http://svn.reactos.org/svn/reactos?rev=50422&view=rev Log: - Remove unneeded events code, definitions, types. - Rename RosGdiGetDC() to RosGdiSetWindow(), to be consistent with the current model which was discussed so hot in #reactos-dev. If/when it changes, it should be changed back. - Remove RosGdiReleaseDC() because it's unused. - Remove RosGdiSetDcRects() because it was added as kind of a temporary hack. Instead, get position from a real window set for that DC. - Change GR_WINDOW_ID to more suitable SWM_WINDOW_ID. - Bring back getting hwnd via SWM for input events code because using ChildWindowFromPoint introduces usability problems in some apps (e.g. unable to push buttons) and dependence on hacked winlogon. To be investigated in future. Also as a bonus, it turns out to be faster. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/mouse.c branches/arwinss/reactos/dll/win32/winent.drv/window.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h branches/arwinss/reactos/include/reactos/wine/rosuser.h branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Tue Jan 18 12:47:07 2011 @@ -117,9 +117,8 @@ const struct ntdrv_escape_set_drawable *data = in_data; pdcattr->dc_rect = data->dc_rect; - RosGdiSetDcRects(pdcattr->hKernelDC, NULL, (RECT*)&data->drawable_rect); - - RosGdiGetDC(pdcattr->hKernelDC, data->drawable, data->clip_children); + + RosGdiSetWindow(pdcattr->hKernelDC, data->drawable, data->clip_children); TRACE( "SET_DRAWABLE hdc %p dc_rect %s drawable_rect %s\n", pdcattr->hdc, wine_dbgstr_rect(&data->dc_rect), wine_dbgstr_rect(&data->drawable_rect) ); Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] Tue Jan 18 12:47:07 2011 @@ -178,7 +178,8 @@ } /* get the window handle from cursor position */ - hwnd = ChildWindowFromPointEx(GetDesktopWindow(), pt, CWP_SKIPINVISIBLE); + //hwnd = ChildWindowFromPointEx(GetDesktopWindow(), pt, CWP_SKIPINVISIBLE); + hwnd = SwmGetWindowFromPoint(pt.x, pt.y); if (flags & MOUSEEVENTF_MOVE) { Modified: branches/arwinss/reactos/dll/win32/winent.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/window.c [iso-8859-1] Tue Jan 18 12:47:07 2011 @@ -27,7 +27,7 @@ static const char whole_window_prop[] = "__arwin_nt_whole_window"; static const char client_window_prop[]= "__arwin_nt_client_window"; -GR_WINDOW_ID root_window = SWM_ROOT_WINDOW_ID; +SWM_WINDOW_ID root_window = SWM_ROOT_WINDOW_ID; /* FUNCTIONS **************************************************************/ @@ -134,7 +134,7 @@ } else { - //GR_WINDOW_ID win = (GR_WINDOW_ID)GetPropA( hwnd, whole_window_prop ); + //SWM_WINDOW_ID win = (SWM_WINDOW_ID)GetPropA( hwnd, whole_window_prop ); //ERR("win %p, w %d h %d, hwnd %x\n", win, width, height, hwnd); //if (win && win != root_window) NTDRV_init_desktop( win, width, height ); @@ -486,10 +486,10 @@ /*********************************************************************** * create_client_window */ -static GR_WINDOW_ID create_client_window( struct ntdrv_win_data *data ) +static SWM_WINDOW_ID create_client_window( struct ntdrv_win_data *data ) { int cx, cy; - GR_WINDOW_ID client; + SWM_WINDOW_ID client; RECT winRect; if ((cx = data->client_rect.right - data->client_rect.left) <= 0) cx = 1; @@ -525,7 +525,7 @@ * * Create the whole X window for a given window */ -GR_WINDOW_ID create_whole_window( struct ntdrv_win_data *data ) +SWM_WINDOW_ID create_whole_window( struct ntdrv_win_data *data ) { int cx, cy; //int mask; @@ -596,14 +596,14 @@ * * Return the X window associated with the full area of a window */ -GR_WINDOW_ID NTDRV_get_whole_window( HWND hwnd ) +SWM_WINDOW_ID NTDRV_get_whole_window( HWND hwnd ) { struct ntdrv_win_data *data = NTDRV_get_win_data( hwnd ); if (!data) { if (hwnd == GetDesktopWindow()) return root_window; - return (GR_WINDOW_ID)GetPropA( hwnd, whole_window_prop ); + return (SWM_WINDOW_ID)GetPropA( hwnd, whole_window_prop ); } return data->whole_window; } @@ -613,14 +613,14 @@ * * Return the SWM window associated with the client area of a window */ -static GR_WINDOW_ID NTDRV_get_client_window( HWND hwnd ) +static SWM_WINDOW_ID NTDRV_get_client_window( HWND hwnd ) { struct ntdrv_win_data *data = NTDRV_get_win_data( hwnd ); if (!data) { if (hwnd == GetDesktopWindow()) return root_window; - return (GR_WINDOW_ID)GetPropA( hwnd, client_window_prop ); + return (SWM_WINDOW_ID)GetPropA( hwnd, client_window_prop ); } return data->client_window; } Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Tue Jan 18 12:47:07 2011 @@ -60,7 +60,7 @@ struct ntdrv_escape_set_drawable { enum ntdrv_escape_codes code; /* escape code (NTDRV_SET_DRAWABLE) */ - GR_WINDOW_ID drawable; + SWM_WINDOW_ID drawable; BOOL clip_children;/* ClipByChildren or IncludeInferiors */ RECT dc_rect; /* DC rectangle relative to drawable */ RECT drawable_rect;/* Drawable rectangle relative to screen */ @@ -74,8 +74,8 @@ { struct list entry; /* entry in the linked list of win data */ HWND hwnd; /* hwnd that this private data belongs to */ - GR_WINDOW_ID whole_window; /* SWM window for the complete window */ - GR_WINDOW_ID client_window; /* SWM window for the client area */ + SWM_WINDOW_ID whole_window; /* SWM window for the complete window */ + SWM_WINDOW_ID client_window; /* SWM window for the client area */ RECT window_rect; /* USER window rectangle relative to parent */ RECT whole_rect; /* SWM window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to parent */ @@ -87,7 +87,7 @@ //typedef void (*ntdrv_event_handler)( HWND hwnd, GR_EVENT *event ); -extern GR_WINDOW_ID root_window; +extern SWM_WINDOW_ID root_window; static inline void mirror_rect( const RECT *window_rect, RECT *rect ) { @@ -154,4 +154,4 @@ void sync_window_position( struct ntdrv_win_data *data, UINT swp_flags, const RECT *old_window_rect, const RECT *old_whole_rect, const RECT *old_client_rect ); -GR_WINDOW_ID create_whole_window( struct ntdrv_win_data *data ); +SWM_WINDOW_ID create_whole_window( struct ntdrv_win_data *data ); Modified: branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h [iso-8859-1] Tue Jan 18 12:47:07 2011 @@ -100,9 +100,7 @@ int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd); COLORREF APIENTRY RosGdiSetTextColor( HDC physDev, COLORREF color ); -VOID APIENTRY RosGdiSetDcRects( HDC physDev, RECT *rcDcRect, RECT *rcVport ); -VOID APIENTRY RosGdiGetDC( HDC physDev, GR_WINDOW_ID Wid, BOOL clipChildren ); -VOID APIENTRY RosGdiReleaseDC( HDC physDev ); +VOID APIENTRY RosGdiSetWindow( HDC physDev, SWM_WINDOW_ID Wid, BOOL clipChildren ); /* enum.c */ int APIENTRY RosGdiChoosePixelFormat(HDC physDev, Modified: branches/arwinss/reactos/include/reactos/wine/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/rosuser.h [iso-8859-1] Tue Jan 18 12:47:07 2011 @@ -15,49 +15,11 @@ #define SWM_ROOT_WINDOW_ID 1 -#define SWM_EVENT_TYPE_NONE 0 -#define SWM_EVENT_TYPE_EXPOSURE 1 - -/* Event masks */ -#define SWM_EVENTMASK(n) (((ULONG) 1) << (n)) - -#define SWM_EVENT_MASK_NONE SWM_EVENTMASK(SWM_EVENT_TYPE_NONE) -#define SWM_EVENT_MASK_EXPOSURE SWM_EVENTMASK(SWM_EVENT_TYPE_EXPOSURE) - /* ENUMERATIONS **************************************************************/ /* TYPES *********************************************************************/ -typedef ULONG_PTR GR_WINDOW_ID; -typedef ULONG SWM_EVENT_TYPE; - -typedef struct -{ - SWM_EVENT_TYPE type; /**< event type */ - GR_WINDOW_ID wid; /**< window id */ - GR_WINDOW_ID otherid; /**< new/old focus id for focus events*/ - /**< for mouse enter only the following are valid:*/ - LONG rootx; /**< root window x coordinate */ - LONG rooty; /**< root window y coordinate */ - LONG x; /**< window x coordinate of mouse */ - LONG y; /**< window y coordinate of mouse */ -} SWM_EVENT_GENERAL; - -typedef struct { - SWM_EVENT_TYPE type; /**< event type */ - GR_WINDOW_ID wid; /**< window id */ - LONG x; /**< window x coordinate of exposure */ - LONG y; /**< window y coordinate of exposure */ - LONG width; /**< width of exposure */ - LONG height; /**< height of exposure */ -} SWM_EVENT_EXPOSURE; - -typedef union -{ - SWM_EVENT_TYPE type; /**< event type */ - SWM_EVENT_GENERAL general; /**< general window events */ - SWM_EVENT_EXPOSURE exposure; /**< exposure events */ -} SWM_EVENT; +typedef ULONG_PTR SWM_WINDOW_ID; /* FUNCTIONS *****************************************************************/ @@ -215,28 +177,25 @@ BOOL NTAPI RosUserBuildShellHookHwndList(HWND *list, UINT *cbSize); -GR_WINDOW_ID NTAPI -SwmNewWindow(GR_WINDOW_ID parent, RECT *WindowRect, HWND hWnd, DWORD ex_style); +SWM_WINDOW_ID NTAPI +SwmNewWindow(SWM_WINDOW_ID parent, RECT *WindowRect, HWND hWnd, DWORD ex_style); VOID NTAPI SwmAddDesktopWindow(HWND hWnd, UINT Width, UINT Height); VOID NTAPI -SwmDestroyWindow(GR_WINDOW_ID Wid); - -VOID NTAPI -SwmSetForeground(GR_WINDOW_ID Wid); - -VOID NTAPI -SwmPosChanged(GR_WINDOW_ID Wid, const RECT *WindowRect, const RECT *OldRect, HWND hWndAfter, UINT SwpFlags); - -VOID NTAPI -SwmShowWindow(GR_WINDOW_ID Wid, BOOLEAN Show, UINT SwpFlags); - -int NTAPI -SwmPeekEvent(SWM_EVENT *ep); - -VOID NTAPI -SwmGetNextEvent(SWM_EVENT *ep); +SwmDestroyWindow(SWM_WINDOW_ID Wid); + +VOID NTAPI +SwmSetForeground(SWM_WINDOW_ID Wid); + +VOID NTAPI +SwmPosChanged(SWM_WINDOW_ID Wid, const RECT *WindowRect, const RECT *OldRect, HWND hWndAfter, UINT SwpFlags); + +HWND NTAPI +SwmGetWindowFromPoint(LONG x, LONG y); + +VOID NTAPI +SwmShowWindow(SWM_WINDOW_ID Wid, BOOLEAN Show, UINT SwpFlags); #endif /* __WIN32K_NTUSER_H */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Tue Jan 18 12:47:07 2011 @@ -668,42 +668,23 @@ return color; } -VOID APIENTRY RosGdiSetDcRects( HDC physDev, RECT *rcDcRect, RECT *rcVport ) +VOID APIENTRY RosGdiSetWindow(HDC physDev, SWM_WINDOW_ID Wid, BOOL clipChildren) { PDC pDC; + + /* Acquire SWM lock before locking the DC */ + SwmAcquire(); /* Get a pointer to the DC */ pDC = DC_LockDc(physDev); - _SEH2_TRY - { - /* Set viewport rectangle */ - if (rcVport) - pDC->rcVport = *rcVport; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - } - _SEH2_END; - - /* Release the object */ - DC_UnlockDc(pDC); -} - -VOID APIENTRY RosGdiGetDC(HDC physDev, GR_WINDOW_ID Wid, BOOL clipChildren) -{ - PDC pDC; - - /* Acquire SWM lock before locking the DC */ - SwmAcquire(); - - /* Get a pointer to the DC */ - pDC = DC_LockDc(physDev); - /* Get a pointer to this window */ if (Wid) { pDC->pWindow = SwmGetWindowById(Wid); + RECTL_vSetRect(&pDC->rcVport, + pDC->pWindow->Window.left, pDC->pWindow->Window.top, + pDC->pWindow->Window.right, pDC->pWindow->Window.bottom); DPRINT("hdc %x set window hwnd %x\n", physDev, pDC->pWindow->hwnd); } else @@ -723,29 +704,6 @@ /* Release SWM lock */ SwmRelease(); } - -//FIXME: to be deleted! -VOID APIENTRY RosGdiReleaseDC(HDC physDev) -{ - PDC pDC; - - /* Get a pointer to the DC */ - pDC = DC_LockDc(physDev); - - /* Check if it was a dummy window */ - if (!pDC->pWindow->hwnd) - { - /* Free it */ - ExFreePool(pDC->pWindow); - } - - /* No window clipping is to be performed */ - pDC->pWindow = NULL; - - /* Release the object */ - DC_UnlockDc(pDC); -} - static HPEN Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Tue Jan 18 12:47:07 2011 @@ -32,7 +32,7 @@ EBRUSHOBJ eboLine; /* Origins and extents */ - RECT rcVport; + RECTL rcVport; /* Combined clipping region */ struct region *Clipping; Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h [iso-8859-1] Tue Jan 18 12:47:07 2011 @@ -1,11 +1,5 @@ #ifndef SWM__H #define SWM__H - -typedef struct _SWM_EVENT_LIST SWM_EVENT_LIST; -struct _SWM_EVENT_LIST { - SWM_EVENT_LIST *next; /* next element in list */ - SWM_EVENT event; /* event */ -}; typedef struct _SWM_WINDOW { @@ -26,6 +20,6 @@ VOID NTAPI SwmAcquire(VOID); VOID NTAPI SwmRelease(VOID); HDC SwmGetScreenDC(); -PSWM_WINDOW NTAPI SwmGetWindowById(GR_WINDOW_ID Wid); +PSWM_WINDOW NTAPI SwmGetWindowById(SWM_WINDOW_ID Wid); #endif Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Tue Jan 18 12:47:07 2011 @@ -77,7 +77,7 @@ PSWM_WINDOW NTAPI -SwmGetWindowById(GR_WINDOW_ID Wid) +SwmGetWindowById(SWM_WINDOW_ID Wid) { /* Right now, Wid is a pointer to SWM_WINDOW structure, except for SWM_ROOT_WINDOW_ID which maps to a root window */ @@ -334,9 +334,9 @@ } -GR_WINDOW_ID -NTAPI -SwmNewWindow(GR_WINDOW_ID parent, RECT *WindowRect, HWND hWnd, DWORD ex_style) +SWM_WINDOW_ID +NTAPI +SwmNewWindow(SWM_WINDOW_ID parent, RECT *WindowRect, HWND hWnd, DWORD ex_style) { PSWM_WINDOW Win, FirstNonTop; @@ -387,7 +387,7 @@ /* Release the lock */ SwmRelease(); - return (GR_WINDOW_ID)Win; + return (SWM_WINDOW_ID)Win; } VOID @@ -470,7 +470,7 @@ VOID NTAPI -SwmDestroyWindow(GR_WINDOW_ID Wid) +SwmDestroyWindow(SWM_WINDOW_ID Wid) { PSWM_WINDOW Win; @@ -575,7 +575,7 @@ VOID NTAPI -SwmSetForeground(GR_WINDOW_ID Wid) +SwmSetForeground(SWM_WINDOW_ID Wid) { PSWM_WINDOW SwmWin; extern struct window *shell_window; @@ -721,7 +721,7 @@ VOID NTAPI -SwmPosChanged(GR_WINDOW_ID Wid, const RECT *WindowRect, const RECT *OldRect, HWND hWndAfter, UINT SwpFlags) +SwmPosChanged(SWM_WINDOW_ID Wid, const RECT *WindowRect, const RECT *OldRect, HWND hWndAfter, UINT SwpFlags) { PSWM_WINDOW SwmWin, SwmPrev; LONG Width, Height, OldWidth, OldHeight; @@ -826,7 +826,7 @@ VOID NTAPI -SwmShowWindow(GR_WINDOW_ID Wid, BOOLEAN Show, UINT SwpFlags) +SwmShowWindow(SWM_WINDOW_ID Wid, BOOLEAN Show, UINT SwpFlags) { PSWM_WINDOW Win; struct region *OldRegion; @@ -887,6 +887,47 @@ /* Release the lock */ SwmRelease(); +} + +HWND +NTAPI +SwmGetWindowFromPoint(LONG x, LONG y) +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + + /* Acquire the lock */ + SwmAcquire(); + + /* Traverse the list to find our window */ + Current = SwmWindows.Flink; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + /* Skip hidden windows */ + if (Window->Hidden) + { + /* Advance to the next window */ + Current = Current->Flink; + continue; + } + + if (point_in_region(Window->Visible, x, y)) + { + /* Release the lock */ + SwmRelease(); + + return Window->hwnd; + } + /* Advance to the next window */ + Current = Current->Flink; + } + + /* Release the lock */ + SwmRelease(); + + return 0; } VOID Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Tue Jan 18 12:47:07 2011 @@ -32,14 +32,13 @@ RosGdiSetPixel 4 RosGdiSetPixelFormat 3 RosGdiSetTextColor 2 -RosGdiSetDcRects 3 RosGdiChoosePixelFormat 2 RosGdiDescribePixelFormat 4 RosGdiEnumDeviceFonts 4 RosGdiGetCharWidth 4 RosGdiGetDeviceCaps 2 RosGdiGetDeviceGammaRamp 2 -RosGdiGetDC 3 +RosGdiSetWindow 3 RosGdiGetICMProfile 3 RosGdiGetNearestColor 2 RosGdiGetPixelFormat 1 @@ -59,7 +58,6 @@ RosGdiRealizeDefaultPalette 1 RosGdiRealizePalette 3 RosGdiRectangle 2 -RosGdiReleaseDC 1 RosGdiRoundRect 7 RosGdiSwapBuffers 1 RosGdiUnrealizePalette 1 @@ -91,5 +89,6 @@ SwmDestroyWindow 1 SwmSetForeground 1 SwmPosChanged 5 +SwmGetWindowFromPoint 2 SwmShowWindow 3 NtUserInitialize 3

1 0

[fireball] 50421: - It's more useful to show a dprint before asserting.
by fireball＠svn.reactos.org 18 Jan '11

18 Jan '11

Author: fireball Date: Tue Jan 18 12:13:59 2011 New Revision: 50421 URL: http://svn.reactos.org/svn/reactos?rev=50421&view=rev Log: - It's more useful to show a dprint before asserting. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] Tue Jan 18 12:13:59 2011 @@ -995,9 +995,9 @@ HandleType != ExpectedType) || HandleType == 0 ) { - //ASSERT(FALSE); DPRINT1("Attempted to lock object 0x%x of wrong type (Handle: 0x%x, requested: 0x%x)\n", hObj, HandleType, ExpectedType); + ASSERT(FALSE); return NULL; }

1 0

[fireball] 50420: - Properly initialize an empty CLIPOBJ. - Uncomment children window clipping of desktop's window, allows fullscreen drawing operations. - Update surface clipping region when a new...
by fireball＠svn.reactos.org 18 Jan '11

18 Jan '11

Author: fireball Date: Tue Jan 18 12:11:43 2011 New Revision: 50420 URL: http://svn.reactos.org/svn/reactos?rev=50420&view=rev Log: - Properly initialize an empty CLIPOBJ. - Uncomment children window clipping of desktop's window, allows fullscreen drawing operations. - Update surface clipping region when a new bitmap is selected. - Don't leak allocated clipping regions at DC cleanup time, spotted by smiley_. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Tue Jan 18 12:11:43 2011 @@ -52,6 +52,10 @@ /* Cleanup the dc brushes */ EBRUSHOBJ_vCleanup(&pDC->eboFill); EBRUSHOBJ_vCleanup(&pDC->eboLine); + + /* Delete clipping regions */ + if (pDC->CombinedClip) EngDeleteClip(pDC->CombinedClip); + if (pDC->Clipping) free_region(pDC->Clipping); return TRUE; } @@ -167,7 +171,7 @@ } /* Create an empty combined clipping region */ - pNewDC->CombinedClip = EngCreateClip(); + pNewDC->CombinedClip = NULL; pNewDC->Clipping = NULL; pNewDC->ClipChildren = FALSE; @@ -238,6 +242,9 @@ pDC->rcVport.top = 0; pDC->rcVport.right = pSurface->SurfObj.sizlBitmap.cx; pDC->rcVport.bottom = pSurface->SurfObj.sizlBitmap.cy; + + /* Update clipping to reflect changes in the surface */ + RosGdiUpdateClipping(pDC, FALSE); /* Release the DC object */ DC_UnlockDc(pDC); @@ -462,6 +469,7 @@ { struct region *window, *surface; rectangle_t surfrect = {0,0,0,0}; + RECTL EmptyRect = {0,0,0,0}; surface = create_empty_region(); surfrect.right = pDC->dclevel.pSurface->SurfObj.sizlBitmap.cx; @@ -484,14 +492,14 @@ { /* Drawing is forbidden */ if (pDC->CombinedClip) EngDeleteClip(pDC->CombinedClip); - pDC->CombinedClip = EngCreateClip(); + pDC->CombinedClip = IntEngCreateClipRegion(1, &EmptyRect, &EmptyRect); return; } /* Root window's visibility may be ignored */ if ((pDC->pWindow == &SwmRoot) && !pDC->ClipChildren) { - //IgnoreVisibility = TRUE; + IgnoreVisibility = TRUE; } /* window visibility X user clipping (if any) X underlying surface */ @@ -525,7 +533,7 @@ /* Drawing is forbidden */ if (pDC->CombinedClip) EngDeleteClip(pDC->CombinedClip); - pDC->CombinedClip = EngCreateClip(); + pDC->CombinedClip = IntEngCreateClipRegion(1, &EmptyRect, &EmptyRect); } }

1 0

[fireball] 50419: [WINENT.DRV] - Remove unnecessary events code, it has no use for us.
by fireball＠svn.reactos.org 18 Jan '11

18 Jan '11

Author: fireball Date: Tue Jan 18 12:01:58 2011 New Revision: 50419 URL: http://svn.reactos.org/svn/reactos?rev=50419&view=rev Log: [WINENT.DRV] - Remove unnecessary events code, it has no use for us. Modified: branches/arwinss/reactos/dll/win32/winent.drv/event.c branches/arwinss/reactos/dll/win32/winent.drv/window.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/event.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/event.c [iso-8859-1] Tue Jan 18 12:01:58 2011 @@ -4,7 +4,6 @@ * FILE: dll/win32/winent.drv/event.c * PURPOSE: Event handling routines * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) - * Some parts inspired by Wine's winex11.drv */ /* INCLUDES ***************************************************************/ @@ -13,198 +12,8 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(event); -#if 0 + /* GLOBALS ****************************************************************/ - -static void NTDRV_Expose( HWND hwnd, GR_EVENT *event ); - -struct event_handler -{ - GR_EVENT_TYPE type; /* event type */ - ntdrv_event_handler handler; /* corresponding handler function */ -}; - -#define MAX_EVENT_HANDLERS 64 - -static struct event_handler handlers[MAX_EVENT_HANDLERS] = -{ - /* list must be sorted by event type */ - //{ KeyPress, X11DRV_KeyEvent }, - //{ KeyRelease, X11DRV_KeyEvent }, - //{ ButtonPress, X11DRV_ButtonPress }, - //{ ButtonRelease, X11DRV_ButtonRelease }, - //{ MotionNotify, X11DRV_MotionNotify }, - //{ EnterNotify, X11DRV_EnterNotify }, - /* LeaveNotify */ - //{ FocusIn, X11DRV_FocusIn }, - //{ FocusOut, X11DRV_FocusOut }, - //{ KeymapNotify, X11DRV_KeymapNotify }, - { GR_EVENT_TYPE_EXPOSURE, NTDRV_Expose }, - /* GraphicsExpose */ - /* NoExpose */ - /* VisibilityNotify */ - /* CreateNotify */ - //{ DestroyNotify, X11DRV_DestroyNotify }, - /* UnmapNotify */ - //{ MapNotify, X11DRV_MapNotify }, - /* MapRequest */ - //{ ReparentNotify, X11DRV_ReparentNotify }, - //{ ConfigureNotify, X11DRV_ConfigureNotify }, - /* ConfigureRequest */ - //{ GravityNotify, X11DRV_GravityNotify }, - /* ResizeRequest */ - /* CirculateNotify */ - /* CirculateRequest */ - //{ PropertyNotify, X11DRV_PropertyNotify }, - //{ SelectionClear, X11DRV_SelectionClear }, - //{ SelectionRequest, X11DRV_SelectionRequest }, - /* SelectionNotify */ - /* ColormapNotify */ - //{ ClientMessage, X11DRV_ClientMessage }, - //{ MappingNotify, X11DRV_MappingNotify }, -}; - -static int nb_event_handlers = 1; /* change this if you add handlers above */ - -/* FUNCTIONS **************************************************************/ - -/*********************************************************************** - * find_handler - * - * Find the handler for a given event type. Caller must hold the x11 lock. - */ -static inline ntdrv_event_handler find_handler( GR_EVENT_TYPE type ) -{ - int min = 0, max = nb_event_handlers - 1; - - while (min <= max) - { - int pos = (min + max) / 2; - if (handlers[pos].type == type) return handlers[pos].handler; - if (handlers[pos].type > type) max = pos - 1; - else min = pos + 1; - } - return NULL; -} - -enum event_merge_action -{ - MERGE_DISCARD, /* discard the old event */ - MERGE_HANDLE, /* handle the old event */ - MERGE_KEEP /* keep the old event for future merging */ -}; - -/*********************************************************************** - * merge_events - * - * Try to merge 2 consecutive events. - */ -#if 0 -static enum event_merge_action merge_events( GR_EVENT *prev, GR_EVENT *next ) -{ - switch (prev->type) - { - case GR_UPDATE_MOVE: - switch (next->type) - { - case GR_UPDATE_MOVE: - if (prev->wid == next->wid) - { - TRACE( "discarding duplicate ConfigureNotify for window %lx\n", prev->wid ); - return MERGE_DISCARD; - } - break; - case GR_EVENT_MASK_EXPOSURE: - //case PropertyNotify: - return MERGE_KEEP; - } - break; - case GR_EVENT_MASK_MOUSE_MOTION: - if (prev->wid == next->wid && next->type == MotionNotify) - { - TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->wid ); - return MERGE_DISCARD; - }xch - break; - } - - return MERGE_HANDLE; -} -#endif - - -/*********************************************************************** - * call_event_handler - */ -static inline void call_event_handler( GR_EVENT *event ) -{ - HWND hwnd; - ntdrv_event_handler handler; - //GR_EVENT *prev; - //struct ntdrv_thread_data *thread_data; - - if (!(handler = find_handler( event->type ))) - { - TRACE( "%s for win %lx, ignoring\n", "event", -1 ); - return; /* no handler, ignore it */ - } - - hwnd = GrGetHwnd( event->general.wid ); - //if (!hwnd && event->xany.window == root_window) hwnd = GetDesktopWindow(); - - //TRACE( "%lu %s for hwnd/window %p/%lx\n", - // event->xany.serial, dbgstr_event( event->type ), hwnd, event->xany.window ); - //wine_tsx11_unlock(); - //thread_data = ntdrv_thread_data(); - //prev = thread_data->current_event; - //thread_data->current_event = event; - handler( hwnd, event ); - //thread_data->current_event = prev; - //wine_tsx11_lock(); -} - -/*********************************************************************** - * process_events - */ -static int process_events( int mask ) -{ - GR_EVENT event;//, prev_event; - int count = 0; - //enum event_merge_action action = MERGE_DISCARD; - - //prev_event.type = 0; - //wine_tsx11_lock(); - while (GrPeekEvent(&event)) - { - GrGetNextEvent(&event); - ERR("Got event type %d\n", event.type); - count++; -#if 0 - if (prev_event.type) action = merge_events( &prev_event, &event ); - switch( action ) - { - case MERGE_DISCARD: /* discard prev, keep new */ - prev_event = event; - break; - case MERGE_HANDLE: /* handle prev, keep new */ - call_event_handler( display, &prev_event ); - prev_event = event; - break; - case MERGE_KEEP: /* handle new, keep prev for future merging */ - call_event_handler( display, &event ); - break; - } -#else - call_event_handler( &event ); -#endif - } - //if (prev_event.type) call_event_handler( &prev_event ); - //XFlush( gdi_display ); - //wine_tsx11_unlock(); - if (count) TRACE( "processed %d events\n", count ); - return count; -} -#endif /*********************************************************************** * MsgWaitForMultipleObjectsEx (NTDRV.@) @@ -212,61 +21,9 @@ DWORD CDECL RosDrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { - //TRACE("WaitForMultipleObjectsEx(%d %p %d %x %x %x\n", count, handles, timeout, mask, flags); + TRACE("WaitForMultipleObjectsEx(%d %p %d %x %x %x\n", count, handles, timeout, mask, flags); if (!count && !timeout) return WAIT_TIMEOUT; return WaitForMultipleObjectsEx( count, handles, flags & MWMO_WAITALL, timeout, flags & MWMO_ALERTABLE ); } - -#if 0 -/*********************************************************************** - * X11DRV_Expose - */ -static void NTDRV_Expose( HWND hwnd, GR_EVENT *xev ) -{ - GR_EVENT_EXPOSURE *event = &xev->exposure; - RECT rect; - struct ntdrv_win_data *data; - int flags = RDW_INVALIDATE | RDW_ERASE; - - ERR( "win %p (%lx) %d,%d %dx%d\n", - hwnd, event->wid, event->x, event->y, event->width, event->height ); - - if (!(data = NTDRV_get_win_data( hwnd ))) return; - - rect.left = event->x; - rect.top = event->y; - rect.right = event->x + event->width; - rect.bottom = event->y + event->height; - if (event->wid == data->whole_window) - { - OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, - data->whole_rect.top - data->client_rect.top ); - flags |= RDW_FRAME; - } - - //if (event->wid != root_window) - { - if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) - mirror_rect( &data->client_rect, &rect ); - - SERVER_START_REQ( update_window_zorder ) - { - req->window = wine_server_user_handle( hwnd ); - req->rect.left = rect.left; - req->rect.top = rect.top; - req->rect.right = rect.right; - req->rect.bottom = rect.bottom; - wine_server_call( req ); - } - SERVER_END_REQ; - - flags |= RDW_ALLCHILDREN; - } - //else OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - - RedrawWindow( hwnd, &rect, 0, flags ); -} -#endif -/* EOF */ Modified: branches/arwinss/reactos/dll/win32/winent.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/window.c [iso-8859-1] Tue Jan 18 12:01:58 2011 @@ -140,7 +140,6 @@ //if (win && win != root_window) NTDRV_init_desktop( win, width, height ); // create a desktop window - //GrSelectEvents(GR_ROOT_WINDOW_ID, GR_EVENT_MASK_EXPOSURE); } return TRUE; @@ -230,6 +229,7 @@ data->whole_window = data->client_window = root_window; SetPropA( data->hwnd, whole_window_prop, (HANDLE)root_window ); SetPropA( data->hwnd, client_window_prop, (HANDLE)root_window ); + //SetPropA( data->hwnd, "__wine_x11_managed", (HANDLE)1 ); return data; } @@ -559,8 +559,6 @@ data->whole_window = SwmNewWindow( root_window, &data->whole_rect, data->hwnd, ex_style ); - //GrSelectEvents(data->whole_window, GR_EVENT_MASK_EXPOSURE); - if (!data->whole_window) goto done; if (!create_client_window( data )) @@ -574,6 +572,7 @@ //set_wm_hints( display, data ); SetPropA( data->hwnd, whole_window_prop, (HANDLE)data->whole_window ); + //SetPropA( data->hwnd, "__wine_x11_managed", (HANDLE)1 ); /* set the window text */ //if (!InternalGetWindowText( data->hwnd, text, sizeof(text)/sizeof(WCHAR) )) text[0] = 0;

1 0

[dreimer] 50418: revert it... test commit...
by dreimer＠svn.reactos.org 17 Jan '11

17 Jan '11

Author: dreimer Date: Mon Jan 17 23:16:46 2011 New Revision: 50418 URL: http://svn.reactos.org/svn/reactos?rev=50418&view=rev Log: revert it... test commit... Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Mon Jan 17 23:16:46 2011 @@ -107,4 +107,3 @@ <xi:include href="rapps/rapps.rbuild" /> </directory> </group> -

1 0

[dreimer] 50417: Test commit
by dreimer＠svn.reactos.org 17 Jan '11

17 Jan '11

Author: dreimer Date: Mon Jan 17 23:12:27 2011 New Revision: 50417 URL: http://svn.reactos.org/svn/reactos?rev=50417&view=rev Log: Test commit Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Mon Jan 17 23:12:27 2011 @@ -107,3 +107,4 @@ <xi:include href="rapps/rapps.rbuild" /> </directory> </group> +

1 0

[dreimer] 50416: Update rapps database and add encoded's VMWare Sound driver.
by dreimer＠svn.reactos.org 17 Jan '11

17 Jan '11

Author: dreimer Date: Mon Jan 17 23:05:15 2011 New Revision: 50416 URL: http://svn.reactos.org/svn/reactos?rev=50416&view=rev Log: Update rapps database and add encoded's VMWare Sound driver. Added: trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/kdewin.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt Modified: trunk/reactos/base/applications/rapps/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] Mon Jan 17 23:05:15 2011 @@ -2,13 +2,13 @@ [Section] Name = K Desktop Environment -Version = 0.9.8-0 +Version = 0.9.8-1 Licence = GPL Description = KDE for Windows. Size = 2.0MB Category = 15 URLSite = http://www.winkde.org/ -URLDownload = http://www.winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.… +URLDownload = http://www.winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Mon Jan 17 23:05:15 2011 @@ -2,13 +2,13 @@ [Section] Name = LibreOffice -Version = 3.3.0 RC2 +Version = 3.3.0 RC3 Licence = LGPL Description = Former called OpenOffice. Open Source Office Suite. -Size = 206.0MB +Size = 209.0MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/testing/3.3.0-rc2/win/x8… +URLDownload = http://download.documentfoundation.org/libreoffice/testing/3.3.0-rc3/win/x8… CDPath = none [Section.0407] Added: trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt [iso-8859-1] Mon Jan 17 23:05:15 2011 @@ -1,0 +1,48 @@ +ï»¿; UTF-8 + +[Section] +Name = SoundBlaster Driver for VMWare +Version = 5.12.1.5017 +Licence = Unknown +Description = Unzip in the "ReactOS" folder then restart ReactOS twice. +Size = 2.2MB +Category = 13 +URLSite = Unknown +URLDownload = http://svn.reactos.org/packages/sb_vmware.exe +CDPath = none + +[Section.0405] +Name = OvladaÄ SoundBlaster pro VMWare +Licence = NeznÃ¡mÃ¡ +Description = Rozbalte do sloÅ¾ky "ReactOS" a pak ReactOS dvakrÃ¡t restartujte. +URLSite = NeznÃ¡mÃ¡ + +[Section.0407] +Name = SoundBlaster Treiber fÃ¼r VMWare +Licence = Unbekannt +Description = Entpacken in das "ReactOS"-Verzeichnis und ReactOS zweimal neustarten. +URLSite = Unbekannt + +[Section.040a] +Name = Driver SoundBlaster para VMWare +Licence = Desconocida +Description = Descomprimir en la carpeta "Reactos" y reiniciar Reactos dos veces. +URLSite = Desconocida + +[Section.0415] +Name = Sterownik SoundBlaster dla VMWare +Licence = Nieznana +Description = Rozpakuj zawartoÅÄ w folderze "ReactOS" i dwukrotnie zrestartuj system. +URLSite = Nieznana + +[Section.0419] +Name = ÐÑÐ°Ð¹Ð²ÐµÑ SoundBlaster Ð´Ð»Ñ VMWare +Licence = ÐÐµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ +Description = PÐ°Ð·Ð°ÑÑÐ¸Ð²Ð¸ÑÑÐ¹ÑÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð² Ð¿Ð°Ð¿ÐºÑ "ReactOS", Ð·Ð°ÑÐµÐ¼ Ð´Ð²Ð°Ð¶Ð´Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. +URLSite = ÐÐµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ + +[Section.0422] +Name = ÐÑÐ°Ð¹Ð²ÐµÑ SoundBlaster Ð´Ð»Ñ VMWare +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = PÐ¾Ð·Ð°ÑÑÑÐ²ÑÐ¹ÑÐµ Ð²Ð¼ÑÑÑ Ð² ÑÐµÐºÑ "ReactOS" Ð¿ÑÑÐ»Ñ ÑÐ¾Ð³Ð¾ Ð´Ð²ÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. +URLSite = ÐÐµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ Propchange: trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[spetreolle] 50415: [TEST] Enable DroidSansFallback.ttf.
by spetreolle＠svn.reactos.org 17 Jan '11

17 Jan '11

Author: spetreolle Date: Mon Jan 17 23:01:16 2011 New Revision: 50415 URL: http://svn.reactos.org/svn/reactos?rev=50415&view=rev Log: [TEST] Enable DroidSansFallback.ttf. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Jan 17 23:01:16 2011 @@ -695,7 +695,7 @@ subsystems\win32\win32k\win32k.sys 1 ; Optional/proprietary files -;modules\optional\DroidSansFallback.ttf 3 optional +modules\optional\DroidSansFallback.ttf 3 optional modules\optional\NOTICE_for_Droid_Font.txt 4 optional modules\optional\netkvm2k.inf 6 optional modules\optional\netkvm2k.cat 6 optional

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2011