wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Józef Kucia : d3d10core/tests: Add test for creating SRV with DXGI_FORMAT_UNKNOWN.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: 6e7fe14ba5b971e8f7a777180cec20a16a380380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7fe14ba5b971e8f7a777180… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 4 11:43:30 2016 +0100 d3d10core/tests: Add test for creating SRV with DXGI_FORMAT_UNKNOWN. 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 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index d644603..26e7e44 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1143,6 +1143,22 @@ static void test_create_shader_resource_view(void) if (SUCCEEDED(hr)) IUnknown_Release(iface); ID3D10ShaderResourceView_Release(srview); + + srv_desc.Format = DXGI_FORMAT_UNKNOWN; + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, &srv_desc, &srview); + ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x.\n", hr); + + memset(&srv_desc, 0, sizeof(srv_desc)); + ID3D10ShaderResourceView_GetDesc(srview, &srv_desc); + todo_wine ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); + ok(srv_desc.ViewDimension == D3D10_SRV_DIMENSION_TEXTURE2D, + "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); + ok(U(srv_desc).Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", + U(srv_desc).Texture2D.MostDetailedMip); + ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + + ID3D10ShaderResourceView_Release(srview); + ID3D10Texture2D_Release(texture); refcount = ID3D10Device_Release(device);

1 0

Józef Kucia : d3d11/tests: Add test for creating SRV with DXGI_FORMAT_UNKNOWN.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: c7d18b39a92fd3722d5823cde8eb4ba591ab7872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d18b39a92fd3722d5823cde… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 4 11:43:29 2016 +0100 d3d11/tests: Add test for creating SRV with DXGI_FORMAT_UNKNOWN. 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 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 878cab8..e8934fb 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1551,6 +1551,22 @@ static void test_create_shader_resource_view(void) ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); ID3D11ShaderResourceView_Release(srview); + + srv_desc.Format = DXGI_FORMAT_UNKNOWN; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, &srv_desc, &srview); + ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x.\n", hr); + + memset(&srv_desc, 0, sizeof(srv_desc)); + ID3D11ShaderResourceView_GetDesc(srview, &srv_desc); + todo_wine ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); + ok(srv_desc.ViewDimension == D3D11_SRV_DIMENSION_TEXTURE2D, + "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); + ok(U(srv_desc).Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", + U(srv_desc).Texture2D.MostDetailedMip); + ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + + ID3D11ShaderResourceView_Release(srview); + ID3D11Texture2D_Release(texture); refcount = ID3D11Device_Release(device);

1 0

Józef Kucia : d3d11: Sync formats with dxgi.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: 012b282ffac7de5460e4e2dbe887085ec0dbe377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=012b282ffac7de5460e4e2dbe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 4 11:43:28 2016 +0100 d3d11: Sync formats with dxgi. 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/utils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 6c6212c..d05ff3d 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -143,6 +143,9 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM_SRGB); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8X8_TYPELESS); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM_SRGB); + WINE_D3D_TO_STR(DXGI_FORMAT_BC7_TYPELESS); + WINE_D3D_TO_STR(DXGI_FORMAT_BC7_UNORM); + WINE_D3D_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB); default: FIXME("Unrecognized DXGI_FORMAT %#x.\n", format); return "unrecognized"; @@ -248,6 +251,9 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_B8G8R8A8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; case WINED3DFMT_B8G8R8X8_TYPELESS: return DXGI_FORMAT_B8G8R8X8_TYPELESS; case WINED3DFMT_B8G8R8X8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB; + case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; + case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; + case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; default: FIXME("Unhandled wined3d format %#x.\n", format); return DXGI_FORMAT_UNKNOWN; @@ -351,6 +357,9 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: return WINED3DFMT_B8G8R8A8_UNORM_SRGB; case DXGI_FORMAT_B8G8R8X8_TYPELESS: return WINED3DFMT_B8G8R8X8_TYPELESS; case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: return WINED3DFMT_B8G8R8X8_UNORM_SRGB; + case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; + case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; + case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; default: FIXME("Unhandled DXGI_FORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN;

1 0

Józef Kucia : dxgi: Add recently introduced wined3d formats.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: 71e35c46b05fcbf87c06309771158bf0df8863f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e35c46b05fcbf87c0630977… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 4 11:43:27 2016 +0100 dxgi: Add recently introduced wined3d formats. 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/dxgi/utils.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 92a049f..dea1b69 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -120,8 +120,15 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_DXGI_TO_STR(DXGI_FORMAT_B5G5R5A1_UNORM); WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM); WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM); + WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8A8_TYPELESS); + WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM_SRGB); + WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8X8_TYPELESS); + WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM_SRGB); + WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_TYPELESS); + WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM); + WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB); default: - FIXME("Unrecognized DXGI_FORMAT %#x\n", format); + FIXME("Unrecognized DXGI_FORMAT %#x.\n", format); return "unrecognized"; } } @@ -221,6 +228,13 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_B5G5R5A1_UNORM: return DXGI_FORMAT_B5G5R5A1_UNORM; case WINED3DFMT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; case WINED3DFMT_B8G8R8X8_UNORM: return DXGI_FORMAT_B8G8R8X8_UNORM; + case WINED3DFMT_B8G8R8A8_TYPELESS: return DXGI_FORMAT_B8G8R8A8_TYPELESS; + case WINED3DFMT_B8G8R8A8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; + case WINED3DFMT_B8G8R8X8_TYPELESS: return DXGI_FORMAT_B8G8R8X8_TYPELESS; + case WINED3DFMT_B8G8R8X8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB; + case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; + case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; + case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; default: FIXME("Unhandled wined3d format %#x.\n", format); return DXGI_FORMAT_UNKNOWN; @@ -320,8 +334,15 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_B5G5R5A1_UNORM: return WINED3DFMT_B5G5R5A1_UNORM; case DXGI_FORMAT_B8G8R8A8_UNORM: return WINED3DFMT_B8G8R8A8_UNORM; case DXGI_FORMAT_B8G8R8X8_UNORM: return WINED3DFMT_B8G8R8X8_UNORM; + case DXGI_FORMAT_B8G8R8A8_TYPELESS: return WINED3DFMT_B8G8R8A8_TYPELESS; + case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: return WINED3DFMT_B8G8R8A8_UNORM_SRGB; + case DXGI_FORMAT_B8G8R8X8_TYPELESS: return WINED3DFMT_B8G8R8X8_TYPELESS; + case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: return WINED3DFMT_B8G8R8X8_UNORM_SRGB; + case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; + case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; + case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; default: - FIXME("Unhandled DXGI_FORMAT %#x\n", format); + FIXME("Unhandled DXGI_FORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN; } }

1 0

Nikolay Sivov : d3drm: Remove first found callback, not all of them.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: d5d1a288e9bc7a108a6b7b46e22ca2d617df88b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d1a288e9bc7a108a6b7b46e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 4 07:20:18 2016 +0300 d3drm: Remove first found callback, not all of them. 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/d3drm/d3drm_main.c | 5 +++-- dlls/d3drm/tests/d3drm.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index 62ad5b9..67d1ad1 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -77,17 +77,18 @@ HRESULT d3drm_object_add_destroy_callback(struct d3drm_object *object, D3DRMOBJE HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) { - struct destroy_callback *callback, *callback2; + struct destroy_callback *callback; if (!cb) return D3DRMERR_BADVALUE; - LIST_FOR_EACH_ENTRY_SAFE(callback, callback2, &object->destroy_callbacks, struct destroy_callback, entry) + LIST_FOR_EACH_ENTRY(callback, &object->destroy_callbacks, struct destroy_callback, entry) { if (callback->cb == cb && callback->ctx == ctx) { list_remove(&callback->entry); HeapFree(GetProcessHeap(), 0, callback); + break; } } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 77b4d59..8a125fc 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1355,6 +1355,26 @@ static void test_Viewport(void) IDirect3DRMViewport_Release(viewport); ok(context.called == 3, "got %d, expected 3\n", context.called); + /* test this pattern - add cb1, add cb2, add cb1, delete cb1 */ + hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback1, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_DeleteDestroyCallback(viewport, destroy_callback, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + context.called = 0; + IDirect3DRMViewport_Release(viewport); + ok(context.called == 2, "got %d, expected 2\n", context.called); + /* destroy from Viewport2 */ hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); @@ -1395,6 +1415,30 @@ static void test_Viewport(void) IDirect3DRMViewport2_Release(viewport2); ok(context.called == 3, "got %d, expected 3\n", context.called); + /* test this pattern - add cb1, add cb2, add cb1, delete cb1 */ + hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + IDirect3DRMViewport_Release(viewport); + + hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback1, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport2_DeleteDestroyCallback(viewport2, destroy_callback, &context); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + context.called = 0; + IDirect3DRMViewport2_Release(viewport2); + ok(context.called == 2, "got %d, expected 2\n", context.called); + IDirect3DRMFrame_Release(frame); IDirect3DRMDevice_Release(device); IDirectDrawClipper_Release(pClipper);

1 0

Nikolay Sivov : ole32: Hold a lock when checking is spy is already registered.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: 7c0b1b62688258c3478b218e62691a44295f57c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0b1b62688258c3478b218e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 4 11:24:32 2016 +0300 ole32: Hold a lock when checking is spy is already registered. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 7469fb2..c9e5625 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -467,11 +467,12 @@ HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy) TRACE("%p\n", pMallocSpy); if(!pMallocSpy) return E_INVALIDARG; - if(Malloc32.pSpy) return CO_E_OBJISREG; EnterCriticalSection(&IMalloc32_SpyCS); - if (SUCCEEDED(IMallocSpy_QueryInterface(pMallocSpy, &IID_IMallocSpy, (void**)&pSpy))) { + if (Malloc32.pSpy) + hres = CO_E_OBJISREG; + else if (SUCCEEDED(IMallocSpy_QueryInterface(pMallocSpy, &IID_IMallocSpy, (void**)&pSpy))) { Malloc32.pSpy = pSpy; hres = S_OK; }

1 0

Nikolay Sivov : ole32: Improve CoRegisterMallocSpy/ CoRevokeMallocSpy state and parameter validation.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: cef4c7dc69bf9c76db9e8c04438575ca9e4ee5b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef4c7dc69bf9c76db9e8c044… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 4 11:24:31 2016 +0300 ole32: Improve CoRegisterMallocSpy/CoRevokeMallocSpy state and parameter validation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 7 +++++-- dlls/ole32/tests/compobj.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 0ca9b71..7469fb2 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -464,8 +464,9 @@ HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy) IMallocSpy* pSpy; HRESULT hres = E_INVALIDARG; - TRACE("\n"); + TRACE("%p\n", pMallocSpy); + if(!pMallocSpy) return E_INVALIDARG; if(Malloc32.pSpy) return CO_E_OBJISREG; EnterCriticalSection(&IMalloc32_SpyCS); @@ -504,7 +505,9 @@ HRESULT WINAPI CoRevokeMallocSpy(void) EnterCriticalSection(&IMalloc32_SpyCS); - if (Malloc32.SpyedAllocationsLeft) { + if (!Malloc32.pSpy) + hres = CO_E_OBJNOTREG; + else if (Malloc32.SpyedAllocationsLeft) { TRACE("SpyReleasePending with %u allocations left\n", Malloc32.SpyedAllocationsLeft); Malloc32.SpyReleasePending = TRUE; hres = E_ACCESSDENIED; diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 39beee4..b88029f 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3051,9 +3051,21 @@ static void test_IMallocSpy(void) IMalloc *imalloc; HRESULT hr; + hr = CoRegisterMallocSpy(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = CoRevokeMallocSpy(); + ok(hr == CO_E_OBJNOTREG, "got 0x%08x\n", hr); + hr = CoRegisterMallocSpy(&testspy); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = CoRegisterMallocSpy(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = CoRegisterMallocSpy(&testspy); + ok(hr == CO_E_OBJISREG, "got 0x%08x\n", hr); + imalloc = NULL; hr = CoGetMalloc(MEMCTX_TASK, &imalloc); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3065,6 +3077,9 @@ static void test_IMallocSpy(void) hr = CoRevokeMallocSpy(); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoRevokeMallocSpy(); + ok(hr == CO_E_OBJNOTREG, "got 0x%08x\n", hr); } static void init_funcs(void)

1 0

Nikolay Sivov : ole32: Don't call spy on IMalloc::Free(NULL).
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: 110665a3d88d68e0076a435c1e6a1522a964942c URL: http://source.winehq.org/git/wine.git/?a=commit;h=110665a3d88d68e0076a435c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 4 11:24:30 2016 +0300 ole32: Don't call spy on IMalloc::Free(NULL). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 3 + dlls/ole32/tests/compobj.c | 135 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 6868897..0ca9b71 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -257,6 +257,9 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) TRACE("(%p)\n",pv); + if(!pv) + return; + if(Malloc32.pSpy) { EnterCriticalSection(&IMalloc32_SpyCS); fSpyed = RemoveMemoryLocation(pv); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index de511ab..39beee4 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2933,6 +2933,140 @@ static void test_CoGetApartmentType(void) CoUninitialize(); } + +static HRESULT WINAPI testspy_QI(IMallocSpy *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMallocSpy) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMallocSpy_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI testspy_AddRef(IMallocSpy *iface) +{ + return 2; +} + +static ULONG WINAPI testspy_Release(IMallocSpy *iface) +{ + return 1; +} + +static SIZE_T WINAPI testspy_PreAlloc(IMallocSpy *iface, SIZE_T cb) +{ + ok(0, "unexpected call\n"); + return 0; +} + +static void* WINAPI testspy_PostAlloc(IMallocSpy *iface, void *ptr) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static void* WINAPI testspy_PreFree(IMallocSpy *iface, void *ptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static void WINAPI testspy_PostFree(IMallocSpy *iface, BOOL spyed) +{ + ok(0, "unexpected call\n"); +} + +static SIZE_T WINAPI testspy_PreRealloc(IMallocSpy *iface, void *ptr, SIZE_T cb, void **newptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return 0; +} + +static void* WINAPI testspy_PostRealloc(IMallocSpy *iface, void *ptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static void* WINAPI testspy_PreGetSize(IMallocSpy *iface, void *ptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static SIZE_T WINAPI testspy_PostGetSize(IMallocSpy *iface, SIZE_T actual, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return 0; +} + +static void* WINAPI testspy_PreDidAlloc(IMallocSpy *iface, void *ptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static int WINAPI testspy_PostDidAlloc(IMallocSpy *iface, void *ptr, BOOL spyed, int actual) +{ + ok(0, "unexpected call\n"); + return 0; +} + +static void WINAPI testspy_PreHeapMinimize(IMallocSpy *iface) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI testspy_PostHeapMinimize(IMallocSpy *iface) +{ + ok(0, "unexpected call\n"); +} + +static const IMallocSpyVtbl testspyvtbl = +{ + testspy_QI, + testspy_AddRef, + testspy_Release, + testspy_PreAlloc, + testspy_PostAlloc, + testspy_PreFree, + testspy_PostFree, + testspy_PreRealloc, + testspy_PostRealloc, + testspy_PreGetSize, + testspy_PostGetSize, + testspy_PreDidAlloc, + testspy_PostDidAlloc, + testspy_PreHeapMinimize, + testspy_PostHeapMinimize +}; + +static IMallocSpy testspy = { &testspyvtbl }; + +static void test_IMallocSpy(void) +{ + IMalloc *imalloc; + HRESULT hr; + + hr = CoRegisterMallocSpy(&testspy); + ok(hr == S_OK, "got 0x%08x\n", hr); + + imalloc = NULL; + hr = CoGetMalloc(MEMCTX_TASK, &imalloc); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(imalloc != NULL, "got %p\n", imalloc); + + IMalloc_Free(imalloc, NULL); + + IMalloc_Release(imalloc); + + hr = CoRevokeMallocSpy(); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -3000,4 +3134,5 @@ START_TEST(compobj) test_CoGetMalloc(); test_OleRegGetUserType(); test_CoGetApartmentType(); + test_IMallocSpy(); }

1 0

Michael Stefaniuc : gdi32/tests: Use SetRectEmpty() instead of open coding it.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: a23038217d865bbe101c15e076721420e5fa2d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a23038217d865bbe101c15e07… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 3 09:59:16 2016 +0100 gdi32/tests: Use SetRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 09c05c1..c9b7b31 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -891,7 +891,7 @@ static void test_boundsrect(void) ret = GetBoundsRect(hdc, &rect, 0); ok(ret == DCB_RESET, "Expected GetBoundsRect to return DCB_RESET, got %u\n", ret); - SetRect(&expect, 0, 0, 0, 0); + SetRectEmpty(&expect); ok(EqualRect(&rect, &expect) || broken(EqualRect(&rect, &set_rect)), /* nt4 sp1-5 */ "Expected output rectangle (0,0)-(0,0), got (%d,%d)-(%d,%d)\n", @@ -986,7 +986,7 @@ static void test_boundsrect(void) "GetBoundsRect returned %x\n", ret); if (ret == DCB_RESET) { - SetRect(&expect, 0, 0, 0, 0); + SetRectEmpty(&expect); ok(EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom); @@ -995,7 +995,7 @@ static void test_boundsrect(void) ok(ret == (DCB_RESET | DCB_DISABLE), "SetBoundsRect returned %x\n", ret); ret = GetBoundsRect(hdc, &rect, 0); ok(ret == DCB_RESET, "GetBoundsRect returned %x\n", ret); - SetRect(&expect, 0, 0, 0, 0); + SetRectEmpty(&expect); ok(EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom); }

1 0

Aric Stewart : hidclass.sys: Handle failure to parse preparseData.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: 5fb6a94bb9c5688a27b01cf65bdec0774b481a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb6a94bb9c5688a27b01cf65… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 3 12:53:06 2016 -0600 hidclass.sys: Handle failure to parse preparseData. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 24dd140..5de7522 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -212,8 +212,16 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) } ext->preparseData = ParseDescriptor(reportDescriptor, descriptor.DescriptorList[0].wReportLength); - ext->information.DescriptorSize = ext->preparseData->dwSize; + HeapFree(GetProcessHeap(), 0, reportDescriptor); + if (!ext->preparseData) + { + ERR("Cannot parse Report Descriptor\n"); + HID_DeleteDevice(&minidriver->minidriver, device); + return STATUS_NOT_SUPPORTED; + } + + ext->information.DescriptorSize = ext->preparseData->dwSize; serial[0] = 0; status = call_minidriver(IOCTL_HID_GET_STRING, device,

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2016