wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Henri Verbeet : ddrawex/tests: Add some tests for GetSurfaceFromDC().
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: d14b7e6a320a7ab9e837f7bdb936d3a08bf397d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d14b7e6a320a7ab9e837f7bdb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 29 13:31:10 2010 +0200 ddrawex/tests: Add some tests for GetSurfaceFromDC(). --- dlls/ddrawex/tests/surface.c | 154 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 154 insertions(+), 0 deletions(-) diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index 211e8e9..d5a26b5 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -237,6 +237,158 @@ static void SysVidMemTest(void) GetDCTest_main(&ddsd, &ddsd2, dctest_sysvidmem); } +static void test_surface_from_dc3(void) +{ + IDirectDrawSurface3 *surf3; + IDirectDrawSurface *surf1; + IDirectDrawSurface *tmp; + DDSURFACEDESC ddsd; + IDirectDraw3 *dd3; + IDirectDraw *dd1; + HRESULT hr; + HDC dc; + + dd1 = createDD(); + hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw3, (void **)&dd3); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed, hr %#x.\n", hr); + IDirectDraw_Release(dd1); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 64; + ddsd.dwHeight = 64; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + + hr = IDirectDraw3_CreateSurface(dd3, &ddsd, &surf1, NULL); + ok(SUCCEEDED(hr), "CreateSurface failed, hr %#x.\n", hr); + + hr = IDirectDrawSurface3_QueryInterface(surf1, &IID_IDirectDrawSurface, (void **)&surf3); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); + IDirectDrawSurface_Release(surf1); + + hr = IDirectDrawSurface3_GetDC(surf3, &dc); + ok(SUCCEEDED(hr), "GetDC failed, hr %#x.\n", hr); + + hr = IDirectDraw3_GetSurfaceFromDC(dd3, dc, NULL); + ok(hr == E_POINTER, "Expected E_POINTER, got %#x.\n", hr); + + hr = IDirectDraw3_GetSurfaceFromDC(dd3, dc, &tmp); + ok(SUCCEEDED(hr), "GetSurfaceFromDC failed, hr %#x.\n", hr); + ok((IDirectDrawSurface3 *)tmp == surf3, "Expected surface != %p.\n", surf3); + + IUnknown_Release(tmp); + + hr = IDirectDrawSurface3_ReleaseDC(surf3, dc); + ok(SUCCEEDED(hr), "ReleaseDC failed, hr %#x.\n", hr); + + dc = CreateCompatibleDC(NULL); + ok(!!dc, "CreateCompatibleDC failed.\n"); + + tmp = (IDirectDrawSurface *)0xdeadbeef; + hr = IDirectDraw3_GetSurfaceFromDC(dd3, dc, &tmp); + ok(hr == DDERR_NOTFOUND, "Expected DDERR_NOTFOUND, got %#x.\n", hr); + ok(!tmp, "Expected surface NULL, got %p.\n", tmp); + + ok(DeleteDC(dc), "DeleteDC failed.\n"); + + IDirectDrawSurface3_Release(surf3); + IDirectDraw3_Release(dd3); +} + +DEFINE_GUID(guid, 0x38594b23, 0x2311, 0x4332, 0x95, 0xde, 0x2b, 0x0c, 0x61, 0xbf, 0x7b, 0x84); + +static void test_surface_from_dc4(void) +{ + IDirectDrawSurface4 *surf4; + IDirectDrawSurface *surf1; + DDSURFACEDESC2 ddsd2; + IUnknown *tmp, *tmp2; + IDirectDraw4 *dd4; + IDirectDraw *dd1; + DWORD priv, size; + HRESULT hr; + HDC dc; + + dd1 = createDD(); + hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **)&dd4); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed, hr %#x.\n", hr); + IDirectDraw_Release(dd1); + + memset(&ddsd2, 0, sizeof(ddsd2)); + ddsd2.dwSize = sizeof(ddsd2); + ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd2.dwWidth = 64; + ddsd2.dwHeight = 64; + ddsd2.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + + hr = IDirectDraw4_CreateSurface(dd4, &ddsd2, &surf4, NULL); + ok(SUCCEEDED(hr), "CreateSurface failed, hr %#x.\n", hr); + + hr = IDirectDrawSurface4_QueryInterface(surf4, &IID_IDirectDrawSurface, (void **)&surf1); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); + + priv = 0xdeadbeef; + size = sizeof(priv); + hr = IDirectDrawSurface4_SetPrivateData(surf4, &guid, &priv, size, 0); + ok(SUCCEEDED(hr), "SetPrivateData failed, hr %#x.\n", hr); + + priv = 0; + hr = IDirectDrawSurface4_GetPrivateData(surf4, &guid, &priv, &size); + ok(SUCCEEDED(hr), "GetPrivateData failed, hr %#x.\n", hr); + ok(priv == 0xdeadbeef, "Expected private data 0xdeadbeef, got %#x.\n", priv); + + hr = IDirectDrawSurface4_GetDC(surf4, &dc); + ok(SUCCEEDED(hr), "GetDC failed, hr %#x.\n", hr); + + hr = IDirectDraw4_GetSurfaceFromDC(dd4, dc, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %#x.\n", hr); + + hr = IDirectDraw4_GetSurfaceFromDC(dd4, dc, (IDirectDrawSurface4 **)&tmp); + ok(SUCCEEDED(hr), "GetSurfaceFromDC failed, hr %#x.\n", hr); + ok((IDirectDrawSurface4 *)tmp != surf4, "Expected surface != %p.\n", surf4); + + hr = IUnknown_QueryInterface(tmp, &IID_IDirectDrawSurface, (void **)&tmp2); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); + ok(tmp2 == tmp, "Expected %p, got %p.\n", tmp, tmp2); + ok((IDirectDrawSurface *)tmp2 != surf1, "Expected surface != %p.\n", surf1); + IUnknown_Release(tmp2); + + hr = IUnknown_QueryInterface(tmp, &IID_IDirectDrawSurface4, (void **)&tmp2); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); + ok((IDirectDrawSurface4 *)tmp2 != surf4, "Expected surface != %p.\n", surf4); + + priv = 0; + hr = IDirectDrawSurface4_GetPrivateData((IDirectDrawSurface4 *)tmp2, &guid, &priv, &size); + ok(SUCCEEDED(hr), "GetPrivateData failed, hr %#x.\n", hr); + ok(priv == 0xdeadbeef, "Expected private data 0xdeadbeef, got %#x.\n", priv); + IUnknown_Release(tmp2); + + IUnknown_Release(tmp); + + hr = IDirectDrawSurface4_ReleaseDC(surf4, dc); + ok(SUCCEEDED(hr), "ReleaseDC failed, hr %#x.\n", hr); + + dc = CreateCompatibleDC(NULL); + ok(!!dc, "CreateCompatibleDC failed.\n"); + + tmp = (IUnknown *)0xdeadbeef; + hr = IDirectDraw4_GetSurfaceFromDC(dd4, dc, (IDirectDrawSurface4 **)&tmp); + ok(hr == DDERR_NOTFOUND, "Expected DDERR_NOTFOUND, got %#x.\n", hr); + ok(!tmp, "Expected surface NULL, got %p.\n", tmp); + + ok(DeleteDC(dc), "DeleteDC failed.\n"); + + tmp = (IUnknown *)0xdeadbeef; + hr = IDirectDraw4_GetSurfaceFromDC(dd4, NULL, (IDirectDrawSurface4 **)&tmp); + ok(hr == DDERR_NOTFOUND, "Expected DDERR_NOTFOUND, got %#x.\n", hr); + ok(!tmp, "Expected surface NULL, got %p.\n", tmp); + + IDirectDrawSurface_Release(surf1); + IDirectDrawSurface4_Release(surf4); + IDirectDraw4_Release(dd4); +} + START_TEST(surface) { IClassFactory *classfactory = NULL; @@ -261,6 +413,8 @@ START_TEST(surface) GetDCTest(); CapsTest(); SysVidMemTest(); + test_surface_from_dc3(); + test_surface_from_dc4(); if(factory) { ref = IDirectDrawFactory_Release(factory);

