January 2016 - Wine-commits

André Hentschel : htaccess: Use https for wiki.winehq.org
by Jeremy Newman 20 Jan '16

20 Jan '16

Module: website Branch: master Commit: 68df846195e0c5b3901dc920fdba9f269c14c3e9 URL: http://source.winehq.org/git/website.git/?a=commit;h=68df846195e0c5b3901dc9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 20 20:12:31 2016 +0100 htaccess: Use https for wiki.winehq.org Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/htaccess.sample | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index 775e8ad..e969153 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -40,35 +40,35 @@ RedirectPermanent /download.shtml https://www.winehq.org/download RedirectPermanent /download.html https://www.winehq.org/download RedirectPermanent /download-mirrors.html https://www.winehq.org/download RedirectPermanent /download-mirrors.shtml https://www.winehq.org/download -RedirectPermanent /site/download-deb http://wiki.winehq.org/Debian -RedirectPermanent /download/debian http://wiki.winehq.org/Debian -RedirectPermanent /download/ubuntu http://wiki.winehq.org/Ubuntu +RedirectPermanent /site/download-deb https://wiki.winehq.org/Debian +RedirectPermanent /download/debian https://wiki.winehq.org/Debian +RedirectPermanent /download/ubuntu https://wiki.winehq.org/Ubuntu RedirectPermanent /site/getting_help https://www.winehq.org/help RedirectPermanent /support.shtml https://www.winehq.org/help RedirectPermanent /News/status.html https://www.winehq.org/status -RedirectPermanent /wiki http://wiki.winehq.org/ -RedirectPermanent /faq http://wiki.winehq.org/FAQ -RedirectPermanent /site/faq http://wiki.winehq.org/FAQ -RedirectPermanent /FAQ http://wiki.winehq.org/FAQ -RedirectPermanent /site/docs/wine-faq/index http://wiki.winehq.org/FAQ +RedirectPermanent /wiki https://wiki.winehq.org/ +RedirectPermanent /faq https://wiki.winehq.org/FAQ +RedirectPermanent /site/faq https://wiki.winehq.org/FAQ +RedirectPermanent /FAQ https://wiki.winehq.org/FAQ +RedirectPermanent /site/docs/wine-faq/index https://wiki.winehq.org/FAQ RedirectPermanent /screenshots https://appdb.winehq.org/ RedirectPermanent /site/screenshots https://appdb.winehq.org/ -RedirectPermanent /howto http://wiki.winehq.org/HowTo -RedirectPermanent /site/howto http://wiki.winehq.org/HowTo -RedirectPermanent /myths http://wiki.winehq.org/Debunking_Wine_Myths -RedirectPermanent /site/myths http://wiki.winehq.org/Debunking_Wine_Myths -RedirectPermanent /cvs http://wiki.winehq.org/GitWine -RedirectPermanent /site/cvs http://wiki.winehq.org/GitWine -RedirectPermanent /git http://wiki.winehq.org/GitWine -RedirectPermanent /site/git http://wiki.winehq.org/GitWine -RedirectPermanent /site/who http://wiki.winehq.org/WhosWho -RedirectPermanent /todo http://wiki.winehq.org/KnownIssues -RedirectPermanent /site/history http://wiki.winehq.org/WineHistory -RedirectPermanent /fun_projects http://wiki.winehq.org/Fun_Projects -RedirectPermanent /winelib http://wiki.winehq.org/Winelib +RedirectPermanent /howto https://wiki.winehq.org/HowTo +RedirectPermanent /site/howto https://wiki.winehq.org/HowTo +RedirectPermanent /myths https://wiki.winehq.org/Debunking_Wine_Myths +RedirectPermanent /site/myths https://wiki.winehq.org/Debunking_Wine_Myths +RedirectPermanent /cvs https://wiki.winehq.org/GitWine +RedirectPermanent /site/cvs https://wiki.winehq.org/GitWine +RedirectPermanent /git https://wiki.winehq.org/GitWine +RedirectPermanent /site/git https://wiki.winehq.org/GitWine +RedirectPermanent /site/who https://wiki.winehq.org/WhosWho +RedirectPermanent /todo https://wiki.winehq.org/KnownIssues +RedirectPermanent /site/history https://wiki.winehq.org/WineHistory +RedirectPermanent /fun_projects https://wiki.winehq.org/Fun_Projects +RedirectPermanent /winelib https://wiki.winehq.org/Winelib RedirectMatch ^/download/deb.*$ https://www.winehq.org/download/ -RedirectMatch ^/site/wineconf/?$ http://wiki.winehq.org/WineConf -RedirectMatch ^/wineconf/?$ http://wiki.winehq.org/WineConf +RedirectMatch ^/site/wineconf/?$ https://wiki.winehq.org/WineConf +RedirectMatch ^/wineconf/?$ https://wiki.winehq.org/WineConf # fix documentation links RedirectMatch ^/docs/wineusr-guide$ https://www.winehq.org/docs/wineusr-guide/index @@ -86,7 +86,7 @@ RedirectMatch ^/docs/([a-z-]+)/$ https://www.winehq.org/docs/$1/i RedirectMatch ^/(APPS|Apps|apps)$ https://appdb.winehq.org/ RedirectMatch ^/(APPS|Apps|apps)/query\.cgi$ https://appdb.winehq.org/ RedirectMatch ^/apps\.cgi$ https://appdb.winehq.org/ -RedirectMatch ^/(FAQ|Faq)$ http://wiki.winehq.org/FAQ +RedirectMatch ^/(FAQ|Faq)$ https://wiki.winehq.org/FAQ RedirectMatch ^/(BUGS|Bugs|bugs)$ https://bugs.winehq.org/ RedirectMatch ^/(TROUBLE|Trouble|trouble)$ https://wiki.winehq.org/FAQ

