Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[cgutman] 47375: [NPFS] - Partially revert r47370 and apply a better patch - Change ReadEvent and WriteEvent to notification events because we reset those events manually when we run out of buffer space

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri May 28 01:52:32 2010 New Revision: 47375 URL: http://svn.reactos.org/svn/reactos?rev=47375&view=rev Log: [NPFS] - Partially revert r47370 and apply a better patch - Change ReadEvent and WriteEvent to notification events because we reset those events manually when we run out of buffer space Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Fri May 28 01:52:32 2010 @@ -205,8 +205,8 @@ ClientCcb->MaxDataLength = Fcb->OutboundQuota; ExInitializeFastMutex(&ClientCcb->DataListLock); KeInitializeEvent(&ClientCcb->ConnectEvent, SynchronizationEvent, FALSE); - KeInitializeEvent(&ClientCcb->ReadEvent, SynchronizationEvent, FALSE); - KeInitializeEvent(&ClientCcb->WriteEvent, SynchronizationEvent, FALSE); + KeInitializeEvent(&ClientCcb->ReadEvent, NotificationEvent, FALSE); + KeInitializeEvent(&ClientCcb->WriteEvent, NotificationEvent, FALSE); /* @@ -540,8 +540,8 @@ DPRINT("CCB: %p\n", Ccb); KeInitializeEvent(&Ccb->ConnectEvent, SynchronizationEvent, FALSE); - KeInitializeEvent(&Ccb->ReadEvent, SynchronizationEvent, FALSE); - KeInitializeEvent(&Ccb->WriteEvent, SynchronizationEvent, FALSE); + KeInitializeEvent(&Ccb->ReadEvent, NotificationEvent, FALSE); + KeInitializeEvent(&Ccb->WriteEvent, NotificationEvent, FALSE); KeLockMutex(&Fcb->CcbListLock); InsertTailList(&Fcb->ServerCcbListHead, &Ccb->CcbListEntry); @@ -619,7 +619,6 @@ ExAcquireFastMutex(&OtherSide->DataListLock); ExAcquireFastMutex(&Ccb->DataListLock); } - OtherSide->PipeState = FILE_PIPE_CLOSING_STATE; OtherSide->OtherSide = NULL; /* * Signaling the write event. If is possible that an other @@ -745,7 +744,6 @@ /* Disconnect the pipes */ if (Ccb->OtherSide) { - Ccb->OtherSide->PipeState = FILE_PIPE_CLOSING_STATE; Ccb->OtherSide->OtherSide = NULL; Ccb->OtherSide = NULL; } Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Fri May 28 01:52:32 2010 @@ -331,11 +331,8 @@ if ((Ccb->OtherSide == NULL) && (Ccb->ReadDataAvailable == 0)) { - if (Ccb->PipeState == FILE_PIPE_CLOSING_STATE) - { - DPRINT("File pipe broken\n"); + if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) Status = STATUS_PIPE_BROKEN; - } else if (Ccb->PipeState == FILE_PIPE_LISTENING_STATE) Status = STATUS_PIPE_LISTENING; else if (Ccb->PipeState == FILE_PIPE_DISCONNECTED_STATE) @@ -443,7 +440,7 @@ { break; } - if ((Ccb->PipeState != FILE_PIPE_CONNECTED_STATE) && (Ccb->ReadDataAvailable == 0)) + if (((Ccb->PipeState != FILE_PIPE_CONNECTED_STATE) || (!Ccb->OtherSide)) && (Ccb->ReadDataAvailable == 0)) { DPRINT("PipeState: %x\n", Ccb->PipeState); Status = STATUS_PIPE_BROKEN; @@ -800,13 +797,13 @@ { if ((ReaderCcb->WriteQuotaAvailable == 0)) { - KeSetEvent(&ReaderCcb->ReadEvent, IO_NO_INCREMENT, FALSE); - if (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE) + if (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE || !Ccb->OtherSide) { Status = STATUS_PIPE_BROKEN; ExReleaseFastMutex(&ReaderCcb->DataListLock); goto done; } + KeSetEvent(&ReaderCcb->ReadEvent, IO_NO_INCREMENT, FALSE); ExReleaseFastMutex(&ReaderCcb->DataListLock); DPRINT("Write Waiting for buffer space (%S)\n", Fcb->PipeName.Buffer); @@ -830,20 +827,15 @@ * It's possible that the event was signaled because the * other side of pipe was closed. */ - if (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE) + if (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE || !Ccb->OtherSide) { DPRINT("PipeState: %x\n", Ccb->PipeState); Status = STATUS_PIPE_BROKEN; goto done; } /* Check that the pipe has not been closed */ - if (ReaderCcb->PipeState != FILE_PIPE_CONNECTED_STATE) - { - /* If the other side is valid, fire event */ - if (Ccb) - { - KeResetEvent(&Ccb->WriteEvent); - } + if (ReaderCcb->PipeState != FILE_PIPE_CONNECTED_STATE || !ReaderCcb->OtherSide) + { Status = STATUS_PIPE_BROKEN; goto done; }

14 years, 11 months

[ekohl] 47374: The global flag FLG_HEAP_ENABLE_CALL_TRACING has been replaced by FLG_ENABLE_SYSTEM_CRIT_BREAKS in Windows XP and above.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu May 27 22:15:35 2010 New Revision: 47374 URL: http://svn.reactos.org/svn/reactos?rev=47374&view=rev Log: The global flag FLG_HEAP_ENABLE_CALL_TRACING has been replaced by FLG_ENABLE_SYSTEM_CRIT_BREAKS in Windows XP and above. Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Thu May 27 22:15:35 2010 @@ -60,7 +60,11 @@ #define FLG_ENABLE_CSRDEBUG 0x00020000 #define FLG_ENABLE_KDEBUG_SYMBOL_LOAD 0x00040000 #define FLG_DISABLE_PAGE_KERNEL_STACKS 0x00080000 +#if (NTDDI_VERSION < NTDDI_WINXP) #define FLG_HEAP_ENABLE_CALL_TRACING 0x00100000 +#else +#define FLG_ENABLE_SYSTEM_CRIT_BREAKS 0x00100000 +#endif #define FLG_HEAP_DISABLE_COALESCING 0x00200000 #define FLG_ENABLE_CLOSE_EXCEPTIONS 0x00400000 #define FLG_ENABLE_EXCEPTION_LOGGING 0x00800000

14 years, 11 months

[bfreisen] 47373: [PAINT] - After clearing a new selection and creating an undo-step, draw selection contents - Fixes bug #5246

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Thu May 27 16:53:53 2010 New Revision: 47373 URL: http://svn.reactos.org/svn/reactos?rev=47373&view=rev Log: [PAINT] - After clearing a new selection and creating an undo-step, draw selection contents - Fixes bug #5246 Modified: trunk/reactos/base/applications/paint/mouse.c Modified: trunk/reactos/base/applications/paint/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/mo… ============================================================================== --- trunk/reactos/base/applications/paint/mouse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/mouse.c [iso-8859-1] Thu May 27 16:53:53 2010 @@ -279,6 +279,9 @@ Poly(hdc, ptStack, ptSP + 1, bg, bg, 1, 2, TRUE); newReversible(); + MaskBlt(hDrawingDC, rectSel_src[0], rectSel_src[1], rectSel_src[2], rectSel_src[3], hSelDC, 0, + 0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND)); + placeSelWin(); ShowWindow(hSelection, SW_SHOW); } @@ -302,6 +305,9 @@ rectSel_src[1] + rectSel_src[3], bgColor, bgColor, 0, TRUE); newReversible(); + BitBlt(hDrawingDC, rectSel_src[0], rectSel_src[1], rectSel_src[2], rectSel_src[3], hSelDC, 0, + 0, SRCCOPY); + placeSelWin(); ShowWindow(hSelection, SW_SHOW); }

14 years, 11 months