1 0

Henri Verbeet : ddrawex: Correctly retrieve the "outer" surface in IDirectDraw3Impl_GetSurfaceFromDC().
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: d38f535c05dc8e41793a97c1ab1311cf2874d58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38f535c05dc8e41793a97c1a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 29 13:31:09 2010 +0200 ddrawex: Correctly retrieve the "outer" surface in IDirectDraw3Impl_GetSurfaceFromDC(). --- dlls/ddrawex/ddraw.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index 8c6b937..353ec8b 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -1333,17 +1333,30 @@ IDirectDraw3Impl_GetSurfaceFromDC(IDirectDraw3 *iface, IDirectDrawSurface **Surface) { IDirectDrawImpl *This = impl_from_dd3(iface); - IDirectDrawSurface4 *surf4; + IDirectDrawSurface4 *surf4, *outer; + IDirectDrawSurface *inner; HRESULT hr; TRACE("(%p)->(%p, %p): Thunking to IDirectDraw4\n", This, hdc, Surface); - hr = IDirectDraw4_GetSurfaceFromDC(dd4_from_impl(This), hdc, &surf4); + if (!Surface) return E_POINTER; + + hr = IDirectDraw4_GetSurfaceFromDC(This->parent, hdc, (IDirectDrawSurface4 **)&inner); if(FAILED(hr)) { *Surface = NULL; return hr; } - IDirectDrawSurface4_QueryInterface(surf4, &IID_IDirectDrawSurface, (void **) Surface); + + hr = IDirectDrawSurface_QueryInterface(inner, &IID_IDirectDrawSurface4, (void **)&surf4); + IDirectDrawSurface_Release(inner); + if (FAILED(hr)) + { + *Surface = NULL; + return hr; + } + + outer = dds_get_outer(surf4); + hr = IDirectDrawSurface4_QueryInterface(outer, &IID_IDirectDrawSurface, (void **)Surface); IDirectDrawSurface4_Release(surf4); return hr; }

