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

Andrew Nguyen : ntdll: Fix the status code for ProcessDebugObjectHandle class in NtQueryInformationProcess when the debugger is absent .
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: d7956bab541fde38f4b3f5011b209fa7d9989c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7956bab541fde38f4b3f5011… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jul 27 06:15:35 2010 -0500 ntdll: Fix the status code for ProcessDebugObjectHandle class in NtQueryInformationProcess when the debugger is absent. --- dlls/ntdll/process.c | 5 +- dlls/ntdll/tests/info.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 104 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 6fdceae..f331429 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -291,8 +291,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( } break; case ProcessDebugPort: - /* "These are not the debuggers you are looking for." * - * set it to 0 aka "no debugger" to satisfy copy protections */ len = sizeof(DWORD_PTR); if (ProcessInformationLength == len) { @@ -327,7 +325,10 @@ NTSTATUS WINAPI NtQueryInformationProcess( else if (!ProcessHandle) ret = STATUS_INVALID_HANDLE; else + { memset(ProcessInformation, 0, ProcessInformationLength); + ret = STATUS_PORT_NOT_SET; + } } else ret = STATUS_INFO_LENGTH_MISMATCH; diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 13c29f8..a56bcd1 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -920,6 +920,102 @@ static void test_query_process_image_file_name(void) HeapFree(GetProcessHeap(), 0, file_nameA); } +static void test_query_process_debug_object_handle(int argc, char **argv) +{ + char cmdline[MAX_PATH]; + STARTUPINFO si = {0}; + PROCESS_INFORMATION pi; + BOOL ret; + HANDLE debug_object; + NTSTATUS status; + + sprintf(cmdline, "%s %s %s", argv[0], argv[1], "debuggee"); + + si.cb = sizeof(si); + ret = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, + NULL, &si, &pi); + ok(ret, "CreateProcess failed with last error %u\n", GetLastError()); + if (!ret) return; + + status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL, + 0, NULL); + if (status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED) + { + win_skip("ProcessDebugObjectHandle is not supported\n"); + return; + } + ok(status == STATUS_INFO_LENGTH_MISMATCH, + "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n", + status); + + status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL, + sizeof(debug_object), NULL); + ok(status == STATUS_INVALID_HANDLE || + status == STATUS_ACCESS_VIOLATION, /* XP */ + "Expected NtQueryInformationProcess to return STATUS_INVALID_HANDLE, got 0x%08x\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), + ProcessDebugObjectHandle, NULL, sizeof(debug_object), NULL); + ok(status == STATUS_ACCESS_VIOLATION, + "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08x\n", status); + + status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle, + &debug_object, sizeof(debug_object), NULL); + ok(status == STATUS_INVALID_HANDLE, + "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08x\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), + ProcessDebugObjectHandle, &debug_object, + sizeof(debug_object) - 1, NULL); + ok(status == STATUS_INFO_LENGTH_MISMATCH, + "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), + ProcessDebugObjectHandle, &debug_object, + sizeof(debug_object) + 1, NULL); + ok(status == STATUS_INFO_LENGTH_MISMATCH, + "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n", status); + + debug_object = (HANDLE)0xdeadbeef; + status = pNtQueryInformationProcess(GetCurrentProcess(), + ProcessDebugObjectHandle, &debug_object, + sizeof(debug_object), NULL); + ok(status == STATUS_PORT_NOT_SET, + "Expected NtQueryInformationProcess to return STATUS_PORT_NOT_SET, got 0x%08x\n", status); + ok(debug_object == NULL || + broken(debug_object == (HANDLE)0xdeadbeef), /* Wow64 */ + "Expected debug object handle to be NULL, got %p\n", debug_object); + + debug_object = (HANDLE)0xdeadbeef; + status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugObjectHandle, + &debug_object, sizeof(debug_object), NULL); + todo_wine + ok(status == STATUS_SUCCESS, + "Expected NtQueryInformationProcess to return STATUS_SUCCESS, got 0x%08x\n", status); + todo_wine + ok(debug_object != NULL, + "Expected debug object handle to be non-NULL, got %p\n", debug_object); + + for (;;) + { + DEBUG_EVENT ev; + + ret = WaitForDebugEvent(&ev, INFINITE); + ok(ret, "WaitForDebugEvent failed with last error %u\n", GetLastError()); + if (!ret) break; + + if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; + + ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); + ok(ret, "ContinueDebugEvent failed with last error %u\n", GetLastError()); + if (!ret) break; + } + + ret = CloseHandle(pi.hThread); + ok(ret, "CloseHandle failed with last error %u\n", GetLastError()); + ret = CloseHandle(pi.hProcess); + ok(ret, "CloseHandle failed with last error %u\n", GetLastError()); +} static void test_readvirtualmemory(void) { @@ -1202,10 +1298,14 @@ START_TEST(info) trace("Starting test_query_process_handlecount()\n"); test_query_process_handlecount(); - /* 27 ProcessImageFileName */ + /* 0x1B ProcessImageFileName */ trace("Starting test_query_process_image_file_name()\n"); test_query_process_image_file_name(); + /* 0x1E ProcessDebugObjectHandle */ + trace("Starting test_query_process_debug_object_handle()\n"); + test_query_process_debug_object_handle(argc, argv); + /* belongs into it's own file */ trace("Starting test_readvirtualmemory()\n"); test_readvirtualmemory();

1 0

Piotr Caban : msvcp90: Added 64-bit exports.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: 3ba830446d7549d061a6c4c984e86dbae8976cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba830446d7549d061a6c4c98… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 27 02:44:18 2010 +0200 msvcp90: Added 64-bit exports. --- dlls/msvcp90/msvcp90.spec | 7855 ++++++++++++++++++++++++++++++--------------- dlls/msvcp90/tests/misc.c | 6 +- 2 files changed, 5242 insertions(+), 2619 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ba830446d7549d061a6c…

1 0

Maarten Lankhorst : quartz: Add support for renderer methods to MediaSeekingPassThru.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: c9ce21ed7e190a537327bc3b34af354af5c7501c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ce21ed7e190a537327bc3b3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat May 22 15:19:38 2010 +0200 quartz: Add support for renderer methods to MediaSeekingPassThru. --- dlls/quartz/control.c | 51 ++++++++++++++++++++++++++++++++++++++++- dlls/quartz/control_private.h | 4 +++ 2 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index a7727d9..84e7dd7 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -42,6 +42,9 @@ typedef struct PassThruImpl { BOOL bUnkOuterValid; BOOL bAggregatable; BOOL renderer; + CRITICAL_SECTION time_cs; + BOOL timevalid; + REFERENCE_TIME time_earliest; } PassThruImpl; static HRESULT WINAPI SeekInner_QueryInterface(IUnknown * iface, @@ -90,6 +93,8 @@ static ULONG WINAPI SeekInner_Release(IUnknown * iface) { if (ref == 0) { + This->time_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->time_cs); CoTaskMemFree(This); } return ref; @@ -213,6 +218,9 @@ HRESULT SeekingPassThru_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->IMediaSeeking_vtbl = &IMediaSeekingPassThru_Vtbl; fimpl->ref = 1; fimpl->pin = NULL; + fimpl->timevalid = 0; + InitializeCriticalSection(&fimpl->time_cs); + fimpl->time_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PassThruImpl.time_cs"); return S_OK; } @@ -854,8 +862,20 @@ static HRESULT WINAPI MediaSeekingPassThru_GetCurrentPosition(IMediaSeeking * if { ICOM_THIS_MULTI(PassThruImpl, IMediaSeeking_vtbl, iface); IMediaSeeking *seek; - HRESULT hr; + HRESULT hr = S_OK; TRACE("(%p/%p)->(%p)\n", iface, This, pCurrent); + if (!pCurrent) + return E_POINTER; + EnterCriticalSection(&This->time_cs); + if (This->timevalid) + *pCurrent = This->time_earliest; + else + hr = E_FAIL; + LeaveCriticalSection(&This->time_cs); + if (SUCCEEDED(hr)) { + hr = IMediaSeeking_ConvertTimeFormat(iface, pCurrent, NULL, *pCurrent, &TIME_FORMAT_MEDIA_TIME); + return hr; + } hr = get_connected(This, &seek); if (SUCCEEDED(hr)) { hr = IMediaSeeking_GetCurrentPosition(seek, pCurrent); @@ -962,6 +982,35 @@ static HRESULT WINAPI MediaSeekingPassThru_GetPreroll(IMediaSeeking * iface, LON return hr; } +void MediaSeekingPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start) { + ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); + EnterCriticalSection(&This->time_cs); + This->time_earliest = start; + This->timevalid = 1; + LeaveCriticalSection(&This->time_cs); +} + +void MediaSeekingPassThru_ResetMediaTime(IUnknown *iface) { + ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); + EnterCriticalSection(&This->time_cs); + This->timevalid = 0; + LeaveCriticalSection(&This->time_cs); +} + +void MediaSeekingPassThru_EOS(IUnknown *iface) { + ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); + REFERENCE_TIME time; + HRESULT hr; + hr = IMediaSeeking_GetStopPosition((IMediaSeeking*)&This->IMediaSeeking_vtbl, &time); + EnterCriticalSection(&This->time_cs); + if (SUCCEEDED(hr)) { + This->timevalid = 1; + This->time_earliest = time; + } else + This->timevalid = 0; + LeaveCriticalSection(&This->time_cs); +} + static const IMediaSeekingVtbl IMediaSeekingPassThru_Vtbl = { MediaSeekingPassThru_QueryInterface, diff --git a/dlls/quartz/control_private.h b/dlls/quartz/control_private.h index b5e3997..a3ca7c7 100644 --- a/dlls/quartz/control_private.h +++ b/dlls/quartz/control_private.h @@ -59,4 +59,8 @@ HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate); HRESULT WINAPI MediaSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate); HRESULT WINAPI MediaSeekingImpl_GetPreroll(IMediaSeeking * iface, LONGLONG * pPreroll); +void MediaSeekingPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); +void MediaSeekingPassThru_ResetMediaTime(IUnknown *iface); +void MediaSeekingPassThru_EOS(IUnknown *iface); + #endif /*QUARTZ_CONTROL_H*/

1 0

Austin English : dmusic: use a previously unused variable.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: fa7b5b05e2edc6837f1220cad85caab0f5de7aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa7b5b05e2edc6837f1220cad… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 27 01:36:03 2010 -0500 dmusic: use a previously unused variable. --- dlls/dmusic/port.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 021f1e2..6cb5634 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -382,6 +382,11 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, obj->pDirectSound = NULL; obj->pLatencyClock = NULL; hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&obj->pLatencyClock, NULL); + if(hr != S_OK) + { + HeapFree(GetProcessHeap(), 0, obj); + return hr; + } if(0) {

1 0

André Hentschel : kernel32: Spelling fix in a comment.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: 8d371d88d18fc3384e26633c864c60e8f517861c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d371d88d18fc3384e26633c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 26 19:44:35 2010 +0200 kernel32: Spelling fix in a comment. --- dlls/kernel32/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index bdfa00b..e20f8fb 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1273,7 +1273,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) /* FIXME: should do something for other systems */ GetSystemInfo(&si); lpmemex->ullTotalVirtual = (ULONG_PTR)si.lpMaximumApplicationAddress-(ULONG_PTR)si.lpMinimumApplicationAddress; - /* FIXME: we should track down all the already allocated VM pages and substract them, for now arbitrarily remove 64KB so that it matches NT */ + /* FIXME: we should track down all the already allocated VM pages and subtract them, for now arbitrarily remove 64KB so that it matches NT */ lpmemex->ullAvailVirtual = lpmemex->ullTotalVirtual-64*1024; /* MSDN says about AvailExtendedVirtual: Size of unreserved and uncommitted

1 0

Wade Gobel : gdiplus: Implemented GdipFillClosedCurve and GdipFillClosedCurveI.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: cceb3dc77ae62f7e21175e6942ac7e62eba06a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cceb3dc77ae62f7e21175e694… Author: Wade Gobel <wgobel(a)codeweavers.com> Date: Mon Jul 26 09:21:50 2010 -0500 gdiplus: Implemented GdipFillClosedCurve and GdipFillClosedCurveI. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/graphics.c | 16 +++++ dlls/gdiplus/tests/graphics.c | 139 +++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 4 files changed, 159 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 06aa0cb..3201d32 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -215,8 +215,8 @@ @ stub GdipEnumerateMetafileSrcRectDestRectI @ stdcall GdipFillClosedCurve2(ptr ptr ptr long long long) @ stdcall GdipFillClosedCurve2I(ptr ptr ptr long long long) -@ stub GdipFillClosedCurve -@ stub GdipFillClosedCurveI +@ stdcall GdipFillClosedCurve(ptr ptr ptr long) +@ stdcall GdipFillClosedCurveI(ptr ptr ptr long) @ stdcall GdipFillEllipse(ptr ptr long long long long) @ stdcall GdipFillEllipseI(ptr ptr long long long long) @ stdcall GdipFillPath(ptr ptr ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f2d7db6..ada2c58 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2729,6 +2729,22 @@ GpStatus WINGDIPAPI GdipFillClosedCurve2I(GpGraphics *graphics, GpBrush *brush, return stat; } +GpStatus WINGDIPAPI GdipFillClosedCurve(GpGraphics *graphics, GpBrush *brush, + GDIPCONST GpPointF *points, INT count) +{ + TRACE("(%p, %p, %p, %d)\n", graphics, brush, points, count); + return GdipFillClosedCurve2(graphics, brush, points, count, + 0.5f, FillModeAlternate); +} + +GpStatus WINGDIPAPI GdipFillClosedCurveI(GpGraphics *graphics, GpBrush *brush, + GDIPCONST GpPoint *points, INT count) +{ + TRACE("(%p, %p, %p, %d)\n", graphics, brush, points, count); + return GdipFillClosedCurve2I(graphics, brush, points, count, + 0.5f, FillModeAlternate); +} + GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height) { diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index c0692c5..441367e 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1180,6 +1180,139 @@ static void test_GdipDrawLinesI(void) ReleaseDC(hwnd, hdc); } +static void test_GdipFillClosedCurve(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpSolidFill *brush = NULL; + HDC hdc = GetDC( hwnd ); + GpPointF points[3]; + + points[0].X = 0; + points[0].Y = 0; + + points[1].X = 40; + points[1].Y = 20; + + points[2].X = 10; + points[2].Y = 40; + + /* make a graphics object and brush object */ + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + GdipCreateSolidFill((ARGB)0xdeadbeef, &brush); + + /* InvalidParameter cases: null graphics, null brush, null points */ + status = GdipFillClosedCurve(NULL, NULL, NULL, 3); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve(graphics, NULL, NULL, 3); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve(NULL, (GpBrush*)brush, NULL, 3); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve(NULL, NULL, points, 3); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve(graphics, (GpBrush*)brush, NULL, 3); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve(graphics, NULL, points, 3); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve(NULL, (GpBrush*)brush, points, 3); + expect(InvalidParameter, status); + + /* InvalidParameter cases: invalid count */ + status = GdipFillClosedCurve(graphics, (GpBrush*)brush, points, -1); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve(graphics, (GpBrush*)brush, points, 0); + expect(InvalidParameter, status); + + /* Valid test cases */ + status = GdipFillClosedCurve(graphics, (GpBrush*)brush, points, 1); + expect(Ok, status); + + status = GdipFillClosedCurve(graphics, (GpBrush*)brush, points, 2); + expect(Ok, status); + + status = GdipFillClosedCurve(graphics, (GpBrush*)brush, points, 3); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + GdipDeleteBrush((GpBrush*)brush); + + ReleaseDC(hwnd, hdc); +} + +static void test_GdipFillClosedCurveI(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpSolidFill *brush = NULL; + HDC hdc = GetDC( hwnd ); + GpPoint points[3]; + + points[0].X = 0; + points[0].Y = 0; + + points[1].X = 40; + points[1].Y = 20; + + points[2].X = 10; + points[2].Y = 40; + + /* make a graphics object and brush object */ + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + GdipCreateSolidFill((ARGB)0xdeadbeef, &brush); + + /* InvalidParameter cases: null graphics, null brush */ + /* Note: GdipFillClosedCurveI and GdipFillClosedCurve2I hang in Windows + when points == NULL, so don't test this condition */ + status = GdipFillClosedCurveI(NULL, NULL, points, 3); + expect(InvalidParameter, status); + + status = GdipFillClosedCurveI(graphics, NULL, points, 3); + expect(InvalidParameter, status); + + status = GdipFillClosedCurveI(NULL, (GpBrush*)brush, points, 3); + expect(InvalidParameter, status); + + /* InvalidParameter cases: invalid count */ + status = GdipFillClosedCurveI(graphics, (GpBrush*)brush, points, 0); + expect(InvalidParameter, status); + + /* OutOfMemory cases: large (unsigned) int */ + status = GdipFillClosedCurveI(graphics, (GpBrush*)brush, points, -1); + expect(OutOfMemory, status); + + /* Valid test cases */ + status = GdipFillClosedCurveI(graphics, (GpBrush*)brush, points, 1); + expect(Ok, status); + + status = GdipFillClosedCurveI(graphics, (GpBrush*)brush, points, 2); + expect(Ok, status); + + status = GdipFillClosedCurveI(graphics, (GpBrush*)brush, points, 3); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + GdipDeleteBrush((GpBrush*)brush); + + ReleaseDC(hwnd, hdc); +} + static void test_Get_Release_DC(void) { GpStatus status; @@ -1345,6 +1478,10 @@ static void test_Get_Release_DC(void) expect(ObjectBusy, status); status = Ok; status = GdipFillClosedCurve2I(graphics, (GpBrush*)brush, pt, 5, 1.0, FillModeAlternate); expect(ObjectBusy, status); status = Ok; + status = GdipFillClosedCurve(graphics, (GpBrush*)brush, ptf, 5); + expect(ObjectBusy, status); status = Ok; + status = GdipFillClosedCurveI(graphics, (GpBrush*)brush, pt, 5); + expect(ObjectBusy, status); status = Ok; status = GdipFillEllipse(graphics, (GpBrush*)brush, 0.0, 0.0, 100.0, 100.0); expect(ObjectBusy, status); status = Ok; status = GdipFillEllipseI(graphics, (GpBrush*)brush, 0, 0, 100, 100); @@ -2811,6 +2948,8 @@ START_TEST(graphics) test_GdipDrawCurve3I(); test_GdipDrawLineI(); test_GdipDrawLinesI(); + test_GdipFillClosedCurve(); + test_GdipFillClosedCurveI(); test_GdipDrawString(); test_GdipGetNearestColor(); test_GdipGetVisibleClipBounds(); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8312e16..c361d10 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -210,6 +210,8 @@ GpStatus WINGDIPAPI GdipFillClosedCurve2(GpGraphics*,GpBrush*,GDIPCONST GpPointF REAL,GpFillMode); GpStatus WINGDIPAPI GdipFillClosedCurve2I(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT, REAL,GpFillMode); +GpStatus WINGDIPAPI GdipFillClosedCurve(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipFillClosedCurveI(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics*,GpBrush*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipFillPath(GpGraphics*,GpBrush*,GpPath*);

1 0

Wade Gobel : gdiplus: Fixed GdipFillClosedCurve2 and GdipFillClosedCurve2I in the cases that count <= 1.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: f4e2af65c538743376ddc5d900e6f9f5094528b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e2af65c538743376ddc5d90… Author: Wade Gobel <wgobel(a)codeweavers.com> Date: Mon Jul 26 09:21:40 2010 -0500 gdiplus: Fixed GdipFillClosedCurve2 and GdipFillClosedCurve2I in the cases that count <= 1. --- dlls/gdiplus/graphics.c | 8 ++- dlls/gdiplus/tests/graphics.c | 135 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2d512ab..f2d7db6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2673,6 +2673,9 @@ GpStatus WINGDIPAPI GdipFillClosedCurve2(GpGraphics *graphics, GpBrush *brush, if(graphics->busy) return ObjectBusy; + if(count == 1) /* Do nothing */ + return Ok; + stat = GdipCreatePath(fill, &path); if(stat != Ok) return stat; @@ -2704,9 +2707,12 @@ GpStatus WINGDIPAPI GdipFillClosedCurve2I(GpGraphics *graphics, GpBrush *brush, TRACE("(%p, %p, %p, %d, %.2f, %d)\n", graphics, brush, points, count, tension, fill); - if(!points || count <= 0) + if(!points || count == 0) return InvalidParameter; + if(count == 1) /* Do nothing */ + return Ok; + ptf = GdipAlloc(sizeof(GpPointF)*count); if(!ptf) return OutOfMemory; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 16f0d31..c0692c5 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -230,6 +230,139 @@ static void test_save_restore(void) ReleaseDC(hwnd, hdc); } +static void test_GdipFillClosedCurve2(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpSolidFill *brush = NULL; + HDC hdc = GetDC( hwnd ); + GpPointF points[3]; + + points[0].X = 0; + points[0].Y = 0; + + points[1].X = 40; + points[1].Y = 20; + + points[2].X = 10; + points[2].Y = 40; + + /* make a graphics object and brush object */ + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + GdipCreateSolidFill((ARGB)0xdeadbeef, &brush); + + /* InvalidParameter cases: null graphics, null brush, null points */ + status = GdipFillClosedCurve2(NULL, NULL, NULL, 3, 0.5, FillModeAlternate); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve2(graphics, NULL, NULL, 3, 0.5, FillModeAlternate); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve2(NULL, (GpBrush*)brush, NULL, 3, 0.5, FillModeAlternate); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve2(NULL, NULL, points, 3, 0.5, FillModeAlternate); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve2(graphics, (GpBrush*)brush, NULL, 3, 0.5, FillModeAlternate); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve2(graphics, NULL, points, 3, 0.5, FillModeAlternate); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve2(NULL, (GpBrush*)brush, points, 3, 0.5, FillModeAlternate); + expect(InvalidParameter, status); + + /* InvalidParameter cases: invalid count */ + status = GdipFillClosedCurve2(graphics, (GpBrush*)brush, points, -1, 0.5, FillModeAlternate); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve2(graphics, (GpBrush*)brush, points, 0, 0.5, FillModeAlternate); + expect(InvalidParameter, status); + + /* Valid test cases */ + status = GdipFillClosedCurve2(graphics, (GpBrush*)brush, points, 1, 0.5, FillModeAlternate); + expect(Ok, status); + + status = GdipFillClosedCurve2(graphics, (GpBrush*)brush, points, 2, 0.5, FillModeAlternate); + expect(Ok, status); + + status = GdipFillClosedCurve2(graphics, (GpBrush*)brush, points, 3, 0.5, FillModeAlternate); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + GdipDeleteBrush((GpBrush*)brush); + + ReleaseDC(hwnd, hdc); +} + +static void test_GdipFillClosedCurve2I(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpSolidFill *brush = NULL; + HDC hdc = GetDC( hwnd ); + GpPoint points[3]; + + points[0].X = 0; + points[0].Y = 0; + + points[1].X = 40; + points[1].Y = 20; + + points[2].X = 10; + points[2].Y = 40; + + /* make a graphics object and brush object */ + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + GdipCreateSolidFill((ARGB)0xdeadbeef, &brush); + + /* InvalidParameter cases: null graphics, null brush */ + /* Note: GdipFillClosedCurveI and GdipFillClosedCurve2I hang in Windows + when points == NULL, so don't test this condition */ + status = GdipFillClosedCurve2I(NULL, NULL, points, 3, 0.5, FillModeAlternate); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve2I(graphics, NULL, points, 3, 0.5, FillModeAlternate); + expect(InvalidParameter, status); + + status = GdipFillClosedCurve2I(NULL, (GpBrush*)brush, points, 3, 0.5, FillModeAlternate); + expect(InvalidParameter, status); + + /* InvalidParameter cases: invalid count */ + status = GdipFillClosedCurve2I(graphics, (GpBrush*)brush, points, 0, 0.5, FillModeAlternate); + expect(InvalidParameter, status); + + /* OutOfMemory cases: large (unsigned) int */ + status = GdipFillClosedCurve2I(graphics, (GpBrush*)brush, points, -1, 0.5, FillModeAlternate); + expect(OutOfMemory, status); + + /* Valid test cases */ + status = GdipFillClosedCurve2I(graphics, (GpBrush*)brush, points, 1, 0.5, FillModeAlternate); + expect(Ok, status); + + status = GdipFillClosedCurve2I(graphics, (GpBrush*)brush, points, 2, 0.5, FillModeAlternate); + expect(Ok, status); + + status = GdipFillClosedCurve2I(graphics, (GpBrush*)brush, points, 3, 0.5, FillModeAlternate); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + GdipDeleteBrush((GpBrush*)brush); + + ReleaseDC(hwnd, hdc); +} + static void test_GdipDrawArc(void) { GpStatus status; @@ -2665,6 +2798,8 @@ START_TEST(graphics) test_constructor_destructor(); test_save_restore(); + test_GdipFillClosedCurve2(); + test_GdipFillClosedCurve2I(); test_GdipDrawBezierI(); test_GdipDrawArc(); test_GdipDrawArcI();

1 0

Maarten Lankhorst : quartz: Make it possible to just override IMediaSeeking ::GetCurrentPosition.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: 9c07be439980bdd514b966cf1da85ef00451ae18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c07be439980bdd514b966cf1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 21 21:32:24 2010 +0200 quartz: Make it possible to just override IMediaSeeking::GetCurrentPosition. --- dlls/quartz/control.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index 9a50737..f7c94a7 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -616,8 +616,8 @@ HRESULT WINAPI MediaSeekingImpl_GetPositions(IMediaSeeking * iface, LONGLONG * p TRACE("(%p, %p)\n", pCurrent, pStop); EnterCriticalSection(This->crst); - *pCurrent = This->llCurrent; - *pStop = This->llStop; + IMediaSeeking_GetCurrentPosition(iface, pCurrent); + IMediaSeeking_GetStopPosition(iface, pStop); LeaveCriticalSection(This->crst); return S_OK;

1 0

Igor Paliychuk : taskmgr: Fixed Ukrainian translation.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: aa25221f0e09d036ef57a7cd1479964d79911fce URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa25221f0e09d036ef57a7cd1… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Tue Jul 27 14:53:39 2010 +0300 taskmgr: Fixed Ukrainian translation. --- programs/taskmgr/Uk.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/Uk.rc b/programs/taskmgr/Uk.rc index 7919897..81568c7 100644 --- a/programs/taskmgr/Uk.rc +++ b/programs/taskmgr/Uk.rc @@ -370,7 +370,7 @@ BEGIN CONTROL "&PID (Ідентиф. процесу)",IDC_PID,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,39,91,10 CONTROL "&Використання ЦП",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,50,69,10 + WS_TABSTOP,7,50,71,10 CONTROL "&Час ЦП",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,48,10 CONTROL "&Пам'ять - використання",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX |

1 0

Maarten Lankhorst : quartz: Implement MediaSeekingPassThru.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: 5fbef396078a1b29643070148be4ca1071df128a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fbef396078a1b29643070148… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat May 22 14:04:38 2010 +0200 quartz: Implement MediaSeekingPassThru. --- dlls/quartz/control.c | 230 +++++++++++++++++++++++++++++++----------------- 1 files changed, 148 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fbef396078a1b2964307…

1 0