[bfreisen] 47372: [PAINT] - Improvements by Black_Fox, see bug #5418 - Readability improvement, patch by Katayama Hirofumi, see bug #5420

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Thu May 27 14:21:50 2010 New Revision: 47372 URL: http://svn.reactos.org/svn/reactos?rev=47372&view=rev Log: [PAINT] - Improvements by Black_Fox, see bug #5418 - Readability improvement, patch by Katayama Hirofumi, see bug #5420 Modified: trunk/reactos/base/applications/paint/definitions.h trunk/reactos/base/applications/paint/main.c trunk/reactos/base/applications/paint/mouse.c trunk/reactos/base/applications/paint/toolsettings.c trunk/reactos/base/applications/paint/winproc.c Modified: trunk/reactos/base/applications/paint/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/de… ============================================================================== --- trunk/reactos/base/applications/paint/definitions.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/definitions.h [iso-8859-1] Thu May 27 14:21:50 2010 @@ -98,6 +98,24 @@ #define ID_ELLIPSE 614 #define ID_RRECT 615 +//the following 16 numbers need to be in order, increasing by 1 +#define TOOL_FREESEL 1 +#define TOOL_RECTSEL 2 +#define TOOL_RUBBER 3 +#define TOOL_FILL 4 +#define TOOL_COLOR 5 +#define TOOL_ZOOM 6 +#define TOOL_PEN 7 +#define TOOL_BRUSH 8 +#define TOOL_AIRBRUSH 9 +#define TOOL_TEXT 10 +#define TOOL_LINE 11 +#define TOOL_BEZIER 12 +#define TOOL_RECT 13 +#define TOOL_SHAPE 14 +#define TOOL_ELLIPSE 15 +#define TOOL_RRECT 16 + #define ID_ACCELERATORS 800 #define IDD_MIRRORROTATE 700 Modified: trunk/reactos/base/applications/paint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/ma… ============================================================================== --- trunk/reactos/base/applications/paint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/main.c [iso-8859-1] Thu May 27 14:21:50 2010 @@ -50,7 +50,7 @@ int lineWidth = 1; int shapeStyle = 0; int brushStyle = 0; -int activeTool = 7; +int activeTool = TOOL_PEN; int airBrushWidth = 5; int rubberRadius = 4; int transpBg = 0; Modified: trunk/reactos/base/applications/paint/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/mo… ============================================================================== --- trunk/reactos/base/applications/paint/mouse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/mouse.c [iso-8859-1] Thu May 27 14:21:50 2010 @@ -67,7 +67,7 @@ lastY = y; switch (activeTool) { - case 1: + case TOOL_FREESEL: ShowWindow(hSelection, SW_HIDE); if (ptStack != NULL) HeapFree(GetProcessHeap(), 0, ptStack); @@ -76,39 +76,39 @@ ptStack[0].x = x; ptStack[0].y = y; break; - case 10: - case 11: - case 13: - case 15: - case 16: - newReversible(); - break; - case 2: + case TOOL_TEXT: + case TOOL_LINE: + case TOOL_RECT: + case TOOL_ELLIPSE: + case TOOL_RRECT: + newReversible(); + break; + case TOOL_RECTSEL: newReversible(); ShowWindow(hSelection, SW_HIDE); rectSel_src[2] = rectSel_src[3] = 0; break; - case 3: + case TOOL_RUBBER: newReversible(); Erase(hdc, x, y, x, y, bg, rubberRadius); break; - case 4: + case TOOL_FILL: newReversible(); Fill(hdc, x, y, fg); break; - case 7: + case TOOL_PEN: newReversible(); SetPixel(hdc, x, y, fg); break; - case 8: + case TOOL_BRUSH: newReversible(); Brush(hdc, x, y, x, y, fg, brushStyle); break; - case 9: + case TOOL_AIRBRUSH: newReversible(); Airbrush(hdc, x, y, fg, airBrushWidth); break; - case 12: + case TOOL_BEZIER: pointStack[pointSP].x = x; pointStack[pointSP].y = y; if (pointSP == 0) @@ -117,7 +117,7 @@ pointSP++; } break; - case 14: + case TOOL_SHAPE: pointStack[pointSP].x = x; pointStack[pointSP].y = y; if (pointSP + 1 >= 2) @@ -136,7 +136,7 @@ { switch (activeTool) { - case 1: + case TOOL_FREESEL: if (ptSP == 0) newReversible(); ptSP++; @@ -147,7 +147,7 @@ resetToU1(); Poly(hdc, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE); break; - case 2: + case TOOL_RECTSEL: { short tempX; short tempY; @@ -161,25 +161,25 @@ RectSel(hdc, startX, startY, tempX, tempY); break; } - case 3: + case TOOL_RUBBER: Erase(hdc, lastX, lastY, x, y, bg, rubberRadius); break; - case 7: + case TOOL_PEN: Line(hdc, lastX, lastY, x, y, fg, 1); break; - case 8: + case TOOL_BRUSH: Brush(hdc, lastX, lastY, x, y, fg, brushStyle); break; - case 9: + case TOOL_AIRBRUSH: Airbrush(hdc, x, y, fg, airBrushWidth); break; - case 11: + case TOOL_LINE: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(startX, startY, &x, &y); Line(hdc, startX, startY, x, y, fg, lineWidth); break; - case 12: + case TOOL_BEZIER: resetToU1(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; @@ -197,13 +197,13 @@ break; } break; - case 13: + case TOOL_RECT: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(startX, startY, &x, &y); Rect(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle); break; - case 14: + case TOOL_SHAPE: resetToU1(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; @@ -213,13 +213,13 @@ if (pointSP + 1 >= 2) Poly(hdc, pointStack, pointSP + 1, fg, bg, lineWidth, shapeStyle, FALSE); break; - case 15: + case TOOL_ELLIPSE: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(startX, startY, &x, &y); Ellp(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle); break; - case 16: + case TOOL_RRECT: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(startX, startY, &x, &y); @@ -236,7 +236,7 @@ { switch (activeTool) { - case 1: + case TOOL_FREESEL: { POINT *ptStackCopy; int i; @@ -286,7 +286,7 @@ ptStack = NULL; break; } - case 2: + case TOOL_RECTSEL: resetToU1(); if ((rectSel_src[2] != 0) && (rectSel_src[3] != 0)) { @@ -306,31 +306,31 @@ ShowWindow(hSelection, SW_SHOW); } break; - case 3: + case TOOL_RUBBER: Erase(hdc, lastX, lastY, x, y, bg, rubberRadius); break; - case 7: + case TOOL_PEN: Line(hdc, lastX, lastY, x, y, fg, 1); SetPixel(hdc, x, y, fg); break; - case 11: + case TOOL_LINE: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(startX, startY, &x, &y); Line(hdc, startX, startY, x, y, fg, lineWidth); break; - case 12: + case TOOL_BEZIER: pointSP++; if (pointSP == 4) pointSP = 0; break; - case 13: + case TOOL_RECT: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(startX, startY, &x, &y); Rect(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle); break; - case 14: + case TOOL_SHAPE: resetToU1(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; @@ -354,13 +354,13 @@ if (pointSP == 255) pointSP--; break; - case 15: + case TOOL_ELLIPSE: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(startX, startY, &x, &y); Ellp(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle); break; - case 16: + case TOOL_RRECT: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(startX, startY, &x, &y); @@ -378,35 +378,35 @@ lastY = y; switch (activeTool) { - case 1: - case 10: - case 11: - case 13: - case 15: - case 16: - newReversible(); - break; - case 3: + case TOOL_FREESEL: + case TOOL_TEXT: + case TOOL_LINE: + case TOOL_RECT: + case TOOL_ELLIPSE: + case TOOL_RRECT: + newReversible(); + break; + case TOOL_RUBBER: newReversible(); Replace(hdc, x, y, x, y, fg, bg, rubberRadius); break; - case 4: + case TOOL_FILL: newReversible(); Fill(hdc, x, y, bg); break; - case 7: + case TOOL_PEN: newReversible(); SetPixel(hdc, x, y, bg); break; - case 8: + case TOOL_BRUSH: newReversible(); Brush(hdc, x, y, x, y, bg, brushStyle); break; - case 9: + case TOOL_AIRBRUSH: newReversible(); Airbrush(hdc, x, y, bg, airBrushWidth); break; - case 12: + case TOOL_BEZIER: pointStack[pointSP].x = x; pointStack[pointSP].y = y; if (pointSP == 0) @@ -415,7 +415,7 @@ pointSP++; } break; - case 14: + case TOOL_SHAPE: pointStack[pointSP].x = x; pointStack[pointSP].y = y; if (pointSP + 1 >= 2) @@ -434,25 +434,25 @@ { switch (activeTool) { - case 3: + case TOOL_RUBBER: Replace(hdc, lastX, lastY, x, y, fg, bg, rubberRadius); break; - case 7: + case TOOL_PEN: Line(hdc, lastX, lastY, x, y, bg, 1); break; - case 8: + case TOOL_BRUSH: Brush(hdc, lastX, lastY, x, y, bg, brushStyle); break; - case 9: + case TOOL_AIRBRUSH: Airbrush(hdc, x, y, bg, airBrushWidth); break; - case 11: + case TOOL_LINE: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(startX, startY, &x, &y); Line(hdc, startX, startY, x, y, bg, lineWidth); break; - case 12: + case TOOL_BEZIER: resetToU1(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; @@ -470,13 +470,13 @@ break; } break; - case 13: + case TOOL_RECT: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(startX, startY, &x, &y); Rect(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle); break; - case 14: + case TOOL_SHAPE: resetToU1(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; @@ -486,13 +486,13 @@ if (pointSP + 1 >= 2) Poly(hdc, pointStack, pointSP + 1, bg, fg, lineWidth, shapeStyle, FALSE); break; - case 15: + case TOOL_ELLIPSE: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(startX, startY, &x, &y); Ellp(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle); break; - case 16: + case TOOL_RRECT: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(startX, startY, &x, &y); @@ -509,31 +509,31 @@ { switch (activeTool) { - case 3: + case TOOL_RUBBER: Replace(hdc, lastX, lastY, x, y, fg, bg, rubberRadius); break; - case 7: + case TOOL_PEN: Line(hdc, lastX, lastY, x, y, bg, 1); SetPixel(hdc, x, y, bg); break; - case 11: + case TOOL_LINE: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(startX, startY, &x, &y); Line(hdc, startX, startY, x, y, bg, lineWidth); break; - case 12: + case TOOL_BEZIER: pointSP++; if (pointSP == 4) pointSP = 0; break; - case 13: + case TOOL_RECT: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(startX, startY, &x, &y); Rect(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle); break; - case 14: + case TOOL_SHAPE: resetToU1(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; @@ -557,13 +557,13 @@ if (pointSP == 255) pointSP--; break; - case 15: + case TOOL_ELLIPSE: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(startX, startY, &x, &y); Ellp(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle); break; - case 16: + case TOOL_RRECT: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(startX, startY, &x, &y); Modified: trunk/reactos/base/applications/paint/toolsettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/to… ============================================================================== --- trunk/reactos/base/applications/paint/toolsettings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/toolsettings.c [iso-8859-1] Thu May 27 14:21:50 2010 @@ -34,13 +34,13 @@ DefWindowProc(hwnd, message, wParam, lParam); - DrawEdge(hdc, &rect1, BDR_SUNKENOUTER, (activeTool == 6) ? BF_RECT : BF_RECT | BF_MIDDLE); - DrawEdge(hdc, &rect2, (activeTool >= 13) ? BDR_SUNKENOUTER : 0, BF_RECT | BF_MIDDLE); + DrawEdge(hdc, &rect1, BDR_SUNKENOUTER, (activeTool == TOOL_ZOOM) ? BF_RECT : BF_RECT | BF_MIDDLE); + DrawEdge(hdc, &rect2, (activeTool >= TOOL_RECT) ? BDR_SUNKENOUTER : 0, BF_RECT | BF_MIDDLE); switch (activeTool) { - case 1: - case 2: - case 10: + case TOOL_FREESEL: + case TOOL_RECTSEL: + case TOOL_TEXT: { HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); @@ -50,7 +50,7 @@ DrawIconEx(hdc, 1, 33, hTranspIcon, 40, 30, 0, NULL, DI_NORMAL); break; } - case 3: + case TOOL_RUBBER: { int i; HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); @@ -69,7 +69,7 @@ DeleteObject(SelectObject(hdc, oldPen)); break; } - case 8: + case TOOL_BRUSH: { int i; HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); @@ -82,7 +82,7 @@ GetSysColor((i == brushStyle) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), i); break; } - case 9: + case TOOL_AIRBRUSH: { HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); @@ -112,8 +112,8 @@ DeleteObject(SelectObject(hdc, oldPen)); break; } - case 11: - case 12: + case TOOL_LINE: + case TOOL_BEZIER: { int i; HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); @@ -132,10 +132,10 @@ DeleteObject(SelectObject(hdc, oldPen)); break; } - case 13: - case 14: - case 15: - case 16: + case TOOL_RECT: + case TOOL_SHAPE: + case TOOL_ELLIPSE: + case TOOL_RRECT: { int i; HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); @@ -178,23 +178,23 @@ { switch (activeTool) { - case 1: - case 2: - case 10: + case TOOL_FREESEL: + case TOOL_RECTSEL: + case TOOL_TEXT: if ((HIWORD(lParam) > 1) && (HIWORD(lParam) < 64)) { transpBg = (HIWORD(lParam) - 2) / 31; SendMessage(hwnd, WM_PAINT, 0, 0); } break; - case 3: + case TOOL_RUBBER: if ((HIWORD(lParam) > 1) && (HIWORD(lParam) < 62)) { rubberRadius = (HIWORD(lParam) - 2) / 15 + 2; SendMessage(hwnd, WM_PAINT, 0, 0); } break; - case 8: + case TOOL_BRUSH: if ((LOWORD(lParam) > 1) && (LOWORD(lParam) < 40) && (HIWORD(lParam) > 1) && (HIWORD(lParam) < 62)) { @@ -202,7 +202,7 @@ SendMessage(hwnd, WM_PAINT, 0, 0); } break; - case 9: + case TOOL_AIRBRUSH: if (HIWORD(lParam) < 62) { if (HIWORD(lParam) < 30) @@ -222,18 +222,18 @@ SendMessage(hwnd, WM_PAINT, 0, 0); } break; - case 11: - case 12: + case TOOL_LINE: + case TOOL_BEZIER: if (HIWORD(lParam) <= 62) { lineWidth = (HIWORD(lParam) - 2) / 12 + 1; SendMessage(hwnd, WM_PAINT, 0, 0); } break; - case 13: - case 14: - case 15: - case 16: + case TOOL_RECT: + case TOOL_SHAPE: + case TOOL_ELLIPSE: + case TOOL_RRECT: if (HIWORD(lParam) <= 60) { shapeStyle = (HIWORD(lParam) - 2) / 20; Modified: trunk/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Thu May 27 14:21:50 2010 @@ -460,19 +460,19 @@ { switch (activeTool) { - case 4: + case TOOL_FILL: SetCursor(hCurFill); break; - case 5: + case TOOL_COLOR: SetCursor(hCurColor); break; - case 6: + case TOOL_ZOOM: SetCursor(hCurZoom); break; - case 7: + case TOOL_PEN: SetCursor(hCurPen); break; - case 9: + case TOOL_AIRBRUSH: SetCursor(hCurAirbrush); break; default: @@ -486,7 +486,7 @@ case WM_LBUTTONDOWN: if (hwnd == hImageArea) { - if ((!drawing) || (activeTool == 5)) + if ((!drawing) || (activeTool == TOOL_COLOR)) { SetCapture(hImageArea); drawing = TRUE; @@ -499,7 +499,7 @@ undo(); } SendMessage(hImageArea, WM_PAINT, 0, 0); - if ((activeTool == 6) && (zoom < 8000)) + if ((activeTool == TOOL_ZOOM) && (zoom < 8000)) zoomTo(zoom * 2, (short)LOWORD(lParam), (short)HIWORD(lParam)); } break; @@ -507,7 +507,7 @@ case WM_RBUTTONDOWN: if (hwnd == hImageArea) { - if ((!drawing) || (activeTool == 5)) + if ((!drawing) || (activeTool == TOOL_COLOR)) { SetCapture(hImageArea); drawing = TRUE; @@ -520,7 +520,7 @@ undo(); } SendMessage(hImageArea, WM_PAINT, 0, 0); - if ((activeTool == 6) && (zoom > 125)) + if ((activeTool == TOOL_ZOOM) && (zoom > 125)) zoomTo(zoom / 2, (short)LOWORD(lParam), (short)HIWORD(lParam)); } break; @@ -533,7 +533,7 @@ endPaintingL(hDrawingDC, LOWORD(lParam) * 1000 / zoom, HIWORD(lParam) * 1000 / zoom, fgColor, bgColor); SendMessage(hImageArea, WM_PAINT, 0, 0); - if (activeTool == 5) + if (activeTool == TOOL_COLOR) { int tempColor = GetPixel(hDrawingDC, LOWORD(lParam) * 1000 / zoom, HIWORD(lParam) * 1000 / zoom); @@ -553,7 +553,7 @@ endPaintingR(hDrawingDC, LOWORD(lParam) * 1000 / zoom, HIWORD(lParam) * 1000 / zoom, fgColor, bgColor); SendMessage(hImageArea, WM_PAINT, 0, 0); - if (activeTool == 5) + if (activeTool == TOOL_COLOR) { int tempColor = GetPixel(hDrawingDC, LOWORD(lParam) * 1000 / zoom, HIWORD(lParam) * 1000 / zoom); @@ -568,16 +568,13 @@ case WM_MOUSEMOVE: if (hwnd == hImageArea) { - if ((!drawing) || (activeTool <= 9)) + short xNow = (short)LOWORD(lParam) * 1000 / zoom; + short yNow = (short)HIWORD(lParam) * 1000 / zoom; + if ((!drawing) || (activeTool <= TOOL_AIRBRUSH)) { TRACKMOUSEEVENT tme; - TCHAR coordStr[100]; - _stprintf(coordStr, _T("%d, %d"), (short)LOWORD(lParam) * 1000 / zoom, - (short)HIWORD(lParam) * 1000 / zoom); - SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr); - - if (activeTool == 6) + if (activeTool == TOOL_ZOOM) { SendMessage(hImageArea, WM_PAINT, 0, 0); drawZoomFrame((short)LOWORD(lParam), (short)HIWORD(lParam)); @@ -588,32 +585,73 @@ tme.hwndTrack = hImageArea; tme.dwHoverTime = 0; TrackMouseEvent(&tme); + + if (!drawing) + { + TCHAR coordStr[100]; + _stprintf(coordStr, _T("%d, %d"), xNow, yNow); + SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr); + } } if (drawing) { + /* values displayed in statusbar */ + short xRel = xNow - startX; + short yRel = yNow - startY; + /* freesel, rectsel and text tools always show numbers limited to fit into image area */ + if ((activeTool == TOOL_FREESEL) || (activeTool == TOOL_RECTSEL) || (activeTool == TOOL_TEXT)) + { + if (xRel < 0) + xRel = (xNow < 0) ? -startX : xRel; + else if (xNow > imgXRes) + xRel = imgXRes-startX; + if (yRel < 0) + yRel = (yNow < 0) ? -startY : yRel; + else if (yNow > imgYRes) + yRel = imgYRes-startY; + } + /* rectsel and shape tools always show non-negative numbers when drawing */ + if ((activeTool == TOOL_RECTSEL) || (activeTool == TOOL_SHAPE)) + { + if (xRel < 0) + xRel = -xRel; + if (yRel < 0) + yRel = -yRel; + } + /* while drawing, update cursor coordinates only for tools 3, 7, 8, 9, 14 */ + switch(activeTool) + { + case TOOL_RUBBER: + case TOOL_PEN: + case TOOL_BRUSH: + case TOOL_AIRBRUSH: + case TOOL_SHAPE: + { + TCHAR coordStr[100]; + _stprintf(coordStr, _T("%d, %d"), xNow, yNow); + SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr); + break; + } + } if ((wParam & MK_LBUTTON) != 0) { - whilePaintingL(hDrawingDC, (short)LOWORD(lParam) * 1000 / zoom, - (short)HIWORD(lParam) * 1000 / zoom, fgColor, bgColor); + whilePaintingL(hDrawingDC, xNow, yNow, fgColor, bgColor); SendMessage(hImageArea, WM_PAINT, 0, 0); - if ((activeTool >= 10) || (activeTool == 2)) + if ((activeTool >= TOOL_TEXT) || (activeTool == TOOL_RECTSEL) || (activeTool == TOOL_FREESEL)) { TCHAR sizeStr[100]; - _stprintf(sizeStr, _T("%d x %d"), (short)LOWORD(lParam) * 1000 / zoom - startX, - (short)HIWORD(lParam) * 1000 / zoom - startY); + _stprintf(sizeStr, _T("%d x %d"), xRel, yRel); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); } } if ((wParam & MK_RBUTTON) != 0) { - whilePaintingR(hDrawingDC, (short)LOWORD(lParam) * 1000 / zoom, - (short)HIWORD(lParam) * 1000 / zoom, fgColor, bgColor); + whilePaintingR(hDrawingDC, xNow, yNow, fgColor, bgColor); SendMessage(hImageArea, WM_PAINT, 0, 0); - if (activeTool >= 10) + if (activeTool >= TOOL_TEXT) { TCHAR sizeStr[100]; - _stprintf(sizeStr, _T("%d x %d"), (short)LOWORD(lParam) * 1000 / zoom - startX, - (short)HIWORD(lParam) * 1000 / zoom - startY); + _stprintf(sizeStr, _T("%d x %d"), xRel, yRel); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); } } @@ -623,7 +661,7 @@ case WM_MOUSELEAVE: SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) _T("")); - if (activeTool == 6) + if (activeTool == TOOL_ZOOM) SendMessage(hImageArea, WM_PAINT, 0, 0); break; @@ -747,7 +785,7 @@ /* remove selection window and already painted content using undo(), paint Rect for rectangular selections and nothing for freeform selections */ undo(); - if (activeTool == 2) + if (activeTool == TOOL_RECTSEL) { newReversible(); Rect(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2] + rectSel_dest[0], @@ -756,7 +794,7 @@ break; } case IDM_EDITSELECTALL: - if (activeTool == 2) + if (activeTool == TOOL_RECTSEL) { startPaintingL(hDrawingDC, 0, 0, fgColor, bgColor); whilePaintingL(hDrawingDC, imgXRes, imgYRes, fgColor, bgColor);

