mirror of
https://github.com/reactos/reactos.git
synced 2024-07-02 10:45:24 +00:00
[GDIPLUS] Sync with Wine Staging 1.9.4. CORE-10912
svn path=/trunk/; revision=70862
This commit is contained in:
parent
1a6ea4f8e9
commit
615db957ca
|
@ -205,6 +205,7 @@ struct GpPen{
|
||||||
REAL offset; /* dash offset */
|
REAL offset; /* dash offset */
|
||||||
GpBrush *brush;
|
GpBrush *brush;
|
||||||
GpPenAlignment align;
|
GpPenAlignment align;
|
||||||
|
GpMatrix transform;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct GpGraphics{
|
struct GpGraphics{
|
||||||
|
|
|
@ -2060,7 +2060,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix,
|
||||||
status = GdipClonePath(path, &flat_path);
|
status = GdipClonePath(path, &flat_path);
|
||||||
|
|
||||||
if (status == Ok)
|
if (status == Ok)
|
||||||
status = GdipFlattenPath(flat_path, matrix, flatness);
|
status = GdipFlattenPath(flat_path, pen->unit == UnitPixel ? matrix : NULL, flatness);
|
||||||
|
|
||||||
if (status == Ok && !init_path_list(&points, 314.0, 22.0))
|
if (status == Ok && !init_path_list(&points, 314.0, 22.0))
|
||||||
status = OutOfMemory;
|
status = OutOfMemory;
|
||||||
|
@ -2133,6 +2133,9 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix,
|
||||||
|
|
||||||
GdipDeletePath(flat_path);
|
GdipDeletePath(flat_path);
|
||||||
|
|
||||||
|
if (status == Ok && pen->unit != UnitPixel)
|
||||||
|
status = GdipTransformPath(path, matrix);
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -159,6 +159,7 @@ GpStatus WINGDIPAPI GdipCreatePen2(GpBrush *brush, REAL width, GpUnit unit,
|
||||||
gp_pen->offset = 0.0;
|
gp_pen->offset = 0.0;
|
||||||
gp_pen->customstart = NULL;
|
gp_pen->customstart = NULL;
|
||||||
gp_pen->customend = NULL;
|
gp_pen->customend = NULL;
|
||||||
|
GdipSetMatrixElements(&gp_pen->transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0);
|
||||||
|
|
||||||
if(!((gp_pen->unit == UnitWorld) || (gp_pen->unit == UnitPixel))) {
|
if(!((gp_pen->unit == UnitWorld) || (gp_pen->unit == UnitPixel))) {
|
||||||
FIXME("UnitWorld, UnitPixel only supported units\n");
|
FIXME("UnitWorld, UnitPixel only supported units\n");
|
||||||
|
@ -406,17 +407,14 @@ GpStatus WINGDIPAPI GdipGetPenWidth(GpPen *pen, REAL *width)
|
||||||
|
|
||||||
GpStatus WINGDIPAPI GdipResetPenTransform(GpPen *pen)
|
GpStatus WINGDIPAPI GdipResetPenTransform(GpPen *pen)
|
||||||
{
|
{
|
||||||
static int calls;
|
|
||||||
|
|
||||||
TRACE("(%p)\n", pen);
|
TRACE("(%p)\n", pen);
|
||||||
|
|
||||||
if(!pen)
|
if(!pen)
|
||||||
return InvalidParameter;
|
return InvalidParameter;
|
||||||
|
|
||||||
if(!(calls++))
|
GdipSetMatrixElements(&pen->transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0);
|
||||||
FIXME("(%p) stub\n", pen);
|
|
||||||
|
|
||||||
return NotImplemented;
|
return Ok;
|
||||||
}
|
}
|
||||||
|
|
||||||
GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix)
|
GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix)
|
||||||
|
@ -429,24 +427,23 @@ GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix)
|
||||||
return InvalidParameter;
|
return InvalidParameter;
|
||||||
|
|
||||||
if(!(calls++))
|
if(!(calls++))
|
||||||
FIXME("not implemented\n");
|
FIXME("(%p,%p) Semi-stub\n", pen, matrix);
|
||||||
|
|
||||||
return NotImplemented;
|
pen->transform = *matrix;
|
||||||
|
|
||||||
|
return Ok;
|
||||||
}
|
}
|
||||||
|
|
||||||
GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *pen, GpMatrix *matrix)
|
GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *pen, GpMatrix *matrix)
|
||||||
{
|
{
|
||||||
static int calls;
|
|
||||||
|
|
||||||
TRACE("(%p,%p)\n", pen, matrix);
|
TRACE("(%p,%p)\n", pen, matrix);
|
||||||
|
|
||||||
if(!pen || !matrix)
|
if(!pen || !matrix)
|
||||||
return InvalidParameter;
|
return InvalidParameter;
|
||||||
|
|
||||||
if(!(calls++))
|
*matrix = pen->transform;
|
||||||
FIXME("not implemented\n");
|
|
||||||
|
|
||||||
return NotImplemented;
|
return Ok;
|
||||||
}
|
}
|
||||||
|
|
||||||
GpStatus WINGDIPAPI GdipTranslatePenTransform(GpPen *pen, REAL dx, REAL dy, GpMatrixOrder order)
|
GpStatus WINGDIPAPI GdipTranslatePenTransform(GpPen *pen, REAL dx, REAL dy, GpMatrixOrder order)
|
||||||
|
|
|
@ -68,7 +68,7 @@ reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.55
|
||||||
reactos/dll/win32/faultrep # Synced to WineStaging-1.7.55
|
reactos/dll/win32/faultrep # Synced to WineStaging-1.7.55
|
||||||
reactos/dll/win32/fltlib # Synced to WineStaging-1.7.55
|
reactos/dll/win32/fltlib # Synced to WineStaging-1.7.55
|
||||||
reactos/dll/win32/fusion # Synced to WineStaging-1.9.4
|
reactos/dll/win32/fusion # Synced to WineStaging-1.9.4
|
||||||
reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.55
|
reactos/dll/win32/gdiplus # Synced to WineStaging-1.9.4
|
||||||
reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.55
|
reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.55
|
||||||
reactos/dll/win32/hlink # Synced to WineStaging-1.7.55
|
reactos/dll/win32/hlink # Synced to WineStaging-1.7.55
|
||||||
reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.55
|
reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.55
|
||||||
|
|
Loading…
Reference in a new issue