1 0

Akihiro Sagawa : comctl32: Prevent invalid focus change notifications from LVS_OWNERDATA lists.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: af4a757ad2cacbd238486632d0f7bd6f0a94483f URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4a757ad2cacbd238486632d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 20 22:34:42 2016 +0900 comctl32: Prevent invalid focus change notifications from LVS_OWNERDATA lists. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 68a5515..419a823 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8808,6 +8808,7 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl if (infoPtr->dwStyle & LVS_OWNERDATA) { INT nOldCount = infoPtr->nItemCount; + infoPtr->nItemCount = nItems; if (nItems < nOldCount) { @@ -8820,7 +8821,6 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl } } - infoPtr->nItemCount = nItems; LISTVIEW_UpdateScroll(infoPtr); /* the flags are valid only in ownerdata report and list modes */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 2afa44d..a6910d2 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3418,6 +3418,28 @@ static void test_ownerdata(void) style = GetWindowLongPtrA(hwnd, GWL_STYLE); ok(style & LVS_SORTDESCENDING, "Expected LVS_SORTDESCENDING to be set\n"); DestroyWindow(hwnd); + + /* The focused item is updated after the invalidation */ + hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 3, 0); + expect(TRUE, res); + + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 0, 0); + expect(TRUE, res); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "ownerdata setitemcount", FALSE); + + res = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + expect(-1, res); + DestroyWindow(hwnd); } static void test_norecompute(void)

1 0