14 years, 11 months

[khornicek] 47371: - Sync wined3d, ddraw, d3d8, d3d9 with Wine

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu May 27 12:25:14 2010 New Revision: 47371 URL: http://svn.reactos.org/svn/reactos?rev=47371&view=rev Log: - Sync wined3d, ddraw, d3d8, d3d9 with Wine Modified: trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw_thunks.c trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/direct3d.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/material.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/view.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/wined3d.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_thunks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/direct3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dir… Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/material.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mat… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

14 years, 11 months

[cgutman] 47370: [NPFS] - Change the other side's to PIPE_STATUS_CLOSING_STATE in NpfsCleanup and NpfsClose so the reading/writing thread knows that the pipe is dead when we signal its event - Fixes iphlpapi_winetest hang and possibly bug #4689

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu May 27 02:26:34 2010 New Revision: 47370 URL: http://svn.reactos.org/svn/reactos?rev=47370&view=rev Log: [NPFS] - Change the other side's to PIPE_STATUS_CLOSING_STATE in NpfsCleanup and NpfsClose so the reading/writing thread knows that the pipe is dead when we signal its event - Fixes iphlpapi_winetest hang and possibly bug #4689 Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Thu May 27 02:26:34 2010 @@ -619,7 +619,7 @@ ExAcquireFastMutex(&OtherSide->DataListLock); ExAcquireFastMutex(&Ccb->DataListLock); } - //OtherSide->PipeState = FILE_PIPE_DISCONNECTED_STATE; + OtherSide->PipeState = FILE_PIPE_CLOSING_STATE; OtherSide->OtherSide = NULL; /* * Signaling the write event. If is possible that an other @@ -743,8 +743,12 @@ } /* Disconnect the pipes */ - if (Ccb->OtherSide) Ccb->OtherSide->OtherSide = NULL; - if (Ccb) Ccb->OtherSide = NULL; + if (Ccb->OtherSide) + { + Ccb->OtherSide->PipeState = FILE_PIPE_CLOSING_STATE; + Ccb->OtherSide->OtherSide = NULL; + Ccb->OtherSide = NULL; + } ASSERT(Ccb->PipeState == FILE_PIPE_CLOSING_STATE); Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Thu May 27 02:26:34 2010 @@ -331,7 +331,7 @@ if ((Ccb->OtherSide == NULL) && (Ccb->ReadDataAvailable == 0)) { - if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) + if (Ccb->PipeState == FILE_PIPE_CLOSING_STATE) { DPRINT("File pipe broken\n"); Status = STATUS_PIPE_BROKEN;

