August 2017 - Wine-commits - list.winehq.org

Alexandre Julliard : kernel32/tests: Use function pointers to avoid gcc warnings for invalid parameter tests.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: ff8af74189086ae2dc29a6ebbd364cee369f1178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8af74189086ae2dc29a6ebb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 30 09:45:29 2017 +0200 kernel32/tests: Use function pointers to avoid gcc warnings for invalid parameter tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 0acf109..2c91bb9 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -89,6 +89,12 @@ static void test_heap(void) HGLOBAL hsecond; SIZE_T size, size2; const SIZE_T max_size = 1024, init_size = 10; + /* use function pointers to avoid warnings for invalid parameter tests */ + LPVOID (WINAPI *pHeapAlloc)(HANDLE,DWORD,SIZE_T); + LPVOID (WINAPI *pHeapReAlloc)(HANDLE,DWORD,LPVOID,SIZE_T); + + pHeapAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapAlloc" ); + pHeapReAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapReAlloc" ); /* Heap*() functions */ mem = HeapAlloc(GetProcessHeap(), 0, 0); @@ -111,12 +117,12 @@ static void test_heap(void) /* test some border cases of HeapAlloc and HeapReAlloc */ mem = HeapAlloc(GetProcessHeap(), 0, 0); ok(mem != NULL, "memory not allocated for size 0\n"); - msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0 - 7); + msecond = pHeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0 - 7); ok(msecond == NULL, "HeapReAlloc(~0 - 7) should have failed\n"); - msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0); + msecond = pHeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0); ok(msecond == NULL, "HeapReAlloc(~0) should have failed\n"); HeapFree(GetProcessHeap(), 0, mem); - mem = HeapAlloc(GetProcessHeap(), 0, ~(SIZE_T)0); + mem = pHeapAlloc(GetProcessHeap(), 0, ~(SIZE_T)0); ok(mem == NULL, "memory allocated for size ~0\n"); mem = HeapAlloc(GetProcessHeap(), 0, 17); msecond = HeapReAlloc(GetProcessHeap(), 0, mem, 0);

1 0

