March 2017 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp140: Add __crtSetThreadpoolWait implementation.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 10266f5bf5a4fb4be34e3ec94a17785ed6534f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10266f5bf5a4fb4be34e3ec94… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 10 17:33:51 2017 +0100 msvcp140: Add __crtSetThreadpoolWait implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 054540a..2c25ccb 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3777,7 +3777,7 @@ @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub __crtSetFileInformationByHandle @ cdecl __crtSetThreadpoolTimer(ptr ptr long long) MSVCP__crtSetThreadpoolTimer -@ stub __crtSetThreadpoolWait +@ cdecl __crtSetThreadpoolWait(ptr long ptr) MSVCP__crtSetThreadpoolWait @ stub __crtWaitForThreadpoolTimerCallbacks @ stub __set_stl_sync_api_mode @ cdecl xtime_get(ptr long) xtime_get diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 433153a..c0a3421 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1296,6 +1296,15 @@ PTP_WAIT CDECL MSVCP__crtCreateThreadpoolWait(PTP_WAIT_CALLBACK callback, return CreateThreadpoolWait(callback, userdata, environment); } +/********************************************************************* + * __crtSetThreadpoolWait (MSVCP140.@) + */ +VOID CDECL MSVCP__crtSetThreadpoolWait(TP_WAIT *wait, HANDLE handle, FILETIME *due_time) +{ + TRACE("(%p %p %p)\n", wait, handle, due_time); + return SetThreadpoolWait(wait, handle, due_time); +} + /* ?_Execute_once(a)std@@YAHAAUonce_flag(a)1@P6GHPAX1PAPAX(a)Z1@Z */ /* ?_Execute_once(a)std@@YAHAEAUonce_flag(a)1@P6AHPEAX1PEAPEAX(a)Z1@Z */ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param)

1 0

Austin English : ntoskrnl.exe: Add KeWaitForMultipleObjects stub.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: ce9b40d79bdf8668344a91719d2f6384afd2ddf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce9b40d79bdf8668344a91719… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 24 15:35:23 2014 -0600 ntoskrnl.exe: Add KeWaitForMultipleObjects stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b72f42c..f022f4c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1999,6 +1999,19 @@ NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object, } /*********************************************************************** + * KeWaitForMultipleObjects (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG Count, PVOID Object[], WAIT_TYPE WaitType, + KWAIT_REASON WaitReason, KPROCESSOR_MODE WaitMode, + BOOLEAN Alertable, PLARGE_INTEGER Timeout, + PKWAIT_BLOCK WaitBlockArray) +{ + FIXME( "stub: %u, %p, %d, %d, %d, %d, %p, %p\n", Count, Object, WaitType, WaitReason, WaitMode, + Alertable, Timeout, WaitBlockArray ); + return STATUS_NOT_IMPLEMENTED; +} + +/*********************************************************************** * IoRegisterFileSystem (NTOSKRNL.EXE.@) */ VOID WINAPI IoRegisterFileSystem(PDEVICE_OBJECT DeviceObject) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index e223ead..7cd5146 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -629,7 +629,7 @@ @ stub KeUpdateRunTime @ stub KeUpdateSystemTime @ stub KeUserModeCallback -@ stub KeWaitForMultipleObjects +@ stdcall KeWaitForMultipleObjects(long ptr long long long long ptr ptr) @ stdcall KeWaitForMutexObject(ptr long long long ptr) @ stdcall KeWaitForSingleObject(ptr long long long ptr) @ stub KiBugCheckData

1 0

Matteo Bruni : wined3d: Don't advertise unsupported shader versions.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 09483c68016b00b492db8ea112a68641b1ca7ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09483c68016b00b492db8ea11… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 10 00:31:59 2017 +0100 wined3d: Don't advertise unsupported shader versions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 490fcbf..fe6e8c8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9551,6 +9551,9 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s caps->ps_version = min(wined3d_settings.max_sm_ps, shader_model); caps->cs_version = min(wined3d_settings.max_sm_cs, shader_model); + caps->vs_version = gl_info->supported[ARB_VERTEX_SHADER] ? caps->vs_version : 0; + caps->ps_version = gl_info->supported[ARB_FRAGMENT_SHADER] ? caps->ps_version : 0; + caps->vs_uniform_count = min(WINED3D_MAX_VS_CONSTS_F, gl_info->limits.glsl_vs_float_constants); caps->ps_uniform_count = min(WINED3D_MAX_PS_CONSTS_F, gl_info->limits.glsl_ps_float_constants); caps->varying_count = gl_info->limits.glsl_varyings;