14 years, 11 months

[jgardou] 47369: Sync with trunk r47367

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu May 27 01:20:20 2010 New Revision: 47369 URL: http://svn.reactos.org/svn/reactos?rev=47369&view=rev Log: Sync with trunk r47367 Added: branches/reactos-yarotows/dll/cpl/usrmgr/lang/es-ES.rc (with props) branches/reactos-yarotows/lib/3rdparty/freetype/README.git branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftadvanc.h (with props) branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftcid.h (with props) branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftpic.h (with props) branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svcid.h (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afpic.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afpic.h (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/base/basepic.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/base/basepic.h (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftadvanc.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftbase.h (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftcid.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftfstype.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftpic.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftsnames.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffpic.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffpic.h (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvmath.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshpic.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshpic.h (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/pspic.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/pspic.h (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/rastpic.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/rastpic.h (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/sfntpic.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/sfntpic.h (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttcmapc.h (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/ftspic.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/ftspic.h (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/chktrcmp.py (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttpic.c (with props) branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttpic.h (with props) Removed: branches/reactos-yarotows/lib/3rdparty/freetype/README.CVS branches/reactos-yarotows/lib/3rdparty/freetype/i386/ branches/reactos-yarotows/lib/3rdparty/freetype/src/base/_ftbase_ros.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/_ftmulfix_ros.c Modified: branches/reactos-yarotows/ (props changed) branches/reactos-yarotows/base/applications/games/winemine/lang/cs-CZ.rc branches/reactos-yarotows/base/applications/notepad/lang/cs-CZ.rc branches/reactos-yarotows/base/applications/paint/lang/cs-CZ.rc branches/reactos-yarotows/base/applications/regedit/lang/cs-CZ.rc branches/reactos-yarotows/base/applications/sndvol32/lang/cs-CZ.rc branches/reactos-yarotows/base/setup/usetup/lang/en-US.h branches/reactos-yarotows/base/setup/usetup/lang/es-ES.h branches/reactos-yarotows/base/setup/usetup/lang/et-EE.h branches/reactos-yarotows/base/setup/usetup/lang/it-IT.h branches/reactos-yarotows/base/setup/welcome/lang/es-ES.rc branches/reactos-yarotows/boot/freeldr/freeldr/fs/ntfs.c branches/reactos-yarotows/dll/cpl/usrmgr/rsrc.rc branches/reactos-yarotows/dll/shellext/slayer/lang/cs-CZ.rc branches/reactos-yarotows/dll/win32/devmgr/lang/es-ES.rc branches/reactos-yarotows/dll/win32/kernel32/misc/console.c branches/reactos-yarotows/dll/win32/shell32/lang/cs-CZ.rc branches/reactos-yarotows/dll/win32/shell32/lang/es-ES.rc branches/reactos-yarotows/dll/win32/shell32/lang/it-IT.rc branches/reactos-yarotows/dll/win32/syssetup/lang/es-ES.rc branches/reactos-yarotows/dll/win32/userenv/lang/es-ES.rc branches/reactos-yarotows/dll/win32/userenv/lang/it-IT.rc branches/reactos-yarotows/include/reactos/subsys/csrss/csrss.h branches/reactos-yarotows/lib/3rdparty/freetype/ChangeLog branches/reactos-yarotows/lib/3rdparty/freetype/ChangeLog.21 branches/reactos-yarotows/lib/3rdparty/freetype/ChangeLog.22 branches/reactos-yarotows/lib/3rdparty/freetype/Jamfile branches/reactos-yarotows/lib/3rdparty/freetype/README branches/reactos-yarotows/lib/3rdparty/freetype/autogen.sh branches/reactos-yarotows/lib/3rdparty/freetype/configure branches/reactos-yarotows/lib/3rdparty/freetype/devel/ftoption.h branches/reactos-yarotows/lib/3rdparty/freetype/freetype.def branches/reactos-yarotows/lib/3rdparty/freetype/freetype.rbuild branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/config/ftconfig.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/config/ftheader.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/config/ftmodule.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/config/ftoption.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/config/ftstdlib.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/freetype.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftbbox.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftbdf.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftbitmap.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftcache.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftchapters.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftgasp.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftglyph.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftgxval.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftgzip.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftimage.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftincrem.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftlcdfil.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftlist.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftlzw.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftmac.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftmm.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftmodapi.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftotval.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftoutln.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftpfr.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftrender.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftsizes.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftsnames.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftstroke.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftsynth.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftsystem.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/fttypes.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftwinfnt.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftxf86.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/autohint.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftcalc.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftdebug.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftdriver.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftgloadr.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftmemory.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftobjs.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftrfork.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftserv.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/fttrace.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/internal.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/psaux.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/pshints.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svbdf.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svgldict.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svmm.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svpostnm.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svpscmap.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svpsinfo.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svsfnt.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svttcmap.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svttglyf.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/sfnt.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/t1types.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/tttypes.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/t1tables.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ttnameid.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/tttables.h branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/tttags.h branches/reactos-yarotows/lib/3rdparty/freetype/modules.cfg branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/Jamfile branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afcjk.c branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afcjk.h branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afdummy.c branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afdummy.h branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afglobal.c branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afglobal.h branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afhints.c branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afhints.h branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afindic.c branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afindic.h branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/aflatin.c branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/aflatin.h branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/aflatin2.c branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/aflatin2.h branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afloader.c branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afmodule.c branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afmodule.h branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/aftypes.h branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afwarp.c branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/autofit.c branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/base/Jamfile branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftbase.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftbbox.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftbitmap.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftcalc.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftdbgmem.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftdebug.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftgloadr.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftglyph.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftinit.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftlcdfil.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftmac.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftmm.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftobjs.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftotval.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftoutln.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftpatent.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftpfr.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftrfork.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftstream.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftstroke.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftsynth.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftsystem.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/fttrigon.c branches/reactos-yarotows/lib/3rdparty/freetype/src/base/rules.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/bdf/bdf.h branches/reactos-yarotows/lib/3rdparty/freetype/src/bdf/bdfdrivr.c branches/reactos-yarotows/lib/3rdparty/freetype/src/bdf/bdfdrivr.h branches/reactos-yarotows/lib/3rdparty/freetype/src/bdf/bdflib.c branches/reactos-yarotows/lib/3rdparty/freetype/src/bdf/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/bdf/rules.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcbasic.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftccache.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftccache.h branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftccback.h branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftccmap.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcglyph.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcglyph.h branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcimage.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcmanag.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcmru.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcmru.h branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcsbits.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/rules.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/Jamfile branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cff.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffcmap.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffcmap.h branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffdrivr.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffdrivr.h branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffgload.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffgload.h branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffload.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffload.h branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffobjs.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffobjs.h branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffparse.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffparse.h branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cfftypes.h branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/cidgload.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/cidload.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/cidobjs.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/cidparse.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/cidriver.c branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/cidriver.h branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/cidtoken.h branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvbsln.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvcommn.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvcommn.h branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvfeat.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvjust.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvkern.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvlcar.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmod.h branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmort.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmort.h branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmort0.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmort1.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmort2.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmort4.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmort5.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmorx.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmorx0.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmorx1.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmorx2.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmorx5.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvopbd.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvprop.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvtrak.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/gzip/adler32.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gzip/ftgzip.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gzip/inftrees.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gzip/zconf.h branches/reactos-yarotows/lib/3rdparty/freetype/src/gzip/zutil.c branches/reactos-yarotows/lib/3rdparty/freetype/src/gzip/zutil.h branches/reactos-yarotows/lib/3rdparty/freetype/src/lzw/ftlzw.c branches/reactos-yarotows/lib/3rdparty/freetype/src/lzw/ftzopen.c branches/reactos-yarotows/lib/3rdparty/freetype/src/lzw/ftzopen.h branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/Jamfile branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvalid.c branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvalid.h branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvbase.c branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvcommn.c branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvcommn.h branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvgdef.c branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvgpos.c branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvgsub.c branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvjstf.c branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvmod.c branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvmod.h branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/rules.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/pcf.h branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/pcfdrivr.c branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/pcfdrivr.h branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/pcfread.c branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/pcfutil.c branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/pcfutil.h branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/rules.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrcmap.c branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrdrivr.c branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrdrivr.h branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrgload.c branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrload.c branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrobjs.c branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrsbit.c branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrtypes.h branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/afmparse.c branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/afmparse.h branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/psauxmod.h branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/psconv.c branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/psconv.h branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/psobjs.c branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/psobjs.h branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/t1cmap.c branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/t1decode.c branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/Jamfile branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshalgo.c branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshalgo.h branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshinter.c branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshmod.c branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshmod.h branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshrec.c branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshrec.h branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/Jamfile branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/psmodule.c branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/psmodule.h branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/psnames.c branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/pstables.h branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/Jamfile branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/ftmisc.h branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/ftraster.c branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/ftrend1.c branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/ftrend1.h branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/raster.c branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/rules.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/Jamfile branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/rules.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/sfdriver.c branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/sfdriver.h branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/sfnt.c branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/sfobjs.c branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttbdf.c branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttcmap.c branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttcmap.h branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttkern.c branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttload.c branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttmtx.c branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttpost.c branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttsbit.c branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttsbit.h branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttsbit0.c branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/Jamfile branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/ftgrays.c branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/ftgrays.h branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/ftsmooth.c branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/ftsmooth.h branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/smooth.c branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/apinames.c branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/docmaker/content.py branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/docmaker/docbeauty.py branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/docmaker/docmaker.py branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/docmaker/formatter.py branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/docmaker/sources.py branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/docmaker/tohtml.py branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/docmaker/utils.py branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/ftrandom/ftrandom.c branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/glnames.py branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/test_afm.c branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/Jamfile branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/truetype.c branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttdriver.c branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttdriver.h branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttgload.c branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttgload.h branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttgxvar.c branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttgxvar.h branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttinterp.c branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttobjs.c branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttobjs.h branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttpload.c branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1afm.c branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1driver.c branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1driver.h branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1gload.c branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1gload.h branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1load.c branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1objs.c branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1parse.c branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1parse.h branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1tokens.h branches/reactos-yarotows/lib/3rdparty/freetype/src/type42/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/type42/rules.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/type42/t42drivr.c branches/reactos-yarotows/lib/3rdparty/freetype/src/type42/t42drivr.h branches/reactos-yarotows/lib/3rdparty/freetype/src/type42/t42objs.c branches/reactos-yarotows/lib/3rdparty/freetype/src/type42/t42parse.c branches/reactos-yarotows/lib/3rdparty/freetype/src/type42/t42types.h branches/reactos-yarotows/lib/3rdparty/freetype/src/winfonts/module.mk branches/reactos-yarotows/lib/3rdparty/freetype/src/winfonts/winfnt.c branches/reactos-yarotows/lib/3rdparty/freetype/src/winfonts/winfnt.h branches/reactos-yarotows/subsystems/win32/csrss/win32csr/conio.c branches/reactos-yarotows/subsystems/win32/csrss/win32csr/conio.h branches/reactos-yarotows/subsystems/win32/csrss/win32csr/guiconsole.c branches/reactos-yarotows/subsystems/win32/win32k/include/timer.h branches/reactos-yarotows/subsystems/win32/win32k/main/dllmain.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/defwnd.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/msgqueue.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/timer.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/window.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/reactos-yarotows/base/applications/games/winemine/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/notepad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/paint/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/sndvol32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/setup/use… Modified: branches/reactos-yarotows/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/setup/use… Modified: branches/reactos-yarotows/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/setup/use… Modified: branches/reactos-yarotows/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/setup/use… Modified: branches/reactos-yarotows/base/setup/welcome/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/setup/wel… Modified: branches/reactos-yarotows/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/freeldr/f… Added: branches/reactos-yarotows/dll/cpl/usrmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/usrmgr… Modified: branches/reactos-yarotows/dll/cpl/usrmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/usrmgr… Modified: branches/reactos-yarotows/dll/shellext/slayer/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/shellext/s… Modified: branches/reactos-yarotows/dll/win32/devmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/devm… Modified: branches/reactos-yarotows/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/shel… Modified: branches/reactos-yarotows/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/shel… Modified: branches/reactos-yarotows/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/shel… Modified: branches/reactos-yarotows/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/syss… Modified: branches/reactos-yarotows/dll/win32/userenv/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… Modified: branches/reactos-yarotows/dll/win32/userenv/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… Modified: branches/reactos-yarotows/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/ChangeLog URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/ChangeLog.21 URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/ChangeLog.22 URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/README URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Removed: branches/reactos-yarotows/lib/3rdparty/freetype/README.CVS URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/README.git URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/autogen.sh URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/configure URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/devel/ftoption.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/freetype.def URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/config/ftconfig.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/config/ftheader.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/config/ftmodule.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/config/ftoption.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/config/ftstdlib.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/freetype.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftadvanc.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftbbox.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftbdf.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftbitmap.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftcache.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftchapters.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftcid.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftgasp.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftglyph.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftgxval.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftgzip.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftimage.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftincrem.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftlcdfil.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftlist.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftlzw.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftmac.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftmm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftmodapi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftotval.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftoutln.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftpfr.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftrender.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftsizes.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftsnames.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftstroke.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftsynth.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftsystem.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/fttypes.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftwinfnt.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ftxf86.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/autohint.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftcalc.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftdebug.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftdriver.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftgloadr.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftmemory.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftobjs.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftpic.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftrfork.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/ftserv.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/fttrace.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/internal.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/psaux.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/pshints.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svbdf.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svcid.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svgldict.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svmm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svpostnm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svpscmap.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svpsinfo.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svsfnt.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svttcmap.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/services/svttglyf.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/sfnt.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/t1types.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/internal/tttypes.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/t1tables.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/ttnameid.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/tttables.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/include/freetype/tttags.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/modules.cfg URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afcjk.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afcjk.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afdummy.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afdummy.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afglobal.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afglobal.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afhints.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afhints.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afindic.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afindic.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/aflatin.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/aflatin.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/aflatin2.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/aflatin2.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afloader.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afmodule.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afmodule.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afpic.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afpic.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/aftypes.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/afwarp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/autofit.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/autofit/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Removed: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/_ftbase_ros.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Removed: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/_ftmulfix_ros.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/basepic.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/basepic.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftadvanc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftbase.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftbase.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftbbox.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftbitmap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftcalc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftcid.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftdbgmem.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftdebug.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftfstype.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftgloadr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftglyph.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftinit.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftlcdfil.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftmac.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftmm.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftobjs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftotval.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftoutln.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftpatent.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftpfr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftpic.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftrfork.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftsnames.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftstream.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftstroke.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftsynth.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/ftsystem.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/fttrigon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/base/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/bdf/bdf.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/bdf/bdfdrivr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/bdf/bdfdrivr.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/bdf/bdflib.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/bdf/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/bdf/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcbasic.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftccache.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftccache.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftccback.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftccmap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcglyph.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcglyph.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcimage.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcmanag.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcmru.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcmru.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/ftcsbits.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cache/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cff.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffcmap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffcmap.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffdrivr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffdrivr.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffgload.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffgload.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffload.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffload.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffobjs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffobjs.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffparse.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffparse.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffpic.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cffpic.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/cfftypes.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cff/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/cidgload.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/cidload.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/cidobjs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/cidparse.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/cidriver.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/cidriver.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/cidtoken.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/cid/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvbsln.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvcommn.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvcommn.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvfeat.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvjust.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvkern.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvlcar.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmod.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmort.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmort.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmort0.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmort1.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmort2.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmort4.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmort5.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmorx.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmorx0.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmorx1.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmorx2.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvmorx5.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvopbd.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvprop.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/gxvtrak.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gxvalid/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gzip/adler32.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gzip/ftgzip.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gzip/inftrees.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gzip/zconf.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gzip/zutil.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/gzip/zutil.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/lzw/ftlzw.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/lzw/ftzopen.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/lzw/ftzopen.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvalid.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvalid.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvbase.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvcommn.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvcommn.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvgdef.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvgpos.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvgsub.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvjstf.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvmath.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvmod.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/otvmod.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/otvalid/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/pcf.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/pcfdrivr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/pcfdrivr.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/pcfread.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/pcfutil.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/pcfutil.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pcf/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrcmap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrdrivr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrdrivr.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrgload.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrload.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrobjs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrsbit.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pfr/pfrtypes.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/afmparse.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/afmparse.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/psauxmod.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/psconv.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/psconv.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/psobjs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/psobjs.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/t1cmap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psaux/t1decode.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshalgo.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshalgo.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshinter.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshmod.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshmod.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshpic.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshpic.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshrec.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/pshinter/pshrec.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/psmodule.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/psmodule.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/psnames.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/pspic.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/pspic.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/psnames/pstables.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/ftmisc.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/ftraster.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/ftrend1.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/ftrend1.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/raster.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/rastpic.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/rastpic.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/raster/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/sfdriver.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/sfdriver.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/sfnt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/sfntpic.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/sfntpic.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/sfobjs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttbdf.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttcmap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttcmap.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttcmapc.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttkern.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttload.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttmtx.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttpost.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttsbit.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttsbit.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/sfnt/ttsbit0.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/ftgrays.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/ftgrays.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/ftsmooth.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/ftsmooth.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/ftspic.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/ftspic.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/smooth/smooth.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/apinames.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/chktrcmp.py URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/docmaker/content.py URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/docmaker/docbeauty.py URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/docmaker/docmaker.py URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/docmaker/formatter.py URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/docmaker/sources.py URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/docmaker/tohtml.py URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/docmaker/utils.py URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/ftrandom/ftrandom.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/glnames.py URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/tools/test_afm.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/truetype.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttdriver.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttdriver.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttgload.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttgload.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttgxvar.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttgxvar.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttinterp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttobjs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttobjs.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttpic.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Added: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttpic.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/truetype/ttpload.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1afm.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1driver.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1driver.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1gload.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1gload.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1load.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1objs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1parse.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1parse.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type1/t1tokens.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type42/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type42/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type42/t42drivr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type42/t42drivr.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type42/t42objs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type42/t42parse.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/type42/t42types.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/winfonts/module.mk URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/winfonts/winfnt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/lib/3rdparty/freetype/src/winfonts/winfnt.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/f… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/conio.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win…

