July 2007 - Wine-Commits - list.winehq.org

Alexandre Julliard : kernel32: Always clear the I/ O status block count before calling ntdll functions.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: cd33692fa176bfa5e64cd91d229f547949bdb21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd33692fa176bfa5e64cd91d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 16:20:29 2007 +0200 kernel32: Always clear the I/O status block count before calling ntdll functions. --- dlls/kernel32/file.c | 2 ++ dlls/kernel32/sync.c | 3 +++ dlls/kernel32/vxd.c | 2 ++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 1472893..90280ad 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -376,6 +376,7 @@ BOOL WINAPI ReadFileEx(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, offset.u.HighPart = overlapped->u.s.OffsetHigh; io_status = (PIO_STATUS_BLOCK)overlapped; io_status->u.Status = STATUS_PENDING; + io_status->Information = 0; status = NtReadFile(hFile, NULL, FILE_ReadWriteApc, lpCompletionRoutine, io_status, buffer, bytesToRead, &offset, NULL); @@ -465,6 +466,7 @@ BOOL WINAPI WriteFileEx(HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite, io_status = (PIO_STATUS_BLOCK)overlapped; io_status->u.Status = STATUS_PENDING; + io_status->Information = 0; status = NtWriteFile(hFile, NULL, FILE_ReadWriteApc, lpCompletionRoutine, io_status, buffer, bytesToWrite, &offset, NULL); diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 7b67948..d53ab38 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1332,7 +1332,10 @@ BOOL WINAPI ConnectNamedPipe(HANDLE hPipe, LPOVERLAPPED overlapped) TRACE("(%p,%p)\n", hPipe, overlapped); if(overlapped) + { overlapped->Internal = STATUS_PENDING; + overlapped->InternalHigh = 0; + } status = NtFsControlFile(hPipe, overlapped ? overlapped->hEvent : NULL, NULL, NULL, overlapped ? (IO_STATUS_BLOCK *)overlapped : &status_block, diff --git a/dlls/kernel32/vxd.c b/dlls/kernel32/vxd.c index 106b086..0a4e771 100644 --- a/dlls/kernel32/vxd.c +++ b/dlls/kernel32/vxd.c @@ -351,6 +351,8 @@ BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, if (lpOverlapped) { + lpOverlapped->Internal = STATUS_PENDING; + lpOverlapped->InternalHigh = 0; if (HIWORD(dwIoControlCode) == FILE_DEVICE_FILE_SYSTEM) status = NtFsControlFile(hDevice, lpOverlapped->hEvent, NULL, NULL, (PIO_STATUS_BLOCK)lpOverlapped,

1 0

Alexandre Julliard : server: Merge APC processing into the select request.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: fec5117e9144f7c8b6204f447ddedd6de9735093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec5117e9144f7c8b6204f447… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 16:14:45 2007 +0200 server: Merge APC processing into the select request. This is needed to return the correct value when one of the handles being waited on is set to signaled state by the APC. --- dlls/kernel32/tests/pipe.c | 5 +-- dlls/ntdll/sync.c | 69 +++++++++--------------- include/wine/server_protocol.h | 25 ++------- server/protocol.def | 15 ++---- server/request.h | 2 - server/thread.c | 114 +++++++++++++++++++++------------------- server/trace.c | 38 +++++++------ 7 files changed, 115 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fec5117e9144f7c8b6204…

1 0

Rob Shearman : rpcrt4: Never allocate memory for the discriminant in union_arm_unmarshall as the memory is part of the union and has already been allocated .
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 27030599337d3617a1bd14662b6ea6d6ff2e6979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27030599337d3617a1bd14662… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jul 16 15:03:15 2007 +0100 rpcrt4: Never allocate memory for the discriminant in union_arm_unmarshall as the memory is part of the union and has already been allocated. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index dd5a991..26a55b1 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4556,7 +4556,7 @@ static unsigned char *union_arm_unmarshall(PMIDL_STUB_MESSAGE pStubMsg, if((type & 0xff00) == 0x8000) { unsigned char basetype = LOBYTE(type); - return NdrBaseTypeUnmarshall(pStubMsg, ppMemory, &basetype, fMustAlloc); + return NdrBaseTypeUnmarshall(pStubMsg, ppMemory, &basetype, FALSE); } else {

1 0

Rob Shearman : rpcrt4: Even though FC_ENUM16 is an unsigned type, the highest allowable value that can be marshalled is SHRT_MAX, not USHRT_MAX.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 686c0f094cdec400c41f6337748a73d40d0924dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=686c0f094cdec400c41f63377… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jul 16 15:00:59 2007 +0100 rpcrt4: Even though FC_ENUM16 is an unsigned type, the highest allowable value that can be marshalled is SHRT_MAX, not USHRT_MAX. --- dlls/rpcrt4/ndr_marshall.c | 2 +- dlls/rpcrt4/tests/ndr_marshall.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index d8395b8..7ff77e9 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -5354,7 +5354,7 @@ static unsigned char *WINAPI NdrBaseTypeMarshall( break; case RPC_FC_ENUM16: /* only 16-bits on the wire, so do a sanity check */ - if (*(UINT *)pMemory > USHRT_MAX) + if (*(UINT *)pMemory > SHRT_MAX) RpcRaiseException(RPC_X_ENUM_VALUE_OUT_OF_RANGE); ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); *(USHORT *)pStubMsg->Buffer = *(UINT *)pMemory; diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index ec12983..f64c766 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -418,8 +418,9 @@ static void test_simple_types(void) test_pointer_marshal(fmtstr_up_short, &s, 2, wiredata, 6, NULL, 0, "up_short"); test_pointer_marshal(fmtstr_up_ushort, &s, 2, wiredata, 6, NULL, 0, "up_ushort"); - i = s; + i = 0x7fff; *(void**)wiredata = &i; + *(unsigned short*)(wiredata + sizeof(void*)) = i; test_pointer_marshal(fmtstr_up_enum16, &i, 2, wiredata, 6, NULL, 0, "up_enum16"); l = 0xcafebabe;

1 0

Alexandre Julliard : kernel32: Wait in overlapped Read/ WriteFile even when no overlapped structure is passed.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: acb43cfef2c114c4da5c57675379a92bc9cba8f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb43cfef2c114c4da5c57675… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 15:27:53 2007 +0200 kernel32: Wait in overlapped Read/WriteFile even when no overlapped structure is passed. --- dlls/kernel32/file.c | 12 ++++++++++++ dlls/kernel32/tests/pipe.c | 10 ++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index a3d6942..1472893 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -424,6 +424,12 @@ BOOL WINAPI ReadFile( HANDLE hFile, LPVOID buffer, DWORD bytesToRead, status = NtReadFile(hFile, hEvent, NULL, NULL, io_status, buffer, bytesToRead, poffset, NULL); + if (status == STATUS_PENDING && !overlapped) + { + WaitForSingleObject( hFile, INFINITE ); + status = io_status->u.Status; + } + if (status != STATUS_PENDING && bytesRead) *bytesRead = io_status->Information; @@ -510,6 +516,12 @@ BOOL WINAPI WriteFile( HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite, buffer, bytesToWrite); } + if (status == STATUS_PENDING && !overlapped) + { + WaitForSingleObject( hFile, INFINITE ); + status = piosb->u.Status; + } + if (status != STATUS_PENDING && bytesWritten) *bytesWritten = piosb->Information; diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index ccb72ba..2862592 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1293,10 +1293,7 @@ static DWORD CALLBACK overlapped_server(LPVOID arg) /* This should block */ ret = ReadFile(pipe, buf, sizeof(buf), &num, NULL); - if(ret == 0) - todo_wine ok(ret == 1, "ret %d\n", ret); - else - ok(ret == 1, "ret %d\n", ret); + ok(ret == 1, "ret %d\n", ret); DisconnectNamedPipe(pipe); CloseHandle(ol.hEvent); @@ -1322,10 +1319,7 @@ static void test_overlapped(void) Sleep(1); ret = WriteFile(pipe, "x", 1, &num, NULL); - if(ret == 0) - todo_wine ok(ret == 1, "ret %d\n", ret); - else - ok(ret == 1, "ret %d\n", ret); + ok(ret == 1, "ret %d\n", ret); WaitForSingleObject(thread, INFINITE); CloseHandle(pipe);

1 0

Evan Stade : gdiplus: Simplified GdipDrawPath by moving more of the code to the helpers.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 9e88347f4533a67df0b9cb119314b7cf5a8d4a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e88347f4533a67df0b9cb119… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 13 17:51:49 2007 -0700 gdiplus: Simplified GdipDrawPath by moving more of the code to the helpers. --- dlls/gdiplus/graphics.c | 102 ++++++++++++++++++++++------------------------- 1 files changed, 48 insertions(+), 54 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5bfd79a..d28d76a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -466,52 +466,60 @@ static GpStatus draw_poly(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, ERR("Bad bezier points\n"); goto end; } - i += 2; } } - if((types[count - 1] & PathPointTypePathTypeMask) == PathPointTypeBezier){ - ptf = GdipAlloc(4 * sizeof(GpPointF)); - memcpy(ptf, &pt[count-4], 4 * sizeof(GpPointF)); + for(i = 0; i < count; i++){ + pti[i].x = roundr(pt[i].X); + pti[i].y = roundr(pt[i].Y); + } - if(caps){ - if(pen->endcap == LineCapArrowAnchor) - shorten_bezier_amt(ptf, pen->width); + /* If we are drawing caps, go through the points and adjust them accordingly, + * and draw the caps. */ + if(caps){ + switch(types[count - 1] & PathPointTypePathTypeMask){ + case PathPointTypeBezier: + ptf = GdipAlloc(4 * sizeof(GpPointF)); + if(!ptf){ + status = OutOfMemory; + goto end; + } + memcpy(ptf, &pt[count - 4], 4 * sizeof(GpPointF)); - draw_cap(hdc, pen->color, pen->endcap, pen->width, - pt[count - 1].X - (ptf[3].X - ptf[2].X), - pt[count - 1].Y - (ptf[3].Y - ptf[2].Y), - pt[count - 1].X, pt[count - 1].Y); - } - for(i = 0; i < 4; i ++){ - pti[i + count - 4].x = roundr(ptf[i].X); - pti[i + count - 4].y = roundr(ptf[i].Y); - } - for(i = 0; i < count - 4; i ++){ - pti[i].x = roundr(pt[i].X); - pti[i].y = roundr(pt[i].Y); - } - } - else if((types[count - 1] & PathPointTypePathTypeMask) == PathPointTypeLine){ - if(caps){ - if(pen->endcap == LineCapArrowAnchor) - shorten_line_amt(pt[count-2].X, pt[count-2].Y, &x, &y, pen->width); + if(pen->endcap == LineCapArrowAnchor) + shorten_bezier_amt(ptf, pen->width); - draw_cap(hdc, pen->color, pen->endcap, pen->width, pt[count-2].X, - pt[count-2].Y, pt[count - 1].X, pt[count - 1].Y); - } - pti[count - 1].x = roundr(x); - pti[count - 1].y = roundr(y); - for(i = 0; i < count - 1; i ++){ - pti[i].x = roundr(pt[i].X); - pti[i].y = roundr(pt[i].Y); + + draw_cap(hdc, pen->color, pen->endcap, pen->width, + pt[count - 1].X - (ptf[3].X - ptf[2].X), + pt[count - 1].Y - (ptf[3].Y - ptf[2].Y), + pt[count - 1].X, pt[count - 1].Y); + + for(i = 0; i < 4; i++){ + pti[i + count - 4].x = roundr(ptf[i].X); + pti[i + count - 4].y = roundr(ptf[i].Y); + } + + break; + + case PathPointTypeLine: + if(pen->endcap == LineCapArrowAnchor) + shorten_line_amt(pt[count - 2].X, pt[count - 2].Y, &x, &y, + pen->width); + + draw_cap(hdc, pen->color, pen->endcap, pen->width, pt[count - 2].X, + pt[count - 2].Y, pt[count - 1].X, pt[count - 1].Y); + + pti[count - 1].x = roundr(x); + pti[count - 1].y = roundr(y); + + break; + default: + ERR("Bad path last point\n"); + goto end; } } - else{ - ERR("Bad path last point\n"); - goto end; - } for(i = 0; i < count; i++){ tp[i] = convert_path_point_type(types[i]); @@ -729,7 +737,7 @@ GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { - INT save_state, i, this_fig = 0; + INT save_state; GpStatus retval; if(!pen || !graphics) @@ -739,23 +747,9 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) EndPath(graphics->hdc); SelectObject(graphics->hdc, pen->gdipen); - for(i = 0; i < path->pathdata.Count; i++){ - if(path->pathdata.Types[i] == PathPointTypeStart){ - retval = draw_poly(graphics->hdc, pen, - &path->pathdata.Points[this_fig], - &path->pathdata.Types[this_fig], i - this_fig, TRUE); - this_fig = i; + retval = draw_poly(graphics->hdc, pen, path->pathdata.Points, + path->pathdata.Types, path->pathdata.Count, TRUE); - if(retval != Ok) - goto end; - } - } - - retval = draw_poly(graphics->hdc, pen, &path->pathdata.Points[this_fig], - &path->pathdata.Types[this_fig], path->pathdata.Count - this_fig, - TRUE); - -end: RestoreDC(graphics->hdc, save_state); return retval;

1 0

Evan Stade : gdiplus: Added GdipFillPath.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: d362b58ded69e08ae4ee20d21b238889b5f3ee0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d362b58ded69e08ae4ee20d21… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 13 20:19:46 2007 -0700 gdiplus: Added GdipFillPath. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 32 ++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3c6f140..b5e0b03 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -208,7 +208,7 @@ @ stub GdipFillClosedCurveI @ stub GdipFillEllipse @ stub GdipFillEllipseI -@ stub GdipFillPath +@ stdcall GdipFillPath(ptr ptr ptr) @ stdcall GdipFillPie(ptr ptr long long long long long long) @ stub GdipFillPieI @ stub GdipFillPolygon2 diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d28d76a..6123b69 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -785,6 +785,38 @@ GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, return Ok; } +GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) +{ + INT save_state; + GpStatus retval; + + if(!brush || !graphics || !path) + return InvalidParameter; + + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, brush->gdibrush); + SetPolyFillMode(graphics->hdc, (path->fill == FillModeAlternate ? ALTERNATE + : WINDING)); + + BeginPath(graphics->hdc); + retval = draw_poly(graphics->hdc, NULL, path->pathdata.Points, + path->pathdata.Types, path->pathdata.Count, FALSE); + + if(retval != Ok) + goto end; + + EndPath(graphics->hdc); + FillPath(graphics->hdc); + + retval = Ok; + +end: + RestoreDC(graphics->hdc, save_state); + + return retval; +} + GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 7f2113d..3bda290 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -44,6 +44,7 @@ GpStatus WINGDIPAPI GdipDrawLines(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipDrawPath(GpGraphics*,GpPen*,GpPath*); GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); +GpStatus WINGDIPAPI GdipFillPath(GpGraphics*,GpBrush*,GpPath*); GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*);

1 0

Evan Stade : gdiplus: Added GpGraphics save/restore tests.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: d13e1ba0e826a3acd59497978c98c150b24b8532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d13e1ba0e826a3acd59497978… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 13 17:51:45 2007 -0700 gdiplus: Added GpGraphics save/restore tests. --- dlls/gdiplus/tests/graphics.c | 170 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 170 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 93d419c..17f0f85 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -24,6 +24,7 @@ #include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define TABLE_LEN (23) static void test_constructor_destructor() { @@ -51,6 +52,174 @@ static void test_constructor_destructor() ReleaseDC(0, hdc); } +typedef struct node{ + GraphicsState data; + struct node * next; +} node; + +/* Linked list prepend function. */ +static void log_state(GraphicsState data, node ** log) +{ + node * new_entry = HeapAlloc(GetProcessHeap(), 0, sizeof(node)); + + new_entry->data = data; + new_entry->next = *log; + *log = new_entry; +} + +/* Checks if there are duplicates in the list, and frees it. */ +static void check_no_duplicates(node * log) +{ + INT dups = 0; + node * temp = NULL; + + if(!log) + goto end; + + do{ + HeapFree(GetProcessHeap(), 0, temp); + temp = log; + while((temp = temp->next)) + if(log->data == temp->data) + dups++; + + }while((log = log->next)); + + HeapFree(GetProcessHeap(), 0, temp); + +end: + expect(0, dups); +} + +static void test_save_restore() +{ + GpStatus stat; + GraphicsState state_a, state_b, state_c; + InterpolationMode mode; + GpGraphics *graphics1, *graphics2; + node * state_log = NULL; + HDC hdc = GetDC(0); + + /* Invalid saving. */ + GdipCreateFromHDC(hdc, &graphics1); + stat = GdipSaveGraphics(graphics1, NULL); + expect(InvalidParameter, stat); + stat = GdipSaveGraphics(NULL, &state_a); + expect(InvalidParameter, stat); + GdipDeleteGraphics(graphics1); + + log_state(state_a, &state_log); + + /* Basic save/restore. */ + GdipCreateFromHDC(hdc, &graphics1); + GdipSetInterpolationMode(graphics1, InterpolationModeBilinear); + stat = GdipSaveGraphics(graphics1, &state_a); + todo_wine + expect(Ok, stat); + GdipSetInterpolationMode(graphics1, InterpolationModeBicubic); + stat = GdipRestoreGraphics(graphics1, state_a); + todo_wine + expect(Ok, stat); + GdipGetInterpolationMode(graphics1, &mode); + todo_wine + expect(InterpolationModeBilinear, mode); + GdipDeleteGraphics(graphics1); + + log_state(state_a, &state_log); + + /* Restoring garbage doesn't affect saves. */ + GdipCreateFromHDC(hdc, &graphics1); + GdipSetInterpolationMode(graphics1, InterpolationModeBilinear); + GdipSaveGraphics(graphics1, &state_a); + GdipSetInterpolationMode(graphics1, InterpolationModeBicubic); + GdipSaveGraphics(graphics1, &state_b); + GdipSetInterpolationMode(graphics1, InterpolationModeNearestNeighbor); + stat = GdipRestoreGraphics(graphics1, 0xdeadbeef); + todo_wine + expect(Ok, stat); + GdipRestoreGraphics(graphics1, state_b); + GdipGetInterpolationMode(graphics1, &mode); + todo_wine + expect(InterpolationModeBicubic, mode); + GdipRestoreGraphics(graphics1, state_a); + GdipGetInterpolationMode(graphics1, &mode); + todo_wine + expect(InterpolationModeBilinear, mode); + GdipDeleteGraphics(graphics1); + + log_state(state_a, &state_log); + log_state(state_b, &state_log); + + /* Restoring older state invalidates newer saves (but not older saves). */ + GdipCreateFromHDC(hdc, &graphics1); + GdipSetInterpolationMode(graphics1, InterpolationModeBilinear); + GdipSaveGraphics(graphics1, &state_a); + GdipSetInterpolationMode(graphics1, InterpolationModeBicubic); + GdipSaveGraphics(graphics1, &state_b); + GdipSetInterpolationMode(graphics1, InterpolationModeNearestNeighbor); + GdipSaveGraphics(graphics1, &state_c); + GdipSetInterpolationMode(graphics1, InterpolationModeHighQualityBilinear); + GdipRestoreGraphics(graphics1, state_b); + GdipGetInterpolationMode(graphics1, &mode); + todo_wine + expect(InterpolationModeBicubic, mode); + GdipRestoreGraphics(graphics1, state_c); + GdipGetInterpolationMode(graphics1, &mode); + todo_wine + expect(InterpolationModeBicubic, mode); + GdipRestoreGraphics(graphics1, state_a); + GdipGetInterpolationMode(graphics1, &mode); + todo_wine + expect(InterpolationModeBilinear, mode); + GdipDeleteGraphics(graphics1); + + log_state(state_a, &state_log); + log_state(state_b, &state_log); + log_state(state_c, &state_log); + + /* Restoring older save from one graphics object does not invalidate + * newer save from other graphics object. */ + GdipCreateFromHDC(hdc, &graphics1); + GdipCreateFromHDC(hdc, &graphics2); + GdipSetInterpolationMode(graphics1, InterpolationModeBilinear); + GdipSaveGraphics(graphics1, &state_a); + GdipSetInterpolationMode(graphics2, InterpolationModeBicubic); + GdipSaveGraphics(graphics2, &state_b); + GdipSetInterpolationMode(graphics1, InterpolationModeNearestNeighbor); + GdipSetInterpolationMode(graphics2, InterpolationModeNearestNeighbor); + GdipRestoreGraphics(graphics1, state_a); + GdipGetInterpolationMode(graphics1, &mode); + todo_wine + expect(InterpolationModeBilinear, mode); + GdipRestoreGraphics(graphics2, state_b); + GdipGetInterpolationMode(graphics2, &mode); + todo_wine + expect(InterpolationModeBicubic, mode); + GdipDeleteGraphics(graphics1); + GdipDeleteGraphics(graphics2); + + /* You can't restore a state to a graphics object that didn't save it. */ + GdipCreateFromHDC(hdc, &graphics1); + GdipCreateFromHDC(hdc, &graphics2); + GdipSetInterpolationMode(graphics1, InterpolationModeBilinear); + GdipSaveGraphics(graphics1, &state_a); + GdipSetInterpolationMode(graphics1, InterpolationModeNearestNeighbor); + GdipSetInterpolationMode(graphics2, InterpolationModeNearestNeighbor); + GdipRestoreGraphics(graphics2, state_a); + GdipGetInterpolationMode(graphics2, &mode); + expect(InterpolationModeNearestNeighbor, mode); + GdipDeleteGraphics(graphics1); + GdipDeleteGraphics(graphics2); + + log_state(state_a, &state_log); + + /* The same state value should never be returned twice. */ + todo_wine + check_no_duplicates(state_log); + + ReleaseDC(0, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -64,6 +233,7 @@ START_TEST(graphics) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_constructor_destructor(); + test_save_restore(); GdiplusShutdown(gdiplusToken); }

1 0

Evan Stade : gdiplus: Constructor tests for GpGraphics.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 05a7cef855331d8653ed528d88bfa26b50273ca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a7cef855331d8653ed528d8… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 13 17:51:41 2007 -0700 gdiplus: Constructor tests for GpGraphics. --- dlls/gdiplus/tests/Makefile.in | 3 +- dlls/gdiplus/tests/graphics.c | 69 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index 9eb9e51..421bd4e 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -3,10 +3,11 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = gdiplus.dll -IMPORTS = gdiplus kernel32 +IMPORTS = gdiplus user32 gdi32 kernel32 CTESTS = \ brush.c \ + graphics.c \ graphicspath.c \ matrix.c \ pen.c diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c new file mode 100644 index 0000000..93d419c --- /dev/null +++ b/dlls/gdiplus/tests/graphics.c @@ -0,0 +1,69 @@ +/* + * Unit test suite for graphics objects + * + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windows.h" +#include "gdiplus.h" +#include "wingdi.h" +#include "wine/test.h" + +#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) + +static void test_constructor_destructor() +{ + GpStatus stat; + GpGraphics *graphics = NULL; + HDC hdc = GetDC(0); + + stat = GdipCreateFromHDC(NULL, &graphics); + expect(OutOfMemory, stat); + stat = GdipDeleteGraphics(graphics); + expect(InvalidParameter, stat); + + stat = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, stat); + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipCreateFromHWND(NULL, &graphics); + expect(Ok, stat); + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDeleteGraphics(NULL); + expect(InvalidParameter, stat); + ReleaseDC(0, hdc); +} + +START_TEST(graphics) +{ + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + + test_constructor_destructor(); + + GdiplusShutdown(gdiplusToken); +}

1 0

Evan Stade : gdiplus: GdipSaveGraphics/GdipRestoreGraphics stubs.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: c760668cabb5a9f17a728bbfdb9fbb838a1e7a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c760668cabb5a9f17a728bbfd… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 13 17:51:37 2007 -0700 gdiplus: GdipSaveGraphics/GdipRestoreGraphics stubs. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 20 ++++++++++++++++++++ include/gdiplusenums.h | 2 ++ include/gdiplusflat.h | 2 ++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4403a2f..3c6f140 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -463,7 +463,7 @@ @ stub GdipResetPenTransform @ stub GdipResetTextureTransform @ stub GdipResetWorldTransform -@ stub GdipRestoreGraphics +@ stdcall GdipRestoreGraphics(ptr long) @ stub GdipReversePath @ stub GdipRotateLineTransform @ stub GdipRotateMatrix @@ -473,7 +473,7 @@ @ stub GdipRotateWorldTransform @ stub GdipSaveAdd @ stub GdipSaveAddImage -@ stub GdipSaveGraphics +@ stdcall GdipSaveGraphics(ptr ptr) @ stub GdipSaveImageToFile @ stub GdipSaveImageToStream @ stub GdipScaleLineTransform diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a725804..5bfd79a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -848,6 +848,26 @@ GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics *graphics, SmoothingMode *mo return Ok; } +GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics *graphics, GraphicsState state) +{ + if(!graphics) + return InvalidParameter; + + FIXME("graphics state not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) +{ + if(!graphics || !state) + return InvalidParameter; + + FIXME("graphics state not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics *graphics, CompositingQuality quality) { diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 10ed54f..74f9c02 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -19,6 +19,8 @@ #ifndef _GDIPLUSENUMS_H #define _GDIPLUSENUMS_H +typedef UINT GraphicsState; + enum Unit { UnitWorld = 0, diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 2c3c617..7f2113d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -49,6 +49,8 @@ GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*); GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*); GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); +GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState); +GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*); GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics*,CompositingQuality); GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics*,InterpolationMode); GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics*,PixelOffsetMode);

1 0