1 0

Józef Kucia : d3d11/tests: Fix render target format in test_resinfo_instruction().
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: f58fe845b52ab0bf2b9d9b088c984347468f2e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58fe845b52ab0bf2b9d9b088… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 10 09:11:00 2017 +0100 d3d11/tests: Fix render target format in test_resinfo_instruction(). 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 94a5a8f..2bcbec8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14069,7 +14069,7 @@ static void test_resinfo_instruction(void) texture_desc.Height = 64; texture_desc.MipLevels = 1; texture_desc.ArraySize = 1; - texture_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; texture_desc.Usage = D3D11_USAGE_DEFAULT;

1 0

André Hentschel : iphlpapi: Add stub for NotifyUnicastIpAddressChange.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 0bf31be76e1b8152238f4da88eceec1645729197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf31be76e1b8152238f4da88… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 8 21:22:22 2017 +0100 iphlpapi: Add stub for NotifyUnicastIpAddressChange. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 12 ++++++++++++ include/netioapi.h | 11 +++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 1a1f8f7..d69b80e 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -239,7 +239,7 @@ @ stub NotifyRouteChangeEx #@ stub NotifyStableUnicastIpAddressTable #@ stub NotifyTeredoPortChange -#@ stub NotifyUnicastIpAddressChange +@ stdcall NotifyUnicastIpAddressChange(long ptr ptr long ptr) #@ stub NTPTimeToNTFileTime #@ stub NTTimeToNTPTime #@ stub ParseNetworkString diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 12767c3..51d05ed 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2674,6 +2674,18 @@ DWORD WINAPI NotifyRouteChange(PHANDLE Handle, LPOVERLAPPED overlapped) /****************************************************************** + * NotifyUnicastIpAddressChange (IPHLPAPI.@) + */ +DWORD WINAPI NotifyUnicastIpAddressChange(ADDRESS_FAMILY family, PUNICAST_IPADDRESS_CHANGE_CALLBACK callback, + PVOID context, BOOLEAN init_notify, PHANDLE handle) +{ + FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", + family, callback, context, init_notify, handle); + if (handle) *handle = NULL; + return ERROR_NOT_SUPPORTED; +} + +/****************************************************************** * SendARP (IPHLPAPI.@) * * Send an ARP request. diff --git a/include/netioapi.h b/include/netioapi.h index 2faa5d6..7c4917b 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -21,6 +21,14 @@ #include <ntddndis.h> +typedef enum _MIB_NOTIFICATION_TYPE +{ + MibParameterNotification, + MibAddInstance, + MibDeleteInstance, + MibInitialNotification, +} MIB_NOTIFICATION_TYPE, *PMIB_NOTIFICATION_TYPE; + typedef struct _MIB_IF_ROW2 { NET_LUID InterfaceLuid; @@ -98,6 +106,9 @@ typedef struct _MIB_UNICASTIPADDRESS_ROW LARGE_INTEGER CreationTimeStamp; } MIB_UNICASTIPADDRESS_ROW, *PMIB_UNICASTIPADDRESS_ROW; +typedef VOID (WINAPI *PUNICAST_IPADDRESS_CHANGE_CALLBACK)(PVOID, PMIB_UNICASTIPADDRESS_ROW, + MIB_NOTIFICATION_TYPE); + DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID*,NET_LUID*); DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX,NET_LUID*); DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID*,GUID*);

1 0