14 years, 11 months

[jgardou] 47368: [WIN32K] - sync subsystems/win32/win32k.objects/cliprgn.c with trunk.

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu May 27 01:04:02 2010 New Revision: 47368 URL: http://svn.reactos.org/svn/reactos?rev=47368&view=rev Log: [WIN32K] - sync subsystems/win32/win32k.objects/cliprgn.c with trunk. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Thu May 27 01:04:02 2010 @@ -52,21 +52,24 @@ if((CombinedRegion = RGNOBJAPI_Lock(Dc->rosdc.hGCClipRgn, NULL))) { - if (Dc->rosdc.CombinedClip != NULL) - IntEngDeleteClipRegion(Dc->rosdc.CombinedClip); - - Dc->rosdc.CombinedClip = IntEngCreateClipRegion( - CombinedRegion->rdh.nCount, + CLIPOBJ *CombinedClip; + + CombinedClip = IntEngCreateClipRegion(CombinedRegion->rdh.nCount, CombinedRegion->Buffer, &CombinedRegion->rdh.rcBound); RGNOBJAPI_Unlock(CombinedRegion); - } - - if ( NULL == Dc->rosdc.CombinedClip ) - { + + if ( !CombinedClip ) + { DPRINT1("IntEngCreateClipRegion() failed\n"); return ERROR; + } + + if(Dc->rosdc.CombinedClip != NULL) + IntEngDeleteClipRegion(Dc->rosdc.CombinedClip); + + Dc->rosdc.CombinedClip = CombinedClip ; } return NtGdiOffsetRgn(Dc->rosdc.hGCClipRgn, -Dc->ptlDCOrig.x, -Dc->ptlDCOrig.y); @@ -137,7 +140,7 @@ { PROSRGNDATA Rgn; RECTL rect; - if((Rgn = RGNOBJAPI_Lock(((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr, NULL))) + if((Rgn = RGNOBJAPI_Lock(dc->prgnVis->BaseObject.hHmgr, NULL))) { REGION_GetRgnBox(Rgn, &rect); RGNOBJAPI_Unlock(Rgn); @@ -185,13 +188,49 @@ PROSRGNDATA Rgn; INT retval; PDC dc; + HRGN hRgnNew, hRgn = NULL; if (!(dc = DC_LockDc(hDC))) { return ERROR; } - if (!(Rgn = RGNOBJAPI_Lock(dc->rosdc.hGCClipRgn, NULL))) + /* FIXME! Rao and Vis only! */ + if (dc->prgnAPI) // APIRGN + { + hRgn = ((PROSRGNDATA)dc->prgnAPI)->BaseObject.hHmgr; + } + else if (dc->dclevel.prgnMeta) // METARGN + { + hRgn = ((PROSRGNDATA)dc->dclevel.prgnMeta)->BaseObject.hHmgr; + } + else + { + hRgn = dc->rosdc.hClipRgn; // CLIPRGN + } + + if (hRgn) + { + hRgnNew = IntSysCreateRectRgn( 0, 0, 0, 0 ); + + NtGdiCombineRgn(hRgnNew, dc->prgnVis->BaseObject.hHmgr, hRgn, RGN_AND); + + if (!(Rgn = RGNOBJAPI_Lock(hRgnNew, NULL))) + { + DC_UnlockDc(dc); + return ERROR; + } + + retval = REGION_GetRgnBox(Rgn, rc); + + REGION_FreeRgnByHandle(hRgnNew); + RGNOBJAPI_Unlock(Rgn); + + DC_UnlockDc(dc); + return retval; + } + + if (!(Rgn = RGNOBJAPI_Lock(dc->prgnVis->BaseObject.hHmgr, NULL))) { DC_UnlockDc(dc); return ERROR; @@ -269,7 +308,7 @@ if (!dc->rosdc.hClipRgn) { dc->rosdc.hClipRgn = IntSysCreateRectRgn(0, 0, 0, 0); - NtGdiCombineRgn(dc->rosdc.hClipRgn, ((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr, NewRgn, RGN_DIFF); + NtGdiCombineRgn(dc->rosdc.hClipRgn, dc->prgnVis->BaseObject.hHmgr, NewRgn, RGN_DIFF); Result = SIMPLEREGION; } else @@ -444,7 +483,7 @@ { if ( pDC->dclevel.prgnClip ) { - TempRgn = IntSysCreateRectRgn(0,0,0,0); + TempRgn = IntSysCreateRectpRgn(0,0,0,0); if (TempRgn) { Ret = IntGdiCombineRgn( TempRgn, @@ -510,56 +549,76 @@ { CLIPOBJ * co; - if (!pDC->prgnVis) return 0; + /* Must have VisRgn set to a valid state! */ + if (!pDC->prgnVis) return ERROR; if (pDC->prgnAPI) { REGION_Delete(pDC->prgnAPI); - pDC->prgnAPI = IntSysCreateRectRgn(0,0,0,0); + pDC->prgnAPI = IntSysCreateRectpRgn(0,0,0,0); } if (pDC->prgnRao) { REGION_Delete(pDC->prgnRao); - pDC->prgnRao = IntSysCreateRectRgn(0,0,0,0); + pDC->prgnRao = IntSysCreateRectpRgn(0,0,0,0); } if (pDC->dclevel.prgnMeta && pDC->dclevel.prgnClip) { IntGdiCombineRgn( pDC->prgnAPI, - pDC->dclevel.prgnClip, - pDC->dclevel.prgnMeta, - RGN_AND); + pDC->dclevel.prgnClip, + pDC->dclevel.prgnMeta, + RGN_AND); } else { if (pDC->dclevel.prgnClip) + { IntGdiCombineRgn( pDC->prgnAPI, - pDC->dclevel.prgnClip, - NULL, - RGN_COPY); + pDC->dclevel.prgnClip, + NULL, + RGN_COPY); + } else if (pDC->dclevel.prgnMeta) + { IntGdiCombineRgn( pDC->prgnAPI, - pDC->dclevel.prgnMeta, - NULL, - RGN_COPY); + 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)); + RGN_AND); + + RtlCopyMemory(&pDC->erclClip, + &((PROSRGNDATA)pDC->prgnRao)->rdh.rcBound, + sizeof(RECTL)); + pDC->fs &= ~DC_FLAG_DIRTY_RAO; -// if (Dc->CombinedClip != NULL) IntEngDeleteClipRegion(Dc->CombinedClip); + IntGdiOffsetRgn(pDC->prgnRao, pDC->ptlDCOrig.x, pDC->ptlDCOrig.y); + + // pDC->co should be used. Example, CLIPOBJ_cEnumStart uses XCLIPOBJ to build + // the rects from region objects rects in pClipRgn->Buffer. + // With pDC->co.pClipRgn->Buffer, + // pDC->co.pClipRgn = pDC->prgnRao ? pDC->prgnRao : pDC->prgnVis; co = IntEngCreateClipRegion( ((PROSRGNDATA)pDC->prgnRao)->rdh.nCount, - ((PROSRGNDATA)pDC->prgnRao)->Buffer, + ((PROSRGNDATA)pDC->prgnRao)->Buffer, &pDC->erclClip); - - return REGION_Complexity(pDC->prgnRao); + if (co) + { + if (pDC->rosdc.CombinedClip != NULL) + IntEngDeleteClipRegion(pDC->rosdc.CombinedClip); + + pDC->rosdc.CombinedClip = co; + } + + return IntGdiOffsetRgn(pDC->prgnRao, -pDC->ptlDCOrig.x, -pDC->ptlDCOrig.y); } /* EOF */

