wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Frédéric Delanoy : French translation for release 1.7.41
by Jeremy Newman 27 Apr '15

27 Apr '15

Module: website Branch: master Commit: 7cedd393a0d4455a54c07ea5a6ef4b41ad272ecb URL: http://source.winehq.org/git/website.git/?a=commit;h=7cedd393a0d4455a54c07e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Apr 26 21:58:52 2015 +0200 French translation for release 1.7.41 --- news/fr/2015041701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2015041701.xml b/news/fr/2015041701.xml new file mode 100644 index 0000000..64e76ea --- /dev/null +++ b/news/fr/2015041701.xml @@ -0,0 +1,15 @@ +<news> +<date>17 avril 2015</date> +<title>Sortie de Wine 1.7.41</title> +<body> + La version de développement 1.7.41 de Wine est disponible. + <a href="{$root}/announce/1.7.41">Nouveautés</a> de cette version : +<ul> + <li>Dossiers spéciaux supplémentaires pris en charge dans le shell.</li> + <li>Prise en charge complémentaire des objets tâches du noyau.</li> + <li>Améliorations dans la prise en charge des patchs MSI.</li> + <li>Quelques correctifs dans la gestion des thèmes.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.41.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.41
by Jeremy Newman 27 Apr '15

27 Apr '15

Module: website Branch: master Commit: 852023262cc9e8bdff38047e46a223daf1d2b8ba URL: http://source.winehq.org/git/website.git/?a=commit;h=852023262cc9e8bdff3804… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Apr 25 19:44:52 2015 +0200 German translation for release 1.7.41 --- news/de/2015041701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2015041701.xml b/news/de/2015041701.xml new file mode 100644 index 0000000..d261540 --- /dev/null +++ b/news/de/2015041701.xml @@ -0,0 +1,16 @@ +<news> +<date>17. April 2015</date> +<title>Wine 1.7.41 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.41 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.41">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Mehr bekannte Ordner unterstützt in der Shell.</li> + <li>Ein wenig mehr Unterstützung für Kernel-Job-Objekte.</li> + <li>Mehr Verbesserungen an MSI-Patches.</li> + <li>Einige Korrekturen für grafische Themen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.41.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.40
by Jeremy Newman 27 Apr '15

27 Apr '15

Module: website Branch: master Commit: 9b502eda4fc14b045fba328c4ece625e127decf2 URL: http://source.winehq.org/git/website.git/?a=commit;h=9b502eda4fc14b045fba32… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Apr 25 19:36:11 2015 +0200 German translation for release 1.7.40 --- news/de/2015040301.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2015040301.xml b/news/de/2015040301.xml new file mode 100644 index 0000000..a007e6b --- /dev/null +++ b/news/de/2015040301.xml @@ -0,0 +1,18 @@ +<news> +<date>3. April 2015</date> +<title>Wine 1.7.40 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.40 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.40">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für Kernel-Job-Objekte.</li> + <li>Diverse Korrekturen am ListView-Steuerelement.</li> + <li>Bessere Unterstützung von OOB-Daten in Windows Sockets.</li> + <li>Unterstützung von DIB-Bildern im OLE-Datencache.</li> + <li>Verbesserte Unterstützung für MSI-Patches.</li> + <li>Einige Korrekturen an ACL-Dateiberechtigungen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.40.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

André Hentschel : Add WWN 389
by Jeremy Newman 27 Apr '15

27 Apr '15

Module: website Branch: master Commit: faddebbcbb9098285736afc8c4469643ea456309 URL: http://source.winehq.org/git/website.git/?a=commit;h=faddebbcbb9098285736af… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 25 16:32:14 2015 +0200 Add WWN 389 --- news/de/2015042501.xml | 10 + news/en/2015042501.xml | 10 + wwn/en/wn20150425_389.xml | 986 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1006 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=faddebbcbb90982857…

1 0