Stefan Dösinger : d3d8: Don' t validate 2D texture lock coordinates.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: a2d3b3a5a58cdacb8bf09cb927a3421d9e3cc32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2d3b3a5a58cdacb8bf09cb92… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jan 18 22:20:05 2016 +0000 d3d8: Don't validate 2D texture lock coordinates. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/surface.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 679f094..ec263b1 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -204,26 +204,36 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, struct wined3d_box box; struct wined3d_map_desc map_desc; HRESULT hr; + D3DRESOURCETYPE type; TRACE("iface %p, locked_rect %p, rect %s, flags %#x.\n", iface, locked_rect, wine_dbgstr_rect(rect), flags); wined3d_mutex_lock(); + + if (surface->texture) + type = IDirect3DBaseTexture8_GetType(&surface->texture->IDirect3DBaseTexture8_iface); + else + type = D3DRTYPE_SURFACE; + if (rect) { D3DSURFACE_DESC desc; IDirect3DSurface8_GetDesc(iface, &desc); - if ((rect->left < 0) + if (type != D3DRTYPE_TEXTURE + && ((rect->left < 0) || (rect->top < 0) || (rect->left >= rect->right) || (rect->top >= rect->bottom) || (rect->right > desc.Width) - || (rect->bottom > desc.Height)) + || (rect->bottom > desc.Height))) { WARN("Trying to lock an invalid rectangle, returning D3DERR_INVALIDCALL\n"); wined3d_mutex_unlock(); + locked_rect->Pitch = 0; + locked_rect->pBits = NULL; return D3DERR_INVALIDCALL; } box.left = rect->left; @@ -243,7 +253,7 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, locked_rect->Pitch = map_desc.row_pitch; locked_rect->pBits = map_desc.data; } - else + else if (type != D3DRTYPE_TEXTURE) { locked_rect->Pitch = 0; locked_rect->pBits = NULL;

1 0

Stefan Dösinger : d3d8/tests: Test invalid locks with textures.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: e6cf8ba609f33a528f7fddbcb6e1ad681e69feca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6cf8ba609f33a528f7fddbcb… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jan 18 22:20:06 2016 +0000 d3d8/tests: Test invalid locks with textures. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 300 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 245 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6cf8ba609f33a528f7fd…

1 0

Stefan Dösinger : d3d9/tests: Test invalid locks with textures.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: 062c0a90a250d95cb086303ae4e2c5292229b205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=062c0a90a250d95cb086303ae… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jan 18 22:20:07 2016 +0000 d3d9/tests: Test invalid locks with textures. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 286 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 231 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=062c0a90a250d95cb0863…

1 0

Stefan Dösinger : d3d8/tests: Block validation checks the surface size too.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: 5b63c93f3e0b5ba21195a90db3aef170df9c6df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b63c93f3e0b5ba21195a90db… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jan 18 22:20:09 2016 +0000 d3d8/tests: Block validation checks the surface size too. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 18ea559..c1dc886 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -5350,7 +5350,7 @@ static void test_surface_blocks(void) IDirect3DSurface8 *surface; D3DLOCKED_RECT locked_rect; IDirect3DDevice8 *device; - unsigned int i, j, w, h; + unsigned int i, j, k, w, h; IDirect3D8 *d3d; ULONG refcount; HWND window; @@ -5358,6 +5358,21 @@ static void test_surface_blocks(void) RECT rect; BOOL tex_pow2, cube_pow2; D3DCAPS8 caps; + static const RECT invalid[] = + { + {60, 60, 60, 68}, /* 0 height */ + {60, 60, 68, 60}, /* 0 width */ + {68, 60, 60, 68}, /* left > right */ + {60, 68, 68, 60}, /* top > bottom */ + {-8, 60, 0, 68}, /* left < surface */ + {60, -8, 68, 0}, /* top < surface */ + {-16, 60, -8, 68}, /* right < surface */ + {60, -16, 68, -8}, /* bottom < surface */ + {60, 60, 136, 68}, /* right > surface */ + {60, 60, 68, 136}, /* bottom > surface */ + {136, 60, 144, 68}, /* left > surface */ + {60, 136, 68, 144}, /* top > surface */ + }; window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -5573,6 +5588,19 @@ static void test_surface_blocks(void) } } + for (k = 0; k < sizeof(invalid) / sizeof(*invalid); ++k) + { + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, &invalid[k], 0); + ok(FAILED(hr) == !pools[j].success, "Invalid lock %s(%#x), expected %s, format %s, pool %s, case %u.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", hr, pools[j].success ? "success" : "failure", + formats[i].name, pools[j].name, k); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + } + } + SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height); hr = IDirect3DSurface8_LockRect(surface, &locked_rect, &rect, 0); ok(hr == D3D_OK, "Got unexpected hr %#x for format %s, pool %s.\n", hr, formats[i].name, pools[j].name);

1 0