14 years, 11 months

[tkreuzer] 47367: [WIN32K] GreGradientFill: don't forget to unlock the DC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 27 00:33:10 2010 New Revision: 47367 URL: http://svn.reactos.org/svn/reactos?rev=47367&view=rev Log: [WIN32K] GreGradientFill: don't forget to unlock the DC Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Thu May 27 00:33:10 2010 @@ -955,6 +955,8 @@ if (ppal) PALETTE_UnlockPalette(ppal); + DC_UnlockDc(pdc); + return bRet; }

14 years, 11 months

[jgardou] 47366: [WIN32K] - merge r47350, slightly modified to get it the yarotows way

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu May 27 00:29:45 2010 New Revision: 47366 URL: http://svn.reactos.org/svn/reactos?rev=47366&view=rev Log: [WIN32K] - merge r47350, slightly modified to get it the yarotows way Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/intgdi.h branches/reactos-yarotows/subsystems/win32/win32k/ntuser/painting.c branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] Thu May 27 00:29:45 2010 @@ -122,10 +122,15 @@ PULONG PolyCounts, int Count); -BOOL FASTCALL IntGdiGradientFill(DC *dc, +BOOL +NTAPI +GreGradientFill( + HDC hdc, PTRIVERTEX pVertex, - ULONG uVertex, - PVOID pMesh, ULONG uMesh, ULONG ulMode); + ULONG nVertex, + PVOID pMesh, + ULONG nMesh, + ULONG ulMode); /* DC functions */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Thu May 27 00:29:45 2010 @@ -1782,7 +1782,6 @@ static GRADIENT_RECT gcap = {0, 1}; TRIVERTEX vert[2]; COLORREF Colors[2]; - PDC pMemDc; if (Wnd != NULL) { @@ -1835,21 +1834,12 @@ vert[1].Blue = (WORD)(Colors[1]>>8) & 0xFF00; vert[1].Alpha = 0; - pMemDc = DC_LockDc(hMemDc); - if(!pMemDc) - { - DPRINT1("%s: Can't lock dc!\n", __FUNCTION__); - goto cleanup; - } - - /* There is no need to call DC_vPrepareDCsForBlit for memory DC */ - if(!IntGdiGradientFill(pMemDc, vert, 2, &gcap, + if(!GreGradientFill(hMemDc, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_H)) { DPRINT1("%s: IntGdiGradientFill() failed!\n", __FUNCTION__); } - DC_UnlockDc(pMemDc); } //if(uFlags & DC_GRADIENT) } Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Thu May 27 00:29:45 2010 @@ -856,39 +856,34 @@ return ret; } -BOOL FASTCALL -IntGdiGradientFill( - DC *dc, +BOOL +NTAPI +GreGradientFill( + HDC hdc, PTRIVERTEX pVertex, - ULONG uVertex, + ULONG nVertex, PVOID pMesh, - ULONG uMesh, + ULONG nMesh, ULONG ulMode) { + PDC pdc; SURFACE *psurf; - PPALETTE PalDestGDI; EXLATEOBJ exlo; - RECTL Extent; - POINTL DitherOrg; + RECTL rclExtent; + POINTL ptlDitherOrg; ULONG i; - BOOL Ret; - - ASSERT(dc); - ASSERT(pVertex); - ASSERT(uVertex); - ASSERT(pMesh); - ASSERT(uMesh); + BOOL bRet; /* check parameters */ if (ulMode & GRADIENT_FILL_TRIANGLE) { - PGRADIENT_TRIANGLE tr = (PGRADIENT_TRIANGLE)pMesh; - - for (i = 0; i < uMesh; i++, tr++) + PGRADIENT_TRIANGLE pTriangle = (PGRADIENT_TRIANGLE)pMesh; + + for (i = 0; i < nMesh; i++, pTriangle++) { - if (tr->Vertex1 >= uVertex || - tr->Vertex2 >= uVertex || - tr->Vertex3 >= uVertex) + if (pTriangle->Vertex1 >= nVertex || + pTriangle->Vertex2 >= nVertex || + pTriangle->Vertex3 >= nVertex) { SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; @@ -897,10 +892,10 @@ } else { - PGRADIENT_RECT rc = (PGRADIENT_RECT)pMesh; - for (i = 0; i < uMesh; i++, rc++) + PGRADIENT_RECT pRect = (PGRADIENT_RECT)pMesh; + for (i = 0; i < nMesh; i++, pRect++) { - if (rc->UpperLeft >= uVertex || rc->LowerRight >= uVertex) + if (pRect->UpperLeft >= nVertex || pRect->LowerRight >= nVertex) { SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; @@ -908,61 +903,74 @@ } } + /* Lock the output DC */ + pdc = DC_LockDc(hdc); + if(!pdc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + if(pdc->dctype == DC_TYPE_INFO) + { + DC_UnlockDc(pdc); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + psurf = pdc->dclevel.pSurface; + if(!psurf) + { + /* Memory DC with no surface selected */ + DC_UnlockDc(pdc); + return TRUE; //CHECKME + } + /* calculate extent */ - Extent.left = Extent.right = pVertex->x; - Extent.top = Extent.bottom = pVertex->y; - for (i = 0; i < uVertex; i++) - { - Extent.left = min(Extent.left, (pVertex + i)->x); - Extent.right = max(Extent.right, (pVertex + i)->x); - Extent.top = min(Extent.top, (pVertex + i)->y); - Extent.bottom = max(Extent.bottom, (pVertex + i)->y); - } - IntLPtoDP(dc, (LPPOINT)&Extent, 2); - - Extent.left += dc->ptlDCOrig.x; - Extent.right += dc->ptlDCOrig.x; - Extent.top += dc->ptlDCOrig.y; - Extent.bottom += dc->ptlDCOrig.y; - - DitherOrg.x = DitherOrg.y = 0; - IntLPtoDP(dc, (LPPOINT)&DitherOrg, 1); - - DitherOrg.x += dc->ptlDCOrig.x; - DitherOrg.y += dc->ptlDCOrig.y; - - psurf = dc->dclevel.pSurface; - /* FIXME - psurf can be NULL!!! Don't assert but handle this case gracefully! */ - ASSERT(psurf); - - if (psurf->ppal) - { - PalDestGDI = psurf->ppal; - GDIOBJ_IncrementShareCount(&PalDestGDI->BaseObject); - } - else - // Destination palette obtained from the hDC - PalDestGDI = PALETTE_ShareLockPalette(dc->ppdev->devinfo.hpalDefault); - - EXLATEOBJ_vInitialize(&exlo, &gpalRGB, PalDestGDI, 0, 0, 0); - - Ret = IntEngGradientFill(&psurf->SurfObj, - dc->rosdc.CombinedClip, + rclExtent.left = rclExtent.right = pVertex->x; + rclExtent.top = rclExtent.bottom = pVertex->y; + for (i = 0; i < nVertex; i++) + { + rclExtent.left = min(rclExtent.left, (pVertex + i)->x); + rclExtent.right = max(rclExtent.right, (pVertex + i)->x); + rclExtent.top = min(rclExtent.top, (pVertex + i)->y); + rclExtent.bottom = max(rclExtent.bottom, (pVertex + i)->y); + } + IntLPtoDP(pdc, (LPPOINT)&rclExtent, 2); + + rclExtent.left += pdc->ptlDCOrig.x; + rclExtent.right += pdc->ptlDCOrig.x; + rclExtent.top += pdc->ptlDCOrig.y; + rclExtent.bottom += pdc->ptlDCOrig.y; + + ptlDitherOrg.x = ptlDitherOrg.y = 0; + IntLPtoDP(pdc, (LPPOINT)&ptlDitherOrg, 1); + + ptlDitherOrg.x += pdc->ptlDCOrig.x; + ptlDitherOrg.y += pdc->ptlDCOrig.y; + + EXLATEOBJ_vInitialize(&exlo, &gpalRGB, psurf->ppal, 0, 0, 0); + + ASSERT(pdc->rosdc.CombinedClip); + + DC_vPrepareDCsForBlit(pdc, rclExtent, NULL, rclExtent); + + bRet = IntEngGradientFill(&psurf->SurfObj, + pdc->rosdc.CombinedClip, &exlo.xlo, pVertex, - uVertex, + nVertex, pMesh, - uMesh, - &Extent, - &DitherOrg, + nMesh, + &rclExtent, + &ptlDitherOrg, ulMode); EXLATEOBJ_vCleanup(&exlo); - - if (PalDestGDI) - PALETTE_ShareUnlockPalette(PalDestGDI); - - return Ret; + DC_vFinishBlit(pdc, NULL); + DC_UnlockDc(pdc); + + return bRet; } BOOL @@ -970,33 +978,19 @@ NtGdiGradientFill( HDC hdc, PTRIVERTEX pVertex, - ULONG uVertex, + ULONG nVertex, PVOID pMesh, - ULONG uMesh, + ULONG nMesh, ULONG ulMode) { - DC *dc; - BOOL Ret; + BOOL bRet; PTRIVERTEX SafeVertex; PVOID SafeMesh; - ULONG SizeMesh; - NTSTATUS Status = STATUS_SUCCESS; - - dc = DC_LockDc(hdc); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - if (!pVertex || !uVertex || !pMesh || !uMesh) - { - DC_UnlockDc(dc); + ULONG cbVertex, cbMesh; + + /* Validate parameters */ + if (!pVertex || !nVertex || !pMesh || !nMesh) + { SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } @@ -1005,81 +999,55 @@ { case GRADIENT_FILL_RECT_H: case GRADIENT_FILL_RECT_V: - SizeMesh = uMesh * sizeof(GRADIENT_RECT); + cbMesh = nMesh * sizeof(GRADIENT_RECT); break; case GRADIENT_FILL_TRIANGLE: - SizeMesh = uMesh * sizeof(TRIVERTEX); + cbMesh = nMesh * sizeof(GRADIENT_TRIANGLE); break; default: - DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } + cbVertex = nVertex * sizeof(TRIVERTEX) ; + if(cbVertex + cbMesh <= cbVertex) + { + /* Overflow */ + return FALSE ; + } + + /* Allocate a kernel mode buffer */ + SafeVertex = ExAllocatePoolWithTag(PagedPool, cbVertex + cbMesh, TAG_SHAPE); + if(!SafeVertex) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + SafeMesh = (PVOID)((ULONG_PTR)SafeVertex + cbVertex); + + /* Copy the parameters to kernel mode */ _SEH2_TRY { - ProbeForRead(pVertex, - uVertex * sizeof(TRIVERTEX), - 1); - ProbeForRead(pMesh, - SizeMesh, - 1); + ProbeForRead(pVertex, cbVertex, 1); + ProbeForRead(pMesh, cbMesh, 1); + RtlCopyMemory(SafeVertex, pVertex, cbVertex); + RtlCopyMemory(SafeMesh, pMesh, cbMesh); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + ExFreePoolWithTag(SafeVertex, TAG_SHAPE); + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(return FALSE;) } _SEH2_END; - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastWin32Error(Status); - return FALSE; - } - - if (!(SafeVertex = ExAllocatePoolWithTag(PagedPool, (uVertex * sizeof(TRIVERTEX)) + SizeMesh, TAG_SHAPE))) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - SafeMesh = (PTRIVERTEX)(SafeVertex + uVertex); - - _SEH2_TRY - { - /* pointers were already probed! */ - RtlCopyMemory(SafeVertex, - pVertex, - uVertex * sizeof(TRIVERTEX)); - RtlCopyMemory(SafeMesh, - pMesh, - SizeMesh); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - ExFreePoolWithTag(SafeVertex, TAG_SHAPE); - SetLastNtError(Status); - return FALSE; - } - - DC_vPrepareDCsForBlit(dc, dc->rosdc.CombinedClip->rclBounds, - NULL, dc->rosdc.CombinedClip->rclBounds); - - Ret = IntGdiGradientFill(dc, SafeVertex, uVertex, SafeMesh, uMesh, ulMode); - - DC_vFinishBlit(dc, NULL) ; - DC_UnlockDc(dc); - ExFreePool(SafeVertex); - return Ret; + /* Call the internal function */ + bRet = GreGradientFill(hdc, SafeVertex, nVertex, SafeMesh, nMesh, ulMode); + + /* Cleanup and return result */ + ExFreePoolWithTag(SafeVertex, TAG_SHAPE); + return bRet; } BOOL APIENTRY

14 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
44
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 May 2010