Józef Kucia : d3d10core/tests: Add test for unbinding shader resource view.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 241e99dc24815b2cff651f725cf97581e4eaa837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=241e99dc24815b2cff651f725… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 10 09:10:59 2017 +0100 d3d10core/tests: Add test for unbinding shader resource view. 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 | 88 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index fda0c64..7819362 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -10558,6 +10558,93 @@ static void test_shader_input_registers_limits(void) release_test_context(&test_context); } +static void test_unbind_shader_resource_view(void) +{ + struct d3d10core_test_context test_context; + D3D10_SUBRESOURCE_DATA resource_data; + ID3D10ShaderResourceView *srv, *srv2; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Texture2D *texture; + ID3D10PixelShader *ps; + ID3D10Device *device; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture2D t0; + Texture2D t1; + SamplerState s; + + float4 main() : SV_Target + { + return min(t0.Sample(s, float2(0, 0)) + t1.Sample(s, float2(0, 0)), 1.0f); + } +#endif + 0x43425844, 0x698dc0cb, 0x0bf322b8, 0xee127418, 0xfe9214ce, 0x00000001, 0x00000168, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000f0, 0x00000040, 0x0000003c, + 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04001858, + 0x00107000, 0x00000001, 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, + 0x0c000045, 0x001000f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0c000045, 0x001000f2, 0x00000001, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00107e46, 0x00000001, 0x00106000, 0x00000000, + 0x07000000, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x0a000033, + 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, + 0x3f800000, 0x0100003e, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD texture_data[] = {0xff00ff00}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 0; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = sizeof(texture_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); + ID3D10Device_PSSetShaderResources(device, 1, 1, &srv); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + + srv2 = NULL; + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv2); + ID3D10Device_PSSetShaderResources(device, 1, 1, &srv2); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + todo_wine check_texture_color(test_context.backbuffer, 0x00000000, 1); + + ID3D10PixelShader_Release(ps); + ID3D10ShaderResourceView_Release(srv); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_stencil_separate(void) { struct d3d10core_test_context test_context; @@ -11527,6 +11614,7 @@ START_TEST(device) test_required_format_support(); test_ddy(); test_shader_input_registers_limits(); + test_unbind_shader_resource_view(); test_stencil_separate(); test_sm4_ret_instruction(); test_primitive_restart();

1 0

Henri Verbeet : usp10: Use heap_free() instead of HeapFree().
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: c3dc9edc256d215bfa78f2e91eab5de910b99bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3dc9edc256d215bfa78f2e91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 9 10:37:08 2017 +0100 usp10: Use heap_free() instead of HeapFree(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 14 +++++------ dlls/usp10/breaking.c | 4 ++-- dlls/usp10/shape.c | 64 +++++++++++++++++++++++++-------------------------- 3 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3dc9edc256d215bfa78f…

1 0

Matteo Bruni : wined3d: Use the MAX_TEXTURES define in a few more places.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 72deec5295587b918f3b0d19400a3d8dfe19520c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72deec5295587b918f3b0d194… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 10 00:32:01 2017 +0100 wined3d: Use the MAX_TEXTURES define in a few more places. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/ati_fragment_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 04ff803..341bd9b 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -53,7 +53,7 @@ struct atifs_ffp_desc struct ffp_frag_desc parent; GLuint shader; unsigned int num_textures_used; - enum atifs_constant_value constants[8]; + enum atifs_constant_value constants[MAX_TEXTURES]; }; struct atifs_private_data @@ -938,7 +938,7 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], constants[ATIFS_CONST_TFACTOR - GL_CON_0_ATI] = ATIFS_CONSTANT_TFACTOR; /* Assign unused constants to avoid reloading due to unused <-> bump matrix switches. */ - for (stage = 0; stage < 8; ++stage) + for (stage = 0; stage < MAX_TEXTURES; ++stage) { if (constants[stage] == ATIFS_CONSTANT_UNUSED) constants[stage] = ATIFS_CONSTANT_BUMP; @@ -1062,7 +1062,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined GL_EXTCALL(glBindFragmentShaderATI(desc->shader)); ctx_priv->last_shader = desc; - for (i = 0; i < 8; i++) + for (i = 0; i < MAX_TEXTURES; i++) { if (last_shader && last_shader->constants[i] == desc->constants[i]) continue;

1 0

Matteo Bruni : d3d9/tests: Skip UpdateTexture tests if texture filtering isn't supported.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 7ea7680966502c13e89ddf64a3ec13ea2b161a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea7680966502c13e89ddf64a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 10 00:32:00 2017 +0100 d3d9/tests: Skip UpdateTexture tests if texture filtering isn't supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 41a883d..a615596 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19772,9 +19772,15 @@ static void test_updatetexture(void) skip("%s textures not supported, skipping some tests.\n", texture_types[t].name); continue; } - if (FAILED(IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, texture_types[t].type, MAKEFOURCC('A','T','I','2')))) + D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_FILTER, texture_types[t].type, D3DFMT_A8R8G8B8))) + { + skip("%s D3DFMT_A8R8G8B8 texture filtering is not supported, skipping some tests.\n", + texture_types[t].name); + continue; + } + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_FILTER, texture_types[t].type, MAKEFOURCC('A','T','I','2')))) { skip("%s ATI2N textures are not supported, skipping some tests.\n", texture_types[t].name); ati2n_supported = FALSE;

1 0

Matteo Bruni : ddraw/tests: Add a ddraw4 vertex buffer refcount test.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 444475fb4a81f2139673ab25e27b8905c7acabb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444475fb4a81f2139673ab25e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 10 00:31:57 2017 +0100 ddraw/tests: Add a ddraw4 vertex buffer refcount test. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 4c15e0b..dfdf4ce 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -13386,6 +13386,70 @@ done: DestroyWindow(window); } +static void test_vb_refcount(void) +{ + ULONG prev_d3d_refcount, prev_device_refcount; + ULONG cur_d3d_refcount, cur_device_refcount; + IDirect3DVertexBuffer *vb, *vb1; + IDirect3DVertexBuffer7 *vb7; + D3DVERTEXBUFFERDESC vb_desc; + IDirect3DDevice3 *device; + IDirect3D3 *d3d; + ULONG refcount; + IUnknown *unk; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d3_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); + + prev_d3d_refcount = get_refcount((IUnknown *)d3d); + prev_device_refcount = get_refcount((IUnknown *)device); + + memset(&vb_desc, 0, sizeof(vb_desc)); + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwFVF = D3DFVF_XYZ; + vb_desc.dwNumVertices = 4; + hr = IDirect3D3_CreateVertexBuffer(d3d, &vb_desc, &vb, 0, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + cur_d3d_refcount = get_refcount((IUnknown *)d3d); + cur_device_refcount = get_refcount((IUnknown *)device); + ok(cur_d3d_refcount == prev_d3d_refcount, "D3D object refcount changed from %u to %u.\n", + prev_d3d_refcount, cur_d3d_refcount); + ok(cur_device_refcount == prev_device_refcount, "Device refcount changed from %u to %u.\n", + prev_device_refcount, cur_device_refcount); + + hr = IDirect3DVertexBuffer_QueryInterface(vb, &IID_IDirect3DVertexBuffer, (void **)&vb1); + ok(hr == DD_OK, "Failed to query IDirect3DVertexBuffer, hr %#x.\n", hr); + IDirect3DVertexBuffer_Release(vb1); + + hr = IDirect3DVertexBuffer_QueryInterface(vb, &IID_IDirect3DVertexBuffer7, (void **)&vb7); + ok(hr == E_NOINTERFACE, "Querying IDirect3DVertexBuffer7 returned unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer_QueryInterface(vb, &IID_IUnknown, (void **)&unk); + ok(hr == DD_OK, "Failed to query IUnknown, hr %#x.\n", hr); + ok((IUnknown *)vb == unk, + "IDirect3DVertexBuffer and IUnknown interface pointers don't match, %p != %p.\n", vb, unk); + IUnknown_Release(unk); + + refcount = IDirect3DVertexBuffer_Release(vb); + ok(!refcount, "Vertex buffer has %u references left.\n", refcount); + IDirect3D3_Release(d3d); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { IDirectDraw4 *ddraw; @@ -13490,4 +13554,5 @@ START_TEST(ddraw4) test_surface_desc_size(); test_get_surface_from_dc(); test_ck_operation(); + test_vb_refcount(); }

1 0