1 0

Henri Verbeet : ddrawex: Directly return the ddraw surface in IDirectDraw4Impl_GetSurfaceFromDC().
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 6ae96807c0c0e39d7b17b95b07f6cab645f7770d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae96807c0c0e39d7b17b95b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 29 13:31:08 2010 +0200 ddrawex: Directly return the ddraw surface in IDirectDraw4Impl_GetSurfaceFromDC(). --- dlls/ddrawex/ddraw.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index 4c757ec..8c6b937 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -1320,20 +1320,9 @@ IDirectDraw4Impl_GetSurfaceFromDC(IDirectDraw4 *iface, IDirectDrawSurface4 **Surface) { IDirectDrawImpl *This = impl_from_dd4(iface); - IDirectDrawSurface4 *inner; HRESULT hr; TRACE("(%p)->(%p, %p)\n", This, hdc, Surface); - hr = IDirectDraw4_GetSurfaceFromDC(This->parent,hdc, &inner); - if(SUCCEEDED(hr)) - { - *Surface = dds_get_outer(inner); - IDirectDrawSurface4_AddRef(*Surface); - IDirectDrawSurface4_Release(inner); - } - else - { - *Surface = NULL; - } + hr = IDirectDraw4_GetSurfaceFromDC(This->parent,hdc, Surface); return hr; }

1 0

Henri Verbeet : ntdll: Return a more reasonable value for "Reserved3".
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 7bfe6c4308a2b8bf7f469026027ae61d94ef210b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bfe6c4308a2b8bf7f4690260… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 29 13:31:07 2010 +0200 ntdll: Return a more reasonable value for "Reserved3". The value is based on 64-bit Win 7, the main thing we care about is that it's not 0. --- dlls/ntdll/nt.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 2444fed..b262c1e 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1320,6 +1320,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( memset(&spi, 0 , sizeof(spi)); len = sizeof(spi); + spi.Reserved3 = 0x7fffffff; /* Available paged pool memory? */ + if (Length >= len) { if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION;

1 0