Alistair Leslie-Hughes : packager: Mark DllCanUnloadNow, DllGetClassObject , DllRegisterServer, DllUnregisterServer as private.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: d15ca4edb9c3823a698c4bb6137c8777e1ad08dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15ca4edb9c3823a698c4bb61… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 27 09:21:54 2015 +1000 packager: Mark DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer as private. --- dlls/packager/packager.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/packager/packager.spec b/dlls/packager/packager.spec index 5baed04..b16365d 100644 --- a/dlls/packager/packager.spec +++ b/dlls/packager/packager.spec @@ -1,4 +1,4 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Aric Stewart : comctl32: TTM_SETTOOLINFO does not change subclassing flags.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: aba3b131bc6ab9f74e9ffcaaad0019253cb3f70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba3b131bc6ab9f74e9ffcaaa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 24 07:34:59 2015 -0500 comctl32: TTM_SETTOOLINFO does not change subclassing flags. --- dlls/comctl32/tests/tooltips.c | 149 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 24 ++++--- 2 files changed, 162 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index a07a054..3382fce 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -839,6 +839,154 @@ static void test_track(void) DestroyWindow(parent); } +static LRESULT CALLBACK info_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProcA(hWnd, msg, wParam, lParam); + } + return 0; +} + +static void test_setinfo(void) +{ + WNDCLASSA wc; + LRESULT lResult; + HWND parent, parent2, hwndTip, hwndTip2; + TTTOOLINFOA toolInfo = { 0 }; + TTTOOLINFOA toolInfo2 = { 0 }; + WNDPROC wndProc; + + /* Create a class to use the custom draw wndproc */ + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = "SetInfoClass"; + wc.lpfnWndProc = info_wnd_proc; + RegisterClassA(&wc); + + /* Create a main window */ + parent = CreateWindowExA(0, "SetInfoClass", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_VISIBLE, + 50, 50, + 300, 300, + NULL, NULL, NULL, 0); + ok(parent != NULL, "Creation of main window failed\n"); + + parent2 = CreateWindowExA(0, "SetInfoClass", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_VISIBLE, + 50, 50, + 300, 300, + NULL, NULL, NULL, 0); + ok(parent2 != NULL, "Creation of main window failed\n"); + + /* Make it show */ + ShowWindow(parent2, SW_SHOWNORMAL); + flush_events(100); + + /* Create Tooltip */ + hwndTip = CreateWindowExA(WS_EX_TOPMOST, TOOLTIPS_CLASSA, + NULL, TTS_NOPREFIX | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + parent, NULL, GetModuleHandleA(NULL), 0); + ok(hwndTip != NULL, "Creation of tooltip window failed\n"); + + hwndTip2 = CreateWindowExA(WS_EX_TOPMOST, TOOLTIPS_CLASSA, + NULL, TTS_NOPREFIX | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + parent, NULL, GetModuleHandleA(NULL), 0); + ok(hwndTip2 != NULL, "Creation of tooltip window failed\n"); + + + /* Make it topmost, as per the MSDN */ + SetWindowPos(hwndTip, HWND_TOPMOST, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + /* Create a tool */ + toolInfo.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo.hwnd = parent; + toolInfo.hinst = GetModuleHandleA(NULL); + toolInfo.uFlags = TTF_SUBCLASS; + toolInfo.uId = 0x1234ABCD; + toolInfo.lpszText = (LPSTR)"This is a test tooltip"; + toolInfo.lParam = 0xdeadbeef; + GetClientRect (parent, &toolInfo.rect); + lResult = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&toolInfo); + ok(lResult, "Adding the tool to the tooltip failed\n"); + + toolInfo.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo.hwnd = parent2; + toolInfo.hinst = GetModuleHandleA(NULL); + toolInfo.uFlags = 0; + toolInfo.uId = 0x1234ABCE; + toolInfo.lpszText = (LPSTR)"This is a test tooltip"; + toolInfo.lParam = 0xdeadbeef; + GetClientRect (parent, &toolInfo.rect); + lResult = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&toolInfo); + ok(lResult, "Adding the tool to the tooltip failed\n"); + + /* Try to Remove Subclass */ + toolInfo2.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo2.hwnd = parent; + toolInfo2.uId = 0x1234ABCD; + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(toolInfo2.uFlags & TTF_SUBCLASS, "uFlags does not have subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent, GWLP_WNDPROC); + ok (wndProc != info_wnd_proc, "Window Proc is wrong\n"); + + toolInfo2.uFlags &= ~TTF_SUBCLASS; + SendMessageA(hwndTip, TTM_SETTOOLINFOA, 0, (LPARAM)&toolInfo2); + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(!(toolInfo2.uFlags & TTF_SUBCLASS), "uFlags has subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent, GWLP_WNDPROC); + ok (wndProc != info_wnd_proc, "Window Proc is wrong\n"); + + /* Try to Add Subclass */ + + /* Make it topmost, as per the MSDN */ + SetWindowPos(hwndTip2, HWND_TOPMOST, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + toolInfo2.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo2.hwnd = parent2; + toolInfo2.uId = 0x1234ABCE; + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(!(toolInfo2.uFlags & TTF_SUBCLASS), "uFlags has subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent2, GWLP_WNDPROC); + ok (wndProc == info_wnd_proc, "Window Proc is wrong\n"); + + toolInfo2.uFlags |= TTF_SUBCLASS; + SendMessageA(hwndTip, TTM_SETTOOLINFOA, 0, (LPARAM)&toolInfo2); + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(toolInfo2.uFlags & TTF_SUBCLASS, "uFlags does not have subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent2, GWLP_WNDPROC); + ok (wndProc == info_wnd_proc, "Window Proc is wrong\n"); + + /* Clean up */ + DestroyWindow(hwndTip); + DestroyWindow(hwndTip2); + DestroyWindow(parent); + DestroyWindow(parent2); +} + START_TEST(tooltips) { InitCommonControls(); @@ -850,4 +998,5 @@ START_TEST(tooltips) test_longtextA(); test_longtextW(); test_track(); + test_setinfo(); } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 5423ca5..8bf6919 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -111,6 +111,7 @@ static HICON hTooltipIcons[TTI_ERROR+1]; typedef struct { UINT uFlags; + UINT uInternalFlags; HWND hwnd; BOOL bNotifyUnicode; UINT_PTR uId; @@ -1057,11 +1058,12 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) infoPtr->uNumTools++; /* copy tool data */ - toolPtr->uFlags = ti->uFlags; - toolPtr->hwnd = ti->hwnd; - toolPtr->uId = ti->uId; - toolPtr->rect = ti->rect; - toolPtr->hinst = ti->hinst; + toolPtr->uFlags = ti->uFlags; + toolPtr->uInternalFlags = (ti->uFlags & (TTF_SUBCLASS | TTF_IDISHWND)); + toolPtr->hwnd = ti->hwnd; + toolPtr->uId = ti->uId; + toolPtr->rect = ti->rect; + toolPtr->hinst = ti->hinst; if (ti->cbSize >= TTTOOLINFOW_V1_SIZE) { if (IS_INTRESOURCE(ti->lpszText)) { @@ -1092,8 +1094,8 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->lParam = ti->lParam; /* install subclassing hook */ - if (toolPtr->uFlags & TTF_SUBCLASS) { - if (toolPtr->uFlags & TTF_IDISHWND) { + if (toolPtr->uInternalFlags & TTF_SUBCLASS) { + if (toolPtr->uInternalFlags & TTF_IDISHWND) { SetWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1, (DWORD_PTR)infoPtr->hwndSelf); } @@ -1152,8 +1154,8 @@ TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) } /* remove subclassing */ - if (toolPtr->uFlags & TTF_SUBCLASS) { - if (toolPtr->uFlags & TTF_IDISHWND) { + if (toolPtr->uInternalFlags & TTF_SUBCLASS) { + if (toolPtr->uInternalFlags & TTF_IDISHWND) { RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); } else { @@ -1918,8 +1920,8 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) } /* remove subclassing */ - if (toolPtr->uFlags & TTF_SUBCLASS) { - if (toolPtr->uFlags & TTF_IDISHWND) { + if (toolPtr->uInternalFlags & TTF_SUBCLASS) { + if (toolPtr->uInternalFlags & TTF_IDISHWND) { RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); } else {

1 0

Henri Verbeet : wined3d: Also free the input signature in shader_cleanup() (Valgrind).
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 4b86f13adef659dea80618afc5359bdeb5124e62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b86f13adef659dea80618afc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:39 2015 +0200 wined3d: Also free the input signature in shader_cleanup() (Valgrind). --- dlls/wined3d/shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2a2cf3a..d9ff768 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1862,6 +1862,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe static void shader_cleanup(struct wined3d_shader *shader) { HeapFree(GetProcessHeap(), 0, shader->output_signature.elements); + HeapFree(GetProcessHeap(), 0, shader->input_signature.elements); HeapFree(GetProcessHeap(), 0, shader->signature_strings); shader->device->shader_backend->shader_destroy(shader); HeapFree(GetProcessHeap(), 0, shader->reg_maps.constf);

1 0

Henri Verbeet : wined3d: Release the context before potentially destroying the swapchain in wined3d_device_uninit_3d () (Valgrind).
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 79f4ca9ec4dd6642c09f8f597449074a6d1c1415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f4ca9ec4dd6642c09f8f597… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:38 2015 +0200 wined3d: Release the context before potentially destroying the swapchain in wined3d_device_uninit_3d() (Valgrind). --- dlls/wined3d/device.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4954d00..0822f61 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1086,6 +1086,12 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) device->shader_backend->shader_free_private(device); destroy_dummy_textures(device, gl_info); + /* Release the context again as soon as possible. In particular, + * releasing the render target views below may release the last reference + * to the swapchain associated with this context, which in turn will + * destroy the context. */ + context_release(context); + /* Release the buffers (with sanity checks)*/ if (device->onscreen_depth_stencil) { @@ -1123,8 +1129,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) device->back_buffer_view = NULL; } - context_release(context); - for (i = 0; i < device->swapchain_count; ++i) { TRACE("Releasing the implicit swapchain %u.\n", i);

1 0

Henri Verbeet : d2d1/tests: Add a test for bitmap brushes.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 61a40b0d9c5645d74d62d176e68e811d754cfcd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a40b0d9c5645d74d62d176e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:37 2015 +0200 d2d1/tests: Add a test for bitmap brushes. --- dlls/d2d1/tests/d2d1.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3285acb..357a518 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -46,6 +46,12 @@ static void set_color(D2D1_COLOR_F *color, float r, float g, float b, float a) color->a = a; } +static void set_size_u(D2D1_SIZE_U *size, unsigned int w, unsigned int h) +{ + size->width = w; + size->height = h; +} + static void set_matrix_identity(D2D1_MATRIX_3X2_F *matrix) { matrix->_11 = 1.0f; @@ -685,9 +691,143 @@ static void test_color_brush(void) DestroyWindow(window); } +static void test_bitmap_brush(void) +{ + D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; + D2D1_MATRIX_3X2_F matrix, tmp_matrix; + D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1Bitmap *bitmap, *tmp_bitmap; + D2D1_RECT_F src_rect, dst_rect; + D2D1_EXTEND_MODE extend_mode; + IDXGISwapChain *swapchain; + ID2D1BitmapBrush *brush; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + D2D1_COLOR_F color; + D2D1_SIZE_U size; + ULONG refcount; + float opacity; + HWND window; + HRESULT hr; + + static const DWORD bitmap_data[] = + { + 0xffff0000, 0xffffff00, 0xff00ff00, 0xff00ffff, + 0xff0000ff, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + + set_size_u(&size, 4, 4); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + /* Creating a brush with a NULL bitmap crashes on Vista, but works fine on + * Windows 7+. */ + hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + ID2D1BitmapBrush_GetBitmap(brush, &tmp_bitmap); + ok(tmp_bitmap == bitmap, "Got unexpected bitmap %p, expected %p.\n", tmp_bitmap, bitmap); + ID2D1Bitmap_Release(tmp_bitmap); + opacity = ID2D1BitmapBrush_GetOpacity(brush); + ok(opacity == 1.0f, "Got unexpected opacity %.8e.\n", opacity); + set_matrix_identity(&matrix); + ID2D1BitmapBrush_GetTransform(brush, &tmp_matrix); + ok(!memcmp(&tmp_matrix, &matrix, sizeof(matrix)), + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + tmp_matrix._11, tmp_matrix._12, tmp_matrix._21, + tmp_matrix._22, tmp_matrix._31, tmp_matrix._32); + extend_mode = ID2D1BitmapBrush_GetExtendModeX(brush); + ok(extend_mode == D2D1_EXTEND_MODE_CLAMP, "Got unexpected extend mode %#x.\n", extend_mode); + extend_mode = ID2D1BitmapBrush_GetExtendModeY(brush); + ok(extend_mode == D2D1_EXTEND_MODE_CLAMP, "Got unexpected extend mode %#x.\n", extend_mode); + interpolation_mode = ID2D1BitmapBrush_GetInterpolationMode(brush); + ok(interpolation_mode == D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, + "Got unexpected interpolation mode %#x.\n", interpolation_mode); + ID2D1BitmapBrush_Release(brush); + + hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + set_matrix_identity(&matrix); + translate_matrix(&matrix, 40.0f, 120.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(brush, &matrix); + ID2D1BitmapBrush_SetInterpolationMode(brush, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + + ID2D1RenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + set_rect(&dst_rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(rt, &dst_rect, (ID2D1Brush *)brush); + + set_matrix_identity(&matrix); + scale_matrix(&matrix, 0.5f, 2.0f); + translate_matrix(&matrix, 320.0f, 240.0f); + rotate_matrix(&matrix, M_PI / 4.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_matrix_identity(&matrix); + translate_matrix(&matrix, -80.0f, -60.0f); + scale_matrix(&matrix, 40.0f, 30.0f); + ID2D1BitmapBrush_SetTransform(brush, &matrix); + ID2D1BitmapBrush_SetOpacity(brush, 0.75f); + set_rect(&dst_rect, -80.0f, -60.0f, 80.0f, 60.0f); + ID2D1RenderTarget_FillRectangle(rt, &dst_rect, (ID2D1Brush *)brush); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 200.0f, 120.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, NULL, 0.25f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + set_rect(&dst_rect, -4.0f, 12.0f, -8.0f, 8.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 0.75f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + set_rect(&dst_rect, 0.0f, 8.0f, 4.0f, 12.0f); + set_rect(&src_rect, 2.0f, 1.0f, 4.0f, 3.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + ok(compare_surface(surface, "393636185359a550d459e1e5f0e25411814f724c"), "Surface does not match.\n"); + + ID2D1BitmapBrush_Release(brush); + refcount = ID2D1Bitmap_Release(bitmap); + ok(!refcount, "Bitmap has %u references left.\n", refcount); + ID2D1RenderTarget_Release(rt); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); test_state_block(); test_color_brush(); + test_bitmap_brush(); }

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_GetInterpolationMode().
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 719dfff5bd87577ebcefe2b35aff8313e84fc00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=719dfff5bd87577ebcefe2b35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:36 2015 +0200 d2d1: Implement d2d_bitmap_brush_GetInterpolationMode(). --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index c15945a..f2cb99e 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -599,9 +599,11 @@ static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeY(ID2D1B static D2D1_BITMAP_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetInterpolationMode(ID2D1BitmapBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p.\n", iface); - return D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR; + return brush->u.bitmap.interpolation_mode; } static void STDMETHODCALLTYPE d2d_bitmap_brush_GetBitmap(ID2D1BitmapBrush *iface, ID2D1Bitmap **bitmap)

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
46
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 April 2015