Nikolay Sivov : d2d1: Fix rounding when setting scissor rectangle.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: 0a315ba0653f8de70386b2424c595621f76bd453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a315ba0653f8de70386b2424… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 29 15:13:38 2017 +0300 d2d1: Fix rounding when setting scissor rectangle. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 8 +++--- dlls/d2d1/tests/d2d1.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0428245..f37565d 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -166,10 +166,10 @@ static void d2d_rt_draw(struct d2d_d3d_render_target *render_target, enum d2d_sh const D2D1_RECT_F *clip_rect; clip_rect = &render_target->clip_stack.stack[render_target->clip_stack.count - 1]; - scissor_rect.left = clip_rect->left + 0.5f; - scissor_rect.top = clip_rect->top + 0.5f; - scissor_rect.right = clip_rect->right + 0.5f; - scissor_rect.bottom = clip_rect->bottom + 0.5f; + scissor_rect.left = ceilf(clip_rect->left - 0.5f); + scissor_rect.top = ceilf(clip_rect->top - 0.5f); + scissor_rect.right = ceilf(clip_rect->right - 0.5f); + scissor_rect.bottom = ceilf(clip_rect->bottom - 0.5f); } else { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index c1ca98d..f626129 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1059,6 +1059,72 @@ static void test_clip(void) match = compare_surface(surface, "035a44d4198d6e422e9de6185b5b2c2bac5e33c9"); ok(match, "Surface does not match.\n"); + /* Fractional clip rectangle coordinates, aliased mode. */ + set_matrix_identity(&matrix); + ID2D1RenderTarget_SetTransform(rt, &matrix); + ID2D1RenderTarget_SetDpi(rt, 96.0f, 96.0f); + + ID2D1RenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 0.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + scale_matrix(&matrix, 2.0f, 2.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_rect(&rect, 0.0f, 0.5f, 200.0f, 100.5f); + set_color(&color, 1.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + set_matrix_identity(&matrix); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_rect(&rect, 0.0f, 0.5f, 100.0f, 200.5f); + set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_rect(&rect, 0.5f, 250.0f, 100.5f, 300.0f); + set_color(&color, 1.0f, 1.0f, 0.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + translate_matrix(&matrix, 0.1f, 0.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_rect(&rect, 110.0f, 250.25f, 150.0f, 300.25f); + set_color(&color, 0.0f, 0.5f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + set_rect(&rect, 160.0f, 250.75f, 200.0f, 300.75f); + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + ID2D1RenderTarget_SetDpi(rt, 48.0f, 192.0f); + set_rect(&rect, 160.25f, 0.0f, 200.25f, 100.0f); + set_color(&color, 1.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + set_rect(&rect, 160.75f, 100.0f, 200.75f, 120.0f); + set_color(&color, 0.0f, 1.0f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "a958d1fe69ee880200d47b206948e4c1ef382748"); + ok(match, "Surface does not match.\n"); + ID2D1RenderTarget_Release(rt); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain);

1 0

Andrey Gusev : api-ms-win-core-kernel32-legacy-l1-1-1: Update spec file.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: 3ba77b956d7e39b14aee72b6dd1f2cebcb372c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba77b956d7e39b14aee72b6d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Aug 30 17:49:23 2017 +0300 api-ms-win-core-kernel32-legacy-l1-1-1: Update spec file. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec index 579e254..2850919 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec @@ -1,15 +1,69 @@ +@ stub AddLocalAlternateComputerNameW +@ stdcall BackupRead(ptr ptr long ptr long long ptr) kernel32.BackupRead +@ stdcall BackupWrite(ptr ptr long ptr long long ptr) kernel32.BackupWrite +@ stdcall BindIoCompletionCallback(long ptr long) kernel32.BindIoCompletionCallback +@ stdcall CopyFileA(str str long) kernel32.CopyFileA +@ stdcall CopyFileW(wstr wstr long) kernel32.CopyFileW +@ stdcall CreateFileMappingA(long ptr long long long str) kernel32.CreateFileMappingA +@ stub CreateFileTransactedW +@ stdcall CreateMailslotA(str long long ptr) kernel32.CreateMailslotA +@ stdcall CreateNamedPipeA(str long long long long long long ptr) kernel32.CreateNamedPipeA +@ stdcall CreateSemaphoreW(ptr long long wstr) kernel32.CreateSemaphoreW +@ stdcall DnsHostnameToComputerNameW(wstr ptr ptr) kernel32.DnsHostnameToComputerNameW +@ stdcall DosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime +@ stdcall FatalAppExitA(long str) kernel32.FatalAppExitA +@ stdcall FatalAppExitW(long wstr) kernel32.FatalAppExitW +@ stdcall FileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime @ stdcall FindFirstVolumeMountPointW(wstr ptr long) kernel32.FindFirstVolumeMountPointW @ stub FindNextVolumeMountPointW +@ stdcall FindResourceA(long str str) kernel32.FindResourceA +@ stdcall FindResourceExA(long str str long) kernel32.FindResourceExA +@ stdcall FindResourceW(long wstr wstr) kernel32.FindResourceW @ stdcall FindVolumeMountPointClose(ptr) kernel32.FindVolumeMountPointClose +@ stdcall GetComputerNameA(ptr ptr) kernel32.GetComputerNameA +@ stdcall GetComputerNameW(ptr ptr) kernel32.GetComputerNameW +@ stdcall GetConsoleWindow() kernel32.GetConsoleWindow +@ stub GetDurationFormatEx @ stub GetFileAttributesTransactedW @ stub GetFirmwareType +@ stub GetMaximumProcessorGroupCount +@ stub GetNamedPipeClientProcessId +@ stub GetNamedPipeServerProcessId @ stub GetNumaAvailableMemoryNodeEx @ stdcall GetNumaNodeProcessorMask(long ptr) kernel32.GetNumaNodeProcessorMask @ stub GetNumaProcessorNodeEx +@ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA +@ stdcall GetStartupInfoA(ptr) kernel32.GetStartupInfoA +@ stdcall GetStringTypeExA(long long str long ptr) kernel32.GetStringTypeExA +@ stdcall GetSystemPowerStatus(ptr) kernel32.GetSystemPowerStatus +@ stdcall GetSystemWow64DirectoryA(ptr long) kernel32.GetSystemWow64DirectoryA +@ stdcall GetSystemWow64DirectoryW(ptr long) kernel32.GetSystemWow64DirectoryW +@ stdcall GetTapeParameters(ptr long ptr ptr) kernel32.GetTapeParameters +@ stdcall GetTempPathA(long ptr) kernel32.GetTempPathA +@ stdcall GetThreadSelectorEntry(long long ptr) kernel32.GetThreadSelectorEntry +@ stdcall GlobalMemoryStatus(ptr) kernel32.GlobalMemoryStatus +@ stdcall LoadLibraryA(str) kernel32.LoadLibraryA +@ stdcall LoadLibraryW(wstr) kernel32.LoadLibraryW +@ stdcall MoveFileA(str str) kernel32.MoveFileA +@ stdcall MoveFileExA(str str long) kernel32.MoveFileExA +@ stdcall MoveFileW(wstr wstr) kernel32.MoveFileW +@ stdcall MulDiv(long long long) kernel32.MulDiv +@ stdcall OpenFile(str ptr long) kernel32.OpenFile @ stdcall PowerClearRequest(long long) kernel32.PowerClearRequest @ stdcall PowerCreateRequest(ptr) kernel32.PowerCreateRequest @ stdcall PowerSetRequest(long long) kernel32.PowerSetRequest +@ stdcall PulseEvent(long) kernel32.PulseEvent +@ stub RaiseFailFastException +@ stdcall RegisterWaitForSingleObject(ptr long ptr ptr long long) kernel32.RegisterWaitForSingleObject +@ stdcall SetConsoleTitleA(str) kernel32.SetConsoleTitleA @ stdcall SetDllDirectoryW(wstr) kernel32.SetDllDirectoryW +@ stdcall SetFileCompletionNotificationModes(long long) kernel32.SetFileCompletionNotificationModes +@ stdcall SetHandleCount(long) kernel32.SetHandleCount +@ stdcall SetMailslotInfo(long long) kernel32.SetMailslotInfo @ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor +@ stdcall SetVolumeLabelW(wstr wstr) kernel32.SetVolumeLabelW @ stdcall SetVolumeMountPointW(wstr wstr) kernel32.SetVolumeMountPointW +@ stdcall UnregisterWait(long) kernel32.UnregisterWait @ stdcall VerifyVersionInfoW(long long int64) kernel32.VerifyVersionInfoW +@ stdcall WaitForMultipleObjects(long ptr long long) kernel32.WaitForMultipleObjects +@ stdcall WTSGetActiveConsoleSessionId() kernel32.WTSGetActiveConsoleSessionId

1 0

Vincent Povirk : gdiplus: Test that clip region doesn' t account for gdi32 transform changes.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: c579661006041d0fb28287dd22029339446a34d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c579661006041d0fb28287dd2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 30 12:32:13 2017 -0500 gdiplus: Test that clip region doesn't account for gdi32 transform changes. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 74d85d1..04e2f50 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4959,6 +4959,16 @@ static void test_clipping(void) ok(rect.X == 100.0 && rect.Y == 100.0 && rect.Width == 100.0 && rect.Height == 100.0, "expected 100.0,100.0-100.0,100.0, got %.2f,%.2f-%.2f,%.2f\n", rect.X, rect.Y, rect.Width, rect.Height); + /* Clip region does not account for changes to gdi32 transform */ + SetViewportOrgEx(hdc, 10, 10, NULL); + + status = GdipGetClipBounds(graphics, &rect); + expect(Ok, status); + ok(rect.X == 100.0 && rect.Y == 100.0 && rect.Width == 100.0 && rect.Height == 100.0, + "expected 100.0,100.0-100.0,100.0, got %.2f,%.2f-%.2f,%.2f\n", rect.X, rect.Y, rect.Width, rect.Height); + + SetViewportOrgEx(hdc, 0, 0, NULL); + status = GdipSetEmpty(region); expect(Ok, status); status = GdipGetClip(graphics, region);

1 0

Vincent Povirk : gdiplus: Transform clipping region to gdi device coordinates.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: 016dc76ab22f14c6f9a1c04fcc1fd494bddebe62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=016dc76ab22f14c6f9a1c04fc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 30 12:32:14 2017 -0500 gdiplus: Transform clipping region to gdi device coordinates. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 22 ++++++++++++++++++++-- dlls/gdiplus/tests/graphics.c | 2 +- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a250678..3dbb457 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -348,8 +348,26 @@ static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_ static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn) { - /* clipping region is in device coords */ - return GdipGetRegionHRgn(graphics->clip, NULL, hrgn); + GpRegion *rgn; + GpMatrix transform; + GpStatus stat; + + stat = get_graphics_transform(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceDevice, &transform); + + if (stat == Ok) + stat = GdipCloneRegion(graphics->clip, &rgn); + + if (stat == Ok) + { + stat = GdipTransformRegion(rgn, &transform); + + if (stat == Ok) + stat = GdipGetRegionHRgn(rgn, NULL, hrgn); + + GdipDeleteRegion(rgn); + } + + return stat; } /* Draw ARGB data to the given graphics object */ diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 04e2f50..540fdfd 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6276,7 +6276,7 @@ static void test_GdipFillRectanglesOnMemoryDCSolidBrush(void) color[5] = get_bitmap_pixel(width-1, height/2-1); } - todo_wine ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && + ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && color[3] == 0 && color[4] == 0 && color[5] == 0, "Expected GdipFillRectangleI take effect!\n" ); ReleaseBitmapPixelBuffer(pixel);

1 0

Vincent Povirk : gdiplus: Test that GdipGetRegionHRgn includes gdi32 transform.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: 0241da1c2d893013eff26f6221a499bf58867d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0241da1c2d893013eff26f622… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 30 12:32:15 2017 -0500 gdiplus: Test that GdipGetRegionHRgn includes gdi32 transform. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/region.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 06c47d9..86a2e40 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -1118,6 +1118,8 @@ static void test_gethrgn(void) GpGraphics *graphics; HRGN hrgn; HDC hdc=GetDC(0); + INT rgntype; + RECT rgnbox; static const RECT empty_rect = {0,0,0,0}; static const RECT test_rect = {10, 11, 20, 21}; static const GpRectF test_rectF = {10.0, 11.0, 10.0, 10.0}; @@ -1238,6 +1240,35 @@ static void test_gethrgn(void) ok(status == Ok, "status %08x\n", status); status = GdipDeleteGraphics(graphics); ok(status == Ok, "status %08x\n", status); + + /* test with gdi32 transform */ + SetViewportOrgEx(hdc, 10, 10, NULL); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipCreateRegionRect(&test_rectF, &region); + expect(Ok, status); + + status = GdipGetRegionHRgn(region, graphics, &hrgn); + expect(Ok, status); + + rgntype = GetRgnBox(hrgn, &rgnbox); + DeleteObject(hrgn); + + expect(SIMPLEREGION, rgntype); + expect(20, rgnbox.left); + expect(21, rgnbox.top); + expect(30, rgnbox.right); + expect(31, rgnbox.bottom); + + status = GdipDeleteRegion(region); + expect(Ok, status); + status = GdipDeleteGraphics(graphics); + expect(Ok, status); + + SetViewportOrgEx(hdc, 0, 0, NULL); + ReleaseDC(0, hdc); }

1 0

Changhui Liu : gdiplus/tests: Add drawing tests for GdipFillRegion with gdi transform.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: 24f109072c60149a87ceacb8bff97bdc4f69ebcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=24f109072c60149a87ceacb8b… Author: Changhui Liu <liuchanghui(a)linuxdeepin.com> Date: Wed Aug 30 12:32:16 2017 -0500 gdiplus/tests: Add drawing tests for GdipFillRegion with gdi transform. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 245 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 245 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 540fdfd..5f45cc2 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6287,6 +6287,248 @@ static void test_GdipFillRectanglesOnMemoryDCSolidBrush(void) ReleaseDC(hwnd, dc); } +static void test_GdipFillRectanglesOnMemoryDCTextureBrush(void) +{ + ARGB color[6] = {0,0,0,0,0,0}; + POINT pt = {0,0}; + RECT rect = {100, 100, 180, 180}; + UINT width = rect.right - rect.left; + UINT height = rect.bottom - rect.top; + GpStatus status = 0; + union + { + GpBitmap *bitmap; + GpImage *image; + } src_img; + GpTexture *brush = NULL; + GpGraphics *graphics = NULL; + HDC dc = GetDC( hwnd); + HDC hdc = CreateCompatibleDC(dc); + HBITMAP bmp = CreateCompatibleBitmap(dc, width, height); + HGDIOBJ old = SelectObject(hdc, bmp); + + UINT x = 0; + UINT y = 0; + UINT src_img_width = width/2; + UINT src_img_height = height/2; + BYTE *src_img_data = GdipAlloc(src_img_width*src_img_height*4); + DWORD *pixel = (DWORD *)src_img_data; + ok(pixel != NULL, "Expected src_img_data is valid\n"); + + /*Change the window origin is the key test point*/ + SetWindowOrgEx(hdc, rect.left, rect.top, &pt); + + /*build a blue solid image!*/ + for(y = 0; y < src_img_height; ++y) + { + for(x = 0; x < src_img_width; ++x) + { + pixel[x] = BLUE_COLOR; + } + + pixel += src_img_width; + } + + status = GdipCreateBitmapFromScan0(src_img_width, src_img_height, src_img_width*4, + PixelFormat32bppARGB, src_img_data, &src_img.bitmap); + expect(Ok, status); + + status = GdipCreateTexture(src_img.image, 0, &brush); + expect(Ok, status); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipSetClipRectI(graphics, rect.left+width/2, rect.top+height/2, + width, height, CombineModeReplace); + expect(Ok, status); + + status = GdipFillRectangleI(graphics, (GpBrush*)brush, 0, 0, rect.right, rect.bottom); + expect(Ok, status); + + GdipDisposeImage(src_img.image); + GdipDeleteBrush((GpBrush*)brush); + GdipDeleteGraphics(graphics); + GdipFree(src_img_data); + + pixel = GetBitmapPixelBuffer(hdc, bmp, width, height); + if (pixel) + { + color[0] = get_bitmap_pixel(width/2, height/2); + color[1] = get_bitmap_pixel(width/2+1, height/2); + color[2] = get_bitmap_pixel(width/2, height/2+1); + color[3] = get_bitmap_pixel(width/2-1, height/2-1); + color[4] = get_bitmap_pixel(width/2-1, height-1); + color[5] = get_bitmap_pixel(width-1, height/2-1); + } + todo_wine ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && + color[3] == 0 && color[4] == 0 && color[5] == 0, + "Expected GdipFillRectangleI take effect!\n" ); + ReleaseBitmapPixelBuffer(pixel); + + SelectObject(hdc, old); + DeleteObject(bmp); + DeleteDC(hdc); + ReleaseDC(hwnd, dc); +} + +static void test_GdipFillRectanglesOnBitmapTextureBrush(void) +{ + ARGB color[6] = {0,0,0,0,0,0}; + UINT x = 0; + UINT y = 0; + RECT rect = {100, 100, 180, 180}; + UINT width = rect.right - rect.left; + UINT height = rect.bottom - rect.top; + UINT src_img_width = width/2; + UINT src_img_height = height/2; + + GpStatus status = 0; + union + { + GpBitmap *bitmap; + GpImage *image; + } src_img; + union + { + GpBitmap *bitmap; + GpImage *image; + } dst_img; + + GpTexture *brush = NULL; + GpGraphics *graphics = NULL; + BYTE *src_img_data = GdipAlloc(src_img_width*src_img_height*4); + DWORD *pixel = (DWORD *)src_img_data; + ok(pixel != NULL, "Expected src_img_data is valid\n"); + + status = GdipCreateBitmapFromScan0(width, height, width*4, + PixelFormat32bppARGB, NULL, &dst_img.bitmap); + expect(Ok, status); + + /*build a blue solid image!*/ + for(y = 0; y < src_img_height; ++y) + { + for(x = 0; x < src_img_width; ++x) + { + pixel[x] = BLUE_COLOR; + } + + pixel += src_img_width; + } + + status = GdipCreateBitmapFromScan0(src_img_width, src_img_height, src_img_width*4, + PixelFormat32bppARGB, src_img_data, &src_img.bitmap); + expect(Ok, status); + + status = GdipCreateTexture(src_img.image, 0, &brush); + expect(Ok, status); + + status = GdipGetImageGraphicsContext(dst_img.image, &graphics); + expect(Ok, status); + + status = GdipSetClipRectI(graphics, 0, 0, width, height, CombineModeReplace); + expect(Ok, status); + + status = GdipFillRectangleI(graphics, (GpBrush*)brush, 0, 0, width/2, height/2); + expect(Ok, status); + + GdipDeleteBrush((GpBrush*)brush); + GdipDeleteGraphics(graphics); + + GdipBitmapGetPixel(dst_img.bitmap, 0, 0, &color[0]); + GdipBitmapGetPixel(dst_img.bitmap, 0, 1, &color[1]); + GdipBitmapGetPixel(dst_img.bitmap, 1, 0, &color[2]); + GdipBitmapGetPixel(dst_img.bitmap, width/2, 0, &color[3]); + GdipBitmapGetPixel(dst_img.bitmap, width/2, height/2, &color[4]); + GdipBitmapGetPixel(dst_img.bitmap, 0, height/2, &color[5]); + + ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && + color[3] == 0 && color[4] == 0 && color[5] == 0, + "Expected GdipFillRectangleI take effect!\n" ); + + GdipDisposeImage(src_img.image); + GdipDisposeImage(dst_img.image); + GdipFree(src_img_data); +} + +static void test_GdipDrawImagePointsRectOnMemoryDC(void) +{ + ARGB color[6] = {0,0,0,0,0,0}; + POINT pt = {0,0}; + RECT rect = {100, 100, 180, 180}; + UINT width = rect.right - rect.left; + UINT height = rect.bottom - rect.top; + GpStatus status = 0; + union + { + GpBitmap *bitmap; + GpImage *image; + } src_img; + GpGraphics *graphics = NULL; + HDC dc = GetDC( hwnd); + HDC hdc = CreateCompatibleDC(dc); + HBITMAP bmp = CreateCompatibleBitmap(dc, width, height); + HGDIOBJ old = SelectObject(hdc, bmp); + + UINT x = 0; + UINT y = 0; + UINT src_img_width = width/2; + UINT src_img_height = height/2; + BYTE *src_img_data = GdipAlloc(src_img_width*src_img_height*4); + DWORD *pixel = (DWORD *)src_img_data; + ok(pixel != NULL, "Expected src_img_data is valid\n"); + + /*Change the window origin is the key test point*/ + SetWindowOrgEx(hdc, rect.left, rect.top, &pt); + + /*build a blue solid image!*/ + for(y = 0; y < src_img_height; ++y) + { + for(x = 0; x < src_img_width; ++x) + { + pixel[x] = BLUE_COLOR; + } + + pixel += src_img_width; + } + + status = GdipCreateBitmapFromScan0(src_img_width, src_img_height, src_img_width*4, + PixelFormat32bppARGB, src_img_data, &src_img.bitmap); + expect(Ok, status); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipDrawImageRectRectI(graphics, src_img.image, + rect.left+width/2, rect.top+height/2, width/2, height/2, + 0, 0, src_img_width, src_img_height, UnitPixel, NULL, NULL, NULL); + expect(Ok, status); + + GdipDisposeImage(src_img.image); + GdipDeleteGraphics(graphics); + GdipFree(src_img_data); + + pixel = GetBitmapPixelBuffer(hdc, bmp, width, height); + if (pixel) + { + color[0] = get_bitmap_pixel(width/2, height/2); + color[1] = get_bitmap_pixel(width/2+1, height/2); + color[2] = get_bitmap_pixel(width/2, height/2+1); + color[3] = get_bitmap_pixel(width/2-1, height/2-1); + color[4] = get_bitmap_pixel(width/2-1, height-1); + color[5] = get_bitmap_pixel(width-1, height/2-1); + } + ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && + color[3] == 0 && color[4] == 0 && color[5] == 0, + "Expected GdipDrawImageRectRectI take effect!\n" ); + ReleaseBitmapPixelBuffer(pixel); + + SelectObject(hdc, old); + DeleteObject(bmp); + DeleteDC(hdc); + ReleaseDC(hwnd, dc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -6371,6 +6613,9 @@ START_TEST(graphics) test_GdipFillRectangles(); test_GdipGetVisibleClipBounds_memoryDC(); test_GdipFillRectanglesOnMemoryDCSolidBrush(); + test_GdipFillRectanglesOnMemoryDCTextureBrush(); + test_GdipFillRectanglesOnBitmapTextureBrush(); + test_GdipDrawImagePointsRectOnMemoryDC(); test_container_rects(); test_GdipGraphicsSetAbort();

1 0

Alexandre Julliard : kernel32/tests: Add tests for SetSearchPathMode.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 5841521477b18d5f8d8af5032cec220d309ee57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5841521477b18d5f8d8af5032… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 15:50:40 2017 +0200 kernel32/tests: Add tests for SetSearchPathMode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 109 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 7eb9e75..632aefc 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -72,6 +72,7 @@ static BOOL (WINAPI *pNeedCurrentDirectoryForExePathW)(LPCWSTR); static DWORD (WINAPI *pSearchPathA)(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*); static DWORD (WINAPI *pSearchPathW)(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*); +static BOOL (WINAPI *pSetSearchPathMode)(DWORD); static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); @@ -2119,6 +2120,7 @@ static void init_pointers(void) MAKEFUNC(NeedCurrentDirectoryForExePathW); MAKEFUNC(SearchPathA); MAKEFUNC(SearchPathW); + MAKEFUNC(SetSearchPathMode); MAKEFUNC(ActivateActCtx); MAKEFUNC(CreateActCtxW); MAKEFUNC(DeactivateActCtx); @@ -2276,6 +2278,112 @@ static void test_CheckNameLegalDOS8Dot3(void) } } +static void test_SetSearchPathMode(void) +{ + BOOL ret; + char orig[MAX_PATH], buf[MAX_PATH], dir[MAX_PATH], expect[MAX_PATH]; + HANDLE handle; + + if (!pSetSearchPathMode) + { + win_skip( "SetSearchPathMode isn't available\n" ); + return; + } + GetCurrentDirectoryA( MAX_PATH, orig ); + GetTempPathA( MAX_PATH, buf ); + GetTempFileNameA( buf, "path", 0, dir ); + DeleteFileA( dir ); + CreateDirectoryA( dir, NULL ); + ret = SetCurrentDirectoryA( dir ); + ok( ret, "failed to switch to %s\n", dir ); + if (!ret) + { + RemoveDirectoryA( dir ); + return; + } + + handle = CreateFileA( "kernel32.dll", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + CloseHandle( handle ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( 0 ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( 0x80 ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_PERMANENT ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SearchPathA( NULL, "kernel32.dll", NULL, MAX_PATH, buf, NULL ); + ok( ret, "SearchPathA failed err %u\n", GetLastError() ); + GetCurrentDirectoryA( MAX_PATH, expect ); + strcat( expect, "\\kernel32.dll" ); + ok( !lstrcmpiA( buf, expect ), "found %s expected %s\n", buf, expect ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE ); + ok( ret, "SetSearchPathMode failed err %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SearchPathA( NULL, "kernel32.dll", NULL, MAX_PATH, buf, NULL ); + ok( ret, "SearchPathA failed err %u\n", GetLastError() ); + GetSystemDirectoryA( expect, MAX_PATH ); + strcat( expect, "\\kernel32.dll" ); + ok( !lstrcmpiA( buf, expect ), "found %s expected %s\n", buf, expect ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE ); + ok( ret, "SetSearchPathMode failed err %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SearchPathA( NULL, "kernel32.dll", NULL, MAX_PATH, buf, NULL ); + ok( ret, "SearchPathA failed err %u\n", GetLastError() ); + GetCurrentDirectoryA( MAX_PATH, expect ); + strcat( expect, "\\kernel32.dll" ); + ok( !lstrcmpiA( buf, expect ), "found %s expected %s\n", buf, expect ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT ); + ok( ret, "SetSearchPathMode failed err %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT ); + ok( ret, "SetSearchPathMode failed err %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SearchPathA( NULL, "kernel32.dll", NULL, MAX_PATH, buf, NULL ); + ok( ret, "SearchPathA failed err %u\n", GetLastError() ); + GetSystemDirectoryA( expect, MAX_PATH ); + strcat( expect, "\\kernel32.dll" ); + ok( !lstrcmpiA( buf, expect ), "found %s expected %s\n", buf, expect ); + + DeleteFileA( "kernel32.dll" ); + SetCurrentDirectoryA( orig ); + RemoveDirectoryA( dir ); +} + START_TEST(path) { CHAR origdir[MAX_PATH],curdir[MAX_PATH], curDrive, otherDrive; @@ -2309,4 +2417,5 @@ START_TEST(path) test_GetFullPathNameA(); test_GetFullPathNameW(); test_CheckNameLegalDOS8Dot3(); + test_SetSearchPathMode(); }

1 0

Alexandre Julliard : rsaenh: Avoid potential buffer overflows in registry key name.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: f7eb53b1f9aac5a3d1252e31b649477dc050355d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7eb53b1f9aac5a3d1252e31b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 12:52:31 2017 +0200 rsaenh: Avoid potential buffer overflows in registry key name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 98bba16..3db8286 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1096,7 +1096,7 @@ static void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpe */ static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY *phKey) { - CHAR szRSABase[MAX_PATH]; + CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH]; HKEY hRootKey; sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName); @@ -1127,7 +1127,7 @@ static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY * */ static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, REGSAM access, HKEY *phKey) { - CHAR szRSABase[MAX_PATH]; + CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH]; HKEY hRootKey; sprintf(szRSABase, RSAENH_REGKEY, pszContainerName); @@ -1154,24 +1154,21 @@ static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, REGSAM ac */ static BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags) { - CHAR szRegKey[MAX_PATH]; + CHAR szRegKey[sizeof(RSAENH_REGKEY) + MAX_PATH]; + HKEY hRootKey; - if (snprintf(szRegKey, MAX_PATH, RSAENH_REGKEY, pszContainerName) >= MAX_PATH) { - SetLastError(NTE_BAD_KEYSET_PARAM); - return FALSE; + sprintf(szRegKey, RSAENH_REGKEY, pszContainerName); + + if (dwFlags & CRYPT_MACHINE_KEYSET) + hRootKey = HKEY_LOCAL_MACHINE; + else + hRootKey = HKEY_CURRENT_USER; + if (!RegDeleteKeyA(hRootKey, szRegKey)) { + SetLastError(ERROR_SUCCESS); + return TRUE; } else { - HKEY hRootKey; - if (dwFlags & CRYPT_MACHINE_KEYSET) - hRootKey = HKEY_LOCAL_MACHINE; - else - hRootKey = HKEY_CURRENT_USER; - if (!RegDeleteKeyA(hRootKey, szRegKey)) { - SetLastError(ERROR_SUCCESS); - return TRUE; - } else { - SetLastError(NTE_BAD_KEYSET); - return FALSE; - } + SetLastError(NTE_BAD_KEYSET); + return FALSE; } }

1 0

Alexandre Julliard : wintrust: Increase buffer size to silence a gcc warning.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 9369e800c0c42498d23d23ed0d4ee8d0a032c5a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9369e800c0c42498d23d23ed0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 13:09:57 2017 +0200 wintrust: Increase buffer size to silence a gcc warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/asn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 035a59a..6406ba3 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -1841,10 +1841,10 @@ static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTag(DWORD dwCertEncodingType, /* The largest possible string for the first two components * is 2.175 (= 2 * 40 + 175 = 255), so this is big enough. */ - char firstTwo[6]; + char firstTwo[8]; const BYTE *ptr; - snprintf(firstTwo, sizeof(firstTwo), "%d.%d", + sprintf(firstTwo, "%d.%d", pbEncoded[1 + lenBytes] / 40, pbEncoded[1 + lenBytes] - (pbEncoded[1 + lenBytes] / 40) * 40);

1 0