Henri Verbeet : include: Specify some fields of the SYSTEM_PERFORMANCE_INFORMATION structure.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: be73cb70de28d62e88334d04f7f4bceec31a6042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be73cb70de28d62e88334d04f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 29 13:31:06 2010 +0200 include: Specify some fields of the SYSTEM_PERFORMANCE_INFORMATION structure. --- include/winternl.h | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 74 insertions(+), 1 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 2f88cad..39a034b 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1124,8 +1124,81 @@ typedef struct _SYSTEM_CPU_INFORMATION { /* System Information Class 0x02 */ +/* Documented in "Windows NT/2000 Native API Reference" by Gary Nebbett. */ typedef struct _SYSTEM_PERFORMANCE_INFORMATION { - BYTE Reserved1[312]; + LARGE_INTEGER IdleTime; + LARGE_INTEGER ReadTransferCount; + LARGE_INTEGER WriteTransferCount; + LARGE_INTEGER OtherTransferCount; + ULONG ReadOperationCount; + ULONG WriteOperationCount; + ULONG OtherOperationCount; + ULONG AvailablePages; + ULONG TotalCommittedPages; + ULONG TotalCommitLimit; + ULONG PeakCommitment; + ULONG PageFaults; + ULONG WriteCopyFaults; + ULONG TransitionFaults; + ULONG Reserved1; + ULONG DemandZeroFaults; + ULONG PagesRead; + ULONG PageReadIos; + ULONG Reserved2[2]; + ULONG PagefilePagesWritten; + ULONG PagefilePageWriteIos; + ULONG MappedFilePagesWritten; + ULONG MappedFilePageWriteIos; + ULONG PagedPoolUsage; + ULONG NonPagedPoolUsage; + ULONG PagedPoolAllocs; + ULONG PagedPoolFrees; + ULONG NonPagedPoolAllocs; + ULONG NonPagedPoolFrees; + ULONG TotalFreeSystemPtes; + ULONG SystemCodePage; + ULONG TotalSystemDriverPages; + ULONG TotalSystemCodePages; + ULONG SmallNonPagedLookasideListAllocateHits; + ULONG SmallPagedLookasideListAllocateHits; + ULONG Reserved3; + ULONG MmSystemCachePage; + ULONG PagedPoolPage; + ULONG SystemDriverPage; + ULONG FastReadNoWait; + ULONG FastReadWait; + ULONG FastReadResourceMiss; + ULONG FastReadNotPossible; + ULONG FastMdlReadNoWait; + ULONG FastMdlReadWait; + ULONG FastMdlReadResourceMiss; + ULONG FastMdlReadNotPossible; + ULONG MapDataNoWait; + ULONG MapDataWait; + ULONG MapDataNoWaitMiss; + ULONG MapDataWaitMiss; + ULONG PinMappedDataCount; + ULONG PinReadNoWait; + ULONG PinReadWait; + ULONG PinReadNoWaitMiss; + ULONG PinReadWaitMiss; + ULONG CopyReadNoWait; + ULONG CopyReadWait; + ULONG CopyReadNoWaitMiss; + ULONG CopyReadWaitMiss; + ULONG MdlReadNoWait; + ULONG MdlReadWait; + ULONG MdlReadNoWaitMiss; + ULONG MdlReadWaitMiss; + ULONG ReadAheadIos; + ULONG LazyWriteIos; + ULONG LazyWritePages; + ULONG DataFlushes; + ULONG DataPages; + ULONG ContextSwitches; + ULONG FirstLevelTbFills; + ULONG SecondLevelTbFills; + ULONG SystemCalls; } SYSTEM_PERFORMANCE_INFORMATION, *PSYSTEM_PERFORMANCE_INFORMATION; /* System Information Class 0x03 */

1 0

Konstantin Kondratyuk : ole32: Add missed initialization of virtual function table.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: eab89da812856da7b25f02316398d97dbe16052d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab89da812856da7b25f02316… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Mon Mar 29 15:04:02 2010 +0400 ole32: Add missed initialization of virtual function table. --- dlls/ole32/storage32.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index e1ba8a3..9d36820 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4854,6 +4854,7 @@ static StorageInternalImpl* StorageInternalImpl_Construct( * Initialize the virtual function table. */ newStorage->base.lpVtbl = &Storage32InternalImpl_Vtbl; + newStorage->base.pssVtbl = &IPropertySetStorage_Vtbl; newStorage->base.baseVtbl = &StorageInternalImpl_BaseVtbl; newStorage->base.openFlags = (openFlags & ~STGM_CREATE);

1 0

Justin Chevrier : gdiplus: Add GdipGetPathGradientSurroundColorCount stub with tests.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 402781376436347d098417c4830145e37f795967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=402781376436347d098417c48… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Sat Mar 27 17:55:27 2010 -0400 gdiplus: Add GdipGetPathGradientSurroundColorCount stub with tests. --- dlls/gdiplus/brush.c | 10 ++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/tests/brush.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 5582a95..8994b87 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1167,6 +1167,16 @@ GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient return NotImplemented; } +GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorCount(GpPathGradient *brush, INT *count) +{ + TRACE("(%p, %p)\n", brush, count); + + if (!brush || !count) + return InvalidParameter; + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetPathGradientWrapMode(GpPathGradient *brush, GpWrapMode *wrapmode) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e6cea5a..14e7fbf 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -338,7 +338,7 @@ @ stub GdipGetPathGradientPresetBlendCount @ stdcall GdipGetPathGradientRect(ptr ptr) @ stdcall GdipGetPathGradientRectI(ptr ptr) -@ stub GdipGetPathGradientSurroundColorCount +@ stdcall GdipGetPathGradientSurroundColorCount(ptr ptr) @ stdcall GdipGetPathGradientSurroundColorsWithCount(ptr ptr ptr) @ stub GdipGetPathGradientTransform @ stdcall GdipGetPathGradientWrapMode(ptr ptr) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 0ee4dd4..0effcf4 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -646,6 +646,61 @@ static void test_linelinearblend(void) expect(Ok, status); } +static void test_gradientsurroundcolorcount(void) +{ + GpStatus status; + GpPathGradient *grad; + ARGB *color; + INT count = 3; + + status = GdipCreatePathGradient(blendcount_ptf, 2, WrapModeClamp, &grad); + expect(Ok, status); + + color = GdipAlloc(sizeof(ARGB[3])); + + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(InvalidParameter, status); + GdipFree(color); + + count = 2; + + color = GdipAlloc(sizeof(ARGB[2])); + + color[0] = 0x00ff0000; + color[1] = 0x0000ff00; + + status = GdipSetPathGradientSurroundColorsWithCount(NULL, color, &count); + expect(InvalidParameter, status); + + status = GdipSetPathGradientSurroundColorsWithCount(grad, NULL, &count); + expect(InvalidParameter, status); + + /* WinXP crashes on this test */ + if(0) + { + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, NULL); + expect(InvalidParameter, status); + } + + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); + todo_wine expect(Ok, status); + expect(2, count); + + status = GdipGetPathGradientSurroundColorCount(NULL, &count); + expect(InvalidParameter, status); + + status = GdipGetPathGradientSurroundColorCount(grad, NULL); + expect(InvalidParameter, status); + + count = 0; + status = GdipGetPathGradientSurroundColorCount(grad, &count); + todo_wine expect(Ok, status); + todo_wine expect(2, count); + + GdipFree(color); + GdipDeleteBrush((GpBrush*)grad); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -669,6 +724,7 @@ START_TEST(brush) test_gradientgetrect(); test_lineblend(); test_linelinearblend(); + test_gradientsurroundcolorcount(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 9672367..8312e16 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -563,6 +563,7 @@ GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*, GDIPCONST ARGB*,INT*); GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient*,GpWrapMode); +GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorCount(GpPathGradient*,INT*); /* PathIterator */ GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*);

