September 2013 - Wine-Commits

Stefan Dösinger : d3d9/tests: Test the behavior of failing surface creation calls.
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

Module: wine Branch: master Commit: b59418d75d5b24fb87b662d2e40f5a3eee09e69d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b59418d75d5b24fb87b662d2e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 10 12:14:01 2013 +0200 d3d9/tests: Test the behavior of failing surface creation calls. --- dlls/d3d9/tests/device.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2514153..235d482 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6890,6 +6890,55 @@ out: DestroyWindow(window); } +static void test_create_rt_ds_fail(void) +{ + IDirect3DDevice9 *device; + HWND window; + HRESULT hr; + ULONG refcount; + IDirect3D9 *d3d9; + IDirect3DSurface9 *surface; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + /* Output pointer == NULL segfaults on Windows. */ + + surface = (IDirect3DSurface9 *)0xdeadbeef; + hr = IDirect3DDevice9_CreateRenderTarget(device, 4, 4, D3DFMT_D16, + D3DMULTISAMPLE_NONE, 0, FALSE, &surface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Creating a D16 render target returned hr %#x.\n", hr); + ok(surface == NULL, "Got pointer %p, expected NULL.\n", surface); + if (SUCCEEDED(hr)) + IDirect3DSurface9_Release(surface); + + surface = (IDirect3DSurface9 *)0xdeadbeef; + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 4, 4, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Creating a A8R8G8B8 depth stencil returned hr %#x.\n", hr); + ok(surface == NULL, "Got pointer %p, expected NULL.\n", surface); + if (SUCCEEDED(hr)) + IDirect3DSurface9_Release(surface); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -6982,6 +7031,7 @@ START_TEST(device) test_vidmem_accounting(); test_volume_locking(); test_update_volumetexture(); + test_create_rt_ds_fail(); } out:

1 0

Henri Verbeet : wined3d: Get rid of the special SFLAG_INTEXTURE / SFLAG_INSRGBTEX code in surface_modify_location().
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

Module: wine Branch: master Commit: c6ce5486c00b637422ec78c2dfdd584205faf5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ce5486c00b637422ec78c2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 10 09:32:32 2013 +0200 wined3d: Get rid of the special SFLAG_INTEXTURE / SFLAG_INSRGBTEX code in surface_modify_location(). It turns out this is already safe for all callers. --- dlls/wined3d/surface.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 385a994..ee404c1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5361,8 +5361,6 @@ static void surface_invalidate_location(struct wined3d_surface *surface, DWORD l void surface_modify_location(struct wined3d_surface *surface, DWORD location, BOOL persistent) { - const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; - TRACE("surface %p, location %s, persistent %#x.\n", surface, debug_surflocation(location), persistent); @@ -5371,10 +5369,6 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO && (location & SFLAG_INDRAWABLE)) ERR("Trying to invalidate the SFLAG_INDRAWABLE location of an offscreen surface.\n"); - if (location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX) - && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - location |= (SFLAG_INTEXTURE | SFLAG_INSRGBTEX); - if (persistent) { surface_validate_location(surface, location);

1 0

Ken Thomases : winemac: Don' t allow dead-key state to repeat after characters are generated.
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

Module: wine Branch: master Commit: ae2ce18fd669efb797e11ef0e614be309e83fd3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2ce18fd669efb797e11ef0e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Sep 9 22:37:36 2013 -0500 winemac: Don't allow dead-key state to repeat after characters are generated. It's fairly common in Mac keyboard layouts that, if you type a dead key twice, the second key press will both produce a non-dead character and also perpetuate the dead-key state. For example, with the U.S. layout, Option-E, E will produce "�" and Option-E, Option-E, E will produce "��". Windows keyboard layouts don't tend to do this. The second key press produces the non-dead character and clears the dead-key state. --- dlls/winemac.drv/keyboard.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 98d17ba..cc25789 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1394,7 +1394,10 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState } if (!is_menu) { - thread_data->dead_key_state = deadKeyState; + if (keyAction != kUCKeyActionUp && len > 0 && deadKeyState == thread_data->dead_key_state) + thread_data->dead_key_state = 0; + else + thread_data->dead_key_state = deadKeyState; if (keyAction == kUCKeyActionUp) goto done;

1 0

Stefan Dösinger : d3d8/tests: Test the behavior of failing surface creation calls.
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

Module: wine Branch: master Commit: 99da74fea44076ac96f20a6ebe77f0c066f9c633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99da74fea44076ac96f20a6eb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 10 12:14:00 2013 +0200 d3d8/tests: Test the behavior of failing surface creation calls. --- dlls/d3d8/tests/device.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index eb7f1f4..2b791f7 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -5320,6 +5320,56 @@ out: IDirect3D8_Release(d3d8); DestroyWindow(window); } + +static void test_create_rt_ds_fail(void) +{ + IDirect3DDevice8 *device; + HWND window; + HRESULT hr; + ULONG refcount; + IDirect3D8 *d3d8; + IDirect3DSurface8 *surface; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + /* Output pointer == NULL segfaults on Windows. */ + + surface = (IDirect3DSurface8 *)0xdeadbeef; + hr = IDirect3DDevice8_CreateRenderTarget(device, 4, 4, D3DFMT_D16, + D3DMULTISAMPLE_NONE, FALSE, &surface); + ok(hr == D3DERR_INVALIDCALL, "Creating a D16 render target returned hr %#x.\n", hr); + ok(surface == NULL, "Got pointer %p, expected NULL.\n", surface); + if (SUCCEEDED(hr)) + IDirect3DSurface8_Release(surface); + + surface = (IDirect3DSurface8 *)0xdeadbeef; + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 4, 4, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, &surface); + ok(hr == D3DERR_INVALIDCALL, "Creating a A8R8G8B8 depth stencil returned hr %#x.\n", hr); + ok(surface == NULL, "Got pointer %p, expected NULL.\n", surface); + if (SUCCEEDED(hr)) + IDirect3DSurface8_Release(surface); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -5399,6 +5449,7 @@ START_TEST(device) test_npot_textures(); test_volume_locking(); test_update_volumetexture(); + test_create_rt_ds_fail(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : d3drm: Avoid LPRECT.
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

Module: wine Branch: master Commit: 4b772c2cf2ba5fd4c43d35310c6cd1bc62e24a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b772c2cf2ba5fd4c43d35310… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 10 09:32:36 2013 +0200 d3drm: Avoid LPRECT. --- dlls/d3drm/texture.c | 7 +++---- include/d3drmobj.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index b2ea078..5ed2ad0 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -565,11 +565,10 @@ static HRESULT WINAPI IDirect3DRMTexture3Impl_InitFromResource(IDirect3DRMTextur return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMTexture3Impl_Changed(IDirect3DRMTexture3* iface, DWORD flags, DWORD nb_rects, LPRECT rects) +static HRESULT WINAPI IDirect3DRMTexture3Impl_Changed(IDirect3DRMTexture3 *iface, + DWORD flags, DWORD rect_count, RECT *rects) { - IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture3(iface); - - FIXME("(%p/%p)->(%x, %u, %p): stub\n", iface, This, flags, nb_rects, rects); + FIXME("iface %p, flags %#x, rect_count %u, rects %p stub!\n", iface, flags, rect_count, rects); return E_NOTIMPL; } diff --git a/include/d3drmobj.h b/include/d3drmobj.h index d9de5c3..89198f8 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -3442,7 +3442,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) STDMETHOD(InitFromFile)(THIS_ const char *filename) PURE; STDMETHOD(InitFromSurface)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(InitFromResource)(THIS_ HRSRC) PURE; - STDMETHOD(Changed)(THIS_ DWORD dwFlags, DWORD dwcRects, LPRECT pRects) PURE; + STDMETHOD(Changed)(THIS_ DWORD flags, DWORD rect_count, RECT *rects) PURE; STDMETHOD(SetColors)(THIS_ DWORD) PURE; STDMETHOD(SetShades)(THIS_ DWORD) PURE; STDMETHOD(SetDecalSize)(THIS_ D3DVALUE width, D3DVALUE height) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDWORD.
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

Module: wine Branch: master Commit: 39991e759a45760269ece936408cbd241a1a7c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39991e759a45760269ece9364… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 10 09:32:35 2013 +0200 d3drm: Avoid LPDWORD. --- dlls/d3drm/d3drm.c | 13 ++++--------- dlls/d3drm/device.c | 10 ++++------ dlls/d3drm/frame.c | 14 ++++---------- dlls/d3drm/texture.c | 7 +++---- include/d3drm.h | 4 ++-- include/d3drmobj.h | 22 +++++++++++----------- 6 files changed, 28 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39991e759a45760269ece…

1 0

Huw Davies : iphlpapi: Don' t set the dns server list if there are no servers.
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

Module: wine Branch: master Commit: 5bfabee8cdb23bb3b8b5e9e6f3e4fc14a93972ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bfabee8cdb23bb3b8b5e9e6f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 10 14:19:58 2013 +0100 iphlpapi: Don't set the dns server list if there are no servers. --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 837eb3d..670713f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1083,7 +1083,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P size = bytes_left -= size; } } - if (!(flags & GAA_FLAG_SKIP_DNS_SERVER)) + if (!(flags & GAA_FLAG_SKIP_DNS_SERVER) && dns_server_size) { firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)first_aa + total_size - dns_server_size - dns_suffix_size); get_dns_server_addresses(firstDns, &dns_server_size);

1 0

Stefan Dösinger : d3d8/tests: Mark YUY2 and UYVY broken.
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

Module: wine Branch: master Commit: 5b48335ce24b0518600874b7901063ef05bb0164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b48335ce24b0518600874b79… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 10 12:14:02 2013 +0200 d3d8/tests: Mark YUY2 and UYVY broken. --- dlls/d3d8/tests/device.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2b791f7..83cdaf9 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4362,8 +4362,11 @@ static void test_surface_blocks(void) * which doesn't match the format spec. On newer Nvidia cards * it has the correct 4x4 block size */ {MAKEFOURCC('A','T','I','2'), "ATI2N", 4, 4, TRUE, FALSE, FALSE}, - {D3DFMT_YUY2, "D3DFMT_YUY2", 2, 1, FALSE, FALSE, TRUE }, - {D3DFMT_UYVY, "D3DFMT_UYVY", 2, 1, FALSE, FALSE, TRUE }, + /* Windows drivers generally enforce block-aligned locks for + * YUY2 and UYVY. The notable exception is the AMD r500 driver + * in d3d8. The same driver checks the sizes in d3d9. */ + {D3DFMT_YUY2, "D3DFMT_YUY2", 2, 1, TRUE, FALSE, TRUE }, + {D3DFMT_UYVY, "D3DFMT_UYVY", 2, 1, TRUE, FALSE, TRUE }, }; static const struct {

1 0

Jactry Zeng : riched20: Add a length return parameter to ME_ToUnicode.
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

Module: wine Branch: master Commit: 1cbdb2aff7cb690be5a99ca36e994f84504e4b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cbdb2aff7cb690be5a99ca36… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Fri Sep 6 10:46:10 2013 +0800 riched20: Add a length return parameter to ME_ToUnicode. --- dlls/riched20/editor.c | 15 +++++++-------- dlls/riched20/editor.h | 2 +- dlls/riched20/string.c | 13 ++++++++++--- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f54458e..9af8a23 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3276,8 +3276,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { LPWSTR wszText; SETTEXTEX *pStruct = (SETTEXTEX *)wParam; - size_t len = 0; - int from, to; + int from, to, len; ME_Style *style; BOOL bRtf, bUnicode, bSelection; int oldModify = editor->nModifyStep; @@ -3315,8 +3314,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } } else { /* FIXME: make use of pStruct->codepage in the to unicode translation */ - wszText = lParam ? ME_ToUnicode(bUnicode, (void *)lParam) : NULL; - len = wszText ? lstrlenW(wszText) : 0; + wszText = ME_ToUnicode(bUnicode, (void *)lParam, &len); ME_InsertTextFromCursor(editor, 0, wszText, len, style); ME_EndToUnicode(bUnicode, wszText); } @@ -3505,8 +3503,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { int from, to, nStartCursor; ME_Style *style; - LPWSTR wszText = lParam ? ME_ToUnicode(unicode, (void *)lParam) : NULL; - size_t len = wszText ? lstrlenW(wszText) : 0; + int len = 0; + LPWSTR wszText = ME_ToUnicode(unicode, (void *)lParam, &len); TRACE("EM_REPLACESEL - %s\n", debugstr_w(wszText)); nStartCursor = ME_GetSelectionOfs(editor, &from, &to); @@ -3576,9 +3574,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } else { - LPWSTR wszText = ME_ToUnicode(unicode, (void *)lParam); + int textLen; + LPWSTR wszText = ME_ToUnicode(unicode, (void *)lParam, &textLen); TRACE("WM_SETTEXT - %s\n", debugstr_w(wszText)); /* debugstr_w() */ - if (lstrlenW(wszText) > 0) + if (textLen > 0) { int len = -1; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8c78447..5893051 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -109,7 +109,7 @@ void ME_StrDeleteV(ME_String *s, int nVChar, int nChars) DECLSPEC_HIDDEN; BOOL ME_InsertString(ME_String *s, int ofs, const WCHAR *insert, int len) DECLSPEC_HIDDEN; /* smart helpers for A<->W conversions, they reserve/free memory and call MultiByte<->WideChar functions */ -LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz) DECLSPEC_HIDDEN; +LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz, INT *len) DECLSPEC_HIDDEN; void ME_EndToUnicode(BOOL unicode, LPVOID psz) DECLSPEC_HIDDEN; static inline int ME_IsWSpace(WCHAR ch) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 6d7d222..f4cd320 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -172,17 +172,24 @@ ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT } } -LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz) +LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz, INT *len) { - assert(psz != NULL); + *len = 0; + if (!psz) return NULL; if (unicode) + { + *len = lstrlenW(psz); return psz; + } else { WCHAR *tmp; int nChars = MultiByteToWideChar(CP_ACP, 0, psz, -1, NULL, 0); + + if(!nChars) return NULL; + if((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) - MultiByteToWideChar(CP_ACP, 0, psz, -1, tmp, nChars); + *len = MultiByteToWideChar(CP_ACP, 0, psz, -1, tmp, nChars) - 1; return tmp; } }

1 0

Henri Verbeet : wined3d: Get rid of surface_modify_location().
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

Module: wine Branch: master Commit: d21c26e4f6e59ce7ba8a808392afdc7ba964c19a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d21c26e4f6e59ce7ba8a80839… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 10 09:32:34 2013 +0200 wined3d: Get rid of surface_modify_location(). --- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/device.c | 5 ++- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 76 +++++++++++++++--------------------- dlls/wined3d/swapchain.c | 24 +++++++---- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 56 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d21c26e4f6e59ce7ba8a8…

1 0