Józef Kucia : wined3d: Do not update surface when empty box is passed.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: 3d7c666005d5aac1c810dcf1fc82498df8d9b91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7c666005d5aac1c810dcf1f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 19 22:28:05 2016 +0100 wined3d: Do not update surface when empty box is passed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7c5a4c2..d308083 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4070,7 +4070,8 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str if (box) { if (box->left >= box->right || box->right > sub_resource->width - || box->top >= box->bottom || box->bottom > sub_resource->height) + || box->top >= box->bottom || box->bottom > sub_resource->height + || box->front >= box->back) { WARN("Invalid box (%u, %u, %u)->(%u, %u, %u) specified.\n", box->left, box->top, box->front, box->right, box->bottom, box->back);

1 0

Józef Kucia : d3d11/tests: Extend test for ID3D11DeviceContext::UpdateSubresource().
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: 8330635c93c392b4f1e12c1127dd5682cb6c1ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8330635c93c392b4f1e12c112… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 19 22:28:06 2016 +0100 d3d11/tests: Extend test for ID3D11DeviceContext::UpdateSubresource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5c6efaf..cb3f185 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4227,6 +4227,9 @@ static void test_update_subresource(void) set_box(&box, 4, 4, 0, 3, 1, 1); ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)texture, 0, &box, bitmap_data, sizeof(*bitmap_data), 0); + set_box(&box, 0, 0, 0, 4, 4, 0); + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)texture, 0, &box, + bitmap_data, 4 * sizeof(*bitmap_data), 0); ID3D11DeviceContext_Draw(context, 4, 0); get_texture_readback(backbuffer, &rb); for (i = 0; i < 4; ++i)

1 0

Józef Kucia : d3d10core/tests: Extend test for ID3D10Device::UpdateSubresource().
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: f26e13f38f68716fead0d363d62db686e41571b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26e13f38f68716fead0d363d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 19 22:28:07 2016 +0100 d3d10core/tests: Extend test for ID3D10Device::UpdateSubresource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5d2b4c4..ba35e0d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -4582,6 +4582,9 @@ static void test_update_subresource(void) set_box(&box, 4, 4, 0, 3, 1, 1); ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, 0, &box, bitmap_data, sizeof(*bitmap_data), 0); + set_box(&box, 0, 0, 0, 4, 4, 0); + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, 0, &box, + bitmap_data, 4 * sizeof(*bitmap_data), 0); ID3D10Device_Draw(device, 4, 0); get_texture_readback(backbuffer, &rb); for (i = 0; i < 4; ++i)

1 0

Nikolay Sivov : d2d1: Don't update target dpi if only one SetDpi() argument is zero.
by Alexandre Julliard 20 Jan '16

20 Jan '16

Module: wine Branch: master Commit: c05dd9e11f74d16d568e5a59cbc2459ba658e8ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c05dd9e11f74d16d568e5a59c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 00:43:33 2016 +0300 d2d1: Don't update target dpi if only one SetDpi() argument is zero. 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 | 2 ++ dlls/d2d1/tests/d2d1.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 21c3125..fba1738 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1436,6 +1436,8 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetDpi(ID2D1RenderTarget *if dpi_x = 96.0f; dpi_y = 96.0f; } + else if (dpi_x == 0.0f || dpi_y == 0.0f) + return; render_target->dpi_x = dpi_x; render_target->dpi_y = dpi_y; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b721c26..7c554d2 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -587,6 +587,19 @@ static void test_clip(void) ok(dpi_x == 96.0f, "Got unexpected dpi_x %.8e.\n", dpi_x); ok(dpi_y == 96.0f, "Got unexpected dpi_y %.8e.\n", dpi_y); + ID2D1RenderTarget_SetDpi(rt, 192.0f, 192.0f); + ID2D1RenderTarget_SetDpi(rt, 0.0f, 96.0f); + ID2D1RenderTarget_GetDpi(rt, &dpi_x, &dpi_y); + ok(dpi_x == 192.0f, "Got unexpected dpi_x %.8e.\n", dpi_x); + ok(dpi_y == 192.0f, "Got unexpected dpi_y %.8e.\n", dpi_y); + + ID2D1RenderTarget_SetDpi(rt, 96.0f, 0.0f); + ID2D1RenderTarget_GetDpi(rt, &dpi_x, &dpi_y); + ok(dpi_x == 192.0f, "Got unexpected dpi_x %.8e.\n", dpi_x); + ok(dpi_y == 192.0f, "Got unexpected dpi_y %.8e.\n", dpi_y); + + ID2D1RenderTarget_SetDpi(rt, 96.0f, 96.0f); + /* Transformations apply to clip rects, the effective clip rect is the * (axis-aligned) bounding box of the transformed clip rect. */ set_point(&point, 320.0f, 240.0f);

1 0