1 0

Justin Chevrier : include: Fix GdipSetPathGradientSurroundColorsWithCount definition.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 88b4263a61a06449b7a5dd4ffa10282da6ae7a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b4263a61a06449b7a5dd4ff… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Sat Mar 27 17:55:26 2010 -0400 include: Fix GdipSetPathGradientSurroundColorsWithCount definition. --- dlls/gdiplus/brush.c | 2 +- include/gdiplusflat.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 287d9d8..5582a95 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1532,7 +1532,7 @@ GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient *grad, } GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient - *grad, ARGB *argb, INT *count) + *grad, GDIPCONST ARGB *argb, INT *count) { static int calls; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index cd97a70..9672367 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -561,7 +561,7 @@ GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient*,BOOL); GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*, - ARGB*,INT*); + GDIPCONST ARGB*,INT*); GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient*,GpWrapMode); /* PathIterator */

1 0

Piotr Caban : msvcrt: Added _strtoui64 implementation.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 9a8fe9679b3edd928107c6831015b53eebf3eb46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a8fe9679b3edd928107c6831… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 29 00:04:32 2010 +0200 msvcrt: Added _strtoui64 implementation. --- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/string.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 49 ++++++++++++++++++++++++++++- 5 files changed, 127 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e44ad0f..541cf68 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -961,8 +961,8 @@ @ cdecl _strtoi64(str ptr long) msvcrt._strtoi64 @ cdecl _strtoi64_l(str ptr long ptr) msvcrt._strtoi64_l @ stub _strtol_l -@ stub _strtoui64 -@ stub _strtoui64_l +@ cdecl _strtoui64(str ptr long) msvcrt._strtoui64 +@ cdecl _strtoui64_l(str ptr long ptr) msvcrt._strtoui64_l @ stub _strtoul_l @ cdecl _strupr(str) msvcrt._strupr @ stub _strupr_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 1cec19c..296466a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -947,8 +947,8 @@ @ cdecl _strtoi64(str ptr long) msvcrt._strtoi64 @ cdecl _strtoi64_l(str ptr long ptr) msvcrt._strtoi64_l @ stub _strtol_l -@ stub _strtoui64 -@ stub _strtoui64_l +@ cdecl _strtoui64(str ptr long) msvcrt._strtoui64 +@ cdecl _strtoui64_l(str ptr long ptr) msvcrt._strtoui64_l @ stub _strtoul_l @ cdecl _strupr(str) msvcrt._strupr @ stub _strupr_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d25bcc4..2b6be16 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -894,8 +894,8 @@ @ cdecl _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l # stub _strtol_l -# stub _strtoui64 -# stub _strtoui64_l +@ cdecl _strtoui64(str ptr long) MSVCRT_strtoui64 +@ cdecl _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l # stub _strtoul_l @ cdecl _strupr(str) ntdll._strupr # stub _strupr_l diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d64cd45..5432a30 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -407,3 +407,77 @@ __int64 CDECL MSVCRT_strtoi64(const char *nptr, char **endptr, int base) { return MSVCRT_strtoi64_l(nptr, endptr, base, NULL); } + +/********************************************************************* + * _strtoui64_l (MSVCR90.@) + * + * FIXME: locale parameter is ignored + */ +unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int base, MSVCRT__locale_t locale) +{ + BOOL negative = FALSE; + unsigned __int64 ret = 0; + + TRACE("(%s %p %d %p)\n", nptr, endptr, base, locale); + + if(!nptr || base<0 || base>36 || base==1) { + MSVCRT_invalid_parameter(NULL, NULL, NULL, 0, NULL); + return 0; + } + + while(isspace(*nptr)) nptr++; + + if(*nptr == '-') { + negative = TRUE; + nptr++; + } else if(*nptr == '+') + nptr++; + + if((base==0 || base==16) && *nptr=='0' && tolower(*(nptr+1))=='x') { + base = 16; + nptr += 2; + } + + if(base == 0) { + if(*nptr=='0') + base = 8; + else + base = 10; + } + + while(*nptr) { + char cur = tolower(*nptr); + int v; + + if(isdigit(cur)) { + if(cur >= '0'+base) + break; + v = *nptr-'0'; + } else { + if(cur<'a' || cur>='a'+base-10) + break; + v = cur-'a'+10; + } + + nptr++; + + if(ret>MSVCRT_UI64_MAX/base || ret*base>MSVCRT_UI64_MAX-v) { + ret = MSVCRT_UI64_MAX; + *MSVCRT__errno() = ERANGE; + } else + ret = ret*base + v; + } + + if(endptr) + *endptr = (char*)nptr; + + return negative ? -ret : ret; +} + +/********************************************************************* + * _strtoui64 (MSVCR90.@) + */ +unsigned __int64 CDECL MSVCRT_strtoui64(const char *nptr, char **endptr, int base) +{ + return MSVCRT_strtoui64_l(nptr, endptr, base, NULL); +} diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 87c8460..a4926d9 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -55,6 +55,7 @@ static int (__cdecl *p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wc static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); static size_t (__cdecl *p_strnlen)(const char *, size_t); static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); +static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); static _invalid_parameter_handler *p_invalid_parameter; static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -959,10 +960,11 @@ static void test__strtoi64(void) static const char blanks[] = " 12 212.31"; __int64 res; + unsigned __int64 ures; char *endpos; - if(!p_strtoi64) { - win_skip("_strtoi64 not found\n"); + if(!p_strtoi64 || !p_strtoui64) { + win_skip("_strtoi64 or _strtoui64 not found\n"); return; } @@ -974,6 +976,12 @@ static void test__strtoi64(void) ok(res == 0, "res != 0\n"); res = p_strtoi64(no1, NULL, 37); ok(res == 0, "res != 0\n"); + ures = p_strtoui64(NULL, NULL, 10); + ok(ures == 0, "res = %d\n", (int)ures); + ures = p_strtoui64(no1, NULL, 1); + ok(ures == 0, "res = %d\n", (int)ures); + ures = p_strtoui64(no1, NULL, 37); + ok(ures == 0, "res = %d\n", (int)ures); ok(errno == 0xdeadbeef, "errno = %x\n", errno); } @@ -1063,6 +1071,42 @@ static void test__strtoi64(void) ok(res == 12, "res != 12\n"); ok(endpos == blanks+10, "Incorrect endpos (%p-%p)\n", blanks, endpos); ok(errno == 0xdeadbeef, "errno = %x\n", errno); + + errno = 0xdeadbeef; + ures = p_strtoui64(no1, &endpos, 0); + ok(ures == 31923, "ures != 31923\n"); + ok(endpos == no1+strlen(no1), "Incorrect endpos (%p-%p)\n", no1, endpos); + ures = p_strtoui64(no2, &endpos, 0); + ok(ures == -213312, "ures != -213312\n"); + ok(endpos == no2+strlen(no2), "Incorrect endpos (%p-%p)\n", no2, endpos); + ures = p_strtoui64(no3, &endpos, 10); + ok(ures == 12, "ures != 12\n"); + ok(endpos == no3+2, "Incorrect endpos (%p-%p)\n", no3, endpos); + ures = p_strtoui64(no4, &endpos, 10); + ok(ures == 0, "ures != 0\n"); + ok(endpos == no4, "Incorrect endpos (%p-%p)\n", no4, endpos); + ures = p_strtoui64(hex, &endpos, 10); + ok(ures == 0, "ures != 0\n"); + ok(endpos == hex+1, "Incorrect endpos (%p-%p)\n", hex, endpos); + ures = p_strtoui64(oct, &endpos, 10); + ok(ures == 123, "ures != 123\n"); + ok(endpos == oct+strlen(oct), "Incorrect endpos (%p-%p)\n", oct, endpos); + ures = p_strtoui64(blanks, &endpos, 10); + ok(ures == 12, "ures != 12\n"); + ok(endpos == blanks+10, "Incorrect endpos (%p-%p)\n", blanks, endpos); + ok(errno == 0xdeadbeef, "errno = %x\n", errno); + + errno = 0xdeadbeef; + ures = p_strtoui64(overflow, &endpos, 10); + ok(ures == _UI64_MAX, "ures != _UI64_MAX\n"); + ok(endpos == overflow+strlen(overflow), "Incorrect endpos (%p-%p)\n", overflow, endpos); + ok(errno == ERANGE, "errno = %x\n", errno); + + errno = 0xdeadbeef; + ures = p_strtoui64(neg_overflow, &endpos, 10); + ok(ures == 1, "ures != 1\n"); + ok(endpos == neg_overflow+strlen(neg_overflow), "Incorrect endpos (%p-%p)\n", neg_overflow, endpos); + ok(errno == ERANGE, "errno = %x\n", errno); } START_TEST(string) @@ -1089,6 +1133,7 @@ START_TEST(string) p_wcsupr_s = (void *)GetProcAddress( hMsvcrt,"_wcsupr_s" ); p_strnlen = (void *)GetProcAddress( hMsvcrt,"strnlen" ); p_strtoi64 = (void *) GetProcAddress(hMsvcrt, "_strtoi64"); + p_strtoui64 = (void *) GetProcAddress(hMsvcrt, "_strtoui64"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */

1 0

Piotr Caban : msvcrt: Added _strtoi64 implementation.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 585ea9cdd8bdcb63c3207200b0cdfe94c0d20e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=585ea9cdd8bdcb63c3207200b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 29 00:04:03 2010 +0200 msvcrt: Added _strtoi64 implementation. --- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/msvcrt.h | 44 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/string.c | 80 ++++++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 123 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 253 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=585ea9cdd8bdcb63c3207…

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
92
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

2003

2002

2001

wine-commits March 2010