- wine-devel - winehq.org

[PATCH vkd3d 06/10] vkd3d: Add FIXME() for ignored SampleDesc.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 5e401fdd9523..446e1a65029d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2180,6 +2180,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ds_desc_from_d3d12(&graphics->ds_desc, &desc->DepthStencilState); + if (desc->SampleDesc.Count != 1) + FIXME("Ignoring sample desc %u, %u.\n", desc->SampleDesc.Count, desc->SampleDesc.Quality); + graphics->root_signature = root_signature; state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; -- 2.16.4

2 1

[PATCH v2] kernel32: add stub for GetApplicationRestartSettings
by Louis Lenders 27 Aug '18

27 Aug '18

v2: Removed SetLastError and return E_NOTIMPL Found this trying to start newest firefox 61.0.2. This prevents crashing it. (note: also removed a superfluous extra empty line few lines above this change) To: wine-devel <wine-devel(a)winehq.org> Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 +++++++++- include/winbase.h | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c53276c70a..f1d75b8e1c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -543,7 +543,7 @@ @ stdcall GetActiveProcessorCount(long) @ stdcall GetActiveProcessorGroupCount() # @ stub GetApplicationRecoveryCallback -# @ stub GetApplicationRestartSettings +@ stdcall GetApplicationRestartSettings(long ptr ptr ptr) @ stdcall GetAtomNameA(long ptr long) @ stdcall GetAtomNameW(long ptr long) @ stdcall GetBinaryType(str ptr) GetBinaryTypeA diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d615f06c4a..ad61d18dbe 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3953,7 +3953,6 @@ BOOL WINAPI CmdBatNotification( BOOL bBatchRunning ) return FALSE; } - /*********************************************************************** * RegisterApplicationRestart (KERNEL32.@) */ @@ -4023,6 +4022,15 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK return E_FAIL; } +/*********************************************************************** + * GetApplicationRestartSettings (KERNEL32.@) + */ +HRESULT WINAPI GetApplicationRestartSettings(HANDLE process, WCHAR *cmdline, DWORD *size, DWORD *flags) +{ + FIXME("%p, %p, %p, %p)\n", process, cmdline, size, flags); + return E_NOTIMPL; +} + /********************************************************************** * GetNumaHighestNodeNumber (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index aa57dae818..8b26308b95 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2038,6 +2038,7 @@ WINBASEAPI BOOL WINAPI FreeResource(HGLOBAL); WINADVAPI PVOID WINAPI FreeSid(PSID); WINADVAPI BOOL WINAPI GetAce(PACL,DWORD,LPVOID*); WINADVAPI BOOL WINAPI GetAclInformation(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +WINBASEAPI HRESULT WINAPI GetApplicationRestartSettings(HANDLE,WCHAR*,DWORD*,DWORD*); WINBASEAPI UINT WINAPI GetAtomNameA(ATOM,LPSTR,INT); WINBASEAPI UINT WINAPI GetAtomNameW(ATOM,LPWSTR,INT); #define GetAtomName WINELIB_NAME_AW(GetAtomName) -- 2.17.1

1 0

[PATCH] kernel32: add stub for GetApplicationRestartSettings
by Louis Lenders 27 Aug '18

27 Aug '18

Found this trying to start newest firefox 61.0.2. This prevents crashing it. (note: also removed a superfluous extra emply line few lines above this change) Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 11 ++++++++++- include/winbase.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c53276c70a..f1d75b8e1c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -543,7 +543,7 @@ @ stdcall GetActiveProcessorCount(long) @ stdcall GetActiveProcessorGroupCount() # @ stub GetApplicationRecoveryCallback -# @ stub GetApplicationRestartSettings +@ stdcall GetApplicationRestartSettings(long ptr ptr ptr) @ stdcall GetAtomNameA(long ptr long) @ stdcall GetAtomNameW(long ptr long) @ stdcall GetBinaryType(str ptr) GetBinaryTypeA diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d615f06c4a..b2e3aeee98 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3953,7 +3953,6 @@ BOOL WINAPI CmdBatNotification( BOOL bBatchRunning ) return FALSE; } - /*********************************************************************** * RegisterApplicationRestart (KERNEL32.@) */ @@ -4023,6 +4022,16 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK return E_FAIL; } +/*********************************************************************** + * GetApplicationRestartSettings (KERNEL32.@) + */ +HRESULT WINAPI GetApplicationRestartSettings(HANDLE process, WCHAR *cmdline, DWORD *size, DWORD *flags) +{ + FIXME("%p, %p, %p, %p)\n", process, cmdline, size, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return E_FAIL; +} + /********************************************************************** * GetNumaHighestNodeNumber (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index aa57dae818..8b26308b95 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2038,6 +2038,7 @@ WINBASEAPI BOOL WINAPI FreeResource(HGLOBAL); WINADVAPI PVOID WINAPI FreeSid(PSID); WINADVAPI BOOL WINAPI GetAce(PACL,DWORD,LPVOID*); WINADVAPI BOOL WINAPI GetAclInformation(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +WINBASEAPI HRESULT WINAPI GetApplicationRestartSettings(HANDLE,WCHAR*,DWORD*,DWORD*); WINBASEAPI UINT WINAPI GetAtomNameA(ATOM,LPSTR,INT); WINBASEAPI UINT WINAPI GetAtomNameW(ATOM,LPWSTR,INT); #define GetAtomName WINELIB_NAME_AW(GetAtomName) -- 2.17.1

2 2

[PATCH vkd3d 09/10] tests: Add test for clearing 3D textures.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7261e89e82df..1c6b65fa758a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3311,10 +3311,12 @@ static void test_clear_render_target_view(void) ID3D12DescriptorHeap *rtv_heap; D3D12_CLEAR_VALUE clear_value; struct test_context_desc desc; + struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *resource; ID3D12Device *device; + D3D12_BOX box; HRESULT hr; memset(&desc, 0, sizeof(desc)); @@ -3388,6 +3390,48 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(resource, 0, queue, command_list, 0xbf95bc59, 2); + /* 3D texture */ + ID3D12Resource_Release(resource); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D; + resource_desc.DepthOrArraySize = 32; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + ID3D12Device_CreateRenderTargetView(device, resource, NULL, rtv_handle); + + reset_command_list(command_list, context.allocator); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, color, 0, NULL); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(resource, 0, queue, command_list, 0xbf4c7f19, 2); + + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE3D; + rtv_desc.Texture3D.FirstWSlice = 2; + rtv_desc.Texture3D.WSize = 2; + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, green, 0, NULL); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 0, 32, 32, 2); + check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + set_box(&box, 0, 0, 2, 32, 32, 4); + check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + set_box(&box, 0, 0, 4, 32, 32, 32); + check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + release_resource_readback(&rb); + ID3D12Resource_Release(resource); ID3D12DescriptorHeap_Release(rtv_heap); destroy_test_context(&context); -- 2.16.4

1 0

[PATCH vkd3d 05/10] vkd3d: Add support for 2D array texture views.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d9cc48db319e..77a346ea7df7 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1489,6 +1489,17 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (desc->u.Texture2D.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); break; + case D3D12_SRV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.Texture2DArray.MipLevels; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + if (desc->u.Texture2DArray.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + if (desc->u.Texture2DArray.ResourceMinLODClamp) + FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2DArray.ResourceMinLODClamp); + break; case D3D12_SRV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MostDetailedMip; @@ -1878,6 +1889,14 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); break; + case D3D12_RTV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + if (desc->u.Texture2DArray.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + break; case D3D12_RTV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; @@ -1962,6 +1981,12 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev case D3D12_DSV_DIMENSION_TEXTURE2D: vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; break; + case D3D12_DSV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } -- 2.16.4

1 0

[PATCH vkd3d 04/10] vkd3d: Add support for 3D texture views.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 71 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index faf9a710cef1..d9cc48db319e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -309,8 +309,7 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, static unsigned int max_miplevel_count(const D3D12_RESOURCE_DESC *desc) { unsigned int size = max(desc->Width, desc->Height); - if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) - size = max(size, desc->DepthOrArraySize); + size = max(size, d3d12_resource_desc_get_depth(desc, 0)); return vkd3d_log2i(size) + 1; } @@ -339,6 +338,8 @@ static HRESULT vkd3d_create_image(struct d3d12_resource *resource, struct d3d12_ if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D && desc->Width == desc->Height && desc->DepthOrArraySize >= 6) image_info.flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + image_info.flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR; image_info.imageType = vk_image_type_from_d3d12_resource_dimension(desc->Dimension); image_info.format = format->vk_format; @@ -1311,7 +1312,7 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, desc->miplevel_idx = 0; desc->miplevel_count = is_srv ? VK_REMAINING_MIP_LEVELS : 1; desc->layer_idx = 0; - desc->layer_count = VK_REMAINING_ARRAY_LAYERS; + desc->layer_count = d3d12_resource_desc_get_layer_count(&resource->desc); switch (resource->desc.Dimension) { @@ -1488,6 +1489,13 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (desc->u.Texture2D.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); break; + case D3D12_SRV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.Texture3D.MipLevels; + if (desc->u.Texture3D.ResourceMinLODClamp) + FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); + break; case D3D12_SRV_DIMENSION_TEXTURECUBE: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_CUBE; vkd3d_desc.miplevel_idx = desc->u.TextureCube.MostDetailedMip; @@ -1612,27 +1620,30 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, if (desc) { - if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2D) - { - if (desc->u.Texture2D.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); - - vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; - } - else if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2DARRAY) - { - if (desc->u.Texture2DArray.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); - - vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; - vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; - vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; - vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; - } - else + switch (desc->ViewDimension) { - WARN("Unexpected view dimension %#x.\n", desc->ViewDimension); - return; + case D3D12_UAV_DIMENSION_TEXTURE2D: + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; + if (desc->u.Texture2D.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + break; + case D3D12_UAV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + if (desc->u.Texture2DArray.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + break; + case D3D12_UAV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; + if (desc->u.Texture3D.FirstWSlice || desc->u.Texture3D.WSize != resource->desc.DepthOrArraySize) + FIXME("Unhandled depth view %u-%u.\n", + desc->u.Texture3D.FirstWSlice, desc->u.Texture3D.WSize); + break; + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } } @@ -1867,10 +1878,22 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); break; + case D3D12_RTV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture3D.FirstWSlice; + vkd3d_desc.layer_count = desc->u.Texture3D.WSize; + break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } } + else if (resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + { + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.layer_idx = 0; + vkd3d_desc.layer_count = resource->desc.DepthOrArraySize; + } if (!(view = vkd3d_view_create())) return; @@ -1885,7 +1908,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev rtv_desc->format = vkd3d_desc.format->vk_format; rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); - rtv_desc->layer_count = resource->desc.DepthOrArraySize; + rtv_desc->layer_count = vkd3d_desc.layer_count; rtv_desc->view = view; rtv_desc->resource = resource; } -- 2.16.4

1 0

[PATCH vkd3d 03/10] vkd3d: Add support for default 3D texture views.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 03015bf45cbd..faf9a710cef1 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1325,6 +1325,11 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; break; + case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + desc->view_type = VK_IMAGE_VIEW_TYPE_3D; + desc->layer_count = 1; + break; + default: FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); return false; @@ -1909,6 +1914,12 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev return; } + if (resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + { + WARN("Cannot create DSV for 3D texture.\n"); + return; + } + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0, VKD3D_VIEW_TYPE_DSV)) return; -- 2.16.4

1 0

[PATCH vkd3d 02/10] vkd3d: Add support for default 1D texture views.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d4d1b38f7496..03015bf45cbd 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1308,15 +1308,21 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return false; } + desc->miplevel_idx = 0; + desc->miplevel_count = is_srv ? VK_REMAINING_MIP_LEVELS : 1; + desc->layer_idx = 0; + desc->layer_count = VK_REMAINING_ARRAY_LAYERS; + switch (resource->desc.Dimension) { + case D3D12_RESOURCE_DIMENSION_TEXTURE1D: + desc->view_type = resource->desc.DepthOrArraySize > 1 + ? VK_IMAGE_VIEW_TYPE_1D_ARRAY : VK_IMAGE_VIEW_TYPE_1D; + break; + case D3D12_RESOURCE_DIMENSION_TEXTURE2D: desc->view_type = resource->desc.DepthOrArraySize > 1 ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; - desc->miplevel_idx = 0; - desc->miplevel_count = is_srv ? VK_REMAINING_MIP_LEVELS : 1; - desc->layer_idx = 0; - desc->layer_count = VK_REMAINING_ARRAY_LAYERS; break; default: @@ -1337,7 +1343,7 @@ static VkResult vkd3d_create_texture_view(struct d3d12_device *device, struct VkImageViewCreateInfo view_desc; VkResult vr; - assert(resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D); + assert(d3d12_resource_is_texture(resource)); view_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; view_desc.pNext = NULL; -- 2.16.4

1 0

[PATCH 1/4] wined3d: Add max_rt_count field to d3d_info.
by Józef Kucia 27 Aug '18

27 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/cs.c | 17 +++++++++-------- dlls/wined3d/device.c | 22 ++++++++++++++-------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8c1cce457ed0..af17df83cd02 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3657,6 +3657,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); + d3d_info->limits.max_rt_count = gl_info->limits.buffers; d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7bd51f4c2a19..ecfce4181235 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -588,7 +588,7 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - unsigned int rt_count = cs->device->adapter->gl_info.limits.buffers; + unsigned int rt_count = cs->device->adapter->d3d_info.limits.max_rt_count; const struct wined3d_state *state = &cs->device->state; const struct wined3d_viewport *vp = &state->viewports[0]; struct wined3d_rendertarget_view *view; @@ -839,6 +839,7 @@ void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_shader *geometry_shader; struct wined3d_state *state = &cs->state; @@ -893,7 +894,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) if (state->textures[i]) wined3d_resource_release(&state->textures[i]->resource); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { if (state->fb->render_targets[i]) wined3d_resource_release(state->fb->render_targets[i]->resource); @@ -906,7 +907,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } static void acquire_graphics_pipeline_resources(const struct wined3d_state *state, - BOOL indexed, const struct wined3d_gl_info *gl_info) + BOOL indexed, const struct wined3d_d3d_info *d3d_info) { unsigned int i; @@ -927,7 +928,7 @@ static void acquire_graphics_pipeline_resources(const struct wined3d_state *stat if (state->textures[i]) wined3d_resource_acquire(&state->textures[i]->resource); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { if (state->fb->render_targets[i]) wined3d_resource_acquire(state->fb->render_targets[i]->resource); @@ -943,7 +944,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; @@ -959,7 +960,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned op->parameters.u.direct.instance_count = instance_count; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(state, indexed, gl_info); + acquire_graphics_pipeline_resources(state, indexed, d3d_info); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -967,7 +968,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, struct wined3d_buffer *buffer, unsigned int offset, BOOL indexed) { - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; @@ -980,7 +981,7 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, op->parameters.u.indirect.offset = offset; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(state, indexed, gl_info); + acquire_graphics_pipeline_resources(state, indexed, d3d_info); wined3d_resource_acquire(&buffer->resource); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab67a967a3fa..96b8d3c247d6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -970,7 +970,7 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi BOOL ds_enable = swapchain->desc.enable_auto_depth_stencil; unsigned int i; - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -1240,7 +1240,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) ERR("Something's still holding the auto depth/stencil view (%p).\n", view); } - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -4380,11 +4380,14 @@ void CDECL wined3d_device_clear_unordered_access_view_uint(struct wined3d_device struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, unsigned int view_idx) { + unsigned int max_rt_count; + TRACE("device %p, view_idx %u.\n", device, view_idx); - if (view_idx >= device->adapter->gl_info.limits.buffers) + max_rt_count = device->adapter->d3d_info.limits.max_rt_count; + if (view_idx >= max_rt_count) { - WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", max_rt_count); return NULL; } @@ -4402,13 +4405,15 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport) { struct wined3d_rendertarget_view *prev; + unsigned int max_rt_count; TRACE("device %p, view_idx %u, view %p, set_viewport %#x.\n", device, view_idx, view, set_viewport); - if (view_idx >= device->adapter->gl_info.limits.buffers) + max_rt_count = device->adapter->d3d_info.limits.max_rt_count; + if (view_idx >= max_rt_count) { - WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", max_rt_count); return WINED3DERR_INVALIDCALL; } @@ -4706,6 +4711,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state) { + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; struct wined3d_view_desc view_desc; @@ -4739,7 +4745,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state_unbind_resources(&device->state); } - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -5038,7 +5044,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso if (device->d3d_initialized) { - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < ARRAY_SIZE(device->fb.render_targets); ++i) { if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource) ERR("Resource %p is still in use as render target %u.\n", resource, i); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 774cd48caec6..8fa3a2492dfe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2201,7 +2201,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->AdapterOrdinalInGroup = 0; caps->NumberOfAdaptersInGroup = 1; - caps->NumSimultaneousRTs = gl_info->limits.buffers; + caps->NumSimultaneousRTs = d3d_info->limits.max_rt_count; caps->StretchRectFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | WINED3DPTFILTERCAPS_MAGFPOINT | diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de0b4867de79..bc031890960e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -164,6 +164,7 @@ struct wined3d_d3d_limits unsigned int ffp_vertex_blend_matrices; unsigned int active_light_count; + unsigned int max_rt_count; float pointsize_max; }; -- 2.16.4

2 1

[PATCH 2/4] wined3d: Pass context to wined3d_texture_set_compatible_renderbuffer().
by Józef Kucia 27 Aug '18

27 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/texture.c | 7 +++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9d2236bc17a0..a4cfd66dfc42 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -608,7 +608,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, } else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D) { - wined3d_texture_set_compatible_renderbuffer(ds_texture, ds_level, &render_targets[0]); + wined3d_texture_set_compatible_renderbuffer(ds_texture, context, ds_level, &render_targets[0]); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7cc03fe4821e..f72442d1ddfe 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1453,15 +1453,14 @@ HRESULT CDECL wined3d_texture_set_color_key(struct wined3d_texture *texture, /* TODO: We should synchronize the renderbuffer's content with the texture's content. */ /* Context activation is done by the caller. */ void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, - unsigned int level, const struct wined3d_rendertarget_info *rt) + struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) { + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_renderbuffer_entry *entry; - const struct wined3d_gl_info *gl_info; unsigned int src_width, src_height; unsigned int width, height; GLuint renderbuffer = 0; - gl_info = &texture->resource.device->adapter->gl_info; if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) return; @@ -1528,7 +1527,7 @@ void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture texture->current_renderbuffer = entry; } - checkGLcall("set_compatible_renderbuffer"); + checkGLcall("set compatible renderbuffer"); } HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bc031890960e..8da12d7cf3f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3366,7 +3366,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, +void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, -- 2.16.4

2 1

[PATCH 4/4] dxgi: Choose exact formats for D3D12 swapchain fallback formats.
by Józef Kucia 27 Aug '18

27 Aug '18

Mainly to avoid gamma correction issues. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 83e0f256748f..101f2d185e17 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1694,6 +1694,32 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return TRUE; } +static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) +{ + switch (vk_format) + { + case VK_FORMAT_B8G8R8A8_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; + case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; + case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; + default: + WARN("Unhandled format %#x.\n", vk_format); + return DXGI_FORMAT_UNKNOWN; + } +} + +static VkFormat get_swapchain_fallback_format(VkFormat vk_format) +{ + switch (vk_format) + { + case VK_FORMAT_R8G8B8A8_SRGB: return VK_FORMAT_B8G8R8A8_SRGB; + case VK_FORMAT_R8G8B8A8_UNORM: return VK_FORMAT_B8G8R8A8_UNORM; + default: + WARN("Unhandled format %#x.\n", vk_format); + return VK_FORMAT_UNDEFINED; + } +} + static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, VkPhysicalDevice vk_physical_device, VkSurfaceKHR vk_surface, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat *vk_format) @@ -1734,10 +1760,11 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, if (i == format_count) { /* Try to create a swapchain with format conversion. */ + format = get_swapchain_fallback_format(format); WARN("Failed to find Vulkan swapchain format for %s.\n", debug_dxgi_format(swapchain_desc->Format)); for (i = 0; i < format_count; ++i) { - if (formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) + if (formats[i].format == format && formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) { format = formats[i].format; break; @@ -1757,20 +1784,6 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, return S_OK; } -static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) -{ - switch (vk_format) - { - case VK_FORMAT_B8G8R8A8_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; - case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; - case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; - case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; - default: - FIXME("Unhandled format %#x.\n", vk_format); - return DXGI_FORMAT_UNKNOWN; - } -} - static HRESULT vk_select_memory_type(const struct dxgi_vk_funcs *vk_funcs, VkPhysicalDevice vk_physical_device, uint32_t memory_type_mask, VkMemoryPropertyFlags flags, uint32_t *memory_type_index) -- 2.16.4

2 1

[PATCH 3/4] wined3d: Avoid accessing gl_info in vertexdeclaration_init().
by Józef Kucia 27 Aug '18

27 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/vertexdeclaration.c | 6 +++--- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a4cfd66dfc42..83e35638bc6e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3683,7 +3683,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st if (use_vs(state)) { - if (state->vertex_declaration->half_float_conv_needed) + if (state->vertex_declaration->have_half_floats && !gl_info->supported[ARB_HALF_FLOAT_VERTEX]) { TRACE("Using immediate mode draw with vertex shaders for FLOAT16 conversion.\n"); context->use_immediate_mode_draw = TRUE; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 9098b3225c85..c050a6dda9f1 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -174,7 +174,6 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_adapter *adapter = device->adapter; - const struct wined3d_gl_info *gl_info = &adapter->gl_info; unsigned int i; if (TRACE_ON(d3d_decl)) @@ -218,7 +217,8 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara /* Find the streams used in the declaration. The vertex buffers have * to be loaded when drawing, but filter tesselation pseudo streams. */ - if (e->input_slot >= MAX_STREAMS) continue; + if (e->input_slot >= MAX_STREAMS) + continue; if (!e->format->gl_vtx_format) { @@ -254,7 +254,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara if (elements[i].format == WINED3DFMT_R16G16_FLOAT || elements[i].format == WINED3DFMT_R16G16B16A16_FLOAT) { - if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) declaration->half_float_conv_needed = TRUE; + declaration->have_half_floats = TRUE; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8da12d7cf3f3..da3cd4615686 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3463,10 +3463,10 @@ struct wined3d_vertex_declaration struct wined3d_device *device; struct wined3d_vertex_declaration_element *elements; - UINT element_count; + unsigned int element_count; BOOL position_transformed; - BOOL half_float_conv_needed; + BOOL have_half_floats; }; struct wined3d_saved_states -- 2.16.4

2 1

[PATCH] d2d1: Implement matrix inversion functions.
by Nikolay Sivov 27 Aug '18

27 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1.spec | 4 +- dlls/d2d1/factory.c | 16 ++++++++ dlls/d2d1/tests/d2d1.c | 84 ++++++++++++++++++++++++++++++++++++++++++ include/d2d1.idl | 2 + 4 files changed, 104 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 26d17c687d..3443b29505 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -1,8 +1,8 @@ @ stdcall D2D1CreateFactory(long ptr ptr ptr) @ stdcall D2D1MakeRotateMatrix(float float float ptr) @ stub D2D1MakeSkewMatrix -@ stub D2D1IsMatrixInvertible -@ stub D2D1InvertMatrix +@ stdcall D2D1IsMatrixInvertible(ptr) +@ stdcall D2D1InvertMatrix(ptr) @ stub D2D1ConvertColorSpace @ stub D2D1CreateDevice @ stub D2D1CreateDeviceContext diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 7810e957d4..d2e53879e6 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -554,6 +554,22 @@ void WINAPI D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_ matrix->_32 = center.y - center.x * sin_theta - center.y * cos_theta; } +BOOL WINAPI D2D1IsMatrixInvertible(const D2D1_MATRIX_3X2_F *matrix) +{ + TRACE("matrix %p.\n", matrix); + + return (matrix->_11 * matrix->_22 - matrix->_21 * matrix->_12) != 0.0f; +} + +BOOL WINAPI D2D1InvertMatrix(D2D1_MATRIX_3X2_F *matrix) +{ + D2D1_MATRIX_3X2_F m = *matrix; + + TRACE("matrix %p.\n", matrix); + + return d2d_matrix_invert(matrix, &m); +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 8e58eef658..eeae75f841 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6968,6 +6968,89 @@ if (SUCCEEDED(hr)) ID3D10Device1_Release(d3d_device); } +static void test_invert_matrix(void) +{ + static const struct + { + D2D1_MATRIX_3X2_F matrix; + D2D1_MATRIX_3X2_F inverse; + BOOL invertible; + } + invert_tests[] = + { + { { 0 }, { 0 }, FALSE }, + { + { + 1.0f, 2.0f, + 1.0f, 2.0f, + 4.0f, 8.0f + }, + { + 1.0f, 2.0f, + 1.0f, 2.0f, + 4.0f, 8.0f + }, + FALSE + }, + { + { + 2.0f, 0.0f, + 0.0f, 2.0f, + 4.0f, 8.0f + }, + { + 0.5f, -0.0f, + -0.0f, 0.5f, + -2.0f, -4.0f + }, + TRUE + }, + { + { + 2.0f, 1.0f, + 2.0f, 2.0f, + 4.0f, 8.0f + }, + { + 1.0f, -0.5f, + -1.0f, 1.0f, + 4.0f, -6.0f + }, + TRUE + }, + { + { + 2.0f, 1.0f, + 3.0f, 1.0f, + 4.0f, 8.0f + }, + { + -1.0f, 1.0f, + 3.0f, -2.0f, + -20.0f, 12.0f + }, + TRUE + }, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(invert_tests); ++i) + { + D2D1_MATRIX_3X2_F m; + BOOL ret; + + m = invert_tests[i].matrix; + ret = D2D1InvertMatrix(&m); + ok(ret == invert_tests[i].invertible, "%u: unexpected return value %d.\n", i, ret); + ok(!memcmp(&m, &invert_tests[i].inverse, sizeof(m)), + "%u: unexpected matrix value {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", i, + m._11, m._12, m._21, m._22, m._31, m._32); + + ret = D2D1IsMatrixInvertible(&invert_tests[i].matrix); + ok(ret == invert_tests[i].invertible, "%u: unexpected return value %d.\n", i, ret); + } +} + START_TEST(d2d1) { unsigned int argc, i; @@ -7009,6 +7092,7 @@ START_TEST(d2d1) queue_test(test_create_device); queue_test(test_bitmap_surface); queue_test(test_device_context); + queue_test(test_invert_matrix); run_queued_tests(); } diff --git a/include/d2d1.idl b/include/d2d1.idl index fbfb40d93d..ff2dc03cfd 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1254,4 +1254,6 @@ interface ID2D1Factory : IUnknown [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); +[local] BOOL __stdcall D2D1InvertMatrix(D2D1_MATRIX_3X2_F *matrix); +[local] BOOL __stdcall D2D1IsMatrixInvertible(const D2D1_MATRIX_3X2_F *matrix); [local] void __stdcall D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_3X2_F *matrix); -- 2.18.0

2 1

[PATCH] schedsvc: In case it's an old Wine prefix create c:\windows\tasks automatically.
by Dmitry Timoshkov 27 Aug '18

27 Aug '18

This patch helps to avoid manual creation of c:\windows\tasks in old Wine prefixes a user may have around. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/svc_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 8830d59970..81f5d321ae 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -74,6 +74,9 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) GetWindowsDirectoryW(path, MAX_PATH); lstrcatW(path, tasksW); + /* Just in case it's an old Wine prefix with missing c:\windows\tasks */ + CreateDirectoryW(path, NULL); + htasks = CreateFileW(path, FILE_LIST_DIRECTORY, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL); if (htasks == INVALID_HANDLE_VALUE) -- 2.17.1

2 10

[PATCH v2 2/2] winhttp: Avoid double free on connection error.
by Hans Leidekker 27 Aug '18

27 Aug '18

Reported by Stefan Dösinger. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 96624022e2..c141185cf8 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -234,7 +234,8 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock if (!ret) { WARN("unable to connect to host (%u)\n", get_last_error()); - netconn_close( conn ); + closesocket( conn->socket ); + heap_free( conn ); return NULL; } return conn; -- 2.11.0

1 0

[PATCH v2 1/2] winhttp: Use winsock sockets.
by Hans Leidekker 27 Aug '18

27 Aug '18

v2: Rebased. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/Makefile.in | 4 +- dlls/winhttp/cookie.c | 6 +- dlls/winhttp/handle.c | 5 +- dlls/winhttp/main.c | 1 + dlls/winhttp/net.c | 328 ++++++++++------------------------------- dlls/winhttp/request.c | 13 +- dlls/winhttp/session.c | 63 +------- dlls/winhttp/url.c | 4 +- dlls/winhttp/winhttp_private.h | 19 +-- 9 files changed, 94 insertions(+), 349 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 7fbe2a707e..659b5821df 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -1,8 +1,8 @@ MODULE = winhttp.dll IMPORTLIB = winhttp -IMPORTS = uuid jsproxy user32 advapi32 +IMPORTS = uuid jsproxy user32 advapi32 ws2_32 DELAYIMPORTS = oleaut32 ole32 crypt32 secur32 -EXTRALIBS = $(CORESERVICES_LIBS) $(SOCKET_LIBS) +EXTRALIBS = $(CORESERVICES_LIBS) C_SRCS = \ cookie.c \ diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index b4b25304f7..e8cc89f948 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -17,15 +17,15 @@ */ #include "config.h" +#include "ws2tcpip.h" #include <stdarg.h> -#include "wine/debug.h" -#include "wine/list.h" - #include "windef.h" #include "winbase.h" #include "winhttp.h" +#include "wine/debug.h" +#include "wine/list.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 6026a49610..d08e72079f 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -19,15 +19,14 @@ */ #include "config.h" -#include "wine/port.h" -#include "wine/debug.h" - +#include "ws2tcpip.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "winhttp.h" +#include "wine/debug.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index a63f28cf10..e6c084b979 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -18,6 +18,7 @@ #define COBJMACROS #include "config.h" +#include "ws2tcpip.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 2625e4a9d7..96624022e2 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -18,134 +18,31 @@ */ #include "config.h" -#include "wine/port.h" - +#define NONAMELESSUNION +#include "ws2tcpip.h" #include <stdarg.h> #include <stdio.h> -#include <errno.h> #include <assert.h> -#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif -#ifdef HAVE_SYS_FILIO_H -# include <sys/filio.h> -#endif -#ifdef HAVE_POLL_H -# include <poll.h> -#endif - -#define NONAMELESSUNION - -#include "wine/debug.h" -#include "wine/library.h" - #include "windef.h" #include "winbase.h" #include "winhttp.h" #include "schannel.h" +#include "wine/debug.h" +#include "wine/library.h" #include "winhttp_private.h" -/* to avoid conflicts with the Unix socket headers */ -#define USE_WS_PREFIX -#include "winsock2.h" - WINE_DEFAULT_DEBUG_CHANNEL(winhttp); -#ifndef HAVE_GETADDRINFO - -/* critical section to protect non-reentrant gethostbyname() */ -static CRITICAL_SECTION cs_gethostbyname; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &cs_gethostbyname, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": cs_gethostbyname") } -}; -static CRITICAL_SECTION cs_gethostbyname = { &critsect_debug, -1, 0, 0, 0, 0 }; - -#endif - -/* translate a unix error code into a winsock error code */ -static int sock_get_error( int err ) -{ -#if !defined(__MINGW32__) && !defined (_MSC_VER) - switch (err) - { - case EINTR: return WSAEINTR; - case EBADF: return WSAEBADF; - case EPERM: - case EACCES: return WSAEACCES; - case EFAULT: return WSAEFAULT; - case EINVAL: return WSAEINVAL; - case EMFILE: return WSAEMFILE; - case EWOULDBLOCK: return WSAEWOULDBLOCK; - case EINPROGRESS: return WSAEINPROGRESS; - case EALREADY: return WSAEALREADY; - case ENOTSOCK: return WSAENOTSOCK; - case EDESTADDRREQ: return WSAEDESTADDRREQ; - case EMSGSIZE: return WSAEMSGSIZE; - case EPROTOTYPE: return WSAEPROTOTYPE; - case ENOPROTOOPT: return WSAENOPROTOOPT; - case EPROTONOSUPPORT: return WSAEPROTONOSUPPORT; - case ESOCKTNOSUPPORT: return WSAESOCKTNOSUPPORT; - case EOPNOTSUPP: return WSAEOPNOTSUPP; - case EPFNOSUPPORT: return WSAEPFNOSUPPORT; - case EAFNOSUPPORT: return WSAEAFNOSUPPORT; - case EADDRINUSE: return WSAEADDRINUSE; - case EADDRNOTAVAIL: return WSAEADDRNOTAVAIL; - case ENETDOWN: return WSAENETDOWN; - case ENETUNREACH: return WSAENETUNREACH; - case ENETRESET: return WSAENETRESET; - case ECONNABORTED: return WSAECONNABORTED; - case EPIPE: - case ECONNRESET: return WSAECONNRESET; - case ENOBUFS: return WSAENOBUFS; - case EISCONN: return WSAEISCONN; - case ENOTCONN: return WSAENOTCONN; - case ESHUTDOWN: return WSAESHUTDOWN; - case ETOOMANYREFS: return WSAETOOMANYREFS; - case ETIMEDOUT: return WSAETIMEDOUT; - case ECONNREFUSED: return WSAECONNREFUSED; - case ELOOP: return WSAELOOP; - case ENAMETOOLONG: return WSAENAMETOOLONG; - case EHOSTDOWN: return WSAEHOSTDOWN; - case EHOSTUNREACH: return WSAEHOSTUNREACH; - case ENOTEMPTY: return WSAENOTEMPTY; -#ifdef EPROCLIM - case EPROCLIM: return WSAEPROCLIM; -#endif -#ifdef EUSERS - case EUSERS: return WSAEUSERS; -#endif -#ifdef EDQUOT - case EDQUOT: return WSAEDQUOT; -#endif -#ifdef ESTALE - case ESTALE: return WSAESTALE; -#endif -#ifdef EREMOTE - case EREMOTE: return WSAEREMOTE; -#endif - default: errno = err; perror( "sock_set_error" ); return WSAEFAULT; - } -#endif - return err; -} - static int sock_send(int fd, const void *msg, size_t len, int flags) { int ret; do { - if ((ret = send(fd, msg, len, flags)) == -1) WARN("send error %s\n", strerror(errno)); + if ((ret = send(fd, msg, len, flags)) == -1) WARN("send error %u\n", WSAGetLastError()); } - while(ret == -1 && errno == EINTR); + while(ret == -1 && WSAGetLastError() == WSAEINTR); return ret; } @@ -154,9 +51,9 @@ static int sock_recv(int fd, void *msg, size_t len, int flags) int ret; do { - if ((ret = recv(fd, msg, len, flags)) == -1) WARN("recv error %s\n", strerror(errno)); + if ((ret = recv(fd, msg, len, flags)) == -1) WARN("recv error %u\n", WSAGetLastError()); } - while(ret == -1 && errno == EINTR); + while(ret == -1 && WSAGetLastError() == WSAEINTR); return ret; } @@ -254,11 +151,32 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu return err; } +static BOOL winsock_loaded; + void netconn_unload( void ) { -#ifndef HAVE_GETADDRINFO - DeleteCriticalSection(&cs_gethostbyname); -#endif + if (winsock_loaded) WSACleanup(); +} + +static BOOL WINAPI winsock_startup( INIT_ONCE *once, void *param, void **ctx ) +{ + int ret; + WSADATA data; + if (!(ret = WSAStartup( MAKEWORD(1,1), &data ))) winsock_loaded = TRUE; + else ERR( "WSAStartup failed: %d\n", ret ); + return TRUE; +} + +void winsock_init(void) +{ + static INIT_ONCE once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL ); +} + +static void set_blocking( netconn_t *conn, BOOL blocking ) +{ + ULONG state = !blocking; + ioctlsocket( conn->socket, FIONBIO, &state ); } netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sockaddr, int timeout ) @@ -266,8 +184,8 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock netconn_t *conn; unsigned int addr_len; BOOL ret = FALSE; - int res; - ULONG state; + + winsock_init(); conn = heap_alloc_zero(sizeof(*conn)); if (!conn) return NULL; @@ -275,8 +193,7 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock conn->sockaddr = *sockaddr; if ((conn->socket = socket( sockaddr->ss_family, SOCK_STREAM, 0 )) == -1) { - WARN("unable to create socket (%s)\n", strerror(errno)); - set_last_error( sock_get_error( errno ) ); + WARN("unable to create socket (%u)\n", WSAGetLastError()); heap_free(conn); return NULL; } @@ -293,66 +210,38 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock assert(0); } - if (timeout > 0) - { - state = 1; - ioctlsocket( conn->socket, FIONBIO, &state ); - } + if (timeout > 0) set_blocking( conn, FALSE ); - for (;;) + if (!connect( conn->socket, (const struct sockaddr *)&conn->sockaddr, addr_len )) ret = TRUE; + else { - res = 0; - if (connect( conn->socket, (const struct sockaddr *)&conn->sockaddr, addr_len ) < 0) - { - res = sock_get_error( errno ); - if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) - { - struct pollfd pfd; - - pfd.fd = conn->socket; - pfd.events = POLLOUT; - for (;;) - { - res = 0; - if (poll( &pfd, 1, timeout ) > 0) - { - ret = TRUE; - break; - } - else - { - res = sock_get_error( errno ); - if (res != WSAEINTR) break; - } - } - } - if (res != WSAEINTR) break; - } - else + DWORD err = WSAGetLastError(); + if (err == WSAEWOULDBLOCK || err == WSAEINPROGRESS) { - ret = TRUE; - break; + FD_SET set; + TIMEVAL timeval = { 0, timeout * 1000 }; + int res; + + FD_ZERO( &set ); + FD_SET( conn->socket, &set ); + if ((res = select( conn->socket + 1, NULL, &set, NULL, &timeval )) > 0) ret = TRUE; + else if (!res) set_last_error( ERROR_WINHTTP_TIMEOUT ); } } - if (timeout > 0) - { - state = 0; - ioctlsocket( conn->socket, FIONBIO, &state ); - } + + if (timeout > 0) set_blocking( conn, TRUE ); + if (!ret) { - WARN("unable to connect to host (%d)\n", res); - set_last_error( res ); + WARN("unable to connect to host (%u)\n", get_last_error()); netconn_close( conn ); return NULL; } return conn; } -BOOL netconn_close( netconn_t *conn ) +void netconn_close( netconn_t *conn ) { - int res; - if (conn->secure) { heap_free( conn->peek_msg_mem ); @@ -360,15 +249,9 @@ BOOL netconn_close( netconn_t *conn ) heap_free(conn->extra_buf); DeleteSecurityContext(&conn->ssl_ctx); } - res = closesocket( conn->socket ); + closesocket( conn->socket ); release_host( conn->host ); heap_free(conn); - if (res == -1) - { - set_last_error( sock_get_error( errno ) ); - return FALSE; - } - return TRUE; } BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle, @@ -552,12 +435,7 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int *sent ) return TRUE; } - if ((*sent = sock_send( conn->socket, msg, len, 0 )) == -1) - { - set_last_error( sock_get_error( errno ) ); - return FALSE; - } - return TRUE; + return ((*sent = sock_send( conn->socket, msg, len, 0 )) != -1); } static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T *ret_size, BOOL *eof) @@ -700,12 +578,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd *recvd = size; return TRUE; } - if ((*recvd = sock_recv( conn->socket, buf, len, flags )) == -1) - { - set_last_error( sock_get_error( errno ) ); - return FALSE; - } - return TRUE; + return ((*recvd = sock_recv( conn->socket, buf, len, flags )) != -1); } ULONG netconn_query_data_available( netconn_t *conn ) @@ -715,86 +588,54 @@ ULONG netconn_query_data_available( netconn_t *conn ) DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) { - struct timeval tv; - - /* value is in milliseconds, convert to struct timeval */ - tv.tv_sec = value / 1000; - tv.tv_usec = (value % 1000) * 1000; - - if (setsockopt( netconn->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, sizeof(tv) ) == -1) + int opt = send ? SO_SNDTIMEO : SO_RCVTIMEO; + if (setsockopt( netconn->socket, SOL_SOCKET, opt, (void *)&value, sizeof(value) ) == -1) { - WARN("setsockopt failed (%s)\n", strerror( errno )); - return sock_get_error( errno ); + DWORD err = WSAGetLastError(); + WARN("setsockopt failed (%u)\n", err ); + return err; } return ERROR_SUCCESS; } BOOL netconn_is_alive( netconn_t *netconn ) { -#ifdef MSG_DONTWAIT - ssize_t len; - BYTE b; - - len = recv( netconn->socket, &b, 1, MSG_PEEK | MSG_DONTWAIT ); - return len == 1 || (len == -1 && errno == EWOULDBLOCK); -#elif defined(__MINGW32__) || defined(_MSC_VER) - ULONG mode; int len; char b; + DWORD err; - mode = 1; - if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) - return FALSE; - - len = recv(netconn->socket, &b, 1, MSG_PEEK); + set_blocking( netconn, FALSE ); + len = sock_recv( netconn->socket, &b, 1, MSG_PEEK ); + err = WSAGetLastError(); + set_blocking( netconn, TRUE ); - mode = 0; - if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) - return FALSE; - - return len == 1 || (len == -1 && WSAGetLastError() == WSAEWOULDBLOCK); -#else - FIXME("not supported on this platform\n"); - return TRUE; -#endif + return len == 1 || (len == -1 && err == WSAEWOULDBLOCK); } -static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_storage *sa ) +static DWORD resolve_hostname( const WCHAR *name, INTERNET_PORT port, struct sockaddr_storage *sa ) { - char *hostname; -#ifdef HAVE_GETADDRINFO - struct addrinfo *res, hints; + ADDRINFOW *res, hints; int ret; -#else - struct hostent *he; - struct sockaddr_in *sin = (struct sockaddr_in *)sa; -#endif - if (!(hostname = strdupWA( hostnameW ))) return ERROR_OUTOFMEMORY; - -#ifdef HAVE_GETADDRINFO - memset( &hints, 0, sizeof(struct addrinfo) ); + memset( &hints, 0, sizeof(hints) ); /* Prefer IPv4 to IPv6 addresses, since some web servers do not listen on * their IPv6 addresses even though they have IPv6 addresses in the DNS. */ hints.ai_family = AF_INET; - ret = getaddrinfo( hostname, NULL, &hints, &res ); + ret = GetAddrInfoW( name, NULL, &hints, &res ); if (ret != 0) { - TRACE("failed to get IPv4 address of %s (%s), retrying with IPv6\n", debugstr_w(hostnameW), gai_strerror(ret)); + TRACE("failed to get IPv4 address of %s, retrying with IPv6\n", debugstr_w(name)); hints.ai_family = AF_INET6; - ret = getaddrinfo( hostname, NULL, &hints, &res ); + ret = GetAddrInfoW( name, NULL, &hints, &res ); if (ret != 0) { - TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret)); - heap_free( hostname ); + TRACE("failed to get address of %s\n", debugstr_w(name)); return ERROR_WINHTTP_NAME_NOT_RESOLVED; } } - heap_free( hostname ); memcpy( sa, res->ai_addr, res->ai_addrlen ); - /* Copy port */ switch (res->ai_family) { case AF_INET: @@ -805,27 +646,8 @@ static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struc break; } - freeaddrinfo( res ); - return ERROR_SUCCESS; -#else - EnterCriticalSection( &cs_gethostbyname ); - - he = gethostbyname( hostname ); - heap_free( hostname ); - if (!he) - { - TRACE("failed to get address of %s (%d)\n", debugstr_w(hostnameW), h_errno); - LeaveCriticalSection( &cs_gethostbyname ); - return ERROR_WINHTTP_NAME_NOT_RESOLVED; - } - memset( sa, 0, sizeof(struct sockaddr_in) ); - memcpy( &sin->sin_addr, he->h_addr, he->h_length ); - sin->sin_family = he->h_addrtype; - sin->sin_port = htons( port ); - - LeaveCriticalSection( &cs_gethostbyname ); + FreeAddrInfoW( res ); return ERROR_SUCCESS; -#endif } struct resolve_args diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 6f6de7c63d..3e6d2af396 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -21,13 +21,9 @@ #define COBJMACROS #include "config.h" -#include "wine/port.h" - +#include "ws2tcpip.h" #include <stdarg.h> #include <assert.h> -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif #include "windef.h" #include "winbase.h" @@ -38,9 +34,8 @@ #include "schannel.h" #include "winhttp.h" -#include "winhttp_private.h" - #include "wine/debug.h" +#include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); @@ -1481,10 +1476,6 @@ static BOOL secure_proxy_connect( request_t *request ) return ret; } -#ifndef INET6_ADDRSTRLEN -#define INET6_ADDRSTRLEN 46 -#endif - static WCHAR *addr_to_str( struct sockaddr_storage *addr ) { char buf[INET6_ADDRSTRLEN]; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 8da09a2e21..c62fdadb06 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -17,9 +17,7 @@ */ #include "config.h" -#include "wine/port.h" -#include "wine/debug.h" - +#include "ws2tcpip.h" #include <stdarg.h> #include <stdlib.h> @@ -34,9 +32,6 @@ #include "windef.h" #include "winbase.h" -#ifndef __MINGW32__ -#define USE_WS_PREFIX -#endif #include "winsock2.h" #include "ws2ipdef.h" #include "winhttp.h" @@ -46,6 +41,7 @@ #include "dispex.h" #include "activscp.h" +#include "wine/debug.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); @@ -649,46 +645,8 @@ static WCHAR *blob_to_str( DWORD encoding, CERT_NAME_BLOB *blob ) return ret; } -static BOOL convert_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *addr_storage ) +static BOOL copy_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *addr_storage ) { -#ifndef __MINGW32__ - switch (addr->sa_family) - { - case AF_INET: - { - const struct sockaddr_in *addr_unix = (const struct sockaddr_in *)addr; - struct WS_sockaddr_in *addr_win = (struct WS_sockaddr_in *)addr_storage; - char *p; - - addr_win->sin_family = WS_AF_INET; - addr_win->sin_port = addr_unix->sin_port; - memcpy( &addr_win->sin_addr, &addr_unix->sin_addr, 4 ); - p = (char *)&addr_win->sin_addr + 4; - memset( p, 0, sizeof(*addr_storage) - (p - (char *)addr_win) ); - return TRUE; - } - case AF_INET6: - { - const struct sockaddr_in6 *addr_unix = (const struct sockaddr_in6 *)addr; - struct WS_sockaddr_in6 *addr_win = (struct WS_sockaddr_in6 *)addr_storage; - - addr_win->sin6_family = WS_AF_INET6; - addr_win->sin6_port = addr_unix->sin6_port; - addr_win->sin6_flowinfo = addr_unix->sin6_flowinfo; - memcpy( &addr_win->sin6_addr, &addr_unix->sin6_addr, 16 ); -#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID - addr_win->sin6_scope_id = addr_unix->sin6_scope_id; -#else - addr_win->sin6_scope_id = 0; -#endif - memset( addr_win + 1, 0, sizeof(*addr_storage) - sizeof(*addr_win) ); - return TRUE; - } - default: - ERR("unhandled family %u\n", addr->sa_family); - return FALSE; - } -#else switch (addr->sa_family) { case AF_INET: @@ -711,7 +669,6 @@ static BOOL convert_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *add ERR("unhandled family %u\n", addr->sa_family); return FALSE; } -#endif } static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) @@ -829,8 +786,8 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf return FALSE; } if (getsockname( request->netconn->socket, &local, &len )) return FALSE; - if (!convert_sockaddr( &local, &info->LocalAddress )) return FALSE; - if (!convert_sockaddr( remote, &info->RemoteAddress )) return FALSE; + if (!copy_sockaddr( &local, &info->LocalAddress )) return FALSE; + if (!copy_sockaddr( remote, &info->RemoteAddress )) return FALSE; info->cbSize = sizeof(*info); return TRUE; } @@ -1338,11 +1295,7 @@ static BOOL is_domain_suffix( const char *domain, const char *suffix ) static int reverse_lookup( const struct addrinfo *ai, char *hostname, size_t len ) { - int ret = -1; -#ifdef HAVE_GETNAMEINFO - ret = getnameinfo( ai->ai_addr, ai->ai_addrlen, hostname, len, NULL, 0, 0 ); -#endif - return ret; + return getnameinfo( ai->ai_addr, ai->ai_addrlen, hostname, len, NULL, 0, 0 ); } static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) @@ -1434,7 +1387,6 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) } if (flags & WINHTTP_AUTO_DETECT_TYPE_DNS_A) { -#ifdef HAVE_GETADDRINFO char *fqdn, *domain, *p; if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return FALSE; @@ -1476,9 +1428,6 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) } heap_free( domain ); heap_free( fqdn ); -#else - FIXME("getaddrinfo not found at build time\n"); -#endif } if (!ret) { diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 52a175c84d..9e040bcbff 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -17,16 +17,16 @@ */ #include "config.h" +#include "ws2tcpip.h" #include <stdarg.h> -#include "wine/debug.h" - #include "windef.h" #include "winbase.h" #include "winreg.h" #include "winhttp.h" #include "shlwapi.h" +#include "wine/debug.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 7b92afc7ce..838561fe66 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -27,23 +27,6 @@ #include "wine/list.h" #include "wine/unicode.h" -#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_NETDB_H -# include <netdb.h> -#endif -#if defined(__MINGW32__) || defined (_MSC_VER) -# include <ws2tcpip.h> -#else -# define closesocket close -# define ioctlsocket ioctl -#endif - #include "ole2.h" #include "sspi.h" #include "wincrypt.h" @@ -301,7 +284,7 @@ DWORD get_last_error( void ) DECLSPEC_HIDDEN; void send_callback( object_header_t *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; void close_connection( request_t * ) DECLSPEC_HIDDEN; -BOOL netconn_close( netconn_t * ) DECLSPEC_HIDDEN; +void netconn_close( netconn_t * ) DECLSPEC_HIDDEN; netconn_t *netconn_create( hostdata_t *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 2/2] winhttp: Avoid double free on connection error.
by Hans Leidekker 27 Aug '18

27 Aug '18

Reported by Stefan Dösinger. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 25644a10be..c866c9b9fd 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -233,7 +233,8 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock if (!ret) { WARN("unable to connect to host (%u)\n", get_last_error()); - netconn_close( conn ); + closesocket( conn->socket ); + heap_free( conn ); return NULL; } return conn; -- 2.11.0

2 1

[PATCH 1/2] winhttp: Use winsock sockets.
by Hans Leidekker 27 Aug '18

27 Aug '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/Makefile.in | 4 +- dlls/winhttp/cookie.c | 6 +- dlls/winhttp/handle.c | 5 +- dlls/winhttp/main.c | 1 + dlls/winhttp/net.c | 328 ++++++++++------------------------------- dlls/winhttp/request.c | 13 +- dlls/winhttp/session.c | 63 +------- dlls/winhttp/url.c | 4 +- dlls/winhttp/winhttp_private.h | 19 +-- 9 files changed, 94 insertions(+), 349 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 7fbe2a707e..659b5821df 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -1,8 +1,8 @@ MODULE = winhttp.dll IMPORTLIB = winhttp -IMPORTS = uuid jsproxy user32 advapi32 +IMPORTS = uuid jsproxy user32 advapi32 ws2_32 DELAYIMPORTS = oleaut32 ole32 crypt32 secur32 -EXTRALIBS = $(CORESERVICES_LIBS) $(SOCKET_LIBS) +EXTRALIBS = $(CORESERVICES_LIBS) C_SRCS = \ cookie.c \ diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index b4b25304f7..e8cc89f948 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -17,15 +17,15 @@ */ #include "config.h" +#include "ws2tcpip.h" #include <stdarg.h> -#include "wine/debug.h" -#include "wine/list.h" - #include "windef.h" #include "winbase.h" #include "winhttp.h" +#include "wine/debug.h" +#include "wine/list.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 6026a49610..d08e72079f 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -19,15 +19,14 @@ */ #include "config.h" -#include "wine/port.h" -#include "wine/debug.h" - +#include "ws2tcpip.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "winhttp.h" +#include "wine/debug.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index a63f28cf10..e6c084b979 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -18,6 +18,7 @@ #define COBJMACROS #include "config.h" +#include "ws2tcpip.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index d577a64783..25644a10be 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -18,134 +18,31 @@ */ #include "config.h" -#include "wine/port.h" - +#define NONAMELESSUNION +#include "ws2tcpip.h" #include <stdarg.h> #include <stdio.h> -#include <errno.h> #include <assert.h> -#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif -#ifdef HAVE_SYS_FILIO_H -# include <sys/filio.h> -#endif -#ifdef HAVE_POLL_H -# include <poll.h> -#endif - -#define NONAMELESSUNION - -#include "wine/debug.h" -#include "wine/library.h" - #include "windef.h" #include "winbase.h" #include "winhttp.h" #include "schannel.h" +#include "wine/debug.h" +#include "wine/library.h" #include "winhttp_private.h" -/* to avoid conflicts with the Unix socket headers */ -#define USE_WS_PREFIX -#include "winsock2.h" - WINE_DEFAULT_DEBUG_CHANNEL(winhttp); -#ifndef HAVE_GETADDRINFO - -/* critical section to protect non-reentrant gethostbyname() */ -static CRITICAL_SECTION cs_gethostbyname; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &cs_gethostbyname, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": cs_gethostbyname") } -}; -static CRITICAL_SECTION cs_gethostbyname = { &critsect_debug, -1, 0, 0, 0, 0 }; - -#endif - -/* translate a unix error code into a winsock error code */ -static int sock_get_error( int err ) -{ -#if !defined(__MINGW32__) && !defined (_MSC_VER) - switch (err) - { - case EINTR: return WSAEINTR; - case EBADF: return WSAEBADF; - case EPERM: - case EACCES: return WSAEACCES; - case EFAULT: return WSAEFAULT; - case EINVAL: return WSAEINVAL; - case EMFILE: return WSAEMFILE; - case EWOULDBLOCK: return WSAEWOULDBLOCK; - case EINPROGRESS: return WSAEINPROGRESS; - case EALREADY: return WSAEALREADY; - case ENOTSOCK: return WSAENOTSOCK; - case EDESTADDRREQ: return WSAEDESTADDRREQ; - case EMSGSIZE: return WSAEMSGSIZE; - case EPROTOTYPE: return WSAEPROTOTYPE; - case ENOPROTOOPT: return WSAENOPROTOOPT; - case EPROTONOSUPPORT: return WSAEPROTONOSUPPORT; - case ESOCKTNOSUPPORT: return WSAESOCKTNOSUPPORT; - case EOPNOTSUPP: return WSAEOPNOTSUPP; - case EPFNOSUPPORT: return WSAEPFNOSUPPORT; - case EAFNOSUPPORT: return WSAEAFNOSUPPORT; - case EADDRINUSE: return WSAEADDRINUSE; - case EADDRNOTAVAIL: return WSAEADDRNOTAVAIL; - case ENETDOWN: return WSAENETDOWN; - case ENETUNREACH: return WSAENETUNREACH; - case ENETRESET: return WSAENETRESET; - case ECONNABORTED: return WSAECONNABORTED; - case EPIPE: - case ECONNRESET: return WSAECONNRESET; - case ENOBUFS: return WSAENOBUFS; - case EISCONN: return WSAEISCONN; - case ENOTCONN: return WSAENOTCONN; - case ESHUTDOWN: return WSAESHUTDOWN; - case ETOOMANYREFS: return WSAETOOMANYREFS; - case ETIMEDOUT: return WSAETIMEDOUT; - case ECONNREFUSED: return WSAECONNREFUSED; - case ELOOP: return WSAELOOP; - case ENAMETOOLONG: return WSAENAMETOOLONG; - case EHOSTDOWN: return WSAEHOSTDOWN; - case EHOSTUNREACH: return WSAEHOSTUNREACH; - case ENOTEMPTY: return WSAENOTEMPTY; -#ifdef EPROCLIM - case EPROCLIM: return WSAEPROCLIM; -#endif -#ifdef EUSERS - case EUSERS: return WSAEUSERS; -#endif -#ifdef EDQUOT - case EDQUOT: return WSAEDQUOT; -#endif -#ifdef ESTALE - case ESTALE: return WSAESTALE; -#endif -#ifdef EREMOTE - case EREMOTE: return WSAEREMOTE; -#endif - default: errno = err; perror( "sock_set_error" ); return WSAEFAULT; - } -#endif - return err; -} - static int sock_send(int fd, const void *msg, size_t len, int flags) { int ret; do { - if ((ret = send(fd, msg, len, flags)) == -1) WARN("send error %s\n", strerror(errno)); + if ((ret = send(fd, msg, len, flags)) == -1) WARN("send error %u\n", WSAGetLastError()); } - while(ret == -1 && errno == EINTR); + while(ret == -1 && WSAGetLastError() == WSAEINTR); return ret; } @@ -154,9 +51,9 @@ static int sock_recv(int fd, void *msg, size_t len, int flags) int ret; do { - if ((ret = recv(fd, msg, len, flags)) == -1) WARN("recv error %s\n", strerror(errno)); + if ((ret = recv(fd, msg, len, flags)) == -1) WARN("recv error %u\n", WSAGetLastError()); } - while(ret == -1 && errno == EINTR); + while(ret == -1 && WSAGetLastError() == WSAEINTR); return ret; } @@ -253,11 +150,32 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu return err; } +static BOOL winsock_loaded; + void netconn_unload( void ) { -#ifndef HAVE_GETADDRINFO - DeleteCriticalSection(&cs_gethostbyname); -#endif + if (winsock_loaded) WSACleanup(); +} + +static BOOL WINAPI winsock_startup( INIT_ONCE *once, void *param, void **ctx ) +{ + int ret; + WSADATA data; + if (!(ret = WSAStartup( MAKEWORD(1,1), &data ))) winsock_loaded = TRUE; + else ERR( "WSAStartup failed: %d\n", ret ); + return TRUE; +} + +void winsock_init(void) +{ + static INIT_ONCE once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL ); +} + +static void set_blocking( netconn_t *conn, BOOL blocking ) +{ + ULONG state = !blocking; + ioctlsocket( conn->socket, FIONBIO, &state ); } netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sockaddr, int timeout ) @@ -265,8 +183,8 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock netconn_t *conn; unsigned int addr_len; BOOL ret = FALSE; - int res; - ULONG state; + + winsock_init(); conn = heap_alloc_zero(sizeof(*conn)); if (!conn) return NULL; @@ -274,8 +192,7 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock conn->sockaddr = *sockaddr; if ((conn->socket = socket( sockaddr->ss_family, SOCK_STREAM, 0 )) == -1) { - WARN("unable to create socket (%s)\n", strerror(errno)); - set_last_error( sock_get_error( errno ) ); + WARN("unable to create socket (%u)\n", WSAGetLastError()); heap_free(conn); return NULL; } @@ -292,66 +209,38 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock assert(0); } - if (timeout > 0) - { - state = 1; - ioctlsocket( conn->socket, FIONBIO, &state ); - } + if (timeout > 0) set_blocking( conn, FALSE ); - for (;;) + if (!connect( conn->socket, (const struct sockaddr *)&conn->sockaddr, addr_len )) ret = TRUE; + else { - res = 0; - if (connect( conn->socket, (const struct sockaddr *)&conn->sockaddr, addr_len ) < 0) - { - res = sock_get_error( errno ); - if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) - { - struct pollfd pfd; - - pfd.fd = conn->socket; - pfd.events = POLLOUT; - for (;;) - { - res = 0; - if (poll( &pfd, 1, timeout ) > 0) - { - ret = TRUE; - break; - } - else - { - res = sock_get_error( errno ); - if (res != WSAEINTR) break; - } - } - } - if (res != WSAEINTR) break; - } - else + DWORD err = WSAGetLastError(); + if (err == WSAEWOULDBLOCK || err == WSAEINPROGRESS) { - ret = TRUE; - break; + FD_SET set; + TIMEVAL timeval = { 0, timeout * 1000 }; + int res; + + FD_ZERO( &set ); + FD_SET( conn->socket, &set ); + if ((res = select( conn->socket + 1, NULL, &set, NULL, &timeval )) > 0) ret = TRUE; + else if (!res) set_last_error( ERROR_WINHTTP_TIMEOUT ); } } - if (timeout > 0) - { - state = 0; - ioctlsocket( conn->socket, FIONBIO, &state ); - } + + if (timeout > 0) set_blocking( conn, TRUE ); + if (!ret) { - WARN("unable to connect to host (%d)\n", res); - set_last_error( res ); + WARN("unable to connect to host (%u)\n", get_last_error()); netconn_close( conn ); return NULL; } return conn; } -BOOL netconn_close( netconn_t *conn ) +void netconn_close( netconn_t *conn ) { - int res; - if (conn->secure) { heap_free( conn->peek_msg_mem ); @@ -359,15 +248,9 @@ BOOL netconn_close( netconn_t *conn ) heap_free(conn->extra_buf); DeleteSecurityContext(&conn->ssl_ctx); } - res = closesocket( conn->socket ); + closesocket( conn->socket ); release_host( conn->host ); heap_free(conn); - if (res == -1) - { - set_last_error( sock_get_error( errno ) ); - return FALSE; - } - return TRUE; } BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle ) @@ -550,12 +433,7 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int *sent ) return TRUE; } - if ((*sent = sock_send( conn->socket, msg, len, 0 )) == -1) - { - set_last_error( sock_get_error( errno ) ); - return FALSE; - } - return TRUE; + return ((*sent = sock_send( conn->socket, msg, len, 0 )) != -1); } static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T *ret_size, BOOL *eof) @@ -698,12 +576,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd *recvd = size; return TRUE; } - if ((*recvd = sock_recv( conn->socket, buf, len, flags )) == -1) - { - set_last_error( sock_get_error( errno ) ); - return FALSE; - } - return TRUE; + return ((*recvd = sock_recv( conn->socket, buf, len, flags )) != -1); } ULONG netconn_query_data_available( netconn_t *conn ) @@ -713,86 +586,54 @@ ULONG netconn_query_data_available( netconn_t *conn ) DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) { - struct timeval tv; - - /* value is in milliseconds, convert to struct timeval */ - tv.tv_sec = value / 1000; - tv.tv_usec = (value % 1000) * 1000; - - if (setsockopt( netconn->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, sizeof(tv) ) == -1) + int opt = send ? SO_SNDTIMEO : SO_RCVTIMEO; + if (setsockopt( netconn->socket, SOL_SOCKET, opt, (void *)&value, sizeof(value) ) == -1) { - WARN("setsockopt failed (%s)\n", strerror( errno )); - return sock_get_error( errno ); + DWORD err = WSAGetLastError(); + WARN("setsockopt failed (%u)\n", err ); + return err; } return ERROR_SUCCESS; } BOOL netconn_is_alive( netconn_t *netconn ) { -#ifdef MSG_DONTWAIT - ssize_t len; - BYTE b; - - len = recv( netconn->socket, &b, 1, MSG_PEEK | MSG_DONTWAIT ); - return len == 1 || (len == -1 && errno == EWOULDBLOCK); -#elif defined(__MINGW32__) || defined(_MSC_VER) - ULONG mode; int len; char b; + DWORD err; - mode = 1; - if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) - return FALSE; - - len = recv(netconn->socket, &b, 1, MSG_PEEK); + set_blocking( netconn, FALSE ); + len = sock_recv( netconn->socket, &b, 1, MSG_PEEK ); + err = WSAGetLastError(); + set_blocking( netconn, TRUE ); - mode = 0; - if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) - return FALSE; - - return len == 1 || (len == -1 && WSAGetLastError() == WSAEWOULDBLOCK); -#else - FIXME("not supported on this platform\n"); - return TRUE; -#endif + return len == 1 || (len == -1 && err == WSAEWOULDBLOCK); } -static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_storage *sa ) +static DWORD resolve_hostname( const WCHAR *name, INTERNET_PORT port, struct sockaddr_storage *sa ) { - char *hostname; -#ifdef HAVE_GETADDRINFO - struct addrinfo *res, hints; + ADDRINFOW *res, hints; int ret; -#else - struct hostent *he; - struct sockaddr_in *sin = (struct sockaddr_in *)sa; -#endif - if (!(hostname = strdupWA( hostnameW ))) return ERROR_OUTOFMEMORY; - -#ifdef HAVE_GETADDRINFO - memset( &hints, 0, sizeof(struct addrinfo) ); + memset( &hints, 0, sizeof(hints) ); /* Prefer IPv4 to IPv6 addresses, since some web servers do not listen on * their IPv6 addresses even though they have IPv6 addresses in the DNS. */ hints.ai_family = AF_INET; - ret = getaddrinfo( hostname, NULL, &hints, &res ); + ret = GetAddrInfoW( name, NULL, &hints, &res ); if (ret != 0) { - TRACE("failed to get IPv4 address of %s (%s), retrying with IPv6\n", debugstr_w(hostnameW), gai_strerror(ret)); + TRACE("failed to get IPv4 address of %s, retrying with IPv6\n", debugstr_w(name)); hints.ai_family = AF_INET6; - ret = getaddrinfo( hostname, NULL, &hints, &res ); + ret = GetAddrInfoW( name, NULL, &hints, &res ); if (ret != 0) { - TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret)); - heap_free( hostname ); + TRACE("failed to get address of %s\n", debugstr_w(name)); return ERROR_WINHTTP_NAME_NOT_RESOLVED; } } - heap_free( hostname ); memcpy( sa, res->ai_addr, res->ai_addrlen ); - /* Copy port */ switch (res->ai_family) { case AF_INET: @@ -803,27 +644,8 @@ static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struc break; } - freeaddrinfo( res ); - return ERROR_SUCCESS; -#else - EnterCriticalSection( &cs_gethostbyname ); - - he = gethostbyname( hostname ); - heap_free( hostname ); - if (!he) - { - TRACE("failed to get address of %s (%d)\n", debugstr_w(hostnameW), h_errno); - LeaveCriticalSection( &cs_gethostbyname ); - return ERROR_WINHTTP_NAME_NOT_RESOLVED; - } - memset( sa, 0, sizeof(struct sockaddr_in) ); - memcpy( &sin->sin_addr, he->h_addr, he->h_length ); - sin->sin_family = he->h_addrtype; - sin->sin_port = htons( port ); - - LeaveCriticalSection( &cs_gethostbyname ); + FreeAddrInfoW( res ); return ERROR_SUCCESS; -#endif } struct resolve_args diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5e5b229a1f..5da951987c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -21,13 +21,9 @@ #define COBJMACROS #include "config.h" -#include "wine/port.h" - +#include "ws2tcpip.h" #include <stdarg.h> #include <assert.h> -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif #include "windef.h" #include "winbase.h" @@ -38,9 +34,8 @@ #include "schannel.h" #include "winhttp.h" -#include "winhttp_private.h" - #include "wine/debug.h" +#include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); @@ -1481,10 +1476,6 @@ static BOOL secure_proxy_connect( request_t *request ) return ret; } -#ifndef INET6_ADDRSTRLEN -#define INET6_ADDRSTRLEN 46 -#endif - static WCHAR *addr_to_str( struct sockaddr_storage *addr ) { char buf[INET6_ADDRSTRLEN]; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index fb815682c2..6e81516c8b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -17,9 +17,7 @@ */ #include "config.h" -#include "wine/port.h" -#include "wine/debug.h" - +#include "ws2tcpip.h" #include <stdarg.h> #include <stdlib.h> @@ -34,9 +32,6 @@ #include "windef.h" #include "winbase.h" -#ifndef __MINGW32__ -#define USE_WS_PREFIX -#endif #include "winsock2.h" #include "ws2ipdef.h" #include "winhttp.h" @@ -46,6 +41,7 @@ #include "dispex.h" #include "activscp.h" +#include "wine/debug.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); @@ -649,46 +645,8 @@ static WCHAR *blob_to_str( DWORD encoding, CERT_NAME_BLOB *blob ) return ret; } -static BOOL convert_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *addr_storage ) +static BOOL copy_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *addr_storage ) { -#ifndef __MINGW32__ - switch (addr->sa_family) - { - case AF_INET: - { - const struct sockaddr_in *addr_unix = (const struct sockaddr_in *)addr; - struct WS_sockaddr_in *addr_win = (struct WS_sockaddr_in *)addr_storage; - char *p; - - addr_win->sin_family = WS_AF_INET; - addr_win->sin_port = addr_unix->sin_port; - memcpy( &addr_win->sin_addr, &addr_unix->sin_addr, 4 ); - p = (char *)&addr_win->sin_addr + 4; - memset( p, 0, sizeof(*addr_storage) - (p - (char *)addr_win) ); - return TRUE; - } - case AF_INET6: - { - const struct sockaddr_in6 *addr_unix = (const struct sockaddr_in6 *)addr; - struct WS_sockaddr_in6 *addr_win = (struct WS_sockaddr_in6 *)addr_storage; - - addr_win->sin6_family = WS_AF_INET6; - addr_win->sin6_port = addr_unix->sin6_port; - addr_win->sin6_flowinfo = addr_unix->sin6_flowinfo; - memcpy( &addr_win->sin6_addr, &addr_unix->sin6_addr, 16 ); -#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID - addr_win->sin6_scope_id = addr_unix->sin6_scope_id; -#else - addr_win->sin6_scope_id = 0; -#endif - memset( addr_win + 1, 0, sizeof(*addr_storage) - sizeof(*addr_win) ); - return TRUE; - } - default: - ERR("unhandled family %u\n", addr->sa_family); - return FALSE; - } -#else switch (addr->sa_family) { case AF_INET: @@ -711,7 +669,6 @@ static BOOL convert_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *add ERR("unhandled family %u\n", addr->sa_family); return FALSE; } -#endif } static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) @@ -829,8 +786,8 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf return FALSE; } if (getsockname( request->netconn->socket, &local, &len )) return FALSE; - if (!convert_sockaddr( &local, &info->LocalAddress )) return FALSE; - if (!convert_sockaddr( remote, &info->RemoteAddress )) return FALSE; + if (!copy_sockaddr( &local, &info->LocalAddress )) return FALSE; + if (!copy_sockaddr( remote, &info->RemoteAddress )) return FALSE; info->cbSize = sizeof(*info); return TRUE; } @@ -1326,11 +1283,7 @@ static BOOL is_domain_suffix( const char *domain, const char *suffix ) static int reverse_lookup( const struct addrinfo *ai, char *hostname, size_t len ) { - int ret = -1; -#ifdef HAVE_GETNAMEINFO - ret = getnameinfo( ai->ai_addr, ai->ai_addrlen, hostname, len, NULL, 0, 0 ); -#endif - return ret; + return getnameinfo( ai->ai_addr, ai->ai_addrlen, hostname, len, NULL, 0, 0 ); } static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) @@ -1422,7 +1375,6 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) } if (flags & WINHTTP_AUTO_DETECT_TYPE_DNS_A) { -#ifdef HAVE_GETADDRINFO char *fqdn, *domain, *p; if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return FALSE; @@ -1464,9 +1416,6 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) } heap_free( domain ); heap_free( fqdn ); -#else - FIXME("getaddrinfo not found at build time\n"); -#endif } if (!ret) { diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 32b30da0ce..a3f623d90d 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -17,16 +17,16 @@ */ #include "config.h" +#include "ws2tcpip.h" #include <stdarg.h> -#include "wine/debug.h" - #include "windef.h" #include "winbase.h" #include "winreg.h" #include "winhttp.h" #include "shlwapi.h" +#include "wine/debug.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index d639a2deb2..5f44e5ba6a 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -27,23 +27,6 @@ #include "wine/list.h" #include "wine/unicode.h" -#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_NETDB_H -# include <netdb.h> -#endif -#if defined(__MINGW32__) || defined (_MSC_VER) -# include <ws2tcpip.h> -#else -# define closesocket close -# define ioctlsocket ioctl -#endif - #include "ole2.h" #include "sspi.h" #include "wincrypt.h" @@ -300,7 +283,7 @@ DWORD get_last_error( void ) DECLSPEC_HIDDEN; void send_callback( object_header_t *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; void close_connection( request_t * ) DECLSPEC_HIDDEN; -BOOL netconn_close( netconn_t * ) DECLSPEC_HIDDEN; +void netconn_close( netconn_t * ) DECLSPEC_HIDDEN; netconn_t *netconn_create( hostdata_t *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; -- 2.11.0

2 1

[PATCH 8/8] mshtml: Pass style id instead of flags to var_to_styleval.
by Jacek Caban 27 Aug '18

27 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0

[PATCH 7/8] mshtml: Get rid of no longer needed argument in get_nsstyle_* implementation.
by Jacek Caban 27 Aug '18

27 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlcurstyle.c | 118 ++++++++++++++++++++++----------------------- dlls/mshtml/htmlstyle.c | 19 +++++--- dlls/mshtml/htmlstyle.h | 12 +---- 3 files changed, 74 insertions(+), 75 deletions(-)

1 0

[PATCH 6/8] mshtml: Introduce get_style_property_var helper and use it instead of get_nsstyle_attr_var in HTMLStyle implementation.
by Jacek Caban 27 Aug '18

27 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 75 ++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 35 deletions(-)

1 0

[PATCH 5/8] mshtml: Use get_style_property instead of get_nsstyle_attr in HTMLStyle object.
by Jacek Caban 27 Aug '18

27 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)

1 0

[PATCH 4/8] mshtml: Rename get_style_attr to get_style_property.
by Jacek Caban 27 Aug '18

27 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- What was called CSS attributes in old IEs is now called properties in recent IEs and the spec. dlls/mshtml/htmlstyle.c | 72 ++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 36 deletions(-)

1 0

[PATCH 3/8] mshtml: Refactor setting style property value implementation.
by Jacek Caban 27 Aug '18

27 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 133 ++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 67 deletions(-)

1 0

[PATCH 2/8] mshtml: Clean up set_style_property_var prototype.
by Jacek Caban 27 Aug '18

27 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 76 +++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 37 deletions(-)

1 0

[PATCH 1/8] mshtml: Store style property flags in an array and use it in set_nsstyle_attr and get_nsstyle_attr_var.
by Jacek Caban 27 Aug '18

27 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 343 ++++++++++++++++++++++++------------------------ 1 file changed, 173 insertions(+), 170 deletions(-)

1 0

[PATCH v4 1/2] iphlpapi: Implement GetUdp6Table().
by Guillaume Charifi 27 Aug '18

27 Aug '18

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 30 ++++- dlls/iphlpapi/ipstats.c | 244 ++++++++++++++++++++++++++++++++++ dlls/iphlpapi/ipstats.h | 1 + include/iphlpapi.h | 2 + include/udpmib.h | 53 ++++++++ include/ws2ipdef.h | 17 +++ 7 files changed, 342 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 1686644de0..fd00cc093a 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -141,7 +141,7 @@ @ stdcall GetTcpTable2( ptr ptr long ) @ stub GetTcpTableFromStack #@ stub GetTeredoPort -#@ stub GetUdp6Table +@ stdcall GetUdp6Table( ptr ptr long ) @ stdcall GetUdpStatisticsEx( ptr long ) @ stdcall GetUdpStatistics( ptr ) @ stub GetUdpStatsFromStack diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7de70c9ef4..c7140cd974 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2442,6 +2442,14 @@ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET, UDP_TABLE_BASIC, 0); } +/****************************************************************** + * GetUdp6Table (IPHLPAPI.@) + */ +DWORD WINAPI GetUdp6Table(PMIB_UDP6TABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) +{ + return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET6, UDP_TABLE_BASIC, 0); +} + /****************************************************************** * GetExtendedUdpTable (IPHLPAPI.@) */ @@ -2456,15 +2464,25 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, if (!pdwSize) return ERROR_INVALID_PARAMETER; - if (ulAf != WS_AF_INET) - { - FIXME("ulAf = %u not supported\n", ulAf); - return ERROR_NOT_SUPPORTED; - } if (TableClass == UDP_TABLE_OWNER_MODULE) FIXME("UDP_TABLE_OWNER_MODULE not fully supported\n"); - if ((ret = build_udp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size))) + switch (ulAf) + { + case WS_AF_INET: + ret = build_udp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); + break; + + case WS_AF_INET6: + ret = build_udp6_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); + break; + + default: + FIXME("ulAf = %u not supported\n", ulAf); + ret = ERROR_NOT_SUPPORTED; + } + + if (ret) return ret; if (!pUdpTable || *pdwSize < size) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 799d03d574..994e1fe127 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -151,6 +151,9 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #define NONAMELESSUNION +#define USE_WS_PREFIX +#include "winsock2.h" +#include "ws2ipdef.h" #include "ifenum.h" #include "ipstats.h" #include "iphlpapi.h" @@ -2565,6 +2568,247 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE return ret; } +static DWORD get_udp6_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) +{ + DWORD table_size; + + switch (class) + { + case UDP_TABLE_BASIC: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW); + break; + } + case UDP_TABLE_OWNER_PID: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE_OWNER_PID, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW_OWNER_PID); + break; + } + case UDP_TABLE_OWNER_MODULE: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE_OWNER_MODULE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW_OWNER_MODULE); + break; + } + default: + ERR("unhandled class %u\n", class); + return 0; + } + return table_size; +} + +static MIB_UDP6TABLE *append_udp6_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, + MIB_UDP6TABLE *table, DWORD *count, + const MIB_UDP6ROW_OWNER_MODULE *row, DWORD row_size ) +{ + if (table->dwNumEntries >= *count) + { + MIB_UDP6TABLE *new_table; + DWORD new_count = table->dwNumEntries * 2, new_table_size; + + new_table_size = get_udp6_table_sizes( class, new_count, NULL ); + if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) + { + HeapFree( heap, 0, table ); + return NULL; + } + *count = new_count; + table = new_table; + } + memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); + table->dwNumEntries++; + return table; +} + +static int compare_udp6_rows(const void *a, const void *b) +{ + const MIB_UDP6ROW *rowA = a; + const MIB_UDP6ROW *rowB = b; + int ret; + + if ((ret = memcmp(&rowA->dwLocalAddr, &rowB->dwLocalAddr, sizeof(rowA->dwLocalAddr)) != 0)) return ret; + if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; + return rowA->dwLocalPort - rowB->dwLocalPort; +} + +struct ipv6_addr_scope +{ + IN6_ADDR addr; + DWORD scope; +}; + +static struct ipv6_addr_scope *get_ipv6_addr_scope_table(unsigned int *size) +{ + struct ipv6_addr_scope *table = NULL; + unsigned int table_size = 0; + + if (!(table = HeapAlloc( GetProcessHeap(), 0, sizeof(table[0]) ))) + return NULL; + +#ifdef __linux__ + { + FILE *fp; + char buf[512], *ptr; + + if (!(fp = fopen( "/proc/net/if_inet6", "r" ))) + goto failed; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + WORD a[8]; + DWORD scope; + struct ipv6_addr_scope *new_table; + struct ipv6_addr_scope *entry; + unsigned int i; + + if (sscanf( ptr, "%4hx%4hx%4hx%4hx%4hx%4hx%4hx%4hx %*s %*s %x", + &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6], &a[7], &scope ) != 9) + continue; + + table_size++; + if (!(new_table = HeapReAlloc( GetProcessHeap(), 0, table, table_size * sizeof(table[0]) ))) + { + fclose(fp); + goto failed; + } + + table = new_table; + entry = &table[table_size - 1]; + + i = 0; + while (i < 8) + { + entry->addr.u.Word[i] = htons(a[i]); + i++; + } + + entry->scope = htons(scope); + } + } +#else + FIXME( "not implemented\n" ); + goto failed; +#endif + + *size = table_size; + return table; + +failed: + HeapFree( GetProcessHeap(), 0, table ); + return NULL; +} + +static DWORD find_ipv6_addr_scope(const IN6_ADDR *addr, const struct ipv6_addr_scope *table, unsigned int size) +{ + const BYTE multicast_scope_mask = 0x0F; + const BYTE multicast_scope_shift = 0; + unsigned int i = 0; + + if (WS_IN6_IS_ADDR_UNSPECIFIED(addr)) + return 0; + + if (WS_IN6_IS_ADDR_MULTICAST(addr)) + return htons((addr->u.Byte[1] & multicast_scope_mask) >> multicast_scope_shift); + + if (!table) + return -1; + + while (i < size) + { + if (memcmp(&table[i].addr, addr, sizeof(table[i].addr)) == 0) + return table[i].scope; + i++; + } + + return -1; +} + +DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE heap, DWORD flags, + DWORD *size ) +{ + MIB_UDP6TABLE *table; + MIB_UDP6ROW_OWNER_MODULE row; + DWORD ret = NO_ERROR, count = 16, table_size, row_size; + + if (!(table_size = get_udp6_table_sizes( class, count, &row_size ))) + return ERROR_INVALID_PARAMETER; + + if (!(table = HeapAlloc( heap, flags, table_size ))) + return ERROR_OUTOFMEMORY; + + table->dwNumEntries = 0; + memset( &row, 0, sizeof(row) ); + +#ifdef __linux__ + { + FILE *fp; + + if ((fp = fopen( "/proc/net/udp6", "r" ))) + { + char buf[512], *ptr; + struct pid_map *map = NULL; + unsigned int num_entries = 0; + struct ipv6_addr_scope *addr_scopes; + unsigned int addr_scopes_size = 0; + unsigned int dummy; + int inode; + + addr_scopes = get_ipv6_addr_scope_table(&addr_scopes_size); + + if (class >= UDP_TABLE_OWNER_PID) map = get_pid_map( &num_entries ); + + /* skip header line */ + ptr = fgets( buf, sizeof(buf), fp ); + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + DWORD in6_addr32[4]; + + if (sscanf( ptr, "%u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", &dummy, + &in6_addr32[0], &in6_addr32[1], &in6_addr32[2], &in6_addr32[3], + &row.dwLocalPort, &inode ) != 7) + continue; + memcpy(&row.ucLocalAddr, in6_addr32, sizeof(row.ucLocalAddr)); + row.dwLocalScopeId = find_ipv6_addr_scope((const IN6_ADDR *)&row.ucLocalAddr, addr_scopes, addr_scopes_size); + row.dwLocalPort = htons( row.dwLocalPort ); + + if (class >= UDP_TABLE_OWNER_PID) + row.dwOwningPid = find_owning_pid( map, num_entries, inode ); + if (class >= UDP_TABLE_OWNER_MODULE) + { + row.liCreateTimestamp.QuadPart = 0; /* FIXME */ + row.u.dwFlags = 0; + memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); + } + if (!(table = append_udp6_row( class, heap, flags, table, &count, &row, row_size ))) + break; + } + HeapFree( GetProcessHeap(), 0, map ); + if (addr_scopes) + HeapFree( GetProcessHeap(), 0, addr_scopes ); + fclose( fp ); + } + else ret = ERROR_NOT_SUPPORTED; + } +#else + FIXME( "not implemented\n" ); + ret = ERROR_NOT_SUPPORTED; +#endif + + if (!table) return ERROR_OUTOFMEMORY; + if (!ret) + { + if (order && table->dwNumEntries) + qsort( table->table, table->dwNumEntries, row_size, compare_udp6_rows ); + *tablep = table; + } + else HeapFree( heap, flags, table ); + if (size) *size = get_udp6_table_sizes( class, count, NULL ); + TRACE( "returning ret %u table %p\n", ret, table ); + return ret; +} + /****************************************************************** * AllocateAndGetUdpTableFromStack (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index d742d6380a..acf43ee27c 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -34,5 +34,6 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDE DWORD build_tcp_table(TCP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; DWORD build_udp_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; +DWORD build_udp6_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; #endif /* ndef WINE_IPSTATS_H_ */ diff --git a/include/iphlpapi.h b/include/iphlpapi.h index 54d93d1c9c..86507dfd4d 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -51,6 +51,8 @@ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder); DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder); +DWORD WINAPI GetUdp6Table(PMIB_UDP6TABLE pUdpTable, PDWORD pdwSize, BOOL bOrder); + DWORD WINAPI GetIpStatistics(PMIB_IPSTATS pStats); DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily); diff --git a/include/udpmib.h b/include/udpmib.h index 6b3f51cf2f..3d1bba5ee5 100644 --- a/include/udpmib.h +++ b/include/udpmib.h @@ -18,6 +18,8 @@ #ifndef __WINE_UDPMIB_H #define __WINE_UDPMIB_H +#include <in6addr.h> + #define TCPIP_OWNING_MODULE_SIZE 16 @@ -71,6 +73,57 @@ typedef struct _MIB_UDPTABLE_OWNER_MODULE MIB_UDPROW_OWNER_MODULE table[1]; } MIB_UDPTABLE_OWNER_MODULE, *PMIB_UDPTABLE_OWNER_MODULE; +typedef struct _MIB_UDP6ROW +{ + IN6_ADDR dwLocalAddr; + DWORD dwLocalScopeId; + DWORD dwLocalPort; +} MIB_UDP6ROW, *PMIB_UDP6ROW; + +typedef struct _MIB_UDP6TABLE +{ + DWORD dwNumEntries; + MIB_UDP6ROW table[1]; +} MIB_UDP6TABLE, *PMIB_UDP6TABLE; + +typedef struct _MIB_UDP6ROW_OWNER_PID +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + DWORD dwOwningPid; +} MIB_UDP6ROW_OWNER_PID, *PMIB_UDP6ROW_OWNER_PID; + +typedef struct _MIB_UDP6TABLE_OWNER_PID +{ + DWORD dwNumEntries; + MIB_UDP6ROW_OWNER_PID table[1]; +} MIB_UDP6TABLE_OWNER_PID, *PMIB_UDP6TABLE_OWNER_PID; + +typedef struct _MIB_UDP6ROW_OWNER_MODULE +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + DWORD dwOwningPid; + LARGE_INTEGER liCreateTimestamp; + __C89_NAMELESS union + { + __C89_NAMELESS struct + { + int SpecificPortBind:1; + } __C89_NAMELESSSTRUCTNAME; + int dwFlags; + } __C89_NAMELESSUNIONNAME; + ULONGLONG OwningModuleInfo[TCPIP_OWNING_MODULE_SIZE]; +} MIB_UDP6ROW_OWNER_MODULE, *PMIB_UDP6ROW_OWNER_MODULE; + +typedef struct _MIB_UDP6TABLE_OWNER_MODULE +{ + DWORD dwNumEntries; + MIB_UDP6ROW_OWNER_MODULE table[1]; +} MIB_UDP6TABLE_OWNER_MODULE, *PMIB_UDP6TABLE_OWNER_MODULE; + /* UDP statistics */ typedef struct _MIB_UDPSTATS diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index e4cbce1a86..d2d1548ccb 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -296,6 +296,23 @@ static inline BOOL WS(IN6_IS_ADDR_LOOPBACK) ( const IN6_ADDR *a ) (a->s6_words[7] == 0x0100)); } +static inline BOOL WS(IN6_IS_ADDR_MULTICAST) ( const IN6_ADDR *a ) +{ + return (BOOL)(a->s6_bytes[0] == 0xff); +} + +static inline BOOL WS(IN6_IS_ADDR_UNSPECIFIED) ( const IN6_ADDR *a ) +{ + return (BOOL)((a->s6_words[0] == 0) && + (a->s6_words[1] == 0) && + (a->s6_words[2] == 0) && + (a->s6_words[3] == 0) && + (a->s6_words[4] == 0) && + (a->s6_words[5] == 0) && + (a->s6_words[6] == 0) && + (a->s6_words[7] == 0)); +} + #ifdef __cplusplus } #endif -- Guillaume Charifi <guillaume.charifi(a)sfr.fr>

1 1

[v3 resend PATCH 1/2] user32: When registering redirected class use correct base class name.
by Nikolay Sivov 27 Aug '18

27 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/class.c | 31 +++++++++++++++++++++---------- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 2 +- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 07d36f05d7..5383b6771f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -320,7 +320,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, BOOL register_class ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, WCHAR *combined, BOOL register_class ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -335,9 +335,12 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B const WCHAR *module, *ret; UNICODE_STRING name_us; HMODULE hmod; + UINT offset; - if (basename_offset) - *basename_offset = 0; + if (!basename_offset) + basename_offset = &offset; + + *basename_offset = 0; if (IS_INTRESOURCE( name )) return name; @@ -352,14 +355,21 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B return name; wndclass = (struct wndclass_redirect_data *)data.lpData; - if (basename_offset) - *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); + *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset); if (!(hmod = GetModuleHandleW( module ))) hmod = LoadLibraryW( module ); + /* Combined name is used to register versioned class name. Base name part will match exactly + original class name and won't be reused from context data. */ ret = (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); + if (combined) + { + memcpy(combined, ret, *basename_offset * sizeof(WCHAR)); + strcpyW(&combined[*basename_offset], name); + ret = combined; + } if (register_class && hmod) { @@ -409,7 +419,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; - name = CLASS_GetVersionedName( name, NULL, TRUE ); + name = CLASS_GetVersionedName( name, NULL, NULL, TRUE ); for (;;) { @@ -662,8 +672,8 @@ ATOM WINAPI RegisterClassW( const WNDCLASSW* wc ) */ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { + WCHAR name[MAX_ATOM_LEN + 1], combined[MAX_ATOM_LEN + 1]; const WCHAR *classname = NULL; - WCHAR name[MAX_ATOM_LEN + 1]; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -682,7 +692,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); + classname = CLASS_GetVersionedName( name, &basename_offset, combined, FALSE ); classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -720,6 +730,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) */ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { + WCHAR name[MAX_ATOM_LEN + 1]; const WCHAR *classname; UINT basename_offset; ATOM atom; @@ -736,7 +747,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); + classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, name, FALSE ); if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; @@ -789,7 +800,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - className = CLASS_GetVersionedName( className, NULL, FALSE ); + className = CLASS_GetVersionedName( className, NULL, NULL, FALSE ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 73a2badc7d..0ee7dbeece 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -273,7 +273,7 @@ extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset, - BOOL register_class) DECLSPEC_HIDDEN; + WCHAR *combined, BOOL register_class) DECLSPEC_HIDDEN; /* message spy definitions */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e7bbc4eb90..2a55ab4ce6 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1349,7 +1349,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className, NULL, TRUE); + className = CLASS_GetVersionedName(className, NULL, NULL, TRUE); TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), -- 2.18.0

1 1

[PATCH 01/20] shell32: Add favorites icon
by Alex Henrie 27 Aug '18

27 Aug '18

Adapted from emblem-favorite in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/favorites.ico | Bin 0 -> 49876 bytes dlls/shell32/resources/favorites.svg | 548 +++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 11 +- dlls/shell32/shresdef.h | 4 +- 5 files changed, 560 insertions(+), 4 deletions(-) create mode 100644 dlls/shell32/resources/favorites.ico create mode 100644 dlls/shell32/resources/favorites.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 8bac5903e9..5d76218d9a 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -69,6 +69,7 @@ SVG_SRCS = \ resources/document.svg \ resources/drive.svg \ resources/eject.svg \ + resources/favorites.svg \ resources/floppy.svg \ resources/folder.svg \ resources/folder_open.svg \ diff --git a/dlls/shell32/resources/favorites.ico b/dlls/shell32/resources/favorites.ico new file mode 100644 index 0000000000000000000000000000000000000000..e976000d032900c0b4a414ffc023cdd260137941 GIT binary patch literal 49876 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 literal 0 HcmV?d00001 diff --git a/dlls/shell32/resources/favorites.svg b/dlls/shell32/resources/favorites.svg new file mode 100644 index 0000000000..f4b4352516 --- /dev/null +++ b/dlls/shell32/resources/favorites.svg @@ -0,0 +1,548 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.0" + height="272" + width="632" + id="svg1"> + <defs + id="defs3"> + <linearGradient + id="linearGradient3111"> + <stop + id="stop3113" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop3115" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3101"> + <stop + id="stop3103" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + id="stop3105" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient118"> + <stop + id="stop119" + offset="0.0000000" + style="stop-color:#f5a108;stop-opacity:0.0000000;" /> + <stop + id="stop120" + offset="1.0000000" + style="stop-color:#fefdc3;stop-opacity:0.74251497;" /> + </linearGradient> + <linearGradient + id="linearGradient6621"> + <stop + id="stop6622" + offset="0.0000000" + style="stop-color:#f5a108;stop-opacity:0.0000000;" /> + <stop + id="stop6623" + offset="1.0000000" + style="stop-color:#fefdc3;stop-opacity:0.74251497;" /> + </linearGradient> + <linearGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.94697898,0,0,0.487322,3.734953,4.0497072)" + y2="12.239423" + x2="12.849945" + y1="28.829224" + x1="22.819513" + id="linearGradient7881" + xlink:href="#linearGradient6621" /> + <linearGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.012297,0,0,1.079974,0.83512302,-1.3406628)" + y2="6.1003184" + x2="6.3578372" + y1="32.756931" + x1="11.355036" + id="linearGradient1697" + xlink:href="#linearGradient6621" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.182912,0,0,0.76754023,-13.527047,18.845937)" + r="9.6875" + fy="25.53125" + fx="17.3125" + cy="25.53125" + cx="17.3125" + id="radialGradient3107" + xlink:href="#linearGradient3101" /> + <linearGradient + gradientTransform="matrix(0.90340098,0,0,0.903401,2.335433,2.1777372)" + gradientUnits="userSpaceOnUse" + y2="-6.8890476" + x2="17.444614" + y1="29.173397" + x1="34.797703" + id="linearGradient3117" + xlink:href="#linearGradient3111" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.182912,0,0,0.76754024,-13.527041,18.845928)" + r="9.6875" + fy="25.53125" + fx="17.3125" + cy="25.53125" + cx="17.3125" + id="radialGradient3107-3" + xlink:href="#linearGradient3101" /> + <linearGradient + y2="12.239423" + x2="12.849945" + y1="28.829224" + x1="22.819513" + gradientTransform="matrix(0.946979,0,0,0.487322,3.7349493,4.0497076)" + gradientUnits="userSpaceOnUse" + id="linearGradient906" + xlink:href="#linearGradient6621" /> + <linearGradient + y2="6.1003184" + x2="6.3578372" + y1="32.756931" + x1="11.355036" + gradientTransform="matrix(2.012297,0,0,1.079974,0.8351293,-1.3406624)" + gradientUnits="userSpaceOnUse" + id="linearGradient908" + xlink:href="#linearGradient6621" /> + <linearGradient + y2="-6.8890476" + x2="17.444614" + y1="29.173397" + x1="34.797703" + gradientTransform="matrix(0.903401,0,0,0.903401,2.3354393,2.1777376)" + gradientUnits="userSpaceOnUse" + id="linearGradient910" + xlink:href="#linearGradient3111" /> + <linearGradient + y2="-6.8890476" + x2="17.444614" + y1="29.173397" + x1="34.797703" + gradientTransform="matrix(0.90340098,0,0,0.90340099,2.3354294,2.1777415)" + gradientUnits="userSpaceOnUse" + id="linearGradient910-9" + xlink:href="#linearGradient3111" /> + <linearGradient + y2="6.1003184" + x2="6.3578372" + y1="32.756931" + x1="11.355036" + gradientTransform="matrix(2.012297,0,0,1.079974,0.83511544,-1.3406581)" + gradientUnits="userSpaceOnUse" + id="linearGradient908-0" + xlink:href="#linearGradient118" /> + <linearGradient + y2="12.239423" + x2="12.849945" + y1="28.829224" + x1="22.819513" + gradientTransform="matrix(0.946979,0,0,0.487322,3.7349364,4.0497121)" + gradientUnits="userSpaceOnUse" + id="linearGradient906-6" + xlink:href="#linearGradient118" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.182912,0,0,0.76754027,-13.527057,18.845931)" + r="9.6875" + fy="25.53125" + fx="17.3125" + cy="25.53125" + cx="17.3125" + id="radialGradient3107-3-1" + xlink:href="#linearGradient3101" /> + </defs> + <metadata + id="metadata4"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + <dc:date>2005-02-01</dc:date> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:source>http://jimmac.musichall.cz/</dc:source> + <dc:contributor> + <cc:Agent> + <dc:title>Andreas Nilsson <nisses.mail(a)home.se></dc:title> + </cc:Agent> + </dc:contributor> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> + </rdf:RDF> + </metadata> + <ellipse + ry="40.048054" + rx="112.78371" + cy="212.63495" + cx="137.4127" + id="path3099" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40909095;fill:url(#radialGradient3107);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.41285896;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + id="path5378" + d="m 126.73192,201.14524 c 0.30704,-0.46476 5.31612,5.98814 5.31612,5.98814 21.96303,-24.1331 78.02088,-69.2246 93.31318,-106.83095 -30.92557,34.63818 -81.45413,90.3636 -98.6293,100.84281 z" + style="fill:#d4572d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path7876" + d="m 88.884799,45.895357 c -25.590843,-1.27207 -37.512887,15.32992 -43.961788,31.12321 -6.399725,20.79769 2.646791,60.079643 46.979002,57.091243 25.286877,0 35.337507,-26.18825 48.645857,-32.98657 12.09479,-4.618303 13.0467,-5.031643 25.82504,-5.031643 17.75792,0 49.871,-12.97851 49.87101,-25.8562 -5.45836,-10.33357 -19.9496,-28.73605 -46.57817,-25.59957 -16.95017,1.99227 -32.98604,14.2281 -37.17483,20.31669 -10.26116,-9.13988 -23.36309,-19.05716 -43.606121,-19.05716 z" + style="fill:url(#linearGradient7881);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path920" + d="M 135.60111,54.075757 C 179.88387,9.3554272 240.73877,50.574337 240.33847,92.985927 239.97253,131.75749 210.71218,150.32568 137.20228,219.28869 60.259562,155.13336 33.14988,140.33889 33.550176,94.337717 33.950472,46.719537 86.047393,10.981877 135.60111,54.075757 Z" + style="fill:#c71807;fill-opacity:1;fill-rule:evenodd;stroke:#820000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + id="path922" + d="M 35.085143,92.776547 C 33.922531,131.4479 39.323228,125.32083 49.081261,137.57227 58.674256,149.61652 100.50476,142.036 138.05319,106.28315 176.05011,70.103247 214.78157,90.581497 233.55651,70.437007 219.56988,46.216937 175.91589,16.871337 135.72623,57.536227 84.222135,10.531457 36.247755,53.675117 35.085143,92.776547 Z" + style="opacity:0.625;fill:url(#linearGradient1697);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + style="opacity:0.39204544;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3117);stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 136.11884,60.786357 c 42.1045,-45.96114 99.6472,-7.56258 99.27429,31.94703 C 235.05223,128.85205 205.66466,148.73018 137.1846,212.97447 65.506606,153.20889 38.122543,137.27635 38.495449,94.422767 38.868356,50.062807 89.955796,15.050157 136.11884,60.786357 Z" + id="path3109" /> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <ellipse + id="path3099-2" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40909095;fill:url(#radialGradient3107-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.41285896;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="296.26495" + cy="258.44244" + rx="21.146959" + ry="7.435544" /> + <path + id="path5378-9" + d="m 294.26231,256.30921 c 0.0576,-0.0863 0.99677,1.11179 0.99677,1.11179 4.11807,-4.48069 14.62893,-12.85262 17.49624,-19.83483 -5.79855,6.43112 -15.27266,16.77741 -18.49301,18.72304 z" + style="fill:#d4572d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path7876-1" + d="m 287.16597,227.48465 c -4.79829,-0.23618 -7.03367,2.84624 -8.24284,5.77851 -1.19995,3.86141 0.49627,11.15472 8.80857,10.59988 4.74129,0 6.62579,-4.86226 9.1211,-6.12447 2.26778,-0.85746 2.44626,-0.93421 4.8422,-0.93421 3.32961,0 9.35082,-2.40966 9.35082,-4.8006 -1.02344,-1.91859 -3.74055,-5.3353 -8.73341,-4.75296 -3.17816,0.3699 -6.18489,2.64167 -6.97029,3.77211 -1.92396,-1.69696 -4.38058,-3.53826 -8.17615,-3.53826 z" + style="fill:url(#linearGradient906);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path920-2" + d="m 295.92528,229.00347 c 8.30303,-8.30303 19.71333,-0.65009 19.63827,7.22428 -0.0686,7.19854 -5.55493,10.64602 -19.33805,23.45007 -14.42677,-11.91143 -19.50983,-14.65826 -19.43478,-23.19909 0.0751,-8.84106 9.84324,-15.47631 19.13456,-7.47526 z" + style="fill:#c71807;fill-opacity:1;fill-rule:evenodd;stroke:#820000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + id="path922-7" + d="m 277.07853,236.18887 c -0.21799,7.17994 0.79464,6.04236 2.62427,8.31703 1.79869,2.2362 9.64191,0.82876 16.68225,-5.80932 7.12443,-6.71736 14.38658,-2.91525 17.90688,-6.65539 -2.62249,-4.49683 -10.80762,-9.9453 -18.34319,-2.39523 -9.65702,-8.72717 -18.65222,-0.71687 -18.87021,6.54291 z" + style="opacity:0.625;fill:url(#linearGradient908);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + style="opacity:0.39204544;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient910);stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 296.02236,230.2494 c 7.8946,-8.5334 18.68386,-1.40411 18.61394,5.93146 -0.0639,6.70599 -5.57409,10.39668 -18.41411,22.32463 -13.43963,-11.09641 -18.57415,-14.05454 -18.50423,-22.01097 0.0699,-8.23612 9.64882,-14.73676 18.3044,-6.24512 z" + id="path3109-0" /> + <rect + id="icon:48-32" + height="48" + width="48" + y="220" + x="272" + style="fill:none" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +7FPIs1/bypZtmxj/+O94iaGSfa1Fi4m376PzdCc9V7v5vaCGZxl/1gIAGoGfKGTN2mZ2fns3Ttc/ +ydy8XtQnunwF1dt3cebDk1y/dZvfgqrEzqkiAkK8ZiAtCxrY+8pLWIkBkuc7QWuq1qzD2voNjr/7 +N64+6OePunJxKyoA4GWQnVUx2r+zj0WWwh14AOta+Ojw+3w2PMJfKhyz4gIANgHfMw3Z1r6dFc1N +HD/8PieS4xybg3hzIgBgCfAjhcRNkw/9QJ2dq0BziRjQ+r8mMY95zGMe85gO/wEEGFhCsflliQAA +ABR0RVh0QXV0aG9yAEpha3ViIFN0ZWluZXLm+/cvAAAAWHRFWHRDb3B5cmlnaHQAQ0MwIFB1Ymxp +YyBEb21haW4gRGVkaWNhdGlvbiBodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9wdWJsaWNkb21h +aW4vemVyby8xLjAvxuO9+QAAABh0RVh0Q3JlYXRpb24gVGltZQAyMDA1LTAyLTAxhIsTNAAAACV0 +RVh0ZGF0ZTpjcmVhdGUAMjAxOC0wOC0yNFQxNzoyNjozMC0wNjowMAIlLYAAAAAldEVYdGRhdGU6 +bW9kaWZ5ADIwMTgtMDgtMjRUMTc6MjY6MzAtMDY6MDBzeJU8AAAAGXRFWHRTb2Z0d2FyZQB3d3cu +aW5rc2NhcGUub3Jnm+48GgAAACJ0RVh0U291cmNlAGh0dHA6Ly9qaW1tYWMubXVzaWNoYWxsLmN6 +L/VpyMQAAAAZdEVYdFRpdGxlAEZhdm91cml0ZXMgKGVtYmxlbSmyreP+AAAAAElFTkSuQmCC +" + id="icon:48-8" + x="328" + y="220" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +7FPIs1/bypZtmxj/+O94iaGSfa1Fi4m376PzdCc9V7v5vaCGZxl/1gIAGoGfKGTN2mZ2fns3Ttc/ +ydy8XtQnunwF1dt3cebDk1y/dZvfgqrEzqkiAkK8ZiAtCxrY+8pLWIkBkuc7QWuq1qzD2voNjr/7 +N64+6OePunJxKyoA4GWQnVUx2r+zj0WWwh14AOta+Ojw+3w2PMJfKhyz4gIANgHfMw3Z1r6dFc1N +HD/8PieS4xybg3hzIgBgCfAjhcRNkw/9QJ2dq0BziRjQ+r8mMY95zGMe85gO/wEEGFhCsflliQAA +ABR0RVh0QXV0aG9yAEpha3ViIFN0ZWluZXLm+/cvAAAAWHRFWHRDb3B5cmlnaHQAQ0MwIFB1Ymxp +YyBEb21haW4gRGVkaWNhdGlvbiBodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9wdWJsaWNkb21h +aW4vemVyby8xLjAvxuO9+QAAABh0RVh0Q3JlYXRpb24gVGltZQAyMDA1LTAyLTAxhIsTNAAAACV0 +RVh0ZGF0ZTpjcmVhdGUAMjAxOC0wOC0yNFQxNzoyNjozMS0wNjowMKRSJjQAAAAldEVYdGRhdGU6 +bW9kaWZ5ADIwMTgtMDgtMjRUMTc6MjY6MzEtMDY6MDDVD56IAAAAGXRFWHRTb2Z0d2FyZQB3d3cu +aW5rc2NhcGUub3Jnm+48GgAAACJ0RVh0U291cmNlAGh0dHA6Ly9qaW1tYWMubXVzaWNoYWxsLmN6 +L/VpyMQAAAAZdEVYdFRpdGxlAEZhdm91cml0ZXMgKGVtYmxlbSmyreP+AAAAAElFTkSuQmCC +" + id="icon:48-4" + x="384" + y="220" /> + <ellipse + id="path3099-2-9" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40909095;fill:url(#radialGradient3107-3-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.41285896;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="456.17703" + cy="261.65808" + rx="14.098043" + ry="4.9269128" /> + <path + id="path5378-9-2" + d="m 454.84193,260.24458 c 0.0384,-0.0572 0.66452,0.73669 0.66452,0.73669 2.7454,-2.96898 9.75267,-8.51636 11.66422,-13.14289 -3.86572,4.26137 -10.18182,11.11699 -12.32874,12.4062 z" + style="fill:#d4572d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path7876-1-0" + d="m 450.11102,241.14495 c -3.19888,-0.15649 -4.68914,1.88597 -5.49526,3.82894 -0.79997,2.55863 0.33085,7.3913 5.87241,7.02365 3.16088,0 4.41722,-3.22181 6.08077,-4.05817 1.51186,-0.56817 1.63085,-0.61903 3.22815,-0.61903 2.21975,0 6.23391,-1.59668 6.23391,-3.18095 -0.6823,-1.27129 -2.49371,-3.53526 -5.8223,-3.14939 -2.11879,0.2451 -4.12329,1.75041 -4.64689,2.49946 -1.28264,-1.12443 -2.9204,-2.34451 -5.45079,-2.34451 z" + style="fill:url(#linearGradient906-6);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path920-2-2" + d="m 455.95059,242.15135 c 5.53538,-5.50173 13.14228,-0.43076 13.09224,4.78692 -0.0457,4.76987 -3.7033,7.05423 -12.8921,15.5384 -9.61789,-7.89271 -13.00661,-9.7128 -12.95658,-15.37209 0.0501,-5.85823 6.56219,-10.25486 12.75644,-4.95323 z" + style="fill:#c71807;fill-opacity:1;fill-rule:evenodd;stroke:#820000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + id="path922-7-3" + d="m 443.38602,246.91251 c -0.14532,4.75755 0.52977,4.00377 1.74953,5.511 1.19913,1.48174 6.42797,0.54915 11.12155,-3.84935 4.74965,-4.45103 9.5911,-1.93169 11.93798,-4.40997 -1.74833,-2.97967 -7.20511,-6.58992 -12.22885,-1.58712 -6.43805,-5.78276 -12.43488,-0.47501 -12.58021,4.33544 z" + style="opacity:0.625;fill:url(#linearGradient908-0);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + style="opacity:0.39204544;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient910-9);stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 456.01531,242.97692 c 5.26309,-5.65437 12.45597,-0.93039 12.40935,3.93028 -0.0426,4.4435 -3.71608,6.88901 -12.27613,14.79267 -8.9598,-7.35267 -12.38283,-9.31277 -12.33622,-14.58483 0.0466,-5.45739 6.43258,-9.76482 12.203,-4.13812 z" + id="path3109-0-7" /> + <rect + id="icon:32-32" + height="32" + width="32" + y="236" + x="440" + style="fill:none" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAA +B3RJTUUH1gYMFyca8+vhYAAABIpJREFUWMPtls9vVFUUxz/3zcybaTvTklZtIRZaVH4IVBIVEQwt +KJgQjQsJrvUPYGHCAmNMdcFeo3FvYlQMATagafwBQhHEFI0EQULTX7TTX7Sdmc689+69x8W005lS +SgcXJIaTvMzk3nO/388957zJwMN4wKEW2/wQcBWC4yCAA4i1aEHFgINFuR8BYQdRKGRmzRHBKJSy +8F45AO1AVCFuzKWldRMrN68hFo+hPc3A1R7+7rzCyNA4xopyAVFIyA2zccs6Vm3ZQKKuGqsNyX96 +ud75F73dScSKen8pAJ8AaUfJ6rXL2fJmKw6C9X1EDIigQhEc12W4b5TTX58mm/N5Yv1Ktu5rQ5kc +NpdFjI9ywjhujFBVNWP9I5z5soNsxuPQPM87AA47SFNzPVv3tyJeFquD/IZYQEDIg0SiiFtF39U+ +mlpWYm6PIUaDSP5BEBFQinB1LdaNc/Kzo0ync+qQvQtAO1ARCcm+A69j/WlEB2BnOjpfGFBOiFC8 +Bj1xG8TM5UE+ZyYfK4Rr6tBuguOfHkUCqw7NeIaLASIOsnbT44ifw05nwJIXuIuwWMFOTxe+F+eV +fIrgD98iVLOCpoZabg6MCjZ/+RIAhaJxfSMmk0J8v1DyOdM7hREQNdcaRLBpD53OYbI+Nhcgnsbm +AkKJEZqeXE13/2jBswTAiBCvqkBS44jWpcIlbaDQhtk1MRZ/aJIgmcIGZsFXzmTSJBrq0cLCAAqF +WIvxfZgdqHm3LhgXtUZPeWS7x0BbFgsVChFog6PmjpcAOA5kM1lca5DAzy9ayecWIEor4Y1kCJKp +guBiEYrHSY2Nl0x+CUAo7DA+MMbyuijWy+SHS6D49ZulEBGCwTTBpHdv55mINjZx9c9rGJljcIoT +fI3qvZnEqYxjdYANNKIDJND5RxskMJi0T/bmRFnm4do6gsQyegdHKZ6Q0iE0hqHBSSYnPSorEpjJ +iZL+W2MxEx46HSyp5IVbulESz22j48QpBFHtxXvFie1AYESd7fgDahrAiWCyAXoyh5ecxutPo1Pl +matIhOrtrVw8c57UVIY18+bUmX/gAyAXaH45eRGnuhmTcgjGPWxWl2WcN3ep2fEyl7uu0NdzC19Q +++dXZ6GDT1nURCrL2XO/E9vQQrh6WXnOgBONsWzXHi792kX3tW4cKS19AfJuAkeAGwqpqozRumcH +pvs6/tDg0swrKqlp282Fnzrp7+knEBY0XxQA8hU/DBKJhNm5t43I2DDZG9cWNQ8lqqlp3c25734k +OZAkLKIOLpK/KMBs5P/tOLKt7QUeqYqS7voN0fqOvHBtHYmXdvHzsZOMjY5TIah376G9JACAA8Bj +SsnGlrWse+ZppjrPYNKpwr7bsJzY89v54chxJqYyfCGoG0vQXTIAwE5gp1LSuOJRtr32KukLZ/GH +bhFd1Uxkw2a+/+oYw57Hxxa11J+osgAA6oG3FVJfWcErb72BqyDtBXR8c4Ieo/nclqdZNgBACHjH +QZqdEJtffJauzktcNpZv70PvvgBmYy/IVuA8cOo/at13JB6I68P4P8W/3Fhxee98CpgAAAAldEVY +dGRhdGU6Y3JlYXRlADIwMTgtMDgtMjNUMjI6MTQ6NTctMDY6MDAATcIIAAAAJXRFWHRkYXRlOm1v +ZGlmeQAyMDA2LTA2LTEzVDA1OjM5OjI2LTA2OjAwewtT2wAAAABJRU5ErkJggg== +" + id="icon:32-8" + x="480" + y="236" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAA +B3RJTUUH1gYMFyca8+vhYAAABIpJREFUWMPtls9vVFUUxz/3zcybaTvTklZtIRZaVH4IVBIVEQwt +KJgQjQsJrvUPYGHCAmNMdcFeo3FvYlQMATagafwBQhHEFI0EQULTX7TTX7Sdmc689+69x8W005lS +SgcXJIaTvMzk3nO/388957zJwMN4wKEW2/wQcBWC4yCAA4i1aEHFgINFuR8BYQdRKGRmzRHBKJSy +8F45AO1AVCFuzKWldRMrN68hFo+hPc3A1R7+7rzCyNA4xopyAVFIyA2zccs6Vm3ZQKKuGqsNyX96 +ud75F73dScSKen8pAJ8AaUfJ6rXL2fJmKw6C9X1EDIigQhEc12W4b5TTX58mm/N5Yv1Ktu5rQ5kc +NpdFjI9ywjhujFBVNWP9I5z5soNsxuPQPM87AA47SFNzPVv3tyJeFquD/IZYQEDIg0SiiFtF39U+ +mlpWYm6PIUaDSP5BEBFQinB1LdaNc/Kzo0ync+qQvQtAO1ARCcm+A69j/WlEB2BnOjpfGFBOiFC8 +Bj1xG8TM5UE+ZyYfK4Rr6tBuguOfHkUCqw7NeIaLASIOsnbT44ifw05nwJIXuIuwWMFOTxe+F+eV +fIrgD98iVLOCpoZabg6MCjZ/+RIAhaJxfSMmk0J8v1DyOdM7hREQNdcaRLBpD53OYbI+Nhcgnsbm +AkKJEZqeXE13/2jBswTAiBCvqkBS44jWpcIlbaDQhtk1MRZ/aJIgmcIGZsFXzmTSJBrq0cLCAAqF +WIvxfZgdqHm3LhgXtUZPeWS7x0BbFgsVChFog6PmjpcAOA5kM1lca5DAzy9ayecWIEor4Y1kCJKp +guBiEYrHSY2Nl0x+CUAo7DA+MMbyuijWy+SHS6D49ZulEBGCwTTBpHdv55mINjZx9c9rGJljcIoT +fI3qvZnEqYxjdYANNKIDJND5RxskMJi0T/bmRFnm4do6gsQyegdHKZ6Q0iE0hqHBSSYnPSorEpjJ +iZL+W2MxEx46HSyp5IVbulESz22j48QpBFHtxXvFie1AYESd7fgDahrAiWCyAXoyh5ecxutPo1Pl +matIhOrtrVw8c57UVIY18+bUmX/gAyAXaH45eRGnuhmTcgjGPWxWl2WcN3ep2fEyl7uu0NdzC19Q +++dXZ6GDT1nURCrL2XO/E9vQQrh6WXnOgBONsWzXHi792kX3tW4cKS19AfJuAkeAGwqpqozRumcH +pvs6/tDg0swrKqlp282Fnzrp7+knEBY0XxQA8hU/DBKJhNm5t43I2DDZG9cWNQ8lqqlp3c25734k +OZAkLKIOLpK/KMBs5P/tOLKt7QUeqYqS7voN0fqOvHBtHYmXdvHzsZOMjY5TIah376G9JACAA8Bj +SsnGlrWse+ZppjrPYNKpwr7bsJzY89v54chxJqYyfCGoG0vQXTIAwE5gp1LSuOJRtr32KukLZ/GH +bhFd1Uxkw2a+/+oYw57Hxxa11J+osgAA6oG3FVJfWcErb72BqyDtBXR8c4Ieo/nclqdZNgBACHjH +QZqdEJtffJauzktcNpZv70PvvgBmYy/IVuA8cOo/at13JB6I68P4P8W/3Fhxee98CpgAAAAldEVY +dGRhdGU6Y3JlYXRlADIwMTgtMDgtMjNUMjI6MTQ6NTctMDY6MDAATcIIAAAAJXRFWHRkYXRlOm1v +ZGlmeQAyMDA2LTA2LTEzVDA1OjM5OjI2LTA2OjAwewtT2wAAAABJRU5ErkJggg== +" + id="icon:32-4" + x="520" + y="236" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz +AAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAKRSURB +VDiNpZNLSJRRFMf/595v/GbmS4XyQRQUCWEQJT1BRO2BYrQoWgUR1SZatC0oJirNli2iTa0kgiCS +CJGwbCFliD2IohcUpZSpozPTNzPf6957Wthba9OBA2fx//05nAcxM/4nrO9FB9FuS9BekqKWma1I +mZMAugAstggdEGKbEJQB87NQmYsp5l4AIGbGGUFH40n7xPrWtcmyynL4hQiP+4aD3JSbY7Czoq4m +sbxxtQjyHjIf03jc/8SLlO48pnQHnQZ2Oo59pW3f1oRtC3DoAwyIhIOx0QzshI35FQ60mwWEhHRK +4WuJW5d6/ELePyJbJJ1auaGmrqq6FDo3DQ58cOBDu1/gxAlxRFCZSbDnwRQL0NkpWIbgJOdZn0bG +l1oMal20pBIqmwEHPsAMZgaYgWIBMAwTKARjOWjXh/YikHyHqvpmGH66zGJmSUbA5F2wUjMwZgzY +AFE6j/CzCzY/t8Vag2IlYLCwLElvM+PTqysSBO3NdAAArAyCMRe6EM1aXWxBBdITk5CED0IZvvz8 +yTtPllfCBCGMFyJKF+C9z84JkxVDvG4dhgaGipHBUaE1n8tlvdcvHr3XZC+EP+oiTHtgZWbDsRhK +G5oxeOdeEIVRd4q5W6SYjTK88+Wb0YlXI9ORs2oNSMpZsLBtlDW1YKD/vp+emLqjGAd+HBIAtBNV +WIJuV1fNr93YuCFeGH4A43kzcDIJp2Ez7t7s8/M594Zi7Ekx698MvpnYFuHqvFKnddOOtoT/cBAc +hojXN6H/eq9fLHpdmnEo9QtEfz5TOxFJwtmSktjhLbu2J6UUuH2txw+C4Pwxw0dmzeVv39hBtN+S +4oIQgiKl2o8b7pxTyN8ub648DTS3Awf/pfkKvceKsypI9XkAAAAASUVORK5CYII= +" + id="icon:16-32" + x="560" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABg1BMVEX///+DAACCAACEAQCF +AwKFAwGHAgGIBQOHBAKGAQCGAwKIBAKMCwfBUjrPZ0nHXESVFg+FAwGuMyTUcVPNZUq8SjaKBwWN +CwfWa0vdck3cbEXca0XedFDFVz/MYEbedFHbZ0HbaUTWcVSODAiHAwG2PSfca0bZXzfZXjbZXTXY +WzTZYTraYDvYWTHYVzDXVi/XVS3aYUG/QDDRXDzYWzXXVC3XUyzWUivWUSrWUSnWTyjUSCTNLxXK +Ig3HGQjIHAvVVkuFAQGFAgHSWj7WTijVSiTUSSPUSSLUSCHTRiHOMhXIGgjHGAfWW1GEAQCJBQLB +QyzVTCnSQRzSQBvRPBnKIwzMLBzCRTyHAgCVEgrYWz7QOhbQNxXNLBDIHAnIHAzUXFCLBwWGAgGu +KB7RQS/IHQzVWEyaGBSpIx3TSDrIGwrJHw7WXFKXFRGdGBPUVknJIRDJIhHUXlOSEA2SDgvTXlTL +KhrKJBTSXlOPCwmFAQDOWlHRXVOMCAeHAwKJBQQAAAAkgy4/AAAABnRSTlMAAAAAAABupgeRAAAA +AWJLR0SAZb2eaAAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB9cEAgsBLcz3aqkAAADRSURB +VBjTY2DABIxs7BxMTEycXOzcTCA+Mw8vH78Al6CQsIioGAsDA5O4hKSUtIysnLyCorySMiODiqqa +uoamlraOrp6+gaERGwOXsYmpmbmFpZW1ja2dvYMjg5Ozi6ubu4enl7ePj4+drx+Df0BgUHBwSKgP +CISFRzCwRkZFx8TGgfnxCYlMDExJySneYK5Palo6J9AdTE4ZmVkgfnZObhLYZUxJefkFPj6FRcWc +TBC3M3GWlJaVV1RWMcF8w1SVWF1TW4Xiwbp6ZlQvMzFCGQCmliqV/01FkgAAACV0RVh0ZGF0ZTpj +cmVhdGUAMjAxOC0wOC0yM1QyMjoxNDo1Ny0wNjowMABNwggAAAAldEVYdGRhdGU6bW9kaWZ5ADIw +MDctMDQtMDJUMTc6MDE6NDUtMDY6MDCxuArqAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUu +b3Jnm+48GgAAAABJRU5ErkJggg== +" + id="icon:16-8" + x="584" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABg1BMVEX///+DAACCAACEAQCF +AwKFAwGHAgGIBQOHBAKGAQCGAwKIBAKMCwfBUjrPZ0nHXESVFg+FAwGuMyTUcVPNZUq8SjaKBwWN +CwfWa0vdck3cbEXca0XedFDFVz/MYEbedFHbZ0HbaUTWcVSODAiHAwG2PSfca0bZXzfZXjbZXTXY +WzTZYTraYDvYWTHYVzDXVi/XVS3aYUG/QDDRXDzYWzXXVC3XUyzWUivWUSrWUSnWTyjUSCTNLxXK +Ig3HGQjIHAvVVkuFAQGFAgHSWj7WTijVSiTUSSPUSSLUSCHTRiHOMhXIGgjHGAfWW1GEAQCJBQLB +QyzVTCnSQRzSQBvRPBnKIwzMLBzCRTyHAgCVEgrYWz7QOhbQNxXNLBDIHAnIHAzUXFCLBwWGAgGu +KB7RQS/IHQzVWEyaGBSpIx3TSDrIGwrJHw7WXFKXFRGdGBPUVknJIRDJIhHUXlOSEA2SDgvTXlTL +KhrKJBTSXlOPCwmFAQDOWlHRXVOMCAeHAwKJBQQAAAAkgy4/AAAABnRSTlMAAAAAAABupgeRAAAA +AWJLR0SAZb2eaAAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB9cEAgsBLcz3aqkAAADRSURB +VBjTY2DABIxs7BxMTEycXOzcTCA+Mw8vH78Al6CQsIioGAsDA5O4hKSUtIysnLyCorySMiODiqqa +uoamlraOrp6+gaERGwOXsYmpmbmFpZW1ja2dvYMjg5Ozi6ubu4enl7ePj4+drx+Df0BgUHBwSKgP +CISFRzCwRkZFx8TGgfnxCYlMDExJySneYK5Palo6J9AdTE4ZmVkgfnZObhLYZUxJefkFPj6FRcWc +TBC3M3GWlJaVV1RWMcF8w1SVWF1TW4Xiwbp6ZlQvMzFCGQCmliqV/01FkgAAACV0RVh0ZGF0ZTpj +cmVhdGUAMjAxOC0wOC0yM1QyMjoxNDo1Ny0wNjowMABNwggAAAAldEVYdGRhdGU6bW9kaWZ5ADIw +MDctMDQtMDJUMTc6MDE6NDUtMDY6MDCxuArqAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUu +b3Jnm+48GgAAAABJRU5ErkJggg== +" + id="icon:16-4" + x="608" + y="252" /> +</svg> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 2333e397f1..2192327a76 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -553,21 +553,26 @@ IDI_SHELL_TREE ICON resources/menu.ico /* @makedep: resources/folder.ico */ IDI_SHELL_REMOTE_FOLDER ICON resources/folder.ico +/* @makedep: resources/favorites.ico */ +IDI_SHELL_FAVORITES ICON resources/favorites.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico +/* @makedep: resources/favorites.ico */ +IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico -/* FIXME: Following resource is not yet added */ -/* @makedep: resources/mydocs.ico */ -IDI_SHELL_FAVORITES ICON resources/mydocs.ico +/* @makedep: resources/favorites.ico */ +IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico /* @makedep: resources/idb_tb_large.bmp */ IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 651d52ea37..174f76076f 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -212,6 +212,7 @@ #define IDI_SHELL_MUSIC_CD 41 #define IDI_SHELL_TREE 42 #define IDI_SHELL_REMOTE_FOLDER 43 +#define IDI_SHELL_FAVORITES 44 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142 @@ -219,9 +220,10 @@ #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 +#define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_OPTICAL_DISC 302 -#define IDI_SHELL_FAVORITES 319 +#define IDI_SHELL_FAVORITES_SMALL 322 /* AVI resources, windows shell32 has 14 of them: 150-152 and 160-170 -- 2.18.0

1 19

[PATCH] include: Add sal.h
by Alistair Leslie-Hughes 27 Aug '18

27 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/sal.h | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 include/sal.h diff --git a/include/Makefile.in b/include/Makefile.in index fec158d..a89fef6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -549,6 +549,7 @@ SOURCES = \ rstloc.idl \ rstnot.idl \ rtutils.h \ + sal.h \ sapi.idl \ sapiddk.idl \ scarderr.h \ diff --git a/include/sal.h b/include/sal.h new file mode 100644 index 0000000..3c4d419 --- /dev/null +++ b/include/sal.h @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_SAL_H__ +#define __WINE_SAL_H__ + +#define _Check_return_ + +#define _Deref_out_ +#define _Deref_out_opt_ +#define _Deref_out_opt_z_ +#define _Deref_post_opt_cap_(count) +#define _Deref_post_opt_valid_ + +#define _In_ +#define _In_bytecount_(count) +#define _In_count_(count) +#define _In_opt_ +#define _In_opt_count_(count) +#define _In_opt_z_ +#define _In_reads_(count) +#define _In_reads_bytes_(count) +#define _In_reads_opt_z_(count) +#define _In_reads_z_(count) +#define _In_z_ + +#define _Inout_ +#define _Inout_cap_(count) +#define _Inout_opt_ +#define _Inout_updates_z_(count) +#define _Inout_z_ +#define _Inout_z_bytecap_(count) +#define _Inout_z_cap_(count) +#define _Inout_z_cap_c_(count) + +#define _Null_terminated_ + +#define _Out_ +#define _Out_bytecap_(count) +#define _Out_bytecapcount_(count) +#define _Out_bytecap_post_bytecount_(count1, count2) +#define _Out_cap_(count) +#define _Out_cap_post_count_(count1, count2) +#define _Out_opt_ +#define _Out_opt_z_cap_(count) +#define _Out_opt_z_cap_post_count_(count1, count2) +#define _Out_writes_(count) +#define _Out_writes_bytes_to_(count1, count2) +#define _Out_writes_opt_(count) +#define _Out_writes_opt_z_(count) +#define _Out_writes_to_(count1, count2) +#define _Out_writes_z_(count) +#define _Out_z_cap_(count) +#define _Out_z_cap_c_(count) +#define _Out_z_cap_post_count_(count1, count2) + +#define _Outptr_result_buffer_(count) +#define _Outptr_result_maybenull_z_ + +#define _Post_invalid_ +#define _Post_writable_byte_size_(count) +#define _Post_z_ + +#define _Pre_maybenull_ +#define _Pre_notnull_ +#define _Pre_writable_size_(count) + +#define _Printf_format_string_ + +#define _Ret_maybenull_ +#define _Ret_maybenull_z_ +#define _Ret_opt_ +#define _Ret_opt_z_cap_(count) +#define _Ret_writes_bytes_maybenull_(count) +#define _Ret_z_ + +#define _Success_(exp) + +#endif + -- 1.9.1

1 0

[PATCH] dpnet: Implement IDirectPlay8Peer SetSPCaps
by Alistair Leslie-Hughes 27 Aug '18

27 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/peer.c | 12 ++++++++++-- dlls/dpnet/tests/client.c | 25 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index e8a60c3..3e3cd9b 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -526,9 +526,17 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetCaps(IDirectPlay8Peer *iface, cons static HRESULT WINAPI IDirectPlay8PeerImpl_SetSPCaps(IDirectPlay8Peer *iface, const GUID * const pguidSP, const DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags ) { - FIXME("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); - return DPNERR_GENERIC; + TRACE("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + + if(!This->msghandler || pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) + return DPNERR_INVALIDPARAM; + + /* Only dwSystemBufferSize is set by this call. */ + This->spcaps.dwSystemBufferSize = pdpspCaps->dwSystemBufferSize; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8PeerImpl_GetSPCaps(IDirectPlay8Peer *iface, const GUID * const pguidSP, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 431203b..47d8b01 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -561,6 +561,9 @@ static void test_init_dp_peer(void) memset(&caps, 0, sizeof(DPN_SP_CAPS)); caps.dwSize = sizeof(DPN_SP_CAPS); + hr = IDirectPlay8Peer_SetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_INVALIDPARAM, "SetSPCaps failed with %x\n", hr); + hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); ok(hr == DPNERR_UNINITIALIZED, "GetSPCaps failed with %x\n", hr); @@ -815,6 +818,28 @@ static void test_get_sp_caps_peer(void) ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); + + caps.dwNumThreads = 2; + caps.dwDefaultEnumCount = 3; + caps.dwDefaultEnumRetryInterval = 1400; + caps.dwDefaultEnumTimeout = 1400; + caps.dwMaxEnumPayloadSize = 900; + caps.dwBuffersPerThread = 2; + caps.dwSystemBufferSize = 0x0ffff; + hr = IDirectPlay8Peer_SetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "SetSPCaps failed with %x\n", hr); + + hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + + ok(caps.dwSize == sizeof(DPN_SP_CAPS), "got %d\n", caps.dwSize); + ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); + ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + ok(caps.dwSystemBufferSize == 0x0ffff, "expected 0x0ffff, got 0x%x\n", caps.dwSystemBufferSize); } static void test_player_info_peer(void) -- 1.9.1

1 0

[PATCH] explorer: Replace the desktop window procedure instead of wrapping it.
by Fabian Maurer 26 Aug '18

26 Aug '18

This reverts commit fc14753dc0188a52a05243d5d82c4062b93daaff. According to Alexandre, we should be passing all messages to DefWindowProc. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/explorer/desktop.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index ff58204530..49d3ee6928 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -599,8 +599,6 @@ static BOOL start_screensaver( void ) return FALSE; } -static WNDPROC desktop_orig_wndproc; - /* window procedure for the desktop window */ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPARAM lp ) { @@ -662,9 +660,10 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR EndPaint( hwnd, &ps ); } return 0; - } - return desktop_orig_wndproc( hwnd, message, wp, lp ); + default: + return DefWindowProcW( hwnd, message, wp, lp ); + } } /* create the desktop and the associated driver window, and make it the current desktop */ @@ -979,8 +978,7 @@ void manage_desktop( WCHAR *arg ) CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, 0, 0, 0, NULL ); - desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( hwnd, GWLP_WNDPROC, - (LONG_PTR)desktop_wnd_proc ); + SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); using_root = !desktop || !create_desktop( graphics_driver, name, width, height ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); -- 2.18.0

1 1

[PATCH 1/2] comctl32/listview: Use mask to disable change notifications.
by Nikolay Sivov 26 Aug '18

26 Aug '18

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 48 +++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 200bf93be5..d463607e45 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -211,6 +211,12 @@ typedef struct tagDELAYED_ITEM_EDIT INT iItem; } DELAYED_ITEM_EDIT; +enum notification_mask +{ + NOTIFY_MASK_ITEM_CHANGE = 0x1, + NOTIFY_MASK_UNMASK_ALL = 0xffffffff +}; + typedef struct tagLISTVIEW_INFO { /* control window */ @@ -225,7 +231,7 @@ typedef struct tagLISTVIEW_INFO /* notification window */ SHORT notifyFormat; HWND hwndNotify; - BOOL bDoChangeNotify; /* send change notification messages? */ + DWORD notify_mask; UINT uCallbackMask; /* tooltips */ @@ -3507,13 +3513,13 @@ Parameters: */ static void LISTVIEW_ShiftFocus(LISTVIEW_INFO *infoPtr, INT focus, INT item, INT direction) { - BOOL old_change = infoPtr->bDoChangeNotify; + DWORD old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; - infoPtr->bDoChangeNotify = FALSE; + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; focus = shift_item(infoPtr, focus, item, direction); if (focus != infoPtr->nFocusedItem) LISTVIEW_SetItemFocus(infoPtr, focus); - infoPtr->bDoChangeNotify = old_change; + infoPtr->notify_mask |= old_mask; } /** @@ -3556,8 +3562,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) INT nLast = max(infoPtr->nSelectionMark, nItem); HWND hwndSelf = infoPtr->hwndSelf; NMLVODSTATECHANGE nmlv; + DWORD old_mask; LVITEMW item; - BOOL bOldChange; INT i; /* Temporarily disable change notification @@ -3565,8 +3571,9 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) * only one LVN_ODSTATECHANGED notification. * See MSDN documentation for LVN_ITEMCHANGED. */ - bOldChange = infoPtr->bDoChangeNotify; - if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; + old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; + if (infoPtr->dwStyle & LVS_OWNERDATA) + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; if (nFirst == -1) nFirst = nItem; @@ -3585,7 +3592,7 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); if (!IsWindow(hwndSelf)) return FALSE; - infoPtr->bDoChangeNotify = bOldChange; + infoPtr->notify_mask |= old_mask; return TRUE; } @@ -3604,9 +3611,9 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) { RANGES selection; + DWORD old_mask; LVITEMW item; ITERATOR i; - BOOL bOldChange; if (!(selection = ranges_create(100))) return; @@ -3656,8 +3663,9 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) /* disable per item notifications on LVS_OWNERDATA style FIXME: single LVN_ODSTATECHANGED should be used */ - bOldChange = infoPtr->bDoChangeNotify; - if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; + old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; + if (infoPtr->dwStyle & LVS_OWNERDATA) + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; LISTVIEW_DeselectAllSkipItems(infoPtr, selection); @@ -3668,8 +3676,7 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) /* this will also destroy the selection */ iterator_destroy(&i); - infoPtr->bDoChangeNotify = bOldChange; - + infoPtr->notify_mask |= old_mask; LISTVIEW_SetItemFocus(infoPtr, nItem); } @@ -4257,7 +4264,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications are enabled. Even nothing really changed we still need to send this, in this case uChanged mask is just set to passed item mask. */ - if(lpItem && !isNew && infoPtr->bDoChangeNotify) + if (lpItem && !isNew && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4350,7 +4357,8 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL /* send LVN_ITEMCHANGED notification */ if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; - if (infoPtr->bDoChangeNotify) notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); + if (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE) + notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); return TRUE; } @@ -8973,7 +8981,7 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE if (nItem == -1) { UINT oldstate = 0; - BOOL notify; + DWORD old_mask; /* special case optimization for recurring attempt to deselect all */ if (lvItem.state == 0 && lvItem.stateMask == LVIS_SELECTED && !LISTVIEW_GetSelectedCount(infoPtr)) @@ -8986,10 +8994,10 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE /* focus all isn't allowed */ if (lvItem.state & lvItem.stateMask & LVIS_FOCUSED) return FALSE; - notify = infoPtr->bDoChangeNotify; + old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; if (infoPtr->dwStyle & LVS_OWNERDATA) { - infoPtr->bDoChangeNotify = FALSE; + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; if (!(lvItem.state & LVIS_SELECTED) && LISTVIEW_GetSelectedCount(infoPtr)) oldstate |= LVIS_SELECTED; if (infoPtr->nFocusedItem != -1) oldstate |= LVIS_FOCUSED; @@ -9003,7 +9011,7 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE { NMLISTVIEW nmlv; - infoPtr->bDoChangeNotify = notify; + infoPtr->notify_mask |= old_mask; nmlv.iItem = -1; nmlv.iSubItem = 0; @@ -9484,7 +9492,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW * infoPtr->nHotItem = -1; infoPtr->redraw = TRUE; infoPtr->bNoItemMetrics = TRUE; - infoPtr->bDoChangeNotify = TRUE; + infoPtr->notify_mask = NOTIFY_MASK_UNMASK_ALL; infoPtr->autoSpacing = TRUE; infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); -- 2.18.0

1 1

[PATCH] ntdll/tests: Add Nt[WaitFor|Release]KeyedEvent test with NULL handle.
by Gijs Vermeulen 26 Aug '18

26 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44620 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/tests/om.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 52b4a83968..c2b40cb69c 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1677,6 +1677,13 @@ static void test_keyed_events(void) status = pNtReleaseKeyedEvent( handle, NULL, 0, &timeout ); ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + status = pNtWaitForKeyedEvent( NULL, (void *)8, 0, &timeout ); + todo_wine ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ + "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( NULL, (void *)8, 0, &timeout ); + todo_wine ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ + "NtReleaseKeyedEvent %x\n", status ); + status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); -- 2.15.2 (Apple Git-101.1)

1 0

[PATCH 3/3] comctl32/pager: Support WM_NOTIFYFORMAT message.
by Zhiyi Zhang 26 Aug '18

26 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/pager.c | 25 +++++++++++++++++++++++++ dlls/comctl32/tests/pager.c | 8 ++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index fe68515e67..de63cad717 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -71,6 +71,7 @@ typedef struct HWND hwndSelf; /* handle of the control wnd */ HWND hwndChild; /* handle of the contained wnd */ HWND hwndNotify; /* handle of the parent wnd */ + BOOL bUnicode; /* send notifications in Unicode */ DWORD dwStyle; /* styles for this control */ COLORREF clrBk; /* background color */ INT nBorder; /* border size for the control */ @@ -555,6 +556,7 @@ static LRESULT PAGER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) { PAGER_INFO *infoPtr; + INT ret; /* allocate memory for info structure */ infoPtr = heap_alloc_zero (sizeof(*infoPtr)); @@ -581,6 +583,9 @@ PAGER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) if (infoPtr->dwStyle & PGS_DRAGNDROP) FIXME("[%p] Drag and Drop style is not implemented yet.\n", infoPtr->hwndSelf); + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); + infoPtr->bUnicode = (ret == NFR_UNICODE); + return 0; } @@ -998,6 +1003,23 @@ PAGER_StyleChanged(PAGER_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lp return 0; } +static LRESULT PAGER_NotifyFormat(PAGER_INFO *infoPtr, INT command) +{ + INT ret; + switch (command) + { + case NF_REQUERY: + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); + infoPtr->bUnicode = (ret == NFR_UNICODE); + return ret; + case NF_QUERY: + /* Pager always wants Unicode notifications from children */ + return NFR_UNICODE; + default: + return 0; + } +} + static LRESULT WINAPI PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1089,6 +1111,9 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_TIMER: return PAGER_Timer (infoPtr, (INT)wParam); + case WM_NOTIFYFORMAT: + return PAGER_NotifyFormat (infoPtr, lParam); + case WM_NOTIFY: case WM_COMMAND: return SendMessageW (infoPtr->hwndNotify, uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index f2ac8b299a..a1f6683a57 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -392,8 +392,8 @@ static void test_wm_notifyformat(void) /* Test parent */ notify_query_received = FALSE; ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent, NF_REQUERY); - todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); - todo_wine ok(notify_query_received, "Didn't receive notify\n"); + ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + ok(notify_query_received, "Didn't receive notify\n"); /* Send NF_QUERY directly to parent */ notify_query_received = FALSE; @@ -404,8 +404,8 @@ static void test_wm_notifyformat(void) /* Pager send notifications to its parent regardless of wParam */ notify_query_received = FALSE; ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent_wnd, NF_REQUERY); - todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); - todo_wine ok(notify_query_received, "Didn't receive notify\n"); + ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + ok(notify_query_received, "Didn't receive notify\n"); /* Pager always wants Unicode notifications from children */ ret = SendMessageW(child, WM_NOTIFYFORMAT, (WPARAM)pager, NF_REQUERY); -- 2.18.0

2 1

[PATCH 2/3] comctl32/tests: Add WM_NOTIFYFORMAT tests for pager.
by Zhiyi Zhang 26 Aug '18

26 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/pager.c | 90 +++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index fa505dce68..f2ac8b299a 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -28,6 +28,8 @@ #define PAGER_SEQ_INDEX 0 static HWND parent_wnd, child1_wnd, child2_wnd; +static INT notify_format; +static BOOL notify_query_received; #define CHILD1_ID 1 #define CHILD2_ID 2 @@ -330,6 +332,93 @@ static void test_pager(void) DestroyWindow( pager ); } +static LRESULT WINAPI test_notifyformat_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_NOTIFYFORMAT: + if (lParam == NF_QUERY) + { + notify_query_received = TRUE; + return notify_format; + } + else if (lParam == NF_REQUERY) + return SendMessageA(GetParent(hwnd), WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY); + else + return 0; + default: + return notify_format == NFR_UNICODE ? DefWindowProcW(hwnd, message, wParam, lParam) + : DefWindowProcA(hwnd, message, wParam, lParam); + } +} + +static BOOL register_notifyformat_class(void) +{ + static const WCHAR class_w[] = {'P', 'a', 'g', 'e', 'r', ' ', 'n', 'o', 't', 'i', 'f', 'y', 'f', + 'o', 'r', 'm', 'a', 't', ' ', 'c', 'l', 'a', 's', 's', 0}; + WNDCLASSW cls = {0}; + + cls.lpfnWndProc = test_notifyformat_proc; + cls.hInstance = GetModuleHandleW(NULL); + cls.lpszClassName = class_w; + return RegisterClassW(&cls); +} + +static void test_wm_notifyformat(void) +{ + static const WCHAR class_w[] = {'P', 'a', 'g', 'e', 'r', ' ', 'n', 'o', 't', 'i', 'f', 'y', 'f', + 'o', 'r', 'm', 'a', 't', ' ', 'c', 'l', 'a', 's', 's', 0}; + static const WCHAR parent_w[] = {'p', 'a', 'r', 'e', 'n', 't', 0}; + static const WCHAR pager_w[] = {'p', 'a', 'g', 'e', 'r', 0}; + static const WCHAR child_w[] = {'c', 'h', 'i', 'l', 'd', 0}; + static const INT formats[] = {NFR_UNICODE, NFR_ANSI}; + HWND parent, pager, child; + LRESULT ret; + INT i; + + ok(register_notifyformat_class(), "Register test class failed, error 0x%08x\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(formats); i++) + { + notify_format = formats[i]; + parent = CreateWindowW(class_w, parent_w, WS_OVERLAPPED, 0, 0, 100, 100, 0, 0, GetModuleHandleW(0), 0); + ok(parent != NULL, "CreateWindow failed\n"); + pager = CreateWindowW(WC_PAGESCROLLERW, pager_w, WS_CHILD, 0, 0, 100, 100, parent, 0, GetModuleHandleW(0), 0); + ok(pager != NULL, "CreateWindow failed\n"); + child = CreateWindowW(class_w, child_w, WS_CHILD, 0, 0, 100, 100, pager, 0, GetModuleHandleW(0), 0); + ok(child != NULL, "CreateWindow failed\n"); + SendMessageW(pager, PGM_SETCHILD, 0, (LPARAM)child); + + /* Test parent */ + notify_query_received = FALSE; + ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent, NF_REQUERY); + todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + todo_wine ok(notify_query_received, "Didn't receive notify\n"); + + /* Send NF_QUERY directly to parent */ + notify_query_received = FALSE; + ret = SendMessageW(parent, WM_NOTIFYFORMAT, (WPARAM)pager, NF_QUERY); + ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + ok(notify_query_received, "Didn't receive notify\n"); + + /* Pager send notifications to its parent regardless of wParam */ + notify_query_received = FALSE; + ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent_wnd, NF_REQUERY); + todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + todo_wine ok(notify_query_received, "Didn't receive notify\n"); + + /* Pager always wants Unicode notifications from children */ + ret = SendMessageW(child, WM_NOTIFYFORMAT, (WPARAM)pager, NF_REQUERY); + ok(ret == NFR_UNICODE, "Expect %d, got %ld\n", NFR_UNICODE, ret); + ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)child, NF_QUERY); + ok(ret == NFR_UNICODE, "Expect %d, got %ld\n", NFR_UNICODE, ret); + + DestroyWindow(parent); + } + + UnregisterClassW(class_w, GetModuleHandleW(NULL)); +} + static void init_functions(void) { HMODULE mod = LoadLibraryA("comctl32.dll"); @@ -357,6 +446,7 @@ START_TEST(pager) ok(parent_wnd != NULL, "Failed to create parent window!\n"); test_pager(); + test_wm_notifyformat(); DestroyWindow(parent_wnd); } -- 2.18.0

2 1

[PATCH 1/3] comctl32/tests: Remove pager skip check.
by Zhiyi Zhang 26 Aug '18

26 Aug '18

Pager should be available on all VMs(XP+) on TestBot. So there's no need to check for the availability of pager control. Add calling InitCommonControls() so that pager control can be correctly initialized on XP. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/pager.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 0da396cdd1..fa505dce68 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -32,6 +32,7 @@ static HWND parent_wnd, child1_wnd, child2_wnd; #define CHILD1_ID 1 #define CHILD2_ID 2 +static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; @@ -257,11 +258,7 @@ static void test_pager(void) RECT rect, rect2; pager = create_pager_control( PGS_HORZ ); - if (!pager) - { - win_skip( "Pager control not supported\n" ); - return; - } + ok(pager != NULL, "Fail to create pager\n"); register_child_wnd_class(); @@ -333,11 +330,26 @@ static void test_pager(void) DestroyWindow( pager ); } -START_TEST(pager) +static void init_functions(void) { - HMODULE mod = GetModuleHandleA("comctl32.dll"); + HMODULE mod = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(mod, #f); + X(InitCommonControlsEx); +#undef X pSetWindowSubclass = (void*)GetProcAddress(mod, (LPSTR)410); +} + +START_TEST(pager) +{ + INITCOMMONCONTROLSEX iccex; + + init_functions(); + + iccex.dwSize = sizeof(iccex); + iccex.dwICC = ICC_PAGESCROLLER_CLASS; + pInitCommonControlsEx(&iccex); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); @@ -345,4 +357,6 @@ START_TEST(pager) ok(parent_wnd != NULL, "Failed to create parent window!\n"); test_pager(); + + DestroyWindow(parent_wnd); } -- 2.18.0

2 1

[PATCH 1/2] d3drm: Partially implement IDirect3DRMTexture*::InitFromFile. (v6)
by Aaryaman Vasishta 26 Aug '18

26 Aug '18

v6: Rebased on top of master as of this patch date v5: Redundant newline removed. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/tests/d3drm.c | 79 ++++++++- dlls/d3drm/texture.c | 325 ++++++++++++++++++++++++++++++++++++- 3 files changed, 393 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 858911f350..333b809896 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -26,6 +26,7 @@ #define COBJMACROS #include <assert.h> #include <math.h> +#include <limits.h> #include "dxfile.h" #include "d3drmwin.h" #include "rmxfguid.h" diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f78e098fec..4ed90ca682 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -5572,6 +5572,7 @@ static void test_load_texture(void) char *filename; HRESULT hr; BOOL ret; + ULONG ref1, ref2; int i; static const struct @@ -5595,6 +5596,7 @@ static void test_load_texture(void) ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr); + ref1 = get_refcount((IUnknown *)d3drm1); for (i = 0; i < ARRAY_SIZE(tests); ++i) { @@ -5602,24 +5604,74 @@ static void test_load_texture(void) hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + /* InitFromFile seems to AddRef IDirect3DRM even if it fails. */ + if (FAILED(hr)) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture_Release(texture1); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture, (void **)&texture1); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, ""); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture_GetImage(texture1); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + if (FAILED(hr)) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4 + 1, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture2_Release(texture2); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, ""); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture2_GetImage(texture2); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture2_Release(texture2); hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + if (FAILED(hr)) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) test_bitmap_data(i * 4 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); /* Test whether querying a version 1 texture from version 3 causes a @@ -5627,11 +5679,26 @@ static void test_load_texture(void) hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1); ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#x.\n", hr); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) test_bitmap_data(i * 4 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); IDirect3DRMTexture3_Release(texture3); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3, (void **)&texture3); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, ""); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture3_GetImage(texture3); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture3_Release(texture3); ret = DeleteFileA(filename); ok(ret, "Test %u: Failed to delete bitmap \"%s\".\n", i, filename); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index fd56e76ff9..4c81c788bf 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -2,6 +2,7 @@ * Implementation of IDirect3DRMTextureX interfaces * * Copyright 2012 Christian Costa + * Copyright 2016 Aaryaman Vasishta * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -67,6 +68,294 @@ static BOOL d3drm_validate_image(D3DRMIMAGE *image) return TRUE; } +static void CDECL destroy_image_callback(IDirect3DRMObject *obj, void *arg) +{ + D3DRMIMAGE *image = arg; + + TRACE("image %p texture object %p.\n", arg, obj); + + HeapFree(GetProcessHeap(), 0, image->buffer1); + HeapFree(GetProcessHeap(), 0, image); +} + +HRESULT d3drm_texture_load(struct d3drm_texture *texture, const char *path, BOOL load_upside_down, D3DRMIMAGE **image_out) +{ + BITMAPINFO *info; + BITMAPFILEHEADER *bmp_header; + unsigned char *buffer; + DWORD size; + HANDLE hfile, hmapping; + HRESULT hr = D3DRM_OK; + D3DRMPALETTEENTRY *colors = NULL; + D3DRMIMAGE *image = NULL; + BOOL black_used = FALSE, palette_used; + LONG w; + LONG h; + UINT i, j, k; + UINT idx, buffer1_idx; + unsigned char *buffer1; + UINT bpp; + UINT bpl; + UINT num_colors = 0; + struct colors_24bpp + { + BYTE red; + BYTE green; + BYTE blue; + } *color = NULL; + + /* Load the bitmap data */ + hfile = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + if (hfile == INVALID_HANDLE_VALUE) + return D3DRMERR_BADOBJECT; + + size = GetFileSize(hfile, NULL); + if (size == INVALID_FILE_SIZE) + { + CloseHandle(hfile); + return D3DRMERR_BADVALUE; + } + if (!(hmapping = CreateFileMappingA(hfile, NULL, PAGE_READONLY, 0, 0, NULL))) + { + CloseHandle(hfile); + return D3DRMERR_BADVALUE; + } + if (!(buffer = MapViewOfFile(hmapping, FILE_MAP_READ, 0, 0, 0))) + { + CloseHandle(hmapping); + CloseHandle(hfile); + return D3DRMERR_BADVALUE; + } + + bmp_header = (BITMAPFILEHEADER *)buffer; + if (bmp_header->bfType != 0x4d42) /* BM */ + { + hr = D3DRMERR_BADFILE; + goto cleanup; + } + + info = (BITMAPINFO *)(bmp_header + 1); + /* Only allow version 1 DIB's (BITMAPINFOHEADER) to be loaded */ + if (info->bmiHeader.biSize != sizeof(info->bmiHeader)) + { + hr = D3DRMERR_BADFILE; + goto cleanup; + } + + bpp = info->bmiHeader.biBitCount == 24 ? 32 : info->bmiHeader.biBitCount; + w = info->bmiHeader.biWidth; + h = abs(info->bmiHeader.biHeight); + + if (bpp == 8) + { + buffer += sizeof(BITMAPINFOHEADER) + sizeof(BITMAPFILEHEADER) + 256 * sizeof(RGBQUAD); + palette_used = TRUE; + } + else if (bpp == 32) + { + buffer += sizeof(BITMAPINFOHEADER) + sizeof(BITMAPFILEHEADER); + palette_used = FALSE; + } + else + { + hr = D3DRMERR_BADFILE; + goto cleanup; + } + + /* Create and initialize the image struct. */ + color = (struct colors_24bpp *)buffer; + + if (palette_used) + bpl = w; + else if ((bpl = ((w + 3) & ~3)) > UINT_MAX / (bpp / 8)) + { + hr = D3DRMERR_BADALLOC; + goto cleanup; + } + + bpl = bpl * bpp / 8; + + if (bpl > UINT_MAX / h) + { + hr = D3DRMERR_BADALLOC; + goto cleanup; + } + + if (!(colors = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 256 * sizeof(*colors)))) + { + WARN("Not enough memory to allocate palette, returning NULL.\n"); + hr = D3DRMERR_BADALLOC; + goto cleanup; + } + + if (!(image = HeapAlloc(GetProcessHeap(), 0, sizeof(*image)))) + { + WARN("Not enough memory to allocate image struct, returning NULL.\n"); + hr = D3DRMERR_BADALLOC; + goto cleanup; + } + image->buffer1 = NULL; + + if (!(image->buffer1 = HeapAlloc(GetProcessHeap(), 0, bpl * h))) + { + WARN("Not enough memory to allocate image buffer, returning NULL.\n"); + hr = D3DRMERR_BADALLOC; + goto cleanup; + } + + buffer1 = image->buffer1; + memset(buffer1, 0xff, bpl * h); + if (!palette_used) + { + for (i = 0; i < h; i++) + { + for (j = 0; j < w; j++) + { + buffer1_idx = ((w + 3) & ~3) * i + j; + idx = load_upside_down ? (h - 1 - i) * w + j : i * w + j; + for (k = 0; k < 256; k++) + { + if (color[idx].blue == colors[k].blue && + color[idx].green == colors[k].green && + color[idx].red == colors[k].red) + { + if (color[idx].blue == 0 && + color[idx].green == 0 && + color[idx].red == 0 && + !black_used) + { + black_used = TRUE; + colors[num_colors++].flags = D3DRMPALETTE_READONLY; + } + buffer1[buffer1_idx] = k; + + break; + } + } + if (k == 256) + { + if (num_colors == 256) + { + num_colors++; + i = h; + break; + } + buffer1[buffer1_idx] = num_colors; + colors[num_colors].red = color[idx].red; + colors[num_colors].green = color[idx].green; + colors[num_colors].blue = color[idx].blue; + colors[num_colors++].flags = D3DRMPALETTE_READONLY; + } + } + } + + if (num_colors <= 256) + { + if (!(image->palette = HeapAlloc(GetProcessHeap(), 0, num_colors * sizeof(*image->palette)))) + { + WARN("Not enough memory to allocate image palette, returning NULL.\n"); + hr = D3DRMERR_BADALLOC; + goto cleanup; + } + image->red_mask = 0xff; + image->green_mask = 0xff; + image->blue_mask = 0xff; + image->rgb = 0; + bpl = bpl / (bpp / 8); + memcpy(image->palette, colors, num_colors * sizeof(D3DRMPALETTEENTRY)); + image->palette_size = num_colors; + palette_used = TRUE; + } + else + { + bpl = w * 4; + image->rgb = 1; + image->palette = NULL; + image->palette_size = 0; + for (i = 0; i < h; ++i) + { + for (j = 0; j < w; ++j) + { + unsigned char *ptr = &buffer1[i * bpl + j * 4]; + idx = load_upside_down ? (h - 1 - i) * w * 3 + j * 3 : i * w * 3 + j * 3; + ptr[0] = buffer[idx]; + ptr[1] = buffer[idx + 1]; + ptr[2] = buffer[idx + 2]; + ptr[3] = 0xff; + } + } + + image->red_mask = 0xff0000; + image->green_mask = 0x00ff00; + image->blue_mask = 0x0000ff; + } + } + else + { + if (!(image->palette = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(*image->palette)))) + { + WARN("Not enough memory to allocate image palette, returning NULL.\n"); + hr = D3DRMERR_BADALLOC; + goto cleanup; + } + + memcpy(image->palette, info->bmiColors, 256 * sizeof(D3DRMPALETTEENTRY)); + for (i = 0; i < 256; i++) + { + image->palette[i].flags = D3DRMPALETTE_READONLY; + } + if (load_upside_down) + { + for (i = 0; i < h; i++) + { + for (j = 0; j < w; j++) + { + idx = (h - 1 - i) * bpl + j; + buffer1[i * bpl + j] = buffer[idx]; + } + } + } + else + { + memcpy(buffer1, buffer, bpl * h); + } + image->palette_size = 256; + image->red_mask = 0xff; + image->green_mask = 0xff; + image->blue_mask = 0xff; + image->rgb = 0; + } + image->width = w; + image->height = h; + image->aspectx = 1; + image->aspecty = 1; + image->alpha_mask = 0; + image->depth = palette_used ? 8 : bpp; + image->bytes_per_line = bpl; + image->buffer2 = NULL; + + /* Use an internal destroy callback to destroy image struct */ + hr = IDirect3DRMObject_AddDestroyCallback(&texture->IDirect3DRMTexture3_iface, destroy_image_callback, image); + + *image_out = image; + +cleanup: + UnmapViewOfFile(buffer); + CloseHandle(hmapping); + CloseHandle(hfile); + + HeapFree(GetProcessHeap(), 0, colors); + + if (FAILED(hr)) + { + if (image) + HeapFree(GetProcessHeap(), 0, image->buffer1); + HeapFree(GetProcessHeap(), 0, image); + } + + return hr; +} + static HRESULT WINAPI d3drm_texture1_QueryInterface(IDirect3DRMTexture *iface, REFIID riid, void **out) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); @@ -171,9 +460,18 @@ static HRESULT WINAPI d3drm_texture1_GetClassName(IDirect3DRMTexture *iface, DWO static HRESULT WINAPI d3drm_texture1_InitFromFile(IDirect3DRMTexture *iface, const char *filename) { - FIXME("iface %p, filename %s stub!\n", iface, debugstr_a(filename)); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); + D3DRMIMAGE *image; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, filename %s.\n", iface, debugstr_a(filename)); + + if (FAILED(hr = d3drm_texture_load(texture, filename, FALSE, &image))) + return hr; + + hr = IDirect3DRMTexture3_InitFromImage(&texture->IDirect3DRMTexture3_iface, image); + + return hr; } static HRESULT WINAPI d3drm_texture1_InitFromSurface(IDirect3DRMTexture *iface, @@ -473,9 +771,15 @@ static HRESULT WINAPI d3drm_texture2_GetClassName(IDirect3DRMTexture2 *iface, DW static HRESULT WINAPI d3drm_texture2_InitFromFile(IDirect3DRMTexture2 *iface, const char *filename) { - FIXME("iface %p, filename %s stub!\n", iface, debugstr_a(filename)); + struct d3drm_texture *object = impl_from_IDirect3DRMTexture2(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, filename %s.\n", iface, debugstr_a(filename)); + + if (FAILED(hr = IDirect3DRMTexture3_InitFromFile(&object->IDirect3DRMTexture3_iface, filename))) + return hr; + + return D3DRM_OK; } static HRESULT WINAPI d3drm_texture2_InitFromSurface(IDirect3DRMTexture2 *iface, @@ -833,9 +1137,18 @@ static HRESULT WINAPI d3drm_texture3_GetClassName(IDirect3DRMTexture3 *iface, DW static HRESULT WINAPI d3drm_texture3_InitFromFile(IDirect3DRMTexture3 *iface, const char *filename) { - FIXME("iface %p, filename %s stub!\n", iface, debugstr_a(filename)); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); + D3DRMIMAGE *image; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, filename %s.\n", iface, debugstr_a(filename)); + + if (FAILED(hr = d3drm_texture_load(texture, filename, TRUE, &image))) + return hr; + + hr = IDirect3DRMTexture3_InitFromImage(iface, image); + + return hr; } static HRESULT WINAPI d3drm_texture3_InitFromSurface(IDirect3DRMTexture3 *iface, -- 2.17.1

2 3

[PATCH 4/4] testbot: Detect the TestBot scripts usage errors in LogUtils.
by Francois Gouget 26 Aug '18

26 Aug '18

They indicate a TestBot error obviously. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index a9ab20b5f..17b9093aa 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -119,7 +119,11 @@ sub GetLogLineCategory($) { return "diag"; } - if ($Line =~ /^BotError:/ or + if (# TestBot script error messages + $Line =~ /^[a-zA-Z.]+:error: / or + # TestBot error + $Line =~ /^BotError:/ or + # X errors $Line =~ /^X Error of failed request: / or $Line =~ / opcode of failed request: /) { -- 2.18.0

1 0

[PATCH 3/4] testbot: Fix detection of new exceptions and too much data errors.
by Francois Gouget 26 Aug '18

26 Aug '18

The address of the crashing code changes with each patch and should thus be ignored. The exact amount of data printed does not change the error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 19a39aaf5..a9ab20b5f 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -756,6 +756,12 @@ sub _GetLineKey($) # Remove the line number $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/; + # Remove the crash code address: it changes whenever the test is recompiled + $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/; + + # The exact amount of data printed does not change the error + $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$[0-9]+ bytes$$/$1/; + # Note: Only the 'done (258)' lines are reported as errors and they are # modified by GetLogErrors() so that they no longer contain the pid. # So there is no need to remove the pid from the done lines. -- 2.18.0

1 0

[PATCH 2/4] testbot: Add a note regarding the detection of new errors.
by Francois Gouget 26 Aug '18

26 Aug '18

The detection of new errors may be based on a WineTest report which is not up-to-date. However this should not be a real issue in practice. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is not a new issue. testbot/bin/WineSendLog.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index f3b56d8c9..b0efa8c33 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -266,6 +266,12 @@ EOF # Build a job summary with only the new errors # + # Note that this may be a bit inaccurate right after a Wine commit if this + # job's patch got compiled on top of the new Wine before all the reference + # WineTest results were updated. This is made more likely by the job + # priorities: high for Wine updates, and low for WineTest runs. + # However in practice this would only be an issue if the patch reintroduced + # an error that just disappeared in the latest Wine which is highly unlikely. my @Messages; foreach my $Key (@SortedKeys) { -- 2.18.0

1 0

[PATCH 1/4] testbot/WineSendLog: Use LogUtils to identify (new) errors.
by Francois Gouget 26 Aug '18

26 Aug '18

Added LogUtils::GetNewLogErrors() to identify new errors in test reports and their associated extra errors files. Note that unlike WineSendLog.pl's old CompareLogs() function GetNewLogErrors() can deal with reports containing the errors for multiple modules, which is a requirement for running the tests on Wine. WineSendLog.pl now uses LogUtils instead of duplicating the code. Besides reaping the benefits from the improved GetNewLogErrors() this also improves error detection and ensures it is consistent with JobDetails.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 380 ++++++---------------------- testbot/lib/WineTestBot/LogUtils.pm | 106 +++++++- 2 files changed, 183 insertions(+), 303 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 2127eadb7..f3b56d8c9 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -78,129 +78,47 @@ sub Error(@) # -# Log analysis +# Reporting # -sub IsBotFailure($) +sub GetTitle($$) { - my ($ErrLine) = @_; + my ($StepTask, $LogName) = @_; - return ($ErrLine =~ m/Can't set VM status to running/ || - $ErrLine =~ m/Can't copy exe to VM/ || - $ErrLine =~ m/Can't copy log from VM/ || - $ErrLine =~ m/Can't copy generated executable from VM/); -} - -sub CheckErrLog($) -{ - my ($ErrLogFileName) = @_; - - my $BotFailure = !1; - my $Messages = ""; - if (open ERRFILE, "$ErrLogFileName") - { - my $Line; - while (defined($Line = <ERRFILE>)) - { - if (IsBotFailure($Line)) - { - if (! $Messages) - { - $BotFailure = 1; - } - } - else - { - $Messages .= $Line; - } - } - close ERRFILE; - } - - return ($BotFailure, $Messages); -} - -sub ReadLog($$$) -{ - my ($LogName, $BaseName, $TestSet) = @_; - - my @Messages; - if (open LOG, "<$LogName") - { - my $Line; - my $Found = !1; - while (! $Found && defined($Line = <LOG>)) - { - $Found = ($Line =~ m/${BaseName}:${TestSet} start/); - } - if ($Found) - { - $Found = !1; - while (! $Found && defined($Line = <LOG>)) - { - $Line =~ s/[\r\n]*$//; - if ($Line =~ m/${BaseName}:${TestSet}(?::[0-9a-f]+)? done/) - { - if ($Line =~ m/${BaseName}:${TestSet}(?::[0-9a-f]+)? done $258$/) - { - push @Messages, "The test timed out"; - } - $Found = 1; - } - else - { - push @Messages, $Line; - } - } - } - - close LOG; - } - else + my $Label = GetLogLabel($LogName); + if ($LogName !~ /\.report$/ and + ($StepTask->Type eq "build" or $StepTask->VM->Type eq "wine")) { - Error "Unable to open '$LogName' for reading: $!\n"; + $Label = "build log"; } - return \@Messages; + return $StepTask->VM->Name . " ($Label)"; } -sub GetLineKey($) +sub DumpLogAndErr($$) { - my ($Line) = @_; - - $Line =~ s/^([\w_.]+:)\d+(:.*)$/$1$2/; - - return $Line; -} - -sub CompareLogs($$$$) -{ - my ($SuiteLog, $TaskLog, $BaseName, $TestSet) = @_; - - my $Messages = ""; + my ($File, $Path) = @_; - my $SuiteMessages = ReadLog($SuiteLog, $BaseName, $TestSet); - my $TaskMessages = ReadLog($TaskLog, $BaseName, $TestSet); - - my $Diff = Algorithm::Diff->new($SuiteMessages, $TaskMessages, - { keyGen => \&GetLineKey }); - while ($Diff->Next()) + my $PrintSeparator; + foreach my $FileName ($Path, "$Path.err") { - if (! $Diff->Same()) + if (open(my $LogFile, "<", $FileName)) { - foreach my $Line ($Diff->Items(2)) + my $First = 1; + foreach my $Line (<$LogFile>) { - if ($Line =~ m/: Test failed: / || - $Line =~ m/: unhandled exception [0-9a-fA-F]{8} at / || - $Line =~ m/The test timed out/) + $Line =~ s/\s*$//; + if ($First and $PrintSeparator) { - $Messages .= "$Line\n"; + print $File "\n"; + $First = 0; } + print $File "$Line\n"; } + close($LogFile); + $PrintSeparator = 1; } } - - return $Messages; } sub SendLog($) @@ -279,110 +197,28 @@ EOF print $Sendmail "\nYou can also see the results at:\n$JobURL\n\n"; # Print the job summary - my @FailureKeys; + my ($JobErrors, $ReportCounts); foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - print $Sendmail "\n=== ", $StepTask->GetTitle(), " ===\n"; - - my $LogFiles = GetLogFileNames($TaskDir); - my $LogName = $LogFiles->[0] || "log"; - if (open LOGFILE, "<$TaskDir/$LogName") + my $LogNames = GetLogFileNames($TaskDir); + $JobErrors->{$Key}->{LogNames} = $LogNames; + foreach my $LogName (@$LogNames) { - my $HasLogEntries = !1; - my $PrintedSomething = !1; - my $CurrentDll = ""; - my $PrintedDll = ""; - my $Line; - while (defined($Line = <LOGFILE>)) - { - $HasLogEntries = 1; - $Line =~ s/\s*$//; - if ($Line =~ m/^([^:]+):[^ ]+ start [^ ]+ -$/) - { - $CurrentDll = $1; - } - my $Category = $LogName =~ /\.report$/ ? - GetReportLineCategory($Line) : - GetLogLineCategory($Line); - if ($Category eq "error") - { - if ($PrintedDll ne $CurrentDll) - { - print $Sendmail "\n$CurrentDll:\n"; - $PrintedDll = $CurrentDll; - } - if ($Line =~ m/^[^:]+:([^ ]+)(?::[0-9a-f]+)? done $258$/) - { - print $Sendmail "$1: The test timed out\n"; - } - else - { - print $Sendmail "$Line\n"; - } - $PrintedSomething = 1; - } - } - close LOGFILE; + my ($Groups, $Errors) = GetLogErrors("$TaskDir/$LogName"); + next if (!$Groups or !@$Groups); + $JobErrors->{$Key}->{HasErrors} = 1; + $JobErrors->{$Key}->{$LogName}->{Groups} = $Groups; + $JobErrors->{$Key}->{$LogName}->{Errors} = $Errors; - if (open ERRFILE, "<$TaskDir/log.err") - { - my $First = 1; - while (defined($Line = <ERRFILE>)) - { - if ($First) - { - print $Sendmail "\n"; - $First = !1; - } - $HasLogEntries = 1; - $Line =~ s/\s*$//; - print $Sendmail "$Line\n"; - $PrintedSomething = 1; - } - close ERRFILE; - } + print $Sendmail "\n=== ", GetTitle($StepTask, $LogName), " ===\n"; - if (! $PrintedSomething) - { - if (! $HasLogEntries) - { - print $Sendmail "Empty test log and no error message\n"; - } - elsif ($StepTask->Type eq "build") - { - print $Sendmail "No build failures found\n"; - } - else - { - print $Sendmail "No test failures found\n"; - } - } - else + foreach my $GroupName (@$Groups) { - push @FailureKeys, $Key; - } - } - elsif (open ERRFILE, "<$TaskDir/log.err") - { - my $HasErrEntries = !1; - my $Line; - while (defined($Line = <ERRFILE>)) - { - $HasErrEntries = 1; - $Line =~ s/\s*$//; - print $Sendmail "$Line\n"; - } - close ERRFILE; - if (! $HasErrEntries) - { - print $Sendmail "No test log and no error message"; - } - else - { - push @FailureKeys, $Key; + print $Sendmail ($GroupName ? "\n$GroupName:\n" : "\n"); + print $Sendmail "$_\n" for (@{$Errors->{$GroupName}}); } } } @@ -393,46 +229,25 @@ EOF my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - print $Sendmail <<"EOF"; + foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) + { + print $Sendmail <<"EOF"; --$PART_BOUNDARY Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit EOF - print $Sendmail "Content-Disposition: attachment; filename=", - $StepTask->VM->Name, ".log\n\n"; - print $Sendmail "Not dumping logs in debug mode\n" if ($Debug); - - my $LogFiles = GetLogFileNames($TaskDir); - my $LogName = $LogFiles->[0] || "log"; - my $PrintSeparator = !1; - if (open LOGFILE, "<$TaskDir/$LogName") - { - my $Line; - while (defined($Line = <LOGFILE>)) + print $Sendmail "Content-Disposition: attachment; filename=", + $StepTask->VM->Name, "_$LogName\n\n"; + if ($Debug) { - $Line =~ s/\s*$//; - print $Sendmail "$Line\n" if (!$Debug); - $PrintSeparator = 1; + print $Sendmail "Not dumping logs in debug mode\n"; } - close LOGFILE; - } - - if (open ERRFILE, "<$TaskDir/log.err") - { - my $Line; - while (defined($Line = <ERRFILE>)) + else { - if ($PrintSeparator) - { - print $Sendmail "\n" if (!$Debug); - $PrintSeparator = !1; - } - $Line =~ s/\s*$//; - print $Sendmail "$Line\n" if (!$Debug); + DumpLogAndErr($Sendmail, "$TaskDir/$LogName"); } - close ERRFILE; } } @@ -446,75 +261,62 @@ EOF return; } + # # Build a job summary with only the new errors # - my $Messages = ""; - foreach my $Key (@FailureKeys) + my @Messages; + foreach my $Key (@SortedKeys) { + next if (!$JobErrors->{$Key}->{HasErrors}); my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - my ($BotFailure, $MessagesFromErr) = CheckErrLog("$TaskDir/log.err"); - if ($BotFailure) + if ($StepTask->Status eq "boterror") { - # TestBot errors are not the developer's fault and prevent us from doing - # any meaningful analysis. So skip. - Error "A TestBot error was found in $TaskDir/log.err\n"; + # TestBot errors are not the developer's fault and prevent us from + # identifying new errors. So skip. + Error "A Task error was found in '$TaskDir/log.err'\n"; next; } - my $MessagesFromLog = ""; - my $LogFiles = GetLogFileNames($TaskDir); - my $LogName = $LogFiles->[0] || "log"; - if ($LogName =~ /\.report$/) + foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) { - my $LatestName = "$DataDir/latest/". $StepTask->VM->Name ."_$LogName"; - my ($LatestBotFailure, $Dummy) = CheckErrLog("$LatestName.err"); - if (! $LatestBotFailure) + my $LogErrors = $JobErrors->{$Key}->{$LogName}; + my $RefFileName = "$DataDir/latest". $StepTask->VM->Name ."_$LogName"; + my ($NewGroups, $NewErrors) = GetNewLogErrors($RefFileName, $LogErrors->{Groups}, $LogErrors->{Errors}); + if (!$NewGroups) { - if (defined($StepTask->CmdLineArg)) - { - # Filter out failures that happened in the full test suite: - # the test suite is run against code which is already in Wine - # so any failure it reported is not caused by this patch. - $StepTask->FileName =~ m/^(.*)_test/; - my $BaseName = $1; - $MessagesFromLog = CompareLogs($LatestName, "$TaskDir/$LogName", - $BaseName, $StepTask->CmdLineArg); - } + # There was no reference log (typical of build logs) + # so every error is new + $NewGroups = $LogErrors->{Groups}; + $NewErrors = $LogErrors->{Errors}; } - else + elsif (!@$NewGroups) { - Error "BotFailure found in $LatestName.err\n"; + # There is no new error + next; } - } - elsif (open(my $LogFile, "<", "$TaskDir/$LogName")) - { - foreach my $Line (<$LogFile>) + + push @Messages, "\n=== ". GetTitle($StepTask, $LogName) ." ===\n"; + + foreach my $GroupName (@$NewGroups) { - my $Category = $LogName =~ /\.report$/ ? - GetReportLineCategory($Line) : - GetLogLineCategory($Line); - $MessagesFromLog .= $Line if ($Category eq "error"); + push @Messages, ($GroupName ? "\n$GroupName:\n" : "\n"); + push @Messages, "$_\n" for (@{$NewErrors->{$GroupName}}); } - close($LogFile); - } - if ($MessagesFromErr || $MessagesFromLog) - { - $Messages .= "\n=== " . $StepTask->GetTitle() . " ===\n" . - $MessagesFromLog . $MessagesFromErr; } } + # # Send a summary of the new errors to the mailing list # Debug("\n-------------------- Mailing list email --------------------\n"); - if ($Messages) + if (@Messages) { if ($Debug) { @@ -548,7 +350,7 @@ Your paranoid android. EOF - print $Sendmail $Messages; + print $Sendmail $_ for (@Messages); close($Sendmail); } else @@ -556,6 +358,7 @@ EOF Debug("Found no error to report to the mailing list\n"); } + # # Create a .testbot file for the patches website # @@ -570,7 +373,7 @@ EOF { # Only take into account new errors to decide whether the job was # successful or not. - DebugTee($Result, "Status: ". ($Messages ? "Failed" : "OK") ."\n"); + DebugTee($Result, "Status: ". (@Messages ? "Failed" : "OK") ."\n"); DebugTee($Result, "Job-ID: ". $Job->Id ."\n"); DebugTee($Result, "URL: $JobURL\n"); @@ -579,37 +382,10 @@ EOF my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - print $Result "\n=== ", $StepTask->GetTitle(), " ===\n"; - - my $LogFiles = GetLogFileNames($TaskDir); - my $LogName = $LogFiles->[0] || "log"; - my $PrintSeparator = !1; - if (open(my $logfile, "<", "$TaskDir/$LogName")) - { - my $Line; - while (defined($Line = <$logfile>)) - { - $Line =~ s/\s*$//; - print $Result "$Line\n"; - $PrintSeparator = 1; - } - close($logfile); - } - - if (open(my $errfile, "<", "$TaskDir/log.err")) + foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) { - my $Line; - while (defined($Line = <$errfile>)) - { - if ($PrintSeparator) - { - print $Result "\n"; - $PrintSeparator = !1; - } - $Line =~ s/\s*$//; - print $Result "$Line\n"; - } - close($errfile); + print $Result "=== ", GetTitle($StepTask, $LogName), " ===\n"; + DumpLogAndErr($Result, "$TaskDir/$LogName"); } } print $Result "--- END FULL_LOGS ---\n"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index a5a1a68b5..19a39aaf5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -27,11 +27,12 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; -our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogErrors +our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogErrors GetNewLogErrors GetLogLineCategory GetReportLineCategory RenameReferenceLogs RenameTaskLogs ParseTaskLog ParseWineTestReport); +use Algorithm::Diff; use File::Basename; use WineTestBot::Config; # For $MaxUnitSize @@ -697,6 +698,8 @@ sub GetLogErrors($) $Line =~ s/\s*$//; if (!$CurrentGroup) { + # Note: $GroupName must not depend on the previous content as this + # would break diffs. my $GroupName = $IsReport ? "Report errors" : "Task errors"; $CurrentGroup = _AddErrorGroup($Groups, $Errors, $GroupName); } @@ -714,4 +717,105 @@ sub GetLogErrors($) return $NoLog ? (undef, undef) : ($Groups, $Errors); } +sub _DumpDiff($$) +{ + my ($Label, $Diff) = @_; + + print STDERR "$Label:\n"; + $Diff = $Diff->Copy(); + while ($Diff->Next()) + { + if ($Diff->Same()) + { + print STDERR " $_\n" for ($Diff->Same()); + } + else + { + print STDERR "-$_\n" for ($Diff->Items(1)); + print STDERR "+$_\n" for ($Diff->Items(2)); + } + } +} + +=pod +=over 12 + +=item C<_GetLineKey()> + +This is a helper for GetNewLogErrors(). It reformats the log lines so they can +meaningfully be compared to the reference log even if line numbers change, etc. + +=back +=cut + +sub _GetLineKey($) +{ + my ($Line) = @_; + return undef if (!defined $Line); + + # Remove the line number + $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/; + + # Note: Only the 'done (258)' lines are reported as errors and they are + # modified by GetLogErrors() so that they no longer contain the pid. + # So there is no need to remove the pid from the done lines. + + return $Line; +} + +=pod +=over 12 + +=item C<GetNewLogErrors()> + +Compares the specified errors to the reference log and returns only the ones +that are new. + +Returns a list of error groups containing new errors and a hashtable containing +the list of new errors for each group. + +=back +=cut + +sub GetNewLogErrors($$$) +{ + my ($RefFileName, $Groups, $Errors) = @_; + + my ($_Dummy, $RefErrors, $NoLog) = GetLogErrors($RefFileName); + return (undef, undef) if ($NoLog); + + my (@NewGroups, %NewErrors); + foreach my $GroupName (@$Groups) + { + if ($RefErrors->{$GroupName}) + { + my $Diff = Algorithm::Diff->new($RefErrors->{$GroupName}, + $Errors->{$GroupName}, + { keyGen => \&_GetLineKey }); + my $CurrentGroup; + while ($Diff->Next()) + { + # Skip if there are no new lines + next if ($Diff->Same() or !$Diff->Items(2)); + + if (!$CurrentGroup) + { + push @NewGroups, $GroupName; + $CurrentGroup = $NewErrors{$GroupName} = []; + } + push @$CurrentGroup, $Diff->Items(2); + } + } + else + { + # This module did not have errors before, so every error is new + push @NewGroups, $GroupName; + $NewErrors{$GroupName} = $Errors->{$GroupName}; + my $Last = @{$Errors->{$GroupName}} - 1; + } + } + + return (\@NewGroups, \%NewErrors); +} + 1; -- 2.18.0

1 0

[PATCH v2 1/2] comctl32/listview: Use bitmask to check if we can send notifications
by Fabian Maurer 25 Aug '18

25 Aug '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/listview.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 200bf93be5..fa0d18e5d6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -211,6 +211,8 @@ typedef struct tagDELAYED_ITEM_EDIT INT iItem; } DELAYED_ITEM_EDIT; +#define FLAG_NOTIFY_CHANGE (0x1) /* Whether we can send change notification messages */ + typedef struct tagLISTVIEW_INFO { /* control window */ @@ -225,7 +227,6 @@ typedef struct tagLISTVIEW_INFO /* notification window */ SHORT notifyFormat; HWND hwndNotify; - BOOL bDoChangeNotify; /* send change notification messages? */ UINT uCallbackMask; /* tooltips */ @@ -326,6 +327,7 @@ typedef struct tagLISTVIEW_INFO /* misc */ DWORD iVersion; /* CCM_[G,S]ETVERSION */ + DWORD notify_mask; } LISTVIEW_INFO; /* @@ -3507,13 +3509,13 @@ Parameters: */ static void LISTVIEW_ShiftFocus(LISTVIEW_INFO *infoPtr, INT focus, INT item, INT direction) { - BOOL old_change = infoPtr->bDoChangeNotify; + BOOL old_change = infoPtr->notify_mask & FLAG_NOTIFY_CHANGE; - infoPtr->bDoChangeNotify = FALSE; + infoPtr->notify_mask &= ~FLAG_NOTIFY_CHANGE; focus = shift_item(infoPtr, focus, item, direction); if (focus != infoPtr->nFocusedItem) LISTVIEW_SetItemFocus(infoPtr, focus); - infoPtr->bDoChangeNotify = old_change; + infoPtr->notify_mask |= old_change; } /** @@ -3565,8 +3567,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) * only one LVN_ODSTATECHANGED notification. * See MSDN documentation for LVN_ITEMCHANGED. */ - bOldChange = infoPtr->bDoChangeNotify; - if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; + bOldChange = infoPtr->notify_mask & FLAG_NOTIFY_CHANGE; + if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->notify_mask &= ~FLAG_NOTIFY_CHANGE; if (nFirst == -1) nFirst = nItem; @@ -3585,7 +3587,7 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); if (!IsWindow(hwndSelf)) return FALSE; - infoPtr->bDoChangeNotify = bOldChange; + infoPtr->notify_mask |= bOldChange; return TRUE; } @@ -3656,8 +3658,8 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) /* disable per item notifications on LVS_OWNERDATA style FIXME: single LVN_ODSTATECHANGED should be used */ - bOldChange = infoPtr->bDoChangeNotify; - if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; + bOldChange = infoPtr->notify_mask & FLAG_NOTIFY_CHANGE; + if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->notify_mask &= ~FLAG_NOTIFY_CHANGE; LISTVIEW_DeselectAllSkipItems(infoPtr, selection); @@ -3668,7 +3670,7 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) /* this will also destroy the selection */ iterator_destroy(&i); - infoPtr->bDoChangeNotify = bOldChange; + infoPtr->notify_mask |= bOldChange; LISTVIEW_SetItemFocus(infoPtr, nItem); } @@ -4257,7 +4259,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications are enabled. Even nothing really changed we still need to send this, in this case uChanged mask is just set to passed item mask. */ - if(lpItem && !isNew && infoPtr->bDoChangeNotify) + if(lpItem && !isNew && (infoPtr->notify_mask & FLAG_NOTIFY_CHANGE)) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4350,7 +4352,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL /* send LVN_ITEMCHANGED notification */ if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; - if (infoPtr->bDoChangeNotify) notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); + if (infoPtr->notify_mask & FLAG_NOTIFY_CHANGE) notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); return TRUE; } @@ -8986,10 +8988,10 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE /* focus all isn't allowed */ if (lvItem.state & lvItem.stateMask & LVIS_FOCUSED) return FALSE; - notify = infoPtr->bDoChangeNotify; + notify = infoPtr->notify_mask & FLAG_NOTIFY_CHANGE; if (infoPtr->dwStyle & LVS_OWNERDATA) { - infoPtr->bDoChangeNotify = FALSE; + infoPtr->notify_mask &= ~FLAG_NOTIFY_CHANGE; if (!(lvItem.state & LVIS_SELECTED) && LISTVIEW_GetSelectedCount(infoPtr)) oldstate |= LVIS_SELECTED; if (infoPtr->nFocusedItem != -1) oldstate |= LVIS_FOCUSED; @@ -9003,7 +9005,7 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE { NMLISTVIEW nmlv; - infoPtr->bDoChangeNotify = notify; + infoPtr->notify_mask |= notify; nmlv.iItem = -1; nmlv.iSubItem = 0; @@ -9484,7 +9486,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW * infoPtr->nHotItem = -1; infoPtr->redraw = TRUE; infoPtr->bNoItemMetrics = TRUE; - infoPtr->bDoChangeNotify = TRUE; + infoPtr->notify_mask = ~(0U); /* By default allow sending all notifications */ infoPtr->autoSpacing = TRUE; infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); -- 2.18.0

1 1

[v3 PATCH 1/2] user32: When registering redirected class use correct base class name.
by Nikolay Sivov 25 Aug '18

25 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/class.c | 31 +++++++++++++++++++++---------- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 2 +- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 07d36f05d7..5383b6771f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -320,7 +320,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, BOOL register_class ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, WCHAR *combined, BOOL register_class ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -335,9 +335,12 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B const WCHAR *module, *ret; UNICODE_STRING name_us; HMODULE hmod; + UINT offset; - if (basename_offset) - *basename_offset = 0; + if (!basename_offset) + basename_offset = &offset; + + *basename_offset = 0; if (IS_INTRESOURCE( name )) return name; @@ -352,14 +355,21 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B return name; wndclass = (struct wndclass_redirect_data *)data.lpData; - if (basename_offset) - *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); + *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset); if (!(hmod = GetModuleHandleW( module ))) hmod = LoadLibraryW( module ); + /* Combined name is used to register versioned class name. Base name part will match exactly + original class name and won't be reused from context data. */ ret = (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); + if (combined) + { + memcpy(combined, ret, *basename_offset * sizeof(WCHAR)); + strcpyW(&combined[*basename_offset], name); + ret = combined; + } if (register_class && hmod) { @@ -409,7 +419,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; - name = CLASS_GetVersionedName( name, NULL, TRUE ); + name = CLASS_GetVersionedName( name, NULL, NULL, TRUE ); for (;;) { @@ -662,8 +672,8 @@ ATOM WINAPI RegisterClassW( const WNDCLASSW* wc ) */ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { + WCHAR name[MAX_ATOM_LEN + 1], combined[MAX_ATOM_LEN + 1]; const WCHAR *classname = NULL; - WCHAR name[MAX_ATOM_LEN + 1]; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -682,7 +692,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); + classname = CLASS_GetVersionedName( name, &basename_offset, combined, FALSE ); classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -720,6 +730,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) */ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { + WCHAR name[MAX_ATOM_LEN + 1]; const WCHAR *classname; UINT basename_offset; ATOM atom; @@ -736,7 +747,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); + classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, name, FALSE ); if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; @@ -789,7 +800,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - className = CLASS_GetVersionedName( className, NULL, FALSE ); + className = CLASS_GetVersionedName( className, NULL, NULL, FALSE ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 73a2badc7d..0ee7dbeece 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -273,7 +273,7 @@ extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset, - BOOL register_class) DECLSPEC_HIDDEN; + WCHAR *combined, BOOL register_class) DECLSPEC_HIDDEN; /* message spy definitions */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c7a3b06c3a..7ba0b4c312 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1344,7 +1344,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className, NULL, TRUE); + className = CLASS_GetVersionedName(className, NULL, NULL, TRUE); TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), -- 2.18.0

3 6

[PATCH] comctl32/listview: Don't send LVN_ENDLABELEDIT twice under some circumstances
by Fabian Maurer 25 Aug '18

25 Aug '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/listview.c | 10 +++++++++ dlls/comctl32/tests/listview.c | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 200bf93be55..0193c038ebb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -326,6 +326,7 @@ typedef struct tagLISTVIEW_INFO /* misc */ DWORD iVersion; /* CCM_[G,S]ETVERSION */ + BOOL inEndEditLabel; /* To prevent sending LVN_ENDLABELEDIT during LVN_ENDLABELEDIT */ } LISTVIEW_INFO; /* @@ -5869,6 +5870,9 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL WCHAR *pszText = NULL; BOOL res; + if (infoPtr->inEndEditLabel) + return FALSE; + if (storeText) { DWORD len = isW ? GetWindowTextLengthW(infoPtr->hwndEdit) : GetWindowTextLengthA(infoPtr->hwndEdit); @@ -5914,9 +5918,14 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL dispInfo.item.pszText = same ? NULL : pszText; dispInfo.item.cchTextMax = textlenT(dispInfo.item.pszText, isW); + /* Sending LVN_ENDLABELEDITW might trigger EN_KILLFOCUS which would call this function again */ + infoPtr->inEndEditLabel = TRUE; + /* Do we need to update the Item Text */ res = notify_dispinfoT(infoPtr, LVN_ENDLABELEDITW, &dispInfo, isW); + infoPtr->inEndEditLabel = FALSE; + infoPtr->nEditLabelItem = -1; infoPtr->hwndEdit = 0; @@ -9497,6 +9506,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW * infoPtr->itemEdit.fEnabled = FALSE; infoPtr->iVersion = COMCTL32_VERSION; infoPtr->colRectsDirty = FALSE; + infoPtr->inEndEditLabel = FALSE; /* get default font (icon title) */ SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e9b715ee412..3e9e9697a4f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -75,6 +75,10 @@ static BOOL g_disp_A_to_W; static NMLVDISPINFOA g_editbox_disp_info; /* when this is set focus will be tested on LVN_DELETEITEM */ static BOOL g_focus_test_LVN_DELETEITEM; +/* Whether to send WM_KILLFOCUS to the edit control during LVN_ENDLABELEDIT */ +static BOOL do_LVN_ENDLABELEDIT_killfocus = FALSE; +/* Number of LVN_ENDLABELEDIT notifications received */ +static BOOL LVN_ENDLABELEDITA_count = 0; static HWND subclass_editbox(HWND hwndListview); @@ -510,6 +514,11 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP ok(IsWindow(edit), "expected valid edit control handle\n"); ok((GetWindowLongA(edit, GWL_STYLE) & ES_MULTILINE) == 0, "edit is multiline\n"); + LVN_ENDLABELEDITA_count++; + + if (do_LVN_ENDLABELEDIT_killfocus) + SendMessageA(edit, WM_KILLFOCUS, 0, 0); + return TRUE; } case LVN_BEGINSCROLL: @@ -6322,6 +6331,37 @@ static void test_LVSCW_AUTOSIZE(void) DestroyWindow(hwnd); } +static void test_LVN_ENDLABELEDITW(void) +{ + HWND hwnd, hwndedit; + LVITEMW item = {0}; + WCHAR text[] = {'l','a','l','a',0}; + DWORD ret; + + hwnd = create_listview_control(LVS_REPORT | LVS_EDITLABELS); + + insert_column(hwnd, 0); + + item.mask = LVIF_TEXT; + item.pszText = text; + ListView_InsertItemW(hwnd, &item); + + SetFocus(hwnd); + hwndedit = (HWND)SendMessageW(hwnd, LVM_EDITLABELW, 0, 0); + + ret = SendMessageA(hwndedit, WM_SETTEXT, 0, (LPARAM)"test"); + expect(TRUE, ret); + + LVN_ENDLABELEDITA_count = 0; + do_LVN_ENDLABELEDIT_killfocus = TRUE; + ret = SendMessageA(hwndedit, WM_KEYDOWN, VK_RETURN, 0); + do_LVN_ENDLABELEDIT_killfocus = FALSE; + ok(LVN_ENDLABELEDITA_count == 1, + "messagebox during LVN_ENDLABELEDIT gave wrong number of LVN_ENDLABELEDITA: %d\n", LVN_ENDLABELEDITA_count); + + DestroyWindow(hwnd); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6425,6 +6465,7 @@ START_TEST(listview) test_oneclickactivate(); test_state_image(); test_LVSCW_AUTOSIZE(); + test_LVN_ENDLABELEDITW(); unload_v6_module(ctx_cookie, hCtx); -- 2.18.0

2 4

URGENT REQUEST - WINEHQ PROBLEM
by Emanuele Caracci 25 Aug '18

25 Aug '18

Dear WineHQ developer, I write this because I installed your program to authenticate Logic Pro X by following this guide: https://www.youtube.com/watch?v=ufULIABO4qs&t=183s 1) Uninstalling WineHQ by removing it from the Applications section does not remove even the Codecs that have been installed. I would like to know how you can completely remove the application. 2) Following the program FAQ in the Unistall section (4.1 and 4.4) at the link: https://wiki.winehq.org/FAQ I inserted those codes on the terminal of my Mac and in this mode it has been removed all the files on the Mac! It's a nice mess because I lost all my documents! All the application data and all user files on the Mac have been erased. The Mac is also unable to shut down. Can they be recovered with inverse codes? I need help urgently! *I await your urgent reply as soon as possible.* Thank you, *Emanuele Caracci - www.emanuelecaracci.com <http://www.emanuelecaracci.com/> - +39/3461314467* [image: image.png] Le informazioni contenute in questo messaggio e negli eventuali allegati sono da considerarsi riservati ed il loro utilizzo è consentito unicamente al destinatario ed unicamente per le finalità sopra indicate. Qualora riceveste il presente messaggio per errore e non ne siate i destinatari, Vi preghiamo di darcene notizia via e-mail, di astenervi dal consultare eventuali files allegati, di cancellare il messaggio dal Vs. sistema informatico. Costituisce comportamento contrario ai principi dettati dal D.Lg. 196/2003 il trattenere il messaggio, diffonderne il contenuto, inviarlo ad altri soggetti, eseguirne copia in tutto od in parte, l’utilizzo da parte di soggetti diversi dal destinatario e per finalità diverse da quelle sopra indicate. — Notice: This message and any attachments may be of a confidential nature or may require protection for other reasons. Should you not be the intended recipient of this message or should you have received this message by mistake, you are not allowed to forward, copy or disseminate the content of the message in any form. Should you have received this message by mistake, please inform the sender and delete the message along with the enclosures.

3 2

[PATCH v2 1/3] ntoskrnl.exe/tests: Add basic tests for ZwLoadDriver()/ZwUnloadDriver().
by Zebediah Figura 25 Aug '18

25 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: fix test failures on w8adm dlls/ntoskrnl.exe/tests/Makefile.in | 4 ++ dlls/ntoskrnl.exe/tests/driver.c | 44 ++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/{driver.h => driver2.c} | 37 +++++++----- dlls/ntoskrnl.exe/tests/driver2.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 77 ++++++++++++++++++------- 6 files changed, 129 insertions(+), 35 deletions(-) copy dlls/ntoskrnl.exe/tests/{driver.h => driver2.c} (55%) create mode 100644 dlls/ntoskrnl.exe/tests/driver2.spec diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 6a427ca..fae11bb 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -3,8 +3,12 @@ IMPORTS = advapi32 driver_IMPORTS = winecrt0 ntoskrnl driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver2_IMPORTS = winecrt0 ntoskrnl +driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ driver.c \ driver.spec \ + driver2.c \ + driver2.spec \ ntoskrnl.c diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index cde78e5..d424396 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -187,6 +187,29 @@ static void test_init_funcs(void) ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState); } +static const WCHAR driver2_path[] = { + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','S','e','r','v','i','c','e','s', + '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r','2',0 +}; + +static void test_load_driver(void) +{ + UNICODE_STRING name; + NTSTATUS ret; + + RtlInitUnicodeString(&name, driver2_path); + + ret = ZwLoadDriver(&name); + ok(!ret, "got %#x\n", ret); + + ret = ZwUnloadDriver(&name); + ok(!ret, "got %#x\n", ret); +} + static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -213,6 +236,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) test_currentprocess(); test_mdl_map(); test_init_funcs(); + test_load_driver(); /* print process report */ if (test_input->winetest_debug) @@ -245,6 +269,23 @@ static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR * return STATUS_SUCCESS; } +static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +{ + BOOL *load = irp->AssociatedIrp.SystemBuffer; + UNICODE_STRING name; + + if (!load) + return STATUS_ACCESS_VIOLATION; + + *info = 0; + + RtlInitUnicodeString(&name, driver2_path); + if (*load) + return ZwLoadDriver(&name); + else + return ZwUnloadDriver(&name); +} + static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { irp->IoStatus.Status = STATUS_SUCCESS; @@ -265,6 +306,9 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_WINETEST_MAIN_TEST: status = main_test(irp, stack, &irp->IoStatus.Information); break; + case IOCTL_WINETEST_LOAD_DRIVER: + status = test_load_driver_ioctl(irp, stack, &irp->IoStatus.Information); + break; default: break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index b254d44..6a4179e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -24,6 +24,7 @@ /* All custom IOCTLs need to have a function value >= 0x800. */ #define IOCTL_WINETEST_BASIC_IOCTL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_MAIN_TEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_LOAD_DRIVER CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver2.c similarity index 55% copy from dlls/ntoskrnl.exe/tests/driver.h copy to dlls/ntoskrnl.exe/tests/driver2.c index b254d44..c648ec6 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver2.c @@ -1,9 +1,7 @@ /* - * ntoskrnl.exe testing framework + * Second driver loaded by driver.c * - * Copyright 2015 Sebastian Lackner - * Copyright 2015 Michael Müller - * Copyright 2015 Christian Costa + * Copyright 2018 Zebediah Figura * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,17 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> -/* All custom IOCTLs need to have a function value >= 0x800. */ -#define IOCTL_WINETEST_BASIC_IOCTL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_WINETEST_MAIN_TEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" -static const char teststr[] = "Wine is not an emulator"; +#include "driver.h" -struct test_input +static void WINAPI driver_Unload(DRIVER_OBJECT *driver) { - int running_under_wine; - int winetest_report_success; - int winetest_debug; - WCHAR path[1]; -}; + DbgPrint("unloading driver2\n"); +} + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *registry) +{ + DbgPrint("loading driver2\n"); + + driver->DriverUnload = driver_Unload; + + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/tests/driver2.spec b/dlls/ntoskrnl.exe/tests/driver2.spec new file mode 100644 index 0000000..ad33444 --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/driver2.spec @@ -0,0 +1 @@ +# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 40de760..73f0e85 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -30,9 +30,6 @@ #include "driver.h" -static const char driver_name[] = "WineTestDriver"; -static const char device_path[] = "\\\\.\\WineTestDriver"; - static HANDLE device; static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); @@ -80,11 +77,9 @@ static void unload_driver(SC_HANDLE service) CloseServiceHandle(service); } -static SC_HANDLE load_driver(char *filename) +static SC_HANDLE load_driver(char *filename, const char *resname, const char *driver_name) { SC_HANDLE manager, service; - SERVICE_STATUS status; - BOOL ret; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (!manager && GetLastError() == ERROR_ACCESS_DENIED) @@ -94,12 +89,11 @@ static SC_HANDLE load_driver(char *filename) } ok(!!manager, "OpenSCManager failed\n"); - /* before we start with the actual tests, make sure to terminate - * any old wine test drivers. */ + /* stop any old drivers running under this name */ service = OpenServiceA(manager, driver_name, SERVICE_ALL_ACCESS); if (service) unload_driver(service); - load_resource("driver.dll", filename); + load_resource(resname, filename); trace("Trying to load driver %s\n", filename); service = CreateServiceA(manager, driver_name, driver_name, @@ -107,7 +101,15 @@ static SC_HANDLE load_driver(char *filename) SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, filename, NULL, NULL, NULL, NULL, NULL); ok(!!service, "CreateService failed: %u\n", GetLastError()); + CloseServiceHandle(manager); + return service; +} + +static BOOL start_driver(HANDLE service) +{ + SERVICE_STATUS status; + BOOL ret; SetLastError(0xdeadbeef); ret = StartServiceA(service, 0, NULL); @@ -117,8 +119,7 @@ static SC_HANDLE load_driver(char *filename) skip("Failed to start service; probably your machine doesn't accept unsigned drivers.\n"); DeleteService(service); CloseServiceHandle(service); - DeleteFileA(filename); - return NULL; + return FALSE; } ok(ret, "StartService failed: %u\n", GetLastError()); @@ -134,10 +135,7 @@ static SC_HANDLE load_driver(char *filename) ok(status.dwCurrentState == SERVICE_RUNNING, "expected SERVICE_RUNNING, got %d\n", status.dwCurrentState); - device = CreateFileA(device_path, 0, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); - - return service; + return TRUE; } static void main_test(void) @@ -194,22 +192,59 @@ static void test_basic_ioctl(void) ok(!strcmp(buf, teststr), "got '%s'\n", buf); } +static void test_load_driver(SC_HANDLE service) +{ + SERVICE_STATUS status; + BOOL load, res; + DWORD sz; + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); + + load = TRUE; + res = DeviceIoControl(device, IOCTL_WINETEST_LOAD_DRIVER, &load, sizeof(load), NULL, 0, &sz, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_RUNNING, "got state %#x\n", status.dwCurrentState); + + load = FALSE; + res = DeviceIoControl(device, IOCTL_WINETEST_LOAD_DRIVER, &load, sizeof(load), NULL, 0, &sz, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); +} + START_TEST(ntoskrnl) { - char filename[MAX_PATH]; - SC_HANDLE service; - BOOL ret; + char filename[MAX_PATH], filename2[MAX_PATH]; + SC_HANDLE service, service2; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); - if (!(service = load_driver(filename))) + if (!(service = load_driver(filename, "driver.dll", "WineTestDriver"))) return; + if (!start_driver(service)) + { + DeleteFileA(filename); + return; + } + service2 = load_driver(filename2, "driver2.dll", "WineTestDriver2"); + + device = CreateFileA("\\\\.\\WineTestDriver", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); test_basic_ioctl(); main_test(); + test_load_driver(service2); + unload_driver(service2); unload_driver(service); - ret = DeleteFileA(filename); - ok(ret, "DeleteFile failed: %u\n", GetLastError()); + ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); + ok(DeleteFileA(filename2), "DeleteFile failed: %u\n", GetLastError()); } -- 2.7.4

1 0

[PATCH 1/3] ntoskrnl.exe/tests: Add basic tests for ZwLoadDriver()/ZwUnloadDriver().
by Zebediah Figura 25 Aug '18

25 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/Makefile.in | 4 ++ dlls/ntoskrnl.exe/tests/driver.c | 44 ++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/{driver.h => driver2.c} | 37 +++++++----- dlls/ntoskrnl.exe/tests/driver2.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 76 ++++++++++++++++++------- 6 files changed, 128 insertions(+), 35 deletions(-) copy dlls/ntoskrnl.exe/tests/{driver.h => driver2.c} (55%) create mode 100644 dlls/ntoskrnl.exe/tests/driver2.spec diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 6a427ca..fae11bb 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -3,8 +3,12 @@ IMPORTS = advapi32 driver_IMPORTS = winecrt0 ntoskrnl driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver2_IMPORTS = winecrt0 ntoskrnl +driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ driver.c \ driver.spec \ + driver2.c \ + driver2.spec \ ntoskrnl.c diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index cde78e5..d424396 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -187,6 +187,29 @@ static void test_init_funcs(void) ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState); } +static const WCHAR driver2_path[] = { + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','S','e','r','v','i','c','e','s', + '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r','2',0 +}; + +static void test_load_driver(void) +{ + UNICODE_STRING name; + NTSTATUS ret; + + RtlInitUnicodeString(&name, driver2_path); + + ret = ZwLoadDriver(&name); + ok(!ret, "got %#x\n", ret); + + ret = ZwUnloadDriver(&name); + ok(!ret, "got %#x\n", ret); +} + static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -213,6 +236,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) test_currentprocess(); test_mdl_map(); test_init_funcs(); + test_load_driver(); /* print process report */ if (test_input->winetest_debug) @@ -245,6 +269,23 @@ static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR * return STATUS_SUCCESS; } +static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +{ + BOOL *load = irp->AssociatedIrp.SystemBuffer; + UNICODE_STRING name; + + if (!load) + return STATUS_ACCESS_VIOLATION; + + *info = 0; + + RtlInitUnicodeString(&name, driver2_path); + if (*load) + return ZwLoadDriver(&name); + else + return ZwUnloadDriver(&name); +} + static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { irp->IoStatus.Status = STATUS_SUCCESS; @@ -265,6 +306,9 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_WINETEST_MAIN_TEST: status = main_test(irp, stack, &irp->IoStatus.Information); break; + case IOCTL_WINETEST_LOAD_DRIVER: + status = test_load_driver_ioctl(irp, stack, &irp->IoStatus.Information); + break; default: break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index b254d44..6a4179e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -24,6 +24,7 @@ /* All custom IOCTLs need to have a function value >= 0x800. */ #define IOCTL_WINETEST_BASIC_IOCTL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_MAIN_TEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_LOAD_DRIVER CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver2.c similarity index 55% copy from dlls/ntoskrnl.exe/tests/driver.h copy to dlls/ntoskrnl.exe/tests/driver2.c index b254d44..c648ec6 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver2.c @@ -1,9 +1,7 @@ /* - * ntoskrnl.exe testing framework + * Second driver loaded by driver.c * - * Copyright 2015 Sebastian Lackner - * Copyright 2015 Michael Müller - * Copyright 2015 Christian Costa + * Copyright 2018 Zebediah Figura * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,17 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> -/* All custom IOCTLs need to have a function value >= 0x800. */ -#define IOCTL_WINETEST_BASIC_IOCTL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_WINETEST_MAIN_TEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" -static const char teststr[] = "Wine is not an emulator"; +#include "driver.h" -struct test_input +static void WINAPI driver_Unload(DRIVER_OBJECT *driver) { - int running_under_wine; - int winetest_report_success; - int winetest_debug; - WCHAR path[1]; -}; + DbgPrint("unloading driver2\n"); +} + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *registry) +{ + DbgPrint("loading driver2\n"); + + driver->DriverUnload = driver_Unload; + + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/tests/driver2.spec b/dlls/ntoskrnl.exe/tests/driver2.spec new file mode 100644 index 0000000..ad33444 --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/driver2.spec @@ -0,0 +1 @@ +# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 40de760..febf4c6 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -30,9 +30,6 @@ #include "driver.h" -static const char driver_name[] = "WineTestDriver"; -static const char device_path[] = "\\\\.\\WineTestDriver"; - static HANDLE device; static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); @@ -80,11 +77,9 @@ static void unload_driver(SC_HANDLE service) CloseServiceHandle(service); } -static SC_HANDLE load_driver(char *filename) +static SC_HANDLE load_driver(char *filename, const char *resname, const char *driver_name) { SC_HANDLE manager, service; - SERVICE_STATUS status; - BOOL ret; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (!manager && GetLastError() == ERROR_ACCESS_DENIED) @@ -94,12 +89,11 @@ static SC_HANDLE load_driver(char *filename) } ok(!!manager, "OpenSCManager failed\n"); - /* before we start with the actual tests, make sure to terminate - * any old wine test drivers. */ + /* stop any old drivers running under this name */ service = OpenServiceA(manager, driver_name, SERVICE_ALL_ACCESS); if (service) unload_driver(service); - load_resource("driver.dll", filename); + load_resource(resname, filename); trace("Trying to load driver %s\n", filename); service = CreateServiceA(manager, driver_name, driver_name, @@ -107,7 +101,15 @@ static SC_HANDLE load_driver(char *filename) SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, filename, NULL, NULL, NULL, NULL, NULL); ok(!!service, "CreateService failed: %u\n", GetLastError()); + CloseServiceHandle(manager); + return service; +} + +static BOOL start_driver(HANDLE service) +{ + SERVICE_STATUS status; + BOOL ret; SetLastError(0xdeadbeef); ret = StartServiceA(service, 0, NULL); @@ -117,8 +119,7 @@ static SC_HANDLE load_driver(char *filename) skip("Failed to start service; probably your machine doesn't accept unsigned drivers.\n"); DeleteService(service); CloseServiceHandle(service); - DeleteFileA(filename); - return NULL; + return FALSE; } ok(ret, "StartService failed: %u\n", GetLastError()); @@ -134,10 +135,7 @@ static SC_HANDLE load_driver(char *filename) ok(status.dwCurrentState == SERVICE_RUNNING, "expected SERVICE_RUNNING, got %d\n", status.dwCurrentState); - device = CreateFileA(device_path, 0, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); - - return service; + return TRUE; } static void main_test(void) @@ -194,22 +192,58 @@ static void test_basic_ioctl(void) ok(!strcmp(buf, teststr), "got '%s'\n", buf); } +static void test_load_driver(SC_HANDLE service) +{ + SERVICE_STATUS status; + BOOL load, res; + DWORD sz; + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); + + load = TRUE; + res = DeviceIoControl(device, IOCTL_WINETEST_LOAD_DRIVER, &load, sizeof(load), NULL, 0, &sz, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_RUNNING, "got state %#x\n", status.dwCurrentState); + + load = FALSE; + res = DeviceIoControl(device, IOCTL_WINETEST_LOAD_DRIVER, &load, sizeof(load), NULL, 0, &sz, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); +} + START_TEST(ntoskrnl) { - char filename[MAX_PATH]; - SC_HANDLE service; - BOOL ret; + char filename[MAX_PATH], filename2[MAX_PATH]; + SC_HANDLE service, service2; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); - if (!(service = load_driver(filename))) + service = load_driver(filename, "driver.dll", "WineTestDriver"); + if (!start_driver(service)) + { + DeleteFileA(filename); return; + } + service2 = load_driver(filename2, "driver2.dll", "WineTestDriver2"); + + device = CreateFileA("\\\\.\\WineTestDriver", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); test_basic_ioctl(); main_test(); + test_load_driver(service2); + unload_driver(service2); unload_driver(service); - ret = DeleteFileA(filename); - ok(ret, "DeleteFile failed: %u\n", GetLastError()); + ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); + ok(DeleteFileA(filename2), "DeleteFile failed: %u\n", GetLastError()); } -- 2.7.4

2 3

[PATCH] libs/port/mbtowc: Convert 1 character at a time if dst overlaps into src
by Gabriel Ivăncescu 24 Aug '18

24 Aug '18

Some applications partially overlap the two buffers. For such rare corner cases, do a single check so that there will be no performance regressions, as unsigned operations are defined to wrap around. Bug discovered by Jason Edmeades, revised from bug report. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38558 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- libs/port/mbtowc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index 4977c82..6ed2c2e 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -65,6 +65,17 @@ static inline int mbstowcs_sbcs( const struct sbcs_table *table, int flags, ret = -1; } + /* dst can overlap into src, in which case we need to handle 1 char at a time, + but when src < dst, there is no issue no matter how many we handle at once */ + if ((UINT_PTR) ((UINT_PTR)src - (UINT_PTR)dst) < srclen * sizeof(*dst)) + { + do + *dst++ = cp2uni[*src++]; + while (--srclen); + return ret; + } + + /* dst doesn't overlap into src */ for (;;) { switch(srclen) -- 1.9.1

1 0

[PATCH v3 1/2] iphlpapi: Implement GetUdp6Table().
by Guillaume Charifi 24 Aug '18

24 Aug '18

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 30 ++++- dlls/iphlpapi/ipstats.c | 241 ++++++++++++++++++++++++++++++++++ dlls/iphlpapi/ipstats.h | 1 + include/iphlpapi.h | 2 + include/udpmib.h | 53 ++++++++ 6 files changed, 322 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 1686644de0..fd00cc093a 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -141,7 +141,7 @@ @ stdcall GetTcpTable2( ptr ptr long ) @ stub GetTcpTableFromStack #@ stub GetTeredoPort -#@ stub GetUdp6Table +@ stdcall GetUdp6Table( ptr ptr long ) @ stdcall GetUdpStatisticsEx( ptr long ) @ stdcall GetUdpStatistics( ptr ) @ stub GetUdpStatsFromStack diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7de70c9ef4..c7140cd974 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2442,6 +2442,14 @@ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET, UDP_TABLE_BASIC, 0); } +/****************************************************************** + * GetUdp6Table (IPHLPAPI.@) + */ +DWORD WINAPI GetUdp6Table(PMIB_UDP6TABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) +{ + return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET6, UDP_TABLE_BASIC, 0); +} + /****************************************************************** * GetExtendedUdpTable (IPHLPAPI.@) */ @@ -2456,15 +2464,25 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, if (!pdwSize) return ERROR_INVALID_PARAMETER; - if (ulAf != WS_AF_INET) - { - FIXME("ulAf = %u not supported\n", ulAf); - return ERROR_NOT_SUPPORTED; - } if (TableClass == UDP_TABLE_OWNER_MODULE) FIXME("UDP_TABLE_OWNER_MODULE not fully supported\n"); - if ((ret = build_udp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size))) + switch (ulAf) + { + case WS_AF_INET: + ret = build_udp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); + break; + + case WS_AF_INET6: + ret = build_udp6_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); + break; + + default: + FIXME("ulAf = %u not supported\n", ulAf); + ret = ERROR_NOT_SUPPORTED; + } + + if (ret) return ret; if (!pUdpTable || *pdwSize < size) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 799d03d574..08d1fa428b 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2565,6 +2565,247 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE return ret; } +static DWORD get_udp6_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) +{ + DWORD table_size; + + switch (class) + { + case UDP_TABLE_BASIC: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW); + break; + } + case UDP_TABLE_OWNER_PID: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE_OWNER_PID, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW_OWNER_PID); + break; + } + case UDP_TABLE_OWNER_MODULE: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE_OWNER_MODULE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW_OWNER_MODULE); + break; + } + default: + ERR("unhandled class %u\n", class); + return 0; + } + return table_size; +} + +static MIB_UDP6TABLE *append_udp6_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, + MIB_UDP6TABLE *table, DWORD *count, + const MIB_UDP6ROW_OWNER_MODULE *row, DWORD row_size ) +{ + if (table->dwNumEntries >= *count) + { + MIB_UDP6TABLE *new_table; + DWORD new_count = table->dwNumEntries * 2, new_table_size; + + new_table_size = get_udp6_table_sizes( class, new_count, NULL ); + if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) + { + HeapFree( heap, 0, table ); + return NULL; + } + *count = new_count; + table = new_table; + } + memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); + table->dwNumEntries++; + return table; +} + +static int compare_udp6_rows(const void *a, const void *b) +{ + const MIB_UDP6ROW *rowA = a; + const MIB_UDP6ROW *rowB = b; + int ret; + + if ((ret = memcmp(&rowA->dwLocalAddr, &rowB->dwLocalAddr, sizeof(rowA->dwLocalAddr)) != 0)) return ret; + if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; + return rowA->dwLocalPort - rowB->dwLocalPort; +} + +struct ipv6_addr_scope +{ + IN6_ADDR addr; + DWORD scope; +}; + +static struct ipv6_addr_scope *get_ipv6_addr_scope_table(unsigned int *size) +{ + struct ipv6_addr_scope *table = NULL; + unsigned int table_size = 0; + + if (!(table = HeapAlloc( GetProcessHeap(), 0, sizeof(table[0]) ))) + return NULL; + +#ifdef __linux__ + { + FILE *fp; + char buf[512], *ptr; + + if (!(fp = fopen( "/proc/net/if_inet6", "r" ))) + goto failed; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + WORD a[8]; + DWORD scope; + struct ipv6_addr_scope *new_table; + struct ipv6_addr_scope *entry; + unsigned int i; + + if (sscanf( ptr, "%4hx%4hx%4hx%4hx%4hx%4hx%4hx%4hx %*s %*s %x", + &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6], &a[7], &scope ) != 9) + continue; + + table_size++; + if (!(new_table = HeapReAlloc( GetProcessHeap(), 0, table, table_size * sizeof(table[0]) ))) + { + fclose(fp); + goto failed; + } + + table = new_table; + entry = &table[table_size - 1]; + + i = 0; + while (i < 8) + { + entry->addr.u.Word[i] = htons(a[i]); + i++; + } + + entry->scope = htons(scope); + } + } +#else + FIXME( "not implemented\n" ); + goto failed; +#endif + + *size = table_size; + return table; + +failed: + HeapFree( GetProcessHeap(), 0, table ); + return NULL; +} + +static DWORD find_ipv6_addr_scope(const IN6_ADDR *addr, const struct ipv6_addr_scope *table, unsigned int size) +{ + const BYTE multicast_scope_mask = 0x0F; + const BYTE multicast_scope_shift = 0; + unsigned int i = 0; + + if (IN6_IS_ADDR_UNSPECIFIED(addr)) + return 0; + + if (IN6_IS_ADDR_MULTICAST(addr)) + return htons((addr->u.Byte[1] & multicast_scope_mask) >> multicast_scope_shift); + + if (!table) + return -1; + + while (i < size) + { + if (memcmp(&table[i].addr, addr, sizeof(table[i].addr)) == 0) + return table[i].scope; + i++; + } + + return -1; +} + +DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE heap, DWORD flags, + DWORD *size ) +{ + MIB_UDP6TABLE *table; + MIB_UDP6ROW_OWNER_MODULE row; + DWORD ret = NO_ERROR, count = 16, table_size, row_size; + + if (!(table_size = get_udp6_table_sizes( class, count, &row_size ))) + return ERROR_INVALID_PARAMETER; + + if (!(table = HeapAlloc( heap, flags, table_size ))) + return ERROR_OUTOFMEMORY; + + table->dwNumEntries = 0; + memset( &row, 0, sizeof(row) ); + +#ifdef __linux__ + { + FILE *fp; + + if ((fp = fopen( "/proc/net/udp6", "r" ))) + { + char buf[512], *ptr; + struct pid_map *map = NULL; + unsigned int num_entries = 0; + struct ipv6_addr_scope *addr_scopes; + unsigned int addr_scopes_size = 0; + unsigned int dummy; + int inode; + + addr_scopes = get_ipv6_addr_scope_table(&addr_scopes_size); + + if (class >= UDP_TABLE_OWNER_PID) map = get_pid_map( &num_entries ); + + /* skip header line */ + ptr = fgets( buf, sizeof(buf), fp ); + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + DWORD in6_addr32[4]; + + if (sscanf( ptr, "%u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", &dummy, + &in6_addr32[0], &in6_addr32[1], &in6_addr32[2], &in6_addr32[3], + &row.dwLocalPort, &inode ) != 7) + continue; + memcpy(&row.ucLocalAddr, in6_addr32, sizeof(row.ucLocalAddr)); + row.dwLocalScopeId = find_ipv6_addr_scope((const IN6_ADDR *)&row.ucLocalAddr, addr_scopes, addr_scopes_size); + row.dwLocalPort = htons( row.dwLocalPort ); + + if (class >= UDP_TABLE_OWNER_PID) + row.dwOwningPid = find_owning_pid( map, num_entries, inode ); + if (class >= UDP_TABLE_OWNER_MODULE) + { + row.liCreateTimestamp.QuadPart = 0; /* FIXME */ + row.u.dwFlags = 0; + memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); + } + if (!(table = append_udp6_row( class, heap, flags, table, &count, &row, row_size ))) + break; + } + HeapFree( GetProcessHeap(), 0, map ); + if (addr_scopes) + HeapFree( GetProcessHeap(), 0, addr_scopes ); + fclose( fp ); + } + else ret = ERROR_NOT_SUPPORTED; + } +#else + FIXME( "not implemented\n" ); + ret = ERROR_NOT_SUPPORTED; +#endif + + if (!table) return ERROR_OUTOFMEMORY; + if (!ret) + { + if (order && table->dwNumEntries) + qsort( table->table, table->dwNumEntries, row_size, compare_udp6_rows ); + *tablep = table; + } + else HeapFree( heap, flags, table ); + if (size) *size = get_udp6_table_sizes( class, count, NULL ); + TRACE( "returning ret %u table %p\n", ret, table ); + return ret; +} + /****************************************************************** * AllocateAndGetUdpTableFromStack (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index d742d6380a..acf43ee27c 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -34,5 +34,6 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDE DWORD build_tcp_table(TCP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; DWORD build_udp_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; +DWORD build_udp6_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; #endif /* ndef WINE_IPSTATS_H_ */ diff --git a/include/iphlpapi.h b/include/iphlpapi.h index 54d93d1c9c..86507dfd4d 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -51,6 +51,8 @@ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder); DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder); +DWORD WINAPI GetUdp6Table(PMIB_UDP6TABLE pUdpTable, PDWORD pdwSize, BOOL bOrder); + DWORD WINAPI GetIpStatistics(PMIB_IPSTATS pStats); DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily); diff --git a/include/udpmib.h b/include/udpmib.h index 6b3f51cf2f..3d1bba5ee5 100644 --- a/include/udpmib.h +++ b/include/udpmib.h @@ -18,6 +18,8 @@ #ifndef __WINE_UDPMIB_H #define __WINE_UDPMIB_H +#include <in6addr.h> + #define TCPIP_OWNING_MODULE_SIZE 16 @@ -71,6 +73,57 @@ typedef struct _MIB_UDPTABLE_OWNER_MODULE MIB_UDPROW_OWNER_MODULE table[1]; } MIB_UDPTABLE_OWNER_MODULE, *PMIB_UDPTABLE_OWNER_MODULE; +typedef struct _MIB_UDP6ROW +{ + IN6_ADDR dwLocalAddr; + DWORD dwLocalScopeId; + DWORD dwLocalPort; +} MIB_UDP6ROW, *PMIB_UDP6ROW; + +typedef struct _MIB_UDP6TABLE +{ + DWORD dwNumEntries; + MIB_UDP6ROW table[1]; +} MIB_UDP6TABLE, *PMIB_UDP6TABLE; + +typedef struct _MIB_UDP6ROW_OWNER_PID +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + DWORD dwOwningPid; +} MIB_UDP6ROW_OWNER_PID, *PMIB_UDP6ROW_OWNER_PID; + +typedef struct _MIB_UDP6TABLE_OWNER_PID +{ + DWORD dwNumEntries; + MIB_UDP6ROW_OWNER_PID table[1]; +} MIB_UDP6TABLE_OWNER_PID, *PMIB_UDP6TABLE_OWNER_PID; + +typedef struct _MIB_UDP6ROW_OWNER_MODULE +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + DWORD dwOwningPid; + LARGE_INTEGER liCreateTimestamp; + __C89_NAMELESS union + { + __C89_NAMELESS struct + { + int SpecificPortBind:1; + } __C89_NAMELESSSTRUCTNAME; + int dwFlags; + } __C89_NAMELESSUNIONNAME; + ULONGLONG OwningModuleInfo[TCPIP_OWNING_MODULE_SIZE]; +} MIB_UDP6ROW_OWNER_MODULE, *PMIB_UDP6ROW_OWNER_MODULE; + +typedef struct _MIB_UDP6TABLE_OWNER_MODULE +{ + DWORD dwNumEntries; + MIB_UDP6ROW_OWNER_MODULE table[1]; +} MIB_UDP6TABLE_OWNER_MODULE, *PMIB_UDP6TABLE_OWNER_MODULE; + /* UDP statistics */ typedef struct _MIB_UDPSTATS -- Guillaume Charifi <guillaume.charifi(a)sfr.fr>

2 1

[PATCH 4/5] wined3d: Add shadow sampler capability bit to d3d_info.
by Józef Kucia 24 Aug '18

24 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8c1cce457ed0..39671f2f30cf 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3657,6 +3657,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); + d3d_info->shadow_sampler = gl_info->supported[ARB_SHADOW]; d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 774cd48caec6..d2229c20b2eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1607,7 +1607,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } else if ((usage & WINED3DUSAGE_DEPTHSTENCIL) && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SHADOW) - && !adapter->gl_info.supported[ARB_SHADOW]) + && !adapter->d3d_info.shadow_sampler) { TRACE("[FAILED] - No shadow sampler support.\n"); return WINED3DERR_NOTAVAILABLE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de0b4867de79..834ca151cf6a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -193,7 +193,11 @@ struct wined3d_d3d_info BOOL shader_color_key; DWORD valid_rt_mask; DWORD wined3d_creation_flags; - BOOL shader_double_precision; + + DWORD shadow_sampler : 1; + DWORD shader_double_precision : 1; + DWORD padding : 30; + enum wined3d_feature_level feature_level; }; -- 2.16.4

3 2

[PATCH] winhttp: Escape untrusted URL paths.
by Hans Leidekker 24 Aug '18

24 Aug '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 24 ++++++++++----------- dlls/winhttp/session.c | 8 +++---- dlls/winhttp/tests/url.c | 1 + dlls/winhttp/tests/winhttp.c | 40 ++++++++++++++++++++++++++++++++++ dlls/winhttp/url.c | 49 ++++++++++++++++++++++++------------------ dlls/winhttp/winhttp_private.h | 1 + 6 files changed, 86 insertions(+), 37 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 65d641f3cb..6f6de7c63d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2517,7 +2517,7 @@ static WCHAR *get_redirect_url( request_t *request, DWORD *len ) query_headers( request, WINHTTP_QUERY_LOCATION, NULL, NULL, &size, NULL ); if (get_last_error() != ERROR_INSUFFICIENT_BUFFER) return FALSE; if (!(ret = heap_alloc( size ))) return NULL; - *len = size / sizeof(WCHAR); + *len = size / sizeof(WCHAR) - 1; if (query_headers( request, WINHTTP_QUERY_LOCATION, NULL, ret, &size, NULL )) return ret; heap_free( ret ); return NULL; @@ -2526,42 +2526,42 @@ static WCHAR *get_redirect_url( request_t *request, DWORD *len ) static BOOL handle_redirect( request_t *request, DWORD status ) { BOOL ret = FALSE; - DWORD len, len_url; + DWORD len, len_loc; URL_COMPONENTS uc; connect_t *connect = request->connect; INTERNET_PORT port; WCHAR *hostname = NULL, *location; int index; - if (!(location = get_redirect_url( request, &len_url ))) return FALSE; + if (!(location = get_redirect_url( request, &len_loc ))) return FALSE; memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); uc.dwSchemeLength = uc.dwHostNameLength = uc.dwUrlPathLength = uc.dwExtraInfoLength = ~0u; - if (!WinHttpCrackUrl( location, len_url, 0, &uc )) /* assume relative redirect */ + if (!WinHttpCrackUrl( location, len_loc, 0, &uc )) /* assume relative redirect */ { WCHAR *path, *p; if (location[0] == '/') { - len = strlenW( location ); + len = escape_string( NULL, location, len_loc ); if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - strcpyW( path, location ); + escape_string( path, location, len_loc ); } else { if ((p = strrchrW( request->path, '/' ))) *p = 0; - len = strlenW( request->path ) + 1 + strlenW( location ); + len = strlenW( request->path ) + 1 + escape_string( NULL, location, len_loc ); if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; strcpyW( path, request->path ); strcatW( path, slashW ); - strcatW( path, location ); + escape_string( path + strlenW(path), location, len_loc ); } heap_free( request->path ); request->path = path; - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_url + 1 ); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_loc + 1 ); } else { @@ -2577,7 +2577,7 @@ static BOOL handle_redirect( request_t *request, DWORD status ) request->hdr.flags |= WINHTTP_FLAG_SECURE; } - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_url + 1 ); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_loc + 1 ); len = uc.dwHostNameLength; if (!(hostname = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; @@ -2607,9 +2607,9 @@ static BOOL handle_redirect( request_t *request, DWORD status ) request->path = NULL; if (uc.dwUrlPathLength) { - len = uc.dwUrlPathLength + uc.dwExtraInfoLength; + len = escape_string( NULL, uc.lpszUrlPath, uc.dwUrlPathLength + uc.dwExtraInfoLength ); if (!(request->path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - strcpyW( request->path, uc.lpszUrlPath ); + escape_string( request->path, uc.lpszUrlPath, uc.dwUrlPathLength + uc.dwExtraInfoLength ); } else request->path = strdupW( slashW ); } diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 788f7c613f..8da09a2e21 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1142,14 +1142,14 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (object) { WCHAR *path, *p; - unsigned int len; + unsigned int len, len_object = strlenW(object); - len = strlenW( object ) + 1; + len = escape_string( NULL, object, len_object ); if (object[0] != '/') len++; - if (!(p = path = heap_alloc( len * sizeof(WCHAR) ))) goto end; + if (!(p = path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; if (object[0] != '/') *p++ = '/'; - strcpyW( p, object ); + escape_string( p, object, len_object ); request->path = path; } else if (!(request->path = strdupW( slashW ))) goto end; diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 6bde1de70e..214b7f34cf 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -667,6 +667,7 @@ static void WinHttpCrackUrl_test( void ) ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); ok( !lstrcmpW( uc.lpszHostName, hostnameW ), "unexpected host name\n" ); ok( !lstrcmpW( uc.lpszUrlPath, pathW ), "unexpected path\n" ); + ok( uc.dwUrlPathLength == lstrlenW(pathW), "got %u\n", uc.dwUrlPathLength ); uc.dwStructSize = sizeof(uc); uc.lpszScheme = NULL; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2e903e1105..df822b2e46 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2274,6 +2274,11 @@ static DWORD CALLBACK server_thread(LPVOID param) if (!strstr(buffer, "Cookie: name=value\r\n")) send(c, cookiemsg, sizeof(cookiemsg) - 1, 0); else send(c, notokmsg, sizeof(notokmsg) - 1, 0); } + else if (strstr(buffer, "GET /escape")) + { + if (strstr(buffer, "GET /escape?one%20two%0D%0A HTTP/1.1")) send(c, okmsg, sizeof(okmsg) - 1, 0); + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -3229,6 +3234,40 @@ static void test_cookies( int port ) WinHttpCloseHandle( ses ); } +static void test_request_path_escapes( int port ) +{ + static const WCHAR objW[] = + {'/','e','s','c','a','p','e','?','o','n','e',' ','t','w','o','\r','\n',0}; + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + + ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, objW, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); +} + static void test_connection_info( int port ) { static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; @@ -4555,6 +4594,7 @@ START_TEST (winhttp) test_bad_header(si.port); test_multiple_reads(si.port); test_cookies(si.port); + test_request_path_escapes(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, quitW); diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 32b30da0ce..52a175c84d 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -118,7 +118,7 @@ static BOOL need_escape( WCHAR c ) } } -static DWORD copy_escape( WCHAR *dst, const WCHAR *src, DWORD len ) +DWORD escape_string( WCHAR *dst, const WCHAR *src, DWORD len ) { static const WCHAR hex[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; DWORD ret = len; @@ -129,38 +129,45 @@ static DWORD copy_escape( WCHAR *dst, const WCHAR *src, DWORD len ) { if (need_escape( src[i] )) { - p[0] = '%'; - p[1] = hex[(src[i] >> 4) & 0xf]; - p[2] = hex[src[i] & 0xf]; + if (dst) + { + p[0] = '%'; + p[1] = hex[(src[i] >> 4) & 0xf]; + p[2] = hex[src[i] & 0xf]; + p += 2; + } ret += 2; - p += 2; } - else *p = src[i]; + else if (dst) *p = src[i]; } - dst[ret] = 0; + if (dst) dst[ret] = 0; return ret; } -static WCHAR *escape_url( LPCWSTR url, DWORD *len ) +static WCHAR *escape_url( const WCHAR *url, DWORD *len ) { WCHAR *ret; - const WCHAR *p, *q; + const WCHAR *p; + DWORD len_base, len_path; - if ((p = q = strrchrW( url, '/' ))) + if ((p = strrchrW( url, '/' ))) { - while (*q) - { - if (need_escape( *q )) *len += 2; - q++; - } + len_base = p - url; + len_path = escape_string( NULL, p, *len - len_base ); } - if (!(ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL; - if (!p) strcpyW( ret, url ); else { - memcpy( ret, url, (p - url) * sizeof(WCHAR) ); - copy_escape( ret + (p - url), p, q - p ); + len_base = *len; + len_path = 0; } + + if (!(ret = heap_alloc( (len_base + len_path + 1) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, url, len_base * sizeof(WCHAR) ); + + if (p) escape_string( ret + len_base, p, *len - (p - url) ); + ret[len_base + len_path] = 0; + + *len = len_base + len_path; return ret; } @@ -516,7 +523,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW if (uc->lpszUrlPath) { len = comp_length( uc->dwUrlPathLength, 0, uc->lpszUrlPath ); - if (flags & ICU_ESCAPE) url += copy_escape( url, uc->lpszUrlPath, len ); + if (flags & ICU_ESCAPE) url += escape_string( url, uc->lpszUrlPath, len ); else { memcpy( url, uc->lpszUrlPath, len * sizeof(WCHAR) ); @@ -526,7 +533,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW if (uc->lpszExtraInfo) { len = comp_length( uc->dwExtraInfoLength, 0, uc->lpszExtraInfo ); - if (flags & ICU_ESCAPE) url += copy_escape( url, uc->lpszExtraInfo, len ); + if (flags & ICU_ESCAPE) url += escape_string( url, uc->lpszExtraInfo, len ); else { memcpy( url, uc->lpszExtraInfo, len * sizeof(WCHAR) ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index f1aa5622c6..7b92afc7ce 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -322,6 +322,7 @@ BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HID void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; void release_host( hostdata_t *host ) DECLSPEC_HIDDEN; +DWORD escape_string( WCHAR *, const WCHAR *, DWORD ) DECLSPEC_HIDDEN; extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH] winhttp: Add support for WINHTTP_ENABLE_SSL_REVOCATION.
by Zhiyi Zhang 24 Aug '18

24 Aug '18

This also fixes a regression caused by 0b61334b9d6392e8c8a9772d762efaf0c2eb0835, which is causing Office 2013 to fail to login, saying that there is a problem with your account. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winhttp/net.c | 14 ++++++++------ dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 12 ++++++++++++ dlls/winhttp/tests/winhttp.c | 31 +++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 3 ++- 5 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index d577a64783..2625e4a9d7 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -160,7 +160,7 @@ static int sock_recv(int fd, void *msg, size_t len, int flags) return ret; } -static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags ) +static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags, BOOL check_revocation ) { HCERTSTORE store = cert->hCertStore; BOOL ret; @@ -173,9 +173,10 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu TRACE("verifying %s\n", debugstr_w( server )); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth; - if ((ret = CertGetCertificateChain( NULL, cert, NULL, store, &chainPara, - CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, - NULL, &chain ))) + ret = CertGetCertificateChain( NULL, cert, NULL, store, &chainPara, + check_revocation ? CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT : 0, + NULL, &chain ); + if (ret) { if (chain->TrustStatus.dwErrorStatus) { @@ -370,7 +371,8 @@ BOOL netconn_close( netconn_t *conn ) return TRUE; } -BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle ) +BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle, + BOOL check_revocation) { SecBuffer out_buf = {0, SECBUFFER_TOKEN, NULL}, in_bufs[2] = {{0, SECBUFFER_TOKEN}, {0, SECBUFFER_EMPTY}}; SecBufferDesc out_desc = {SECBUFFER_VERSION, 1, &out_buf}, in_desc = {SECBUFFER_VERSION, 2, in_bufs}; @@ -466,7 +468,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_fl status = QueryContextAttributesW(&ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); if(status == SEC_E_OK) { - res = netconn_verify_cert(cert, hostname, security_flags); + res = netconn_verify_cert(cert, hostname, security_flags, check_revocation); CertFreeCertificateContext(cert); if(res != ERROR_SUCCESS) { WARN("cert verify failed: %u\n", res); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5e5b229a1f..65d641f3cb 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1769,7 +1769,7 @@ static BOOL open_connection( request_t *request ) if (!ensure_cred_handle( connect->session ) || !netconn_secure_connect( netconn, connect->hostname, request->security_flags, - &connect->session->cred_handle )) + &connect->session->cred_handle, request->check_revocation )) { heap_free( addressW ); netconn_close( netconn ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index fb815682c2..788f7c613f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1020,6 +1020,18 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe } FIXME("WINHTTP_OPTION_CLIENT_CERT_CONTEXT\n"); return TRUE; + case WINHTTP_OPTION_ENABLE_FEATURE: + if(buflen == sizeof( DWORD ) && *(DWORD *)buffer == WINHTTP_ENABLE_SSL_REVOCATION) + { + request->check_revocation = TRUE; + SetLastError( NO_ERROR ); + return TRUE; + } + else + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_WINHTTP_INVALID_OPTION ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index c9e053fbea..2e903e1105 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -201,6 +201,37 @@ static void test_QueryOption(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + feature = 0xdeadbeef; + size = sizeof(feature); + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, &size); + ok(!ret, "should fail to query enabled features for a request\n"); + ok(feature == 0xdeadbeef, "expect feature 0xdeadbeef, got %u\n", feature); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + feature = WINHTTP_ENABLE_SSL_REVOCATION; + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, 0, sizeof(feature)); + ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, 0); + ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, sizeof(feature)); + ok(ret, "failed to set feature\n"); + ok(GetLastError() == NO_ERROR || broken(GetLastError() == 0xdeadbeef), /* Doesn't set error code on Vista or older */ + "expected NO_ERROR, got %u\n", GetLastError()); + + feature = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, sizeof(feature)); + ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); ret = WinHttpCloseHandle(request); ok(ret, "WinHttpCloseHandle failed on closing request: %u\n", GetLastError()); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index d639a2deb2..f1aa5622c6 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -210,6 +210,7 @@ typedef struct DWORD optional_len; netconn_t *netconn; DWORD security_flags; + BOOL check_revocation; const CERT_CONTEXT *server_cert; int resolve_timeout; int connect_timeout; @@ -306,7 +307,7 @@ void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; -BOOL netconn_secure_connect( netconn_t *, WCHAR *, DWORD, CredHandle * ) DECLSPEC_HIDDEN; +BOOL netconn_secure_connect( netconn_t *, WCHAR *, DWORD, CredHandle *, BOOL ) DECLSPEC_HIDDEN; BOOL netconn_send( netconn_t *, const void *, size_t, int * ) DECLSPEC_HIDDEN; DWORD netconn_set_timeout( netconn_t *, BOOL, int ) DECLSPEC_HIDDEN; BOOL netconn_is_alive( netconn_t * ) DECLSPEC_HIDDEN; -- 2.18.0

2 1

[PATCH 2/2] widl: Allow defaultvalue() attribute on any pointer type.
by Jacek Caban 24 Aug '18

24 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/write_msft.c | 130 +++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 74 deletions(-)

1 0

[PATCH 1/2] widl: Split write_value for string and int values.
by Jacek Caban 24 Aug '18

24 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/write_msft.c | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-)

1 0

[PATCH] comctl32/tests: Fix test failures on XP.
by Nikolay Sivov 24 Aug '18

24 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/treeview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 14d814d8e0..c60aa8a6c4 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2225,8 +2225,8 @@ static void _check_item(HWND hwnd, HTREEITEM item, BOOL is_version_6, int line) else width = data->width; todo_wine - ok_(__FILE__, line)(width == (rect.right - rect.left), "Width %d, rect width %d.\n", - width, rect.right - rect.left); + ok_(__FILE__, line)(width == (rect.right - rect.left) || broken(is_version_6 && width == 0) /* XP */, + "Width %d, rect width %d.\n", width, rect.right - rect.left); } } -- 2.18.0

1 0

[PATCH] include: Add IWbemUnsecuredApartment interfaces
by Alistair Leslie-Hughes 24 Aug '18

24 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/wbemcli.idl | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 4a0f4e2..2dc451a 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -660,3 +660,46 @@ interface IWbemQualifierSet : IUnknown HRESULT EndEnumeration(); } + + +typedef [v1_enum] enum tag_WBEM_UNSECAPP_FLAG_TYPE +{ + WBEM_FLAG_UNSECAPP_DEFAULT_CHECK_ACCESS = 0, + WBEM_FLAG_UNSECAPP_CHECK_ACCESS = 1, + WBEM_FLAG_UNSECAPP_DONT_CHECK_ACCESS = 2 +} WBEM_UNSECAPP_FLAG_TYPE; + +[ + object, + restricted, + uuid(1cfaba8c-1523-11d1-ad79-00c04fd8fdff) +] +interface IUnsecuredApartment : IUnknown +{ + HRESULT CreateObjectStub( + [in] IUnknown *object, + [out] IUnknown **stub); +}; + +[ + object, + restricted, + uuid(31739d04-3471-4cf4-9a7c-57a44ae71956) +] +interface IWbemUnsecuredApartment : IUnsecuredApartment +{ + HRESULT CreateSinkStub( + [in] IWbemObjectSink *sink, + [in] DWORD flags, + [in,unique] const WCHAR *reserved, + [out] IWbemObjectSink **stub); +}; + +[ + uuid(49bd2028-1523-11d1-ad79-00c04fd8fdff) +] +coclass UnsecuredApartment +{ + interface IUnsecuredApartment; + interface IWbemUnsecuredApartment; +}; -- 1.9.1

2 1

[PATCH 3/3] oleaut32: Use common helper for masked bitmaps to render an icon. (Resend)
by Dmitry Timoshkov 24 Aug '18

24 Aug '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index aa82b057ee..0ef0ecfeb6 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -711,9 +711,18 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, } case PICTYPE_ICON: - FIXME("Not quite correct implementation of rendering icons...\n"); - DrawIconEx(hdc, x, y, This->desc.u.icon.hicon, cx, cy, 0, NULL, DI_NORMAL); + { + ICONINFO info; + + if (!GetIconInfo(This->desc.u.icon.hicon, &info)) + return E_FAIL; + + render_masked_bitmap(This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, info.hbmMask, info.hbmColor); + + DeleteObject(info.hbmMask); + if (info.hbmColor) DeleteObject(info.hbmColor); break; + } case PICTYPE_METAFILE: { -- 2.17.1

1 0

[PATCH 2/3] oleaut32: Move rendering a bitmap to a separate helper. (Resend)
by Dmitry Timoshkov 24 Aug '18

24 Aug '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 103 +++++++++++++++++++++++-------------- 1 file changed, 64 insertions(+), 39 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index a2a54bdcd2..aa82b057ee 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -610,6 +610,55 @@ static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface, return S_OK; } +static void render_masked_bitmap(OLEPictureImpl *This, HDC hdc, + LONG x, LONG y, LONG cx, LONG cy, OLE_XPOS_HIMETRIC xSrc, OLE_YPOS_HIMETRIC ySrc, + OLE_XSIZE_HIMETRIC cxSrc, OLE_YSIZE_HIMETRIC cySrc, HBITMAP hbmMask, HBITMAP hbmXor) +{ + HBITMAP hbmpOld; + HDC hdcBmp; + + /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. + * NB y-axis gets flipped + */ + + hdcBmp = CreateCompatibleDC(0); + SetMapMode(hdcBmp, MM_ANISOTROPIC); + SetWindowOrgEx(hdcBmp, 0, 0, NULL); + SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL); + SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); + SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); + + if (hbmMask) + { + HDC hdcMask = CreateCompatibleDC(0); + HBITMAP hOldbm = SelectObject(hdcMask, hbmMask); + + hbmpOld = SelectObject(hdcBmp, hbmXor); + + SetMapMode(hdcMask, MM_ANISOTROPIC); + SetWindowOrgEx(hdcMask, 0, 0, NULL); + SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); + SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); + SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); + + SetBkColor(hdc, RGB(255, 255, 255)); + SetTextColor(hdc, RGB(0, 0, 0)); + StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); + + SelectObject(hdcMask, hOldbm); + DeleteDC(hdcMask); + } + else + { + hbmpOld = SelectObject(hdcBmp, hbmXor); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); + } + + SelectObject(hdcBmp, hbmpOld); + DeleteDC(hdcBmp); +} + /************************************************************************ * OLEPictureImpl_Render */ @@ -643,48 +692,24 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, /* nothing to do */ return S_OK; case PICTYPE_BITMAP: - { - HBITMAP hbmpOld; - HDC hdcBmp; - - /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. - NB y-axis gets flipped */ - - hdcBmp = CreateCompatibleDC(0); - SetMapMode(hdcBmp, MM_ANISOTROPIC); - SetWindowOrgEx(hdcBmp, 0, 0, NULL); - SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); - SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); - - if (This->hbmMask) { - HDC hdcMask = CreateCompatibleDC(0); - HBITMAP hOldbm = SelectObject(hdcMask, This->hbmMask); - - hbmpOld = SelectObject(hdcBmp, This->hbmXor); - - SetMapMode(hdcMask, MM_ANISOTROPIC); - SetWindowOrgEx(hdcMask, 0, 0, NULL); - SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); - SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); - - SetBkColor(hdc, RGB(255, 255, 255)); - SetTextColor(hdc, RGB(0, 0, 0)); - StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); - - SelectObject(hdcMask, hOldbm); - DeleteDC(hdcMask); - } else { - hbmpOld = SelectObject(hdcBmp, This->desc.u.bmp.hbitmap); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); - } + { + HBITMAP hbmMask, hbmXor; - SelectObject(hdcBmp, hbmpOld); - DeleteDC(hdcBmp); + if (This->hbmMask) + { + hbmMask = This->hbmMask; + hbmXor = This->hbmXor; + } + else + { + hbmMask = 0; + hbmXor = This->desc.u.bmp.hbitmap; } + + render_masked_bitmap(This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, hbmMask, hbmXor); break; + } + case PICTYPE_ICON: FIXME("Not quite correct implementation of rendering icons...\n"); DrawIconEx(hdc, x, y, This->desc.u.icon.hicon, cx, cy, 0, NULL, DI_NORMAL); -- 2.17.1

1 0

[PATCH 1/3] oleaut32/tests: Fix the IPicture::Render() usage. (Resend)
by Dmitry Timoshkov 24 Aug '18

24 Aug '18

When one specifies the target rectangle (0, 0, width, -height) IPicture::Render() places the origin at 0,0 and flips the image vertically. This means that in order to paint an icon on the DC it's necessary to specify the rectangle (0, height, width, -height), i.e. place the origin at 0,height. I've written a test app that verifies this behaviour, ufortunately I don't see a way to add a Wine test case for this. The test currently works by chance under Windows because in case of (0, 0, width, -height) IPicture::Render() draws black rectangle instead of an icon at (0, 0, width, height). If Wine intends to replicate this behaviour it should be fixed by a separate patch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/olepicture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index c06cec19ec..6a5f7ee042 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -864,7 +864,7 @@ static void test_Render(void) SetPixelV(hdc, 10, 10, 0x00223344); expected = GetPixel(hdc, 0, 0); - hres = picture_render(pic, hdc, 1, 1, 9, 9, 0, 0, pWidth, -pHeight, NULL); + hres = picture_render(pic, hdc, 1, 1, 9, 9, 0, pHeight, pWidth, -pHeight, NULL); ole_expect(hres, S_OK); if(hres != S_OK) goto done; -- 2.17.1

1 0

[PATCH] mshtml: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 24 Aug '18

24 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/dispex.c | 6 +++--- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 8 ++++---- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmllocation.c | 2 +- dlls/mshtml/htmlstyle.c | 18 +++++++++--------- dlls/mshtml/htmlwindow.c | 9 +++------ dlls/mshtml/main.c | 8 ++++---- dlls/mshtml/mutation.c | 6 +++--- dlls/mshtml/navigate.c | 4 ++-- dlls/mshtml/nsembed.c | 8 ++++---- dlls/mshtml/nsio.c | 21 ++++++++++----------- dlls/mshtml/olecmd.c | 11 ++++------- dlls/mshtml/pluginhost.c | 4 ++-- dlls/mshtml/protocol.c | 26 +++++++++++++------------- dlls/mshtml/script.c | 4 ++-- dlls/mshtml/view.c | 6 ++---- 19 files changed, 70 insertions(+), 79 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 360d915523..02ba5d41d5 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -182,7 +182,7 @@ void release_typelib(void) if(!typelib) return; - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for(i=0; i < ARRAY_SIZE(typeinfos); i++) if(typeinfos[i]) ITypeInfo_Release(typeinfos[i]); @@ -774,12 +774,12 @@ static HRESULT function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return E_ACCESSDENIED; name_len = SysStringLen(This->info->name); - ptr = str = SysAllocStringLen(NULL, name_len + (sizeof(func_prefixW)+sizeof(func_suffixW))/sizeof(WCHAR)); + ptr = str = SysAllocStringLen(NULL, name_len + ARRAY_SIZE(func_prefixW) + ARRAY_SIZE(func_suffixW)); if(!str) return E_OUTOFMEMORY; memcpy(ptr, func_prefixW, sizeof(func_prefixW)); - ptr += sizeof(func_prefixW)/sizeof(WCHAR); + ptr += ARRAY_SIZE(func_prefixW); memcpy(ptr, This->info->name, name_len*sizeof(WCHAR)); ptr += name_len; diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 4913c45995..2cfd46dc50 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -140,7 +140,7 @@ HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) } if(*color != '#') { - for(i=0; i < sizeof(keyword_table)/sizeof(keyword_table[0]); i++) { + for(i=0; i < ARRAY_SIZE(keyword_table); i++) { if(!strcmpiW(color, keyword_table[i].keyword)) rgb = keyword_table[i].rgb; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index eab7b1feb0..17c9e6307f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1191,7 +1191,7 @@ static BOOL cmdid_from_string(const WCHAR *str, OLECMDID *cmdid) { int i; - for(i = 0; i < sizeof(command_names)/sizeof(*command_names); i++) { + for(i = 0; i < ARRAY_SIZE(command_names); i++) { if(!strcmpiW(command_names[i].name, str)) { *cmdid = command_names[i].id; return TRUE; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 40e558c62a..4da01560e2 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -103,7 +103,7 @@ static const tag_desc_t tag_descs[] = { static const tag_desc_t *get_tag_desc(const WCHAR *tag_name) { - DWORD min=0, max=sizeof(tag_descs)/sizeof(*tag_descs)-1, i; + DWORD min=0, max=ARRAY_SIZE(tag_descs)-1, i; int r; while(min <= max) { diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d5d59905cd..1a93ae2fe8 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -230,7 +230,7 @@ static eventid_t str_to_eid(const WCHAR *str) { int i; - for(i=0; i < sizeof(event_info)/sizeof(event_info[0]); i++) { + for(i=0; i < ARRAY_SIZE(event_info); i++) { if(!strcmpW(event_info[i].name, str)) return i; } @@ -245,7 +245,7 @@ static eventid_t attr_to_eid(const WCHAR *str) if((str[0] != 'o' && str[0] != 'O') || (str[1] != 'n' && str[1] != 'N')) return EVENTID_LAST; - for(i=0; i < sizeof(event_info)/sizeof(event_info[0]); i++) { + for(i=0; i < ARRAY_SIZE(event_info); i++) { if(!strcmpW(event_info[i].name, str+2) && event_info[i].dispid) return i; } @@ -2345,7 +2345,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp } listeners_cnt = 0; - listeners_size = sizeof(listeners_buf)/sizeof(*listeners_buf); + listeners_size = ARRAY_SIZE(listeners_buf); if(container) { LIST_FOR_EACH_ENTRY(listener, &container->listeners, event_listener_t, entry) { @@ -2529,7 +2529,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, IEventTarget_AddRef(&event_target->IEventTarget_iface); chain_cnt = 0; - chain_buf_size = sizeof(target_chain_buf)/sizeof(*target_chain_buf); + chain_buf_size = ARRAY_SIZE(target_chain_buf); do { if(chain_cnt == chain_buf_size) { diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 90681e4783..13dd3edbb5 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -312,7 +312,7 @@ static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) if(NS_SUCCEEDED(nsres)) { nsAString_GetData(&src_str, &src); - if(!strncmpiW(src, blockedW, sizeof(blockedW)/sizeof(WCHAR)-1)) { + if(!strncmpiW(src, blockedW, ARRAY_SIZE(blockedW)-1)) { TRACE("returning BLOCKED::\n"); *p = SysAllocString(blockedW); if(!*p) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 59b20f614d..769951643c 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -355,7 +355,7 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) WCHAR portW[6]; WCHAR *buf; - port_len = snprintfW(portW, sizeof(portW)/sizeof(portW[0]), format, url.nPort); + port_len = snprintfW(portW, ARRAY_SIZE(portW), format, url.nPort); len = url.dwHostNameLength + 1 /* ':' */ + port_len; buf = *p = SysAllocStringLen(NULL, len); memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b99ea08318..bab8923c90 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -303,7 +303,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrZIndex, DISPID_IHTMLSTYLE_ZINDEX} }; -C_ASSERT(sizeof(style_tbl)/sizeof(*style_tbl) == STYLEID_MAX_VALUE); +C_ASSERT(ARRAY_SIZE(style_tbl) == STYLEID_MAX_VALUE); static const WCHAR valLineThrough[] = {'l','i','n','e','-','t','h','r','o','u','g','h',0}; @@ -323,7 +323,7 @@ static const WCHAR emptyW[] = {0}; static const style_tbl_entry_t *lookup_style_tbl(const WCHAR *name) { - int c, i, min = 0, max = sizeof(style_tbl)/sizeof(*style_tbl)-1; + int c, i, min = 0, max = ARRAY_SIZE(style_tbl)-1; while(min <= max) { i = (min+max)/2; @@ -388,7 +388,7 @@ static LPWSTR fix_url_value(LPCWSTR val) static const WCHAR urlW[] = {'u','r','l','('}; - if(strncmpW(val, urlW, sizeof(urlW)/sizeof(WCHAR)) || !strchrW(val, '\\')) + if(strncmpW(val, urlW, ARRAY_SIZE(urlW)) || !strchrW(val, '\\')) return NULL; ret = heap_strdupW(val); @@ -1250,7 +1250,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIA TRACE("no space in %s\n", debugstr_w(pos)); pos = zero_pxW; - space = pos + sizeof(zero_pxW)/sizeof(WCHAR)-1; + space = pos + ARRAY_SIZE(zero_pxW)-1; } posx_len = space-pos; @@ -2718,7 +2718,7 @@ static void update_filter(HTMLStyle *This) continue; } - if(ptr2 + sizeof(alphaW)/sizeof(WCHAR) == ptr && !memcmp(ptr2, alphaW, sizeof(alphaW))) { + if(ptr2 + ARRAY_SIZE(alphaW) == ptr && !memcmp(ptr2, alphaW, sizeof(alphaW))) { static const WCHAR formatW[] = {'%','f',0}; static const WCHAR opacityW[] = {'o','p','a','c','i','t','y','='}; @@ -2735,11 +2735,11 @@ static void update_filter(HTMLStyle *This) break; } - if(ptr-ptr2 > sizeof(opacityW)/sizeof(WCHAR) && !memcmp(ptr2, opacityW, sizeof(opacityW))) { + if(ptr-ptr2 > ARRAY_SIZE(opacityW) && !memcmp(ptr2, opacityW, sizeof(opacityW))) { float fval = 0.0f, e = 0.1f; WCHAR buf[32]; - ptr2 += sizeof(opacityW)/sizeof(WCHAR); + ptr2 += ARRAY_SIZE(opacityW); while(isdigitW(*ptr2)) fval = fval*10.0f + (float)(*ptr2++ - '0'); @@ -2915,12 +2915,12 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri return S_OK; } - for(i=0; i < sizeof(style_tbl)/sizeof(*style_tbl); i++) { + for(i=0; i < ARRAY_SIZE(style_tbl); i++) { if(dispid == style_tbl[i].dispid) break; } - if(i == sizeof(style_tbl)/sizeof(*style_tbl)) + if(i == ARRAY_SIZE(style_tbl)) return remove_attribute(&This->dispex, dispid, pfSuccess); style_entry = style_tbl+i; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 581de990ee..44f633798a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -626,8 +626,7 @@ static HRESULT WINAPI HTMLWindow2_alert(IHTMLWindow2 *iface, BSTR message) TRACE("(%p)->(%s)\n", This, debugstr_w(message)); - if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, title, - sizeof(title)/sizeof(WCHAR))) { + if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, title, ARRAY_SIZE(title))) { WARN("Could not load message box title: %d\n", GetLastError()); return S_OK; } @@ -657,8 +656,7 @@ static HRESULT WINAPI HTMLWindow2_confirm(IHTMLWindow2 *iface, BSTR message, if(!confirmed) return E_INVALIDARG; - if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, wszTitle, - sizeof(wszTitle)/sizeof(WCHAR))) { + if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, wszTitle, ARRAY_SIZE(wszTitle))) { WARN("Could not load message box title: %d\n", GetLastError()); *confirmed = VARIANT_TRUE; return S_OK; @@ -689,8 +687,7 @@ static INT_PTR CALLBACK prompt_dlgproc(HWND hwnd, UINT msg, prompt_arg *arg = (prompt_arg*)lparam; WCHAR wszTitle[100]; - if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, wszTitle, - sizeof(wszTitle)/sizeof(WCHAR))) { + if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, wszTitle, ARRAY_SIZE(wszTitle))) { WARN("Could not load message box title: %d\n", GetLastError()); EndDialog(hwnd, wparam); return FALSE; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 9b2f1993ae..6ce8198aee 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -126,7 +126,7 @@ static void thread_detach(void) static void free_strings(void) { unsigned int i; - for(i = 0; i < sizeof(status_strings)/sizeof(*status_strings); i++) + for(i = 0; i < ARRAY_SIZE(status_strings); i++) heap_free(status_strings[i]); } @@ -490,7 +490,7 @@ static HRESULT register_server(BOOL do_register) INF_SET_CLSID(TridentAPI); INF_SET_ID(LIBID_MSHTML); - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) { + for(i=0; i < ARRAY_SIZE(pse); i++) { pse[i].pszValue = heap_alloc(39); sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], @@ -498,7 +498,7 @@ static HRESULT register_server(BOOL do_register) clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); } - strtable.cEntries = sizeof(pse)/sizeof(pse[0]); + strtable.cEntries = ARRAY_SIZE(pse); strtable.pse = pse; hAdvpack = LoadLibraryW(wszAdvpack); @@ -508,7 +508,7 @@ static HRESULT register_server(BOOL do_register) FreeLibrary(hAdvpack); - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) + for(i=0; i < ARRAY_SIZE(pse); i++) heap_free(pse[i].pszValue); if(FAILED(hres)) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 39a0e58308..6508270d35 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -131,10 +131,10 @@ static PRUnichar *handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar * ptr += 2; len = strlenW(ptr); - if(len < sizeof(endifW)/sizeof(WCHAR)) + if(len < ARRAY_SIZE(endifW)) return NULL; - end = ptr + len-sizeof(endifW)/sizeof(WCHAR); + end = ptr + len - ARRAY_SIZE(endifW); if(memcmp(end, endifW, sizeof(endifW))) return NULL; @@ -398,7 +398,7 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) TRACE("%s\n", debugstr_w(p)); - if(strncmpiW(ie_eqW, p, sizeof(ie_eqW)/sizeof(WCHAR))) + if(strncmpiW(ie_eqW, p, ARRAY_SIZE(ie_eqW))) return FALSE; p += 3; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index cd18287178..f331cfdef5 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -728,13 +728,13 @@ static void parse_content_type(nsChannelBSC *This, const WCHAR *value) ptr++; len = strlenW(value); - if(ptr + sizeof(charsetW)/sizeof(WCHAR) < value+len && !memicmpW(ptr, charsetW, sizeof(charsetW)/sizeof(WCHAR))) { + if(ptr + ARRAY_SIZE(charsetW) < value+len && !memicmpW(ptr, charsetW, ARRAY_SIZE(charsetW))) { size_t charset_len, lena; nsACString charset_str; const WCHAR *charset; char *charseta; - ptr += sizeof(charsetW)/sizeof(WCHAR); + ptr += ARRAY_SIZE(charsetW); if(*ptr == '\'') { FIXME("Quoted value\n"); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9c2d5e51f9..6aae9c2948 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -242,7 +242,7 @@ static nsresult create_profile_directory(void) { static const WCHAR wine_geckoW[] = {'\\','w','i','n','e','_','g','e','c','k','o',0}; - WCHAR path[MAX_PATH + sizeof(wine_geckoW)/sizeof(WCHAR)]; + WCHAR path[MAX_PATH + ARRAY_SIZE(wine_geckoW)]; cpp_bool exists; nsresult nsres; HRESULT hres; @@ -309,7 +309,7 @@ static nsresult NSAPI nsDirectoryServiceProvider2_GetFiles(nsIDirectoryServicePr if(!plugin_directory) { static const WCHAR gecko_pluginW[] = {'\\','g','e','c','k','o','\\','p','l','u','g','i','n',0}; - len = GetSystemDirectoryW(plugin_path, (sizeof(plugin_path)-sizeof(gecko_pluginW))/sizeof(WCHAR)+1); + len = GetSystemDirectoryW(plugin_path, ARRAY_SIZE(plugin_path)-ARRAY_SIZE(gecko_pluginW)+1); if(!len) return NS_ERROR_UNEXPECTED; @@ -413,7 +413,7 @@ static BOOL install_wine_gecko(void) static const WCHAR argsW[] = {' ','a','p','p','w','i','z','.','c','p','l',' ','i','n','s','t','a','l','l','_','g','e','c','k','o',0}; - len = GetSystemDirectoryW(app, MAX_PATH-sizeof(controlW)/sizeof(WCHAR)); + len = GetSystemDirectoryW(app, MAX_PATH-ARRAY_SIZE(controlW)); memcpy(app+len, controlW, sizeof(controlW)); args = heap_alloc(len*sizeof(WCHAR) + sizeof(controlW) + sizeof(argsW)); @@ -421,7 +421,7 @@ static BOOL install_wine_gecko(void) return FALSE; memcpy(args, app, len*sizeof(WCHAR) + sizeof(controlW)); - memcpy(args + len + sizeof(controlW)/sizeof(WCHAR)-1, argsW, sizeof(argsW)); + memcpy(args + len + ARRAY_SIZE(controlW)-1, argsW, sizeof(argsW)); TRACE("starting %s\n", debugstr_w(args)); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7333334f6e..d5e4983616 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -198,8 +198,8 @@ HRESULT nsuri_to_url(LPCWSTR nsuri, BOOL ret_empty, BSTR *ret) static const WCHAR wine_prefixW[] = {'w','i','n','e',':'}; - if(!strncmpW(nsuri, wine_prefixW, sizeof(wine_prefixW)/sizeof(WCHAR))) - ptr += sizeof(wine_prefixW)/sizeof(WCHAR); + if(!strncmpW(nsuri, wine_prefixW, ARRAY_SIZE(wine_prefixW))) + ptr += ARRAY_SIZE(wine_prefixW); if(*ptr || ret_empty) { *ret = SysAllocString(ptr); @@ -1271,7 +1271,7 @@ static nsresult NSAPI nsChannel_SetRequestMethod(nsIHttpChannel *iface, TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aRequestMethod)); nsACString_GetData(aRequestMethod, &method); - for(i=0; i < sizeof(request_method_strings)/sizeof(*request_method_strings); i++) { + for(i=0; i < ARRAY_SIZE(request_method_strings); i++) { if(!strcasecmp(method, request_method_strings[i])) { This->request_method = i; return NS_OK; @@ -1356,7 +1356,7 @@ static nsresult NSAPI nsChannel_SetReferrerWithPolicy(nsIHttpChannel *iface, nsI hres = IUri_GetDisplayUri(referrer->uri, &referrer_uri); if(SUCCEEDED(hres)) { - set_http_header(&This->request_headers, refererW, sizeof(refererW)/sizeof(WCHAR), referrer_uri, SysStringLen(referrer_uri)); + set_http_header(&This->request_headers, refererW, ARRAY_SIZE(refererW), referrer_uri, SysStringLen(referrer_uri)); SysFreeString(referrer_uri); } @@ -1584,7 +1584,7 @@ static nsresult NSAPI nsChannel_IsNoStoreResponse(nsIHttpChannel *iface, cpp_boo TRACE("(%p)->(%p)\n", This, _retval); - header = find_http_header(&This->response_headers, cache_controlW, sizeof(cache_controlW)/sizeof(WCHAR)); + header = find_http_header(&This->response_headers, cache_controlW, ARRAY_SIZE(cache_controlW)); *_retval = header && !strcmpiW(header->data, no_storeW); return NS_OK; } @@ -1756,8 +1756,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, if(!ct) return NS_ERROR_UNEXPECTED; - set_http_header(&This->request_headers, content_typeW, - sizeof(content_typeW)/sizeof(WCHAR), ct, strlenW(ct)); + set_http_header(&This->request_headers, content_typeW, ARRAY_SIZE(content_typeW), ct, strlenW(ct)); heap_free(ct); This->post_data_contains_headers = FALSE; } @@ -2840,7 +2839,7 @@ static nsresult NSAPI nsURI_SchemeIs(nsIFileURL *iface, const char *scheme, cpp_ if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - MultiByteToWideChar(CP_UTF8, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_UTF8, 0, scheme, -1, buf, ARRAY_SIZE(buf)); *_retval = !strcmpW(scheme_name, buf); SysFreeString(scheme_name); return NS_OK; @@ -3296,7 +3295,7 @@ static nsresult NSAPI nsFileURL_GetFile(nsIFileURL *iface, nsIFile **aFile) TRACE("(%p)->(%p)\n", This, aFile); - hres = CoInternetParseIUri(This->uri, PARSE_PATH_FROM_URL, 0, path, sizeof(path)/sizeof(WCHAR), &size, 0); + hres = CoInternetParseIUri(This->uri, PARSE_PATH_FROM_URL, 0, path, ARRAY_SIZE(path), &size, 0); if(FAILED(hres)) { WARN("CoInternetParseIUri failed: %08x\n", hres); return NS_ERROR_FAILURE; @@ -3830,7 +3829,7 @@ static BOOL is_gecko_special_uri(const char *spec) static const char *special_schemes[] = {"chrome:", "data:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; unsigned int i; - for(i=0; i < sizeof(special_schemes)/sizeof(*special_schemes); i++) { + for(i=0; i < ARRAY_SIZE(special_schemes); i++) { if(!strncasecmp(spec, special_schemes[i], strlen(special_schemes[i]))) return TRUE; } @@ -3894,7 +3893,7 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC SysFreeString(charset); } - MultiByteToWideChar(cp, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, spec, -1, new_spec, ARRAY_SIZE(new_spec)); if(base_wine_uri) { hres = combine_url(base_wine_uri->uri, new_spec, &urlmon_uri); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index ece5874f07..e5fc474bbe 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -228,13 +228,10 @@ static void set_default_templates(nsIPrintSettings *settings) nsIPrintSettings_SetFooterStrRight(settings, empty); nsIPrintSettings_SetFooterStrCenter(settings, empty); - if(LoadStringW(get_shdoclc(), IDS_PRINT_HEADER_TEMPLATE, buf, - sizeof(buf)/sizeof(WCHAR))) + if(LoadStringW(get_shdoclc(), IDS_PRINT_HEADER_TEMPLATE, buf, ARRAY_SIZE(buf))) set_print_template(settings, buf, TRUE); - - if(LoadStringW(get_shdoclc(), IDS_PRINT_FOOTER_TEMPLATE, buf, - sizeof(buf)/sizeof(WCHAR))) + if(LoadStringW(get_shdoclc(), IDS_PRINT_FOOTER_TEMPLATE, buf, ARRAY_SIZE(buf))) set_print_template(settings, buf, FALSE); } @@ -838,7 +835,7 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con ULONG i; for(i=0; i<cCmds; i++) { - if(prgCmds[i].cmdID < OLECMDID_OPEN || prgCmds[i].cmdID >= sizeof(exec_table)/sizeof(*exec_table)) { + if(prgCmds[i].cmdID < OLECMDID_OPEN || prgCmds[i].cmdID >= ARRAY_SIZE(exec_table)) { WARN("Unsupported cmdID = %d\n", prgCmds[i].cmdID); prgCmds[i].cmdf = 0; }else { @@ -909,7 +906,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID HTMLDocument *This = impl_from_IOleCommandTarget(iface); if(!pguidCmdGroup) { - if(nCmdID < OLECMDID_OPEN || nCmdID >= sizeof(exec_table)/sizeof(*exec_table) || !exec_table[nCmdID].func) { + if(nCmdID < OLECMDID_OPEN || nCmdID >= ARRAY_SIZE(exec_table) || !exec_table[nCmdID].func) { WARN("Unsupported cmdID = %d\n", nCmdID); return OLECMDERR_E_NOTSUPPORTED; } diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 256850be06..933e35cdcd 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -2269,10 +2269,10 @@ static BOOL parse_classid(const PRUnichar *classid, CLSID *clsid) static const PRUnichar clsidW[] = {'c','l','s','i','d',':'}; - if(strncmpiW(classid, clsidW, sizeof(clsidW)/sizeof(WCHAR))) + if(strncmpiW(classid, clsidW, ARRAY_SIZE(clsidW))) return FALSE; - ptr = classid + sizeof(clsidW)/sizeof(WCHAR); + ptr = classid + ARRAY_SIZE(clsidW); len = strlenW(ptr); if(len == 38) { diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index d385f16185..f7b02c9aa0 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -370,8 +370,8 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr TRACE("bindf %x\n", grfBINDF); - if(strlenW(szUrl)>=sizeof(wszAbout)/sizeof(WCHAR) && !memcmp(wszAbout, szUrl, sizeof(wszAbout))) { - text = szUrl + sizeof(wszAbout)/sizeof(WCHAR); + if(strlenW(szUrl) >= ARRAY_SIZE(wszAbout) && !memcmp(wszAbout, szUrl, sizeof(wszAbout))) { + text = szUrl + ARRAY_SIZE(wszAbout); if(!strcmpW(wszBlank, text)) text = NULL; } @@ -570,14 +570,14 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, return hres; } - if(len < sizeof(wszRes)/sizeof(wszRes[0]) || memcmp(url, wszRes, sizeof(wszRes))) { + if(len < ARRAY_SIZE(wszRes) || memcmp(url, wszRes, sizeof(wszRes))) { WARN("Wrong protocol of url: %s\n", debugstr_w(url)); IInternetProtocolSink_ReportResult(pOIProtSink, E_INVALIDARG, 0, NULL); heap_free(url); return E_INVALIDARG; } - url_dll = url + sizeof(wszRes)/sizeof(wszRes[0]); + url_dll = url + ARRAY_SIZE(wszRes); if(!(res_type = strchrW(url_dll, '/'))) { WARN("wrong url: %s\n", debugstr_w(url)); IInternetProtocolSink_ReportResult(pOIProtSink, MK_E_SYNTAX, 0, NULL); @@ -692,23 +692,23 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC static const WCHAR wszFile[] = {'f','i','l','e',':','/','/'}; static const WCHAR wszRes[] = {'r','e','s',':','/','/'}; - if(strlenW(pwzUrl) <= sizeof(wszRes)/sizeof(WCHAR) || memcmp(pwzUrl, wszRes, sizeof(wszRes))) + if(strlenW(pwzUrl) <= ARRAY_SIZE(wszRes) || memcmp(pwzUrl, wszRes, sizeof(wszRes))) return E_INVALIDARG; - ptr = strchrW(pwzUrl + sizeof(wszRes)/sizeof(WCHAR), '/'); + ptr = strchrW(pwzUrl + ARRAY_SIZE(wszRes), '/'); if(!ptr) return E_INVALIDARG; - len = ptr - (pwzUrl + sizeof(wszRes)/sizeof(WCHAR)); - if(len >= sizeof(file_part)/sizeof(WCHAR)) { + len = ptr - (pwzUrl + ARRAY_SIZE(wszRes)); + if(len >= ARRAY_SIZE(file_part)) { FIXME("Too long URL\n"); return MK_E_SYNTAX; } - memcpy(file_part, pwzUrl + sizeof(wszRes)/sizeof(WCHAR), len*sizeof(WCHAR)); + memcpy(file_part, pwzUrl + ARRAY_SIZE(wszRes), len*sizeof(WCHAR)); file_part[len] = 0; - len = SearchPathW(NULL, file_part, NULL, sizeof(full_path)/sizeof(WCHAR), full_path, NULL); + len = SearchPathW(NULL, file_part, NULL, ARRAY_SIZE(full_path), full_path, NULL); if(!len) { HMODULE module; @@ -720,20 +720,20 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC return MK_E_SYNTAX; } - len = GetModuleFileNameW(module, full_path, sizeof(full_path)/sizeof(WCHAR)); + len = GetModuleFileNameW(module, full_path, ARRAY_SIZE(full_path)); FreeLibrary(module); if(!len) return E_FAIL; } - size = sizeof(wszFile)/sizeof(WCHAR) + len + 1; + size = ARRAY_SIZE(wszFile) + len + 1; if(pcchResult) *pcchResult = size; if(size > cchResult) return S_FALSE; memcpy(pwzResult, wszFile, sizeof(wszFile)); - memcpy(pwzResult + sizeof(wszFile)/sizeof(WCHAR), full_path, (len+1)*sizeof(WCHAR)); + memcpy(pwzResult + ARRAY_SIZE(wszFile), full_path, (len+1)*sizeof(WCHAR)); return S_OK; } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 7acbd5bd0a..d7b4e92310 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1054,8 +1054,8 @@ HRESULT load_script(HTMLScriptElement *script_elem, const WCHAR *src, BOOL async static const WCHAR wine_schemaW[] = {'w','i','n','e',':'}; - if(strlenW(src) > sizeof(wine_schemaW)/sizeof(WCHAR) && !memcmp(src, wine_schemaW, sizeof(wine_schemaW))) - src += sizeof(wine_schemaW)/sizeof(WCHAR); + if(strlenW(src) > ARRAY_SIZE(wine_schemaW) && !memcmp(src, wine_schemaW, sizeof(wine_schemaW))) + src += ARRAY_SIZE(wine_schemaW); TRACE("(%p %s %x)\n", script_elem, debugstr_w(src), async); diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 531c680523..442b07d89a 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -411,10 +411,8 @@ HRESULT call_set_active_object(IOleInPlaceUIWindow *window, IOleInPlaceActiveObj { static WCHAR html_documentW[30]; - if(act_obj && !html_documentW[0]) { - LoadStringW(hInst, IDS_HTMLDOCUMENT, html_documentW, - sizeof(html_documentW)/sizeof(WCHAR)); - } + if(act_obj && !html_documentW[0]) + LoadStringW(hInst, IDS_HTMLDOCUMENT, html_documentW, ARRAY_SIZE(html_documentW)); return IOleInPlaceUIWindow_SetActiveObject(window, act_obj, act_obj ? html_documentW : NULL); } -- 2.14.4

2 1

[PATCH 1/7] shell32: Scale SVG properly to create 48x48 sleep icons
by Alex Henrie 24 Aug '18

24 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- The version of ImageMagick that was released last week started requiring the -density parameter to scale SVGs properly, and I didn't notice until after I had done several of these icons. For the sleep and shutdown icons, redoing them correctly makes them look noticeably better. --- dlls/shell32/resources/sleep.ico | Bin 65140 -> 65144 bytes dlls/shell32/resources/sleep.svg | 244 ++++++++++++++----------------- 2 files changed, 112 insertions(+), 132 deletions(-) diff --git a/dlls/shell32/resources/sleep.ico b/dlls/shell32/resources/sleep.ico index df7a0b05321f0ef3f7f029a1df735cd2f0e75ef3..7c3f26ecb6df0007b8f85ae704a67989d47996da 100644 GIT binary patch delta 34726 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 delta 34939 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%0DcuW&b)ysoq4W9jV5@ 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 DmC}B; diff --git a/dlls/shell32/resources/sleep.svg b/dlls/shell32/resources/sleep.svg index 845d67248b..659f74e417 100644 --- a/dlls/shell32/resources/sleep.svg +++ b/dlls/shell32/resources/sleep.svg @@ -1133,72 +1133,62 @@ preserveAspectRatio="none" xlink:href="data:image/png;base64,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 +gqRg3L24yOXLV5ifn+eDDz743wOgo1jkCwW3sbnJ0SNHyeVyVKoVarUajUZ96H92lFJkwyxhmMX3 +fZaXr1EoFKjXG2xVt25Jj1sGcO7cr9g1u4u3z5+nVCqxa2aGgwfnmT+wwMTEBABRFKGNxlc+vu8T +RRFr62ssX7/G0tIS1WqV82+fp1gssnJt5Zb0uK0k9kd8HvjMA25sfJS5uf3s2j2DEII4jgkzWSZy +O8hkQypbZUpbZbSN8VWA1k2ufniNjY0NVq+vitdf/8Ut63BbANo0OTPJ0YXDTM3sdL7yMa3+NZvN +Ir3kPqdeT0qw53k0mk3W19bFO2+/QxzHt7X2fwuAfspms9x1126CYATnOZx2VCoVVldXb1vhO3SH +7tD/MfpP5j2HCh7EY8QAAAAUdEVYdEF1dGhvcgBKYWt1YiBTdGVpbmVy5vv3LwAAAFh0RVh0Q29w +eXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRpb24gaHR0cDovL2NyZWF0aXZlY29tbW9u +cy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTgt +MDgtMjNUMjI6Mjg6MjctMDY6MDCJVk2eAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE4LTA4LTIzVDIy +OjI4OjI3LTA2OjAw+Av1IgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAi +dEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFsbC5jei/1acjEAAAAEXRFWHRUaXRsZQBT +Y3JlZW5zYWNlcrPCbswAAAAASUVORK5CYII= " id="icon:48-8" x="328" @@ -1209,72 +1199,62 @@ dFRpdGxlAFNjcmVlbnNhY2Vys8JuzAAAAABJRU5ErkJggg== preserveAspectRatio="none" xlink:href="data:image/png;base64,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 +gqRg3L24yOXLV5ifn+eDDz743wOgo1jkCwW3sbnJ0SNHyeVyVKoVarUajUZ96H92lFJkwyxhmMX3 +fZaXr1EoFKjXG2xVt25Jj1sGcO7cr9g1u4u3z5+nVCqxa2aGgwfnmT+wwMTEBABRFKGNxlc+vu8T +RRFr62ssX7/G0tIS1WqV82+fp1gssnJt5Zb0uK0k9kd8HvjMA25sfJS5uf3s2j2DEII4jgkzWSZy +O8hkQypbZUpbZbSN8VWA1k2ufniNjY0NVq+vitdf/8Ut63BbANo0OTPJ0YXDTM3sdL7yMa3+NZvN +Ir3kPqdeT0qw53k0mk3W19bFO2+/QxzHt7X2fwuAfspms9x1126CYATnOZx2VCoVVldXb1vhO3SH +7tD/MfpP5j2HCh7EY8QAAAAUdEVYdEF1dGhvcgBKYWt1YiBTdGVpbmVy5vv3LwAAAFh0RVh0Q29w +eXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRpb24gaHR0cDovL2NyZWF0aXZlY29tbW9u +cy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTgt +MDgtMjNUMjI6Mjg6MzItMDY6MDAXxGKnAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE4LTA4LTIzVDIy +OjI4OjMyLTA2OjAwZpnaGwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAi +dEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFsbC5jei/1acjEAAAAEXRFWHRUaXRsZQBT +Y3JlZW5zYWNlcrPCbswAAAAASUVORK5CYII= " id="icon:48-4" x="384" -- 2.18.0

1 6

[PATCH 1/4] ntdll: Also accept \\? as a UNC or device path in RtlDetermineDosPathNameType_U().
by Zebediah Figura 24 Aug '18

24 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/path.c | 8 ++++---- dlls/ntdll/tests/path.c | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ccc95e3..8fe61da 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -244,10 +244,10 @@ DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U( PCWSTR path ) if (IS_SEPARATOR(path[0])) { if (!IS_SEPARATOR(path[1])) return ABSOLUTE_PATH; /* "/foo" */ - if (path[2] != '.') return UNC_PATH; /* "//foo" */ - if (IS_SEPARATOR(path[3])) return DEVICE_PATH; /* "//./foo" */ - if (path[3]) return UNC_PATH; /* "//.foo" */ - return UNC_DOT_PATH; /* "//." */ + if (path[2] != '.' && path[2] != '?') return UNC_PATH; /* "//foo" */ + if (IS_SEPARATOR(path[3])) return DEVICE_PATH; /* "//./foo" or "//?/foo" */ + if (path[3]) return UNC_PATH; /* "//.foo" or "//?foo" */ + return UNC_DOT_PATH; /* "//." or "//?" */ } else { diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 9369e1c..94b76c1 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -68,6 +68,13 @@ static void test_RtlDetermineDosPathNameType_U(void) { "//.foo", 1 }, { "\\\\.", 7 }, { "//.", 7 }, + { "\\\\?\\foo", 6 }, + { "//?/foo", 6 }, + { "/\\?/foo", 6 }, + { "\\\\?foo", 1 }, + { "//?foo", 1 }, + { "\\\\?", 7 }, + { "//?", 7 }, { NULL, 0 } }; -- 2.7.4

1 3

[PATCH] user32: When registering redirected class use correct base class name
by Fabian Maurer 23 Aug '18

23 Aug '18

Some applications are dependent on the correct spelling of "ComboBox", it can't be the "Combobox" from the comctl32 manifest. We have to take it from the base class instead of the versioned class name. Supersedes 150043 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/combo.c | 15 +++++++++++++ dlls/user32/class.c | 41 ++++++++++++++++------------------ dlls/user32/user_private.h | 3 +-- dlls/user32/win.c | 2 +- include/wine/server_protocol.h | 9 ++++---- server/class.c | 14 +++++++----- server/protocol.def | 6 +++-- server/request.h | 3 ++- server/trace.c | 6 +++-- 9 files changed, 59 insertions(+), 40 deletions(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 923d826b30..065ce1a620 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1254,6 +1254,20 @@ static void test_combo_dropdown_size(DWORD style) } } +static void test_combo(void) +{ + HWND handle_combo; + char classname[10]; + + handle_combo = create_combobox(CBS_DROPDOWNLIST); + + GetClassNameA(handle_combo, classname, sizeof(classname)); + + ok(strcmp(classname, "ComboBox") == 0, "Got wrong classname: %s\n", classname); + + DestroyWindow(handle_combo); +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1281,6 +1295,7 @@ START_TEST(combo) } /* ComboBox control tests. */ + test_combo(); test_combo_WS_VSCROLL(); test_combo_setfont(CBS_DROPDOWN); test_combo_setfont(CBS_DROPDOWNLIST); diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 07d36f05d7..3d4105d91b 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -61,7 +61,7 @@ typedef struct tagCLASS HBRUSH hbrBackground; /* Default background */ ATOM atomName; /* Name of the class */ WCHAR name[MAX_ATOM_LEN + 1]; - WCHAR *basename; /* Base name for redirected classes, pointer within 'name'. */ + WCHAR basename[MAX_ATOM_LEN + 1]; /* Base name for redirected classes */ } CLASS; static struct list class_list = LIST_INIT( class_list ); @@ -320,7 +320,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, BOOL register_class ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name, BOOL register_class ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -336,9 +336,6 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B UNICODE_STRING name_us; HMODULE hmod; - if (basename_offset) - *basename_offset = 0; - if (IS_INTRESOURCE( name )) return name; @@ -352,8 +349,6 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B return name; wndclass = (struct wndclass_redirect_data *)data.lpData; - if (basename_offset) - *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset); if (!(hmod = GetModuleHandleW( module ))) @@ -409,7 +404,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; - name = CLASS_GetVersionedName( name, NULL, TRUE ); + name = CLASS_GetVersionedName( name, TRUE ); for (;;) { @@ -450,11 +445,12 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) * * The real RegisterClass() functionality. */ -static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE hInstance, BOOL local, +static CLASS *CLASS_RegisterClass( LPCWSTR name, LPCWSTR basename, HINSTANCE hInstance, BOOL local, DWORD style, INT classExtra, INT winExtra ) { CLASS *classPtr; BOOL ret; + int name_len = 0, basename_len = 0; TRACE("name=%s hinst=%p style=0x%x clExtr=0x%x winExtr=0x%x\n", debugstr_w(name), hInstance, style, classExtra, winExtra ); @@ -470,11 +466,12 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE if (!classPtr) return NULL; classPtr->atomName = get_int_atom_value( name ); - classPtr->basename = classPtr->name; if (!classPtr->atomName && name) { strcpyW( classPtr->name, name ); - classPtr->basename += basename_offset; + name_len = strlenW(name) * sizeof(WCHAR); + strcpyW( classPtr->basename, basename ); + basename_len = strlenW(basename) * sizeof(WCHAR); } else GlobalGetAtomNameW( classPtr->atomName, classPtr->name, ARRAY_SIZE( classPtr->name )); @@ -487,8 +484,10 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE req->win_extra = winExtra; req->client_ptr = wine_server_client_ptr( classPtr ); req->atom = classPtr->atomName; - req->name_offset = basename_offset; - if (!req->atom && name) wine_server_add_data( req, name, strlenW(name) * sizeof(WCHAR) ); + req->name_len = name_len; + req->basename_len = basename_len; + if (name_len) wine_server_add_data( req, name, name_len); + if (basename_len) wine_server_add_data( req, basename, basename_len); ret = !wine_server_call_err( req ); classPtr->atomName = reply->atom; } @@ -524,7 +523,7 @@ static void register_builtin( const struct builtin_class_descr *descr ) { CLASS *classPtr; - if (!(classPtr = CLASS_RegisterClass( descr->name, 0, user32_module, FALSE, + if (!(classPtr = CLASS_RegisterClass( descr->name, descr->name, user32_module, FALSE, descr->style, 0, descr->extra ))) return; if (descr->cursor) classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); @@ -680,15 +679,14 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) if (!IS_INTRESOURCE(wc->lpszClassName)) { - UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); - classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), + classname = CLASS_GetVersionedName( name, FALSE ); + classPtr = CLASS_RegisterClass( classname, name, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } else { - classPtr = CLASS_RegisterClass( (LPCWSTR)wc->lpszClassName, 0, instance, + classPtr = CLASS_RegisterClass( (LPCWSTR)wc->lpszClassName, (LPCWSTR)wc->lpszClassName, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -721,7 +719,6 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { const WCHAR *classname; - UINT basename_offset; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -736,8 +733,8 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); - if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), + classname = CLASS_GetVersionedName( wc->lpszClassName, FALSE ); + if (!(classPtr = CLASS_RegisterClass( classname, wc->lpszClassName, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; @@ -789,7 +786,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - className = CLASS_GetVersionedName( className, NULL, FALSE ); + className = CLASS_GetVersionedName( className, FALSE ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 73a2badc7d..8051f15d30 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -272,8 +272,7 @@ extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM w extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; -extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset, - BOOL register_class) DECLSPEC_HIDDEN; +extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, BOOL register_class) DECLSPEC_HIDDEN; /* message spy definitions */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index cbfd8bb14a..48cf947b36 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1323,7 +1323,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className, NULL, TRUE); + className = CLASS_GetVersionedName(className, TRUE); TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c636bacb35..4f29006036 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4496,9 +4496,10 @@ struct create_class_request int extra; int win_extra; client_ptr_t client_ptr; - data_size_t name_offset; - /* VARARG(name,unicode_str); */ - char __pad_52[4]; + data_size_t name_len; + data_size_t basename_len; + /* VARARG(name,unicode_str,name_len); */ + /* VARARG(name,unicode_str,basename_len); */ }; struct create_class_reply { @@ -6533,6 +6534,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 556 +#define SERVER_PROTOCOL_VERSION 557 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/class.c b/server/class.c index 6a7de7843e..da6191d6aa 100644 --- a/server/class.c +++ b/server/class.c @@ -151,19 +151,21 @@ client_ptr_t get_class_client_ptr( struct window_class *class ) DECL_HANDLER(create_class) { struct window_class *class; - struct unicode_str name = get_req_unicode_str(); + struct unicode_str name, basename; atom_t atom, base_atom; + name.len = req->name_len; + name.str = get_req_data(); + basename.len = req->basename_len; + basename.str = (WCHAR *)((char *)get_req_data() + req->name_len); + if (name.len) { atom = add_global_atom( NULL, &name ); if (!atom) return; - if (req->name_offset && req->name_offset < name.len / sizeof(WCHAR)) + if (basename.len) { - name.str += req->name_offset; - name.len -= req->name_offset * sizeof(WCHAR); - - base_atom = add_global_atom( NULL, &name ); + base_atom = add_global_atom( NULL, &basename ); if (!base_atom) { release_global_atom( NULL, atom ); diff --git a/server/protocol.def b/server/protocol.def index c8bb3b1100..c55f888a6d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3159,8 +3159,10 @@ enum caret_state int extra; /* number of extra class bytes */ int win_extra; /* number of window extra bytes */ client_ptr_t client_ptr; /* pointer to class in client address space */ - data_size_t name_offset; /* base class name offset for specified atom */ - VARARG(name,unicode_str); /* class name */ + data_size_t name_len; /* class name length */ + data_size_t basename_len; /* base class name length */ + VARARG(name,unicode_str,name_len); /* class name */ + VARARG(name,unicode_str,basename_len); /* base class name */ @REPLY atom_t atom; /* resulting class atom */ @END diff --git a/server/request.h b/server/request.h index d3028f0b1d..56562be81c 100644 --- a/server/request.h +++ b/server/request.h @@ -2044,7 +2044,8 @@ C_ASSERT( FIELD_OFFSET(struct create_class_request, instance) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_class_request, extra) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_class_request, win_extra) == 36 ); C_ASSERT( FIELD_OFFSET(struct create_class_request, client_ptr) == 40 ); -C_ASSERT( FIELD_OFFSET(struct create_class_request, name_offset) == 48 ); +C_ASSERT( FIELD_OFFSET(struct create_class_request, name_len) == 48 ); +C_ASSERT( FIELD_OFFSET(struct create_class_request, basename_len) == 52 ); C_ASSERT( sizeof(struct create_class_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct create_class_reply, atom) == 8 ); C_ASSERT( sizeof(struct create_class_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index 68e47d49b8..966022aaac 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3770,8 +3770,10 @@ static void dump_create_class_request( const struct create_class_request *req ) fprintf( stderr, ", extra=%d", req->extra ); fprintf( stderr, ", win_extra=%d", req->win_extra ); dump_uint64( ", client_ptr=", &req->client_ptr ); - fprintf( stderr, ", name_offset=%u", req->name_offset ); - dump_varargs_unicode_str( ", name=", cur_size ); + fprintf( stderr, ", name_len=%u", req->name_len ); + fprintf( stderr, ", basename_len=%u", req->basename_len ); + dump_varargs_unicode_str( ", name=", min(cur_size,req->name_len) ); + dump_varargs_unicode_str( ", name=", min(cur_size,req->basename_len) ); } static void dump_create_class_reply( const struct create_class_reply *req ) -- 2.18.0

2 7

[PATCH v2] user32: When registering redirected class use correct base class name
by Fabian Maurer 23 Aug '18

23 Aug '18

Based on a patch by Nikolay Sivov Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/combo.c | 15 +++++++++++++++ dlls/user32/class.c | 14 ++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 923d826b30..065ce1a620 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1254,6 +1254,20 @@ static void test_combo_dropdown_size(DWORD style) } } +static void test_combo(void) +{ + HWND handle_combo; + char classname[10]; + + handle_combo = create_combobox(CBS_DROPDOWNLIST); + + GetClassNameA(handle_combo, classname, sizeof(classname)); + + ok(strcmp(classname, "ComboBox") == 0, "Got wrong classname: %s\n", classname); + + DestroyWindow(handle_combo); +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1281,6 +1295,7 @@ START_TEST(combo) } /* ComboBox control tests. */ + test_combo(); test_combo_WS_VSCROLL(); test_combo_setfont(CBS_DROPDOWN); test_combo_setfont(CBS_DROPDOWNLIST); diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 07d36f05d7..b8309025ca 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -664,6 +664,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { const WCHAR *classname = NULL; WCHAR name[MAX_ATOM_LEN + 1]; + WCHAR classname_versioned[MAX_ATOM_LEN + 1]; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -683,6 +684,12 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); + if (basename_offset) /* Make sure redirected classes have the same name as their base class */ + { + strcpyW(classname_versioned, classname); + strcpyW(&classname_versioned[basename_offset], name); + classname = classname_versioned; + } classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -721,6 +728,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { const WCHAR *classname; + WCHAR classname_versioned[MAX_ATOM_LEN + 1]; UINT basename_offset; ATOM atom; CLASS *classPtr; @@ -737,6 +745,12 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); + if (basename_offset) /* Make sure redirected classes have the same name as their base class */ + { + strcpyW(classname_versioned, classname); + strcpyW(&classname_versioned[basename_offset], wc->lpszClassName); + classname = classname_versioned; + } if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; -- 2.18.0

1 0

[PATCH] dmusic: Make midi_port_create() static.
by Michael Stefaniuc 23 Aug '18

23 Aug '18

From: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 1fa94694a9..91913a716f 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -1174,8 +1174,8 @@ static const IDirectMusicThruVtbl midi_thru_vtbl = { midi_IDirectMusicThru_ThruChannel, }; -HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, DMUS_PORTCAPS *caps, - IDirectMusicPort **port) +static HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, + DMUS_PORTCAPS *caps, IDirectMusicPort **port) { struct midi_port *obj; HRESULT hr; -- 2.14.4

1 0

[PATCH] testbot: Let LogUtils detect and return the list of errors.
by Francois Gouget 23 Aug '18

23 Aug '18

LogUtils now exports GetLogErrors() which analyzes the specified log and associated extra errors file and returns per-module lists of errors. For test reports modules correspond to dlls or programs and for other types of log there is a single module called "". Errors from the extra errors file go to an extra module. JobDetails now uses that to offload most of the work of identifying errors. It now can also show errors from more than one report / log when in summary mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 140 +++++++++++++++- testbot/web/JobDetails.pl | 237 +++++++++++++--------------- 2 files changed, 247 insertions(+), 130 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 6f7cef5e8..a5a1a68b5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -27,7 +27,7 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; -our @EXPORT = qw(GetLogFileNames GetLogLabel +our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogErrors GetLogLineCategory GetReportLineCategory RenameReferenceLogs RenameTaskLogs ParseTaskLog ParseWineTestReport); @@ -547,13 +547,17 @@ sub GetLogFileNames($;$) my @Candidates = ("exe32.report", "exe64.report", "win32.report", "wow32.report", "wow64.report", - "log", "log.err"); - push @Candidates, "old_log", "old_log.err" if ($IncludeOld); + "log"); + push @Candidates, "old_log" if ($IncludeOld); my @Logs; foreach my $FileName (@Candidates) { - push @Logs, $FileName if (-f "$Dir/$FileName" and !-z "$Dir/$FileName"); + if ((-f "$Dir/$FileName" and !-z "$Dir/$FileName") or + (-f "$Dir/$FileName.err" and !-z "$Dir/$FileName.err")) + { + push @Logs, $FileName; + } } return \@Logs; } @@ -565,9 +569,7 @@ my %_LogFileLabels = ( "wow32.report" => "32 bit WoW Wine report", "wow64.report" => "64 bit Wow Wine report", "log" => "task log", - "log.err" => "task errors", "old_log" => "old logs", - "old_log.err" => "old task errors", ); =pod @@ -586,4 +588,130 @@ sub GetLogLabel($) return $_LogFileLabels{$LogFileName}; } + +sub _DumpErrors($$$) +{ + my ($Label, $Groups, $Errors) = @_; + + print STDERR "$Label:\n"; + print STDERR " Groups=", scalar(@$Groups), " [", join(",", @$Groups), "]\n"; + my @ErrorKeys = sort keys %$Errors; + print STDERR " Errors=", scalar(@ErrorKeys), " [", join(",", @ErrorKeys), "]\n"; + foreach my $GroupName (@$Groups) + { + print STDERR " [$GroupName]\n"; + print STDERR " [$_]\n" for (@{$Errors->{$GroupName}}); + } +} + +sub _AddErrorGroup($$$) +{ + my ($Groups, $Errors, $GroupName) = @_; + + # In theory the error group names are all unique. But, just in case, make + # sure we don't overwrite $Errors->{$GroupName}. + if (!$Errors->{$GroupName}) + { + push @$Groups, $GroupName; + $Errors->{$GroupName} = []; + } + return $Errors->{$GroupName}; +} + +=pod +=over 12 + +=item C<GetLogErrors()> + +Analyzes the specified log and associated error file to filter out unimportant +messages and only return the errors, split by module (for Wine reports that's +per dll / program being tested). + +Returns a list of modules containing errors, and a hashtable containing the list of errors for each module. + +=back +=cut + +sub GetLogErrors($) +{ + my ($LogFileName) = @_; + + my ($IsReport, $GetCategory); + if ($LogFileName =~ /\.report$/) + { + $IsReport = 1; + $GetCategory = \&GetReportLineCategory; + } + else + { + $GetCategory = \&GetLogLineCategory; + } + + my $NoLog = 1; + my $Groups = []; + my $Errors = {}; + if (open(my $LogFile, "<", $LogFileName)) + { + $NoLog = 0; + my $CurrentModule = ""; + my $CurrentGroup; + foreach my $Line (<$LogFile>) + { + $Line =~ s/\s*$//; + if ($IsReport and $Line =~ /^([_.a-z0-9-]+):[_a-z0-9]* start /) + { + $CurrentModule = $1; + $CurrentGroup = undef; + next; + } + + next if ($GetCategory->($Line) !~ /error/); + + if ($Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) + { + my $Unit = $1; + $Line = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; + } + if (!$CurrentGroup) + { + $CurrentGroup = _AddErrorGroup($Groups, $Errors, $CurrentModule); + } + push @$CurrentGroup, $Line; + } + close($LogFile); + } + elsif (-f $LogFileName) + { + $NoLog = 0; + my $Group = _AddErrorGroup($Groups, $Errors, "TestBot errors"); + push @$Group, "Could not open '". basename($LogFileName) ."' for reading: $!"; + } + + if (open(my $LogFile, "<", "$LogFileName.err")) + { + $NoLog = 0; + # Add the related extra errors + my $CurrentGroup; + foreach my $Line (<$LogFile>) + { + $Line =~ s/\s*$//; + if (!$CurrentGroup) + { + my $GroupName = $IsReport ? "Report errors" : "Task errors"; + $CurrentGroup = _AddErrorGroup($Groups, $Errors, $GroupName); + } + push @$CurrentGroup, $Line; + } + close($LogFile); + } + elsif (-f "$LogFileName.err") + { + $NoLog = 0; + my $Group = _AddErrorGroup($Groups, $Errors, "TestBot errors"); + push @$Group, "Could not open '". basename($LogFileName) .".err' for reading: $!"; + } + + return $NoLog ? (undef, undef) : ($Groups, $Errors); +} + 1; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index e1fe20f18..37185eb1f 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -2,6 +2,7 @@ # Job details page # # Copyright 2009 Ge van Geldorp +# Copyright 2012-2014,2017-2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -229,45 +230,6 @@ sub GeneratePage($) $self->SUPER::GeneratePage(); } -=pod -=over 12 - -=item C<GetHtmlLine()> - -Determines if the log line should be shown, how, and escapes it so it is valid -HTML. - -When not showing the full log, returns undef except for error messages which -are the only lines tha should be shown. -When showing the full log error messages and other lines of interest are -highlighted to make the log more readable. - -=back -=cut - -sub GetHtmlLine($$$$) -{ - my ($self, $LogName, $FullLog, $Line) = @_; - - my $Category = $LogName =~ /\.report$/ ? - GetReportLineCategory($Line) : - GetLogLineCategory($Line); - return undef if ($Category !~ /error/ and !$FullLog); - - my $Html = $self->escapeHTML($Line); - if (!$FullLog and $Html =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) - { - my $Unit = $1; - return $Unit ne "" ? "$Unit: Timeout" : "Timeout"; - } - if ($FullLog and $Category ne "none") - { - # Highlight all line categories in the full log - $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; - } - return $Html; -} - sub InitMoreInfo($) { my ($self) = @_; @@ -283,12 +245,6 @@ sub InitMoreInfo($) my $TaskDir = $StepTask->GetTaskDir(); foreach my $Log (@{GetLogFileNames($TaskDir, 1)}) { - if ($Log =~ s/^err/log/) - { - # We don't want separate entries for log* and err* but we also want a - # log* entry even if only err* exists. - next if (($More->{$Key}->{Logs}->[-1] || "") eq $Log); - } push @{$More->{$Key}->{Logs}}, $Log; $More->{$Key}->{Full} = $Log if (uri_escape($Log) eq $Value); } @@ -348,6 +304,47 @@ sub GenerateMoreInfoLink($$$;$) print "<div class='TaskMoreInfoLink'>$Html</div>\n"; } +sub GetErrorCategory($) +{ + return "error"; +} + +sub GenerateFullLog($$;$) +{ + my ($self, $FileName, $Header) = @_; + + my $GetCategory = $FileName =~ /\.err$/ ? \&GetErrorCategory : + $FileName =~ /\.report$/ ? \&GetReportLineCategory : + \&GetLogLineCategory; + + my $IsEmpty = 1; + if (open(my $LogFile, "<", $FileName)) + { + foreach my $Line (<$LogFile>) + { + $Line =~ s/\s*$//; + if ($IsEmpty) + { + print $Header if (defined $Header); + print "<pre><code>"; + $IsEmpty = 0; + } + + my $Category = $GetCategory->($Line); + my $Html = $self->escapeHTML($Line); + if ($Category ne "none") + { + $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; + } + print "$Html\n"; + } + close($LogFile); + } + print "</code></pre>\n" if (!$IsEmpty); + + return $IsEmpty; +} + sub GenerateBody($) { my ($self) = @_; @@ -386,109 +383,101 @@ sub GenerateBody($) $self->GenerateMoreInfoLink($Key, "final screenshot", "Screenshot"); } - foreach my $Log (@{$MoreInfo->{Logs}}) + my $ReportCount; + foreach my $LogName (@{$MoreInfo->{Logs}}) { - $self->GenerateMoreInfoLink($Key, GetLogLabel($Log), "Full", $Log); + $self->GenerateMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName); + $ReportCount++ if ($LogName !~ /^old_/ and $LogName =~ /\.report$/); } print "</div>\n"; - my $LogName = $MoreInfo->{Full} || $MoreInfo->{Logs}->[0] || "log"; - my $ErrName = "$LogName.err"; - - my ($EmptyDiag, $LogFirst) = (undef, 1); - if (open(my $LogFile, "<", "$TaskDir/$LogName")) + if ($MoreInfo->{Full}) { - my $HasLogEntries; - my ($CurrentDll, $PrintedDll) = ("", ""); - foreach my $Line (<$LogFile>) - { - $HasLogEntries = 1; - chomp $Line; - $CurrentDll = $1 if ($Line =~ m/^([_.a-z0-9-]+):[_a-z0-9]* start /); - my $Html = $self->GetHtmlLine($LogName, $MoreInfo->{Full}, $Line); - next if (!defined $Html); + # + # Show this log in full, highlighting the important lines + # - if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) + my $LogIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}"); + my $EmptyDiag; + if ($LogIsEmpty) + { + if ($StepTask->Status eq "canceled") { - print "</code></pre>" if (!$LogFirst); - print "<div class='LogDllName'>$CurrentDll:</div><pre><code>"; - $PrintedDll = $CurrentDll; - $LogFirst = 0; + $EmptyDiag = "No log, task was canceled\n"; } - elsif ($LogFirst) + elsif ($StepTask->Status eq "skipped") { - print "<pre><code>"; - $LogFirst = 0; + $EmptyDiag = "No log, task skipped\n"; } - print "$Html\n"; - } - close($LogFile); - - if (!$LogFirst) - { - print "</code></pre>\n"; - } - elsif ($HasLogEntries) - { - # Here we know we did not show the full log since it was not empty, - # and yet we did not show anything to the user. But don't claim there - # is no failure if the error log is not empty. - if (-z "$TaskDir/$ErrName") + else { - print "No ". ($StepTask->Type eq "single" || - $StepTask->Type eq "suite" ? "test" : "build") . - " failures found"; - $LogFirst = 0; + print "Empty log\n"; + $LogIsEmpty = 0; } } - elsif ($StepTask->Status eq "canceled") - { - $EmptyDiag = "<p>No log, task was canceled</p>\n"; - } - elsif ($StepTask->Status eq "skipped") - { - $EmptyDiag = "<p>No log, task skipped</p>\n"; - } - else - { - print "Empty log"; - $LogFirst = 0; - } + + # And append the associated extra errors + my $ErrHeader = $MoreInfo->{Full} =~ /\.report/ ? "report" : "task"; + $ErrHeader = "old $ErrHeader" if ($MoreInfo->{Full} =~ /^old_/); + $ErrHeader = "<div class='HrTitle'>". ucfirst($ErrHeader) ." errors<div class='HrLine'></div></div>"; + my $ErrIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}.err", $ErrHeader); + print $EmptyDiag if ($ErrIsEmpty and defined $EmptyDiag); } else { - print "No log". ($StepTask->Status =~ /^(?:queued|running)$/ ? " yet" : ""); - $LogFirst = 0; - } + # + # Show a summary of the errors from all the reports and logs + # - if (open(my $ErrFile, "<", "$TaskDir/$ErrName")) - { - my $ErrFirst = 1; - foreach my $Line (<$ErrFile>) + # Figure out which logs / reports actually have errors + my $LogSummaries; + foreach my $LogName (@{$MoreInfo->{Logs}}) + { + next if ($LogName =~ /^old_/); + my ($Groups, $Errors) = GetLogErrors("$TaskDir/$LogName"); + next if (!$Groups or !@$Groups); + $LogSummaries->{$LogName}->{Groups} = $Groups; + $LogSummaries->{$LogName}->{Errors} = $Errors; + } + my $ShowLogName = ($ReportCount > 1 or scalar(keys %$LogSummaries) > 1); + + my $LogIsEmpty = 1; + foreach my $LogName (@{$MoreInfo->{Logs}}) { - chomp $Line; - if ($ErrFirst) + next if (!$LogSummaries->{$LogName}); + $LogIsEmpty = 0; + + if ($ShowLogName) + { + # Show the log / report name to avoid ambiguity + my $Label = ucfirst(GetLogLabel($LogName)); + print "<div class='HrTitle'>$Label<div class='HrLine'></div></div>\n"; + } + + my $Summary = $LogSummaries->{$LogName}; + foreach my $GroupName (@{$Summary->{Groups}}) { - if (!$LogFirst) - { - print "<div class='HrTitle'>". - ($ErrName =~ /^old_/ ? "Old errors" : "Extra errors") . - "<div class='HrLine'></div></div>\n"; - } + print "<div class='LogDllName'>$GroupName:</div>\n" if ($GroupName); print "<pre><code>"; - $ErrFirst = 0; + print $self->escapeHTML($_), "\n" for (@{$Summary->{Errors}->{$GroupName}}); + print "</code></pre>\n"; } - print $self->GetHtmlLine($ErrName, 1, $Line), "\n"; } - close($ErrFile); - if (!$ErrFirst) + if ($LogIsEmpty) { - print "</code></pre>\n"; - } - elsif (defined $EmptyDiag) - { - print $EmptyDiag; + if ($StepTask->Status eq "canceled") + { + print "No log, task was canceled\n"; + } + elsif ($StepTask->Status eq "skipped") + { + print "No log, task skipped\n"; + } + else + { + print "No errors\n"; + } } } } -- 2.18.0

1 0

[PATCH] testbot/WineRunBuild: Use the new Build.pl parameters and paths.
by Francois Gouget 23 Aug '18

23 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index cca96b92a..117b06551 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -339,14 +339,14 @@ if ($Step->FileType ne "patch") # Figure out what to build # -my (%Bitnesses, %TestExes); +my (%Builds, %TestExes); foreach my $TestStep (@{$Job->Steps->GetItems()}) { if (($TestStep->PreviousNo || 0) == $Step->No and - $TestStep->FileType =~ /^exe([0-9]+)$/) + $TestStep->FileType =~ /^exe/) { - $Bitnesses{$1} = 1; - $TestExes{$TestStep->FileName} = 1; + $Builds{$TestStep->FileType} = 1; + $TestExes{$TestStep->FileName} = $TestStep->FileType; } } @@ -364,7 +364,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n". "( set -x\n". - " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Bitnesses) ."\n". + " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Builds) ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) @@ -455,9 +455,10 @@ foreach my $TestInfo (values %{$Impacts->{Tests}}) my $Local = "$TestInfo->{ExeBase}$Bits.exe"; next if (!$TestExes{$Local}); - my $Remote = "build-mingw". ($Bits || "32") ."/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; Debug(Elapsed($Start), " Retrieving '$Local'\n"); - if ($TA->GetFile($Remote, "$StepDir/$Local")) + my $BuildDir = "wine-$TestExes{$Local}"; + if ($TA->GetFile("$BuildDir/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe", + "$StepDir/$Local")) { chmod 0664, "$StepDir/$Local"; } -- 2.18.0

1 0

[PATCH] winemac: Use fallback implementation for screen dimensions in GetDeviceCaps().
by Ken Thomases 23 Aug '18

23 Aug '18

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/gdi.c | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 79dc348..40478fd 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -42,10 +42,6 @@ static inline MACDRV_PDEVICE *get_macdrv_dev(PHYSDEV dev) static CGRect desktop_rect; /* virtual desktop rectangle */ static int horz_size; /* horz. size of screen in millimeters */ static int vert_size; /* vert. size of screen in millimeters */ -static int horz_res; /* width in pixels of screen */ -static int vert_res; /* height in pixels of screen */ -static int desktop_horz_res; /* width in pixels of virtual desktop */ -static int desktop_vert_res; /* height in pixels of virtual desktop */ static int bits_per_pixel; /* pixel depth of screen */ static int device_data_valid; /* do the above variables have up-to-date values? */ @@ -133,9 +129,6 @@ static void device_init(void) { CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding(mode); - horz_res = CGDisplayModeGetWidth(mode); - vert_res = CGDisplayModeGetHeight(mode); - if (pixelEncoding) { if (CFEqual(pixelEncoding, CFSTR(IO32BitDirectPixels))) @@ -149,21 +142,8 @@ static void device_init(void) CGDisplayModeRelease(mode); } - else - { - horz_res = CGDisplayPixelsWide(mainDisplay); - vert_res = CGDisplayPixelsHigh(mainDisplay); - } - - if (retina_on) - { - horz_res *= 2; - vert_res *= 2; - } compute_desktop_rect(); - desktop_horz_res = desktop_rect.size.width; - desktop_vert_res = desktop_rect.size.height; device_data_valid = TRUE; } @@ -260,25 +240,18 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) case VERTSIZE: ret = vert_size; break; - case HORZRES: - ret = horz_res; - break; - case VERTRES: - ret = vert_res; - break; - case DESKTOPHORZRES: - ret = desktop_horz_res; - break; - case DESKTOPVERTRES: - ret = desktop_vert_res; - break; case BITSPIXEL: ret = bits_per_pixel; break; + case HORZRES: + case VERTRES: default: LeaveCriticalSection(&device_data_section); dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps ); - return dev->funcs->pGetDeviceCaps( dev, cap ); + ret = dev->funcs->pGetDeviceCaps( dev, cap ); + if ((cap == HORZRES || cap == VERTRES) && retina_on) + ret *= 2; + return ret; } TRACE("cap %d -> %d\n", cap, ret); -- 2.10.2

1 0

[PATCH v2 1/2] comctl32/edit: Move common calls outside the blocks
by Gabriel Ivăncescu 23 Aug '18

23 Aug '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Move more stuff outside the blocks and use ~0 This supersedes 150050. dlls/comctl32/edit.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 10ff5fb..3895dc5 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3308,22 +3308,17 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) else EDIT_WM_Clear(es); } else { - if (shift) { + EDIT_EM_SetSel(es, ~0, 0, FALSE); + if (shift) /* delete character left of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveBackward(es, TRUE); - EDIT_WM_Clear(es); - } else if (control) { + else if (control) /* delete to end of line */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveEnd(es, TRUE, FALSE); - EDIT_WM_Clear(es); - } else { + else /* delete character right of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveForward(es, TRUE); - EDIT_WM_Clear(es); - } + EDIT_WM_Clear(es); } } break; -- 1.9.1

2 4

[PATCH vkd3d 6/9] vkd3d: Do not store VkPipelineInputAssemblyStateCreateInfo in d3d12_command_list.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 17 ++++++++++------- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 39b0d1820bc0..3c254c046868 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1695,6 +1695,7 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct VkPipelineVertexInputStateCreateInfo input_desc; + struct VkPipelineInputAssemblyStateCreateInfo ia_desc; struct VkPipelineColorBlendStateCreateInfo blend_desc; struct VkGraphicsPipelineCreateInfo pipeline_desc; const struct d3d12_device *device = list->device; @@ -1776,6 +1777,12 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list input_desc.vertexAttributeDescriptionCount = state->attribute_count; input_desc.pVertexAttributeDescriptions = state->attributes; + ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; + ia_desc.pNext = NULL; + ia_desc.flags = 0; + ia_desc.topology = list->primitive_topology; + ia_desc.primitiveRestartEnable = VK_FALSE; + blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; blend_desc.flags = 0; @@ -1795,7 +1802,7 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list pipeline_desc.stageCount = state->stage_count; pipeline_desc.pStages = state->stages; pipeline_desc.pVertexInputState = &input_desc; - pipeline_desc.pInputAssemblyState = &list->ia_desc; + pipeline_desc.pInputAssemblyState = &ia_desc; pipeline_desc.pTessellationState = NULL; pipeline_desc.pViewportState = &vp_desc; pipeline_desc.pRasterizationState = &state->rs_desc; @@ -2806,7 +2813,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12Gr TRACE("iface %p, topology %#x.\n", iface, topology); - list->ia_desc.topology = vk_topology_from_d3d12_topology(topology); + list->primitive_topology = vk_topology_from_d3d12_topology(topology); d3d12_command_list_invalidate_current_pipeline(list); } @@ -4151,11 +4158,7 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->pipeline_state = initial_pipeline_state; memset(list->strides, 0, sizeof(list->strides)); - list->ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; - list->ia_desc.pNext = NULL; - list->ia_desc.flags = 0; - list->ia_desc.topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; - list->ia_desc.primitiveRestartEnable = VK_FALSE; + list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; memset(list->views, 0, sizeof(list->views)); list->fb_width = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9b5d5db0c57a..df444471cf5b 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -615,7 +615,7 @@ struct d3d12_command_list bool is_valid; uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; - struct VkPipelineInputAssemblyStateCreateInfo ia_desc; + VkPrimitiveTopology primitive_topology; VkImageView views[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; unsigned int fb_width; -- 2.16.4

2 1

[PATCH vkd3d 7/9] tests: Add test for creating graphics pipelines.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 110 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index cf51ab9bbcdd..eefef3becdb4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2268,7 +2268,7 @@ static void test_root_signature_limits(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -static void test_create_pipeline_state(void) +static void test_create_compute_pipeline_state(void) { D3D12_COMPUTE_PIPELINE_STATE_DESC pipeline_state_desc; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; @@ -2302,7 +2302,7 @@ static void test_create_pipeline_state(void) root_signature_desc.pStaticSamplers = NULL; root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; hr = create_root_signature(device, &root_signature_desc, &root_signature); - ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); @@ -2315,7 +2315,7 @@ static void test_create_pipeline_state(void) hr = ID3D12Device_CreateComputePipelineState(device, &pipeline_state_desc, &IID_ID3D12PipelineState, (void **)&pipeline_state); - ok(SUCCEEDED(hr), "Failed to create compute pipeline, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create compute pipeline, hr %#x.\n", hr); refcount = get_refcount(root_signature); ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); @@ -2323,7 +2323,7 @@ static void test_create_pipeline_state(void) refcount = get_refcount(device); ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); hr = ID3D12PipelineState_GetDevice(pipeline_state, &IID_ID3D12Device, (void **)&tmp_device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 4, "Got unexpected refcount %u.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(tmp_device); @@ -2343,6 +2343,110 @@ static void test_create_pipeline_state(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_create_graphics_pipeline_state(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12RootSignature *root_signature; + ID3D12PipelineState *pipeline_state; + ID3D12Device *device, *tmp_device; + D3D12_BLEND_DESC *blend; + ULONG refcount; + unsigned int i; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + root_signature_desc.NumParameters = 0; + root_signature_desc.pParameters = NULL; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + refcount = get_refcount(device); + ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + init_pipeline_state_desc(&pso_desc, root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + refcount = get_refcount(root_signature); + ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + refcount = get_refcount(device); + ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); + hr = ID3D12PipelineState_GetDevice(pipeline_state, &IID_ID3D12Device, (void **)&tmp_device); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); + refcount = get_refcount(device); + ok(refcount == 4, "Got unexpected refcount %u.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(tmp_device); + ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + check_interface(pipeline_state, &IID_ID3D12Object, TRUE); + check_interface(pipeline_state, &IID_ID3D12DeviceChild, TRUE); + check_interface(pipeline_state, &IID_ID3D12Pageable, TRUE); + check_interface(pipeline_state, &IID_ID3D12PipelineState, TRUE); + + refcount = ID3D12PipelineState_Release(pipeline_state); + ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount); + + blend = &pso_desc.BlendState; + blend->IndependentBlendEnable = FALSE; + blend->RenderTarget[0].BlendEnable = TRUE; + blend->RenderTarget[0].SrcBlend = D3D12_BLEND_SRC_COLOR; + blend->RenderTarget[0].DestBlend = D3D12_BLEND_DEST_COLOR; + blend->RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD; + blend->RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_SRC_ALPHA; + blend->RenderTarget[0].DestBlendAlpha = D3D12_BLEND_DEST_ALPHA; + blend->RenderTarget[0].BlendOpAlpha = D3D12_BLEND_OP_ADD; + blend->RenderTarget[0].RenderTargetWriteMask = D3D12_COLOR_WRITE_ENABLE_ALL; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); + + /* Only one of BlendEnable or LogicOpEnable can be set to true. */ + blend->IndependentBlendEnable = FALSE; + blend->RenderTarget[0].BlendEnable = TRUE; + blend->RenderTarget[0].LogicOpEnable = TRUE; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + pso_desc.RTVFormats[0] = DXGI_FORMAT_R32_UINT; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + blend->IndependentBlendEnable = FALSE; + blend->RenderTarget[0].BlendEnable = FALSE; + blend->RenderTarget[0].LogicOpEnable = TRUE; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); + + /* IndependentBlendEnable must be set to false when logic operations are enabled. */ + blend->IndependentBlendEnable = TRUE; + blend->RenderTarget[0].LogicOpEnable = TRUE; + for (i = 1; i < ARRAY_SIZE(blend->RenderTarget); ++i) + blend->RenderTarget[i] = blend->RenderTarget[0]; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + refcount = ID3D12RootSignature_Release(root_signature); + ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_fence(void) { ID3D12Device *device, *tmp_device; @@ -18238,7 +18342,8 @@ START_TEST(d3d12) run_test(test_create_unordered_access_view); run_test(test_create_root_signature); run_test(test_root_signature_limits); - run_test(test_create_pipeline_state); + run_test(test_create_compute_pipeline_state); + run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); -- 2.16.4

2 1

[PATCH vkd3d 5/9] vkd3d: Avoid passing vkd3d_vk_device_procs to helper functions.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 94 +++++++++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 42 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index aa77c6c79f21..39b0d1820bc0 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1165,9 +1165,10 @@ static void d3d12_command_list_invalidate_current_pipeline(struct d3d12_command_ list->current_pipeline = VK_NULL_HANDLE; } -static void d3d12_command_list_end_current_render_pass(struct d3d12_command_list *list, - const struct vkd3d_vk_device_procs *vk_procs) +static void d3d12_command_list_end_current_render_pass(struct d3d12_command_list *list) { + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + if (list->current_render_pass) VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); @@ -1176,8 +1177,7 @@ static void d3d12_command_list_end_current_render_pass(struct d3d12_command_list static void d3d12_command_list_invalidate_current_render_pass(struct d3d12_command_list *list) { - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); } static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *list, @@ -1433,8 +1433,7 @@ static void d3d12_command_list_track_resource_usage(struct d3d12_command_list *l { if (resource->flags & VKD3D_RESOURCE_INITIAL_STATE_TRANSITION) { - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); d3d12_command_list_transition_resource_to_initial_state(list, resource); resource->flags &= ~VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; @@ -1564,7 +1563,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandL vk_procs = &list->device->vk_procs; - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); if ((vr = VK_CALL(vkEndCommandBuffer(list->vk_command_buffer))) < 0) { @@ -1651,10 +1650,10 @@ static void d3d12_command_list_get_fb_extent(struct d3d12_command_list *list, } } -static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_list *list, - const struct vkd3d_vk_device_procs *vk_procs) +static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_list *list) { struct d3d12_device *device = list->device; + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct VkFramebufferCreateInfo fb_desc; VkFramebuffer vk_framebuffer; size_t start_idx = 0; @@ -1691,10 +1690,10 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l return true; } -static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list *list, - const struct vkd3d_vk_device_procs *vk_procs) +static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list *list) { struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct VkPipelineVertexInputStateCreateInfo input_desc; struct VkPipelineColorBlendStateCreateInfo blend_desc; struct VkGraphicsPipelineCreateInfo pipeline_desc; @@ -1833,7 +1832,7 @@ static VkDescriptorSet d3d12_command_list_allocate_descriptor_set(struct d3d12_c const VkDescriptorPoolSize *pool_sizes, unsigned int pool_size_count, VkDescriptorSetLayout vk_set_layout) { - const struct vkd3d_vk_device_procs *vk_procs; + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; VkDevice vk_device = list->device->vk_device; struct VkDescriptorSetAllocateInfo set_desc; struct VkDescriptorPoolCreateInfo pool_desc; @@ -1844,8 +1843,6 @@ static VkDescriptorSet d3d12_command_list_allocate_descriptor_set(struct d3d12_c if (!pool_size_count) return VK_NULL_HANDLE; - vk_procs = &list->device->vk_procs; - pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; pool_desc.pNext = NULL; pool_desc.flags = 0; @@ -2245,9 +2242,9 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis d3d12_command_list_update_uav_counter_descriptors(list, bind_point); } -static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list, - const struct vkd3d_vk_device_procs *vk_procs) +static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list) { + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct VkRenderPassBeginInfo begin_desc; VkRenderPass vk_render_pass; @@ -2257,9 +2254,9 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list return false; } - if (!d3d12_command_list_update_current_framebuffer(list, vk_procs)) + if (!d3d12_command_list_update_current_framebuffer(list)) return false; - if (!d3d12_command_list_update_current_pipeline(list, vk_procs)) + if (!d3d12_command_list_update_current_pipeline(list)) return false; d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_GRAPHICS); @@ -2300,7 +2297,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCom vk_procs = &list->device->vk_procs; - if (!d3d12_command_list_begin_render_pass(list, vk_procs)) + if (!d3d12_command_list_begin_render_pass(list)) { WARN("Failed to begin render pass, ignoring draw call.\n"); return; @@ -2324,7 +2321,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap vk_procs = &list->device->vk_procs; - if (!d3d12_command_list_begin_render_pass(list, vk_procs)) + if (!d3d12_command_list_begin_render_pass(list)) { WARN("Failed to begin render pass, ignoring draw call.\n"); return; @@ -2350,7 +2347,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_Dispatch(ID3D12GraphicsCommandL vk_procs = &list->device->vk_procs; - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_COMPUTE); @@ -2379,7 +2376,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyBufferRegion(ID3D12Graphics d3d12_command_list_track_resource_usage(list, dst_resource); d3d12_command_list_track_resource_usage(list, src_resource); - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); buffer_copy.srcOffset = src_offset; buffer_copy.dstOffset = dst_offset; @@ -2457,8 +2454,8 @@ static void vk_image_copy_from_d3d12(VkImageCopy *image_copy, static HRESULT d3d12_command_list_allocate_transfer_buffer(struct d3d12_command_list *list, VkDeviceSize size, struct vkd3d_buffer *buffer) { + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct d3d12_device *device = list->device; - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC buffer_desc; HRESULT hr; @@ -2601,7 +2598,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic d3d12_command_list_track_resource_usage(list, dst_resource); d3d12_command_list_track_resource_usage(list, src_resource); - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); if (src->Type == D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX && dst->Type == D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT) @@ -2716,7 +2713,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm d3d12_command_list_track_resource_usage(list, dst_resource); d3d12_command_list_track_resource_usage(list, src_resource); - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); if (d3d12_resource_is_buffer(dst_resource)) { @@ -2892,10 +2889,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics { struct d3d12_pipeline_state *state = unsafe_impl_from_ID3D12PipelineState(pipeline_state); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + const struct vkd3d_vk_device_procs *vk_procs; TRACE("iface %p, pipeline_state %p.\n", iface, pipeline_state); + vk_procs = &list->device->vk_procs; + d3d12_command_list_invalidate_bindings(list, state); if (d3d12_pipeline_state_is_compute(state)) @@ -2927,7 +2926,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC vk_procs = &list->device->vk_procs; - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); for (i = 0; i < barrier_count; ++i) { @@ -3587,11 +3586,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi } static void d3d12_command_list_clear(struct d3d12_command_list *list, - const struct vkd3d_vk_device_procs *vk_procs, const struct VkAttachmentDescription *attachment_desc, + const struct VkAttachmentDescription *attachment_desc, const struct VkAttachmentReference *color_reference, const struct VkAttachmentReference *ds_reference, struct vkd3d_view *view, size_t width, size_t height, unsigned int layer_count, const union VkClearValue *clear_value, unsigned int rect_count, const D3D12_RECT *rects) { + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct VkSubpassDescription sub_pass_desc; struct VkRenderPassCreateInfo pass_desc; struct VkRenderPassBeginInfo begin_desc; @@ -3602,7 +3602,7 @@ static void d3d12_command_list_clear(struct d3d12_command_list *list, unsigned int i; VkResult vr; - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); if (!rect_count) { @@ -3737,7 +3737,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra ds_reference.attachment = 0; ds_reference.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; - d3d12_command_list_clear(list, &list->device->vk_procs, &attachment_desc, NULL, &ds_reference, + d3d12_command_list_clear(list, &attachment_desc, NULL, &ds_reference, dsv_desc->view, dsv_desc->width, dsv_desc->height, 1, &clear_value, rect_count, rects); } @@ -3768,7 +3768,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra color_reference.attachment = 0; color_reference.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - d3d12_command_list_clear(list, &list->device->vk_procs, &attachment_desc, &color_reference, NULL, + d3d12_command_list_clear(list, &attachment_desc, &color_reference, NULL, rtv_desc->view, rtv_desc->width, rtv_desc->height, rtv_desc->layer_count, &clear_value, rect_count, rects); } @@ -3778,13 +3778,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID const UINT values[4], UINT rect_count, const D3D12_RECT *rects) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + const struct vkd3d_vk_device_procs *vk_procs; const struct d3d12_desc *cpu_descriptor; struct d3d12_resource *resource_impl; TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); + vk_procs = &list->device->vk_procs; + resource_impl = unsafe_impl_from_ID3D12Resource(resource); d3d12_command_list_track_resource_usage(list, resource_impl); @@ -3800,7 +3802,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID return; } - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); cpu_descriptor = d3d12_desc_from_cpu_handle(cpu_handle); if (!cpu_descriptor->view_size) @@ -3839,12 +3841,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsComman { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap); - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + const struct vkd3d_vk_device_procs *vk_procs; VkQueryControlFlags flags = 0; TRACE("iface %p, heap %p, type %#x, index %u.\n", iface, heap, type, index); - d3d12_command_list_end_current_render_pass(list, vk_procs); + vk_procs = &list->device->vk_procs; + + d3d12_command_list_end_current_render_pass(list); if (type == D3D12_QUERY_TYPE_OCCLUSION) flags = VK_QUERY_CONTROL_PRECISE_BIT; @@ -3858,11 +3862,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_EndQuery(ID3D12GraphicsCommandL { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap); - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + const struct vkd3d_vk_device_procs *vk_procs; TRACE("iface %p, heap %p, type %#x, index %u.\n", iface, heap, type, index); - d3d12_command_list_end_current_render_pass(list, vk_procs); + vk_procs = &list->device->vk_procs; + + d3d12_command_list_end_current_render_pass(list); d3d12_query_heap_mark_result_as_available(query_heap, index); @@ -3884,8 +3890,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics const struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); struct d3d12_resource *buffer = unsafe_impl_from_ID3D12Resource(dst_buffer); - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; VkDeviceSize offset, stride = sizeof(uint64_t); + const struct vkd3d_vk_device_procs *vk_procs; unsigned int i, first, count; TRACE("iface %p, heap %p, type %#x, start_index %u, query_count %u, " @@ -3893,6 +3899,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics iface, heap, type, start_index, query_count, dst_buffer, aligned_dst_buffer_offset); + vk_procs = &list->device->vk_procs; + /* Vulkan is less strict than D3D12 here. Vulkan implementations are free * to return any non-zero result for binary occlusion with at least one * sample passing, while D3D12 guarantees that the result is 1 then. @@ -3909,7 +3917,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics return; } - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); if (type == D3D12_QUERY_TYPE_PIPELINE_STATISTICS) stride = sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS); @@ -3988,8 +3996,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC struct d3d12_command_signature *sig_impl = unsafe_impl_from_ID3D12CommandSignature(command_signature); struct d3d12_resource *arg_impl = unsafe_impl_from_ID3D12Resource(arg_buffer); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const D3D12_COMMAND_SIGNATURE_DESC *signature_desc; + const struct vkd3d_vk_device_procs *vk_procs; unsigned int i; TRACE("iface %p, command_signature %p, max_command_count %u, arg_buffer %p, " @@ -3997,6 +4005,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC iface, command_signature, max_command_count, arg_buffer, arg_buffer_offset, count_buffer, count_buffer_offset); + vk_procs = &list->device->vk_procs; + if (count_buffer) { FIXME("Count buffers not implemented.\n"); @@ -4011,7 +4021,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC switch (arg_desc->Type) { case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW: - if (!d3d12_command_list_begin_render_pass(list, vk_procs)) + if (!d3d12_command_list_begin_render_pass(list)) { WARN("Failed to begin render pass, ignoring draw.\n"); break; @@ -4032,7 +4042,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC break; } - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_COMPUTE); -- 2.16.4

2 1

[PATCH vkd3d 9/9] tests: Use single ResolveQueryData() call for multiple queries.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index eefef3becdb4..ca83680d36c9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15777,19 +15777,19 @@ static void test_create_query_heap(void) static void test_query_timestamp(void) { + UINT64 timestamps[4], timestamp_frequency, timestamp_diff, time_diff; ID3D12GraphicsCommandList *command_list; - struct test_context_desc desc; - struct test_context context; - ID3D12CommandQueue *queue; - ID3D12Device *device; D3D12_QUERY_HEAP_DESC heap_desc; + struct test_context_desc desc; ID3D12QueryHeap *query_heap; - ID3D12Resource *resource; struct resource_readback rb; - UINT64 timestamps[4], timestamp_frequency, timestamp_diff, time_diff; + struct test_context context; time_t time_start, time_end; + ID3D12CommandQueue *queue; + ID3D12Resource *resource; + ID3D12Device *device; + unsigned int i; HRESULT hr; - int i; time_start = time(NULL); @@ -15813,11 +15813,12 @@ static void test_query_timestamp(void) resource = create_readback_buffer(device, sizeof(timestamps)); for (i = 0; i < ARRAY_SIZE(timestamps); ++i) - { ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_TIMESTAMP, i); - ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, D3D12_QUERY_TYPE_TIMESTAMP, i, 1, - resource, i * sizeof(UINT64)); - } + + ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, + D3D12_QUERY_TYPE_TIMESTAMP, 0, 1, resource, 0); + ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, + D3D12_QUERY_TYPE_TIMESTAMP, 1, 3, resource, sizeof(UINT64)); get_buffer_readback_with_command_list(resource, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); @@ -15827,14 +15828,16 @@ static void test_query_timestamp(void) timestamps[i] = get_readback_uint64(&rb, i, 0); for (i = 0; i < ARRAY_SIZE(timestamps) - 1; ++i) + { ok(timestamps[i] <= timestamps[i + 1], "Expected timestamps to monotonically increase, " "but got %"PRIu64" > %"PRIu64".\n", timestamps[i], timestamps[i + 1]); + } time_diff = (UINT64)difftime(time_end, time_start) * timestamp_frequency; timestamp_diff = timestamps[ARRAY_SIZE(timestamps) - 1] - timestamps[0]; ok(timestamp_diff <= time_diff, "Expected timestamp difference to be bounded by CPU time difference, " - "but got %"PRIu64" > %"PRIu64".\n", timestamp_diff, time_diff); + "but got %"PRIu64" > %"PRIu64".\n", timestamp_diff, time_diff); release_resource_readback(&rb); ID3D12QueryHeap_Release(query_heap); -- 2.16.4

2 1

[PATCH vkd3d 1/9] vkd3d: Add support for DXGI_FORMAT_R8G8_SNORM.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index e6b949d068cf..18e3aa18014b 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -37,6 +37,7 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R11G11B10_FLOAT, VK_FORMAT_B10G11R11_UFLOAT_PACK32, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8_TYPELESS, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R8G8_SNORM, VK_FORMAT_R8G8_SNORM, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, VK_FORMAT_R8G8B8A8_SRGB, 4, 1, 1, 1, COLOR}, -- 2.16.4

2 1

[PATCH vkd3d 8/9] vkd3d: Validate D3D12_BLEND_DESC.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 1 - libs/vkd3d/state.c | 24 ++++++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3c254c046868..7aa16957e114 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1786,7 +1786,6 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; blend_desc.flags = 0; - /* FIXME: Logic ops are per-target in D3D. */ blend_desc.logicOpEnable = VK_FALSE; blend_desc.logicOp = VK_LOGIC_OP_COPY; blend_desc.attachmentCount = state->attachment_count - state->rt_idx; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 43b1c1574fd0..5e401fdd9523 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1876,6 +1876,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s state->vk_set_layout = VK_NULL_HANDLE; state->uav_counters = NULL; state->uav_counter_mask = 0; + graphics->stage_count = 0; + + memset(&input_signature, 0, sizeof(input_signature)); if (!(root_signature = unsafe_impl_from_ID3D12RootSignature(desc->pRootSignature))) { @@ -1943,7 +1946,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s for (i = 0; i < rt_count; ++i) { - unsigned int blend_idx = desc->BlendState.IndependentBlendEnable ? i : 0; + const D3D12_RENDER_TARGET_BLEND_DESC *rt_desc; size_t idx = graphics->rt_idx + i; if (!(format = vkd3d_get_format(desc->RTVFormats[i], false))) @@ -1953,6 +1956,20 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + rt_desc = &desc->BlendState.RenderTarget[desc->BlendState.IndependentBlendEnable ? i : 0]; + if (desc->BlendState.IndependentBlendEnable && rt_desc->LogicOpEnable) + { + WARN("IndependentBlendEnable must be FALSE when logic operations are enabled.\n"); + hr = E_INVALIDARG; + goto fail; + } + if (rt_desc->BlendEnable && rt_desc->LogicOpEnable) + { + WARN("Only one of BlendEnable or LogicOpEnable can be set to TRUE."); + hr = E_INVALIDARG; + goto fail; + } + ps_output_swizzle[i] = vkd3d_get_rt_format_swizzle(format); graphics->attachments[idx].flags = 0; @@ -1968,7 +1985,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attachment_references[idx].attachment = idx; graphics->attachment_references[idx].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - blend_attachment_from_d3d12(&graphics->blend_attachments[i], &desc->BlendState.RenderTarget[blend_idx]); + blend_attachment_from_d3d12(&graphics->blend_attachments[i], rt_desc); } graphics->attachment_count = graphics->rt_idx + rt_count; @@ -1983,8 +2000,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0; - memset(&input_signature, 0, sizeof(input_signature)); - for (i = 0, graphics->stage_count = 0; i < ARRAY_SIZE(shader_stages); ++i) + for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) { const D3D12_SHADER_BYTECODE *b = (const void *)((uintptr_t)desc + shader_stages[i].offset); const struct vkd3d_shader_code dxbc = {b->pShaderBytecode, b->BytecodeLength}; -- 2.16.4

2 1

[PATCH vkd3d 4/9] vkd3d: Try to call vkCmdCopyQueryPoolResults() for multiple queries.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 793417eaddff..aa77c6c79f21 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3885,8 +3885,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); struct d3d12_resource *buffer = unsafe_impl_from_ID3D12Resource(dst_buffer); const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - VkDeviceSize stride = sizeof(uint64_t); - unsigned int i; + VkDeviceSize offset, stride = sizeof(uint64_t); + unsigned int i, first, count; TRACE("iface %p, heap %p, type %#x, start_index %u, query_count %u, " "dst_buffer %p, aligned_dst_buffer_offset %#"PRIx64".\n", @@ -3914,26 +3914,45 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics if (type == D3D12_QUERY_TYPE_PIPELINE_STATISTICS) stride = sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS); - /* We cannot copy query results if a query was not issued: - * - * "If the query does not become available in a finite amount of time - * (e.g. due to not issuing a query since the last reset), - * a VK_ERROR_DEVICE_LOST error may occur." - */ + count = 0; + first = start_index; + offset = aligned_dst_buffer_offset; for (i = 0; i < query_count; ++i) { - const UINT64 offset = aligned_dst_buffer_offset + i * stride; - const unsigned int query_index = start_index + i; - - if (!d3d12_query_heap_is_result_available(query_heap, query_index)) + if (d3d12_query_heap_is_result_available(query_heap, start_index + i)) + { + ++count; + } + else { + if (count) + { + VK_CALL(vkCmdCopyQueryPoolResults(list->vk_command_buffer, + query_heap->vk_query_pool, first, count, buffer->u.vk_buffer, + offset, stride, VK_QUERY_RESULT_64_BIT | VK_QUERY_RESULT_WAIT_BIT)); + } + count = 0; + first = start_index + i; + offset = aligned_dst_buffer_offset + i * stride; + + /* We cannot copy query results if a query was not issued: + * + * "If the query does not become available in a finite amount of + * time (e.g. due to not issuing a query since the last reset), + * a VK_ERROR_DEVICE_LOST error may occur." + */ VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, buffer->u.vk_buffer, offset, stride, 0x00000000)); - continue; + + ++first; + offset += stride; } + } + if (count) + { VK_CALL(vkCmdCopyQueryPoolResults(list->vk_command_buffer, - query_heap->vk_query_pool, query_index, 1, buffer->u.vk_buffer, + query_heap->vk_query_pool, first, count, buffer->u.vk_buffer, offset, stride, VK_QUERY_RESULT_64_BIT | VK_QUERY_RESULT_WAIT_BIT)); } } -- 2.16.4

2 1

[PATCH vkd3d 3/9] vkd3d: Simplify d3d12_command_list_IASetVertexBuffers().
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index cb50d63b752d..793417eaddff 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3477,8 +3477,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi return; } + count = 0; first = start_slot; - for (i = 0, count = 0; i < view_count; ++i) + for (i = 0; i < view_count; ++i) { if (views[i].BufferLocation) { @@ -3492,12 +3493,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi { if (count) VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, first, count, buffers, offsets)); + count = 0; + first = start_slot + i + 1; stride = 0; - ++count; - - first += count; - count = 0; } invalidate |= list->strides[start_slot + i] != stride; -- 2.16.4

2 1

[PATCH vkd3d 2/9] vkd3d: Try to not invalidate current pipeline in IASetVertexBuffers().
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f5b6558dab7b..cb50d63b752d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3464,6 +3464,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi VkBuffer buffers[ARRAY_SIZE(list->strides)]; unsigned int i, first, count, stride; struct d3d12_resource *resource; + bool invalidate = false; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); @@ -3499,13 +3500,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi count = 0; } + invalidate |= list->strides[start_slot + i] != stride; list->strides[start_slot + i] = stride; } if (count) VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, first, count, buffers, offsets)); - d3d12_command_list_invalidate_current_pipeline(list); + if (invalidate) + d3d12_command_list_invalidate_current_pipeline(list); } static void STDMETHODCALLTYPE d3d12_command_list_SOSetTargets(ID3D12GraphicsCommandList *iface, -- 2.16.4

2 1

[PATCH] d2d1/tests: Check implicit target bitmap options.
by Nikolay Sivov 23 Aug '18

23 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 20478e5b22..8e58eef658 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6767,6 +6767,7 @@ static void test_device_context(void) ID2D1DeviceContext *device_context; IDXGISurface *surface, *surface2; ID2D1Device *device, *device2; + D2D1_BITMAP_OPTIONS options; ID2D1DCRenderTarget *dc_rt; ID3D10Device1 *d3d_device; IDXGISwapChain *swapchain; @@ -6834,6 +6835,9 @@ if (SUCCEEDED(hr)) hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + options = ID2D1Bitmap1_GetOptions(bitmap); + ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), + "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface2); ok(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); ok(surface2 == surface, "Unexpected surface instance.\n"); @@ -6880,8 +6884,11 @@ if (SUCCEEDED(hr)) hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + options = ID2D1Bitmap1_GetOptions(bitmap); + ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), + "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); ID2D1DeviceContext_SetTarget(device_context, NULL); @@ -6907,8 +6914,11 @@ if (SUCCEEDED(hr)) hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + options = ID2D1Bitmap1_GetOptions(bitmap); + ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), + "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); ID2D1DeviceContext_SetTarget(device_context, NULL); @@ -6938,8 +6948,11 @@ if (SUCCEEDED(hr)) ok(SUCCEEDED(hr), "BindDC() failed, hr %#x.\n", hr); ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + options = ID2D1Bitmap1_GetOptions(bitmap); + ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE), + "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); ID2D1DeviceContext_SetTarget(device_context, NULL); -- 2.18.0

2 1

[PATCH 3/5] wined3d: Store max point size in d3d_info.
by Józef Kucia 23 Aug '18

23 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/cs.c | 8 +++----- dlls/wined3d/device.c | 6 ++---- dlls/wined3d/directx.c | 2 +- dlls/wined3d/stateblock.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 5 +++-- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 3a7270fff47a..8c1cce457ed0 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3657,6 +3657,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); + d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; + adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); d3d_info->vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; d3d_info->limits.vs_version = shader_caps.vs_version; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d6bc7399ca53..7bd51f4c2a19 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1928,8 +1928,7 @@ static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) state_cleanup(&cs->state); memset(&cs->state, 0, sizeof(cs->state)); - state_init(&cs->state, &cs->fb, &adapter->gl_info, &adapter->d3d_info, - WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + state_init(&cs->state, &cs->fb, &adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); } void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) @@ -2795,7 +2794,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_cs *cs; if (!(cs = heap_alloc_zero(sizeof(*cs)))) @@ -2804,8 +2803,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) cs->ops = &wined3d_cs_st_ops; cs->device = device; - state_init(&cs->state, &cs->fb, gl_info, &device->adapter->d3d_info, - WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + state_init(&cs->state, &cs->fb, d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); cs->data_size = WINED3D_INITIAL_CS_SIZE; if (!(cs->data = heap_alloc(cs->data_size))) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6e788b2cf81..ab67a967a3fa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4922,8 +4922,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_delete_opengl_contexts(device); memset(&device->state, 0, sizeof(device->state)); - state_init(&device->state, &device->fb, &device->adapter->gl_info, - &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; device_init_swapchain_state(device, swapchain); @@ -5163,8 +5162,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, return hr; } - state_init(&device->state, &device->fb, &adapter->gl_info, - &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; device->max_frame_latency = 3; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 984cdbb5da80..774cd48caec6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2186,7 +2186,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte } caps->MaxAnisotropy = gl_info->limits.anisotropy; - caps->MaxPointSize = gl_info->limits.pointsize_max; + caps->MaxPointSize = d3d_info->limits.pointsize_max; caps->MaxPrimitiveCount = 0x555555; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ caps->MaxVertexIndex = 0xffffff; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b4d17517b4b9..45a4008ac45d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1113,21 +1113,22 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applied stateblock %p.\n", stateblock); } -static void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) +static void state_init_default(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) { union { struct wined3d_line_pattern lp; DWORD d; } lp; - union { + union + { float f; DWORD d; } tmpfloat; unsigned int i; struct wined3d_matrix identity; - TRACE("state %p, gl_info %p.\n", state, gl_info); + TRACE("state %p, d3d_info %p.\n", state, d3d_info); get_identity_matrix(&identity); state->gl_primitive_type = ~0u; @@ -1222,7 +1223,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d tmpfloat.f = 1.0f; state->render_states[WINED3D_RS_PATCHSEGMENTS] = tmpfloat.d; state->render_states[WINED3D_RS_DEBUGMONITORTOKEN] = 0xbaadcafe; - tmpfloat.f = gl_info->limits.pointsize_max; + tmpfloat.f = d3d_info->limits.pointsize_max; state->render_states[WINED3D_RS_POINTSIZE_MAX] = tmpfloat.d; state->render_states[WINED3D_RS_INDEXEDVERTEXBLENDENABLE] = FALSE; state->render_states[WINED3D_RS_COLORWRITEENABLE] = 0x0000000f; @@ -1316,8 +1317,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d } void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, - DWORD flags) + const struct wined3d_d3d_info *d3d_info, DWORD flags) { unsigned int i; @@ -1330,7 +1330,7 @@ void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, } if (flags & WINED3D_STATE_INIT_DEFAULT) - state_init_default(state, gl_info); + state_init_default(state, d3d_info); } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, @@ -1340,7 +1340,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - state_init(&stateblock->state, NULL, &device->adapter->gl_info, d3d_info, 0); + state_init(&stateblock->state, NULL, d3d_info, 0); if (type == WINED3D_SBT_RECORDED) return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6693a8518af..de0b4867de79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -163,6 +163,8 @@ struct wined3d_d3d_limits unsigned int ffp_blend_stages; unsigned int ffp_vertex_blend_matrices; unsigned int active_light_count; + + float pointsize_max; }; typedef void (WINE_GLAPI *wined3d_ffp_attrib_func)(const void *data); @@ -3537,8 +3539,7 @@ void wined3d_state_enable_light(struct wined3d_state *state, const struct wined3 struct wined3d_light_info *wined3d_state_get_light(const struct wined3d_state *state, unsigned int idx) DECLSPEC_HIDDEN; void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, - DWORD flags) DECLSPEC_HIDDEN; + const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; enum wined3d_cs_queue_id -- 2.16.4

2 1

[PATCH 2/5] wined3d: Pass wined3d_adapter to wined3d_get_format().
by Józef Kucia 23 Aug '18

23 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context.c | 10 +++++----- dlls/wined3d/directx.c | 33 ++++++++++++++++++--------------- dlls/wined3d/resource.c | 10 +++++----- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 12 +++++++----- dlls/wined3d/texture.c | 27 +++++++++++++++------------ dlls/wined3d/utils.c | 3 ++- dlls/wined3d/vertexdeclaration.c | 22 ++++++++++++---------- dlls/wined3d/view.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 6 +++--- 11 files changed, 73 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7e5feb23262e..a824d940bf19 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1323,8 +1323,8 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device UINT size, DWORD usage, enum wined3d_format_id format_id, unsigned int access, unsigned int bind_flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) { + const struct wined3d_format *format = wined3d_get_format(device->adapter, format_id, usage); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, format_id, usage); struct wined3d_resource *resource = &buffer->resource; struct wined3d_box box; BOOL dynamic_buffer_ok; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ce9d740145dd..9d2236bc17a0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2060,9 +2060,9 @@ BOOL wined3d_adapter_opengl_create_context(struct wined3d_context *context, aux_buffers = TRUE; if (color_format->id == WINED3DFMT_B4G4R4X4_UNORM) - color_format = wined3d_get_format(gl_info, WINED3DFMT_B4G4R4A4_UNORM, target_usage); + color_format = wined3d_get_format(device->adapter, WINED3DFMT_B4G4R4A4_UNORM, target_usage); else if (color_format->id == WINED3DFMT_B8G8R8X8_UNORM) - color_format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM, target_usage); + color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_usage); } /* DirectDraw supports 8bit paletted render targets and these are used by @@ -2072,7 +2072,7 @@ BOOL wined3d_adapter_opengl_create_context(struct wined3d_context *context, * For this reason we require a format with 8bit alpha, so request * A8R8G8B8. */ if (color_format->id == WINED3DFMT_P8_UINT) - color_format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM, target_usage); + color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_usage); /* When using FBOs for off-screen rendering, we only use the drawable for * presentation blits, and don't do any rendering to it. That means we @@ -2084,8 +2084,8 @@ BOOL wined3d_adapter_opengl_create_context(struct wined3d_context *context, * conflicting pixel formats. */ if (wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER) { - color_format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM, target_usage); - ds_format = wined3d_get_format(gl_info, WINED3DFMT_UNKNOWN, WINED3DUSAGE_DEPTHSTENCIL); + color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_usage); + ds_format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, WINED3DUSAGE_DEPTHSTENCIL); } /* Try to find a pixel format which matches our requirements. */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3e898c06abef..984cdbb5da80 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -739,7 +739,7 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad return 0; adapter = &wined3d->adapters[adapter_idx]; - format = wined3d_get_format(&adapter->gl_info, format_id, WINED3DUSAGE_RENDERTARGET); + format = wined3d_get_format(adapter, format_id, WINED3DUSAGE_RENDERTARGET); format_bits = format->byte_count * CHAR_BIT; memset(&mode, 0, sizeof(mode)); @@ -793,7 +793,7 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada return WINED3DERR_INVALIDCALL; adapter = &wined3d->adapters[adapter_idx]; - format = wined3d_get_format(&adapter->gl_info, format_id, WINED3DUSAGE_RENDERTARGET); + format = wined3d_get_format(adapter, format_id, WINED3DUSAGE_RENDERTARGET); format_bits = format->byte_count * CHAR_BIT; memset(&m, 0, sizeof(m)); @@ -1052,7 +1052,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, TRACE("mode %ux%u@%u %s %#x.\n", mode->width, mode->height, mode->refresh_rate, debug_d3dformat(mode->format_id), mode->scanline_ordering); - format = wined3d_get_format(&adapter->gl_info, mode->format_id, WINED3DUSAGE_RENDERTARGET); + format = wined3d_get_format(adapter, mode->format_id, WINED3DUSAGE_RENDERTARGET); new_mode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; new_mode.dmBitsPerPel = format->byte_count * CHAR_BIT; @@ -1294,8 +1294,8 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, return WINED3DERR_INVALIDCALL; adapter = &wined3d->adapters[adapter_idx]; - rt_format = wined3d_get_format(&adapter->gl_info, render_target_format_id, WINED3DUSAGE_RENDERTARGET); - ds_format = wined3d_get_format(&adapter->gl_info, depth_stencil_format_id, WINED3DUSAGE_DEPTHSTENCIL); + rt_format = wined3d_get_format(adapter, render_target_format_id, WINED3DUSAGE_RENDERTARGET); + ds_format = wined3d_get_format(adapter, depth_stencil_format_id, WINED3DUSAGE_DEPTHSTENCIL); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if ((rt_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_RENDERTARGET) @@ -1335,8 +1335,8 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 enum wined3d_device_type device_type, enum wined3d_format_id surface_format_id, BOOL windowed, enum wined3d_multisample_type multisample_type, DWORD *quality_levels) { - const struct wined3d_gl_info *gl_info = &wined3d->adapters[adapter_idx].gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, surface_format_id, 0); + const struct wined3d_adapter *adapter; + const struct wined3d_format *format; HRESULT hr = WINED3D_OK; TRACE("wined3d %p, adapter_idx %u, device_type %s, surface_format %s, " @@ -1356,6 +1356,9 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 return WINED3DERR_NOTAVAILABLE; } + adapter = &wined3d->adapters[adapter_idx]; + format = wined3d_get_format(adapter, surface_format_id, 0); + if (multisample_type && !(format->multisample_types & 1u << (multisample_type - 1))) hr = WINED3DERR_NOTAVAILABLE; @@ -1525,10 +1528,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, DWORD usage, enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id) { - const struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx]; - const struct wined3d_gl_info *gl_info = &adapter->gl_info; const struct wined3d_format *adapter_format, *format; enum wined3d_gl_resource_type gl_type, gl_type_end; + const struct wined3d_adapter *adapter; BOOL mipmap_gen_supported = TRUE; DWORD format_flags = 0; DWORD allowed_usage; @@ -1542,8 +1544,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; - adapter_format = wined3d_get_format(gl_info, adapter_format_id, WINED3DUSAGE_RENDERTARGET); - format = wined3d_get_format(gl_info, check_format_id, usage); + adapter = &wined3d->adapters[adapter_idx]; + adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3DUSAGE_RENDERTARGET); + format = wined3d_get_format(adapter, check_format_id, usage); switch (resource_type) { @@ -1604,7 +1607,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } else if ((usage & WINED3DUSAGE_DEPTHSTENCIL) && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SHADOW) - && !gl_info->supported[ARB_SHADOW]) + && !adapter->gl_info.supported[ARB_SHADOW]) { TRACE("[FAILED] - No shadow sampler support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -1702,7 +1705,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad UINT CDECL wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, UINT width) { - const struct wined3d_gl_info *gl_info; + const struct wined3d_adapter *adapter; unsigned int row_pitch, slice_pitch; TRACE("wined3d %p, adapter_idx %u, format_id %s, width %u.\n", @@ -1711,8 +1714,8 @@ UINT CDECL wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT ad if (adapter_idx >= wined3d->adapter_count) return ~0u; - gl_info = &wined3d->adapters[adapter_idx].gl_info; - wined3d_format_calculate_pitch(wined3d_get_format(gl_info, format_id, 0), + adapter = &wined3d->adapters[adapter_idx]; + wined3d_format_calculate_pitch(wined3d_get_format(adapter, format_id, 0), 1, width, 1, &row_pitch, &slice_pitch); return row_pitch; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index bf54245276ae..95c9b7ff1972 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -478,11 +478,11 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) } } -const struct wined3d_format *wined3d_resource_get_decompress_format(struct wined3d_resource *resource, - const struct wined3d_context *context) +const struct wined3d_format *wined3d_resource_get_decompress_format(struct wined3d_resource *resource) { + const struct wined3d_adapter *adapter = resource->device->adapter; if (resource->format_flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE) - && !(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL)) - return wined3d_get_format(context->gl_info, WINED3DFMT_B8G8R8A8_UNORM_SRGB, resource->usage); - return wined3d_get_format(context->gl_info, WINED3DFMT_B8G8R8A8_UNORM, resource->usage); + && !(adapter->d3d_info.wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL)) + return wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM_SRGB, resource->usage); + return wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM, resource->usage); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2f74ad689fd5..a297d55cf14a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1833,7 +1833,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re format = texture->resource.format; if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) - format = wined3d_get_format(gl_info, conversion->dst_format, texture->resource.usage); + format = wined3d_get_format(device->adapter, conversion->dst_format, texture->resource.usage); /* Don't use PBOs for converted surfaces. During PBO conversion we look at * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9df40abc70ce..8200bdd5e0a3 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -659,6 +659,7 @@ static void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_swapchain *swapchain, enum wined3d_format_id format_id, enum wined3d_multisample_type *type, DWORD *quality) { + const struct wined3d_adapter *adapter; const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; enum wined3d_multisample_type t; @@ -666,8 +667,9 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s if (wined3d_settings.sample_count == ~0u) return; - gl_info = &swapchain->device->adapter->gl_info; - if (!(format = wined3d_get_format(gl_info, format_id, WINED3DUSAGE_RENDERTARGET))) + adapter = swapchain->device->adapter; + gl_info = &adapter->gl_info; + if (!(format = wined3d_get_format(adapter, format_id, WINED3DUSAGE_RENDERTARGET))) return; if ((t = min(wined3d_settings.sample_count, gl_info->limits.samples))) @@ -706,7 +708,7 @@ void wined3d_swapchain_set_swap_interval(struct wined3d_swapchain *swapchain, static void wined3d_swapchain_cs_init(void *object) { struct wined3d_swapchain *swapchain = object; - const struct wined3d_gl_info *gl_info; + const struct wined3d_adapter *adapter; unsigned int i; static const enum wined3d_format_id formats[] = @@ -718,13 +720,13 @@ static void wined3d_swapchain_cs_init(void *object) WINED3DFMT_S1_UINT_D15_UNORM, }; - gl_info = &swapchain->device->adapter->gl_info; + adapter = swapchain->device->adapter; /* Without ORM_FBO, switching the depth/stencil format is hard. Always * request a depth/stencil buffer in the likely case it's needed later. */ for (i = 0; i < ARRAY_SIZE(formats); ++i) { - swapchain->ds_format = wined3d_get_format(gl_info, formats[i], WINED3DUSAGE_DEPTHSTENCIL); + swapchain->ds_format = wined3d_get_format(adapter, formats[i], WINED3DUSAGE_DEPTHSTENCIL); if ((swapchain->context[0] = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format))) break; TRACE("Depth stencil format %s is not supported, trying next format.\n", debug_d3dformat(formats[i])); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4947a5618d67..7cc03fe4821e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1535,11 +1535,11 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality, void *mem, UINT pitch) { - struct wined3d_device *device = texture->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, format_id, texture->resource.usage); - UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); struct wined3d_texture_sub_resource *sub_resource; + const struct wined3d_gl_info *gl_info; + const struct wined3d_format *format; + struct wined3d_device *device; + unsigned int resource_size; DWORD valid_location = 0; BOOL create_dib = FALSE; @@ -1547,6 +1547,11 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT "mem %p, pitch %u.\n", texture, width, height, debug_d3dformat(format_id), multisample_type, multisample_quality, mem, pitch); + device = texture->resource.device; + gl_info = &device->adapter->gl_info; + format = wined3d_get_format(device->adapter, format_id, texture->resource.usage); + resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); + if (!resource_size) return WINED3DERR_INVALIDCALL; @@ -1706,6 +1711,7 @@ static void wined3d_texture_force_reload(struct wined3d_texture *texture) void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; + const struct wined3d_device *device = texture->resource.device; const struct wined3d_format *format = texture->resource.format; const struct wined3d_d3d_info *d3d_info = context->d3d_info; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -1731,7 +1737,7 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win { TRACE("WINED3DFMT_FLAG_DECOMPRESS set.\n"); texture->flags |= WINED3D_TEXTURE_CONVERTED; - format = wined3d_resource_get_decompress_format(&texture->resource, context); + format = wined3d_resource_get_decompress_format(&texture->resource); } else if (format->conv_byte_count) { @@ -1740,7 +1746,7 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) { texture->flags |= WINED3D_TEXTURE_CONVERTED; - format = wined3d_get_format(gl_info, conversion->dst_format, texture->resource.usage); + format = wined3d_get_format(device->adapter, conversion->dst_format, texture->resource.usage); TRACE("Using format %s for color key conversion.\n", debug_d3dformat(format->id)); } @@ -1964,7 +1970,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s if (decompress) { - format = wined3d_resource_get_decompress_format(&texture->resource, context); + format = wined3d_resource_get_decompress_format(&texture->resource); } else { @@ -2613,6 +2619,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc WARN("Texture cannot be created with a format of WINED3DFMT_UNKNOWN.\n"); return WINED3DERR_INVALIDCALL; } + format = wined3d_get_format(device->adapter, desc->format, desc->usage); if (desc->usage & WINED3DUSAGE_DYNAMIC && (wined3d_resource_access_is_managed(desc->access) || desc->usage & WINED3DUSAGE_SCRATCH)) @@ -2650,7 +2657,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { - const struct wined3d_format *format = wined3d_get_format(gl_info, desc->format, desc->usage); /* TODO: Add support for non-power-of-two compressed textures. */ if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] @@ -2696,7 +2702,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc TRACE("Creating an oversized (%ux%u) surface.\n", pow2_width, pow2_height); } - format = wined3d_get_format(&device->adapter->gl_info, desc->format, desc->usage); for (i = 0; i < layer_count; ++i) { for (j = 0; j < level_count; ++j) @@ -2929,7 +2934,6 @@ static void texture3d_download_data(struct wined3d_texture *texture, unsigned in GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); checkGLcall("glBindBuffer"); } - } /* Context activation is done by the caller. */ @@ -3349,8 +3353,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct if (desc->multisample_type != WINED3D_MULTISAMPLE_NONE) { - const struct wined3d_format *format = wined3d_get_format(&device->adapter->gl_info, - desc->format, desc->usage); + const struct wined3d_format *format = wined3d_get_format(device->adapter, desc->format, desc->usage); if (desc->multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE && desc->multisample_quality >= wined3d_popcount(format->multisample_types)) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 861f1693c3cb..0c80756e2a87 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3994,9 +3994,10 @@ fail: return FALSE; } -const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl_info, +const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *adapter, enum wined3d_format_id format_id, unsigned int resource_usage) { + const struct wined3d_gl_info *gl_info = &adapter->gl_info; const struct wined3d_format *format; int idx = get_format_idx(format_id); unsigned int i; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 3d1518dd8ada..9098b3225c85 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -173,7 +173,8 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara struct wined3d_device *device, const struct wined3d_vertex_element *elements, UINT element_count, void *parent, const struct wined3d_parent_ops *parent_ops) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_adapter *adapter = device->adapter; + const struct wined3d_gl_info *gl_info = &adapter->gl_info; unsigned int i; if (TRACE_ON(d3d_decl)) @@ -201,7 +202,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara { struct wined3d_vertex_declaration_element *e = &declaration->elements[i]; - e->format = wined3d_get_format(gl_info, elements[i].format, 0); + e->format = wined3d_get_format(adapter, elements[i].format, 0); e->ffp_valid = declaration_element_valid_ffp(&elements[i]); e->input_slot = elements[i].input_slot; e->offset = elements[i].offset; @@ -289,10 +290,10 @@ HRESULT CDECL wined3d_vertex_declaration_create(struct wined3d_device *device, struct wined3d_fvf_convert_state { - const struct wined3d_gl_info *gl_info; + const struct wined3d_adapter *adapter; struct wined3d_vertex_element *elements; - UINT offset; - UINT idx; + unsigned int offset; + unsigned int idx; }; static void append_decl_element(struct wined3d_fvf_convert_state *state, @@ -313,12 +314,12 @@ static void append_decl_element(struct wined3d_fvf_convert_state *state, elements[idx].usage = usage; elements[idx].usage_idx = usage_idx; - format = wined3d_get_format(state->gl_info, format_id, 0); + format = wined3d_get_format(state->adapter, format_id, 0); state->offset += format->attribute_size; ++state->idx; } -static unsigned int convert_fvf_to_declaration(const struct wined3d_gl_info *gl_info, +static unsigned int convert_fvf_to_declaration(const struct wined3d_adapter *adapter, DWORD fvf, struct wined3d_vertex_element **elements) { BOOL has_pos = !!(fvf & WINED3DFVF_POSITION_MASK); @@ -344,7 +345,7 @@ static unsigned int convert_fvf_to_declaration(const struct wined3d_gl_info *gl_ size = has_pos + (has_blend && num_blends > 0) + has_blend_idx + has_normal + has_psize + has_diffuse + has_specular + num_textures; - state.gl_info = gl_info; + state.adapter = adapter; if (!(state.elements = heap_calloc(size, sizeof(*state.elements)))) return ~0u; state.offset = 0; @@ -440,8 +441,9 @@ HRESULT CDECL wined3d_vertex_declaration_create_from_fvf(struct wined3d_device * TRACE("device %p, fvf %#x, parent %p, parent_ops %p, declaration %p.\n", device, fvf, parent, parent_ops, declaration); - size = convert_fvf_to_declaration(&device->adapter->gl_info, fvf, &elements); - if (size == ~0U) return E_OUTOFMEMORY; + size = convert_fvf_to_declaration(device->adapter, fvf, &elements); + if (size == ~0u) + return E_OUTOFMEMORY; hr = wined3d_vertex_declaration_create(device, elements, size, parent, parent_ops, declaration); heap_free(elements); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index d9d661897c83..d1678670bfef 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -84,10 +84,10 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, static const struct wined3d_format *validate_resource_view(const struct wined3d_view_desc *desc, struct wined3d_resource *resource, BOOL mip_slice, BOOL allow_srgb_toggle) { - const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; + const struct wined3d_adapter *adapter = resource->device->adapter; const struct wined3d_format *format; - format = wined3d_get_format(gl_info, desc->format_id, resource->usage); + format = wined3d_get_format(adapter, desc->format_id, resource->usage); if (resource->type == WINED3D_RTYPE_BUFFER && (desc->flags & WINED3D_VIEW_BUFFER_RAW)) { if (format->id != WINED3DFMT_R32_TYPELESS) @@ -96,7 +96,7 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ return NULL; } - format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + format = wined3d_get_format(adapter, WINED3DFMT_R32_UINT, resource->usage); } if (wined3d_format_is_typeless(format)) @@ -118,7 +118,7 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ return NULL; } - format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + format = wined3d_get_format(adapter, WINED3DFMT_R32_UINT, resource->usage); element_size = buffer->desc.structure_byte_stride; } else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3f168dc4c0fe..f6693a8518af 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3136,8 +3136,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; -const struct wined3d_format *wined3d_resource_get_decompress_format(struct wined3d_resource *resource, - const struct wined3d_context *context) DECLSPEC_HIDDEN; +const struct wined3d_format *wined3d_resource_get_decompress_format( + struct wined3d_resource *resource) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -4371,7 +4371,7 @@ struct wined3d_format GLenum gl_view_class; }; -const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl_info, +const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *adapter, enum wined3d_format_id format_id, unsigned int resource_usage) DECLSPEC_HIDDEN; void wined3d_format_calculate_pitch(const struct wined3d_format *format, unsigned int alignment, unsigned int width, unsigned int height, unsigned int *row_pitch, unsigned int *slice_pitch) DECLSPEC_HIDDEN; -- 2.16.4

2 1

[PATCH 1/5] wined3d: Get rid of unused gl_info parameters.
by Józef Kucia 23 Aug '18

23 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index de1f9d993d71..3e898c06abef 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1227,8 +1227,8 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U return WINED3D_OK; } -static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_info, - const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) +static BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, + const struct wined3d_format *format) { /* Float formats need FBOs. If FBOs are used this function isn't called */ if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) @@ -1247,8 +1247,8 @@ static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_in return TRUE; } -static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_info, - const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) +static BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, + const struct wined3d_format *format) { BOOL lockable = FALSE; @@ -1315,8 +1315,8 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, cfg_count = adapter->cfg_count; for (i = 0; i < cfg_count; ++i) { - if (wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], rt_format) - && wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], ds_format)) + if (wined3d_check_pixel_format_color(&cfgs[i], rt_format) + && wined3d_check_pixel_format_depth(&cfgs[i], ds_format)) { TRACE("Formats match.\n"); return WINED3D_OK; @@ -1381,7 +1381,8 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, enum wined3d_gl_resource_type gl_type) { /* Only allow depth/stencil formats */ - if (!(ds_format->depth_size || ds_format->stencil_size)) return FALSE; + if (!(ds_format->depth_size || ds_format->stencil_size)) + return FALSE; /* Blacklist formats not supported on Windows */ switch (ds_format->id) @@ -1409,8 +1410,8 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, for (i = 0; i < adapter->cfg_count; ++i) { const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; - if (wined3d_check_pixel_format_color(&adapter->gl_info, cfg, display_format) - && wined3d_check_pixel_format_depth(&adapter->gl_info, cfg, ds_format)) + if (wined3d_check_pixel_format_color(cfg, display_format) + && wined3d_check_pixel_format_depth(cfg, ds_format)) return TRUE; } } @@ -1449,7 +1450,7 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, for (i = 0; i < adapter->cfg_count; ++i) { if (cfgs[i].windowDrawable - && wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], check_format)) + && wined3d_check_pixel_format_color(&cfgs[i], check_format)) { TRACE("Pixel format %d is compatible with format %s.\n", cfgs[i].iPixelFormat, debug_d3dformat(check_format->id)); -- 2.16.4

2 1

[PATCH] winetest: Fix vstrfmtmake() for large strings.
by Francois Gouget 23 Aug '18

23 Aug '18

Once a va_list has been iterated over one must reset it to the start. So make a copy so we can call vsnprintf() more than once in case we have to reallocate the buffer. Also clearly separate the vstrfmtmake() part from the log writing one in xprintf(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- programs/winetest/util.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/winetest/util.c b/programs/winetest/util.c index af625e7d971..ea67a2d252c 100644 --- a/programs/winetest/util.c +++ b/programs/winetest/util.c @@ -66,7 +66,10 @@ static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap) p = HeapAlloc(GetProcessHeap(), 0, size); if (!p) return NULL; while (1) { - n = vsnprintf (p, size, fmt, ap); + va_list local_ap; + va_copy(local_ap, ap); + n = vsnprintf (p, size, fmt, local_ap); + va_end(local_ap); if (n < 0) size *= 2; /* Windows */ else if ((unsigned)n >= size) size = n+1; /* glibc */ else break; @@ -110,8 +113,9 @@ void xprintf (const char *fmt, ...) va_start (ap, fmt); buffer = vstrfmtmake (&size, fmt, ap); - head = buffer; va_end (ap); + + head = buffer; while (size) { if (!WriteFile( logfile, head, size, &written, NULL )) report (R_FATAL, "Can't write logs: %u", GetLastError()); -- 2.18.0

2 1

[PATCH v2 1/2] quartz/tests: Add some tests for interfaces delegated by the filter graph.
by Zebediah Figura 23 Aug '18

23 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 115 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6597f2f..ba962c3 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1562,6 +1562,119 @@ static void test_aggregate_filter_graph(void) IUnknown_Release(pgraph); } +/* Test how methods from "control" interfaces (IBasicAudio, IBasicVideo, + * IVideoWindow) are delegated to filters exposing those interfaces. */ +static void test_control_delegation(void) +{ + IFilterGraph2 *graph = create_graph(); + IBasicAudio *audio, *filter_audio; + IBaseFilter *renderer; + IVideoWindow *window; + IBasicVideo *video; + HRESULT hr; + LONG val; + + /* IBasicAudio */ + + hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicAudio, (void **)&audio); + ok(hr == S_OK, "got %#x\n", hr); + +todo_wine { + hr = IBasicAudio_put_Volume(audio, -10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Volume(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_put_Balance(audio, 10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Balance(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); +} + + hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&renderer); + if (hr != VFW_E_NO_AUDIO_HARDWARE) + { + ok(hr == S_OK, "got %#x\n", hr); + + hr = IFilterGraph2_AddFilter(graph, renderer, NULL); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicAudio_put_Volume(audio, -10); + ok(hr == S_OK, "got %#x\n", hr); + hr = IBasicAudio_get_Volume(audio, &val); + ok(hr == S_OK, "got %#x\n", hr); + ok(val == -10, "got %d\n", val); + hr = IBasicAudio_put_Balance(audio, 10); + ok(hr == S_OK || hr == VFW_E_MONO_AUDIO_HW, "got %#x\n", hr); + hr = IBasicAudio_get_Balance(audio, &val); + ok(hr == S_OK || hr == VFW_E_MONO_AUDIO_HW, "got %#x\n", hr); + if (hr == S_OK) + ok(val == 10, "got balance %d\n", val); + + hr = IBaseFilter_QueryInterface(renderer, &IID_IBasicAudio, (void **)&filter_audio); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicAudio_get_Volume(filter_audio, &val); + ok(hr == S_OK, "got %#x\n", hr); + ok(val == -10, "got volume %d\n", val); + + hr = IFilterGraph2_RemoveFilter(graph, renderer); + ok(hr == S_OK, "got %#x\n", hr); + + IBaseFilter_Release(renderer); + IBasicAudio_Release(filter_audio); + } + +todo_wine { + hr = IBasicAudio_put_Volume(audio, -10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Volume(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_put_Balance(audio, 10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Balance(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); +} + + IBasicAudio_Release(audio); + + /* IBasicVideo and IVideoWindow */ + + hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicVideo, (void **)&video); + ok(hr == S_OK, "got %#x\n", hr); + hr = IFilterGraph2_QueryInterface(graph, &IID_IVideoWindow, (void **)&window); + ok(hr == S_OK, "got %#x\n", hr); + + /* Unlike IBasicAudio, these return E_NOINTERFACE. */ + hr = IBasicVideo_get_BitRate(video, &val); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + hr = IVideoWindow_SetWindowForeground(window, OAFALSE); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + + hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&renderer); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IFilterGraph2_AddFilter(graph, renderer, NULL); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicVideo_get_BitRate(video, &val); + ok(hr == VFW_E_NOT_CONNECTED, "got %#x\n", hr); + hr = IVideoWindow_SetWindowForeground(window, OAFALSE); + ok(hr == VFW_E_NOT_CONNECTED, "got %#x\n", hr); + + hr = IFilterGraph2_RemoveFilter(graph, renderer); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicVideo_get_BitRate(video, &val); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + hr = IVideoWindow_SetWindowForeground(window, OAFALSE); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + + IBaseFilter_Release(renderer); + IBasicVideo_Release(video); + IVideoWindow_Release(window); + IFilterGraph2_Release(graph); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -1571,6 +1684,8 @@ START_TEST(filtergraph) test_graph_builder(); test_render_filter_priority(); test_aggregate_filter_graph(); + test_control_delegation(); + CoUninitialize(); test_render_with_multithread(); } -- 2.7.4

1 1

[PATCH 1/2] quartz/tests: Add some tests for interfaces delegated by the filter graph.
by Zebediah Figura 23 Aug '18

23 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 115 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6597f2f..27906ce 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1562,6 +1562,119 @@ static void test_aggregate_filter_graph(void) IUnknown_Release(pgraph); } +/* Test how methods from "control" interfaces (IBasicAudio, IBasicVideo, + * IVideoWindow) are delegated to filters exposing those interfaces. */ +static void test_control_delegation(void) +{ + IFilterGraph2 *graph = create_graph(); + IBasicAudio *audio, *filter_audio; + IBaseFilter *renderer; + IVideoWindow *window; + IBasicVideo *video; + HRESULT hr; + LONG val; + + /* IBasicAudio */ + + hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicAudio, (void **)&audio); + ok(hr == S_OK, "got %#x\n", hr); + +todo_wine { + hr = IBasicAudio_put_Volume(audio, -10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Volume(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_put_Balance(audio, 10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Balance(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); +} + + hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&renderer); + if (hr != VFW_E_NO_AUDIO_HARDWARE) + { + ok(hr == S_OK, "got %#x\n", hr); + + hr = IFilterGraph2_AddFilter(graph, renderer, NULL); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicAudio_put_Volume(audio, -10); + ok(hr == S_OK, "got %#x\n", hr); + hr = IBasicAudio_get_Volume(audio, &val); + ok(hr == S_OK, "got %#x\n", hr); + ok(val == -10, "got %d\n", val); + hr = IBasicAudio_put_Balance(audio, 10); + ok(hr == S_OK || hr == VFW_E_MONO_AUDIO_HW, "got %#x\n", hr); + hr = IBasicAudio_get_Balance(audio, &val); + ok(hr == S_OK || hr == VFW_E_MONO_AUDIO_HW, "got %#x\n", hr); + if (hr == S_OK) + ok(val == 10, "got balance %d\n", val); + + hr = IBaseFilter_QueryInterface(renderer, &IID_IBasicAudio, (void **)&filter_audio); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicAudio_get_Volume(filter_audio, &val); + ok(hr == S_OK, "got %#x\n", hr); + ok(val == -10, "got volume %d\n", val); + + hr = IFilterGraph2_RemoveFilter(graph, renderer); + ok(hr == S_OK, "got %#x\n", hr); + + IBaseFilter_Release(renderer); + IBasicAudio_Release(filter_audio); + } + +todo_wine { + hr = IBasicAudio_put_Volume(audio, -10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Volume(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_put_Balance(audio, 10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Balance(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); +} + + IBasicAudio_Release(audio); + + /* IBasicVideo and IVideoWindow */ + + hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicVideo, (void **)&video); + ok(hr == S_OK, "got %#x\n", hr); + hr = IFilterGraph2_QueryInterface(graph, &IID_IVideoWindow, (void **)&window); + ok(hr == S_OK, "got %#x\n", hr); + + /* Unlike IBasicAudio, these return E_NOINTERFACE. */ + hr = IBasicVideo_get_BitRate(video, &val); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + hr = IVideoWindow_SetWindowForeground(window, OATRUE); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + + hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&renderer); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IFilterGraph2_AddFilter(graph, renderer, NULL); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicVideo_get_BitRate(video, &val); + ok(hr == VFW_E_NOT_CONNECTED, "got %#x\n", hr); + hr = IVideoWindow_SetWindowForeground(window, OATRUE); + ok(hr == VFW_E_NOT_CONNECTED, "got %#x\n", hr); + + hr = IFilterGraph2_RemoveFilter(graph, renderer); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicVideo_get_BitRate(video, &val); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + hr = IVideoWindow_SetWindowForeground(window, OATRUE); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + + IBaseFilter_Release(renderer); + IBasicVideo_Release(video); + IVideoWindow_Release(window); + IFilterGraph2_Release(graph); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -1571,6 +1684,8 @@ START_TEST(filtergraph) test_graph_builder(); test_render_filter_priority(); test_aggregate_filter_graph(); + test_control_delegation(); + CoUninitialize(); test_render_with_multithread(); } -- 2.7.4

1 1

[PATCH] schedsvc: Fix a typo in a parameter name.
by Francois Gouget 23 Aug '18

23 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/wine/atsvc.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/atsvc.idl b/include/wine/atsvc.idl index 5c723ed6791..e95e6cf1100 100644 --- a/include/wine/atsvc.idl +++ b/include/wine/atsvc.idl @@ -65,7 +65,7 @@ interface atsvc [in] DWORD MinJobId, [in] DWORD MaxJobId); DWORD NetrJobEnum([in,string,unique] ATSVC_HANDLE ServerName, - [in,out] LPAT_ENUM_CONTAINER pEnumContainer, [in] DWORD PreferedMaximumLength, + [in,out] LPAT_ENUM_CONTAINER pEnumContainer, [in] DWORD PreferredMaximumLength, [out] LPDWORD pTotalEntries, [in,out,unique] LPDWORD pResumeHandle); DWORD NetrJobGetInfo([in,string,unique] ATSVC_HANDLE ServerName, -- 2.18.0

1 0

[PATCH] include: Fix the name of a Wininet error code.
by Francois Gouget 23 Aug '18

23 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/winerror.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winerror.h b/include/winerror.h index 886182ff3d0..6193c240870 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3042,7 +3042,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define WININET_E_CONNECTION_ABORTED _HRESULT_TYPEDEF_(0x80072efe) #define WININET_E_CONNECTION_RESET _HRESULT_TYPEDEF_(0x80072eff) #define WININET_E_FORCE_RETRY _HRESULT_TYPEDEF_(0x80072f00) -#define WININET_E_INVALID_PROXY_REQUREST _HRESULT_TYPEDEF_(0x80072f01) +#define WININET_E_INVALID_PROXY_REQUEST _HRESULT_TYPEDEF_(0x80072f01) #define WININET_E_NEED_UI _HRESULT_TYPEDEF_(0x80072f02) #define WININET_E_HANDLE_EXISTS _HRESULT_TYPEDEF_(0x80072f04) #define WININET_E_SEC_CERT_DATE_INVALID _HRESULT_TYPEDEF_(0x80072f05) -- 2.18.0

1 0

[PATCH] ntdll/tests: Spelling fixes in comments.
by Francois Gouget 23 Aug '18

23 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/tests/rtl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 07fa1cd3ccf..5fe72ec38b0 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1458,9 +1458,9 @@ static const struct NTSTATUS res; int terminator_offset; int ip[8]; - /* win_broken: older versions of windows do not handle this correct + /* win_broken: older versions of windows do not handle this correctly ex_fail: Ex function does need the string to be terminated, non-Ex does not. - ex_skip: test doesnt make sense for Ex (f.e. it's invalid for non-Ex but valid for Ex) */ + ex_skip: test doesn't make sense for Ex (f.e. it's invalid for non-Ex but valid for Ex) */ enum { normal_6, win_broken_6 = 1, ex_fail_6 = 2, ex_skip_6 = 4 } flags; } ipv6_tests[] = { @@ -2284,7 +2284,7 @@ static void test_RtlIpv6StringToAddressEx(void) /* sanity check */ ok(sizeof(ip) == sizeof(USHORT)* 8, "sizeof(ip)\n"); - /* first we run all ip related tests, to make sure someone didnt accidentally reimplement instead of re-use. */ + /* first we run all ip related tests, to make sure someone didn't accidentally reimplement instead of re-use. */ for (i = 0; i < ARRAY_SIZE(ipv6_tests); i++) { ULONG scope = 0xbadf00d; -- 2.18.0

1 0

[PATCH] winedump: Spelling fix in a comment.
by Francois Gouget 23 Aug '18

23 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/winedump/tlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 701c5270637..bed53933be6 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -1165,7 +1165,7 @@ static const char *lookup_code(const BYTE *table, DWORD table_size, struct bitst if (p + 1 < table + table_size && *(p + 1)) { - /* FIXME: Whats the meaning of *p? */ + /* FIXME: What is the meaning of *p? */ const BYTE *q = p + 1; while (q < table + table_size && *q) q++; return (q < table + table_size) ? (const char *)(p + 1) : NULL; -- 2.18.0

1 0

[PATCH] xcopy: Spelling fix in a comment.
by Francois Gouget 23 Aug '18

23 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/xcopy/xcopy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 616c7d27004..eb8c3f04ef0 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -872,7 +872,7 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, goto out; } - /* Unless overriden above, skip over the '/' and the first character */ + /* Unless overridden above, skip over the '/' and the first character */ if (rest == NULL) rest = &word[2]; /* By now, rest should point either to the null after the -- 2.18.0

1 0

[PATCH] winevulkan: Spelling fix in a perl comment.
by Francois Gouget 23 Aug '18

23 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3be6a8de3bf..5b0f82ce355 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2165,7 +2165,7 @@ class VkGenerator(object): f.write(define.definition()) for handle in self.registry.handles: - # For backwards compatiblity also create definitions for aliases. + # For backward compatibility also create definitions for aliases. # These types normally don't get pulled in as we use the new types # even in legacy functions if they are aliases. if handle.is_required() or handle.is_alias(): -- 2.18.0

1 0

[PATCH] wsdapi/tests: Avoid calls to malloc() and free().
by Francois Gouget 23 Aug '18

23 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wsdapi/tests/discovery.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 43a4b2c3a44..f33f469a033 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -1029,20 +1029,20 @@ static void Publish_tests(void) another_name.LocalName = (WCHAR *) name_cider; another_name.Space = &ns2; - types_list.Next = malloc(sizeof(WSD_NAME_LIST)); + types_list.Next = heap_alloc(sizeof(WSD_NAME_LIST)); types_list.Element = &another_name; types_list.Next->Next = NULL; types_list.Next->Element = &header_any_name; /* Create scopes and xaddrs lists */ - scopes_list.Next = malloc(sizeof(WSD_URI_LIST)); + scopes_list.Next = heap_alloc(sizeof(WSD_URI_LIST)); scopes_list.Element = uri; scopes_list.Next->Next = NULL; scopes_list.Next->Element = uri_more_tests; - xaddrs_list.Next = malloc(sizeof(WSD_URI_LIST)); + xaddrs_list.Next = heap_alloc(sizeof(WSD_URI_LIST)); xaddrs_list.Element = uri_more_tests; xaddrs_list.Next->Next = NULL; @@ -1056,9 +1056,9 @@ static void Publish_tests(void) WSDFreeLinkedMemory(body_any_element); WSDFreeLinkedMemory(endpoint_any_element); WSDFreeLinkedMemory(ref_param_any_element); - free(types_list.Next); - free(scopes_list.Next); - free(xaddrs_list.Next); + heap_free(types_list.Next); + heap_free(scopes_list.Next); + heap_free(xaddrs_list.Next); ok(rc == S_OK, "Publish failed: %08x\n", rc); -- 2.18.0

1 0

[PATCH] winebus.sys: Avoid calling strdup().
by Francois Gouget 23 Aug '18

23 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winebus.sys/bus_udev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index d34e18c71c7..788b564851e 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -65,6 +65,7 @@ #include "ddk/wdm.h" #include "ddk/hidtypes.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #ifdef HAS_PROPER_INPUT_HEADER @@ -1046,7 +1047,7 @@ static int parse_uevent_info(const char *uevent, DWORD *vendor_id, DWORD *product_id, WCHAR **serial_number) { DWORD bus_type; - char *tmp = strdup(uevent); + char *tmp; char *saveptr = NULL; char *line; char *key; @@ -1055,6 +1056,8 @@ static int parse_uevent_info(const char *uevent, DWORD *vendor_id, int found_id = 0; int found_serial = 0; + tmp = heap_alloc(strlen(uevent) + 1); + strcpy(tmp, uevent); line = strtok_r(tmp, "\n", &saveptr); while (line != NULL) { @@ -1092,7 +1095,7 @@ next_line: line = strtok_r(NULL, "\n", &saveptr); } - free(tmp); + heap_free(tmp); return (found_id && found_serial); } -- 2.18.0

1 0

[PATCH] dbghelp/tests: Make stack_walk_thread() static.
by Francois Gouget 23 Aug '18

23 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dbghelp/tests/dbghelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 1292b667032..214adb7b16b 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -23,7 +23,7 @@ #if defined(__i386__) || defined(__x86_64__) -DWORD CALLBACK stack_walk_thread(void *arg) +static DWORD CALLBACK stack_walk_thread(void *arg) { DWORD count = SuspendThread(GetCurrentThread()); ok(!count, "got %d\n", count); -- 2.18.0

1 0

[PATCH] msvfw32/tests: Make gdf_driver_proc() static.
by Francois Gouget 23 Aug '18

23 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvfw32/tests/msvfw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 406a35b8f11..7555015ef15 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -331,7 +331,7 @@ static const RGBQUAD color_yellow = {0x00, 0xff, 0xff, 0x00}; static BITMAPINFOHEADER gdf_in, *gdf_out; -LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, +static LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, LPARAM lparam1, LPARAM lparam2) { LRESULT ret = 0; -- 2.18.0

1 0

[PATCH] dmusic: Make midi_port_create() static.
by Francois Gouget 23 Aug '18

23 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dmusic/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 1fa94694a9a..c313875d08e 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -1174,7 +1174,7 @@ static const IDirectMusicThruVtbl midi_thru_vtbl = { midi_IDirectMusicThru_ThruChannel, }; -HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, DMUS_PORTCAPS *caps, +static HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, DMUS_PORTCAPS *caps, IDirectMusicPort **port) { struct midi_port *obj; -- 2.18.0

1 0

[PATCH] ntdll: Simplify the file_part finder in RtlDosPathNameToNtPathName_U_WithStatus
by Gabriel Ivăncescu 23 Aug '18

23 Aug '18

Path is known to start with \??\ in this block, so strrchrW cannot ever return NULL, thus there is no reason to check for it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ntdll/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ccc95e3..d2e70bb 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -366,8 +366,8 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U ntpath->Buffer[1] = '?'; /* change \\?\ to \??\ */ if (file_part) { - if ((ptr = strrchrW( ntpath->Buffer, '\\' )) && ptr[1]) *file_part = ptr + 1; - else *file_part = NULL; + ptr = strrchrW(ntpath->Buffer, '\\'); + *file_part = ptr[1] ? ptr + 1 : NULL; } return STATUS_SUCCESS; } -- 1.9.1

1 0

[PATCH] ntdll: Properly set the current directory for UNC paths
by Gabriel Ivăncescu 23 Aug '18

23 Aug '18

Most of the other code deals with UNC paths of the form \\server\share in the current directory, which is proper, but the current directory is wrongfully set to the form UNC\server\share, so fix it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37834 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ntdll/path.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ccc95e3..6291f9d 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -1039,12 +1039,22 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) if (curdir->Handle) NtClose( curdir->Handle ); curdir->Handle = handle; - /* append trailing \ if missing */ size = newdir.Length / sizeof(WCHAR); ptr = newdir.Buffer; ptr += 4; /* skip \??\ prefix */ size -= 4; - if (size && ptr[size - 1] != '\\') ptr[size++] = '\\'; + if (size) + { + /* append trailing \ if missing */ + if (ptr[size - 1] != '\\') ptr[size++] = '\\'; + + /* convert \??\UNC\ path to \\ prefix */ + if (size >= 4 && !strncmpiW(ptr, UncPfxW, 4)) + { + ptr += 4-2; size -= 4-2; + *ptr = '\\'; + } + } memcpy( curdir->DosPath.Buffer, ptr, size * sizeof(WCHAR)); curdir->DosPath.Buffer[size] = 0; -- 1.9.1

1 0

[PATCH 5/5] wined3d: Add max_rt_count field to d3d_info.
by Józef Kucia 23 Aug '18

23 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/cs.c | 17 +++++++++-------- dlls/wined3d/device.c | 22 ++++++++++++++-------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 39671f2f30cf..1dcf3eb6b6eb 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3658,6 +3658,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); d3d_info->shadow_sampler = gl_info->supported[ARB_SHADOW]; + d3d_info->limits.max_rt_count = gl_info->limits.buffers; d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7bd51f4c2a19..ecfce4181235 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -588,7 +588,7 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - unsigned int rt_count = cs->device->adapter->gl_info.limits.buffers; + unsigned int rt_count = cs->device->adapter->d3d_info.limits.max_rt_count; const struct wined3d_state *state = &cs->device->state; const struct wined3d_viewport *vp = &state->viewports[0]; struct wined3d_rendertarget_view *view; @@ -839,6 +839,7 @@ void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_shader *geometry_shader; struct wined3d_state *state = &cs->state; @@ -893,7 +894,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) if (state->textures[i]) wined3d_resource_release(&state->textures[i]->resource); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { if (state->fb->render_targets[i]) wined3d_resource_release(state->fb->render_targets[i]->resource); @@ -906,7 +907,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } static void acquire_graphics_pipeline_resources(const struct wined3d_state *state, - BOOL indexed, const struct wined3d_gl_info *gl_info) + BOOL indexed, const struct wined3d_d3d_info *d3d_info) { unsigned int i; @@ -927,7 +928,7 @@ static void acquire_graphics_pipeline_resources(const struct wined3d_state *stat if (state->textures[i]) wined3d_resource_acquire(&state->textures[i]->resource); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { if (state->fb->render_targets[i]) wined3d_resource_acquire(state->fb->render_targets[i]->resource); @@ -943,7 +944,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; @@ -959,7 +960,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned op->parameters.u.direct.instance_count = instance_count; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(state, indexed, gl_info); + acquire_graphics_pipeline_resources(state, indexed, d3d_info); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -967,7 +968,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, struct wined3d_buffer *buffer, unsigned int offset, BOOL indexed) { - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; @@ -980,7 +981,7 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, op->parameters.u.indirect.offset = offset; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(state, indexed, gl_info); + acquire_graphics_pipeline_resources(state, indexed, d3d_info); wined3d_resource_acquire(&buffer->resource); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab67a967a3fa..96b8d3c247d6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -970,7 +970,7 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi BOOL ds_enable = swapchain->desc.enable_auto_depth_stencil; unsigned int i; - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -1240,7 +1240,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) ERR("Something's still holding the auto depth/stencil view (%p).\n", view); } - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -4380,11 +4380,14 @@ void CDECL wined3d_device_clear_unordered_access_view_uint(struct wined3d_device struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, unsigned int view_idx) { + unsigned int max_rt_count; + TRACE("device %p, view_idx %u.\n", device, view_idx); - if (view_idx >= device->adapter->gl_info.limits.buffers) + max_rt_count = device->adapter->d3d_info.limits.max_rt_count; + if (view_idx >= max_rt_count) { - WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", max_rt_count); return NULL; } @@ -4402,13 +4405,15 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport) { struct wined3d_rendertarget_view *prev; + unsigned int max_rt_count; TRACE("device %p, view_idx %u, view %p, set_viewport %#x.\n", device, view_idx, view, set_viewport); - if (view_idx >= device->adapter->gl_info.limits.buffers) + max_rt_count = device->adapter->d3d_info.limits.max_rt_count; + if (view_idx >= max_rt_count) { - WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", max_rt_count); return WINED3DERR_INVALIDCALL; } @@ -4706,6 +4711,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state) { + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; struct wined3d_view_desc view_desc; @@ -4739,7 +4745,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state_unbind_resources(&device->state); } - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -5038,7 +5044,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso if (device->d3d_initialized) { - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < ARRAY_SIZE(device->fb.render_targets); ++i) { if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource) ERR("Resource %p is still in use as render target %u.\n", resource, i); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d2229c20b2eb..8ad02452a137 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2201,7 +2201,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->AdapterOrdinalInGroup = 0; caps->NumberOfAdaptersInGroup = 1; - caps->NumSimultaneousRTs = gl_info->limits.buffers; + caps->NumSimultaneousRTs = d3d_info->limits.max_rt_count; caps->StretchRectFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | WINED3DPTFILTERCAPS_MAGFPOINT | diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 834ca151cf6a..6bd60fee953f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -164,6 +164,7 @@ struct wined3d_d3d_limits unsigned int ffp_vertex_blend_matrices; unsigned int active_light_count; + unsigned int max_rt_count; float pointsize_max; }; -- 2.16.4

1 0

[PATCH 1/2] comctl32/edit: Move the call to EDIT_EM_SetSel outside the block
by Gabriel Ivăncescu 23 Aug '18

23 Aug '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- It's called in every block anyway including the else block. dlls/comctl32/edit.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 10ff5fb..c0904cb 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3308,19 +3308,17 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) else EDIT_WM_Clear(es); } else { + EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); if (shift) { /* delete character left of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveBackward(es, TRUE); EDIT_WM_Clear(es); } else if (control) { /* delete to end of line */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveEnd(es, TRUE, FALSE); EDIT_WM_Clear(es); } else { /* delete character right of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveForward(es, TRUE); EDIT_WM_Clear(es); } -- 1.9.1

2 3

[PATCH v2] shell32: Add start menu icon
by Alex Henrie 23 Aug '18

23 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Forgot to add the icon to shell32.rc --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/menu.ico | Bin 0 -> 4696 bytes dlls/shell32/resources/menu.svg | 214 ++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 219 insertions(+) create mode 100644 dlls/shell32/resources/menu.ico create mode 100644 dlls/shell32/resources/menu.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index bef3f6304a..886301542d 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -74,6 +74,7 @@ SVG_SRCS = \ resources/folder_open.svg \ resources/help.svg \ resources/internet.svg \ + resources/menu.svg \ resources/mycomputer.svg \ resources/mydocs.svg \ resources/netdrive.svg \ diff --git a/dlls/shell32/resources/menu.ico b/dlls/shell32/resources/menu.ico new file mode 100644 index 0000000000000000000000000000000000000000..516fb3a9fe0b25920321fd679a58aea0cc8396a3 GIT binary patch literal 4696 zcmeHKOK4M35Iy<We45aw1r=9s;isGEZ39|@&?F=@K@+qD>`D{UC@%a|Voen!gn;cT zf(r%fwzv|z5mEd^iz~&I3q`S{n^LS+gj!;0oZEPtJW<}Ib&*8|CNt;W^JXS<@4$P2 z0d{aPKt;|7jFZopk+1>G1ay$r<Ng*c9<c$c`kQY69yqjk#;L_y+W<wW^6ycukfOzl zf8aYCfzd<JUZ;H<FVq<h1^RfkT&-p@3zy?_WXvah5g#y7XkAKdAgm@seG%Z&P9U2H z%CwZ70WL6LHV$}h0$a|FJv_XhHjKv)^afD5T6p!8kR=_C1T7`&=1nF`W}@_#mXu^7 zIz+q-Wu^LH<+`V3JVy9TIN*zA-p_q3+9sI;#l`a1cSrK7{qsS?bN|mD--)V`V;5hx ze_5~(zGz*(|LM(c!=z1(V$e9!?j1wPtnA8muVG1(p$;4!63NP)+t;6l*H;%^<7RK% z{+56A*#BWZcf~Qfu79)I22BD2Q`5`Sis?zu^%UJo>_`Xu(*ucg%9A{wB7-j0+3jN8 zt}b_sF%NTl*ghBA>tSs6^{`v>!0EFCr%nw2`+-~6iUpoL9E=9;`s29{^6BOvPRb{P zOSWoOd>WjlG*AaBD+0*cC0=_EAZumg>hWar37%d&*?kdD*2=~eyym<#&@f1pBF;_L z%HA8nlZ~s#6Y*rNUOd@-*?fX08&~j}^CEFc8;By#P1cHgA!}vh>hWar37%d&*?kdD z*2=~eJU%Zfsh4#1eT;k|jrKlPt-JO+546>5ZAa_XbGWbFtsy;LvtPAdaj)60YCrV) vAiAc<<M&G;RY}D>ddU~^zvr=1;qUgqGx`qXDzNNYvtDsBf48EaYwhnZVuEqx literal 0 HcmV?d00001 diff --git a/dlls/shell32/resources/menu.svg b/dlls/shell32/resources/menu.svg new file mode 100644 index 0000000000..408803b4bb --- /dev/null +++ b/dlls/shell32/resources/menu.svg @@ -0,0 +1,214 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + id="svg8" + version="1.1" + viewBox="0 0 632 272" + height="272" + width="632"> + <defs + id="defs2" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <rect + y="200" + x="40" + height="32" + width="192" + id="rect815" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="120" + x="40" + height="32" + width="192" + id="rect815-3" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="40" + x="40" + height="32" + width="192" + id="rect815-3-6" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <rect + y="256" + x="278" + height="6" + width="36" + id="rect815-7" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0stroke-opacity:1" /> + <rect + y="241" + x="278" + height="6" + width="36" + id="rect815-3-5" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="226" + x="278" + height="6" + width="36" + id="rect815-3-6-3" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + id="icon:48-32" + height="48" + width="48" + y="220" + x="272" + style="fill:none" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAcIAAAHCAAXfPIkwAAAAHdElNRQfiCBYRBApLB7b2AAAANklEQVRYw+3UMQ4AIAgAMfT/f8bZ +WUVN2o2FCwsRsKpNU+7f2k9fIHA/ABTwrgWAL3jXAvCCAcmqAyIux0X6AAAAJXRFWHRkYXRlOmNy +ZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEwLTA2OjAw89BlqAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAx +OC0wOC0yMlQyMzowNDoxMC0wNjowMIKN3RQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5v +cmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:48-8" + x="328" + y="220" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAcIAAAHCAAXfPIkwAAAAHdElNRQfiCBYRBApLB7b2AAAANklEQVRYw+3UMQ4AIAgAMfT/f8bZ +WUVN2o2FCwsRsKpNU+7f2k9fIHA/ABTwrgWAL3jXAvCCAcmqAyIux0X6AAAAJXRFWHRkYXRlOmNy +ZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEwLTA2OjAw89BlqAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAx +OC0wOC0yMlQyMzowNDoxMC0wNjowMIKN3RQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5v +cmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:48-4" + x="384" + y="220" /> + <rect + y="260" + x="444" + height="4" + width="24" + id="rect815-7-5" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="250" + x="444" + height="4" + width="24" + id="rect815-3-5-6" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="240" + x="444" + height="4" + width="24" + id="rect815-3-6-3-2" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + id="icon:32-32" + height="32" + width="32" + y="236" + x="440" + style="fill:none" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAASwAAAEsAAdCmVQYAAAAHdElNRQfiCBYRBApLB7b2AAAAK0lEQVRIx2NgGAWMcNZ/8nQyUeqC +gTdgFAwGMJoSR8HgAKMpcRQwMDAwAAD3KQMWtPUZjwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0w +OC0yMlQyMzowNDoxMC0wNjowMPPQZagAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTgtMDgtMjJUMjM6 +MDQ6MTAtMDY6MDCCjd0UAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJ +RU5ErkJggg== +" + id="icon:32-8" + x="480" + y="236" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAASwAAAEsAAdCmVQYAAAAHdElNRQfiCBYRBApLB7b2AAAAK0lEQVRIx2NgGAWMcNZ/8nQyUeqC +gTdgFAwGMJoSR8HgAKMpcRQwMDAwAAD3KQMWtPUZjwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0w +OC0yMlQyMzowNDoxMC0wNjowMPPQZagAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTgtMDgtMjJUMjM6 +MDQ6MTAtMDY6MDCCjd0UAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJ +RU5ErkJggg== +" + id="icon:32-4" + x="520" + y="236" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBYRChrIM4scAAAAHklEQVQoz2NgoBQwMjAwMDD8xy3L +RLEVlINRRxIJAHSgAwpvTcLEAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTIyVDIzOjEwOjI2 +LTA2OjAw1uooywAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yMlQyMzoxMDoyNi0wNjowMKe3 +kHcAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:16-32" + x="560" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBYRBAs8AIZgAAAAHklEQVQoz2NgoBQwMjAwMDD8xy3L +RLEVlINRRxIJAHSgAwpvTcLEAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEx +LTA2OjAwVaduHAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yMlQyMzowNDoxMS0wNjowMCT6 +1qAAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:16-8" + x="584" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBYRBAs8AIZgAAAAHklEQVQoz2NgoBQwMjAwMDD8xy3L +RLEVlINRRxIJAHSgAwpvTcLEAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEx +LTA2OjAwVaduHAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yMlQyMzowNDoxMS0wNjowMCT6 +1qAAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:16-4" + x="608" + y="252" /> +</svg> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 86ae802bee..d0bd5e85b6 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -538,6 +538,9 @@ IDI_PRINTERS_FOLDER ICON resources/folder.ico /* @makedep: resources/folder.ico */ IDI_FONTS_FOLDER ICON resources/folder.ico +/* @makedep: resources/menu.ico */ +IDI_SHELL_START_MENU ICON resources/menu.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 178fa789ae..5a637e95ba 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -208,6 +208,7 @@ #define IDI_SHELL_APP_FOLDER 37 #define IDI_SHELL_PRINTERS_FOLDER 38 #define IDI_SHELL_FONTS_FOLDER 39 +#define IDI_SHELL_START_MENU 40 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142 -- 2.18.0

2 1

[PATCH] testbot/build: Rename the build directories to allow for more than one project.
by Francois Gouget 23 Aug '18

23 Aug '18

The new naming scheme is 'project-build', thus avoiding name collisions in case we need build trees for other projects besides Wine. The build now matches the name of the corresponding test reports for Windows builds too; that is exe32 and exe64. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 26 +++++++++---------- testbot/bin/build/Reconfig.pl | 42 +++++++++++++++++++++---------- testbot/bin/build/WineReconfig.pl | 16 +++++++++--- testbot/bin/build/WineTest.pl | 2 +- testbot/lib/Build/Utils.pm | 6 ++--- 5 files changed, 58 insertions(+), 34 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 7f94c8595..7a268db5c 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -58,11 +58,11 @@ sub BuildNative() { InfoMsg "\nRebuilding native tools\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-native' && set -x && ". + system("cd '$DataDir/wine-native' && set -x && ". "time make -j$CPUCount __tooldeps__"); if ($? != 0) { - LogMsg "Rebuild of native tools failed\n"; + LogMsg "The Wine native tools build failed\n"; return !1; } @@ -71,9 +71,9 @@ sub BuildNative() sub BuildTestExecutables($$$) { - my ($Targets, $Impacts, $Bits) = @_; + my ($Targets, $Impacts, $Build) = @_; - return 1 if (!$Targets->{"exe$Bits"}); + return 1 if (!$Targets->{$Build}); my (@BuildDirs, @TestExes); foreach my $TestInfo (values %{$Impacts->{Tests}}) @@ -81,26 +81,26 @@ sub BuildTestExecutables($$$) push @BuildDirs, $TestInfo->{Path}; my $TestExe = "$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; push @TestExes, $TestExe; - unlink("$DataDir/build-mingw$Bits/$TestExe"); # Ignore errors + unlink("$DataDir/wine-$Build/$TestExe"); # Ignore errors } - InfoMsg "\nBuilding the $Bits-bit test executable(s)\n"; + InfoMsg "\nBuilding the $Build Wine test executable(s)\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-mingw$Bits' && set -x && ". + system("cd '$DataDir/wine-$Build' && set -x && ". "time make -j$CPUCount ". join(" ", sort @BuildDirs)); if ($? != 0) { - LogMsg "Rebuild of $Bits-bit crossbuild failed\n"; + LogMsg "The $Build Wine crossbuild failed\n"; return !1; } my $Success = 1; foreach my $TestExe (@TestExes) { - if (!-f "$DataDir/build-mingw$Bits/$TestExe") + if (!-f "$DataDir/wine-$Build/$TestExe") { - LogMsg "Make didn't produce a $TestExe file\n"; - $Success = undef; + LogMsg "Make didn't produce the $Build $TestExe file\n"; + $Success = !1; } } @@ -223,8 +223,8 @@ my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or ($Impacts->{WineBuild} and !BuildNative()) or - !BuildTestExecutables($Targets, $Impacts, 32) or - !BuildTestExecutables($Targets, $Impacts, 64)) + !BuildTestExecutables($Targets, $Impacts, "exe32") or + !BuildTestExecutables($Targets, $Impacts, "exe64")) { exit(1); } diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 36748d66e..f2d63fa24 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -52,19 +52,27 @@ sub BuildNative($) { my ($NoRm) = @_; - mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); + # FIXME Temporary code to ensure compatibility during the transition + my $OldDir = "build-native"; + if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-native") + { + rename("$DataDir/$OldDir", "$DataDir/wine-native"); + # Add a symlink from compatibility with older server-side TestBot scripts + symlink("wine-native", "$DataDir/$OldDir"); + } + mkdir "$DataDir/wine-native" if (!-d "$DataDir/wine-native"); # Rebuild from scratch to make sure cruft will not accumulate InfoMsg "\nRebuilding native tools\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-native' && set -x && ". + system("cd '$DataDir/wine-native' && set -x && ". ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && ". "time make -j$CPUCount __tooldeps__"); if ($? != 0) { - LogMsg "Build native failed\n"; + LogMsg "The Wine native tools build failed\n"; return !1; } @@ -73,22 +81,30 @@ sub BuildNative($) sub BuildCross($$$) { - my ($Targets, $NoRm, $Bits) = @_; + my ($Targets, $NoRm, $Build) = @_; - return 1 if (!$Targets->{"exe$Bits"}); - mkdir "$DataDir/build-mingw$Bits" if (!-d "$DataDir/build-mingw$Bits"); + return 1 if (!$Targets->{$Build}); + # FIXME Temporary code to ensure compatibility during the transition + my $OldDir = $Build eq "exe32" ? "build-mingw32" : "build-mingw64"; + if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-$Build") + { + rename("$DataDir/$OldDir", "$DataDir/wine-$Build"); + # Add a symlink from compatibility with older server-side TestBot scripts + symlink("wine-$Build", "$DataDir/$OldDir"); + } + mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # Rebuild from scratch to make sure cruft will not accumulate - InfoMsg "\nRebuilding the $Bits-bit test executables\n"; + InfoMsg "\nRebuilding the $Build Wine test executables\n"; my $CPUCount = GetCPUCount(); - my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); - system("cd '$DataDir/build-mingw$Bits' && set -x && ". + my $Host = ($Build eq "exe64" ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); + system("cd '$DataDir/wine-$Build' && set -x && ". ($NoRm ? "" : "rm -rf * && ") . - "time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && ". + "time ../wine/configure --host=$Host --with-wine-tools=../wine-native --without-x --without-freetype --disable-winetest && ". "time make -j$CPUCount buildtests"); if ($? != 0) { - LogMsg "Build cross ($Bits bits) failed\n"; + LogMsg "The $Build Wine crossbuild failed\n"; return !1; } @@ -100,8 +116,8 @@ sub UpdateWineBuilds($$) my ($Targets, $NoRm) = @_; return BuildNative($NoRm) && - BuildCross($Targets, $NoRm, 32) && - BuildCross($Targets, $NoRm, 64); + BuildCross($Targets, $NoRm, "exe32") && + BuildCross($Targets, $NoRm, "exe64"); } diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index b30ddd190..2416eebfa 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -50,19 +50,27 @@ sub BuildWine($$$$) my ($Targets, $NoRm, $Build, $Extras) = @_; return 1 if (!$Targets->{$Build}); - mkdir "$DataDir/build-$Build" if (!-d "$DataDir/build-$Build"); + # FIXME Temporary code to ensure compatibility during the transition + my $OldDir = "build-$Build"; + if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-$Build") + { + rename("$DataDir/$OldDir", "$DataDir/wine-$Build"); + # Add a symlink from compatibility with older server-side TestBot scripts + symlink("wine-$Build", "$DataDir/$OldDir"); + } + mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # If $NoRm is not set, rebuild from scratch to make sure cruft will not # accumulate InfoMsg "\nRebuilding the $Build Wine\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-$Build' && set -x && ". + system("cd '$DataDir/wine-$Build' && set -x && ". ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure $Extras && ". "time make -j$CPUCount"); if ($? != 0) { - LogMsg "The $Build build failed\n"; + LogMsg "The $Build Wine build failed\n"; return !1; } @@ -75,7 +83,7 @@ sub UpdateWineBuilds($$) return BuildWine($Targets, $NoRm, "win32", "") && BuildWine($Targets, $NoRm, "wow64", "--enable-win64") && - BuildWine($Targets, $NoRm, "wow32", "--with-wine64='$DataDir/build-wow64'"); + BuildWine($Targets, $NoRm, "wow32", "--with-wine64='$DataDir/wine-wow64'"); } diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 9c264b485..9be73a42f 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -58,7 +58,7 @@ sub BuildWine($$) InfoMsg "\nRebuilding the $Build Wine\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-$Build' && set -x && ". + system("cd '$DataDir/wine-$Build' && set -x && ". "time make -j$CPUCount"); if ($? != 0) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 038c188f2..fd1b8467c 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -326,9 +326,9 @@ sub RunWine($$$) { my ($Build, $Cmd, $CmdArgs) = @_; - my $Magic = `cd '$DataDir/build-$Build' && file $Cmd`; + my $Magic = `cd '$DataDir/wine-$Build' && file $Cmd`; my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); - return system("cd '$DataDir/build-$Build' && set -x && ". + return system("cd '$DataDir/wine-$Build' && set -x && ". "time $Wine $Cmd $CmdArgs"); } @@ -354,7 +354,7 @@ sub CreateWinePrefix($$) { # Ensure the WinePrefix has been fully created and the registry files # saved before returning. - system("cd '$DataDir/build-$Build' && ./server/wineserver -w"); + system("cd '$DataDir/wine-$Build' && ./server/wineserver -w"); } return undef; -- 2.18.0

1 0

[PATCH] testbot: Improve the log naming scheme.
by Francois Gouget 23 Aug '18

23 Aug '18

Tasks generate multiple types of logs and reports: * 32 bit and / or 64 bit test reports(in *.report). * A list of inconsistencies found in each test report (in err). * A build or task log (in log). * A list of task errors (in err). * When a TestBot error occurs and a task gets restarted, the old task logs are preserved in *.old files. So far a task would generate either a single .report file or the log file which is why the above scheme was sufficient. However this is bound to change and there are additional constraints to accommodate: * Running the tests on Wine will generate both a build log and a test report. * It may also be desirable to run both the 32 and 64 bit WoW Wine tests in a single task which would result in it having both a wow32.report and a wow64.report file in addition to the log one. * If a task has two test reports the corresponding inconsistencies must be easily identifiable and kept separate. This also means not mixing them with the generic task errors. * WineTest's reference logs are stored in 'vmname_*.log' files where the variable part is computed differently for the Windows and Wine reports. So this patch tweaks the log and report naming scheme to avoid mixing messages from different sources and to make it easier to match logs and error files: * For each log or report called 'xxx', any additional error message will go to 'xxx.err'. This means any inconsistencies found in 'wow32.report' will go to 'wow32.report.err' and will not be mixed with those of the 64 bit report. * Old versions of a log, report or error file called 'xxx' will be concatenated in 'old_xxx' (and the corresponding old errors would be in 'old_xxx.err'). * The reference version of a report, log or error file called 'xxx' will be stored in 'vmname_xxx'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 15 ++++++++ testbot/bin/Janitor.pl | 2 +- testbot/bin/WineRunBuild.pl | 4 +-- testbot/bin/WineRunReconfig.pl | 4 +-- testbot/bin/WineRunTask.pl | 27 ++++++++------- testbot/bin/WineRunWineTest.pl | 32 ++++++++++------- testbot/bin/WineSendLog.pl | 22 ++++++------ testbot/lib/WineTestBot/LogUtils.pm | 54 ++++++++++++++++++++++++++--- testbot/lib/WineTestBot/Tasks.pm | 16 +++++---- testbot/web/JobDetails.pl | 4 +-- testbot/web/Munin.pl | 2 +- 11 files changed, 127 insertions(+), 55 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 4478d479b..79b25fac0 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -51,6 +51,7 @@ use WineTestBot::Engine::Notify; use WineTestBot::Engine::Scheduler; use WineTestBot::Jobs; use WineTestBot::Log; +use WineTestBot::LogUtils; # FIXME Temporary, for the log renaming use WineTestBot::Patches; use WineTestBot::PendingPatchSets; use WineTestBot::RecordGroups; @@ -102,6 +103,20 @@ sub Cleanup($;$$) { my ($Starting, $KillTasks, $KillVMs) = @_; + # FIXME Temporary: Rename the old logs so they follow the new naming scheme + # and can be identified by WineSendLog.pl and JobDetails.pl. + RenameReferenceLogs(); + foreach my $Job (@{CreateJobs()->GetItems()}) + { + foreach my $Step (@{$Job->Steps->GetItems()}) + { + foreach my $Task (@{$Step->Tasks->GetItems()}) + { + RenameTaskLogs($Task->GetDir()); + } + } + } + # Verify that the running tasks are still alive and requeue them if not. # Ignore the Job and Step status fields because they may be a bit out of date. my %RunningVMs; diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 18bbc3dea..120845121 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -311,7 +311,7 @@ if (opendir(my $dh, "$DataDir/latest")) { next if ($Entry eq "." or $Entry eq ".."); - if ($Entry =~ /^(.*)_[a-z0-9]+\.(?:err|log)$/) + if ($Entry =~ /^(.*)_[a-z0-9]+\.report(?:\.err)?$/) { # Keep the reference WineTest reports for all VMs even if they are # retired or scheduled for deletion. diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index b246164e5..cca96b92a 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -183,14 +183,14 @@ sub LogTaskError($) Debug("$Name0:error: ", $ErrMessage); my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/err")) + if (open(my $ErrFile, ">>", "$TaskDir/log.err")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'err' for writing: $!\n"; + Error "Unable to open 'log.err' for writing: $!\n"; } umask($OldUMask); } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 3fec02b89..19f5ed467 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -182,14 +182,14 @@ sub LogTaskError($) Debug("$Name0:error: ", $ErrMessage); my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/err")) + if (open(my $ErrFile, ">>", "$TaskDir/log.err")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'err' for writing: $!\n"; + Error "Unable to open 'log.err' for writing: $!\n"; } umask($OldUMask); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index c602979b1..5ff3fc4a5 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -214,14 +214,14 @@ sub LogTaskError($) Debug("$Name0:error: ", $ErrMessage); my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/err")) + if (open(my $ErrFile, ">>", "$TaskDir/log.err")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'err' for writing: $!\n"; + Error "Unable to open 'log.err' for writing: $!\n"; } umask($OldUMask); } @@ -296,15 +296,15 @@ sub WrapUpAndExit($;$$$) # Keep the old report if the new one is missing if (-f "$TaskDir/$RptFileName" and !-z "$TaskDir/$RptFileName") { - # Update the reference VM suite results for WineSendLog.pl - my $LatestBaseName = join("", "$DataDir/latest/", $Task->VM->Name, "_", - $Step->FileType eq "exe64" ? "64" : "32"); - unlink("$LatestBaseName.log"); - link("$TaskDir/$RptFileName", "$LatestBaseName.log"); - unlink("$LatestBaseName.err"); - if (-f "$TaskDir/err" and !-z "$TaskDir/err") + # Update the VM's reference WineTest results for WineSendLog.pl + my $RefReport = "$DataDir/latest/". $Task->VM->Name ."_$RptFileName"; + unlink($RefReport); + link("$TaskDir/$RptFileName", $RefReport); + + unlink("$RefReport.err"); + if (-f "$TaskDir/$RptFileName.err" and !-z "$TaskDir/$RptFileName.err") { - link("$TaskDir/err", "$LatestBaseName.err"); + link("$TaskDir/$RptFileName.err", "$RefReport.err"); } } } @@ -541,9 +541,12 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { # $LogFailures can legitimately be undefined in case of a timeout $TaskFailures += $LogFailures || 0; - foreach my $Error (@$LogErrors) + if (@$LogErrors and open(my $Log, ">", "$TaskDir/$RptFileName.err")) { - LogTaskError("$Error\n"); + # Save the extra errors detected by ParseWineTestReport() in + # $RptFileName.err (see WineRunWineTest.pl). + print $Log "$_\n" for (@$LogErrors); + close($Log); } } } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 2552a7c9d..0363a26b3 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -209,14 +209,14 @@ sub LogTaskError($) my ($ErrMessage) = @_; Debug("$Name0:error: ", $ErrMessage); - if (open(my $ErrFile, ">>", "$TaskDir/err")) + if (open(my $ErrFile, ">>", "$TaskDir/log.err")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'err' for writing: $!\n"; + Error "Unable to open 'log.err' for writing: $!\n"; } } @@ -295,15 +295,15 @@ sub WrapUpAndExit($;$$$) my $RptFileName = "$Build.report"; if (-f "$TaskDir/$RptFileName" and !-z "$TaskDir/$RptFileName") { - # Update the reference VM suite results for WineSendLog.pl - my $LatestBaseName = join("", "$DataDir/latest/", $Task->VM->Name, - "_$Build"); - unlink("$LatestBaseName.log"); - link("$TaskDir/$RptFileName", "$LatestBaseName.log"); - unlink("$LatestBaseName.err"); - if (-f "$TaskDir/err" and !-z "$TaskDir/err") + # Update the VM's reference WineTest results for WineSendLog.pl + my $RefReport = "$DataDir/latest/". $Task->VM->Name ."_$RptFileName"; + unlink($RefReport); + link("$TaskDir/$RptFileName", $RefReport); + + unlink("$RefReport.err"); + if (-f "$TaskDir/$RptFileName.err" and !-z "$TaskDir/$RptFileName.err") { - link("$TaskDir/err", "$LatestBaseName.err"); + link("$TaskDir/$RptFileName.err", "$RefReport.err"); } } } @@ -560,9 +560,17 @@ if ($Step->Type ne "build") { # $LogFailures can legitimately be undefined in case of a timeout $TaskFailures += $LogFailures || 0; - foreach my $Error (@$LogErrors) + if (@$LogErrors and open(my $Log, ">", "$TaskDir/$RptFileName.err")) { - LogTaskError("$Error\n"); + # Save the extra errors detected by ParseWineTestReport() in + # $RptFileName.err: + # - This keep the .report file clean. + # - Each .err file can be matched to its corresponding .report, even + # if there are multiple .report files in the directory. + # - The .err file can be moved to the latest directory next to the + # reference report. + print $Log "$_\n" for (@$LogErrors); + close($Log); } } } diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 368d830de..2127eadb7 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -327,7 +327,7 @@ EOF } close LOGFILE; - if (open ERRFILE, "<$TaskDir/err") + if (open ERRFILE, "<$TaskDir/log.err") { my $First = 1; while (defined($Line = <ERRFILE>)) @@ -365,7 +365,7 @@ EOF push @FailureKeys, $Key; } } - elsif (open ERRFILE, "<$TaskDir/err") + elsif (open ERRFILE, "<$TaskDir/log.err") { my $HasErrEntries = !1; my $Line; @@ -419,7 +419,7 @@ EOF close LOGFILE; } - if (open ERRFILE, "<$TaskDir/err") + if (open ERRFILE, "<$TaskDir/log.err") { my $Line; while (defined($Line = <ERRFILE>)) @@ -456,12 +456,12 @@ EOF my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - my ($BotFailure, $MessagesFromErr) = CheckErrLog("$TaskDir/err"); + my ($BotFailure, $MessagesFromErr) = CheckErrLog("$TaskDir/log.err"); if ($BotFailure) { # TestBot errors are not the developer's fault and prevent us from doing # any meaningful analysis. So skip. - Error "A TestBot error was found in $TaskDir/err\n"; + Error "A TestBot error was found in $TaskDir/log.err\n"; next; } @@ -470,9 +470,7 @@ EOF my $LogName = $LogFiles->[0] || "log"; if ($LogName =~ /\.report$/) { - $StepTask->FileName =~ m/^(.*)_test(64)?\.exe$/; - my ($BaseName, $Bits) = ($1, $2 || "32"); - my $LatestName = "$DataDir/latest/" . $StepTask->VM->Name . "_$Bits"; + my $LatestName = "$DataDir/latest/". $StepTask->VM->Name ."_$LogName"; my ($LatestBotFailure, $Dummy) = CheckErrLog("$LatestName.err"); if (! $LatestBotFailure) { @@ -481,13 +479,15 @@ EOF # Filter out failures that happened in the full test suite: # the test suite is run against code which is already in Wine # so any failure it reported is not caused by this patch. - $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/$LogName", + $StepTask->FileName =~ m/^(.*)_test/; + my $BaseName = $1; + $MessagesFromLog = CompareLogs($LatestName, "$TaskDir/$LogName", $BaseName, $StepTask->CmdLineArg); } } else { - Error "BotFailure found in ${LatestName}.err\n"; + Error "BotFailure found in $LatestName.err\n"; } } elsif (open(my $LogFile, "<", "$TaskDir/$LogName")) @@ -596,7 +596,7 @@ EOF close($logfile); } - if (open(my $errfile, "<", "$TaskDir/err")) + if (open(my $errfile, "<", "$TaskDir/log.err")) { my $Line; while (defined($Line = <$errfile>)) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e05afb605..6f7cef5e8 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -29,6 +29,7 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogLineCategory GetReportLineCategory + RenameReferenceLogs RenameTaskLogs ParseTaskLog ParseWineTestReport); use File::Basename; @@ -485,6 +486,49 @@ sub GetReportLineCategory($) # Log querying and formatting # +sub RenameReferenceLogs() +{ + if (opendir(my $dh, "$DataDir/latest")) + { + # We will be renaming files so read the directory in one go + my @Entries = readdir($dh); + close($dh); + foreach my $Entry (@Entries) + { + if ($Entry =~ /^([a-z0-9._]+)$/) + { + my $NewName = $Entry = $1; + $NewName =~ s/\.log$/.report/; + $NewName =~ s/(_[a-z0-9]+)\.err$/$1.report.err/; + $NewName =~ s/_(32|64)\.report/_exe$1.report/; + if ($Entry ne $NewName and !-f "$DataDir/latest/$NewName") + { + rename "$DataDir/latest/$Entry", "$DataDir/latest/$NewName"; + } + } + } + } +} + +sub RenameTaskLogs($) +{ + my ($Dir) = @_; + + if (-f "$Dir/err" and !-f "$Dir/log.err") + { + rename "$Dir/err", "$Dir/log.err"; + } + + if (-f "$Dir/log.old" and !-f "$Dir/old_log") + { + rename "$Dir/log.old", "$Dir/old_log"; + } + if (-f "$Dir/err.old" and !-f "$Dir/old_log.err") + { + rename "$Dir/err.old", "$Dir/old_log.err"; + } +} + =pod =over 12 @@ -503,8 +547,8 @@ sub GetLogFileNames($;$) my @Candidates = ("exe32.report", "exe64.report", "win32.report", "wow32.report", "wow64.report", - "log", "err"); - push @Candidates, "log.old", "err.old" if ($IncludeOld); + "log", "log.err"); + push @Candidates, "old_log", "old_log.err" if ($IncludeOld); my @Logs; foreach my $FileName (@Candidates) @@ -521,9 +565,9 @@ my %_LogFileLabels = ( "wow32.report" => "32 bit WoW Wine report", "wow64.report" => "64 bit Wow Wine report", "log" => "task log", - "err" => "task errors", - "log.old" => "old logs", - "err.old" => "old task errors", + "log.err" => "task errors", + "old_log" => "old logs", + "old_log.err" => "old task errors", ); =pod diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 70b620544..084784a3b 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -117,13 +117,15 @@ sub _SetupTask($$) if (-d $Dir) { mkpath("$Dir.new", 0, 0775); - rename "$Dir/log.old", "$Dir.new/log.old" if (-f "$Dir/log.old"); - rename "$Dir/err.old", "$Dir.new/err.old" if (-f "$Dir/err.old"); - foreach my $Filename ("log", "err") + foreach my $Filename ("log", "log.err") { + if (-f "$Dir/old_$Filename") + { + rename "$Dir/old_$Filename", "$Dir.new/old_$Filename"; + } if (open(my $Src, "<", "$Dir/$Filename")) { - if (open(my $Dst, ">>", "$Dir.new/$Filename.old")) + if (open(my $Dst, ">>", "$Dir.new/old_$Filename")) { print $Dst "----- Run ", ($self->TestFailures || 0), " $Filename\n"; while (my $Line = <$Src>) @@ -142,7 +144,7 @@ sub _SetupTask($$) # Capture Perl errors in the task's generic error log my $TaskDir = $self->CreateDir(); - if (open(STDERR, ">>", "$TaskDir/err")) + if (open(STDERR, ">>", "$TaskDir/log.err")) { # Make sure stderr still flushes after each print my $tmp=select(STDERR); @@ -152,7 +154,7 @@ sub _SetupTask($$) else { require WineTestBot::Log; - WineTestBot::Log::LogMsg("unable to redirect stderr to '$TaskDir/err': $!\n"); + WineTestBot::Log::LogMsg("unable to redirect stderr to '$TaskDir/log.err': $!\n"); } } @@ -215,7 +217,7 @@ sub UpdateStatus($$) my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $OldUMask = umask(002); my $TaskDir = $self->CreateDir(); - if (open TASKLOG, ">>$TaskDir/err") + if (open TASKLOG, ">>$TaskDir/log.err") { print TASKLOG "TestBot process got stuck or died unexpectedly\n"; close TASKLOG; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index ee4e53930..e1fe20f18 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -393,7 +393,7 @@ sub GenerateBody($) print "</div>\n"; my $LogName = $MoreInfo->{Full} || $MoreInfo->{Logs}->[0] || "log"; - my $ErrName = $LogName eq "log.old" ? "err.old" : "err"; + my $ErrName = "$LogName.err"; my ($EmptyDiag, $LogFirst) = (undef, 1); if (open(my $LogFile, "<", "$TaskDir/$LogName")) @@ -472,7 +472,7 @@ sub GenerateBody($) if (!$LogFirst) { print "<div class='HrTitle'>". - ($ErrName eq "err" ? "Other errors" : "Old errors") . + ($ErrName =~ /^old_/ ? "Old errors" : "Extra errors") . "<div class='HrLine'></div></div>\n"; } print "<pre><code>"; diff --git a/testbot/web/Munin.pl b/testbot/web/Munin.pl index 840d912f1..35160a159 100755 --- a/testbot/web/Munin.pl +++ b/testbot/web/Munin.pl @@ -441,7 +441,7 @@ sub GetOutput($) foreach my $VM (@SortedVMs) { next if ($VM->Type ne "win32" and $VM->Type ne "win64"); - my $Filename = "$DataDir/latest/". $VM->Name ."_$Bitness.log"; + my $Filename = "$DataDir/latest/". $VM->Name ."_exe$Bitness.report"; my $Size = -s $Filename; if (defined $Size) { -- 2.18.0

1 0

[PATCH] testbot/WineRunBuild: Check dependencies when grabbing test executables.
by Francois Gouget 23 Aug '18

23 Aug '18

There is no need to try and grab test executables for steps that don't depend on this build step. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 32369b191..2c5fbfa29 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -342,7 +342,8 @@ if ($Step->FileType ne "patch") my (%Bitnesses, %TestExes); foreach my $TestStep (@{$Job->Steps->GetItems()}) { - if ($TestStep->FileType =~ /^exe([0-9]+)$/) + if (($TestStep->PreviousNo || 0) == $Step->No and + $TestStep->FileType =~ /^exe([0-9]+)$/) { $Bitnesses{$1} = 1; $TestExes{$TestStep->FileName} = 1; -- 2.18.0

1 0

[PATCH] testbot: Remove support for the old task status lines.
by Francois Gouget 23 Aug '18

23 Aug '18

Note that there is no need to wait for all task logs to be in the new format because ParseTaskLog() is only called when a new task completes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunWineTest.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 2c5fbfa29..b246164e5 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -406,7 +406,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); if ($TA->GetFile("Build.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log", "Build"); + my $Result = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index b45dba5c7..3fec02b89 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -388,7 +388,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log", "Reconfig"); + my $Result = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 216811116..2552a7c9d 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -499,7 +499,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log", "Task"); + my $Result = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index d39c81b38..e05afb605 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -50,9 +50,9 @@ Returns ok if the task was successful and an error code otherwise. =back =cut -sub ParseTaskLog($$) +sub ParseTaskLog($) { - my ($FileName, $ResultPrefix) = @_; + my ($FileName) = @_; if (open(my $LogFile, "<", $FileName)) { @@ -60,16 +60,16 @@ sub ParseTaskLog($$) foreach my $Line (<$LogFile>) { chomp $Line; - if ($Line =~ /^(?:$ResultPrefix|Task): ok$/) + if ($Line =~ /^Task: ok$/) { $Result ||= "ok"; } - elsif ($Line =~ /^(?:$ResultPrefix|Task): Patch failed to apply$/) + elsif ($Line =~ /^Task: Patch failed to apply$/) { $Result = "badpatch"; last; # Should be the last and most specific message } - elsif ($Line =~ /^(?:$ResultPrefix|Task): /) + elsif ($Line =~ /^Task: /) { $Result = "failed"; } -- 2.18.0

1 0

[PATCH] odbccp32: Fake success from SQLWriteDSNToIni/W
by Alistair Leslie-Hughes 23 Aug '18

23 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index fa82ca9..a9b58fa 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1585,7 +1585,7 @@ BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver) clear_errors(); FIXME("%s %s\n", debugstr_w(lpszDSN), debugstr_w(lpszDriver)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return TRUE; } BOOL WINAPI SQLWriteDSNToIni(LPCSTR lpszDSN, LPCSTR lpszDriver) @@ -1593,7 +1593,7 @@ BOOL WINAPI SQLWriteDSNToIni(LPCSTR lpszDSN, LPCSTR lpszDriver) clear_errors(); FIXME("%s %s\n", debugstr_a(lpszDSN), debugstr_a(lpszDriver)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return TRUE; } BOOL WINAPI SQLWriteFileDSNW(LPCWSTR lpszFileName, LPCWSTR lpszAppName, -- 1.9.1

1 0

[PATCH] shell32: Add start menu icon
by Alex Henrie 23 Aug '18

23 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/menu.ico | Bin 0 -> 4696 bytes dlls/shell32/resources/menu.svg | 214 ++++++++++++++++++++++++++++++++ dlls/shell32/shresdef.h | 1 + 4 files changed, 216 insertions(+) create mode 100644 dlls/shell32/resources/menu.ico create mode 100644 dlls/shell32/resources/menu.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index bef3f6304a..886301542d 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -74,6 +74,7 @@ SVG_SRCS = \ resources/folder_open.svg \ resources/help.svg \ resources/internet.svg \ + resources/menu.svg \ resources/mycomputer.svg \ resources/mydocs.svg \ resources/netdrive.svg \ diff --git a/dlls/shell32/resources/menu.ico b/dlls/shell32/resources/menu.ico new file mode 100644 index 0000000000000000000000000000000000000000..516fb3a9fe0b25920321fd679a58aea0cc8396a3 GIT binary patch literal 4696 zcmeHKOK4M35Iy<We45aw1r=9s;isGEZ39|@&?F=@K@+qD>`D{UC@%a|Voen!gn;cT zf(r%fwzv|z5mEd^iz~&I3q`S{n^LS+gj!;0oZEPtJW<}Ib&*8|CNt;W^JXS<@4$P2 z0d{aPKt;|7jFZopk+1>G1ay$r<Ng*c9<c$c`kQY69yqjk#;L_y+W<wW^6ycukfOzl zf8aYCfzd<JUZ;H<FVq<h1^RfkT&-p@3zy?_WXvah5g#y7XkAKdAgm@seG%Z&P9U2H z%CwZ70WL6LHV$}h0$a|FJv_XhHjKv)^afD5T6p!8kR=_C1T7`&=1nF`W}@_#mXu^7 zIz+q-Wu^LH<+`V3JVy9TIN*zA-p_q3+9sI;#l`a1cSrK7{qsS?bN|mD--)V`V;5hx ze_5~(zGz*(|LM(c!=z1(V$e9!?j1wPtnA8muVG1(p$;4!63NP)+t;6l*H;%^<7RK% z{+56A*#BWZcf~Qfu79)I22BD2Q`5`Sis?zu^%UJo>_`Xu(*ucg%9A{wB7-j0+3jN8 zt}b_sF%NTl*ghBA>tSs6^{`v>!0EFCr%nw2`+-~6iUpoL9E=9;`s29{^6BOvPRb{P zOSWoOd>WjlG*AaBD+0*cC0=_EAZumg>hWar37%d&*?kdD*2=~eyym<#&@f1pBF;_L z%HA8nlZ~s#6Y*rNUOd@-*?fX08&~j}^CEFc8;By#P1cHgA!}vh>hWar37%d&*?kdD z*2=~eJU%Zfsh4#1eT;k|jrKlPt-JO+546>5ZAa_XbGWbFtsy;LvtPAdaj)60YCrV) vAiAc<<M&G;RY}D>ddU~^zvr=1;qUgqGx`qXDzNNYvtDsBf48EaYwhnZVuEqx literal 0 HcmV?d00001 diff --git a/dlls/shell32/resources/menu.svg b/dlls/shell32/resources/menu.svg new file mode 100644 index 0000000000..408803b4bb --- /dev/null +++ b/dlls/shell32/resources/menu.svg @@ -0,0 +1,214 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + id="svg8" + version="1.1" + viewBox="0 0 632 272" + height="272" + width="632"> + <defs + id="defs2" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <rect + y="200" + x="40" + height="32" + width="192" + id="rect815" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="120" + x="40" + height="32" + width="192" + id="rect815-3" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="40" + x="40" + height="32" + width="192" + id="rect815-3-6" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <rect + y="256" + x="278" + height="6" + width="36" + id="rect815-7" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0stroke-opacity:1" /> + <rect + y="241" + x="278" + height="6" + width="36" + id="rect815-3-5" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="226" + x="278" + height="6" + width="36" + id="rect815-3-6-3" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + id="icon:48-32" + height="48" + width="48" + y="220" + x="272" + style="fill:none" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAcIAAAHCAAXfPIkwAAAAHdElNRQfiCBYRBApLB7b2AAAANklEQVRYw+3UMQ4AIAgAMfT/f8bZ +WUVN2o2FCwsRsKpNU+7f2k9fIHA/ABTwrgWAL3jXAvCCAcmqAyIux0X6AAAAJXRFWHRkYXRlOmNy +ZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEwLTA2OjAw89BlqAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAx +OC0wOC0yMlQyMzowNDoxMC0wNjowMIKN3RQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5v +cmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:48-8" + x="328" + y="220" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAcIAAAHCAAXfPIkwAAAAHdElNRQfiCBYRBApLB7b2AAAANklEQVRYw+3UMQ4AIAgAMfT/f8bZ +WUVN2o2FCwsRsKpNU+7f2k9fIHA/ABTwrgWAL3jXAvCCAcmqAyIux0X6AAAAJXRFWHRkYXRlOmNy +ZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEwLTA2OjAw89BlqAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAx +OC0wOC0yMlQyMzowNDoxMC0wNjowMIKN3RQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5v +cmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:48-4" + x="384" + y="220" /> + <rect + y="260" + x="444" + height="4" + width="24" + id="rect815-7-5" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="250" + x="444" + height="4" + width="24" + id="rect815-3-5-6" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="240" + x="444" + height="4" + width="24" + id="rect815-3-6-3-2" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + id="icon:32-32" + height="32" + width="32" + y="236" + x="440" + style="fill:none" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAASwAAAEsAAdCmVQYAAAAHdElNRQfiCBYRBApLB7b2AAAAK0lEQVRIx2NgGAWMcNZ/8nQyUeqC +gTdgFAwGMJoSR8HgAKMpcRQwMDAwAAD3KQMWtPUZjwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0w +OC0yMlQyMzowNDoxMC0wNjowMPPQZagAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTgtMDgtMjJUMjM6 +MDQ6MTAtMDY6MDCCjd0UAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJ +RU5ErkJggg== +" + id="icon:32-8" + x="480" + y="236" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAASwAAAEsAAdCmVQYAAAAHdElNRQfiCBYRBApLB7b2AAAAK0lEQVRIx2NgGAWMcNZ/8nQyUeqC +gTdgFAwGMJoSR8HgAKMpcRQwMDAwAAD3KQMWtPUZjwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0w +OC0yMlQyMzowNDoxMC0wNjowMPPQZagAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTgtMDgtMjJUMjM6 +MDQ6MTAtMDY6MDCCjd0UAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJ +RU5ErkJggg== +" + id="icon:32-4" + x="520" + y="236" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBYRChrIM4scAAAAHklEQVQoz2NgoBQwMjAwMDD8xy3L +RLEVlINRRxIJAHSgAwpvTcLEAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTIyVDIzOjEwOjI2 +LTA2OjAw1uooywAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yMlQyMzoxMDoyNi0wNjowMKe3 +kHcAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:16-32" + x="560" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBYRBAs8AIZgAAAAHklEQVQoz2NgoBQwMjAwMDD8xy3L +RLEVlINRRxIJAHSgAwpvTcLEAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEx +LTA2OjAwVaduHAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yMlQyMzowNDoxMS0wNjowMCT6 +1qAAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:16-8" + x="584" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBYRBAs8AIZgAAAAHklEQVQoz2NgoBQwMjAwMDD8xy3L +RLEVlINRRxIJAHSgAwpvTcLEAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEx +LTA2OjAwVaduHAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yMlQyMzowNDoxMS0wNjowMCT6 +1qAAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:16-4" + x="608" + y="252" /> +</svg> diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 178fa789ae..5a637e95ba 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -208,6 +208,7 @@ #define IDI_SHELL_APP_FOLDER 37 #define IDI_SHELL_PRINTERS_FOLDER 38 #define IDI_SHELL_FONTS_FOLDER 39 +#define IDI_SHELL_START_MENU 40 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142 -- 2.18.0

1 0

[PATCH v2] quartz: Return correct error in IBasicAudio put_Volume
by Alistair Leslie-Hughes 23 Aug '18

23 Aug '18

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=45366 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/quartz/filtergraph.c | 2 ++ dlls/quartz/tests/filtergraph.c | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0113674..210eb3e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -3140,6 +3140,8 @@ static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, LONG lVolume) if (hr == S_OK) hr = IBasicAudio_put_Volume(pBasicAudio, lVolume); + else + hr = E_NOTIMPL; LeaveCriticalSection(&This->cs); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 85079d9..d73cde7 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -67,6 +67,20 @@ static WCHAR *load_resource(const WCHAR *name) return pathW; } +static void test_basic_audio(IFilterGraph2 *graph, HRESULT expected) +{ + IBasicAudio* basic; + HRESULT hr; + + hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicAudio, (void **)&basic); + ok(hr==S_OK, "Cannot get IBasicAudio interface returned: %x\n", hr); + + hr = IBasicAudio_put_Volume(basic, 0); + ok(hr==expected, "expected %x got %x\n", expected, hr); + + IBasicAudio_Release(basic); +} + static IFilterGraph2 *create_graph(void) { IFilterGraph2 *ret; @@ -540,7 +554,7 @@ static HRESULT test_graph_builder_connect(WCHAR *filename) return hr; } -static void test_render_run(const WCHAR *file) +static void test_render_run(const WCHAR *file, HRESULT expected ) { IFilterGraph2 *graph; HANDLE h; @@ -576,6 +590,7 @@ todo_wine { ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "RenderFile failed: %x\n", hr); rungraph(graph); + test_basic_audio(graph, expected); refs = IFilterGraph2_Release(graph); ok(!refs, "Graph has %u references\n", refs); @@ -620,6 +635,7 @@ static void test_render_with_multithread(void) thread = CreateThread(NULL, 0, call_RenderFile_multithread, graph, 0, NULL); ok(WaitForSingleObject(thread, 1000) == WAIT_OBJECT_0, "wait failed\n"); + IFilterGraph2_Release(graph); CloseHandle(thread); CoUninitialize(); @@ -2291,8 +2307,8 @@ START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); - test_render_run(avifile); - test_render_run(mpegfile); + test_render_run(avifile, E_NOTIMPL); + test_render_run(mpegfile, S_OK); test_graph_builder(); test_render_filter_priority(); test_aggregate_filter_graph(); -- 1.9.1

2 1

[PATCH] shell32: Use Public instead of AllUsersProfile in the registry. (v2)
by Dmitry Timoshkov 23 Aug '18

23 Aug '18

This matches what recent Windows versions set in the process environment. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shellpath.c | 13 +++++++------ dlls/userenv/userenv_main.c | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index de4bf7d566..4b92e82065 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -951,13 +951,12 @@ static const WCHAR Videos_Sample_VideosW[] = {'V','i','d','e','o','s','\\','S',' static const WCHAR WindowsW[] = {'W','i','n','d','o','w','s',0}; static const WCHAR Windows_Sidebar_GadgetsW[] = {'W','i','n','d','o','w','s',' ','S','i','d','e','b','a','r','\\','G','a','d','g','e','t','s',0}; static const WCHAR DefaultW[] = {'.','D','e','f','a','u','l','t','\0'}; -static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'}; +static const WCHAR AllUsersProfileW[] = {'%','P','U','B','L','I','C','%',0}; static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'}; static const WCHAR ProgramDataVarW[] = {'%','P','r','o','g','r','a','m','D','a','t','a','%','\0'}; static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'}; static const WCHAR ProfileListW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','P','r','o','f','i','l','e','L','i','s','t',0}; static const WCHAR ProfilesDirectoryW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; -static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szDefaultProfileDirW[] = {'u','s','e','r','s',0}; @@ -3806,11 +3805,13 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) { if (!strncmpiW(szTemp, AllUsersProfileW, strlenW(AllUsersProfileW))) { - WCHAR szAllUsers[MAX_PATH]; + WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; - strcpyW(szDest, szProfilesPrefix); - hr = _SHGetProfilesValue(key, AllUsersProfileValueW, - szAllUsers, AllUsersW); + GetSystemDirectoryW(def_val, MAX_PATH); + if (def_val[1] == ':') strcpyW( def_val + 3, UsersPublicW ); + else FIXME("non-drive system paths unsupported\n"); + + hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); PathAppendW(szDest, szAllUsers); PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); } diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 538b912b20..06c7653836 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -244,7 +244,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, static const WCHAR SystemRootW[] = {'S','y','s','t','e','m','R','o','o','t',0}; static const WCHAR SystemDriveW[] = {'S','y','s','t','e','m','D','r','i','v','e',0}; - static const WCHAR AllUsersProfileW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e',0}; + static const WCHAR AllUsersProfileW[] = {'P','u','b','l','i','c',0}; static const WCHAR ALLUSERSPROFILEW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; static const WCHAR USERNAMEW[] = {'U','S','E','R','N','A','M','E',0}; static const WCHAR USERPROFILEW[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; -- 2.17.1

1 0

[PATCH] comctl32: Correct spelling for ComboBox window class
by Fabian Maurer 22 Aug '18

22 Aug '18

Some programs try to get the class name, so this needs to have correct casing. Note: For some reason, you will need a proper clean to see the changes, just rebuilding is *not* enough. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/comctl32.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/comctl32.manifest b/dlls/comctl32/comctl32.manifest index 4c86137667..fa5df29634 100644 --- a/dlls/comctl32/comctl32.manifest +++ b/dlls/comctl32/comctl32.manifest @@ -6,7 +6,7 @@ <windowClass>ButtonListBox</windowClass> <windowClass>ComboBoxEx32</windowClass> <windowClass>ComboLBox</windowClass> - <windowClass>Combobox</windowClass> + <windowClass>ComboBox</windowClass> <windowClass>Edit</windowClass> <windowClass>Listbox</windowClass> <windowClass>NativeFontCtl</windowClass> -- 2.18.0

2 2

[PATCH v2 1/4] comctl32/edit: Get rid of useless float cast
by Gabriel Ivăncescu 22 Aug '18

22 Aug '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Use a signed variable to get rid of some casts. dlls/comctl32/edit.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 10ff5fb..4e47647 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -4911,9 +4911,10 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_MOUSEWHEEL: { - int wheelDelta; - UINT pulScrollLines = 3; - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + INT wheelDelta, pulScrollLines; + UINT tmp = 3; + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &tmp, 0); + pulScrollLines = tmp; if (wParam & (MK_SHIFT | MK_CONTROL)) { @@ -4931,10 +4932,10 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (es->wheelDeltaRemainder && pulScrollLines) { - int cLineScroll; - pulScrollLines = (int) min((UINT) es->line_count, pulScrollLines); - cLineScroll = pulScrollLines * (float)es->wheelDeltaRemainder / WHEEL_DELTA; - es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + INT cLineScroll; + pulScrollLines = min((UINT)es->line_count, pulScrollLines); + cLineScroll = (pulScrollLines * es->wheelDeltaRemainder) / WHEEL_DELTA; + es->wheelDeltaRemainder -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; result = EDIT_EM_LineScroll(es, 0, -cLineScroll); } break; -- 1.9.1

1 3

[PATCH v2 1/2] comctl32/listbox: Handle Mouse Wheel scrolling for multi-column listboxes properly
by Gabriel Ivăncescu 22 Aug '18

22 Aug '18

Multi-column listboxes scroll horizontally, so each wheel tick must go an entire page at a time instead of an item at a time. But we have to limit the amount of scrolling in this case to avoid "jumping over" columns, if the window is too small. This matches Windows behavior. The calculation has also been simplified to just integer arithmetic in all cases, since the division (the only operation with a fractional result) was immediately truncated to integer anyway, so the float cast was useless. This works fine because the multiplication is done before the division (parentheses have been added to emphasize this point). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Use a signed variable to get rid of some casts. dlls/comctl32/listbox.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 5235ffd..234114f 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1988,9 +1988,11 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - UINT pulScrollLines = 3; + INT pulScrollLines; + UINT tmp = 3; - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &tmp, 0); + pulScrollLines = tmp; /* if scrolling changes direction, ignore left overs */ if ((delta < 0 && descr->wheel_remain < 0) || @@ -2001,10 +2003,21 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { - int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + INT cLineScroll; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min((UINT)descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1U, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min((UINT)descr->page_size, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0; -- 1.9.1

1 1

[PATCH 1/2] comctl32/listbox: Handle Mouse Wheel scrolling for multi-column listboxes properly
by Gabriel Ivăncescu 22 Aug '18

22 Aug '18

Multi-column listboxes scroll horizontally, so each wheel tick must go an entire page at a time instead of an item at a time. But we have to limit the amount of scrolling in this case to avoid "jumping over" columns, if the window is too small. This matches Windows behavior. The calculation has also been simplified to just integer arithmetic in all cases, since the division (the only operation with a fractional result) was immediately truncated to integer anyway, so the float cast was useless. This works fine because the multiplication is done before the division (parentheses have been added to emphasize this point). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index b3491bb..9275db9 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2002,10 +2002,21 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { - int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + INT cLineScroll; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min((UINT)descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1, pulScrollLines); + cLineScroll = ((INT)pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / (INT)pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min((UINT) descr->page_size, pulScrollLines); + cLineScroll = ((INT)pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / (INT)pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0; -- 1.9.1

3 8

[PATCH] [PATCH v3 1/2] iphlpapi: Implement GetUdp6Table().
by Guillaume Charifi 22 Aug '18

22 Aug '18

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 30 ++++- dlls/iphlpapi/ipstats.c | 241 ++++++++++++++++++++++++++++++++++ dlls/iphlpapi/ipstats.h | 1 + include/iphlpapi.h | 2 + include/udpmib.h | 53 ++++++++ 6 files changed, 322 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 1686644de0..fd00cc093a 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -141,7 +141,7 @@ @ stdcall GetTcpTable2( ptr ptr long ) @ stub GetTcpTableFromStack #@ stub GetTeredoPort -#@ stub GetUdp6Table +@ stdcall GetUdp6Table( ptr ptr long ) @ stdcall GetUdpStatisticsEx( ptr long ) @ stdcall GetUdpStatistics( ptr ) @ stub GetUdpStatsFromStack diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7de70c9ef4..c7140cd974 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2442,6 +2442,14 @@ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET, UDP_TABLE_BASIC, 0); } +/****************************************************************** + * GetUdp6Table (IPHLPAPI.@) + */ +DWORD WINAPI GetUdp6Table(PMIB_UDP6TABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) +{ + return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET6, UDP_TABLE_BASIC, 0); +} + /****************************************************************** * GetExtendedUdpTable (IPHLPAPI.@) */ @@ -2456,15 +2464,25 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, if (!pdwSize) return ERROR_INVALID_PARAMETER; - if (ulAf != WS_AF_INET) - { - FIXME("ulAf = %u not supported\n", ulAf); - return ERROR_NOT_SUPPORTED; - } if (TableClass == UDP_TABLE_OWNER_MODULE) FIXME("UDP_TABLE_OWNER_MODULE not fully supported\n"); - if ((ret = build_udp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size))) + switch (ulAf) + { + case WS_AF_INET: + ret = build_udp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); + break; + + case WS_AF_INET6: + ret = build_udp6_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); + break; + + default: + FIXME("ulAf = %u not supported\n", ulAf); + ret = ERROR_NOT_SUPPORTED; + } + + if (ret) return ret; if (!pUdpTable || *pdwSize < size) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 799d03d574..08d1fa428b 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2565,6 +2565,247 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE return ret; } +static DWORD get_udp6_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) +{ + DWORD table_size; + + switch (class) + { + case UDP_TABLE_BASIC: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW); + break; + } + case UDP_TABLE_OWNER_PID: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE_OWNER_PID, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW_OWNER_PID); + break; + } + case UDP_TABLE_OWNER_MODULE: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE_OWNER_MODULE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW_OWNER_MODULE); + break; + } + default: + ERR("unhandled class %u\n", class); + return 0; + } + return table_size; +} + +static MIB_UDP6TABLE *append_udp6_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, + MIB_UDP6TABLE *table, DWORD *count, + const MIB_UDP6ROW_OWNER_MODULE *row, DWORD row_size ) +{ + if (table->dwNumEntries >= *count) + { + MIB_UDP6TABLE *new_table; + DWORD new_count = table->dwNumEntries * 2, new_table_size; + + new_table_size = get_udp6_table_sizes( class, new_count, NULL ); + if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) + { + HeapFree( heap, 0, table ); + return NULL; + } + *count = new_count; + table = new_table; + } + memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); + table->dwNumEntries++; + return table; +} + +static int compare_udp6_rows(const void *a, const void *b) +{ + const MIB_UDP6ROW *rowA = a; + const MIB_UDP6ROW *rowB = b; + int ret; + + if ((ret = memcmp(&rowA->dwLocalAddr, &rowB->dwLocalAddr, sizeof(rowA->dwLocalAddr)) != 0)) return ret; + if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; + return rowA->dwLocalPort - rowB->dwLocalPort; +} + +struct ipv6_addr_scope +{ + IN6_ADDR addr; + DWORD scope; +}; + +static struct ipv6_addr_scope *get_ipv6_addr_scope_table(unsigned int *size) +{ + struct ipv6_addr_scope *table = NULL; + unsigned int table_size = 0; + + if (!(table = HeapAlloc( GetProcessHeap(), 0, sizeof(table[0]) ))) + return NULL; + +#ifdef __linux__ + { + FILE *fp; + char buf[512], *ptr; + + if (!(fp = fopen( "/proc/net/if_inet6", "r" ))) + goto failed; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + WORD a[8]; + DWORD scope; + struct ipv6_addr_scope *new_table; + struct ipv6_addr_scope *entry; + unsigned int i; + + if (sscanf( ptr, "%4hx%4hx%4hx%4hx%4hx%4hx%4hx%4hx %*s %*s %x", + &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6], &a[7], &scope ) != 9) + continue; + + table_size++; + if (!(new_table = HeapReAlloc( GetProcessHeap(), 0, table, table_size * sizeof(table[0]) ))) + { + fclose(fp); + goto failed; + } + + table = new_table; + entry = &table[table_size - 1]; + + i = 0; + while (i < 8) + { + entry->addr.u.Word[i] = htons(a[i]); + i++; + } + + entry->scope = htons(scope); + } + } +#else + FIXME( "not implemented\n" ); + goto failed; +#endif + + *size = table_size; + return table; + +failed: + HeapFree( GetProcessHeap(), 0, table ); + return NULL; +} + +static DWORD find_ipv6_addr_scope(const IN6_ADDR *addr, const struct ipv6_addr_scope *table, unsigned int size) +{ + const BYTE multicast_scope_mask = 0x0F; + const BYTE multicast_scope_shift = 0; + unsigned int i = 0; + + if (IN6_IS_ADDR_UNSPECIFIED(addr)) + return 0; + + if (IN6_IS_ADDR_MULTICAST(addr)) + return htons((addr->u.Byte[1] & multicast_scope_mask) >> multicast_scope_shift); + + if (!table) + return -1; + + while (i < size) + { + if (memcmp(&table[i].addr, addr, sizeof(table[i].addr)) == 0) + return table[i].scope; + i++; + } + + return -1; +} + +DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE heap, DWORD flags, + DWORD *size ) +{ + MIB_UDP6TABLE *table; + MIB_UDP6ROW_OWNER_MODULE row; + DWORD ret = NO_ERROR, count = 16, table_size, row_size; + + if (!(table_size = get_udp6_table_sizes( class, count, &row_size ))) + return ERROR_INVALID_PARAMETER; + + if (!(table = HeapAlloc( heap, flags, table_size ))) + return ERROR_OUTOFMEMORY; + + table->dwNumEntries = 0; + memset( &row, 0, sizeof(row) ); + +#ifdef __linux__ + { + FILE *fp; + + if ((fp = fopen( "/proc/net/udp6", "r" ))) + { + char buf[512], *ptr; + struct pid_map *map = NULL; + unsigned int num_entries = 0; + struct ipv6_addr_scope *addr_scopes; + unsigned int addr_scopes_size = 0; + unsigned int dummy; + int inode; + + addr_scopes = get_ipv6_addr_scope_table(&addr_scopes_size); + + if (class >= UDP_TABLE_OWNER_PID) map = get_pid_map( &num_entries ); + + /* skip header line */ + ptr = fgets( buf, sizeof(buf), fp ); + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + DWORD in6_addr32[4]; + + if (sscanf( ptr, "%u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", &dummy, + &in6_addr32[0], &in6_addr32[1], &in6_addr32[2], &in6_addr32[3], + &row.dwLocalPort, &inode ) != 7) + continue; + memcpy(&row.ucLocalAddr, in6_addr32, sizeof(row.ucLocalAddr)); + row.dwLocalScopeId = find_ipv6_addr_scope((const IN6_ADDR *)&row.ucLocalAddr, addr_scopes, addr_scopes_size); + row.dwLocalPort = htons( row.dwLocalPort ); + + if (class >= UDP_TABLE_OWNER_PID) + row.dwOwningPid = find_owning_pid( map, num_entries, inode ); + if (class >= UDP_TABLE_OWNER_MODULE) + { + row.liCreateTimestamp.QuadPart = 0; /* FIXME */ + row.u.dwFlags = 0; + memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); + } + if (!(table = append_udp6_row( class, heap, flags, table, &count, &row, row_size ))) + break; + } + HeapFree( GetProcessHeap(), 0, map ); + if (addr_scopes) + HeapFree( GetProcessHeap(), 0, addr_scopes ); + fclose( fp ); + } + else ret = ERROR_NOT_SUPPORTED; + } +#else + FIXME( "not implemented\n" ); + ret = ERROR_NOT_SUPPORTED; +#endif + + if (!table) return ERROR_OUTOFMEMORY; + if (!ret) + { + if (order && table->dwNumEntries) + qsort( table->table, table->dwNumEntries, row_size, compare_udp6_rows ); + *tablep = table; + } + else HeapFree( heap, flags, table ); + if (size) *size = get_udp6_table_sizes( class, count, NULL ); + TRACE( "returning ret %u table %p\n", ret, table ); + return ret; +} + /****************************************************************** * AllocateAndGetUdpTableFromStack (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index d742d6380a..acf43ee27c 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -34,5 +34,6 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDE DWORD build_tcp_table(TCP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; DWORD build_udp_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; +DWORD build_udp6_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; #endif /* ndef WINE_IPSTATS_H_ */ diff --git a/include/iphlpapi.h b/include/iphlpapi.h index 54d93d1c9c..86507dfd4d 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -51,6 +51,8 @@ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder); DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder); +DWORD WINAPI GetUdp6Table(PMIB_UDP6TABLE pUdpTable, PDWORD pdwSize, BOOL bOrder); + DWORD WINAPI GetIpStatistics(PMIB_IPSTATS pStats); DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily); diff --git a/include/udpmib.h b/include/udpmib.h index 6b3f51cf2f..3d1bba5ee5 100644 --- a/include/udpmib.h +++ b/include/udpmib.h @@ -18,6 +18,8 @@ #ifndef __WINE_UDPMIB_H #define __WINE_UDPMIB_H +#include <in6addr.h> + #define TCPIP_OWNING_MODULE_SIZE 16 @@ -71,6 +73,57 @@ typedef struct _MIB_UDPTABLE_OWNER_MODULE MIB_UDPROW_OWNER_MODULE table[1]; } MIB_UDPTABLE_OWNER_MODULE, *PMIB_UDPTABLE_OWNER_MODULE; +typedef struct _MIB_UDP6ROW +{ + IN6_ADDR dwLocalAddr; + DWORD dwLocalScopeId; + DWORD dwLocalPort; +} MIB_UDP6ROW, *PMIB_UDP6ROW; + +typedef struct _MIB_UDP6TABLE +{ + DWORD dwNumEntries; + MIB_UDP6ROW table[1]; +} MIB_UDP6TABLE, *PMIB_UDP6TABLE; + +typedef struct _MIB_UDP6ROW_OWNER_PID +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + DWORD dwOwningPid; +} MIB_UDP6ROW_OWNER_PID, *PMIB_UDP6ROW_OWNER_PID; + +typedef struct _MIB_UDP6TABLE_OWNER_PID +{ + DWORD dwNumEntries; + MIB_UDP6ROW_OWNER_PID table[1]; +} MIB_UDP6TABLE_OWNER_PID, *PMIB_UDP6TABLE_OWNER_PID; + +typedef struct _MIB_UDP6ROW_OWNER_MODULE +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + DWORD dwOwningPid; + LARGE_INTEGER liCreateTimestamp; + __C89_NAMELESS union + { + __C89_NAMELESS struct + { + int SpecificPortBind:1; + } __C89_NAMELESSSTRUCTNAME; + int dwFlags; + } __C89_NAMELESSUNIONNAME; + ULONGLONG OwningModuleInfo[TCPIP_OWNING_MODULE_SIZE]; +} MIB_UDP6ROW_OWNER_MODULE, *PMIB_UDP6ROW_OWNER_MODULE; + +typedef struct _MIB_UDP6TABLE_OWNER_MODULE +{ + DWORD dwNumEntries; + MIB_UDP6ROW_OWNER_MODULE table[1]; +} MIB_UDP6TABLE_OWNER_MODULE, *PMIB_UDP6TABLE_OWNER_MODULE; + /* UDP statistics */ typedef struct _MIB_UDPSTATS -- Guillaume Charifi <guillaume.charifi(a)sfr.fr>

1 0

[PATCH v2 1/2] iphlpapi: Implement GetUdp6Table().
by Guillaume Charifi 22 Aug '18

22 Aug '18

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 30 ++++- dlls/iphlpapi/ipstats.c | 241 ++++++++++++++++++++++++++++++++++ dlls/iphlpapi/ipstats.h | 1 + include/iphlpapi.h | 2 + include/udpmib.h | 53 ++++++++ 6 files changed, 322 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 1686644de0..fd00cc093a 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -141,7 +141,7 @@ @ stdcall GetTcpTable2( ptr ptr long ) @ stub GetTcpTableFromStack #@ stub GetTeredoPort -#@ stub GetUdp6Table +@ stdcall GetUdp6Table( ptr ptr long ) @ stdcall GetUdpStatisticsEx( ptr long ) @ stdcall GetUdpStatistics( ptr ) @ stub GetUdpStatsFromStack diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7de70c9ef4..c7140cd974 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2442,6 +2442,14 @@ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET, UDP_TABLE_BASIC, 0); } +/****************************************************************** + * GetUdp6Table (IPHLPAPI.@) + */ +DWORD WINAPI GetUdp6Table(PMIB_UDP6TABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) +{ + return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET6, UDP_TABLE_BASIC, 0); +} + /****************************************************************** * GetExtendedUdpTable (IPHLPAPI.@) */ @@ -2456,15 +2464,25 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, if (!pdwSize) return ERROR_INVALID_PARAMETER; - if (ulAf != WS_AF_INET) - { - FIXME("ulAf = %u not supported\n", ulAf); - return ERROR_NOT_SUPPORTED; - } if (TableClass == UDP_TABLE_OWNER_MODULE) FIXME("UDP_TABLE_OWNER_MODULE not fully supported\n"); - if ((ret = build_udp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size))) + switch (ulAf) + { + case WS_AF_INET: + ret = build_udp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); + break; + + case WS_AF_INET6: + ret = build_udp6_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); + break; + + default: + FIXME("ulAf = %u not supported\n", ulAf); + ret = ERROR_NOT_SUPPORTED; + } + + if (ret) return ret; if (!pUdpTable || *pdwSize < size) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 799d03d574..0c19d4abb0 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2565,6 +2565,247 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE return ret; } +static DWORD get_udp6_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) +{ + DWORD table_size; + + switch (class) + { + case UDP_TABLE_BASIC: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW); + break; + } + case UDP_TABLE_OWNER_PID: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE_OWNER_PID, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW_OWNER_PID); + break; + } + case UDP_TABLE_OWNER_MODULE: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE_OWNER_MODULE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW_OWNER_MODULE); + break; + } + default: + ERR("unhandled class %u\n", class); + return 0; + } + return table_size; +} + +static MIB_UDP6TABLE *append_udp6_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, + MIB_UDP6TABLE *table, DWORD *count, + const MIB_UDP6ROW_OWNER_MODULE *row, DWORD row_size ) +{ + if (table->dwNumEntries >= *count) + { + MIB_UDP6TABLE *new_table; + DWORD new_count = table->dwNumEntries * 2, new_table_size; + + new_table_size = get_udp6_table_sizes( class, new_count, NULL ); + if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) + { + HeapFree( heap, 0, table ); + return NULL; + } + *count = new_count; + table = new_table; + } + memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); + table->dwNumEntries++; + return table; +} + +static int compare_udp6_rows(const void *a, const void *b) +{ + const MIB_UDP6ROW *rowA = a; + const MIB_UDP6ROW *rowB = b; + int ret; + + if ((ret = memcmp(&rowA->dwLocalAddr, &rowB->dwLocalAddr, sizeof(rowA->dwLocalAddr)) != 0)) return ret; + if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; + return rowA->dwLocalPort - rowB->dwLocalPort; +} + +struct ipv6_addr_scope +{ + IN6_ADDR addr; + DWORD scope; +}; + +static struct ipv6_addr_scope *get_ipv6_addr_scope_table(unsigned int *size) +{ + struct ipv6_addr_scope *table = NULL; + unsigned int table_size = 0; + + if (!(table = HeapAlloc( GetProcessHeap(), 0, sizeof(table[0]) ))) + return ERROR_OUTOFMEMORY; + +#ifdef __linux__ + { + FILE *fp; + char buf[512], *ptr; + + if (!(fp = fopen( "/proc/net/if_inet6", "r" ))) + goto failed; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + WORD a[8]; + DWORD scope; + struct ipv6_addr_scope *new_table; + struct ipv6_addr_scope *entry; + unsigned int i; + + if (sscanf( ptr, "%4x%4x%4x%4x%4x%4x%4x%4x %*s %*s %x", + &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6], &a[7], &scope ) != 9) + continue; + + table_size++; + if (!(new_table = HeapReAlloc( GetProcessHeap(), 0, table, table_size * sizeof(table[0]) ))) + { + fclose(fp); + goto failed; + } + + table = new_table; + entry = &table[table_size - 1]; + + i = 0; + while (i < 8) + { + entry->addr.u.Word[i] = htons(a[i]); + i++; + } + + entry->scope = htons(scope); + } + } +#else + FIXME( "not implemented\n" ); + goto failed; +#endif + + *size = table_size; + return table; + +failed: + HeapFree( GetProcessHeap(), 0, table ); + return NULL; +} + +static DWORD find_ipv6_addr_scope(IN6_ADDR *addr, struct ipv6_addr_scope *table, unsigned int size) +{ + const BYTE multicast_scope_mask = 0x0F; + const BYTE multicast_scope_shift = 0; + unsigned int i = 0; + + if (IN6_IS_ADDR_UNSPECIFIED(addr)) + return 0; + + if (IN6_IS_ADDR_MULTICAST(addr)) + return htons((addr->u.Byte[1] & multicast_scope_mask) >> multicast_scope_shift); + + if (!table) + return -1; + + while (i < size) + { + if (memcmp(&table[i].addr, addr, sizeof(table[i].addr)) == 0) + return table[i].scope; + i++; + } + + return -1; +} + +DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE heap, DWORD flags, + DWORD *size ) +{ + MIB_UDP6TABLE *table; + MIB_UDP6ROW_OWNER_MODULE row; + DWORD ret = NO_ERROR, count = 16, table_size, row_size; + + if (!(table_size = get_udp6_table_sizes( class, count, &row_size ))) + return ERROR_INVALID_PARAMETER; + + if (!(table = HeapAlloc( heap, flags, table_size ))) + return ERROR_OUTOFMEMORY; + + table->dwNumEntries = 0; + memset( &row, 0, sizeof(row) ); + +#ifdef __linux__ + { + FILE *fp; + + if ((fp = fopen( "/proc/net/udp6", "r" ))) + { + char buf[512], *ptr; + struct pid_map *map = NULL; + unsigned int num_entries = 0; + struct ipv6_addr_scope *addr_scopes; + unsigned int addr_scopes_size = 0; + unsigned int dummy; + int inode; + + addr_scopes = get_ipv6_addr_scope_table(&addr_scopes_size); + + if (class >= UDP_TABLE_OWNER_PID) map = get_pid_map( &num_entries ); + + /* skip header line */ + ptr = fgets( buf, sizeof(buf), fp ); + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + DWORD in6_addr32[4]; + + if (sscanf( ptr, "%u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", &dummy, + &in6_addr32[0], &in6_addr32[1], &in6_addr32[2], &in6_addr32[3], + &row.dwLocalPort, &inode ) != 7) + continue; + memcpy(&row.ucLocalAddr, in6_addr32, sizeof(row.ucLocalAddr)); + row.dwLocalScopeId = find_ipv6_addr_scope(&row, addr_scopes, addr_scopes_size); + row.dwLocalPort = htons( row.dwLocalPort ); + + if (class >= UDP_TABLE_OWNER_PID) + row.dwOwningPid = find_owning_pid( map, num_entries, inode ); + if (class >= UDP_TABLE_OWNER_MODULE) + { + row.liCreateTimestamp.QuadPart = 0; /* FIXME */ + row.u.dwFlags = 0; + memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); + } + if (!(table = append_udp6_row( class, heap, flags, table, &count, &row, row_size ))) + break; + } + HeapFree( GetProcessHeap(), 0, map ); + if (addr_scopes) + HeapFree( GetProcessHeap(), 0, addr_scopes ); + fclose( fp ); + } + else ret = ERROR_NOT_SUPPORTED; + } +#else + FIXME( "not implemented\n" ); + ret = ERROR_NOT_SUPPORTED; +#endif + + if (!table) return ERROR_OUTOFMEMORY; + if (!ret) + { + if (order && table->dwNumEntries) + qsort( table->table, table->dwNumEntries, row_size, compare_udp6_rows ); + *tablep = table; + } + else HeapFree( heap, flags, table ); + if (size) *size = get_udp6_table_sizes( class, count, NULL ); + TRACE( "returning ret %u table %p\n", ret, table ); + return ret; +} + /****************************************************************** * AllocateAndGetUdpTableFromStack (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index d742d6380a..acf43ee27c 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -34,5 +34,6 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDE DWORD build_tcp_table(TCP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; DWORD build_udp_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; +DWORD build_udp6_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; #endif /* ndef WINE_IPSTATS_H_ */ diff --git a/include/iphlpapi.h b/include/iphlpapi.h index 54d93d1c9c..86507dfd4d 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -51,6 +51,8 @@ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder); DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder); +DWORD WINAPI GetUdp6Table(PMIB_UDP6TABLE pUdpTable, PDWORD pdwSize, BOOL bOrder); + DWORD WINAPI GetIpStatistics(PMIB_IPSTATS pStats); DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily); diff --git a/include/udpmib.h b/include/udpmib.h index 6b3f51cf2f..3d1bba5ee5 100644 --- a/include/udpmib.h +++ b/include/udpmib.h @@ -18,6 +18,8 @@ #ifndef __WINE_UDPMIB_H #define __WINE_UDPMIB_H +#include <in6addr.h> + #define TCPIP_OWNING_MODULE_SIZE 16 @@ -71,6 +73,57 @@ typedef struct _MIB_UDPTABLE_OWNER_MODULE MIB_UDPROW_OWNER_MODULE table[1]; } MIB_UDPTABLE_OWNER_MODULE, *PMIB_UDPTABLE_OWNER_MODULE; +typedef struct _MIB_UDP6ROW +{ + IN6_ADDR dwLocalAddr; + DWORD dwLocalScopeId; + DWORD dwLocalPort; +} MIB_UDP6ROW, *PMIB_UDP6ROW; + +typedef struct _MIB_UDP6TABLE +{ + DWORD dwNumEntries; + MIB_UDP6ROW table[1]; +} MIB_UDP6TABLE, *PMIB_UDP6TABLE; + +typedef struct _MIB_UDP6ROW_OWNER_PID +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + DWORD dwOwningPid; +} MIB_UDP6ROW_OWNER_PID, *PMIB_UDP6ROW_OWNER_PID; + +typedef struct _MIB_UDP6TABLE_OWNER_PID +{ + DWORD dwNumEntries; + MIB_UDP6ROW_OWNER_PID table[1]; +} MIB_UDP6TABLE_OWNER_PID, *PMIB_UDP6TABLE_OWNER_PID; + +typedef struct _MIB_UDP6ROW_OWNER_MODULE +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + DWORD dwOwningPid; + LARGE_INTEGER liCreateTimestamp; + __C89_NAMELESS union + { + __C89_NAMELESS struct + { + int SpecificPortBind:1; + } __C89_NAMELESSSTRUCTNAME; + int dwFlags; + } __C89_NAMELESSUNIONNAME; + ULONGLONG OwningModuleInfo[TCPIP_OWNING_MODULE_SIZE]; +} MIB_UDP6ROW_OWNER_MODULE, *PMIB_UDP6ROW_OWNER_MODULE; + +typedef struct _MIB_UDP6TABLE_OWNER_MODULE +{ + DWORD dwNumEntries; + MIB_UDP6ROW_OWNER_MODULE table[1]; +} MIB_UDP6TABLE_OWNER_MODULE, *PMIB_UDP6TABLE_OWNER_MODULE; + /* UDP statistics */ typedef struct _MIB_UDPSTATS -- Guillaume Charifi <guillaume.charifi(a)sfr.fr>

2 3

[PATCH] winex11.drv: Fix indentation for focus_out
by Andrew Eikum 22 Aug '18

22 Aug '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- It's a whitespace change, I know, but this space character is messing up Git's C function detection, causing diffs in focus_out to appear as if they are in X11DRV_FocusIn. --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 4aee41586f..8fe6b363c2 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -786,7 +786,7 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) /********************************************************************** * focus_out */ - static void focus_out( Display *display , HWND hwnd ) +static void focus_out( Display *display , HWND hwnd ) { HWND hwnd_tmp; Window focus_win; -- 2.18.0

1 0

[PATCH] shell32: Use Public instead of AllUsersProfile in the registry.
by Dmitry Timoshkov 22 Aug '18

22 Aug '18

This matches what recent Windows versions set in the process environment. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shellpath.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index de4bf7d566..4b92e82065 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -951,13 +951,12 @@ static const WCHAR Videos_Sample_VideosW[] = {'V','i','d','e','o','s','\\','S',' static const WCHAR WindowsW[] = {'W','i','n','d','o','w','s',0}; static const WCHAR Windows_Sidebar_GadgetsW[] = {'W','i','n','d','o','w','s',' ','S','i','d','e','b','a','r','\\','G','a','d','g','e','t','s',0}; static const WCHAR DefaultW[] = {'.','D','e','f','a','u','l','t','\0'}; -static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'}; +static const WCHAR AllUsersProfileW[] = {'%','P','U','B','L','I','C','%',0}; static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'}; static const WCHAR ProgramDataVarW[] = {'%','P','r','o','g','r','a','m','D','a','t','a','%','\0'}; static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'}; static const WCHAR ProfileListW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','P','r','o','f','i','l','e','L','i','s','t',0}; static const WCHAR ProfilesDirectoryW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; -static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szDefaultProfileDirW[] = {'u','s','e','r','s',0}; @@ -3806,11 +3805,13 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) { if (!strncmpiW(szTemp, AllUsersProfileW, strlenW(AllUsersProfileW))) { - WCHAR szAllUsers[MAX_PATH]; + WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; - strcpyW(szDest, szProfilesPrefix); - hr = _SHGetProfilesValue(key, AllUsersProfileValueW, - szAllUsers, AllUsersW); + GetSystemDirectoryW(def_val, MAX_PATH); + if (def_val[1] == ':') strcpyW( def_val + 3, UsersPublicW ); + else FIXME("non-drive system paths unsupported\n"); + + hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); PathAppendW(szDest, szAllUsers); PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); } -- 2.17.1

2 1

[PATCH] wined3d: Make the adapter responsible for creating GL contexts.
by Henri Verbeet 22 Aug '18

22 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 6 + dlls/wined3d/context.c | 298 ++++++++++++++++++++++------------------- dlls/wined3d/directx.c | 12 ++ dlls/wined3d/wined3d_private.h | 10 ++ 4 files changed, 188 insertions(+), 138 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 686c79ac73f..3a7270fff47 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4178,6 +4178,11 @@ static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD fla return wined3d_settings.max_gl_version; } +static const struct wined3d_adapter_ops wined3d_adapter_opengl_ops = +{ + wined3d_adapter_opengl_create_context, +}; + BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) { static const DWORD supported_gl_versions[] = @@ -4285,6 +4290,7 @@ BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_ wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); wined3d_adapter_init_ffp_attrib_ops(adapter); + adapter->adapter_ops = &wined3d_adapter_opengl_ops; return TRUE; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 21ad11d9586..ce9d740145d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1884,108 +1884,171 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_texture *target, const struct wined3d_format *ds_format) { struct wined3d_device *device = swapchain->device; - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *color_format; - struct wined3d_context *ret; - BOOL auxBuffers = FALSE; - HGLRC ctx, share_ctx; - DWORD target_usage; - unsigned int i; + struct wined3d_context *context; DWORD state; TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); wined3d_from_cs(device->cs); - if (!(ret = heap_alloc_zero(sizeof(*ret)))) + if (!(context = heap_alloc_zero(sizeof(*context)))) return NULL; - ret->free_timestamp_query_size = 4; - if (!(ret->free_timestamp_queries = heap_calloc(ret->free_timestamp_query_size, - sizeof(*ret->free_timestamp_queries)))) + context->free_timestamp_query_size = 4; + if (!(context->free_timestamp_queries = heap_calloc(context->free_timestamp_query_size, + sizeof(*context->free_timestamp_queries)))) goto out; - list_init(&ret->timestamp_queries); + list_init(&context->timestamp_queries); - ret->free_occlusion_query_size = 4; - if (!(ret->free_occlusion_queries = heap_calloc(ret->free_occlusion_query_size, - sizeof(*ret->free_occlusion_queries)))) + context->free_occlusion_query_size = 4; + if (!(context->free_occlusion_queries = heap_calloc(context->free_occlusion_query_size, + sizeof(*context->free_occlusion_queries)))) goto out; - list_init(&ret->occlusion_queries); + list_init(&context->occlusion_queries); - ret->free_fence_size = 4; - if (!(ret->free_fences = heap_calloc(ret->free_fence_size, sizeof(*ret->free_fences)))) + context->free_fence_size = 4; + if (!(context->free_fences = heap_calloc(context->free_fence_size, sizeof(*context->free_fences)))) goto out; - list_init(&ret->fences); + list_init(&context->fences); - list_init(&ret->so_statistics_queries); + list_init(&context->so_statistics_queries); - list_init(&ret->pipeline_statistics_queries); + list_init(&context->pipeline_statistics_queries); - list_init(&ret->fbo_list); - list_init(&ret->fbo_destroy_list); + list_init(&context->fbo_list); + list_init(&context->fbo_destroy_list); - if (!device->shader_backend->shader_allocate_context_data(ret)) + if (!device->shader_backend->shader_allocate_context_data(context)) { ERR("Failed to allocate shader backend context data.\n"); goto out; } - if (!device->adapter->fragment_pipe->allocate_context_data(ret)) + if (!device->adapter->fragment_pipe->allocate_context_data(context)) { ERR("Failed to allocate fragment pipeline context data.\n"); goto out; } - for (i = 0; i < ARRAY_SIZE(ret->tex_unit_map); ++i) - ret->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; - for (i = 0; i < ARRAY_SIZE(ret->rev_tex_unit_map); ++i) - ret->rev_tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; + if (!(context->hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) + { + WARN("Failed to retrieve device context, trying swapchain backup.\n"); + + if ((context->hdc = swapchain_get_backup_dc(swapchain))) + context->hdc_is_private = TRUE; + else + { + ERR("Failed to retrieve a device context.\n"); + goto out; + } + } + + if (!device_context_add(device, context)) + { + ERR("Failed to add the newly created context to the context list\n"); + goto out; + } + + context->win_handle = swapchain->win_handle; + context->gl_info = &device->adapter->gl_info; + context->d3d_info = &device->adapter->d3d_info; + context->state_table = device->StateTable; + + /* Mark all states dirty to force a proper initialization of the states on + * the first use of the context. Compute states do not need initialization. */ + for (state = 0; state <= STATE_HIGHEST; ++state) + { + if (context->state_table[state].representative && !STATE_IS_COMPUTE(state)) + context_invalidate_state(context, state); + } + + context->device = device; + context->swapchain = swapchain; + context->current_rt.texture = target; + context->current_rt.sub_resource_idx = 0; + context->tid = GetCurrentThreadId(); + + if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) + { + device_context_remove(device, context); + goto out; + } + + device->shader_backend->shader_init_context_state(context); + context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) + | (1u << WINED3D_SHADER_TYPE_VERTEX) + | (1u << WINED3D_SHADER_TYPE_GEOMETRY) + | (1u << WINED3D_SHADER_TYPE_HULL) + | (1u << WINED3D_SHADER_TYPE_DOMAIN) + | (1u << WINED3D_SHADER_TYPE_COMPUTE); + + TRACE("Created context %p.\n", context); + + return context; + +out: + if (context->hdc) + wined3d_release_dc(swapchain->win_handle, context->hdc); + device->shader_backend->shader_free_context_data(context); + device->adapter->fragment_pipe->free_context_data(context); + heap_free(context->free_fences); + heap_free(context->free_occlusion_queries); + heap_free(context->free_timestamp_queries); + heap_free(context); + return NULL; +} + +BOOL wined3d_adapter_opengl_create_context(struct wined3d_context *context, + struct wined3d_texture *target, const struct wined3d_format *ds_format) +{ + struct wined3d_device *device = context->device; + const struct wined3d_format *color_format; + const struct wined3d_d3d_info *d3d_info; + const struct wined3d_gl_info *gl_info; + BOOL aux_buffers = FALSE; + HGLRC ctx, share_ctx; + DWORD target_usage; + unsigned int i; + + gl_info = context->gl_info; + d3d_info = context->d3d_info; + + for (i = 0; i < ARRAY_SIZE(context->tex_unit_map); ++i) + context->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; + for (i = 0; i < ARRAY_SIZE(context->rev_tex_unit_map); ++i) + context->rev_tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; if (gl_info->limits.graphics_samplers >= MAX_COMBINED_SAMPLERS) { /* Initialize the texture unit mapping to a 1:1 mapping. */ unsigned int base, count; wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_PIXEL, &base, &count); - if (base + MAX_FRAGMENT_SAMPLERS > ARRAY_SIZE(ret->rev_tex_unit_map)) + if (base + MAX_FRAGMENT_SAMPLERS > ARRAY_SIZE(context->rev_tex_unit_map)) { ERR("Unexpected texture unit base index %u.\n", base); - goto out; + return FALSE; } for (i = 0; i < min(count, MAX_FRAGMENT_SAMPLERS); ++i) { - ret->tex_unit_map[i] = base + i; - ret->rev_tex_unit_map[base + i] = i; + context->tex_unit_map[i] = base + i; + context->rev_tex_unit_map[base + i] = i; } wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count); - if (base + MAX_VERTEX_SAMPLERS > ARRAY_SIZE(ret->rev_tex_unit_map)) + if (base + MAX_VERTEX_SAMPLERS > ARRAY_SIZE(context->rev_tex_unit_map)) { ERR("Unexpected texture unit base index %u.\n", base); - goto out; + return FALSE; } for (i = 0; i < min(count, MAX_VERTEX_SAMPLERS); ++i) { - ret->tex_unit_map[MAX_FRAGMENT_SAMPLERS + i] = base + i; - ret->rev_tex_unit_map[base + i] = MAX_FRAGMENT_SAMPLERS + i; + context->tex_unit_map[MAX_FRAGMENT_SAMPLERS + i] = base + i; + context->rev_tex_unit_map[base + i] = MAX_FRAGMENT_SAMPLERS + i; } } - if (!(ret->texture_type = heap_calloc(gl_info->limits.combined_samplers, - sizeof(*ret->texture_type)))) - goto out; - - if (!(ret->hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) - { - WARN("Failed to retrieve device context, trying swapchain backup.\n"); - - if ((ret->hdc = swapchain_get_backup_dc(swapchain))) - ret->hdc_is_private = TRUE; - else - { - ERR("Failed to retrieve a device context.\n"); - goto out; - } - } + if (!(context->texture_type = heap_calloc(gl_info->limits.combined_samplers, + sizeof(*context->texture_type)))) + return FALSE; color_format = target->resource.format; target_usage = target->resource.usage; @@ -1994,7 +2057,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, * X4R4G4B4/X8R8G8B8 as we might need it for the backbuffer. */ if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { - auxBuffers = TRUE; + aux_buffers = TRUE; if (color_format->id == WINED3DFMT_B4G4R4X4_UNORM) color_format = wined3d_get_format(gl_info, WINED3DFMT_B4G4R4A4_UNORM, target_usage); @@ -2026,94 +2089,73 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } /* Try to find a pixel format which matches our requirements. */ - if (!(ret->pixel_format = context_choose_pixel_format(device, ret->hdc, color_format, ds_format, auxBuffers))) - goto out; - - ret->gl_info = gl_info; - ret->win_handle = swapchain->win_handle; + if (!(context->pixel_format = context_choose_pixel_format(device, + context->hdc, color_format, ds_format, aux_buffers))) + return FALSE; - context_enter(ret); + context_enter(context); - if (!context_set_pixel_format(ret)) + if (!context_set_pixel_format(context)) { - ERR("Failed to set pixel format %d on device context %p.\n", ret->pixel_format, ret->hdc); - context_release(ret); - goto out; + ERR("Failed to set pixel format %d on device context %p.\n", context->pixel_format, context->hdc); + context_release(context); + heap_free(context->texture_type); + return FALSE; } share_ctx = device->context_count ? device->contexts[0]->glCtx : NULL; if (gl_info->p_wglCreateContextAttribsARB) { - if (!(ctx = context_create_wgl_attribs(gl_info, ret->hdc, share_ctx))) - goto out; + if (!(ctx = context_create_wgl_attribs(gl_info, context->hdc, share_ctx))) + { + context_release(context); + heap_free(context->texture_type); + return FALSE; + } } else { - if (!(ctx = wglCreateContext(ret->hdc))) + if (!(ctx = wglCreateContext(context->hdc))) { ERR("Failed to create a WGL context.\n"); - context_release(ret); - goto out; + context_release(context); + heap_free(context->texture_type); + return FALSE; } if (share_ctx && !wglShareLists(share_ctx, ctx)) { ERR("wglShareLists(%p, %p) failed, last error %#x.\n", share_ctx, ctx, GetLastError()); - context_release(ret); + context_release(context); if (!wglDeleteContext(ctx)) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); - goto out; + heap_free(context->texture_type); + return FALSE; } } - if (!device_context_add(device, ret)) - { - ERR("Failed to add the newly created context to the context list\n"); - context_release(ret); - if (!wglDeleteContext(ctx)) - ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); - goto out; - } - - ret->d3d_info = d3d_info; - ret->state_table = device->StateTable; - - /* Mark all states dirty to force a proper initialization of the states on - * the first use of the context. Compute states do not need initialization. */ - for (state = 0; state <= STATE_HIGHEST; ++state) - { - if (ret->state_table[state].representative && !STATE_IS_COMPUTE(state)) - context_invalidate_state(ret, state); - } - - ret->device = device; - ret->swapchain = swapchain; - ret->current_rt.texture = target; - ret->current_rt.sub_resource_idx = 0; - ret->tid = GetCurrentThreadId(); - - ret->render_offscreen = wined3d_resource_is_offscreen(&target->resource); - ret->draw_buffers_mask = context_generate_rt_mask(GL_BACK); - ret->valid = 1; + context->render_offscreen = wined3d_resource_is_offscreen(&target->resource); + context->draw_buffers_mask = context_generate_rt_mask(GL_BACK); + context->valid = 1; - ret->glCtx = ctx; - ret->hdc_has_format = TRUE; - ret->needs_set = 1; + context->glCtx = ctx; + context->hdc_has_format = TRUE; + context->needs_set = 1; /* Set up the context defaults */ - if (!context_set_current(ret)) + if (!context_set_current(context)) { ERR("Cannot activate context to set up defaults.\n"); - device_context_remove(device, ret); - context_release(ret); + context_release(context); if (!wglDeleteContext(ctx)) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); - goto out; + heap_free(context->texture_type); + return FALSE; } if (context_debug_output_enabled(gl_info)) { - GL_EXTCALL(glDebugMessageCallback(wined3d_debug_callback, ret)); + GL_EXTCALL(glDebugMessageCallback(wined3d_debug_callback, context)); if (TRACE_ON(d3d_synchronous)) gl_info->gl_ops.gl.p_glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS); GL_EXTCALL(glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, GL_FALSE)); @@ -2139,7 +2181,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &ret->aux_buffers); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &context->aux_buffers); TRACE("Setting up the screen\n"); @@ -2175,7 +2217,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, */ for (i = 1; i < gl_info->limits.textures; ++i) { - context_active_texture(ret, gl_info, i); + context_active_texture(context, gl_info, i); gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, GL_TEXTURE0_ARB + i - 1); checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, ..."); @@ -2196,16 +2238,17 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, "!!ARBfp1.0\n" "MOV result.color, fragment.color.primary;\n" "END\n"; - GL_EXTCALL(glGenProgramsARB(1, &ret->dummy_arbfp_prog)); - GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, ret->dummy_arbfp_prog)); - GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(dummy_program), dummy_program)); + GL_EXTCALL(glGenProgramsARB(1, &context->dummy_arbfp_prog)); + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, context->dummy_arbfp_prog)); + GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, + GL_PROGRAM_FORMAT_ASCII_ARB, strlen(dummy_program), dummy_program)); } if (gl_info->supported[ARB_POINT_SPRITE]) { for (i = 0; i < gl_info->limits.textures; ++i) { - context_active_texture(ret, gl_info, i); + context_active_texture(context, gl_info, i); gl_info->gl_ops.gl.p_glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"); } @@ -2239,39 +2282,18 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } if (gl_info->supported[ARB_CLIP_CONTROL]) GL_EXTCALL(glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT)); - device->shader_backend->shader_init_context_state(ret); - ret->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) - | (1u << WINED3D_SHADER_TYPE_VERTEX) - | (1u << WINED3D_SHADER_TYPE_GEOMETRY) - | (1u << WINED3D_SHADER_TYPE_HULL) - | (1u << WINED3D_SHADER_TYPE_DOMAIN) - | (1u << WINED3D_SHADER_TYPE_COMPUTE); /* If this happens to be the first context for the device, dummy textures * are not created yet. In that case, they will be created (and bound) by * create_dummy_textures right after this context is initialized. */ if (device->dummy_textures.tex_2d) - context_bind_dummy_textures(device, ret); + context_bind_dummy_textures(device, context); /* Initialise all rectangles to avoid resetting unused ones later. */ gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); checkGLcall("glScissor"); - TRACE("Created context %p.\n", ret); - - return ret; - -out: - if (ret->hdc) - wined3d_release_dc(swapchain->win_handle, ret->hdc); - device->shader_backend->shader_free_context_data(ret); - device->adapter->fragment_pipe->free_context_data(ret); - heap_free(ret->texture_type); - heap_free(ret->free_fences); - heap_free(ret->free_occlusion_queries); - heap_free(ret->free_timestamp_queries); - heap_free(ret); - return NULL; + return TRUE; } void context_destroy(struct wined3d_device *device, struct wined3d_context *context) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a6f190c4d0a..de1f9d993d7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2456,6 +2456,17 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, e return WINED3D_OK; } +static BOOL wined3d_adapter_no3d_create_context(struct wined3d_context *context, + struct wined3d_texture *target, const struct wined3d_format *ds_format) +{ + return TRUE; +} + +static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = +{ + wined3d_adapter_no3d_create_context, +}; + static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) { TRACE("adapter %p.\n", adapter); @@ -2473,6 +2484,7 @@ static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) adapter->vertex_pipe = &none_vertex_pipe; adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; + adapter->adapter_ops = &wined3d_adapter_no3d_ops; return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 60369ccb51b..3f168dc4c0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2653,6 +2653,15 @@ struct wined3d_driver_info void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, const struct wined3d_gpu_description *gpu_description, UINT64 vram_bytes) DECLSPEC_HIDDEN; +struct wined3d_adapter_ops +{ + BOOL (*adapter_create_context)(struct wined3d_context *context, + struct wined3d_texture *target, const struct wined3d_format *ds_format); +}; + +BOOL wined3d_adapter_opengl_create_context(struct wined3d_context *context, + struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; + /* The adapter structure */ struct wined3d_adapter { @@ -2673,6 +2682,7 @@ struct wined3d_adapter const struct wined3d_vertex_pipe_ops *vertex_pipe; const struct fragment_pipeline *fragment_pipe; const struct wined3d_shader_backend_ops *shader_backend; + const struct wined3d_adapter_ops *adapter_ops; }; BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH] user32: Create a mask from alpha channel when loading a 32 bpp icon. (v4)
by Dmitry Timoshkov 22 Aug '18

22 Aug '18

This patch fixes applications that draw the 32 bpp icons manually. v4: directly create 1-bit mask from alpha. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/cursoricon.c | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0adb73bf56..7c09f50a5f 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1296,6 +1296,49 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE 0, 0, bmi_width, bmi_height, mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } + else + { + if (bmi_has_alpha( bmi, color_bits )) + { + LONG x, y, dst_stride = ((bmi_width + 31) / 8) & ~3; + unsigned char *alpha_mask_bits; + + mask_size = bmi_height * dst_stride; + alpha_mask_bits = HeapAlloc( GetProcessHeap(), 0, mask_size ); + + if (alpha_mask_bits) + { + const unsigned char *src = color_bits; + unsigned char *dst = alpha_mask_bits; + + for (y = 0; y < bmi_height; y++, dst += dst_stride) + { + unsigned char *dst_byte = dst; + + for (x = 0; x < bmi_width; x += 8, dst_byte++) + { + unsigned char mask = 0x80; + LONG bit_off; + + *dst_byte = 0; + + for (bit_off = 0; bit_off < 8; bit_off++, mask >>= 1, src += 4) + { + if (src[3] != 0xff && x + bit_off < bmi_width) + *dst_byte |= mask; + } + } + } + + SelectObject( hdc, mask ); + StretchDIBits( hdc, 0, 0, width, height, + 0, 0, bmi_width, bmi_height, + alpha_mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); + + HeapFree( GetProcessHeap(), 0, alpha_mask_bits ); + } + } + } ret = TRUE; done: -- 2.17.1

2 2

[PATCH 1/2] user32/listbox: Fix multicolumn navigation on VK_RIGHT.
by Nikolay Sivov 22 Aug '18

22 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/listbox.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 3f1396d16d..05fcc4439f 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2354,8 +2354,7 @@ static LRESULT LISTBOX_HandleKeyDown( LB_DESCR *descr, DWORD key ) if (descr->style & LBS_MULTICOLUMN) { bForceSelection = FALSE; - if (descr->focus_item + descr->page_size < descr->nb_items) - caret = descr->focus_item + descr->page_size; + caret = min(descr->focus_item + descr->page_size, descr->nb_items - 1); break; } /* fall through */ -- 2.18.0

1 1

[PATCH] d2d1/tests: Add some tests for context target handling.
by Nikolay Sivov 22 Aug '18

22 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 202 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 199 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f6846c092f..20478e5b22 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6638,16 +6638,16 @@ static void test_bitmap_surface(void) { D2D1_HWND_RENDER_TARGET_PROPERTIES hwnd_rt_desc; D2D1_RENDER_TARGET_PROPERTIES rt_desc; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + ID2D1DeviceContext *device_context; ID3D10Device1 *d3d_device; IDXGISwapChain *swapchain; IDXGIDevice *dxgi_device; ID2D1Factory1 *factory; ID2D1RenderTarget *rt; IDXGISurface *surface; - ID2D1Device *device; - ID2D1DeviceContext *device_context; - D2D1_BITMAP_PROPERTIES1 bitmap_desc; ID2D1Bitmap1 *bitmap; + ID2D1Device *device; HWND window; HRESULT hr; @@ -6760,6 +6760,201 @@ if (SUCCEEDED(hr)) ID3D10Device1_Release(d3d_device); } +static void test_device_context(void) +{ + D2D1_HWND_RENDER_TARGET_PROPERTIES hwnd_rt_desc; + D2D1_RENDER_TARGET_PROPERTIES rt_desc; + ID2D1DeviceContext *device_context; + IDXGISurface *surface, *surface2; + ID2D1Device *device, *device2; + ID2D1DCRenderTarget *dc_rt; + ID3D10Device1 *d3d_device; + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + D2D1_UNIT_MODE unit_mode; + ID2D1Factory1 *factory; + ID2D1RenderTarget *rt; + ID2D1Bitmap1 *bitmap; + ID2D1Image *target; + HWND window; + HRESULT hr; + RECT rect; + HDC hdc; + + IWICBitmap *wic_bitmap; + IWICImagingFactory *wic_factory; + + if (!(d3d_device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + ID3D10Device1_Release(d3d_device); + return; + } + + hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); + + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + + hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); +todo_wine + ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ + ID2D1DeviceContext_GetDevice(device_context, &device2); + ok(device2 == device, "Unexpected device instance.\n"); + ID2D1Device_Release(device2); + + target = (void *)0xdeadbeef; + ID2D1DeviceContext_GetTarget(device_context, &target); + ok(target == NULL, "Unexpected target instance %p.\n", target); + + unit_mode = ID2D1DeviceContext_GetUnitMode(device_context); + ok(unit_mode == D2D1_UNIT_MODE_DIPS, "Unexpected unit mode %d.\n", unit_mode); + + ID2D1DeviceContext_Release(device_context); + + /* DXGI target */ + window = create_window(); + swapchain = create_swapchain(d3d_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"); + + hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); + ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface2); + ok(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); + ok(surface2 == surface, "Unexpected surface instance.\n"); + IDXGISurface_Release(surface2); + + ID2D1DeviceContext_BeginDraw(device_context); + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface2); + ok(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); + ok(surface2 == surface, "Unexpected surface instance.\n"); + IDXGISurface_Release(surface2); + ID2D1DeviceContext_EndDraw(device_context, NULL, NULL); + ID2D1Bitmap1_Release(bitmap); + + ID2D1DeviceContext_SetTarget(device_context, NULL); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + ok(bitmap == NULL, "Unexpected target instance.\n"); + + ID2D1DeviceContext_Release(device_context); + ID2D1RenderTarget_Release(rt); + IDXGISurface_Release(surface); + DestroyWindow(window); + + /* WIC target */ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&wic_factory); + ok(SUCCEEDED(hr), "Failed to create WIC imaging factory, hr %#x.\n", hr); + hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16, + &GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + IWICImagingFactory_Release(wic_factory); + + rt_desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + rt_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + rt_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + rt_desc.dpiX = 96.0f; + rt_desc.dpiY = 96.0f; + rt_desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + rt_desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + hr = ID2D1Factory1_CreateWicBitmapRenderTarget(factory, wic_bitmap, &rt_desc, &rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); + ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ID2D1Bitmap1_Release(bitmap); + + ID2D1DeviceContext_SetTarget(device_context, NULL); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + ok(bitmap == NULL, "Unexpected target instance.\n"); + + ID2D1DeviceContext_Release(device_context); + ID2D1RenderTarget_Release(rt); + + CoUninitialize(); + + /* HWND target */ + hwnd_rt_desc.hwnd = NULL; + hwnd_rt_desc.pixelSize.width = 64; + hwnd_rt_desc.pixelSize.height = 64; + hwnd_rt_desc.presentOptions = D2D1_PRESENT_OPTIONS_NONE; + hwnd_rt_desc.hwnd = CreateWindowA("static", "d2d_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(!!hwnd_rt_desc.hwnd, "Failed to create target window.\n"); + + hr = ID2D1Factory1_CreateHwndRenderTarget(factory, &rt_desc, &hwnd_rt_desc, (ID2D1HwndRenderTarget **)&rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); + ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ID2D1Bitmap1_Release(bitmap); + + ID2D1DeviceContext_SetTarget(device_context, NULL); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + ok(bitmap == NULL, "Unexpected target instance.\n"); + + ID2D1DeviceContext_Release(device_context); + ID2D1RenderTarget_Release(rt); + DestroyWindow(hwnd_rt_desc.hwnd); + + /* DC target */ + hr = ID2D1Factory1_CreateDCRenderTarget(factory, &rt_desc, &dc_rt); + ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr); + + hr = ID2D1DCRenderTarget_QueryInterface(dc_rt, &IID_ID2D1DeviceContext, (void **)&device_context); + ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + ok(bitmap == NULL, "Unexpected bitmap instance.\n"); + + hdc = CreateCompatibleDC(NULL); + ok(hdc != NULL, "Failed to create an HDC.\n"); + + create_target_dibsection(hdc, 16, 16); + + SetRect(&rect, 0, 0, 16, 16); + hr = ID2D1DCRenderTarget_BindDC(dc_rt, hdc, &rect); + ok(SUCCEEDED(hr), "BindDC() failed, hr %#x.\n", hr); + + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ID2D1Bitmap1_Release(bitmap); + + ID2D1DeviceContext_SetTarget(device_context, NULL); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + ok(bitmap == NULL, "Unexpected target instance.\n"); + + ID2D1DeviceContext_Release(device_context); + ID2D1DCRenderTarget_Release(dc_rt); + DeleteDC(hdc); +} + ID2D1Device_Release(device); + ID2D1Factory1_Release(factory); + ID3D10Device1_Release(d3d_device); +} + START_TEST(d2d1) { unsigned int argc, i; @@ -6800,6 +6995,7 @@ START_TEST(d2d1) queue_test(test_bezier_intersect); queue_test(test_create_device); queue_test(test_bitmap_surface); + queue_test(test_device_context); run_queued_tests(); } -- 2.18.0

3 3

[PATCH] ddraw: Avoid leaking references to the wined3d device.
by Zebediah Figura 22 Aug '18

22 Aug '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- The ddraw surfaces associated with backbuffers take a reference to the wined3d device, but this was never released. This patch was all but written by Henri Verbeet. dlls/ddraw/surface.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cb837b1..cf09f9c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -527,7 +527,16 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surf = surface->complex_array[i]; surface->complex_array[i] = NULL; if (!surf->is_complex_root) + { + struct ddraw_texture *texture = wined3d_texture_get_parent(surf->wined3d_texture); + struct wined3d_device *wined3d_device = texture->wined3d_device; + struct ddraw_surface *root = texture->root; + ddraw_surface_cleanup(surf); + + if (surf == root) + wined3d_device_decref(wined3d_device); + } } if (surface->device1) -- 2.7.4

2 1

[PATCH] testbot/web: Add some </div> comments identifying the corresponding <div>.
by Francois Gouget 22 Aug '18

22 Aug '18

This helps debug HTML tag balancing errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Alternatively these could be perl comments but it's more practical to have these in the generated HTML so they can be used when looking at the generated HTML code. testbot/lib/ObjectModel/CGI/FormPage.pm | 4 ++-- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index b3861dd2a..3a41fe0e6 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -128,8 +128,8 @@ sub GenerateBody($) { print "<p>$Text</p>\n"; } - print "</div>\n"; - print "</div>\n"; + print "</div>\n"; + print "</div>\n"; } sub GenerateFormStart($) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 67e8fc86f..e5b2f2d3b 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -327,10 +327,10 @@ sub GenerateFooter($) my ($self) = @_; print <<EOF; - </div> + </div> <b class="rbottom"><b class="r4"> </b><b class="r3"> </b><b class="r2"> </b><b class="r1"> </b></b> </div> -</div> +</div> </body> </html> -- 2.18.0

1 0

[PATCH] testbot/web: Fix some HTML closing tags.
by Francois Gouget 22 Aug '18

22 Aug '18

Also call the parent GenerateFooter() method in the Activity page so the HTML page is terminated correctly. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 6 ++++-- testbot/web/Stats.pl | 1 + testbot/web/Submit.pl | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 512401751..fa842d9f4 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -94,7 +94,7 @@ sub GenerateBody($) # Generate a custom form to let the user specify the Hours field. $self->GenerateFormStart(); - print "<div class='ItemProperty'><label>Analyze the activity of the past <div class='ItemValue'><input type='text' name='Hours' maxlength='3' size='3' value='$self->{hours}'/></div> hours.</div>\n"; + print "<div class='ItemProperty'><label>Analyze the activity of the past <div class='ItemValue'><input type='text' name='Hours' maxlength='3' size='3' value='$self->{hours}'/></div> hours.</label></div>\n"; $self->GenerateFormEnd(); print "<h1>${ProjectName} Test Bot activity</h1>\n"; @@ -267,6 +267,7 @@ EOF ### Generate the table footer print "</tbody></table></div>\n"; + print "</div>\n"; } sub GenerateFooter($) @@ -294,8 +295,9 @@ sub GenerateFooter($) print "<span class='Record-deleted'>deletion</span>.</p>\n"; print "</td></tr></tbody>\n"; - print "</tbody></table></div>\n"; + print "</table></div>\n"; print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; + $self->SUPER::GenerateFooter(); } diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 64f29bdcd..ccabb321a 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -335,6 +335,7 @@ sub GenerateBody($) print "</tbody></table></div>\n"; print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; + print "</div>\n"; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 926fcb7ea..440bd8e5b 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -237,7 +237,7 @@ sub GenerateFields($) print "<thead><tr><th class='Record'></th>\n"; print "<th class='Record'>VM Name</th>\n"; print "<th class='Record'>Description</th>\n"; - print "</th><tbody>\n"; + print "</thead><tbody>\n"; my $VMs = CreateVMs(); if ($self->{FileType} eq "exe64") @@ -296,6 +296,7 @@ sub GenerateFields($) print "</tr>\n"; } print "</tbody></table>\n"; + print "</div>\n"; } else { -- 2.18.0

1 0

[PATCH] testbot/build: Move the common build functions to Build::Utils.
by Francois Gouget 22 Aug '18

22 Aug '18

This reduces the build scripts code duplication. A side-effect is that the status lines now all start with the 'Task:' prefix. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 89 +------- testbot/bin/build/Reconfig.pl | 113 +--------- testbot/bin/build/WineReconfig.pl | 247 ++------------------ testbot/bin/build/WineTest.pl | 111 +-------- testbot/lib/Build/Utils.pm | 363 ++++++++++++++++++++++++++++++ 5 files changed, 409 insertions(+), 514 deletions(-) create mode 100644 testbot/lib/Build/Utils.pm diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index e1133aaee..7f94c8595 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -43,98 +43,23 @@ sub BEGIN } $::BuildEnv = 1; } -my $Name0 = $0; -$Name0 =~ s+^.*/++; - +use Build::Utils; use WineTestBot::Config; -use WineTestBot::PatchUtils; use WineTestBot::Utils; -# -# Logging and error handling helpers -# - -sub InfoMsg(@) -{ - print @_; -} - -sub LogMsg(@) -{ - print "Build: ", @_; -} - -sub Error(@) -{ - print STDERR "$Name0:error: ", @_; -} - - # # Build helpers # -my $ncpus; -sub CountCPUs() -{ - if (open(my $fh, "<", "/proc/cpuinfo")) - { - # Linux - map { $ncpus++ if (/^processor/); } <$fh>; - close($fh); - } - $ncpus ||= 1; -} - -sub ApplyPatch($) -{ - my ($PatchFile) = @_; - - InfoMsg "Applying patch\n"; - system("cd '$DataDir/wine' && ". - "echo wine:HEAD=`git rev-parse HEAD` && ". - "set -x && ". - "git apply --verbose ". ShQuote($PatchFile) ." && ". - "git add -A"); - if ($? != 0) - { - LogMsg "Patch failed to apply\n"; - return undef; - } - - my $Impacts = GetPatchImpact($PatchFile, "nounits"); - if ($Impacts->{MakeMakefiles}) - { - InfoMsg "\nRunning make_makefiles\n"; - system("cd '$DataDir/wine' && set -x && ./tools/make_makefiles"); - if ($? != 0) - { - LogMsg "make_makefiles failed\n"; - return undef; - } - } - - if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure}) - { - InfoMsg "\nRunning autoconf\n"; - system("cd '$DataDir/wine' && set -x && autoconf"); - if ($? != 0) - { - LogMsg "Autoconf failed\n"; - return undef; - } - } - - return $Impacts; -} sub BuildNative() { InfoMsg "\nRebuilding native tools\n"; + my $CPUCount = GetCPUCount(); system("cd '$DataDir/build-native' && set -x && ". - "time make -j$ncpus __tooldeps__"); + "time make -j$CPUCount __tooldeps__"); if ($? != 0) { LogMsg "Rebuild of native tools failed\n"; @@ -160,8 +85,9 @@ sub BuildTestExecutables($$$) } InfoMsg "\nBuilding the $Bits-bit test executable(s)\n"; + my $CPUCount = GetCPUCount(); system("cd '$DataDir/build-mingw$Bits' && set -x && ". - "time make -j$ncpus ". join(" ", sort @BuildDirs)); + "time make -j$CPUCount ". join(" ", sort @BuildDirs)); if ($? != 0) { LogMsg "Rebuild of $Bits-bit crossbuild failed\n"; @@ -262,6 +188,7 @@ if (!defined $Usage) } if (defined $Usage) { + my $Name0 = GetToolName(); if ($Usage) { Error "try '$Name0 --help' for more information\n"; @@ -292,9 +219,7 @@ if ($DataDir =~ /'/) # Run the builds # -CountCPUs(); - -my $Impacts = ApplyPatch($PatchFile); +my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or ($Impacts->{WineBuild} and !BuildNative()) or diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 4aada3242..36748d66e 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -39,112 +39,15 @@ sub BEGIN } $::BuildEnv = 1; } -my $Name0 = $0; -$Name0 =~ s+^.*/++; - +use Build::Utils; use WineTestBot::Config; -use WineTestBot::PatchUtils; - - -# -# Logging and error handling helpers -# - -sub InfoMsg(@) -{ - print @_; -} - -sub LogMsg(@) -{ - print "Reconfig: ", @_; -} - -sub Error(@) -{ - print STDERR "$Name0:error: ", @_; -} # # Build helpers # -my $ncpus; -sub CountCPUs() -{ - if (open(my $fh, "<", "/proc/cpuinfo")) - { - # Linux - map { $ncpus++ if (/^processor/); } <$fh>; - close($fh); - } - $ncpus ||= 1; -} - -sub BuildTestAgentd() -{ - # If testagentd already exists it's likely already running - # so don't rebuild it. - if (! -x "$BinDir/build/testagentd") - { - InfoMsg "\nBuilding the native testagentd\n"; - system("cd '$::RootDir/src/testagentd' && set -x && ". - "time make -j$ncpus build"); - if ($? != 0) - { - LogMsg "Build testagentd failed\n"; - return !1; - } - } - - InfoMsg "\nRebuilding the Windows TestAgentd\n"; - system("cd '$::RootDir/src/testagentd' && set -x && ". - "time make -j$ncpus iso"); - if ($? != 0) - { - LogMsg "Build winetestbot.iso failed\n"; - return !1; - } - - return 1; -} - -sub BuildTestLauncher() -{ - InfoMsg "\nRebuilding TestLauncher\n"; - system("cd '$::RootDir/src/TestLauncher' && set -x && ". - "time make -j$ncpus"); - if ($? != 0) - { - LogMsg "Build TestLauncher failed\n"; - return !1; - } - - return 1; -} - -sub GitPull() -{ - InfoMsg "\nUpdating the Wine source\n"; - system("cd '$DataDir/wine' && git pull"); - if ($? != 0) - { - LogMsg "Git pull failed\n"; - return !1; - } - - my $ErrMessage = UpdateWineData("$DataDir/wine"); - if ($ErrMessage) - { - LogMsg "$ErrMessage\n"; - return !1; - } - - return 1; -} - sub BuildNative($) { my ($NoRm) = @_; @@ -153,10 +56,11 @@ sub BuildNative($) # Rebuild from scratch to make sure cruft will not accumulate InfoMsg "\nRebuilding native tools\n"; + my $CPUCount = GetCPUCount(); system("cd '$DataDir/build-native' && set -x && ". ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && ". - "time make -j$ncpus __tooldeps__"); + "time make -j$CPUCount __tooldeps__"); if ($? != 0) { @@ -176,11 +80,12 @@ sub BuildCross($$$) # Rebuild from scratch to make sure cruft will not accumulate InfoMsg "\nRebuilding the $Bits-bit test executables\n"; + my $CPUCount = GetCPUCount(); my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); system("cd '$DataDir/build-mingw$Bits' && set -x && ". ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && ". - "time make -j$ncpus buildtests"); + "time make -j$CPUCount buildtests"); if ($? != 0) { LogMsg "Build cross ($Bits bits) failed\n"; @@ -271,6 +176,7 @@ if (!defined $Usage) } if (defined $Usage) { + my $Name0 = GetToolName(); if ($Usage) { Error "try '$Name0 --help' for more information\n"; @@ -308,10 +214,9 @@ if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") # Run the builds # -CountCPUs(); - -exit(1) if (!BuildTestAgentd() or !BuildTestLauncher()); -exit(1) if ($OptUpdate and !GitPull()); +exit(1) if (!BuildNativeTestAgentd() or !BuildWindowsTestAgentd()); +exit(1) if (!BuildTestLauncher()); +exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptBuild and !UpdateWineBuilds($Targets, $OptNoRm)); LogMsg "ok\n"; diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 77722734c..b30ddd190 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -36,92 +36,15 @@ sub BEGIN } $::BuildEnv = 1; } -my $Name0 = $0; -$Name0 =~ s+^.*/++; - - -use Digest::SHA; -use File::Path; +use Build::Utils; use WineTestBot::Config; -use WineTestBot::PatchUtils; - - -# -# Logging and error handling helpers -# - -sub InfoMsg(@) -{ - print @_; -} - -sub LogMsg(@) -{ - print "Reconfig: ", @_; -} - -sub Error(@) -{ - print STDERR "$Name0:error: ", @_; -} # # Build helpers # -my $ncpus; -sub CountCPUs() -{ - if (open(my $fh, "<", "/proc/cpuinfo")) - { - # Linux - map { $ncpus++ if (/^processor/); } <$fh>; - close($fh); - } - $ncpus ||= 1; -} - -sub BuildTestAgentd() -{ - # If testagentd already exists it's likely already running - # so don't rebuild it. - if (! -x "$BinDir/build/testagentd") - { - InfoMsg "\nBuilding the native testagentd\n"; - system("cd '$::RootDir/src/testagentd' && set -x && ". - "time make -j$ncpus build"); - if ($? != 0) - { - LogMsg "Build testagentd failed\n"; - return !1; - } - } - - return 1; -} - -sub GitPull() -{ - InfoMsg "\nUpdating the Wine source\n"; - system("cd '$DataDir/wine' && git pull"); - if ($? != 0) - { - LogMsg "Git pull failed\n"; - return !1; - } - - my $ErrMessage = UpdateWineData("$DataDir/wine"); - if ($ErrMessage) - { - LogMsg "$ErrMessage\n"; - return !1; - } - - return 1; -} - sub BuildWine($$$$) { my ($Targets, $NoRm, $Build, $Extras) = @_; @@ -132,10 +55,11 @@ sub BuildWine($$$$) # If $NoRm is not set, rebuild from scratch to make sure cruft will not # accumulate InfoMsg "\nRebuilding the $Build Wine\n"; + my $CPUCount = GetCPUCount(); system("cd '$DataDir/build-$Build' && set -x && ". ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure $Extras && ". - "time make -j$ncpus"); + "time make -j$CPUCount"); if ($? != 0) { LogMsg "The $Build build failed\n"; @@ -159,160 +83,30 @@ sub UpdateWineBuilds($$) # WinePrefix helpers # -sub VerifyAddOn($$) -{ - my ($AddOn, $Arch) = @_; - - my $Sha256 = Digest::SHA->new(256); - eval { $Sha256->addfile("$DataDir/$AddOn->{name}/$AddOn->{filename}") }; - return "$@" if ($@); - - my $Checksum = $Sha256->hexdigest(); - return undef if ($Checksum eq $AddOn->{$Arch}); - return "Bad checksum for '$AddOn->{filename}'"; -} - -sub UpdateAddOn($$$) +sub UpdateWinePrefixes($) { - my ($AddOn, $Name, $Arch) = @_; + my ($Targets) = @_; - if (!defined $AddOn) - { - LogMsg "Could not get information on the $Name addon\n"; - return 0; - } - if (!$AddOn->{version}) - { - LogMsg "Could not get the $Name version\n"; - return 0; - } - if (!$AddOn->{$Arch}) + # Set up brand new WinePrefixes ready for use for testing. + # This way we do it once instead of doing it for every test, thus saving + # time. Note that this requires using a different wineprefix for each build. + foreach my $Build ("win32", "wow64", "wow32") { - LogMsg "Could not get the $Name $Arch checksum\n"; - return 0; - } - - $AddOn->{filename} = "wine". ($Name eq "gecko" ? "_" : "-") . - "$Name-$AddOn->{version}". - ($Arch eq "" ? "" : "-$Arch") .".msi"; - return 1 if (!VerifyAddOn($AddOn, $Arch)); + next if (!$Targets->{$Build}); - InfoMsg "Downloading $AddOn->{filename}\n"; - mkdir "$DataDir/$Name"; - - my $Url="http://dl.winehq.org/wine/wine-$Name/$AddOn->{version}/$AddOn->{filename}"; - for (1..3) - { - system("cd '$DataDir/$Name' && set -x && ". - "wget --no-verbose -O- '$Url' >'$AddOn->{filename}'"); - last if ($? == 0); - } - my $ErrMessage = VerifyAddOn($AddOn, $Arch); - return 1 if (!defined $ErrMessage); - LogMsg "$ErrMessage\n"; - return 0; -} - -sub UpdateAddOns() -{ - my %AddOns; - if (open(my $fh, "<", "$DataDir/wine/dlls/appwiz.cpl/addons.c")) - { - my $Arch = ""; - while (my $Line= <$fh>) + # Wait for the wineprefix creation to complete so it is really done + # before the snapshot gets updated. + SetupWineEnvironment($Build); + my $ErrMessage = CreateWinePrefix($Build, "wait"); + if (defined $ErrMessage) { - if ($Line =~ /^\s*#\s*define\s+ARCH_STRING\s+"([^"]+)"/) - { - $Arch = $1; - } - elsif ($Line =~ /^\s*#\s*define\s*(GECKO|MONO)_VERSION\s*"([^"]+)"/) - { - my ($AddOn, $Version) = ($1, $2); - $AddOn =~ tr/A-Z/a-z/; - $AddOns{$AddOn}->{name} = $AddOn; - $AddOns{$AddOn}->{version} = $Version; - } - elsif ($Line =~ /^\s*#\s*define\s*(GECKO|MONO)_SHA\s*"([^"]+)"/) - { - my ($AddOn, $Checksum) = ($1, $2); - $AddOn =~ tr/A-Z/a-z/; - $AddOns{$AddOn}->{$Arch} = $Checksum; - $Arch = ""; - } + LogMsg "$ErrMessage\n"; + return 0; } - close($fh); - } - else - { - LogMsg "Could not open 'wine/dlls/appwiz.cpl/addons.c': $!\n"; - return 0; - } - - return UpdateAddOn($AddOns{gecko}, "gecko", "x86") && - UpdateAddOn($AddOns{gecko}, "gecko", "x86_64") && - UpdateAddOn($AddOns{mono}, "mono", ""); -} - -# See also WineTest.pl -sub SetupWineEnvironment($) -{ - my ($Build) = @_; - - $ENV{WINEPREFIX} = "$DataDir/wineprefix-$Build"; - $ENV{DISPLAY} ||= ":0.0"; -} - -# See also WineTest.pl -sub RunWine($$$) -{ - my ($Build, $Cmd, $CmdArgs) = @_; - - my $Magic = `cd '$DataDir/build-$Build' && file $Cmd`; - my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); - return system("cd '$DataDir/build-$Build' && set -x && ". - "time $Wine $Cmd $CmdArgs"); -} - -# Setup a brand new WinePrefix ready for use for testing. -# This way we do it once instead of doing it for every test, thus saving -# time. Note that this requires using a different wineprefix for each build. -sub NewWinePrefix($$) -{ - my ($Targets, $Build) = @_; - - return 1 if (!$Targets->{$Build}); - - InfoMsg "\nRecreating the $Build wineprefix\n"; - SetupWineEnvironment($Build); - rmtree($ENV{WINEPREFIX}); - - # Crash dialogs cause delays so disable them - if (RunWine($Build, "./programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) - { - LogMsg "Failed to disable the $Build build crash dialogs: $!\n"; - return 0; } - - # Ensure the WinePrefix has been fully created before updating the snapshot - system("cd '$DataDir/build-$Build' && ./server/wineserver -w"); - return 1; } -sub UpdateWinePrefixes($) -{ - my ($Targets) = @_; - - return NewWinePrefix($Targets, "win32") && - # The wow32 and wow64 wineprefixes: - # - Are essentially identical. - # - Must be created after both WoW builds have been updated. - # - Make it possible to run the wow32 and wow64 tests in separate - # prefixes, thus ensuring they don't interfere with each other. - NewWinePrefix($Targets, "wow64") && - NewWinePrefix($Targets, "wow32"); -} - # # Setup and command line processing @@ -393,6 +187,7 @@ if (!defined $Usage) } if (defined $Usage) { + my $Name0 = GetToolName(); if ($Usage) { Error "try '$Name0 --help' for more information\n"; @@ -436,10 +231,8 @@ if ($DataDir =~ /'/) # Run the builds and/or tests # -CountCPUs(); - -exit(1) if (!BuildTestAgentd()); -exit(1) if ($OptUpdate and !GitPull()); +exit(1) if (!BuildNativeTestAgentd()); +exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptAddOns and !UpdateAddOns()); exit(1) if ($OptBuild and !UpdateWineBuilds($Targets, $OptNoRm)); exit(1) if ($OptWinePrefix and !UpdateWinePrefixes($Targets)); diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index b29440e21..9c264b485 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -40,93 +40,16 @@ sub BEGIN } $::BuildEnv = 1; } -my $Name0 = $0; -$Name0 =~ s+^.*/++; - +use Build::Utils; use WineTestBot::Config; -use WineTestBot::PatchUtils; use WineTestBot::Utils; -# -# Logging and error handling helpers -# - -sub InfoMsg(@) -{ - print @_; -} - -sub LogMsg(@) -{ - print "Task: ", @_; -} - -sub Error(@) -{ - print STDERR "$Name0:error: ", @_; -} - - # # Build helpers # -my $ncpus; -sub CountCPUs() -{ - if (open(my $fh, "<", "/proc/cpuinfo")) - { - # Linux - map { $ncpus++ if (/^processor/); } <$fh>; - close($fh); - } - $ncpus ||= 1; -} - -sub ApplyPatch($) -{ - my ($PatchFile) = @_; - - InfoMsg "Applying patch\n"; - system("cd '$DataDir/wine' && ". - "echo wine:HEAD=`git rev-parse HEAD` && ". - "set -x && ". - "git apply --verbose ". ShQuote($PatchFile) ." && ". - "git add -A"); - if ($? != 0) - { - LogMsg "Patch failed to apply\n"; - return undef; - } - - my $Impacts = GetPatchImpact($PatchFile, "nounits"); - if ($Impacts->{MakeMakefiles}) - { - InfoMsg "\nRunning make_makefiles\n"; - system("cd '$DataDir/wine' && set -x && ./tools/make_makefiles"); - if ($? != 0) - { - LogMsg "make_makefiles failed\n"; - return undef; - } - } - - if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure}) - { - InfoMsg "\nRunning autoconf\n"; - system("cd '$DataDir/wine' && set -x && autoconf"); - if ($? != 0) - { - LogMsg "Autoconf failed\n"; - return undef; - } - } - - return $Impacts; -} - sub BuildWine($$) { my ($Targets, $Build) = @_; @@ -134,8 +57,9 @@ sub BuildWine($$) return 1 if (!$Targets->{$Build}); InfoMsg "\nRebuilding the $Build Wine\n"; + my $CPUCount = GetCPUCount(); system("cd '$DataDir/build-$Build' && set -x && ". - "time make -j$ncpus"); + "time make -j$CPUCount"); if ($? != 0) { LogMsg "The $Build build failed\n"; @@ -150,25 +74,6 @@ sub BuildWine($$) # Test helpers # -# See also WineReconfig.pl -sub SetupWineEnvironment($) -{ - my ($Build) = @_; - - $ENV{WINEPREFIX} = "$DataDir/wineprefix-$Build"; - $ENV{DISPLAY} ||= ":0.0"; -} - -# See also WineReconfig.pl -sub RunWine($$$) -{ - my ($Build, $Cmd, $CmdArgs) = @_; - - my $Magic = `cd '$DataDir/build-$Build' && file $Cmd`; - my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); - return system("cd '$DataDir/build-$Build' && set -x && ". - "time $Wine $Cmd $CmdArgs"); -} sub DailyWineTest($$$$$) { @@ -330,6 +235,12 @@ if (!defined $Usage) } if (defined $Usage) { + my $Name0 = GetToolName(); + if ($Usage) + { + Error "try '$Name0 --help' for more information\n"; + exit $Usage; + } print "Usage: $Name0 [--help] --testpatch TARGETS PATCH\n"; print "or $Name0 [--help] --winetest [--no-submit] TARGETS BASETAG ARGS\n"; print "\n"; @@ -365,11 +276,9 @@ if ($DataDir =~ /'/) # Clean up old reports map { unlink("$_.report") } keys %AllTargets; -CountCPUs(); - if ($Action eq "testpatch") { - my $Impacts = ApplyPatch($FileName); + my $Impacts = ApplyPatch("wine", $FileName); exit(1) if (!$Impacts or !BuildWine($Targets, "win32") or !BuildWine($Targets, "wow64") or diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm new file mode 100644 index 000000000..038c188f2 --- /dev/null +++ b/testbot/lib/Build/Utils.pm @@ -0,0 +1,363 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Copyright 2018 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package Build::Utils; + +=head1 NAME + +Build::Utils - Utility functions for the build scripts + +=cut + +use Exporter 'import'; +our @EXPORT = qw(GetToolName InfoMsg LogMsg Error + GitPull ApplyPatch + GetCPUCount BuildNativeTestAgentd BuildWindowsTestAgentd + BuildTestLauncher UpdateAddOns + SetupWineEnvironment RunWine CreateWinePrefix); + +use Digest::SHA; +use File::Path; + +use WineTestBot::Config; +use WineTestBot::PatchUtils; +use WineTestBot::Utils; + + +# +# Logging and error handling +# + +my $Name0 = $0; +$Name0 =~ s+^.*/++; + +sub GetToolName() +{ + return $Name0; +} + +sub InfoMsg(@) +{ + print @_; +} + +sub LogMsg(@) +{ + print "Task: ", @_; +} + +sub Error(@) +{ + print STDERR "$Name0:error: ", @_; +} + + +# +# Repository updates +# + +sub GitPull($) +{ + my ($Dir) = @_; + + InfoMsg "\nUpdating the $Dir source\n"; + system("cd '$DataDir/$Dir' && git pull"); + if ($? != 0) + { + LogMsg "Git pull failed\n"; + return !1; + } + + if ($Dir eq "wine") + { + my $ErrMessage = UpdateWineData("$DataDir/$Dir"); + if ($ErrMessage) + { + LogMsg "$ErrMessage\n"; + return !1; + } + } + + return 1; +} + +sub ApplyPatch($$) +{ + my ($Dir, $PatchFile) = @_; + + InfoMsg "Applying patch\n"; + system("cd '$DataDir/$Dir' && ". + "echo $Dir:HEAD=`git rev-parse HEAD` && ". + "set -x && ". + "git apply --verbose ". ShQuote($PatchFile) ." && ". + "git add -A"); + if ($? != 0) + { + LogMsg "Patch failed to apply\n"; + return undef; + } + + my $Impacts = GetPatchImpact($PatchFile, "nounits"); + if ($Impacts->{MakeMakefiles}) + { + InfoMsg "\nRunning make_makefiles\n"; + system("cd '$DataDir/$Dir' && set -x && ./tools/make_makefiles"); + if ($? != 0) + { + LogMsg "make_makefiles failed\n"; + return undef; + } + } + + if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure}) + { + InfoMsg "\nRunning autoconf\n"; + system("cd '$DataDir/$Dir' && set -x && autoconf"); + if ($? != 0) + { + LogMsg "Autoconf failed\n"; + return undef; + } + } + + return $Impacts; +} + + +# +# Build helpers +# + +my $_CPUCount; + +sub GetCPUCount() +{ + if (!defined $_CPUCount) + { + if (open(my $Fh, "<", "/proc/cpuinfo")) + { + # Linux + map { $_CPUCount++ if (/^processor/); } <$Fh>; + close($Fh); + } + $_CPUCount ||= 1; + } + return $_CPUCount; +} + +sub BuildNativeTestAgentd() +{ + # If testagentd already exists it's likely already running + # so don't rebuild it. + return 1 if (-x "$BinDir/build/testagentd"); + + InfoMsg "\nBuilding the native testagentd\n"; + my $CPUCount = GetCPUCount(); + system("cd '$::RootDir/src/testagentd' && set -x && ". + "time make -j$CPUCount build"); + if ($? != 0) + { + LogMsg "Build testagentd failed\n"; + return !1; + } + + return 1; +} + +sub BuildWindowsTestAgentd() +{ + InfoMsg "\nRebuilding the Windows TestAgentd\n"; + my $CPUCount = GetCPUCount(); + system("cd '$::RootDir/src/testagentd' && set -x && ". + "time make -j$CPUCount iso"); + if ($? != 0) + { + LogMsg "Build winetestbot.iso failed\n"; + return !1; + } + + return 1; +} + +sub BuildTestLauncher() +{ + InfoMsg "\nRebuilding TestLauncher\n"; + my $CPUCount = GetCPUCount(); + system("cd '$::RootDir/src/TestLauncher' && set -x && ". + "time make -j$CPUCount"); + if ($? != 0) + { + LogMsg "Build TestLauncher failed\n"; + return !1; + } + + return 1; +} + + +# +# Wine addons updates +# + +sub _VerifyAddOn($$) +{ + my ($AddOn, $Arch) = @_; + + my $Sha256 = Digest::SHA->new(256); + eval { $Sha256->addfile("$DataDir/$AddOn->{name}/$AddOn->{filename}") }; + return "$@" if ($@); + + my $Checksum = $Sha256->hexdigest(); + return undef if ($Checksum eq $AddOn->{$Arch}); + return "Bad checksum for '$AddOn->{filename}'"; +} + +sub _UpdateAddOn($$$) +{ + my ($AddOn, $Name, $Arch) = @_; + + if (!defined $AddOn) + { + LogMsg "Could not get information on the $Name addon\n"; + return 0; + } + if (!$AddOn->{version}) + { + LogMsg "Could not get the $Name version\n"; + return 0; + } + if (!$AddOn->{$Arch}) + { + LogMsg "Could not get the $Name $Arch checksum\n"; + return 0; + } + + $AddOn->{filename} = "wine". ($Name eq "gecko" ? "_" : "-") . + "$Name-$AddOn->{version}". + ($Arch eq "" ? "" : "-$Arch") .".msi"; + return 1 if (!_VerifyAddOn($AddOn, $Arch)); + + InfoMsg "Downloading $AddOn->{filename}\n"; + mkdir "$DataDir/$Name"; + + my $Url="http://dl.winehq.org/wine/wine-$Name/$AddOn->{version}/$AddOn->{filename}"; + for (1..3) + { + system("cd '$DataDir/$Name' && set -x && ". + "wget --no-verbose -O- '$Url' >'$AddOn->{filename}'"); + last if ($? == 0); + } + my $ErrMessage = _VerifyAddOn($AddOn, $Arch); + return 1 if (!defined $ErrMessage); + LogMsg "$ErrMessage\n"; + return 0; +} + +sub UpdateAddOns() +{ + my %AddOns; + if (open(my $fh, "<", "$DataDir/wine/dlls/appwiz.cpl/addons.c")) + { + my $Arch = ""; + while (my $Line= <$fh>) + { + if ($Line =~ /^\s*#\s*define\s+ARCH_STRING\s+"([^"]+)"/) + { + $Arch = $1; + } + elsif ($Line =~ /^\s*#\s*define\s*(GECKO|MONO)_VERSION\s*"([^"]+)"/) + { + my ($AddOn, $Version) = ($1, $2); + $AddOn =~ tr/A-Z/a-z/; + $AddOns{$AddOn}->{name} = $AddOn; + $AddOns{$AddOn}->{version} = $Version; + } + elsif ($Line =~ /^\s*#\s*define\s*(GECKO|MONO)_SHA\s*"([^"]+)"/) + { + my ($AddOn, $Checksum) = ($1, $2); + $AddOn =~ tr/A-Z/a-z/; + $AddOns{$AddOn}->{$Arch} = $Checksum; + $Arch = ""; + } + } + close($fh); + } + else + { + LogMsg "Could not open 'wine/dlls/appwiz.cpl/addons.c': $!\n"; + return 0; + } + + return _UpdateAddOn($AddOns{gecko}, "gecko", "x86") && + _UpdateAddOn($AddOns{gecko}, "gecko", "x86_64") && + _UpdateAddOn($AddOns{mono}, "mono", ""); +} + + +# +# Wine helpers +# + +sub SetupWineEnvironment($) +{ + my ($Build) = @_; + + $ENV{WINEPREFIX} = "$DataDir/wineprefix-$Build"; + $ENV{DISPLAY} ||= ":0.0"; +} + +sub RunWine($$$) +{ + my ($Build, $Cmd, $CmdArgs) = @_; + + my $Magic = `cd '$DataDir/build-$Build' && file $Cmd`; + my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); + return system("cd '$DataDir/build-$Build' && set -x && ". + "time $Wine $Cmd $CmdArgs"); +} + + +# +# WinePrefix helpers +# + +sub CreateWinePrefix($$) +{ + my ($Build, $Wait) = @_; + + return "\$WINEPREFIX is not set!" if (!$ENV{WINEPREFIX}); + rmtree($ENV{WINEPREFIX}); + + # Crash dialogs cause delays so disable them + if (RunWine($Build, "./programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) + { + return "Failed to disable the $Build build crash dialogs: $!"; + } + + if ($Wait) + { + # Ensure the WinePrefix has been fully created and the registry files + # saved before returning. + system("cd '$DataDir/build-$Build' && ./server/wineserver -w"); + } + + return undef; +} + +1; -- 2.18.0

1 0

[PATCH] testbot: Add helpers to build and sanitize the WineTest tag.
by Francois Gouget 22 Aug '18

22 Aug '18

Also fix the sanitation: WineTest allows dots and dashes in the tag. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 16 ++++++---------- testbot/bin/WineRunWineTest.pl | 6 ++---- testbot/bin/build/WineTest.pl | 3 ++- testbot/lib/WineTestBot/Utils.pm | 24 +++++++++++++++++++++++- 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 27dd8e7b3..c602979b1 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -41,11 +41,12 @@ $Name0 =~ s+^.*/++; use WineTestBot::Config; +use WineTestBot::Engine::Notify; use WineTestBot::Jobs; -use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; -use WineTestBot::Engine::Notify; +use WineTestBot::Utils; +use WineTestBot::VMs; # @@ -455,18 +456,13 @@ elsif ($Step->Type eq "suite") { $Keepalive = 60; $Script .= "$FileName "; - my $Tag = lc($VM->Name); - $Tag =~ s/^$TagPrefix//; - $Tag =~ s/[^a-zA-Z0-9]/-/g; - if ($VM->Type eq "win64") - { - $Tag .= "-" . ($Step->FileType eq "exe64" ? "64" : "32"); - } if (defined($WebHostName)) { my $StepTask = 100 * $StepNo + $TaskNo; $Script .= "-u \"http://$WebHostName/JobDetails.pl?Key=$JobId&s$StepTask=1#k$StepTask\" "; } + my $Tag = $VM->Type ne "win64" ? "" : $Step->FileType eq "exe64" ? "64" : "32"; + $Tag = BuildTag($VM->Name, $Tag); my $Info = $VM->Description ? $VM->Description : ""; if ($VM->Details) { @@ -481,7 +477,7 @@ elsif ($Step->Type eq "suite") $Info =~ s/"/\\"/g; $Info =~ s/%/%%/g; $Info =~ s/%/%%/g; - $Script .= "-q -o $RptFileName -t $TagPrefix-$Tag -m \"$EMail\" -i \"$Info\"\r\n". + $Script .= "-q -o $RptFileName -t $Tag -m \"$EMail\" -i \"$Info\"\r\n". "$FileName -q -s $RptFileName\r\n"; } Debug(Elapsed($Start), " Sending the script: [$Script]\n"); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index ac5594654..216811116 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -425,10 +425,8 @@ my $Script = "#!/bin/sh\n". " ../bin/build/WineTest.pl "; if ($Step->Type eq "suite") { - my $Tag = lc($VM->Name); - $Tag =~ s/^$TagPrefix//; - $Tag =~ s/[^a-zA-Z0-9]/-/g; - $Script .= "--winetest ". $Task->CmdLineArg ." $TagPrefix-$Tag "; + my $BaseTag = BuildTag($VM->Name); + $Script .= "--winetest ". $Task->CmdLineArg ." $BaseTag "; if (defined $WebHostName) { my $StepTask = 100 * $StepNo + $TaskNo; diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 3310b4c53..b29440e21 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -181,8 +181,9 @@ sub DailyWineTest($$$$$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. + my $Tag = SanitizeTag("$BaseTag-$Build"); RunWine($Build, "./programs/winetest/winetest.exe.so", - "-c -o '../$Build.report' -t $BaseTag-$Build ". ShArgv2Cmd(@$Args)); + "-c -o '../$Build.report' -t $Tag ". ShArgv2Cmd(@$Args)); if (!-f "$Build.report") { LogMsg "WineTest did not produce a report file\n"; diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index f64310b6b..6fa0ccce7 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -1,5 +1,6 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # Copyright 2009 Ge van Geldorp +# Copyright 2012-2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -29,7 +30,7 @@ use Exporter 'import'; our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir DurationToString BuildEMailRecipient IsValidFileName - ShQuote ShArgv2Cmd); + BuildTag SanitizeTag ShQuote ShArgv2Cmd); use Fcntl; @@ -175,6 +176,27 @@ sub CreateNewDir($$) } +# +# WineTest helpers +# + +sub SanitizeTag($) +{ + my ($Tag) = @_; + $Tag =~ s/[^a-zA-Z0-9.-]/-/g; + return substr($Tag, 0, 30); +} + +sub BuildTag($;$) +{ + my ($VMName, $Tag) = @_; + + $Tag = $Tag ? "$VMName-$Tag" : $VMName; + $Tag =~ s/^$TagPrefix//; + return SanitizeTag("$TagPrefix-$Tag"); +} + + # # Shell helpers # -- 2.18.0

1 0

[PATCH v3 2/2] crypt32: Properly check root certificate in CERT_CHAIN_REVOCATION_CHECK_CHAIN.
by Zhiyi Zhang 22 Aug '18

22 Aug '18

Original patch by Michael Müller. Root certificates don't have CRL Distribution Point or Authority Info Access field. Don't report error with CERT_CHAIN_REVOCATION_CHECK_CHAIN in CertGetCertificateChain() because of this. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: v2 got altered somehow in the mail client. Ignore CRYPT_E_NO_REVOCATION_CHECK only with CERT_CHAIN_REVOCATION_CHECK_CHAIN. dlls/crypt32/chain.c | 5 +++++ dlls/crypt32/tests/chain.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d7015d797d..41c87b7ae7 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2698,6 +2698,11 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certToCheck, revocationFlags, &revocationPara, &revocationStatus); + + if (!ret && chainFlags & CERT_CHAIN_REVOCATION_CHECK_CHAIN + && revocationStatus.dwError == CRYPT_E_NO_REVOCATION_CHECK && revocationPara.pIssuerCert == NULL) + ret = TRUE; + if (!ret) { PCERT_CHAIN_ELEMENT element = CRYPT_FindIthElementInChain( diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a995c81239..e2a7633526 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4156,9 +4156,9 @@ static void testGetCertChain(void) ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); - todo_wine ok(!chain->TrustStatus.dwErrorStatus - || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ - "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); pCertFreeCertificateChain(chain); ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, -- 2.18.0

1 0

[PATCH v3 1/2] crypt32/tests: Add revocation flags tests for CertGetCertificateChain().
by Zhiyi Zhang 22 Aug '18

22 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Avoid leaking chain. Supersede 150010,150011. dlls/crypt32/tests/chain.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a6599b21ae..a995c81239 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4147,6 +4147,26 @@ static void testGetCertChain(void) pCertFreeCertificateChain(chain); + /* Test revocation flags */ + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_END_CERT, NULL, + &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + todo_wine ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, + NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + /* Test HCCE_LOCAL_MACHINE */ ret = CertGetCertificateChain(HCCE_LOCAL_MACHINE, cert, &fileTime, store, &para, 0, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); -- 2.18.0

1 0

[PATCH v2 2/2] crypt32: Properly check root certificate in CERT_CHAIN_REVOCATION_CHECK_CHAIN.
by Zhiyi Zhang 22 Aug '18

22 Aug '18

Original patch by Michael Müller. Root certificates don't have CRL Distribution Point or Authority Info Access field. Don't report error with CERT_CHAIN_REVOCATION_CHECK_CHAIN in CertGetCertificateChain() because of this. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: ignore CRYPT_E_NO_REVOCATION_CHECK only with CERT_CHAIN_REVOCATION_CHECK_CHAIN. dlls/crypt32/chain.c | 5 +++++ dlls/crypt32/tests/chain.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d7015d797d..41c87b7ae7 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2698,6 +2698,11 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certToCheck, revocationFlags, &revocationPara, &revocationStatus); + + if (!ret && chainFlags & + && revocationStatus.dwError == CRYPT_E_NO_REVOCATION_CHECK && revocationPara.pIssuerCert == NULL) + ret = TRUE; + if (!ret) { PCERT_CHAIN_ELEMENT element = CRYPT_FindIthElementInChain( diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a995c81239..e2a7633526 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4156,9 +4156,9 @@ static void testGetCertChain(void) ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); - todo_wine ok(!chain->TrustStatus.dwErrorStatus - || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ - "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); pCertFreeCertificateChain(chain); ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, -- 2.18.0

2 1

[PATCH v2 1/2] crypt32/tests: Add revocation flags tests for CertGetCertificateChain().
by Zhiyi Zhang 22 Aug '18

22 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Avoid leaking chain. Supersede 149966,149967. dlls/crypt32/tests/chain.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a6599b21ae..a995c81239 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4147,6 +4147,26 @@ static void testGetCertChain(void) pCertFreeCertificateChain(chain); + /* Test revocation flags */ + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_END_CERT, NULL, + &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + todo_wine ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, + NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + /* Test HCCE_LOCAL_MACHINE */ ret = CertGetCertificateChain(HCCE_LOCAL_MACHINE, cert, &fileTime, store, &para, 0, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); -- 2.18.0

1 0

[PATCH 1/7] shell32: Add eject icon
by Alex Henrie 22 Aug '18

22 Aug '18

Adapted from media-eject in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/eject.ico | Bin 0 -> 41496 bytes dlls/shell32/resources/eject.svg | 596 +++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 601 insertions(+) create mode 100644 dlls/shell32/resources/eject.ico create mode 100644 dlls/shell32/resources/eject.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index ee502c26df..62fb27097c 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -68,6 +68,7 @@ SVG_SRCS = \ resources/desktop.svg \ resources/document.svg \ resources/drive.svg \ + resources/eject.svg \ resources/floppy.svg \ resources/folder.svg \ resources/folder_open.svg \ diff --git a/dlls/shell32/resources/eject.ico b/dlls/shell32/resources/eject.ico new file mode 100644 index 0000000000000000000000000000000000000000..576b25b25c8ecc5e6c7b257ef640cbe9e4128b70 GIT binary patch literal 41496 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 literal 0 HcmV?d00001 diff --git a/dlls/shell32/resources/eject.svg b/dlls/shell32/resources/eject.svg new file mode 100644 index 0000000000..cd8414bdef --- /dev/null +++ b/dlls/shell32/resources/eject.svg @@ -0,0 +1,596 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.1" + id="svg1307" + height="272" + width="632"> + <defs + id="defs1309"> + <linearGradient + id="linearGradient4061"> + <stop + style="stop-color:#474845;stop-opacity:1;" + offset="0" + id="stop4063" /> + <stop + style="stop-color:#838681;stop-opacity:1" + offset="1" + id="stop4065" /> + </linearGradient> + <linearGradient + id="linearGradient2684"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop2686" /> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="1" + id="stop2688" /> + </linearGradient> + <linearGradient + id="linearGradient2679"> + <stop + id="stop2681" + offset="0" + style="stop-color:#ffffff;stop-opacity:1" /> + <stop + id="stop2683" + offset="1" + style="stop-color:#d3d7cf" /> + </linearGradient> + <radialGradient + r="12.551644" + fy="53.259945" + fx="101.15939" + cy="53.259945" + cx="101.15939" + gradientTransform="matrix(0.00402237,-4.19236,11.180094,0.00906826,-459.19255,601.23007)" + gradientUnits="userSpaceOnUse" + id="radialGradient3705" + xlink:href="#linearGradient2679" /> + <linearGradient + gradientTransform="matrix(5.33333,0,0,5.33333,11.036277,4.3243073)" + gradientUnits="userSpaceOnUse" + y2="34.510876" + x2="21.522573" + y1="14.977048" + x1="21.597084" + id="linearGradient3889" + xlink:href="#linearGradient4061" /> + <linearGradient + y2="90.142509" + x2="14.888244" + y1="107.7246" + x1="14.296268" + gradientTransform="matrix(6.0169616,0,0,6.0169616,54.94162,-440.26256)" + gradientUnits="userSpaceOnUse" + id="linearGradient3725" + xlink:href="#linearGradient2684" /> + <radialGradient + r="12.551644" + fy="53.086113" + fx="107.69903" + cy="53.086113" + cx="107.69903" + gradientTransform="matrix(0.00395609,-4.4853732,10.99586,0.00970202,-446.78082,621.57672)" + gradientUnits="userSpaceOnUse" + id="radialGradient2820" + xlink:href="#linearGradient2679" /> + <linearGradient + y2="88.591339" + x2="14.334254" + y1="107.05981" + x1="14.628661" + gradientTransform="matrix(6.0169616,0,0,6.0169616,54.94162,-440.26256)" + gradientUnits="userSpaceOnUse" + id="linearGradient3721" + xlink:href="#linearGradient2684" /> + <linearGradient + gradientTransform="matrix(5.33333,0,0,5.33333,11.036277,4.3243073)" + y2="34.510876" + x2="21.522573" + y1="14.977048" + x1="21.597084" + gradientUnits="userSpaceOnUse" + id="linearGradient967" + xlink:href="#linearGradient4061" /> + <radialGradient + r="12.551644" + fy="53.259945" + fx="101.15939" + cy="53.259945" + cx="101.15939" + gradientTransform="matrix(7.541952e-4,-0.786068,2.096269,0.0017003,183.83171,331.91943)" + gradientUnits="userSpaceOnUse" + id="radialGradient3705-6" + xlink:href="#linearGradient2679" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="34.510876" + x2="21.522573" + y1="14.977048" + x1="21.597084" + id="linearGradient3889-1" + xlink:href="#linearGradient4061" + gradientTransform="translate(271.99967,219.99953)" /> + <linearGradient + y2="90.142509" + x2="14.888244" + y1="107.7246" + x1="14.296268" + gradientTransform="matrix(1.128181,0,0,1.128181,280.23193,136.63944)" + gradientUnits="userSpaceOnUse" + id="linearGradient3725-0" + xlink:href="#linearGradient2684" /> + <radialGradient + r="12.551644" + fy="53.086113" + fx="107.69903" + cy="53.086113" + cx="107.69903" + gradientTransform="matrix(7.417671e-4,-0.841008,2.061725,0.00181913,186.15891,335.73443)" + gradientUnits="userSpaceOnUse" + id="radialGradient2820-6" + xlink:href="#linearGradient2679" /> + <linearGradient + y2="88.591339" + x2="14.334254" + y1="107.05981" + x1="14.628661" + gradientTransform="matrix(1.128181,0,0,1.128181,280.23193,136.63944)" + gradientUnits="userSpaceOnUse" + id="linearGradient3721-6" + xlink:href="#linearGradient2684" /> + <linearGradient + y2="34.510876" + x2="21.522573" + y1="14.977048" + x1="21.597084" + gradientTransform="translate(271.99967,219.99953)" + gradientUnits="userSpaceOnUse" + id="linearGradient1064" + xlink:href="#linearGradient4061" /> + <radialGradient + r="12.551644" + fy="53.259945" + fx="101.15939" + cy="53.259945" + cx="101.15939" + gradientTransform="matrix(5.0279931e-4,-0.52404795,1.3975197,0.00113354,381.22079,310.61353)" + gradientUnits="userSpaceOnUse" + id="radialGradient3705-6-0" + xlink:href="#linearGradient2679" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="34.510876" + x2="21.522573" + y1="14.977048" + x1="21.597084" + id="linearGradient3889-1-7" + xlink:href="#linearGradient4061" + gradientTransform="matrix(0.66667,0,0,0.66667,439.99973,235.99989)" /> + <linearGradient + y2="90.142509" + x2="14.888244" + y1="107.7246" + x1="14.296268" + gradientTransform="matrix(0.75212443,0,0,0.75212443,445.48793,180.42622)" + gradientUnits="userSpaceOnUse" + id="linearGradient3725-0-2" + xlink:href="#linearGradient2684" /> + <radialGradient + r="12.551644" + fy="53.086113" + fx="107.69903" + cy="53.086113" + cx="107.69903" + gradientTransform="matrix(4.9451387e-4,-0.5606748,1.3744902,0.00121276,382.77227,313.15687)" + gradientUnits="userSpaceOnUse" + id="radialGradient2820-6-9" + xlink:href="#linearGradient2679" /> + <linearGradient + y2="88.591339" + x2="14.334254" + y1="107.05981" + x1="14.628661" + gradientTransform="matrix(0.75212443,0,0,0.75212443,445.48793,180.42622)" + gradientUnits="userSpaceOnUse" + id="linearGradient3721-6-3" + xlink:href="#linearGradient2684" /> + <linearGradient + y2="34.510876" + x2="21.522573" + y1="14.977048" + x1="21.597084" + gradientTransform="matrix(0.66667,0,0,0.66667,439.99973,235.99989)" + gradientUnits="userSpaceOnUse" + id="linearGradient1361" + xlink:href="#linearGradient4061" /> + </defs> + <metadata + id="metadata1312"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> + <dc:subject> + <rdf:Bag> + <rdf:li>media</rdf:li> + <rdf:li>eject</rdf:li> + </rdf:Bag> + </dc:subject> + <dc:contributor> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:contributor> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> + </rdf:RDF> + </metadata> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3721);stroke-width:15.99999046;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="M 137.3726,51.030437 69.018984,145.65749 H 205.72622 Z" + id="path3711" /> + <path + id="path2818" + d="M 137.3726,51.030437 69.018984,145.65749 H 205.72622 Z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient2820);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient967);stroke-width:5.33333063;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.33333015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="M 137.37257,60.281837 79.365661,140.81155 195.37949,140.34014 Z" + id="path2828" /> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3725);stroke-width:15.99999046;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect3723" + width="138.03912" + height="26.533634" + x="67.645996" + y="167.01437" /> + <rect + y="167.01437" + x="67.645996" + height="26.533634" + width="138.03912" + id="rect3703" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3705);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3889);stroke-width:5.33333111;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.33332729;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect3707" + width="127.34952" + height="15.628088" + x="72.990623" + y="172.60706" /> + <path + id="path3709" + d="m 137.36953,64.657597 -31.99998,44.333313 c 26.64306,0.99659 35.79754,-0.89496 60.66663,-4.33333 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.56111109;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.33333015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3721-6);stroke-width:3;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 295.68775,228.75694 -12.81632,17.74258 h 25.63263 z" + id="path3711-2" /> + <path + id="path2818-6" + d="m 295.68775,228.75694 -12.81632,17.74258 h 25.63263 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient2820-6);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1064);stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 295.68774,230.49158 -10.8763,15.09933 21.7526,-0.0884 z" + id="path2828-1" /> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3725-0);stroke-width:3;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect3723-8" + width="25.882353" + height="4.9750595" + x="282.61401" + y="250.50394" /> + <rect + y="250.50394" + x="282.61401" + height="4.9750595" + width="25.882353" + id="rect3703-7" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3705-6);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3889-1);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect3707-9" + width="23.87805" + height="2.9302683" + x="283.61612" + y="251.55255" /> + <path + id="path3709-2" + d="m 295.68717,231.31203 -6,8.3125 c 4.99558,0.18686 6.71204,-0.1678 11.375,-0.8125 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.56111109;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:48-32" + height="48" + width="48" + y="220" + x="272" + style="fill:none" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +gg== +" + id="icon:48-8" + x="328" + y="220" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAA +B3RJTUUH1gYMFyca8+vhYAAAB3tJREFUaN7tmMtzE9kVxn/3duv9ltEDP7AsyZY84AwBG0hSWVGV +AbPOY8mav8LzJ7D1ij0bWGaqUqksUqlhqiahMFSmKoTXGLDseRh369ndZxYtP8CMbAwEquKv1NLV +veq+5zvnu/ecKzjEIQ5xiJ0wTROl1K5+pRRmwPzQ5u2N1xm/n7EDz/e+iIweGyEajQDQarZ48nj5 +vczzXmIaCYfI5Y4Qj8cEAcuy1VpjjVa78/ETiMWi5PNDZNNpCUciIBAMBKR4NK8aje+w7ebHR8Aw +NK7rAZBMJRkeHuH07BzliTKC8OC/D2i3O3Q6zhaBnfd8cAKbhqRSSUrj44yOjcmnn57ks999hifC +F1/8mYePH4nribJtm/X1F+/E+HdGYBOl0jjHjo3J7OxpqtUqqXQaRKhUKpw6dQpEpNVsqtu377yz +Od8JgWg0Qj6fI5NJSz6fY272DOPjJVzHQYBSqUSr1WL5yRNWGw0plY6pRmOVZrP1cRDIZrMUiwXK +5QlqtTq1Wp1sJoPdtBAgk81S7/fbtk2r1cJxXJrNt99a35pAKBQim82STmfk9Ok55ucvEU/E6XTb +uJ4LQLfTJhaPcXF+HoCnT59Js9lWq6trdDpvt7Uab0tgerpGrV6Tubk5zp77FfXpaVzPw3F7wHb2 +NQyDVCqD67q4novj9BbA+7zRWP3fEDh//jydTodqtcrz58/7silSrpSkOjnJhQsXqdfrBENBnF4P +QVBKv1Q+aK2JxxPE4zFWVp7T7XYXlNKfm2YA27aZnZ3FNE3OnTvH/fv392XXG0lIa0273QZgdHSE +YrFItVqlXq9TniiTTCbpOV1QCq1834gIIh6u5+J1OyQSccrlCtPTn9DrOYhAo7GKZdn0ej1CodAb +RWBPApcvXwag0WgwPDxGOBwkHouSzqRJpZNSq9U5c+Ys8UScntPdpWkRAQRPBES2ojA3d5ZOu8vK +8xURRIVCIUKhKNFoh0AguDXvtWvXBjt10ODCwgJaa7LZLLf/9SX5XIZYLEKukKN4tCiVSoX69DT1 +2jQCNFstek4PZ8flug6O6+J5Hp54tDtt0FCr1ajX61SqFQqFggwNZUgkohQKQ9z/zxLZbBatNQsL +C28XAc/zsCyL+Uu/p2n/iOv1cDxPCoUCFy/MU6/XfXl4Lgp/sSoU/uvlYldEEMQn47nMzMwQDAW4 +efMmzaYt4VBQKWVw9tx5LMvC8/bO1gMjcOPGDeYvXmJxcZHj9eOksxmi8TiTk1McP37cz7apFL1e +F/DrG9MwMU0T0wj4n69eholS0HN6JFNJKpUqMzMzTE3VCIbCJJIpfnFihsXFRf74hz9x/fr1gQQG +ngeuXr1KMpnCsjZYW1tjw1rH9Rw5efKXzM3OUZ6oYJom7W4bhUIp/0KpHVHoex8Q8VsiHiJCMBjC +dRwePXzIra9u8fU/v8YwTJVKpCgUiqSSKX748QeuXLlyMAlFIhEi4TCu62A1NzAMLdlsjtL4BNXK +1NaOYRjmDmP3c0YSBNBKgxmkXK7QWG2w/HSZ9fV1sZuWisViRKMxuv3oHojAkSNHGB0Z4/nKM+7e +u0PH6WGaJt988+8tjQqyS+v7g/hh6Udteflb1tfXsW2LYDBEPl9gdGSUh48eHJxAJpNhePgo3V4H +MxCg2+tiN5vcvXeXO0t3+nu87Lhjv0RkV8/O43LANBkaGuLo8DAvNtYPTiCdTtNsNUkkEsycmGFj +Y0NpQyOe4LquLwTxywWtfe2/xrZ9kdDaz9oiQjqdIZvJ0O22yeVyByewuLi4PZ3nG+d7XOGv1b7q +lcI0TbTWr0TkZ2KifnYEEUEpuPXlrf73wW4YGPN4PE6r1SIcDnNi5hPiibjv+b2e+hpfq1c7Xvcb +pTAMA8uyuHvnHu12m0gkgmVZB4tAqVRi+dunFIsFTp46SSQSlk0vvSmBwR19b/Yj2mq11caPFisr +KwyPDLO0tHQwAuPj4yRiSdLZFIFAQDKZLCeOnyCZSO7Kkm9E6TXrXmvNixcvWLq7hOuuSmmipNLp +DNmhzMEJTE5O4k54GKbG0y6JZJLf/Pq3FPKFbQKvlAxqgL637ZctEpttrTUrjRUeP3nM999/T61W +w3X8uQdhIIGpqSlikTjNts2DJ/cxtAYE13OwbButFUppdL/u11r57f6OstmPgCd+MbdZXnue3/ZE +EM8jGo0BYGhNOBxi4liFaCSG3bQOTmBycpLh4giN1RWeNpb7W53G0CahYHDbUBRKb5YSendiU37W +1fgO2DJ86/L8caXQWhMKhanX6uTzBZ4+G3xuHkigXC5TLpdJPEnwj6/+jut5NFYbfhRcd1M/OwW0 +3d7V2CmbbTFtvhuGwepqA9fziETCVKpVxsZGCUcGH3AGEhgZGQFgbGyUaDSKbVv89W9/IWAG+tXM +S5a+6vRdGLTQFX6FajctYtEYY2OjL9lwIAI7j3e5XF6p79ak1+3R6XS2fL337rMrC7zWeEHQyj+t +HRk6snXDXkfMgU/e1Oj7+F9/P9ice9D8eq+HHCTzvivj/XU2GHtG4GPAh1LAIQ5xiEP8H+AngIUf +y4zNAPwAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTAtMTlUMDA6MTQ6MDktMDY6MDCO1Rn8AAAA +JXRFWHRkYXRlOm1vZGlmeQAyMDA2LTA2LTEzVDA1OjM5OjI2LTA2OjAwewtT2wAAAABJRU5ErkJg +gg== +" + id="icon:48-4" + x="384" + y="220" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3721-6-3);stroke-width:2.00001001;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 455.79186,241.83819 -8.54425,11.82845 h 17.0885 z" + id="path3711-2-6" /> + <path + id="path2818-6-1" + d="m 455.79186,241.83819 -8.54425,11.82845 h 17.0885 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient2820-6-9);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1361);stroke-width:0.66667008;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.66667002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 455.79186,242.99462 -7.25091,10.06627 14.50181,-0.0589 z" + id="path2828-1-2" /> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3725-0-2);stroke-width:2.00001001;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect3723-8-9" + width="17.254988" + height="3.3167229" + x="447.07602" + y="256.33627" /> + <rect + y="256.33627" + x="447.07602" + height="3.3167229" + width="17.254988" + id="rect3703-7-3" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3705-6-0);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3889-1-7);stroke-width:0.66667014;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.66666967;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect3707-9-1" + width="15.918779" + height="1.953522" + x="447.74408" + y="257.03534" /> + <path + id="path3709-2-9" + d="m 455.79148,243.54159 -4.00002,5.5417 c 3.3304,0.12457 4.47471,-0.11187 7.58337,-0.54167 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.56111109;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.66667002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:32-32" + height="32" + width="32" + y="236" + x="440" + style="fill:none" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABaFBMVEUAAAA3OjU3OTQoKCQM +DAw1NTIfHx8HBwcNDQ0aGhojIyNDQ0NNTUpQUE1HR0dgYGBaWlVfX1qAgICbm5tucGxwcm6ioqK8 +vLzDw8PV1dXW1tbd3d3c3Nzj4+MyMjJnZ2efn5////9OTktMTUrl5uTj5OJHR0Sio6D9/f38/Pyf +oZ5nZ2Pw8e7v8e77+/toaGVOTkzw8O/19vTs7urz9PLt7u1QUU3LzMr6+/ru8O3v8e35+fjJy8hR +UU1NTUyRk47y9PHx8/Hw8u/u7+zt7+z8/PuTlZJPT01maGT5+vnt7+3m6eXn6uXn6eXm6eTs7+z6 ++vpoaWZfYV3o6Of29/Xq7Onr7urs7uvq6+lfYF1namW+v7zx8/Dy9PLz9fP09fP7/PvCw8BnaWWM +jYn///+OkIxsbmppa2dnaWR0d3Fzd3FzdnF3e3V3enV7f3n+/v33+Pb+/v57fnl/g337+/r8/fx/ +gn2ChoDon6pCAAAAInRSTlMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPKwcEQAA +AAFiS0dEIcRsDRYAAAAHdElNRQfWBgwXJxrz6+FgAAABCElEQVQ4y2NgGIKAkQm/PLOSEjM+eRZl +FVVlFjwK1NQ1NLXUcMuzamvq6Orps+KSZzMwNDI2NjE1YMMuz25mbmFpZWVlbWPLgU2e085ew8HR +0cnZxdXNnQtTnpvHw9PL28fX19vPPyCQlw9dnl8gKDgkNCzcxcUlPCwkIlKQH1VeSCgq2tVSNyY2 +Lj4uNkY3ITFJSAhFgbBIcgoKSBUVQ1EgnpSWngQHGSAggaJAUlIKCKSRgIwsA0lALhMGsrKyssFA +DkWBfE4KGsiVR1GgkJcfrusYX+CpWajpWRDvqFtYpICiQKrYoiRBs1RDI78wX0OjVDOhpEwKRYFi +OQZQRFWABZDmzcENAOc0TlYRHRU2AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0 +OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0ZTptb2RpZnkAMjAwNi0wNi0xM1QwNTozOToyNi0wNjow +MHsLU9sAAAAASUVORK5CYII= +" + id="icon:32-8" + x="480" + y="236" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABaFBMVEUAAAA3OjU3OTQoKCQM +DAw1NTIfHx8HBwcNDQ0aGhojIyNDQ0NNTUpQUE1HR0dgYGBaWlVfX1qAgICbm5tucGxwcm6ioqK8 +vLzDw8PV1dXW1tbd3d3c3Nzj4+MyMjJnZ2efn5////9OTktMTUrl5uTj5OJHR0Sio6D9/f38/Pyf +oZ5nZ2Pw8e7v8e77+/toaGVOTkzw8O/19vTs7urz9PLt7u1QUU3LzMr6+/ru8O3v8e35+fjJy8hR +UU1NTUyRk47y9PHx8/Hw8u/u7+zt7+z8/PuTlZJPT01maGT5+vnt7+3m6eXn6uXn6eXm6eTs7+z6 ++vpoaWZfYV3o6Of29/Xq7Onr7urs7uvq6+lfYF1namW+v7zx8/Dy9PLz9fP09fP7/PvCw8BnaWWM +jYn///+OkIxsbmppa2dnaWR0d3Fzd3FzdnF3e3V3enV7f3n+/v33+Pb+/v57fnl/g337+/r8/fx/ +gn2ChoDon6pCAAAAInRSTlMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPKwcEQAA +AAFiS0dEIcRsDRYAAAAHdElNRQfWBgwXJxrz6+FgAAABCElEQVQ4y2NgGIKAkQm/PLOSEjM+eRZl +FVVlFjwK1NQ1NLXUcMuzamvq6Orps+KSZzMwNDI2NjE1YMMuz25mbmFpZWVlbWPLgU2e085ew8HR +0cnZxdXNnQtTnpvHw9PL28fX19vPPyCQlw9dnl8gKDgkNCzcxcUlPCwkIlKQH1VeSCgq2tVSNyY2 +Lj4uNkY3ITFJSAhFgbBIcgoKSBUVQ1EgnpSWngQHGSAggaJAUlIKCKSRgIwsA0lALhMGsrKyssFA +DkWBfE4KGsiVR1GgkJcfrusYX+CpWajpWRDvqFtYpICiQKrYoiRBs1RDI78wX0OjVDOhpEwKRYFi +OQZQRFWABZDmzcENAOc0TlYRHRU2AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0 +OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0ZTptb2RpZnkAMjAwNi0wNi0xM1QwNTozOToyNi0wNjow +MHsLU9sAAAAASUVORK5CYII= +" + id="icon:32-4" + x="520" + y="236" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAABl0RVh0 +U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAIGSURBVDiNlVNNaBNhEH2zm5h2aSxB6Jrd +bhKCK2ICQkEFtVojiIoU/9oYmxgFQREET16UHjx5Us+eDFqqguDJg7Z68KLePBgRVOoPrWlN023a +JLttMh6aSNIkJQ58MIf3Hm9m3kfMjGZFRHYAxMxWM4xtDfJ6TdM2M7NARJ+Z2WhZgIjsLpdL27N3 +11OBIL1+9eYgESWZ2awDM3PNA0AAPCdOHX8yNvZi6d37t8uD4ZPjAHzlcWrwjRxs2Le/90ggGOjv +6wvZQMD2HTt3Z7Jz0ZfPx+8BmG7qAICk63pvLB7N5vI5zi7M83zWYNMy+fyFeK6nZ9thURQ7ajiV +RlEU0e/3bzo9FP6Q/JQs5gt5Ts1M8e/pSV5YzPLE94nSmVj4RzAY3Or1em11I/h8vo3dHuXKgVBo +i67rQmYuDSICESGXX4SqKBQeiMjMj25O/py6CuAXKkuJRCKdxWLxkOzuun/n9t02URAbnpaZcWP4 +euHbl6/XHI72h4lEImMDAFVVO2b+pAZm0+l1ly5ftKhqN1jVm6Zlb2t3xFSl+xmAFQGPx7PkdruH +DcO4RUSrM1HXS5JUcDqdFlAOkqZp0ujjkY8NfTep/qPHAgBSFQciAIw8GG2JfPZctKgoiljtoCQI +wnIsPkRrU/8Vy7JcAspXANAJoAsrMW5JAEAawCxVfWf6TwEGgL8Ut/ce2QnONgAAAABJRU5ErkJg +gg== +" + id="icon:16-32" + x="560" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABAlBMVEX///8AAAAdHR0cHBwR +EREaGho/QT1FSkMlJSUyMi8DAwMiIiIsLCwfHx86Ojo/Pz9YWFhVVVVXV1VeXl5zc3N6enqRkZGM +jIx9fX1+fn5/f3+AgICKioqXl5eurq6jo6PMzMy9vb3p6enU1NRZW1dbXFdSVFG8vLrJyshWV1N9 +gHz8/Pz8/fyLjYpdX1z29/bz9PLy8/H5+vlhZF9YW1fW19b3+Pfp6+fo6ub09fPg4eBaXVdWWFSb +nZn7/Pvq7Oj7+/qxsrBZXFhsbmv+/v79/f15e3heX1xaW1hjZmJkZmJjZWFiZGBhY19gYl5ZW1hf +YFxVV1P6+vpYWlZXWVX///9CgJXBAAAAJHRSTlMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAGAVEMAAAAAWJLR0QAiAUdSAAAAAd0SU1FB9UMDRcLJ+Yqy7UAAACUSURBVBjTY2CA +AEZGBhTAyMSMIsLIoqLKiiTCyKimrqGJpIuRTUtbR5cdLsDIoadvYGhkzMkF4bNym5iamVtYWlnz +8IIF+Gxs7eyBwMHRiR/EFxB0tnMBA1c3IWGggIi7h6eXt4+Pr5+ff4AoUEBMXEISCKSkpKSlZWSB +AnKBSEAeKKAQGAQHwYpAAaUQJKDMQBgAAFqUG9HptvClAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3 +LTEwLTE5VDAwOjE0OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0ZTptb2RpZnkAMjAwNS0xMi0xNFQw +NjoxMTozOS0wNzowMEeqsqMAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAA +AElFTkSuQmCC +" + id="icon:16-8" + x="584" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABAlBMVEX///8AAAAdHR0cHBwR +EREaGho/QT1FSkMlJSUyMi8DAwMiIiIsLCwfHx86Ojo/Pz9YWFhVVVVXV1VeXl5zc3N6enqRkZGM +jIx9fX1+fn5/f3+AgICKioqXl5eurq6jo6PMzMy9vb3p6enU1NRZW1dbXFdSVFG8vLrJyshWV1N9 +gHz8/Pz8/fyLjYpdX1z29/bz9PLy8/H5+vlhZF9YW1fW19b3+Pfp6+fo6ub09fPg4eBaXVdWWFSb +nZn7/Pvq7Oj7+/qxsrBZXFhsbmv+/v79/f15e3heX1xaW1hjZmJkZmJjZWFiZGBhY19gYl5ZW1hf +YFxVV1P6+vpYWlZXWVX///9CgJXBAAAAJHRSTlMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAGAVEMAAAAAWJLR0QAiAUdSAAAAAd0SU1FB9UMDRcLJ+Yqy7UAAACUSURBVBjTY2CA +AEZGBhTAyMSMIsLIoqLKiiTCyKimrqGJpIuRTUtbR5cdLsDIoadvYGhkzMkF4bNym5iamVtYWlnz +8IIF+Gxs7eyBwMHRiR/EFxB0tnMBA1c3IWGggIi7h6eXt4+Pr5+ff4AoUEBMXEISCKSkpKSlZWSB +AnKBSEAeKKAQGAQHwYpAAaUQJKDMQBgAAFqUG9HptvClAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3 +LTEwLTE5VDAwOjE0OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0ZTptb2RpZnkAMjAwNS0xMi0xNFQw +NjoxMTozOS0wNzowMEeqsqMAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAA +AElFTkSuQmCC +" + id="icon:16-4" + x="608" + y="252" /> +</svg> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index a82abfefc3..f66949cee8 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -504,6 +504,9 @@ IDI_SHELL_RUN ICON resources/window.ico /* @makedep: resources/sleep.ico */ IDI_SHELL_SLEEP ICON resources/sleep.ico +/* @makedep: resources/eject.ico */ +IDI_SHELL_EJECT ICON resources/eject.ico + /* @makedep: resources/shortcut.ico */ IDI_SHELL_SHORTCUT ICON resources/shortcut.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 4a9ac9a385..589379b7af 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -195,6 +195,7 @@ #define IDI_SHELL_HELP 24 #define IDI_SHELL_RUN 25 #define IDI_SHELL_SLEEP 26 +#define IDI_SHELL_EJECT 27 #define IDI_SHELL_FOLDER_OPEN_LARGE 29 #define IDI_SHELL_SHORTCUT 30 #define IDI_SHELL_FOLDER_OPEN_SMALL 31 -- 2.18.0

1 6

[PATCH] explorer: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 21 Aug '18

21 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/desktop.c | 8 ++++---- programs/explorer/explorer.c | 32 +++++++++++++++----------------- programs/explorer/systray.c | 8 ++++---- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4f47ad0d36..ff58204530 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -709,7 +709,7 @@ static const WCHAR *get_default_desktop_name(void) WCHAR *ret = NULL; HKEY hkey; - if (desk && GetUserObjectInformationW( desk, UOI_NAME, buffer, sizeof(buffer)/sizeof(WCHAR), NULL )) + if (desk && GetUserObjectInformationW( desk, UOI_NAME, buffer, ARRAY_SIZE( buffer ), NULL )) { if (strcmpiW( buffer, defaultW )) return buffer; } @@ -792,7 +792,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) static const WCHAR drv_formatW[] = {'w','i','n','e','%','s','.','d','r','v',0}; WCHAR buffer[MAX_PATH], libname[32], *name, *next; - WCHAR key[sizeof(device_keyW)/sizeof(WCHAR) + 39]; + WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; HMODULE module = 0; HKEY hkey; char error[80]; @@ -809,7 +809,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) RegCloseKey( hkey ); } } - else lstrcpynW( buffer, driver, sizeof(buffer)/sizeof(WCHAR) ); + else lstrcpynW( buffer, driver, ARRAY_SIZE( buffer )); name = buffer; while (name) @@ -817,7 +817,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) next = strchrW( name, ',' ); if (next) *next++ = 0; - snprintfW( libname, sizeof(libname)/sizeof(WCHAR), drv_formatW, name ); + snprintfW( libname, ARRAY_SIZE( libname ), drv_formatW, name ); if ((module = LoadLibraryW( libname )) != 0) break; switch (GetLastError()) { diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index c50933661b..955678d23b 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -345,10 +345,8 @@ static void make_explorer_window(IShellFolder* startFolder) memset(nav_buttons,0,sizeof(nav_buttons)); - LoadStringW(explorer_hInstance,IDS_EXPLORER_TITLE,explorer_title, - sizeof(explorer_title)/sizeof(WCHAR)); - LoadStringW(explorer_hInstance,IDS_PATHBOX_LABEL,pathbox_label, - sizeof(pathbox_label)/sizeof(WCHAR)); + LoadStringW(explorer_hInstance,IDS_EXPLORER_TITLE,explorer_title, ARRAY_SIZE( explorer_title )); + LoadStringW(explorer_hInstance,IDS_PATHBOX_LABEL,pathbox_label, ARRAY_SIZE( pathbox_label )); hdc = GetDC(0); dpix = GetDeviceCaps(hdc, LOGPIXELSX); @@ -415,7 +413,7 @@ static void make_explorer_window(IShellFolder* startFolder) nav_buttons[2].fsState=TBSTATE_ENABLED; nav_buttons[2].fsStyle=BTNS_BUTTON|BTNS_AUTOSIZE; SendMessageW(nav_toolbar,TB_BUTTONSTRUCTSIZE,sizeof(TBBUTTON),0); - SendMessageW(nav_toolbar,TB_ADDBUTTONSW,sizeof(nav_buttons)/sizeof(TBBUTTON),(LPARAM)nav_buttons); + SendMessageW(nav_toolbar,TB_ADDBUTTONSW,ARRAY_SIZE( nav_buttons ),(LPARAM)nav_buttons); band_info.cbSize = sizeof(band_info); band_info.fMask = RBBIM_STYLE|RBBIM_CHILD|RBBIM_CHILDSIZE|RBBIM_SIZE; @@ -738,38 +736,38 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) while (*p) { while (isspaceW(*p)) p++; - if (strncmpW(p, arg_n, sizeof(arg_n)/sizeof(WCHAR))==0) + if (strncmpW(p, arg_n, ARRAY_SIZE( arg_n ))==0) { parameters->explorer_mode = FALSE; - p += sizeof(arg_n)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_n ); } - else if (strncmpW(p, arg_e, sizeof(arg_e)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_e, ARRAY_SIZE( arg_e ))==0) { parameters->explorer_mode = TRUE; - p += sizeof(arg_e)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_e ); } - else if (strncmpW(p, arg_root, sizeof(arg_root)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_root, ARRAY_SIZE( arg_root ))==0) { - p += sizeof(arg_root)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_root ); p = copy_path_string(parameters->root,p); } - else if (strncmpW(p, arg_select, sizeof(arg_select)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_select, ARRAY_SIZE( arg_select ))==0) { - p += sizeof(arg_select)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_select ); p = copy_path_string(parameters->selection,p); if (!parameters->root[0]) copy_path_root(parameters->root, parameters->selection); } - else if (strncmpW(p, arg_desktop, sizeof(arg_desktop)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_desktop, ARRAY_SIZE( arg_desktop ))==0) { - p += sizeof(arg_desktop)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_desktop ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } /* workaround for Worms Armageddon that hardcodes a /desktop option with quotes */ - else if (strncmpW(p, arg_desktop_quotes, sizeof(arg_desktop_quotes)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_desktop_quotes, ARRAY_SIZE( arg_desktop_quotes ))==0) { - p += sizeof(arg_desktop_quotes)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_desktop_quotes ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } else diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 9e58ad4833..3d36f74e16 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -405,13 +405,13 @@ static BOOL modify_icon( struct icon *icon, NOTIFYICONDATAW *nid ) } if (nid->uFlags & NIF_TIP) { - lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR)); + lstrcpynW( icon->tiptext, nid->szTip, ARRAY_SIZE( icon->tiptext )); if (icon->display != -1) update_tooltip_text(icon); } if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) { - lstrcpynW( icon->info_text, nid->szInfo, sizeof(icon->info_text)/sizeof(WCHAR) ); - lstrcpynW( icon->info_title, nid->szInfoTitle, sizeof(icon->info_title)/sizeof(WCHAR) ); + lstrcpynW( icon->info_text, nid->szInfo, ARRAY_SIZE( icon->info_text )); + lstrcpynW( icon->info_title, nid->szInfoTitle, ARRAY_SIZE( icon->info_title )); icon->info_flags = nid->dwInfoFlags; icon->info_timeout = max(min(nid->u.uTimeout, BALLOON_SHOW_MAX_TIMEOUT), BALLOON_SHOW_MIN_TIMEOUT); icon->info_icon = nid->hBalloonIcon; @@ -933,7 +933,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab return; } - LoadStringW( NULL, IDS_START_LABEL, start_label, sizeof(start_label)/sizeof(WCHAR) ); + LoadStringW( NULL, IDS_START_LABEL, start_label, ARRAY_SIZE( start_label )); add_taskbar_button( 0 ); -- 2.14.4

1 0

[PATCH] dxdiag: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 21 Aug '18

21 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/dxdiag/information.c | 6 +++--- programs/dxdiag/main.c | 10 +++++----- programs/dxdiag/output.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/dxdiag/information.c b/programs/dxdiag/information.c index 5cc862be63..ec2b2b5b0e 100644 --- a/programs/dxdiag/information.c +++ b/programs/dxdiag/information.c @@ -156,7 +156,7 @@ static BOOL fill_system_information(IDxDiagContainer *container, struct dxdiag_i fill_system_property_list(dxdiag_info, property_list); - for (i = 0; i < sizeof(property_list)/sizeof(property_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(property_list); i++) { if (!property_to_string(container, property_list[i].property_name, property_list[i].output)) { @@ -193,7 +193,7 @@ void free_dxdiag_information(struct dxdiag_information *system_info) if (!system_info) return; - for (i = 0; i < sizeof(filler_list)/sizeof(filler_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(filler_list); i++) filler_list[i].free_function(system_info); HeapFree(GetProcessHeap(), 0, system_info); @@ -230,7 +230,7 @@ struct dxdiag_information *collect_dxdiag_information(BOOL whql_check) if (!ret) goto error; - for (i = 0; i < sizeof(filler_list)/sizeof(filler_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(filler_list); i++) { IDxDiagContainer *child; BOOL success; diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index d7d430b570..b073674ca1 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -43,8 +43,8 @@ static void usage(void) WCHAR title[MAX_STRING_LEN]; WCHAR usage[MAX_STRING_LEN]; - LoadStringW(hInstance, STRING_DXDIAG_TOOL, title, sizeof(title)/sizeof(WCHAR)); - LoadStringW(hInstance, STRING_USAGE, usage, sizeof(usage)/sizeof(WCHAR)); + LoadStringW(hInstance, STRING_DXDIAG_TOOL, title, ARRAY_SIZE(title)); + LoadStringW(hInstance, STRING_USAGE, usage, ARRAY_SIZE(usage)); MessageBoxW(NULL, usage, title, MB_OK | MB_ICONWARNING); @@ -126,7 +126,7 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info { info->output_type = OUTPUT_TEXT; return process_file_name(cmdline, OUTPUT_TEXT, info->outfile, - sizeof(info->outfile)/sizeof(WCHAR)); + ARRAY_SIZE(info->outfile)); } cmdline++; @@ -137,12 +137,12 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info case 't': info->output_type = OUTPUT_TEXT; return process_file_name(cmdline + 1, OUTPUT_TEXT, info->outfile, - sizeof(info->outfile)/sizeof(WCHAR)); + ARRAY_SIZE(info->outfile)); case 'X': case 'x': info->output_type = OUTPUT_XML; return process_file_name(cmdline + 1, OUTPUT_XML, info->outfile, - sizeof(info->outfile)/sizeof(WCHAR)); + ARRAY_SIZE(info->outfile)); case 'W': case 'w': if (strncmpiW(cmdline, whql_colonW, 5)) diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index c18c75d183..b1e0f188ee 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -179,7 +179,7 @@ static BOOL output_text_information(struct dxdiag_information *dxdiag_info, cons return FALSE; } - for (i = 0; i < sizeof(output_table)/sizeof(output_table[0]); i++) + for (i = 0; i < ARRAY_SIZE(output_table); i++) { const struct text_information_field *fields = output_table[i].fields; unsigned int j; @@ -313,7 +313,7 @@ static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const if (FAILED(hr)) goto error; - for (i = 0; i < sizeof(output_table)/sizeof(output_table[0]); i++) + for (i = 0; i < ARRAY_SIZE(output_table); i++) { IXMLDOMElement *info_element = xml_create_element(xmldoc, output_table[i].tag_name); const struct xml_information_field *fields = output_table[i].fields; @@ -394,14 +394,14 @@ static struct output_backend const WCHAR *get_output_extension(enum output_type type) { - assert(type > OUTPUT_NONE && type <= sizeof(output_backends)/sizeof(output_backends[0])); + assert(type > OUTPUT_NONE && type <= ARRAY_SIZE(output_backends)); return output_backends[type - 1].filename_ext; } BOOL output_dxdiag_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename, enum output_type type) { - assert(type > OUTPUT_NONE && type <= sizeof(output_backends)/sizeof(output_backends[0])); + assert(type > OUTPUT_NONE && type <= ARRAY_SIZE(output_backends)); return output_backends[type - 1].output_handler(dxdiag_info, filename); } -- 2.14.4

1 0

[PATCH 1/4] comctl32/edit: Get rid of useless float cast
by Gabriel Ivăncescu 21 Aug '18

21 Aug '18

Since the division (the only operation with a fractional result) was immediately truncated to integer anyway, the float cast is completely useless. This works fine because the multiplication is done before the division (parentheses have been added to emphasize this point). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/edit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 10ff5fb..7bcf9ce 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -4911,7 +4911,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_MOUSEWHEEL: { - int wheelDelta; + INT wheelDelta; UINT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); @@ -4931,10 +4931,10 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (es->wheelDeltaRemainder && pulScrollLines) { - int cLineScroll; - pulScrollLines = (int) min((UINT) es->line_count, pulScrollLines); - cLineScroll = pulScrollLines * (float)es->wheelDeltaRemainder / WHEEL_DELTA; - es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + INT cLineScroll; + pulScrollLines = (INT) min((UINT) es->line_count, pulScrollLines); + cLineScroll = ((INT)pulScrollLines * es->wheelDeltaRemainder) / WHEEL_DELTA; + es->wheelDeltaRemainder -= (cLineScroll * WHEEL_DELTA) / (INT)pulScrollLines; result = EDIT_EM_LineScroll(es, 0, -cLineScroll); } break; -- 1.9.1

1 3

[PATCH 1/2] comctl32/listbox: Update the size in SetColumnWidth unconditionally
by Gabriel Ivăncescu 21 Aug '18

21 Aug '18

When the listbox receives a WM_WINDOWPOSCHANGED message and calls DefWindowProc on it, which then ends up sending a WM_SIZE to the window, some applications swallow that up and won't pass the WM_SIZE to the listbox. However, they do pass a LB_SETCOLUMNWIDTH, even when the column width did not change at all. So we have to unconditionally update the size itself (not just the page) when we receive that message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22440 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index b3491bb..b3719a6 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1260,10 +1260,12 @@ static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) */ static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT width) { - if (width == descr->column_width) return LB_OKAY; - TRACE("[%p]: new column width = %d\n", descr->self, width ); + /* update the SIZE unconditionally, because some applications swallow + WM_SIZE from DefWindowProc and only send LB_SETCOLUMNWIDTH, even + when the column width doesn't even change (but its size does) */ + TRACE("[%p]: new column width = %d\n", descr->self, width); descr->column_width = width; - LISTBOX_UpdatePage( descr ); + LISTBOX_UpdateSize(descr); return LB_OKAY; } -- 1.9.1

2 5

[PATCH vkd3d 3/8] vkd3d: Reference count CPU descriptors.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> We have to keep all image views referenced by all used VkFramebuffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 57 ++++++++++++++++++++++++++++++++++++++++------ libs/vkd3d/resource.c | 46 +++++++++++++++++++++++++------------ libs/vkd3d/vkd3d_private.h | 11 +++++++-- 3 files changed, 91 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8fb6b62b9169..f5b6558dab7b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -750,6 +750,19 @@ static bool d3d12_command_allocator_add_descriptor_pool(struct d3d12_command_all return true; } +static bool d3d12_command_allocator_add_view(struct d3d12_command_allocator *allocator, + struct vkd3d_view *view) +{ + if (!vkd3d_array_reserve((void **)&allocator->views, &allocator->views_size, + allocator->view_count + 1, sizeof(*allocator->views))) + return false; + + vkd3d_view_incref(view); + allocator->views[allocator->view_count++] = view; + + return true; +} + static bool d3d12_command_allocator_add_buffer_view(struct d3d12_command_allocator *allocator, VkBufferView view) { @@ -808,6 +821,12 @@ static void d3d12_command_allocator_free_resources(struct d3d12_command_allocato } allocator->buffer_view_count = 0; + for (i = 0; i < allocator->view_count; ++i) + { + vkd3d_view_decref(allocator->views[i], device); + } + allocator->view_count = 0; + for (i = 0; i < allocator->descriptor_pool_count; ++i) { VK_CALL(vkDestroyDescriptorPool(device->vk_device, allocator->descriptor_pools[i], NULL)); @@ -889,6 +908,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllo d3d12_command_allocator_free_resources(allocator); vkd3d_free(allocator->transfer_buffers); vkd3d_free(allocator->buffer_views); + vkd3d_free(allocator->views); vkd3d_free(allocator->descriptor_pools); vkd3d_free(allocator->pipelines); vkd3d_free(allocator->framebuffers); @@ -1077,6 +1097,10 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->descriptor_pools_size = 0; allocator->descriptor_pool_count = 0; + allocator->views = NULL; + allocator->views_size = 0; + allocator->view_count = 0; + allocator->buffer_views = NULL; allocator->buffer_views_size = 0; allocator->buffer_view_count = 0; @@ -3497,6 +3521,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); const struct d3d12_rtv_desc *rtv_desc; const struct d3d12_dsv_desc *dsv_desc; + struct vkd3d_view *view; unsigned int i; TRACE("iface %p, render_target_descriptor_count %u, render_target_descriptors %p, " @@ -3523,7 +3548,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi d3d12_command_list_track_resource_usage(list, rtv_desc->resource); - list->views[i + 1] = rtv_desc->vk_view; + /* In D3D12 CPU descriptors are consumed when a command is recorded. */ + view = rtv_desc->view; + if (!d3d12_command_allocator_add_view(list->allocator, view)) + { + WARN("Failed to add view.\n"); + } + + list->views[i + 1] = view->u.vk_image_view; list->fb_width = max(list->fb_width, rtv_desc->width); list->fb_height = max(list->fb_height, rtv_desc->height); list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count); @@ -3535,11 +3567,17 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi d3d12_command_list_track_resource_usage(list, dsv_desc->resource); + /* In D3D12 CPU descriptors are consumed when a command is recorded. */ + view = dsv_desc->view; + if (!d3d12_command_allocator_add_view(list->allocator, view)) + { + WARN("Failed to add view.\n"); + } + + list->views[0] = view->u.vk_image_view; list->fb_width = max(list->fb_width, dsv_desc->width); list->fb_height = max(list->fb_height, dsv_desc->height); list->fb_layer_count = max(list->fb_layer_count, 1); - - list->views[0] = dsv_desc->vk_view; } d3d12_command_list_invalidate_current_framebuffer(list); @@ -3549,7 +3587,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi static void d3d12_command_list_clear(struct d3d12_command_list *list, const struct vkd3d_vk_device_procs *vk_procs, const struct VkAttachmentDescription *attachment_desc, const struct VkAttachmentReference *color_reference, const struct VkAttachmentReference *ds_reference, - VkImageView vk_view, size_t width, size_t height, unsigned int layer_count, + struct vkd3d_view *view, size_t width, size_t height, unsigned int layer_count, const union VkClearValue *clear_value, unsigned int rect_count, const D3D12_RECT *rects) { struct VkSubpassDescription sub_pass_desc; @@ -3608,12 +3646,17 @@ static void d3d12_command_list_clear(struct d3d12_command_list *list, return; } + if (!d3d12_command_allocator_add_view(list->allocator, view)) + { + WARN("Failed to add view.\n"); + } + fb_desc.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO; fb_desc.pNext = NULL; fb_desc.flags = 0; fb_desc.renderPass = vk_render_pass; fb_desc.attachmentCount = 1; - fb_desc.pAttachments = &vk_view; + fb_desc.pAttachments = &view->u.vk_image_view; fb_desc.width = width; fb_desc.height = height; fb_desc.layers = layer_count; @@ -3693,7 +3736,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra ds_reference.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; d3d12_command_list_clear(list, &list->device->vk_procs, &attachment_desc, NULL, &ds_reference, - dsv_desc->vk_view, dsv_desc->width, dsv_desc->height, 1, &clear_value, rect_count, rects); + dsv_desc->view, dsv_desc->width, dsv_desc->height, 1, &clear_value, rect_count, rects); } static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12GraphicsCommandList *iface, @@ -3724,7 +3767,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra color_reference.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; d3d12_command_list_clear(list, &list->device->vk_procs, &attachment_desc, &color_reference, NULL, - rtv_desc->vk_view, rtv_desc->width, rtv_desc->height, rtv_desc->layer_count, + rtv_desc->view, rtv_desc->width, rtv_desc->height, rtv_desc->layer_count, &clear_value, rect_count, rects); } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 44f323350056..f6dffbfda31e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1099,12 +1099,12 @@ static struct vkd3d_view *vkd3d_view_create(void) return view; } -static void vkd3d_view_incref(struct vkd3d_view *view) +void vkd3d_view_incref(struct vkd3d_view *view) { InterlockedIncrement(&view->refcount); } -static void vkd3d_view_decref(struct vkd3d_view *view, +static void vkd3d_view_decref_descriptor(struct vkd3d_view *view, const struct d3d12_desc *descriptor, struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -1115,7 +1115,11 @@ static void vkd3d_view_decref(struct vkd3d_view *view, TRACE("Destroying view %p.\n", view); - if (descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SRV || descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV) + if (!descriptor) + { + VK_CALL(vkDestroyImageView(device->vk_device, view->u.vk_image_view, NULL)); + } + else if (descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SRV || descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV) { if (descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER || descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) @@ -1134,6 +1138,11 @@ static void vkd3d_view_decref(struct vkd3d_view *view, vkd3d_free(view); } +void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) +{ + vkd3d_view_decref_descriptor(view, NULL, device); +} + static void d3d12_desc_destroy(struct d3d12_desc *descriptor, struct d3d12_device *device) { @@ -1142,7 +1151,7 @@ static void d3d12_desc_destroy(struct d3d12_desc *descriptor, || descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV || descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SAMPLER) { - vkd3d_view_decref(descriptor->u.view, descriptor, device); + vkd3d_view_decref_descriptor(descriptor->u.view, descriptor, device); } memset(descriptor, 0, sizeof(*descriptor)); @@ -1789,12 +1798,10 @@ HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, /* RTVs */ static void d3d12_rtv_desc_destroy(struct d3d12_rtv_desc *rtv, struct d3d12_device *device) { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - if (rtv->magic != VKD3D_DESCRIPTOR_MAGIC_RTV) return; - VK_CALL(vkDestroyImageView(device->vk_device, rtv->vk_view, NULL)); + vkd3d_view_decref(rtv->view, device); memset(rtv, 0, sizeof(*rtv)); } @@ -1803,6 +1810,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev { const struct vkd3d_format *format; VkImageViewType vk_view_type; + struct vkd3d_view *view; uint32_t miplevel_idx; d3d12_rtv_desc_destroy(rtv_desc, device); @@ -1834,30 +1842,35 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc && desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + if (!(view = vkd3d_view_create())) + return; + miplevel_idx = desc ? desc->u.Texture2D.MipSlice : 0; vk_view_type = resource->desc.DepthOrArraySize > 1 ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; if (vkd3d_create_texture_view(device, resource, format, vk_view_type, - miplevel_idx, 1, 0, VK_REMAINING_ARRAY_LAYERS, false, &rtv_desc->vk_view) < 0) + miplevel_idx, 1, 0, VK_REMAINING_ARRAY_LAYERS, false, &view->u.vk_image_view) < 0) + { + vkd3d_free(view); return; + } + rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; rtv_desc->format = format->vk_format; rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, miplevel_idx); rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, miplevel_idx); rtv_desc->layer_count = resource->desc.DepthOrArraySize; - rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; + rtv_desc->view = view; rtv_desc->resource = resource; } /* DSVs */ static void d3d12_dsv_desc_destroy(struct d3d12_dsv_desc *dsv, struct d3d12_device *device) { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - if (dsv->magic != VKD3D_DESCRIPTOR_MAGIC_DSV) return; - VK_CALL(vkDestroyImageView(device->vk_device, dsv->vk_view, NULL)); + vkd3d_view_decref(dsv->view, device); memset(dsv, 0, sizeof(*dsv)); } @@ -1865,6 +1878,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) { const struct vkd3d_format *format; + struct vkd3d_view *view; uint32_t miplevel_idx; d3d12_dsv_desc_destroy(dsv_desc, device); @@ -1896,15 +1910,19 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev if (desc && desc->Flags) FIXME("Ignoring flags %#x.\n", desc->Flags); + if (!(view = vkd3d_view_create())) + return; + miplevel_idx = desc ? desc->u.Texture2D.MipSlice : 0; if (vkd3d_create_texture_view(device, resource, format, VK_IMAGE_VIEW_TYPE_2D, - miplevel_idx, 1, 0, 1, false, &dsv_desc->vk_view) < 0) + miplevel_idx, 1, 0, 1, false, &view->u.vk_image_view) < 0) return; + dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; dsv_desc->format = format->vk_format; dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, miplevel_idx); dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, miplevel_idx); - dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; + dsv_desc->view = view; dsv_desc->resource = resource; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 278f4f615c35..9b5d5db0c57a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -257,6 +257,9 @@ struct vkd3d_view VkBufferView vk_counter_view; }; +void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) DECLSPEC_HIDDEN; +void vkd3d_view_incref(struct vkd3d_view *view) DECLSPEC_HIDDEN; + struct d3d12_desc { uint32_t magic; @@ -306,7 +309,7 @@ struct d3d12_rtv_desc uint64_t width; unsigned int height; unsigned int layer_count; - VkImageView vk_view; + struct vkd3d_view *view; struct d3d12_resource *resource; }; @@ -324,7 +327,7 @@ struct d3d12_dsv_desc VkFormat format; uint64_t width; unsigned int height; - VkImageView vk_view; + struct vkd3d_view *view; struct d3d12_resource *resource; }; @@ -561,6 +564,10 @@ struct d3d12_command_allocator size_t descriptor_pools_size; size_t descriptor_pool_count; + struct vkd3d_view **views; + size_t views_size; + size_t view_count; + VkBufferView *buffer_views; size_t buffer_views_size; size_t buffer_view_count; -- 2.16.4

2 1

[PATCH resend vkd3d 8/8] vkd3d-utils: Detect surface extensions at runtime.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-utils/vkd3d_utils_main.c | 16 ++++++++++++---- libs/vkd3d-utils/vkd3d_utils_private.h | 9 +++------ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 79e31553cb7c..3ee2f130c50d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,7 +106,6 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_CFLAGS = @XCB_CFLAGS@ libvkd3d_utils_la_LDFLAGS = -version-info 1:0:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 8c2503784e37..fa6e5f8f1616 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -28,15 +28,18 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { + struct vkd3d_optional_instance_extensions_info optional_extensions_info; struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; static const char * const instance_extensions[] = { VK_KHR_SURFACE_EXTENSION_NAME, -#ifdef HAVE_XCB - VK_KHR_XCB_SURFACE_EXTENSION_NAME, -#endif + }; + static const char * const optional_instance_extensions[] = + { + "VK_KHR_xcb_surface", + "VK_MVK_macos_surface", }; static const char * const device_extensions[] = { @@ -49,9 +52,14 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, if (adapter) FIXME("Ignoring adapter %p.\n", adapter); + memset(&optional_extensions_info, 0, sizeof(optional_extensions_info)); + optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_extensions_info.extensions = optional_instance_extensions; + optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); + memset(&instance_create_info, 0, sizeof(instance_create_info)); instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; - instance_create_info.next = NULL; + instance_create_info.next = &optional_extensions_info; instance_create_info.pfn_signal_event = vkd3d_signal_event; instance_create_info.wchar_size = sizeof(WCHAR); instance_create_info.instance_extensions = instance_extensions; diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 55d5300de0c1..6b5851e6bfc4 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -19,19 +19,16 @@ #ifndef __VKD3D_UTILS_PRIVATE_H #define __VKD3D_UTILS_PRIVATE_H -#include "vkd3d_memory.h" -#include <vkd3d_utils.h> - #define COBJMACROS #define NONAMELESSUNION #define VK_NO_PROTOTYPES -#ifdef HAVE_XCB -# define VK_USE_PLATFORM_XCB_KHR -#endif #include <pthread.h> #include <vkd3d.h> +#include "vkd3d_memory.h" +#include <vkd3d_utils.h> + struct vkd3d_event { pthread_mutex_t mutex; -- 2.16.4

2 1

[PATCH resend vkd3d 7/8] build: Add support for MoltenVK.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 90557ee42e68..ada7e9a7f0f8 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,10 @@ AC_CHECK_LIB([pthread], [pthread_create], AC_SUBST([VULKAN_LIBS]) VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], - [AC_MSG_ERROR([libvulkan not found.])]) + [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lMoltenVK" + AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$ac_cv_lib_soname_MoltenVK"])], + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])]) AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], -- 2.16.4

3 2

[PATCH v2 vkd3d 6/8] build: Detect soname of libvulkan at configure time.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Remove usage of $LIBEXT. --- configure.ac | 6 +++--- libs/vkd3d/device.c | 4 ++-- m4/check-soname.m4 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 m4/check-soname.m4 diff --git a/configure.ac b/configure.ac index b5123b8d11de..90557ee42e68 100644 --- a/configure.ac +++ b/configure.ac @@ -77,9 +77,9 @@ AC_CHECK_LIB([pthread], [pthread_create], [AC_MSG_ERROR([libpthread not found.])]) AC_SUBST([VULKAN_LIBS]) -AC_CHECK_LIB([vulkan], [vkGetInstanceProcAddr], - [VULKAN_LIBS="-lvulkan"], - [AC_MSG_ERROR([libvulkan not found.])]) +VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lvulkan"], + [AC_MSG_ERROR([libvulkan not found.])]) AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8280fd5d03be..c11f474a28d2 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -283,9 +283,9 @@ static HRESULT vkd3d_init_vk_global_procs(struct vkd3d_instance *instance, if (!vkGetInstanceProcAddr) { - if (!(instance->libvulkan = dlopen("libvulkan.so.1", RTLD_NOW))) + if (!(instance->libvulkan = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) { - ERR("Failed to load libvulkan.\n"); + ERR("Failed to load libvulkan: %s.\n", dlerror()); return E_FAIL; } diff --git a/m4/check-soname.m4 b/m4/check-soname.m4 new file mode 100644 index 000000000000..f1953413fa75 --- /dev/null +++ b/m4/check-soname.m4 @@ -0,0 +1,54 @@ +dnl +dnl Copyright 2002 Alexandre Julliard +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +dnl +dnl As a special exception to the GNU Lesser General Public License, +dnl if you distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it +dnl under the same distribution terms that you use for the rest of +dnl that program. + +dnl VKD3D_PATH_SONAME_TOOLS +AC_DEFUN([VKD3D_PATH_SONAME_TOOLS], +[AC_PATH_PROG(LDD,ldd,true,/sbin:/usr/sbin:$PATH) +AC_CHECK_TOOL(OTOOL,otool,otool) +AC_CHECK_TOOL(READELF,[readelf],true)]) + +dnl VKD3D_CHECK_SONAME(library, function, [action-if-found, [action-if-not-found, [other_libraries, [pattern]]]]) +AC_DEFUN([VKD3D_CHECK_SONAME], +[AC_REQUIRE([VKD3D_PATH_SONAME_TOOLS])dnl +AS_VAR_PUSHDEF([ac_Lib],[ac_cv_lib_soname_$1])dnl +m4_pushdef([ac_lib_pattern],m4_default([$6],[lib$1]))dnl +AC_MSG_CHECKING([for -l$1]) +AC_CACHE_VAL(ac_Lib, +[ac_check_soname_save_LIBS=$LIBS + LIBS="-l$1 $5 $LIBS" + AC_LINK_IFELSE([AC_LANG_CALL([], [$2])], + [AS_CASE(["$host_os"], + [darwin*|macosx*], [AS_VAR_SET(ac_Lib,[`$OTOOL -L conftest$ac_exeext | grep "]ac_lib_pattern[\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/$]ac_lib_pattern[\.[[0-9A-Za-z.]]*dylib$.*$/\1/"';2,$d'`])], + [AS_VAR_SET(ac_Lib,[`$READELF -d conftest$ac_exeext | grep "NEEDED.*]ac_lib_pattern[" | sed -e "s/^.*\\m4_dquote(\$]ac_lib_pattern[[[^ ]]*\$\\).*$/\1/"';2,$d'`]) + AS_VAR_IF([ac_Lib],[], + [AS_VAR_SET(ac_Lib,[`$LDD conftest$ac_exeext | grep "]ac_lib_pattern[" | sed -e "s/^.*$]ac_lib_pattern[[[^ ]]*$.*$/\1/"';2,$d'`])])])]) + LIBS=$ac_check_soname_save_LIBS])dnl +AS_VAR_IF([ac_Lib],[], + [AC_MSG_RESULT([not found]) + $4], + [AC_MSG_RESULT(AS_VAR_GET(ac_Lib)) + AC_DEFINE_UNQUOTED(AS_TR_CPP(SONAME_LIB$1),["]AS_VAR_GET(ac_Lib)["], + [Define to the soname of the lib$1 library.]) + $3])dnl +m4_popdef([ac_lib_pattern])dnl +AS_VAR_POPDEF([ac_Lib])]) -- 2.16.4

3 2

[PATCH resend vkd3d 5/8] build: Make libxcb optional.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 19 ++++++++++++++----- libs/vkd3d-utils/vkd3d_utils_main.c | 2 ++ libs/vkd3d-utils/vkd3d_utils_private.h | 14 ++++++++------ 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index ddc6c972008f..b5123b8d11de 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,7 @@ AC_CONFIG_HEADERS(include/config.h) AC_ARG_VAR([WIDL], [widl IDL compiler]) AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler]) AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) +AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)])) @@ -80,13 +81,17 @@ AC_CHECK_LIB([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], [AC_MSG_ERROR([libvulkan not found.])]) -HAVE_SPIRV_TOOLS=no AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], - [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.]) - HAVE_SPIRV_TOOLS=yes])]) + [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.])])], + [with_spirv_tools=no]) -PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms]) +HAVE_XCB=no +AS_IF([test "x$with_xcb" != "xno"], + [PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], + [AC_DEFINE([HAVE_XCB], [1], [Define to 1 if you have libxcb.]) + HAVE_XCB=yes], + [HAVE_XCB=no])]) dnl Check for functions VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)]) @@ -96,7 +101,10 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_PTHREAD_SETNAME_NP +dnl Makefiles AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no]) +AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], + [AC_MSG_ERROR([libxcb is required for demos.])]) AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) @@ -112,7 +120,8 @@ AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], AS_ECHO([" Configuration summary for $PACKAGE $VERSION - Have SPIRV-Tools: ${HAVE_SPIRV_TOOLS} + Have XCB: ${HAVE_XCB} + Have SPIRV-Tools: ${with_spirv_tools} Building demos: ${enable_demos} diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 2c4d89a7e38e..8c2503784e37 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -34,7 +34,9 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, static const char * const instance_extensions[] = { VK_KHR_SURFACE_EXTENSION_NAME, +#ifdef HAVE_XCB VK_KHR_XCB_SURFACE_EXTENSION_NAME, +#endif }; static const char * const device_extensions[] = { diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 6aa0df6eeef5..55d5300de0c1 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -19,17 +19,19 @@ #ifndef __VKD3D_UTILS_PRIVATE_H #define __VKD3D_UTILS_PRIVATE_H +#include "vkd3d_memory.h" +#include <vkd3d_utils.h> + +#define COBJMACROS +#define NONAMELESSUNION #define VK_NO_PROTOTYPES -#define VK_USE_PLATFORM_XCB_KHR +#ifdef HAVE_XCB +# define VK_USE_PLATFORM_XCB_KHR +#endif #include <pthread.h> #include <vkd3d.h> -#define COBJMACROS -#define NONAMELESSUNION -#include "vkd3d_memory.h" -#include "vkd3d_utils.h" - struct vkd3d_event { pthread_mutex_t mutex; -- 2.16.4

3 2

[PATCH vkd3d 4/8] tests: Add test for CPU descriptors lifetime.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index f340d0915a7c..cf51ab9bbcdd 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18077,6 +18077,133 @@ static void test_render_a8(void) destroy_test_context(&context); } +static void test_cpu_descriptors_lifetime(void) +{ + static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + ID3D12Resource *red_resource, *blue_resource; + ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC resource_desc; + ID3D12DescriptorHeap *rtv_heap; + D3D12_CLEAR_VALUE clear_value; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Device *device; + HRESULT hr; + + if (!init_test_context(&context, NULL)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1); + rtv_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap); + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 32; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + clear_value.Color[0] = 1.0f; + clear_value.Color[1] = 0.0f; + clear_value.Color[2] = 0.0f; + clear_value.Color[3] = 1.0f; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&red_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + clear_value.Color[0] = 0.0f; + clear_value.Color[1] = 0.0f; + clear_value.Color[2] = 1.0f; + clear_value.Color[3] = 1.0f; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&blue_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, red, 0, NULL); + /* Destroy the previous RTV and create a new one in its place. */ + ID3D12Device_CreateRenderTargetView(device, blue_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, blue, 0, NULL); + + /* Destroy the CPU descriptor heap. */ + ID3D12DescriptorHeap_Release(rtv_heap); + + transition_resource_state(command_list, red_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, blue_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(red_resource, 0, queue, command_list, 0xff0000ff, 0); + reset_command_list(command_list, context.allocator); + check_sub_resource_uint(blue_resource, 0, queue, command_list, 0xffff0000, 0); + + rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1); + rtv_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap); + + /* Try again with OMSetRenderTargets(). */ + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, red_resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + transition_resource_state(command_list, blue_resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, red, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv_handle, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + /* Destroy the previous RTV and create a new one in its place. */ + ID3D12Device_CreateRenderTargetView(device, blue_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, blue, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv_handle, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + /* Destroy the previous RTV and create a new one in its place. */ + ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle); + + /* Destroy the CPU descriptor heap. */ + ID3D12DescriptorHeap_Release(rtv_heap); + + transition_resource_state(command_list, red_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, blue_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(red_resource, 0, queue, command_list, 0xff00ff00, 0); + reset_command_list(command_list, context.allocator); + check_sub_resource_uint(blue_resource, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(blue_resource); + ID3D12Resource_Release(red_resource); + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -18189,4 +18316,5 @@ START_TEST(d3d12) run_test(test_geometry_shader); run_test(test_layered_rendering); run_test(test_render_a8); + run_test(test_cpu_descriptors_lifetime); } -- 2.16.4

2 1

[PATCH vkd3d 1/8] vkd3d: Allow IASetVertexBuffers() with NULL buffer locations.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9aba589eadff..8fb6b62b9169 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1738,6 +1738,10 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list b->binding = binding; b->stride = list->strides[binding]; b->inputRate = state->input_rates[binding]; + + if (!b->stride) + FIXME("Invalid stride for input slot %u.\n", binding); + ++binding_count; } @@ -3430,15 +3434,17 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi UINT start_slot, UINT view_count, const D3D12_VERTEX_BUFFER_VIEW *views) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct vkd3d_gpu_va_allocator *gpu_va_allocator; VkDeviceSize offsets[ARRAY_SIZE(list->strides)]; const struct vkd3d_vk_device_procs *vk_procs; VkBuffer buffers[ARRAY_SIZE(list->strides)]; + unsigned int i, first, count, stride; struct d3d12_resource *resource; - unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); vk_procs = &list->device->vk_procs; + gpu_va_allocator = &list->device->gpu_va_allocator; if (start_slot >= ARRAY_SIZE(list->strides) || view_count > ARRAY_SIZE(list->strides) - start_slot) { @@ -3446,15 +3452,34 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi return; } - for (i = 0; i < view_count; ++i) + first = start_slot; + for (i = 0, count = 0; i < view_count; ++i) { - resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, views[i].BufferLocation); - offsets[i] = views[i].BufferLocation - resource->gpu_address; - buffers[i] = resource->u.vk_buffer; - list->strides[start_slot + i] = views[i].StrideInBytes; + if (views[i].BufferLocation) + { + resource = vkd3d_gpu_va_allocator_dereference(gpu_va_allocator, views[i].BufferLocation); + buffers[count] = resource->u.vk_buffer; + offsets[count] = views[i].BufferLocation - resource->gpu_address; + stride = views[i].StrideInBytes; + ++count; + } + else + { + if (count) + VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, first, count, buffers, offsets)); + + stride = 0; + ++count; + + first += count; + count = 0; + } + + list->strides[start_slot + i] = stride; } - VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, start_slot, view_count, buffers, offsets)); + if (count) + VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, first, count, buffers, offsets)); d3d12_command_list_invalidate_current_pipeline(list); } -- 2.16.4

2 1

[PATCH vkd3d 2/8] tests: Test vertex buffer views with NULL buffer location.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7d286614a2a0..f340d0915a7c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3711,7 +3711,7 @@ static void test_append_aligned_element(void) { ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; - D3D12_VERTEX_BUFFER_VIEW vbv[3]; + D3D12_VERTEX_BUFFER_VIEW vbv[6]; struct test_context_desc desc; struct test_context context; struct resource_readback rb; @@ -3724,11 +3724,11 @@ static void test_append_aligned_element(void) { {"CoLoR", 2, DXGI_FORMAT_R32G32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1}, - {"ColoR", 3, DXGI_FORMAT_R32G32_FLOAT, 2, D3D12_APPEND_ALIGNED_ELEMENT, + {"ColoR", 3, DXGI_FORMAT_R32G32_FLOAT, 5, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1}, {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, - {"ColoR", 0, DXGI_FORMAT_R32G32_FLOAT, 2, D3D12_APPEND_ALIGNED_ELEMENT, + {"ColoR", 0, DXGI_FORMAT_R32G32_FLOAT, 5, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1}, {"cOLOr", 1, DXGI_FORMAT_R32G32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1}, @@ -3860,6 +3860,7 @@ static void test_append_aligned_element(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); + memset(vbv, 0, sizeof(vbv)); vb[0] = create_upload_buffer(context.device, sizeof(stream0), stream0); vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]); vbv[0].StrideInBytes = sizeof(*stream0); @@ -3871,9 +3872,9 @@ static void test_append_aligned_element(void) vbv[1].SizeInBytes = sizeof(stream1); vb[2] = create_upload_buffer(context.device, sizeof(stream2), stream2); - vbv[2].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[2]); - vbv[2].StrideInBytes = sizeof(*stream2); - vbv[2].SizeInBytes = sizeof(stream2); + vbv[5].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[2]); + vbv[5].StrideInBytes = sizeof(*stream2); + vbv[5].SizeInBytes = sizeof(stream2); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); -- 2.16.4

2 1

[PATCH 2/2] crypt32: Properly check root certificate in CERT_CHAIN_REVOCATION_CHECK_CHAIN.
by Zhiyi Zhang 21 Aug '18

21 Aug '18

Original patch by Michael Müller. Root certificates don't have CRL Distribution Point or Authority Info Access field. Don't report error with CERT_CHAIN_REVOCATION_CHECK_CHAIN in CertGetCertificateChain() because of this. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/crypt32/chain.c | 8 ++++++++ dlls/crypt32/tests/chain.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d7015d797d..f77010a0fa 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2698,6 +2698,14 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certToCheck, revocationFlags, &revocationPara, &revocationStatus); + + if (!ret && revocationStatus.dwError == CRYPT_E_NO_REVOCATION_CHECK + && revocationPara.pIssuerCert == NULL) + { + WARN("Unable to find CRL or AIA for CA certificate\n"); + ret = TRUE; + } + if (!ret) { PCERT_CHAIN_ELEMENT element = CRYPT_FindIthElementInChain( diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index c997068a06..3503eb3e92 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4153,9 +4153,9 @@ static void testGetCertChain(void) ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); - todo_wine ok(!chain->TrustStatus.dwErrorStatus - || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ - "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, NULL, &chain); -- 2.18.0

2 2

COM tracing ...
by Michael Meeks 21 Aug '18

21 Aug '18

Hi guys, Rather a peripheral question; apologies for that - but I'd imagine there are experts here that may be able to help. I have a black-box problem - a Windows app dealing with confidential data that I can't easily touch (and thus can't get to run under Wine) - which does some small but critical automation of MS Office - using VBS / COM scripting. I'd -really- love some input on how best to trace that series of COM method calls on Windows itself ie. the (remote) service activation, and the RPC beyond that - particularly the method names, parameters etc. of the COM/OLE Office API. I've tried (so far): http://www.rohitab.com/apimonitor which, while closed, looks interesting; but traces a lot in a hard-to-search way and doesn't appear to do the trick. https://support.microsoft.com/en-us/help/926098/how-to-enable-com-and-com-d… Sounds useful: using Event Tracing for Windows (ETW) but has this rather unhelpful property: "The binary file must be formatted by Microsoft so that it can be analyzed. Please forward the .etl files to your support contact. ..." ;-) Component models used to be all the rage in my youth ;-) surely someone solved the "strace for COM calls" problem elegantly some-when ! Crazily - might it be possible to instrument, interpose and use Wine's COM impl. on Windows [ which sounds a bit 'exciting' ;-], or ? Anyhow - help much appreciated & sorry for the noise ! Regards, Michael. -- michael.meeks(a)collabora.com <><, Pseudo Engineer, itinerant idiot

2 4

[PATCH v2] dxgi/tests: Run the tests in parallel.
by Henri Verbeet 21 Aug '18

21 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Looks like some versions of WARP create multiple adapters with increasing LUIDs when concurrently using multiple WARP devices. This supersedes patch 149962. --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/{device.c => dxgi.c} | 113 ++++++++++++++++++++++++++++------- 2 files changed, 93 insertions(+), 22 deletions(-) rename dlls/dxgi/tests/{device.c => dxgi.c} (98%) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 2676bc98d39..1c99d70957d 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -2,4 +2,4 @@ TESTDLL = dxgi.dll IMPORTS = d3d10_1 dxgi user32 C_SRCS = \ - device.c + dxgi.c diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/dxgi.c similarity index 98% rename from dlls/dxgi/tests/device.c rename to dlls/dxgi/tests/dxgi.c index 81b231a4d36..56065456eb0 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/dxgi.c @@ -39,6 +39,73 @@ static HRESULT (WINAPI *pCreateDXGIFactory2)(UINT flags, REFIID iid, void **fact static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; +static unsigned int use_adapter_idx; +static BOOL use_warp_adapter; +static BOOL use_mt = TRUE; + +static struct test_entry +{ + void (*test)(void); +} *mt_tests; +size_t mt_tests_size, mt_test_count; + +static void queue_test(void (*test)(void)) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + } + mt_tests[mt_test_count++].test = test; +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + mt_tests[j].test(); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + mt_tests[i].test(); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static ULONG get_refcount(IUnknown *iface) { IUnknown_AddRef(iface); @@ -394,9 +461,6 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_ } } -static BOOL use_warp_adapter; -static unsigned int use_adapter_idx; - static IDXGIAdapter *create_adapter(void) { IDXGIFactory4 *factory4; @@ -665,8 +729,9 @@ static void test_adapter_luid(void) refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - is_null_luid_adapter = !device_adapter_desc.AdapterLuid.HighPart - && !device_adapter_desc.AdapterLuid.LowPart; + is_null_luid_adapter = !device_adapter_desc.AdapterLuid.LowPart + && !device_adapter_desc.SubSysId && !device_adapter_desc.Revision + && !device_adapter_desc.VendorId && !device_adapter_desc.DeviceId; hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); @@ -4040,7 +4105,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) ok(!refcount, "Device has %u references left.\n", refcount); } -START_TEST(device) +START_TEST(dxgi) { HMODULE dxgi_module, d3d12_module; BOOL enable_debug_layer = FALSE; @@ -4064,30 +4129,36 @@ START_TEST(device) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]); + else if (!strcmp(argv[i], "--single")) + use_mt = FALSE; } - test_adapter_desc(); - test_adapter_luid(); - test_check_interface_support(); - test_create_surface(); - test_parents(); - test_output(); - test_find_closest_matching_mode(); + queue_test(test_adapter_desc); + queue_test(test_adapter_luid); + queue_test(test_check_interface_support); + queue_test(test_create_surface); + queue_test(test_parents); + queue_test(test_output); + queue_test(test_find_closest_matching_mode); + queue_test(test_get_containing_output); + queue_test(test_create_factory); + queue_test(test_private_data); + queue_test(test_swapchain_resize); + queue_test(test_swapchain_present); + queue_test(test_maximum_frame_latency); + queue_test(test_output_desc); + queue_test(test_object_wrapping); + + run_queued_tests(); + + /* These tests use full-screen swapchains, so shouldn't run in parallel. */ test_create_swapchain(); - test_get_containing_output(); test_set_fullscreen(); test_default_fullscreen_target_output(); test_resize_target(); test_inexact_modes(); - test_create_factory(); - test_private_data(); - test_swapchain_resize(); test_swapchain_parameters(); - test_swapchain_present(); run_on_d3d10(test_swapchain_backbuffer_index); - test_maximum_frame_latency(); - test_output_desc(); - test_object_wrapping(); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { -- 2.11.0

1 0

[PATCH] quartz: Return correct error in IBasicAudio put_Volume
by Alistair Leslie-Hughes 21 Aug '18

21 Aug '18

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=45366 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/quartz/filtergraph.c | 2 ++ dlls/quartz/tests/filtergraph.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0113674..210eb3e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -3140,6 +3140,8 @@ static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, LONG lVolume) if (hr == S_OK) hr = IBasicAudio_put_Volume(pBasicAudio, lVolume); + else + hr = E_NOTIMPL; LeaveCriticalSection(&This->cs); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 85079d9..3842491 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -284,6 +284,20 @@ static void test_basic_video(IFilterGraph2 *graph) IBasicVideo_Release(pbv); } +static void test_basic_audio(IFilterGraph2 *graph) +{ + IBasicAudio* basic; + HRESULT hr; + + hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicAudio, (void **)&basic); + ok(hr==S_OK, "Cannot get IBasicAudio interface returned: %x\n", hr); + + hr = IBasicAudio_put_Volume(basic, 0); + ok(hr==E_NOTIMPL || hr==S_OK, "returned: %x\n", hr); + + IBasicAudio_Release(basic); +} + static void test_media_seeking(IFilterGraph2 *graph) { IMediaSeeking *seeking; @@ -492,6 +506,7 @@ todo_wine static void rungraph(IFilterGraph2 *graph) { + test_basic_audio(graph); test_basic_video(graph); test_media_seeking(graph); test_state_change(graph); -- 1.9.1

2 1

[PATCH 1/2] crypt32/tests: Add revocation flags tests for CertGetCertificateChain().
by Zhiyi Zhang 21 Aug '18

21 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/crypt32/tests/chain.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a6599b21ae..c997068a06 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4145,6 +4145,23 @@ static void testGetCertChain(void) test_name_blob(&simple_chain->rgpElement[2]->pCertContext->pCertInfo->Issuer, "US, GeoTrust Inc., GeoTrust Global CA"); test_name_blob(&simple_chain->rgpElement[2]->pCertContext->pCertInfo->Subject, "US, GeoTrust Inc., GeoTrust Global CA"); + /* Test revocation flags */ + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_END_CERT, NULL, + &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + todo_wine ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, + NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); /* Test HCCE_LOCAL_MACHINE */ -- 2.18.0

1 0

[v2 PATCH] d2d1/tests: Add some tests for ID2D1Bitmap1::GetSurface().
by Nikolay Sivov 21 Aug '18

21 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: improve individual tests traceability. dlls/d2d1/tests/d2d1.c | 232 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 232 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a8b67f144b..f6846c092f 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6529,6 +6529,237 @@ static void test_create_device(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +#define check_bitmap_surface(b, s, o) check_bitmap_surface_(__LINE__, b, s, o) +static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap1 *bitmap, BOOL has_surface, DWORD expected_options) +{ + D2D1_BITMAP_OPTIONS options; + IDXGISurface *surface; + HRESULT hr; + + options = ID2D1Bitmap1_GetOptions(bitmap); + ok_(__FILE__, line)(options == expected_options, "Unexpected bitmap options %#x, expected %#x.\n", + options, expected_options); + + surface = (void *)0xdeadbeef; + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + if (has_surface) + { + D3D10_TEXTURE2D_DESC desc; + ID3D10Texture2D *texture; + + todo_wine + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); + ok_(__FILE__, line)(!!surface, "Expected surface instance.\n"); + + if (SUCCEEDED(hr)) + { + /* Correlate with resource configuration. */ + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get texture pointer, hr %#x.\n", hr); + + ID3D10Texture2D_GetDesc(texture, &desc); + ok_(__FILE__, line)(desc.Usage == 0, "Unexpected usage %#x.\n", desc.Usage); + ok_(__FILE__, line)(desc.BindFlags == (options & D2D1_BITMAP_OPTIONS_TARGET ? + D3D10_BIND_RENDER_TARGET : D3D10_BIND_SHADER_RESOURCE), + "Unexpected bind flags %#x, bitmap options %#x.\n", desc.BindFlags, options); + ok_(__FILE__, line)(desc.CPUAccessFlags == 0, "Unexpected cpu access flags %#x.\n", desc.CPUAccessFlags); + ok_(__FILE__, line)(desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", desc.MiscFlags); + + ID3D10Texture2D_Release(texture); + + IDXGISurface_Release(surface); + } + } + else + { + todo_wine { + ok_(__FILE__, line)(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); + ok_(__FILE__, line)(!surface, "Unexpected surface instance.\n"); + } + } +} + +#define check_rt_bitmap_surface(r, s, o) check_rt_bitmap_surface_(__LINE__, r, s, o) +static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, BOOL has_surface, DWORD options) +{ + D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1RenderTarget *compatible_rt; + ID2D1DeviceContext *context; + ID2D1Bitmap1 *bitmap1; + ID2D1Bitmap *bitmap; + D2D1_SIZE_U size; + HRESULT hr; + + static const DWORD bitmap_data[] = + { + 0x7f7f0000, + }; + + set_size_u(&size, 1, 1); + 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, sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); + + check_bitmap_surface_(line, bitmap1, has_surface, options); + + ID2D1Bitmap1_Release(bitmap1); + ID2D1Bitmap_Release(bitmap); + + if (FAILED(ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context))) + { + /* Compatible target follows its parent. */ + hr = ID2D1RenderTarget_CreateCompatibleRenderTarget(rt, NULL, NULL, NULL, + D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, (ID2D1BitmapRenderTarget **)&compatible_rt); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create compatible render target, hr %#x.\n", hr); + + hr = ID2D1RenderTarget_CreateBitmap(compatible_rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); + + check_bitmap_surface_(line, bitmap1, has_surface, options); + ID2D1RenderTarget_Release(compatible_rt); + + ID2D1Bitmap1_Release(bitmap1); + ID2D1Bitmap_Release(bitmap); + } + else + ID2D1DeviceContext_Release(context); +} + +static void test_bitmap_surface(void) +{ + D2D1_HWND_RENDER_TARGET_PROPERTIES hwnd_rt_desc; + D2D1_RENDER_TARGET_PROPERTIES rt_desc; + ID3D10Device1 *d3d_device; + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + ID2D1Factory1 *factory; + ID2D1RenderTarget *rt; + IDXGISurface *surface; + ID2D1Device *device; + ID2D1DeviceContext *device_context; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + ID2D1Bitmap1 *bitmap; + HWND window; + HRESULT hr; + + IWICBitmap *wic_bitmap; + IWICImagingFactory *wic_factory; + + if (!(d3d_device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + ID3D10Device1_Release(d3d_device); + return; + } + + /* DXGI target */ + window = create_window(); + swapchain = create_swapchain(d3d_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"); + + check_rt_bitmap_surface(rt, TRUE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + /* Bitmap created from DXGI surface. */ + hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); + + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); + + hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); +todo_wine + ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ + memset(&bitmap_desc, 0, sizeof(bitmap_desc)); + 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 = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface, NULL, &bitmap); + ok(SUCCEEDED(hr), "Failed to create a bitmap, hr %#x.\n", hr); + + check_bitmap_surface(bitmap, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); + check_rt_bitmap_surface((ID2D1RenderTarget *)device_context, TRUE, D2D1_BITMAP_OPTIONS_NONE); + + ID2D1DeviceContext_Release(device_context); +} + ID2D1Device_Release(device); + IDXGIDevice_Release(dxgi_device); + IDXGISurface_Release(surface); + + /* DC target */ + rt_desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + rt_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + rt_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + rt_desc.dpiX = 96.0f; + rt_desc.dpiY = 96.0f; + rt_desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + rt_desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + hr = ID2D1Factory1_CreateDCRenderTarget(factory, &rt_desc, (ID2D1DCRenderTarget **)&rt); + ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr); + + check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + /* HWND target */ + hwnd_rt_desc.hwnd = NULL; + hwnd_rt_desc.pixelSize.width = 64; + hwnd_rt_desc.pixelSize.height = 64; + hwnd_rt_desc.presentOptions = D2D1_PRESENT_OPTIONS_NONE; + hwnd_rt_desc.hwnd = CreateWindowA("static", "d2d_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(!!hwnd_rt_desc.hwnd, "Failed to create target window.\n"); + + hr = ID2D1Factory1_CreateHwndRenderTarget(factory, &rt_desc, &hwnd_rt_desc, (ID2D1HwndRenderTarget **)&rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + DestroyWindow(hwnd_rt_desc.hwnd); + + /* WIC target */ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&wic_factory); + ok(SUCCEEDED(hr), "Failed to create WIC imaging factory, hr %#x.\n", hr); + hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16, + &GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + IWICImagingFactory_Release(wic_factory); + + hr = ID2D1Factory1_CreateWicBitmapRenderTarget(factory, wic_bitmap, &rt_desc, &rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + CoUninitialize(); + + ID2D1Factory1_Release(factory); + ID3D10Device1_Release(d3d_device); +} + START_TEST(d2d1) { unsigned int argc, i; @@ -6568,6 +6799,7 @@ START_TEST(d2d1) queue_test(test_layer); queue_test(test_bezier_intersect); queue_test(test_create_device); + queue_test(test_bitmap_surface); run_queued_tests(); } -- 2.18.0

2 1

[PATCH 2/2] dxgi/tests: Run the tests in parallel.
by Henri Verbeet 21 Aug '18

21 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/{device.c => dxgi.c} | 108 +++++++++++++++++++++++++++++------ 2 files changed, 90 insertions(+), 20 deletions(-) rename dlls/dxgi/tests/{device.c => dxgi.c} (98%) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 2676bc98d39..1c99d70957d 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -2,4 +2,4 @@ TESTDLL = dxgi.dll IMPORTS = d3d10_1 dxgi user32 C_SRCS = \ - device.c + dxgi.c diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/dxgi.c similarity index 98% rename from dlls/dxgi/tests/device.c rename to dlls/dxgi/tests/dxgi.c index 81b231a4d36..8ee7091b19d 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/dxgi.c @@ -39,6 +39,73 @@ static HRESULT (WINAPI *pCreateDXGIFactory2)(UINT flags, REFIID iid, void **fact static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; +static unsigned int use_adapter_idx; +static BOOL use_warp_adapter; +static BOOL use_mt = TRUE; + +static struct test_entry +{ + void (*test)(void); +} *mt_tests; +size_t mt_tests_size, mt_test_count; + +static void queue_test(void (*test)(void)) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + } + mt_tests[mt_test_count++].test = test; +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + mt_tests[j].test(); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + mt_tests[i].test(); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static ULONG get_refcount(IUnknown *iface) { IUnknown_AddRef(iface); @@ -394,9 +461,6 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_ } } -static BOOL use_warp_adapter; -static unsigned int use_adapter_idx; - static IDXGIAdapter *create_adapter(void) { IDXGIFactory4 *factory4; @@ -4040,7 +4104,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) ok(!refcount, "Device has %u references left.\n", refcount); } -START_TEST(device) +START_TEST(dxgi) { HMODULE dxgi_module, d3d12_module; BOOL enable_debug_layer = FALSE; @@ -4064,30 +4128,36 @@ START_TEST(device) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]); + else if (!strcmp(argv[i], "--single")) + use_mt = FALSE; } - test_adapter_desc(); - test_adapter_luid(); - test_check_interface_support(); - test_create_surface(); - test_parents(); - test_output(); - test_find_closest_matching_mode(); + queue_test(test_adapter_desc); + queue_test(test_adapter_luid); + queue_test(test_check_interface_support); + queue_test(test_create_surface); + queue_test(test_parents); + queue_test(test_output); + queue_test(test_find_closest_matching_mode); + queue_test(test_get_containing_output); + queue_test(test_create_factory); + queue_test(test_private_data); + queue_test(test_swapchain_resize); + queue_test(test_swapchain_present); + queue_test(test_maximum_frame_latency); + queue_test(test_output_desc); + queue_test(test_object_wrapping); + + run_queued_tests(); + + /* These tests use full-screen swapchains, so shouldn't run in parallel. */ test_create_swapchain(); - test_get_containing_output(); test_set_fullscreen(); test_default_fullscreen_target_output(); test_resize_target(); test_inexact_modes(); - test_create_factory(); - test_private_data(); - test_swapchain_resize(); test_swapchain_parameters(); - test_swapchain_present(); run_on_d3d10(test_swapchain_backbuffer_index); - test_maximum_frame_latency(); - test_output_desc(); - test_object_wrapping(); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { -- 2.11.0

2 1

[PATCH 1/2] d3d10core/tests: Run the tests in parallel.
by Henri Verbeet 21 Aug '18

21 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/Makefile.in | 2 +- dlls/d3d10core/tests/{device.c => d3d10core.c} | 259 ++++++++++++++++--------- 2 files changed, 166 insertions(+), 95 deletions(-) rename dlls/d3d10core/tests/{device.c => d3d10core.c} (99%) diff --git a/dlls/d3d10core/tests/Makefile.in b/dlls/d3d10core/tests/Makefile.in index 6401cc8473a..313a042b246 100644 --- a/dlls/d3d10core/tests/Makefile.in +++ b/dlls/d3d10core/tests/Makefile.in @@ -2,4 +2,4 @@ TESTDLL = d3d10core.dll IMPORTS = d3d10 dxgi user32 C_SRCS = \ - device.c + d3d10core.c diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/d3d10core.c similarity index 99% rename from dlls/d3d10core/tests/device.c rename to dlls/d3d10core/tests/d3d10core.c index 569c8eed51a..e675c12a39e 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -33,6 +33,16 @@ #define BITS_N1_0 0xbf800000 #define BITS_1_0 0x3f800000 +static unsigned int use_adapter_idx; +static BOOL use_warp_adapter; +static BOOL use_mt = TRUE; + +static struct test_entry +{ + void (*test)(void); +} *mt_tests; +size_t mt_tests_size, mt_test_count; + struct format_support { DXGI_FORMAT format; @@ -70,6 +80,63 @@ struct uvec4 unsigned int x, y, z, w; }; +static void queue_test(void (*test)(void)) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + } + mt_tests[mt_test_count++].test = test; +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + mt_tests[j].test(); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + mt_tests[i].test(); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static void set_box(D3D10_BOX *box, UINT left, UINT top, UINT front, UINT right, UINT bottom, UINT back) { box->left = left; @@ -946,9 +1013,6 @@ static void check_texture_uvec4_(unsigned int line, ID3D10Texture2D *texture, check_texture_sub_resource_uvec4_(line, texture, sub_resource_idx, NULL, expected_value); } -static BOOL use_warp_adapter; -static unsigned int use_adapter_idx; - static IDXGIAdapter *create_adapter(void) { IDXGIFactory4 *factory4; @@ -17143,7 +17207,7 @@ static void test_depth_clip(void) release_test_context(&test_context); } -START_TEST(device) +START_TEST(d3d10core) { unsigned int argc, i; char **argv; @@ -17155,99 +17219,106 @@ START_TEST(device) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]); + else if (!strcmp(argv[i], "--single")) + use_mt = FALSE; } print_adapter_info(); - test_feature_level(); - test_device_interfaces(); - test_create_texture1d(); - test_texture1d_interfaces(); - test_create_texture2d(); - test_texture2d_interfaces(); - test_create_texture3d(); - test_create_buffer(); - test_create_depthstencil_view(); - test_depthstencil_view_interfaces(); - test_create_rendertarget_view(); - test_render_target_views(); - test_layered_rendering(); - test_create_shader_resource_view(); - test_create_shader(); - test_create_sampler_state(); - test_create_blend_state(); - test_create_depthstencil_state(); - test_create_rasterizer_state(); - test_create_query(); - test_occlusion_query(); - test_pipeline_statistics_query(); - test_timestamp_query(); - test_device_removed_reason(); - test_scissor(); - test_clear_state(); - test_blend(); - test_texture1d(); - test_texture(); - test_cube_maps(); - test_depth_stencil_sampling(); - test_multiple_render_targets(); - test_private_data(); - test_state_refcounting(); - test_il_append_aligned(); - test_instance_id(); - test_fragment_coords(); - test_update_subresource(); - test_copy_subresource_region(); - test_copy_subresource_region_1d(); - test_resource_access(); - test_check_multisample_quality_levels(); - test_cb_relative_addressing(); - test_vs_input_relative_addressing(); - test_swapchain_formats(); - test_swapchain_views(); - test_swapchain_flip(); - test_clear_render_target_view_1d(); - test_clear_render_target_view_2d(); - test_clear_depth_stencil_view(); - test_initial_depth_stencil_state(); - test_draw_depth_only(); - test_shader_stage_input_output_matching(); - test_shader_interstage_interface(); - test_sm4_if_instruction(); - test_sm4_breakc_instruction(); - test_sm4_continuec_instruction(); - test_sm4_discard_instruction(); - test_create_input_layout(); - test_input_assembler(); - test_null_sampler(); - test_immediate_constant_buffer(); - test_fp_specials(); - test_uint_shader_instructions(); - test_index_buffer_offset(); - test_face_culling(); - test_line_antialiasing_blending(); - 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(); - test_resinfo_instruction(); - test_render_target_device_mismatch(); - test_buffer_srv(); - test_geometry_shader(); - test_stream_output(); - test_stream_output_resume(); + queue_test(test_feature_level); + queue_test(test_device_interfaces); + queue_test(test_create_texture1d); + queue_test(test_texture1d_interfaces); + queue_test(test_create_texture2d); + queue_test(test_texture2d_interfaces); + queue_test(test_create_texture3d); + queue_test(test_create_buffer); + queue_test(test_create_depthstencil_view); + queue_test(test_depthstencil_view_interfaces); + queue_test(test_create_rendertarget_view); + queue_test(test_render_target_views); + queue_test(test_layered_rendering); + queue_test(test_create_shader_resource_view); + queue_test(test_create_shader); + queue_test(test_create_sampler_state); + queue_test(test_create_blend_state); + queue_test(test_create_depthstencil_state); + queue_test(test_create_rasterizer_state); + queue_test(test_create_query); + queue_test(test_occlusion_query); + queue_test(test_pipeline_statistics_query); + queue_test(test_timestamp_query); + queue_test(test_device_removed_reason); + queue_test(test_scissor); + queue_test(test_clear_state); + queue_test(test_blend); + queue_test(test_texture1d); + queue_test(test_texture); + queue_test(test_cube_maps); + queue_test(test_depth_stencil_sampling); + queue_test(test_multiple_render_targets); + queue_test(test_private_data); + queue_test(test_state_refcounting); + queue_test(test_il_append_aligned); + queue_test(test_instance_id); + queue_test(test_fragment_coords); + queue_test(test_update_subresource); + queue_test(test_copy_subresource_region); + queue_test(test_copy_subresource_region_1d); + queue_test(test_resource_access); + queue_test(test_check_multisample_quality_levels); + queue_test(test_cb_relative_addressing); + queue_test(test_vs_input_relative_addressing); + queue_test(test_swapchain_formats); + queue_test(test_swapchain_views); + queue_test(test_swapchain_flip); + queue_test(test_clear_render_target_view_1d); + queue_test(test_clear_render_target_view_2d); + queue_test(test_clear_depth_stencil_view); + queue_test(test_initial_depth_stencil_state); + queue_test(test_draw_depth_only); + queue_test(test_shader_stage_input_output_matching); + queue_test(test_shader_interstage_interface); + queue_test(test_sm4_if_instruction); + queue_test(test_sm4_breakc_instruction); + queue_test(test_sm4_continuec_instruction); + queue_test(test_sm4_discard_instruction); + queue_test(test_create_input_layout); + queue_test(test_input_assembler); + queue_test(test_null_sampler); + queue_test(test_immediate_constant_buffer); + queue_test(test_fp_specials); + queue_test(test_uint_shader_instructions); + queue_test(test_index_buffer_offset); + queue_test(test_face_culling); + queue_test(test_line_antialiasing_blending); + queue_test(test_required_format_support); + queue_test(test_ddy); + queue_test(test_shader_input_registers_limits); + queue_test(test_unbind_shader_resource_view); + queue_test(test_stencil_separate); + queue_test(test_sm4_ret_instruction); + queue_test(test_primitive_restart); + queue_test(test_resinfo_instruction); + queue_test(test_render_target_device_mismatch); + queue_test(test_buffer_srv); + queue_test(test_geometry_shader); + queue_test(test_stream_output); + queue_test(test_stream_output_resume); + queue_test(test_depth_bias); + queue_test(test_format_compatibility); + queue_test(test_clip_distance); + queue_test(test_combined_clip_and_cull_distances); + queue_test(test_generate_mips); + queue_test(test_alpha_to_coverage); + queue_test(test_unbound_multisample_texture); + queue_test(test_multiple_viewports); + queue_test(test_multisample_resolve); + queue_test(test_depth_clip); + + run_queued_tests(); + + /* There should be no reason this test can't be run in parallel with the + * others, yet it fails when doing so. (AMD Radeon HD 6310, Windows 7) */ test_stream_output_vs(); - test_depth_bias(); - test_format_compatibility(); - test_clip_distance(); - test_combined_clip_and_cull_distances(); - test_generate_mips(); - test_alpha_to_coverage(); - test_unbound_multisample_texture(); - test_multiple_viewports(); - test_multisample_resolve(); - test_depth_clip(); } -- 2.11.0

2 1

[PATCH] user32: Create a mask from alpha channel when loading a 32 bpp icon. (v3)
by Dmitry Timoshkov 21 Aug '18

21 Aug '18

This patch fixes applications that draws 32 bpp icons manually. v3: create 8-bit intermediate mask from alpha instead of 32-bit. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/cursoricon.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0adb73bf56..5d63a42373 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1296,6 +1296,41 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE 0, 0, bmi_width, bmi_height, mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } + else + { + if (bmi_has_alpha( bmi, color_bits )) + { + DWORD alpha_mask_bits_size = bmi_width * bmi_height; + unsigned char *alpha_mask_bits = HeapAlloc( GetProcessHeap(), 0, alpha_mask_bits_size ); + + if (alpha_mask_bits) + { + const unsigned char *src = color_bits; + unsigned char *dst = alpha_mask_bits; + + while (alpha_mask_bits_size--) + { + *dst++ = src[3] == 0xff ? 0 : 1; + src += 4; + } + + /* DIB palette and color count are already initialized correctly + * for the monochrome case, so just correct the bit depth. + */ + if (bmi_copy->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) + bmi_copy->bmiHeader.biBitCount = 8; + else + ((BITMAPCOREINFO *)bmi_copy)->bmciHeader.bcBitCount = 8; + + SelectObject( hdc, mask ); + StretchDIBits( hdc, 0, 0, width, height, + 0, 0, bmi_width, bmi_height, + alpha_mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); + + HeapFree( GetProcessHeap(), 0, alpha_mask_bits ); + } + } + } ret = TRUE; done: -- 2.17.1

2 5

[PATCH] include/msvcrt: Include calling convention with function pointers.
by Daniel Lehman 21 Aug '18

21 Aug '18

2 1

[PATCH] d2d1/tests: Add some tests for ID2D1Bitmap1::GetSurface().
by Nikolay Sivov 21 Aug '18

21 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 228 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a8b67f144b..5f448dc1a1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6529,6 +6529,233 @@ static void test_create_device(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_check_bitmap_surface(ID2D1Bitmap1 *bitmap, BOOL has_surface, DWORD expected_options) +{ + D2D1_BITMAP_OPTIONS options; + IDXGISurface *surface; + HRESULT hr; + + options = ID2D1Bitmap1_GetOptions(bitmap); + ok(options == expected_options, "Unexpected bitmap options %#x, expected %#x.\n", options, expected_options); + + surface = (void *)0xdeadbeef; + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + if (has_surface) + { + D3D10_TEXTURE2D_DESC desc; + ID3D10Texture2D *texture; + + todo_wine + ok(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); + ok(!!surface, "Expected surface instance.\n"); + + if (SUCCEEDED(hr)) + { + /* Correlate with resource configuration. */ + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); + ok(SUCCEEDED(hr), "Failed to get texture pointer, hr %#x.\n", hr); + + ID3D10Texture2D_GetDesc(texture, &desc); + ok(desc.Usage == 0, "Unexpected usage %#x.\n", desc.Usage); + ok(desc.BindFlags == (options & D2D1_BITMAP_OPTIONS_TARGET ? D3D10_BIND_RENDER_TARGET : D3D10_BIND_SHADER_RESOURCE), + "Unexpected bind flags %#x, bitmap options %#x.\n", desc.BindFlags, options); + ok(desc.CPUAccessFlags == 0, "Unexpected cpu access flags %#x.\n", desc.CPUAccessFlags); + ok(desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", desc.MiscFlags); + + ID3D10Texture2D_Release(texture); + + IDXGISurface_Release(surface); + } + } + else + { + todo_wine { + ok(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); + ok(!surface, "Unexpected surface instance.\n"); + } + } +} + +static void test_check_rt_bitmap_surface(ID2D1RenderTarget *rt, BOOL has_surface, DWORD options) +{ + D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1RenderTarget *compatible_rt; + ID2D1DeviceContext *context; + ID2D1Bitmap1 *bitmap1; + ID2D1Bitmap *bitmap; + D2D1_SIZE_U size; + HRESULT hr; + + static const DWORD bitmap_data[] = + { + 0x7f7f0000, + }; + + set_size_u(&size, 1, 1); + 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, sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); + ok(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); + + test_check_bitmap_surface(bitmap1, has_surface, options); + + ID2D1Bitmap1_Release(bitmap1); + ID2D1Bitmap_Release(bitmap); + + if (FAILED(ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context))) + { + /* Compatible target follows its parent. */ + hr = ID2D1RenderTarget_CreateCompatibleRenderTarget(rt, NULL, NULL, NULL, + D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, (ID2D1BitmapRenderTarget **)&compatible_rt); + ok(SUCCEEDED(hr), "Failed to create compatible render target, hr %#x.\n", hr); + + hr = ID2D1RenderTarget_CreateBitmap(compatible_rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); + ok(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); + + test_check_bitmap_surface(bitmap1, has_surface, options); + ID2D1RenderTarget_Release(compatible_rt); + + ID2D1Bitmap1_Release(bitmap1); + ID2D1Bitmap_Release(bitmap); + } + else + ID2D1DeviceContext_Release(context); +} + +static void test_bitmap_surface(void) +{ + D2D1_HWND_RENDER_TARGET_PROPERTIES hwnd_rt_desc; + D2D1_RENDER_TARGET_PROPERTIES rt_desc; + ID3D10Device1 *d3d_device; + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + ID2D1Factory1 *factory; + ID2D1RenderTarget *rt; + IDXGISurface *surface; + ID2D1Device *device; + ID2D1DeviceContext *device_context; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + ID2D1Bitmap1 *bitmap; + HWND window; + HRESULT hr; + + IWICBitmap *wic_bitmap; + IWICImagingFactory *wic_factory; + + if (!(d3d_device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + ID3D10Device1_Release(d3d_device); + return; + } + + /* DXGI target */ + window = create_window(); + swapchain = create_swapchain(d3d_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"); + + test_check_rt_bitmap_surface(rt, TRUE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + /* Bitmap created from DXGI surface. */ + hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); + + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); + + hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); +todo_wine + ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ + memset(&bitmap_desc, 0, sizeof(bitmap_desc)); + 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 = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface, NULL, &bitmap); + ok(SUCCEEDED(hr), "Failed to create a bitmap, hr %#x.\n", hr); + + test_check_bitmap_surface(bitmap, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); + test_check_rt_bitmap_surface((ID2D1RenderTarget *)device_context, TRUE, D2D1_BITMAP_OPTIONS_NONE); + + ID2D1DeviceContext_Release(device_context); +} + ID2D1Device_Release(device); + IDXGIDevice_Release(dxgi_device); + IDXGISurface_Release(surface); + + /* DC target */ + rt_desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + rt_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + rt_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + rt_desc.dpiX = 96.0f; + rt_desc.dpiY = 96.0f; + rt_desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + rt_desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + hr = ID2D1Factory1_CreateDCRenderTarget(factory, &rt_desc, (ID2D1DCRenderTarget **)&rt); + ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr); + + test_check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + /* HWND target */ + hwnd_rt_desc.hwnd = NULL; + hwnd_rt_desc.pixelSize.width = 64; + hwnd_rt_desc.pixelSize.height = 64; + hwnd_rt_desc.presentOptions = D2D1_PRESENT_OPTIONS_NONE; + hwnd_rt_desc.hwnd = CreateWindowA("static", "d2d_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(!!hwnd_rt_desc.hwnd, "Failed to create target window.\n"); + + hr = ID2D1Factory1_CreateHwndRenderTarget(factory, &rt_desc, &hwnd_rt_desc, (ID2D1HwndRenderTarget **)&rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + test_check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + DestroyWindow(hwnd_rt_desc.hwnd); + + /* WIC target */ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&wic_factory); + ok(SUCCEEDED(hr), "Failed to create WIC imaging factory, hr %#x.\n", hr); + hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16, + &GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + IWICImagingFactory_Release(wic_factory); + + hr = ID2D1Factory1_CreateWicBitmapRenderTarget(factory, wic_bitmap, &rt_desc, &rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + test_check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + CoUninitialize(); + + ID2D1Factory1_Release(factory); + ID3D10Device1_Release(d3d_device); +} + START_TEST(d2d1) { unsigned int argc, i; @@ -6568,6 +6795,7 @@ START_TEST(d2d1) queue_test(test_layer); queue_test(test_bezier_intersect); queue_test(test_create_device); + queue_test(test_bitmap_surface); run_queued_tests(); } -- 2.18.0

2 2

[PATCH 5/5] wined3d: Use local gl_info variable in wined3d_get_device_caps().
by Józef Kucia 21 Aug '18

21 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a5c7b9731615..a6f190c4d0ae 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2205,9 +2205,9 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPTFILTERCAPS_MAGFLINEAR; caps->VertexTextureFilterCaps = 0; - adapter->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); - adapter->fragment_pipe->get_caps(&adapter->gl_info, &fragment_caps); - adapter->vertex_pipe->vp_get_caps(&adapter->gl_info, &vertex_caps); + adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); + adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); + adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); /* Add shader misc caps. Only some of them belong to the shader parts of the pipeline */ caps->PrimitiveMiscCaps |= fragment_caps.PrimitiveMiscCaps; @@ -2243,19 +2243,19 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->VS20Caps.caps = WINED3DVS20CAPS_PREDICATION; /* VS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->VS20Caps.temp_count = max(32, adapter->gl_info.limits.arb_vs_temps); + caps->VS20Caps.temp_count = max(32, gl_info->limits.arb_vs_temps); /* level of nesting in loops / if-statements; VS 3.0 requires MAX (4) */ caps->VS20Caps.static_flow_control_depth = WINED3DVS20_MAX_STATICFLOWCONTROLDEPTH; caps->MaxVShaderInstructionsExecuted = 65535; /* VS 3.0 needs at least 65535, some cards even use 2^32-1 */ - caps->MaxVertexShader30InstructionSlots = max(512, adapter->gl_info.limits.arb_vs_instructions); + caps->MaxVertexShader30InstructionSlots = max(512, gl_info->limits.arb_vs_instructions); caps->VertexTextureFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | WINED3DPTFILTERCAPS_MAGFPOINT; } else if (caps->VertexShaderVersion == 2) { caps->VS20Caps.caps = 0; caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH; - caps->VS20Caps.temp_count = max(12, adapter->gl_info.limits.arb_vs_temps); + caps->VS20Caps.temp_count = max(12, gl_info->limits.arb_vs_temps); caps->VS20Caps.static_flow_control_depth = 1; caps->MaxVShaderInstructionsExecuted = 65535; @@ -2289,7 +2289,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPS20CAPS_NOTEXINSTRUCTIONLIMIT; /* PS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ caps->PS20Caps.dynamic_flow_control_depth = WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->PS20Caps.temp_count = max(32, adapter->gl_info.limits.arb_ps_temps); + caps->PS20Caps.temp_count = max(32, gl_info->limits.arb_ps_temps); /* PS 3.0 requires MAX_STATICFLOWCONTROLDEPTH (4) */ caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MAX_STATICFLOWCONTROLDEPTH; /* PS 3.0 requires MAX_NUMINSTRUCTIONSLOTS (512) */ @@ -2297,14 +2297,14 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxPShaderInstructionsExecuted = 65535; caps->MaxPixelShader30InstructionSlots = max(WINED3DMIN30SHADERINSTRUCTIONS, - adapter->gl_info.limits.arb_ps_instructions); + gl_info->limits.arb_ps_instructions); } else if(caps->PixelShaderVersion == 2) { /* Below we assume PS2.0 specs, not extended 2.0a(GeforceFX)/2.0b(Radeon R3xx) ones */ caps->PS20Caps.caps = 0; caps->PS20Caps.dynamic_flow_control_depth = 0; /* WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH = 0 */ - caps->PS20Caps.temp_count = max(12, adapter->gl_info.limits.arb_ps_temps); + caps->PS20Caps.temp_count = max(12, gl_info->limits.arb_ps_temps); caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MIN_STATICFLOWCONTROLDEPTH; /* Minimum: 1 */ /* Minimum number (64 ALU + 32 Texture), a GeforceFX uses 512 */ caps->PS20Caps.instruction_slot_count = WINED3DPS20_MIN_NUMINSTRUCTIONSLOTS; -- 2.16.4

2 1

[PATCH 4/5] wined3d: Get gl_info from context in query_issue() functions.
by Józef Kucia 21 Aug '18

21 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/query.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9828fc21aab4..01e6bcb9905c 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -526,7 +526,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); struct wined3d_device *device = query->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL poll = FALSE; @@ -540,6 +540,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { if ((context = context_reacquire(device, oq->context))) { + gl_info = context->gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); } @@ -558,6 +559,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD context = context_acquire(device, NULL, 0); context_alloc_occlusion_query(context, oq); } + gl_info = context->gl_info; GL_EXTCALL(glBeginQuery(GL_SAMPLES_PASSED, oq->id)); checkGLcall("glBeginQuery()"); @@ -574,6 +576,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { if ((context = context_reacquire(device, oq->context))) { + gl_info = context->gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); @@ -713,7 +716,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); struct wined3d_device *device = query->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL poll = FALSE; @@ -725,6 +728,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { if ((context = context_reacquire(device, pq->context))) { + gl_info = context->gl_info; GL_EXTCALL(glEndQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, pq->stream_idx)); GL_EXTCALL(glEndQueryIndexed(GL_PRIMITIVES_GENERATED, pq->stream_idx)); } @@ -743,6 +747,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D context = context_acquire(device, NULL, 0); context_alloc_so_statistics_query(context, pq); } + gl_info = context->gl_info; GL_EXTCALL(glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, pq->stream_idx, pq->u.query.written)); @@ -759,6 +764,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { if ((context = context_reacquire(device, pq->context))) { + gl_info = context->gl_info; GL_EXTCALL(glEndQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, pq->stream_idx)); GL_EXTCALL(glEndQueryIndexed(GL_PRIMITIVES_GENERATED, pq->stream_idx)); checkGLcall("end query"); @@ -846,7 +852,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD { struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); struct wined3d_device *device = query->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL poll = FALSE; @@ -875,6 +881,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD context = context_acquire(device, NULL, 0); context_alloc_pipeline_statistics_query(context, pq); } + gl_info = context->gl_info; GL_EXTCALL(glBeginQuery(GL_VERTICES_SUBMITTED_ARB, pq->u.query.vertices)); GL_EXTCALL(glBeginQuery(GL_PRIMITIVES_SUBMITTED_ARB, pq->u.query.primitives)); -- 2.16.4

2 1

[PATCH 3/5] wined3d: Get D3D and GL info from context in create_dummy_textures().
by Józef Kucia 21 Aug '18

21 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5079113120eb..271ee28034b2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -610,9 +610,9 @@ out: /* Context activation is done by the caller. */ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) { - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_dummy_textures *textures = &device->dummy_textures; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; DWORD color; -- 2.16.4

2 1

[PATCH 1/5] wined3d: Simplify shader_arb_destroy().
by Józef Kucia 21 Aug '18

21 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 54 +++++++++++++++------------------------ 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 00b326fcee5f..7cd7d2d03085 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4733,56 +4733,42 @@ static void shader_arb_disable(void *shader_priv, struct wined3d_context *contex static void shader_arb_destroy(struct wined3d_shader *shader) { struct wined3d_device *device = shader->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + unsigned int i; + + /* This can happen if a shader was never compiled */ + if (!shader->backend_data) + return; + + context = context_acquire(device, NULL, 0); + gl_info = context->gl_info; if (shader_is_pshader_version(shader->reg_maps.shader_version.type)) { struct arb_pshader_private *shader_data = shader->backend_data; - UINT i; - - if(!shader_data) return; /* This can happen if a shader was never compiled */ - - if (shader_data->num_gl_shaders) - { - struct wined3d_context *context = context_acquire(device, NULL, 0); - for (i = 0; i < shader_data->num_gl_shaders; ++i) - { - GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); - checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId))"); - } - - context_release(context); - } + for (i = 0; i < shader_data->num_gl_shaders; ++i) + GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); heap_free(shader_data->gl_shaders); - heap_free(shader_data); - shader->backend_data = NULL; } else { struct arb_vshader_private *shader_data = shader->backend_data; - UINT i; - if(!shader_data) return; /* This can happen if a shader was never compiled */ + for (i = 0; i < shader_data->num_gl_shaders; ++i) + GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); - if (shader_data->num_gl_shaders) - { - struct wined3d_context *context = context_acquire(device, NULL, 0); + heap_free(shader_data->gl_shaders); + } - for (i = 0; i < shader_data->num_gl_shaders; ++i) - { - GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); - checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId))"); - } + checkGLcall("delete programs"); - context_release(context); - } + context_release(context); - heap_free(shader_data->gl_shaders); - heap_free(shader_data); - shader->backend_data = NULL; - } + heap_free(shader->backend_data); + shader->backend_data = NULL; } static int sig_tree_compare(const void *key, const struct wine_rb_entry *entry) -- 2.16.4

2 1

[PATCH 2/5] wined3d: Pass context to find_arb_pshader().
by Józef Kucia 21 Aug '18

21 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7cd7d2d03085..67fd193a7bb4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4230,12 +4230,12 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, } /* Context activation is done by the caller. */ -static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_shader *shader, - const struct arb_ps_compile_args *args) +static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_context *context, + struct wined3d_shader *shader, const struct arb_ps_compile_args *args) { + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_device *device = shader->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; UINT i; DWORD new_size; struct arb_ps_compiled_shader *new_array; @@ -4566,7 +4566,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context TRACE("Using pixel shader %p.\n", ps); find_arb_ps_compile_args(state, context, ps, &compile_args); - compiled = find_arb_pshader(ps, &compile_args); + compiled = find_arb_pshader(context, ps, &compile_args); priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled; -- 2.16.4

2 1

[PATCH 2/2] user32/listbox: Fix scrolling for multi-column listboxes
by Gabriel Ivăncescu 21 Aug '18

21 Aug '18

2 1

[PATCH 1/2] comctl32/listbox: Fix scrolling for multi-column listboxes
by Gabriel Ivăncescu 21 Aug '18

21 Aug '18

2 1

[PATCH v2] msi: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 21 Aug '18

21 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Rebased dlls/msi/action.c | 12 ++++++------ dlls/msi/appsearch.c | 3 +-- dlls/msi/assembly.c | 2 +- dlls/msi/automation.c | 2 +- dlls/msi/custom.c | 8 ++++---- dlls/msi/database.c | 2 +- dlls/msi/dialog.c | 2 +- dlls/msi/msi.c | 4 ++-- dlls/msi/package.c | 2 +- dlls/msi/patch.c | 2 +- dlls/msi/registry.c | 38 +++++++++++++++++++------------------- dlls/msi/source.c | 2 +- dlls/msi/upgrade.c | 2 +- 13 files changed, 40 insertions(+), 41 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 03fab71588..af867618c6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2152,7 +2152,7 @@ static WCHAR *create_temp_dir( MSIDATABASE *db ) if (!db->tempfolder) { WCHAR tmp[MAX_PATH]; - UINT len = sizeof(tmp)/sizeof(tmp[0]); + UINT len = ARRAY_SIZE( tmp ); if (msi_get_property( db, szTempFolder, tmp, &len ) || GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY) @@ -5546,9 +5546,9 @@ UINT ACTION_ForceReboot(MSIPACKAGE *package) squash_guid( package->ProductCode, squashed_pc ); - GetSystemDirectoryW(sysdir, sizeof(sysdir)/sizeof(sysdir[0])); + GetSystemDirectoryW(sysdir, ARRAY_SIZE(sysdir)); RegCreateKeyW(HKEY_LOCAL_MACHINE,RunOnce,&hkey); - snprintfW( buffer, sizeof(buffer)/sizeof(buffer[0]), msiexec_fmt, sysdir, squashed_pc ); + snprintfW(buffer, ARRAY_SIZE(buffer), msiexec_fmt, sysdir, squashed_pc); msi_reg_set_val_str( hkey, squashed_pc, buffer ); RegCloseKey(hkey); @@ -6214,7 +6214,7 @@ static LPCWSTR *msi_service_args_to_vector(LPWSTR args, DWORD *numargs) static const WCHAR separator[] = {'[','~',']',0}; *numargs = 0; - sep_len = sizeof(separator) / sizeof(WCHAR) - 1; + sep_len = ARRAY_SIZE(separator) - 1; if (!args) return NULL; @@ -7686,7 +7686,7 @@ static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) MSIPACKAGE *package = param; const WCHAR *property = MSI_RecordGetString( rec, 7 ); int attrs = MSI_RecordGetInteger( rec, 5 ); - UINT len = sizeof(fmtW)/sizeof(fmtW[0]); + UINT len = ARRAY_SIZE( fmtW ); WCHAR *product, *features, *cmd; STARTUPINFOW si; PROCESS_INFORMATION info; @@ -7701,7 +7701,7 @@ static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) if (features) len += strlenW( features ); else - len += sizeof(szAll) / sizeof(szAll[0]); + len += ARRAY_SIZE( szAll ); if (!(cmd = msi_alloc( len * sizeof(WCHAR) ))) { diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 693da18355..fbed073bd4 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -949,8 +949,7 @@ static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, if (GetDriveTypeW(pathWithDrive) != DRIVE_FIXED) continue; - lstrcpynW(pathWithDrive + 3, path, - sizeof(pathWithDrive) / sizeof(pathWithDrive[0]) - 3); + lstrcpynW(pathWithDrive + 3, path, ARRAY_SIZE(pathWithDrive) - 3); if (sig->File) rc = ACTION_RecurseSearchDirectory(package, &val, sig, diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 59fd332d25..e3bd965150 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -344,7 +344,7 @@ static const WCHAR *clr_version[] = static const WCHAR *get_clr_version_str( enum clr_version version ) { - if (version >= sizeof(clr_version)/sizeof(clr_version[0])) return clr_version_unknown; + if (version >= ARRAY_SIZE( clr_version )) return clr_version_unknown; return clr_version[version]; } diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 06ad2f90a4..80254e6df4 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -130,7 +130,7 @@ void release_typelib(void) { unsigned i; - for (i = 0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) if (typeinfos[i]) ITypeInfo_Release(typeinfos[i]); diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index ee259e8ba3..436a096f37 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -213,7 +213,7 @@ WCHAR *msi_create_temp_file( MSIDATABASE *db ) if (!db->tempfolder) { WCHAR tmp[MAX_PATH]; - UINT len = sizeof(tmp)/sizeof(tmp[0]); + UINT len = ARRAY_SIZE( tmp ); if (msi_get_property( db, szTempFolder, tmp, &len ) || GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY) @@ -605,9 +605,9 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) wow64 = FALSE; if ((sizeof(void *) == 8 || wow64) && arch == SCS_32BIT_BINARY) - GetSystemWow64DirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); + GetSystemWow64DirectoryW(path, MAX_PATH - ARRAY_SIZE(msiexecW)); else - GetSystemDirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); + GetSystemDirectoryW(path, MAX_PATH - ARRAY_SIZE(msiexecW)); strcatW(path, msiexecW); sprintfW(cmdline, argsW, path, GetCurrentProcessId()); @@ -943,7 +943,7 @@ static UINT HANDLE_CustomType23( MSIPACKAGE *package, const WCHAR *source, const static const WCHAR msiexecW[] = {'m','s','i','e','x','e','c',0}; static const WCHAR paramsW[] = {'/','q','b',' ','/','i',' '}; WCHAR *dir, *arg, *p; - UINT len_src, len_dir, len_tgt, len = sizeof(paramsW)/sizeof(paramsW[0]); + UINT len_src, len_dir, len_tgt, len = ARRAY_SIZE( paramsW ); HANDLE handle; if (!(dir = msi_dup_property( package->db, szOriginalDatabase ))) return ERROR_OUTOFMEMORY; diff --git a/dlls/msi/database.c b/dlls/msi/database.c index ef0221d2b8..c1fb37b583 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -451,7 +451,7 @@ static LPWSTR msi_build_createsql_prelude(LPWSTR table) static const WCHAR create_fmt[] = {'C','R','E','A','T','E',' ','T','A','B','L','E',' ','`','%','s','`',' ','(',' ',0}; - size = sizeof(create_fmt)/sizeof(create_fmt[0]) + lstrlenW(table) - 2; + size = ARRAY_SIZE(create_fmt) + lstrlenW(table) - 2; prelude = msi_alloc(size * sizeof(WCHAR)); if (!prelude) return NULL; diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b96c44be44..68e8ab2258 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3377,7 +3377,7 @@ static UINT msi_dialog_hyperlink_handler( msi_dialog *dialog, msi_control *contr { static const WCHAR hrefW[] = {'h','r','e','f'}; static const WCHAR openW[] = {'o','p','e','n',0}; - int len, len_href = sizeof(hrefW) / sizeof(hrefW[0]); + int len, len_href = ARRAY_SIZE( hrefW ); const WCHAR *p, *q; WCHAR quote = 0; LITEM item; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7d805afeda..ae146e626f 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1028,7 +1028,7 @@ UINT WINAPI MsiGetProductCodeW(LPCWSTR szComponent, LPWSTR szBuffer) UINT rc, index; HKEY compkey, prodkey; WCHAR squashed_comp[SQUASHED_GUID_SIZE], squashed_prod[SQUASHED_GUID_SIZE]; - DWORD sz = sizeof(squashed_prod)/sizeof(squashed_prod[0]); + DWORD sz = ARRAY_SIZE(squashed_prod); TRACE("%s %p\n", debugstr_w(szComponent), szBuffer); @@ -3482,7 +3482,7 @@ static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, return ERROR_FILE_NOT_FOUND; } msi_free( components ); - StringFromGUID2( &guid, comp, sizeof(comp)/sizeof(comp[0]) ); + StringFromGUID2( &guid, comp, ARRAY_SIZE( comp )); } state = MSI_GetComponentPath( szProduct, comp, szAllSid, MSIINSTALLCONTEXT_ALL, lpPathBuf, pcchPathBuf ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 0d937d609d..273ca71418 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -559,7 +559,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!RegCreateKeyExW(netsetup, v4client, 0, NULL, 0, KEY_QUERY_VALUE, NULL, &hkey, NULL)) { - size = sizeof(path)/sizeof(path[0]); + size = ARRAY_SIZE(path); if (!RegQueryValueExW(hkey, installpath, NULL, &type, (BYTE *)path, &size)) { len = strlenW(path) + strlenW(fusion) + 2; diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index f6ed3c1f1a..bd9b7b87df 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -1037,7 +1037,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) TRACE("%p, %s\n", package, debugstr_w(patch_code)); - len = sizeof(patch_file) / sizeof(WCHAR); + len = ARRAY_SIZE( patch_file ); r = MsiGetPatchInfoExW( patch_code, package->ProductCode, NULL, package->Context, INSTALLPROPERTY_LOCALPACKAGEW, patch_file, &len ); if (r != ERROR_SUCCESS) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index cbc8d8d6f0..efc72725ce 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1297,12 +1297,12 @@ static UINT fetch_machine_component( DWORD ctx, DWORD index, DWORD *idx, WCHAR g if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, componentsW, 0, access, &key_components )) return ERROR_NO_MORE_ITEMS; - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); while (!RegEnumKeyExW( key_components, i, component, &len_component, NULL, NULL, NULL, NULL )) { if (*idx == index) goto found; (*idx)++; - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); i++; } RegCloseKey( key_components ); @@ -1349,14 +1349,14 @@ static UINT fetch_user_component( const WCHAR *usersid, DWORD ctx, DWORD index, if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, userdataW, 0, access, &key_users )) return ERROR_NO_MORE_ITEMS; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); while (!RegEnumKeyExW( key_users, i, user, &len_user, NULL, NULL, NULL, NULL )) { if ((strcmpW( usersid, szAllSid ) && strcmpW( usersid, user )) || !strcmpW( szLocalSid, user )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } strcpyW( path, user ); @@ -1364,19 +1364,19 @@ static UINT fetch_user_component( const WCHAR *usersid, DWORD ctx, DWORD index, if (RegOpenKeyExW( key_users, path, 0, access, &key_components )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); while (!RegEnumKeyExW( key_components, j, component, &len_component, NULL, NULL, NULL, NULL )) { if (*idx == index) goto found; (*idx)++; - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); j++; } RegCloseKey( key_components ); - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); i++; } RegCloseKey( key_users ); @@ -1709,7 +1709,7 @@ UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR szUpgradeCode, DWORD dwReserved, UINT r; HKEY hkey; WCHAR szKeyName[SQUASHED_GUID_SIZE]; - DWORD dwSize = sizeof(szKeyName)/sizeof(szKeyName[0]); + DWORD dwSize = ARRAY_SIZE(szKeyName); TRACE("%s %u %u %p\n", debugstr_w(szUpgradeCode), dwReserved, iProductIndex, lpProductBuf); @@ -2324,18 +2324,18 @@ static UINT fetch_machine_product( const WCHAR *match, DWORD index, DWORD *idx, if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, productsW, 0, access, &key )) return ERROR_NO_MORE_ITEMS; - len = sizeof(product)/sizeof(product[0]); + len = ARRAY_SIZE( product ); while (!RegEnumKeyExW( key, i, product, &len, NULL, NULL, NULL, NULL )) { if (match && strcmpW( match, product )) { i++; - len = sizeof(product)/sizeof(product[0]); + len = ARRAY_SIZE( product ); continue; } if (*idx == index) goto found; (*idx)++; - len = sizeof(product)/sizeof(product[0]); + len = ARRAY_SIZE( product ); i++; } RegCloseKey( key ); @@ -2396,13 +2396,13 @@ static UINT fetch_user_product( const WCHAR *match, const WCHAR *usersid, DWORD } else return ERROR_INVALID_PARAMETER; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); while (!RegEnumKeyExW( key_users, i, user, &len_user, NULL, NULL, NULL, NULL )) { if (strcmpW( usersid, user ) && strcmpW( usersid, szAllSid )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } strcpyW( path, user ); @@ -2410,25 +2410,25 @@ static UINT fetch_user_product( const WCHAR *match, const WCHAR *usersid, DWORD if (RegOpenKeyExW( key_users, path, 0, access, &key_products )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } - len_product = sizeof(product)/sizeof(product[0]); + len_product = ARRAY_SIZE( product ); while (!RegEnumKeyExW( key_products, j, product, &len_product, NULL, NULL, NULL, NULL )) { if (match && strcmpW( match, product )) { j++; - len_product = sizeof(product)/sizeof(product[0]); + len_product = ARRAY_SIZE( product ); continue; } if (*idx == index) goto found; (*idx)++; - len_product = sizeof(product)/sizeof(product[0]); + len_product = ARRAY_SIZE( product ); j++; } RegCloseKey( key_products ); - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); i++; } RegCloseKey( key_users ); diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 68bf9d0a22..904589e947 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -1006,7 +1006,7 @@ static UINT fill_source_list(struct list *sourcelist, HKEY sourcekey, DWORD *cou while (r == ERROR_SUCCESS) { - size = sizeof(name) / sizeof(name[0]); + size = ARRAY_SIZE(name); r = RegEnumValueW(sourcekey, index, name, &size, NULL, NULL, NULL, &val_size); if (r != ERROR_SUCCESS) return r; diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index ac58d909e0..bbc7df6eec 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -103,7 +103,7 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) { MSIPACKAGE *package = param; WCHAR product[SQUASHED_GUID_SIZE]; - DWORD index = 0, attributes = 0, sz = sizeof(product)/sizeof(product[0]); + DWORD index = 0, attributes = 0, sz = ARRAY_SIZE(product); LPCWSTR upgrade_code; HKEY hkey = 0; UINT rc = ERROR_SUCCESS; -- 2.14.4

2 1

[v2 PATCH] wmp: Implement GetClassInfo().
by Nikolay Sivov 21 Aug '18

21 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: removed failing test dlls/wmp/oleobj.c | 11 +++++-- dlls/wmp/tests/oleobj.c | 10 +++++++ dlls/wmp/wmp_main.c | 66 +++++++++++++++++++++++++++++++++++++++++ dlls/wmp/wmp_private.h | 15 ++++++++++ 4 files changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index a90a0c2c6c..cbbd965c38 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -760,11 +760,16 @@ static ULONG WINAPI ProvideClassInfo2_Release(IProvideClassInfo2 *iface) return IOleObject_Release(&This->IOleObject_iface); } -static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) +static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ti) { WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); - FIXME("(%p)->(%p)\n", This, ppTI); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ti); + + if (!ti) + return E_POINTER; + + return get_typeinfo(WindowsMediaPlayer_tid, ti); } static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 472b985244..2250b75aa9 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -1199,6 +1199,8 @@ static void test_wmp(void) IOleObject *oleobj; IWMPCore *wmpcore; DWORD misc_status; + TYPEATTR *attr; + ITypeInfo *ti; RECT pos = {0,0,100,100}; HWND hwnd; GUID guid; @@ -1232,6 +1234,14 @@ static void test_wmp(void) ok(hres == S_OK, "GetGUID failed: %08x\n", hres); ok(IsEqualGUID(&guid, &IID__WMPOCXEvents), "guid = %s\n", wine_dbgstr_guid(&guid)); + hres = IProvideClassInfo2_GetClassInfo(class_info, &ti); + ok(hres == S_OK, "Failed to get class info, hr %#x.\n", hres); + hres = ITypeInfo_GetTypeAttr(ti, &attr); + ok(hres == S_OK, "Failed to get type attributes, hr %#x.\n", hres); + ok(IsEqualGUID(&CLSID_WindowsMediaPlayer, &attr->guid), "Unexpected typeinfo guid %s\n", wine_dbgstr_guid(&attr->guid)); + ITypeInfo_ReleaseTypeAttr(ti, attr); + ITypeInfo_Release(ti); + IProvideClassInfo2_Release(class_info); test_QI((IUnknown*)oleobj); diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index 273d193e58..2541fc54ff 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -27,6 +27,71 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); HINSTANCE wmp_instance; DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static REFIID tid_ids[] = { +#define XIID(iface) &IID_ ## iface, +#define CTID(name) &CLSID_ ## name, +TID_LIST +#undef XIID +#undef CTID +}; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static HRESULT load_typelib(void) +{ + ITypeLib *tl; + HRESULT hr; + + hr = LoadRegTypeLib(&LIBID_WMPLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hr)) { + ERR("LoadRegTypeLib failed: %08x\n", hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hr; +} + +HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo) +{ + HRESULT hr; + + if (!typelib) + hr = load_typelib(); + if (!typelib) + return hr; + + if (!typeinfos[tid]) { + ITypeInfo *ti; + + hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if (FAILED(hr)) { + ERR("GetTypeInfoOfGuid (%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)(typeinfos + tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(*typeinfo); + return S_OK; +} + +static void release_typelib(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) + if (typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -93,6 +158,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_PROCESS_DETACH: unregister_wmp_class(); unregister_player_msg_class(); + release_typelib(); break; } diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 9617be0c7f..ab9c6d098c 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -25,6 +25,21 @@ #include "dshow.h" #include "wmp.h" +#define TID_LIST \ + XIID(NULL) \ + CTID(WindowsMediaPlayer) + +typedef enum { +#define XIID(iface) iface ## _tid, +#define CTID(name) name ## _tid, +TID_LIST +#undef XIID +#undef CTID + LAST_tid +} typeinfo_id; + +HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; + typedef struct { IConnectionPoint IConnectionPoint_iface; -- 2.18.0

1 0

[PATCH] wmp: Implement GetClassInfo().
by Nikolay Sivov 21 Aug '18

21 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wmp/oleobj.c | 11 +++++-- dlls/wmp/tests/oleobj.c | 12 ++++++++ dlls/wmp/wmp_main.c | 66 +++++++++++++++++++++++++++++++++++++++++ dlls/wmp/wmp_private.h | 15 ++++++++++ 4 files changed, 101 insertions(+), 3 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index a90a0c2c6c..cbbd965c38 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -760,11 +760,16 @@ static ULONG WINAPI ProvideClassInfo2_Release(IProvideClassInfo2 *iface) return IOleObject_Release(&This->IOleObject_iface); } -static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) +static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ti) { WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); - FIXME("(%p)->(%p)\n", This, ppTI); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ti); + + if (!ti) + return E_POINTER; + + return get_typeinfo(WindowsMediaPlayer_tid, ti); } static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 472b985244..2a69a102de 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -1199,6 +1199,8 @@ static void test_wmp(void) IOleObject *oleobj; IWMPCore *wmpcore; DWORD misc_status; + TYPEATTR *attr; + ITypeInfo *ti; RECT pos = {0,0,100,100}; HWND hwnd; GUID guid; @@ -1232,6 +1234,16 @@ static void test_wmp(void) ok(hres == S_OK, "GetGUID failed: %08x\n", hres); ok(IsEqualGUID(&guid, &IID__WMPOCXEvents), "guid = %s\n", wine_dbgstr_guid(&guid)); + hres = IProvideClassInfo2_GetClassInfo(class_info, NULL); + ok(hres == E_POINTER, "Unexpected hr %#x.\n", hres); + hres = IProvideClassInfo2_GetClassInfo(class_info, &ti); + ok(hres == S_OK, "Failed to get class info, hr %#x.\n", hres); + hres = ITypeInfo_GetTypeAttr(ti, &attr); + ok(hres == S_OK, "Failed to get type attributes, hr %#x.\n", hres); + ok(IsEqualGUID(&CLSID_WindowsMediaPlayer, &attr->guid), "Unexpected typeinfo guid %s\n", wine_dbgstr_guid(&attr->guid)); + ITypeInfo_ReleaseTypeAttr(ti, attr); + ITypeInfo_Release(ti); + IProvideClassInfo2_Release(class_info); test_QI((IUnknown*)oleobj); diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index 273d193e58..2541fc54ff 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -27,6 +27,71 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); HINSTANCE wmp_instance; DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static REFIID tid_ids[] = { +#define XIID(iface) &IID_ ## iface, +#define CTID(name) &CLSID_ ## name, +TID_LIST +#undef XIID +#undef CTID +}; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static HRESULT load_typelib(void) +{ + ITypeLib *tl; + HRESULT hr; + + hr = LoadRegTypeLib(&LIBID_WMPLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hr)) { + ERR("LoadRegTypeLib failed: %08x\n", hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hr; +} + +HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo) +{ + HRESULT hr; + + if (!typelib) + hr = load_typelib(); + if (!typelib) + return hr; + + if (!typeinfos[tid]) { + ITypeInfo *ti; + + hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if (FAILED(hr)) { + ERR("GetTypeInfoOfGuid (%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)(typeinfos + tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(*typeinfo); + return S_OK; +} + +static void release_typelib(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) + if (typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -93,6 +158,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_PROCESS_DETACH: unregister_wmp_class(); unregister_player_msg_class(); + release_typelib(); break; } diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 9617be0c7f..ab9c6d098c 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -25,6 +25,21 @@ #include "dshow.h" #include "wmp.h" +#define TID_LIST \ + XIID(NULL) \ + CTID(WindowsMediaPlayer) + +typedef enum { +#define XIID(iface) iface ## _tid, +#define CTID(name) name ## _tid, +TID_LIST +#undef XIID +#undef CTID + LAST_tid +} typeinfo_id; + +HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; + typedef struct { IConnectionPoint IConnectionPoint_iface; -- 2.18.0

2 1

[PATCH] testbot/WineRunBuild: Use the new Build command line options.
by Francois Gouget 21 Aug '18

21 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index c681d2e14..32369b191 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -363,7 +363,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n". "( set -x\n". - " ../bin/build/Build.pl patch.diff ". join(",", sort keys %Bitnesses) ."\n". + " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Bitnesses) ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) -- 2.18.0

1 0

[PATCH] testbot/WineRunWineTest: Use the new WineTest command line options.
by Francois Gouget 21 Aug '18

21 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunWineTest.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 6c0c923c9..ac5594654 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -428,7 +428,7 @@ if ($Step->Type eq "suite") my $Tag = lc($VM->Name); $Tag =~ s/^$TagPrefix//; $Tag =~ s/[^a-zA-Z0-9]/-/g; - $Script .= $Task->CmdLineArg .",submit winetest $TagPrefix-$Tag "; + $Script .= "--winetest ". $Task->CmdLineArg ." $TagPrefix-$Tag "; if (defined $WebHostName) { my $StepTask = 100 * $StepNo + $TaskNo; @@ -444,7 +444,7 @@ if ($Step->Type eq "suite") } else { - $Script .= $Task->CmdLineArg ." build patch.diff"; + $Script .= "--testpatch ". $Task->CmdLineArg ." patch.diff"; } $Script .= "\n) >Task.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); -- 2.18.0

1 0

[PATCH] testbot/Build: There is no need to create build-native.
by Francois Gouget 21 Aug '18

21 Aug '18

That directory is created by Reconfig.pl which must be run before Build.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index b729d95f4..e1133aaee 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -132,8 +132,6 @@ sub ApplyPatch($) sub BuildNative() { - mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); - InfoMsg "\nRebuilding native tools\n"; system("cd '$DataDir/build-native' && set -x && ". "time make -j$ncpus __tooldeps__"); -- 2.18.0

1 0

[PATCH] testbot/WineRunWine*: Better check the step type.
by Francois Gouget 21 Aug '18

21 Aug '18

This can help avoid errors when testing the script manually. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 6 +++++- testbot/bin/WineRunReconfig.pl | 6 +++++- testbot/bin/WineRunTask.pl | 6 +++++- testbot/bin/WineRunWineTest.pl | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 47e4b3bbd..c681d2e14 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -325,9 +325,13 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "build") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if ($Step->FileType ne "patch") { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 24a24d067..b45dba5c7 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -325,9 +325,13 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "reconfig") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if ($Step->FileType ne "none") { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 204f86305..27dd8e7b3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -381,9 +381,13 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "single" and $Step->Type ne "suite") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if ($Step->FileType ne "exe32" and $Step->FileType ne "exe64") { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index ee4c8537a..6c0c923c9 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -382,10 +382,14 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "build" and $Step->Type ne "suite") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if (($Step->Type eq "suite" and $Step->FileType ne "none") or ($Step->Type ne "suite" and $Step->FileType ne "patch")) { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } -- 2.18.0

1 0

[PATCH] testbot: Always recognize 'Task:' status lines in the logs
by Francois Gouget 21 Aug '18

21 Aug '18

This opens the door to standardizing the format of the status lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e6f9a27af..d39c81b38 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -60,16 +60,16 @@ sub ParseTaskLog($$) foreach my $Line (<$LogFile>) { chomp $Line; - if ($Line =~ /^$ResultPrefix: ok$/) + if ($Line =~ /^(?:$ResultPrefix|Task): ok$/) { $Result ||= "ok"; } - elsif ($Line =~ /^$ResultPrefix: Patch failed to apply$/) + elsif ($Line =~ /^(?:$ResultPrefix|Task): Patch failed to apply$/) { $Result = "badpatch"; last; # Should be the last and most specific message } - elsif ($Line =~ /^$ResultPrefix: /) + elsif ($Line =~ /^(?:$ResultPrefix|Task): /) { $Result = "failed"; } -- 2.18.0

1 0

[PATCH 1/6] shell32: Remove alpha channel from 4-bit and 8-bit Internet icons
by Alex Henrie 21 Aug '18

21 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I used Tango's raster icons for these bit depths, but forgot that they are only supposed to have a 1-bit transparency mask. Also, it turns out that it looks much better to take Tango's 32x32 Internet icon, scale it up, and then reduce the color depth, rather than taking the 48x48 icon, scaling it down, and reducing the color depth. This commit also includes that change. --- dlls/shell32/resources/internet.ico | Bin 78510 -> 76974 bytes dlls/shell32/resources/internet.svg | 373 ++++++++++++++++++++-------- 2 files changed, 274 insertions(+), 99 deletions(-) diff --git a/dlls/shell32/resources/internet.ico b/dlls/shell32/resources/internet.ico index cf326639b8a38894eab41af159f94ca982451589..7145da1423908508661725b37ae0d396cb54e899 100644 GIT binary patch delta 14870 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 OWRFYs`2WTpxBfR5+&M`A delta 14884 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 diff --git a/dlls/shell32/resources/internet.svg b/dlls/shell32/resources/internet.svg index 07b6e67e98..3d926f1d30 100644 --- a/dlls/shell32/resources/internet.svg +++ b/dlls/shell32/resources/internet.svg @@ -2120,7 +2120,86 @@ y="220" x="328" id="icon:48-8" - xlink:href="data:image/png;base64,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 ZWk+nudlRcARCkdo1lYX03uiD/FhXym7ur5HPO7y1n8eZfu6EnxfMecqfnTMo/O901nCk8kkyWQS E6j5IpZLhS+2+Vna6ADP83BdNwORTKV4/uV2zo6GaKkr40rfFeIzSW62d7ryxlYgxOHXO/Fm4zRV F6TFSEPXZZklPJVKEY/HOXxu5EYrnY/CwvViCN9XxBM+w9fGl0BMTk4x4hVRW1NJQczh/eOX0YG4 6e7JigBdXX+D9KR46bmXqC+NUVEYxfXSk8wHI3Co410e/+7rJPOb5+cAmf70bnSiBQjpS7T0CPwU 710Yzoh3XZeLlweJ2IKWujKOvX0Go1fegr/l1mJ39/eZm42LF/7+JVobiqkoinJpQjI7G894P5lM MjAygVNQi6/MkggsTiMpJYH00NLFSA8jPfomwHXdjF0Zn+PO1o2c6DjL3MwcHR0rnx/ccmcOYGjw XYqKNx8YujDA3fu2grBoKJTo+dWjUoofv3kOL1R6Y0MrCNJvZSogUAqjJEZJCHyM8kH5GCWRUrGp ymFg6Crn+4apadzOqc6zTIxN09VZJqB9RW0fane6bc+T5K6Kmt9+6AHaNhQwOTlJIpHk737SxWS0 GSccw6QXRPOmMVqD0aADjA4gUBidPgBZaJU5apTGpo3kR8Oc6DhLfCZBV1eZgAO31PShzwfa2h7D DtnmM59t5vP33cGh7lO80R8j5Qfc2ARKi8cYzGLxmU+FCQJCQlNXWURteSGDF69y6cwAgTGi653b P635SCc0O3Y8QjgWMTkxh5adG2jcvInxmSSD16YZvR7HdWV62WsWvK8xJg3g2FCaH6W8JJ+ywlxG BkbpOz1AMuFitC0OH/7Oh9LyS52RtbU9hrEsE3YcappqqG6oprS8iMDAbCKF70t8X2JbAscS5EQc HEswMXqd8SvjDPePoZQkUFp0d//gI2n4WE4pd+x4hHA4Cnb6rT4nN4e8gjzCsRC2baGkwvckiZkE yYQHlkFohJQBR458NOEfK8AHx86dX8VxbIRIb9EZk952sayAysoJnn/++V/FYz8Zn4z/l+O/AUIp xNBeLkr4AAAAFHRFWHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8AAABYdEVYdENvcHlyaWdodABD QzAgUHVibGljIERvbWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL3B1 YmxpY2RvbWFpbi96ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTE3VDIx OjU2OjA4LTA2OjAwMKhk9wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0xN1QyMTo1NjowOC0w NjowMEH13EsAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAIXRFWHRTb3Vy Y2UAaHR0cDovL2ppbW1hYy5tdXNpY2hhbGwuY3ppZuNeAAAAAElFTkSuQmCC " + xlink:href="data:image/png;base64,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 +" preserveAspectRatio="none" height="48" width="48" /> @@ -2128,7 +2207,86 @@ y="220" x="384" id="icon:48-4" - xlink:href="data:image/png;base64,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 JHhXMzW15djsNpJyVcjN4zQBKAoYcYPhwetc6LzM6ZfbMU2T8PKK6Ox8alsc3pVbyv37P4fDYcfu tMuYbuD3uymvLiEnz4vD7kDXdRYXlrg+OsHczDJ2p5WVFV0YMYOuru0Rf1cF3IoDBx5E01SEkIBE SoEQoChJSkpmOXny5O+j2ffwHv5f4r8AcHf64g75RHYAAAAUdEVYdEF1dGhvcgBKYWt1YiBTdGVp bmVy5vv3LwAAAFh0RVh0Q29weXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRpb24gaHR0 cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkAAAAldEVY dGRhdGU6Y3JlYXRlADIwMTgtMDgtMTdUMjE6NTY6MDktMDY6MDCW329DAAAAJXRFWHRkYXRlOm1v ZGlmeQAyMDE4LTA4LTE3VDIxOjU2OjA5LTA2OjAw54LX/wAAABl0RVh0U29mdHdhcmUAd3d3Lmlu a3NjYXBlLm9yZ5vuPBoAAAAhdEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFsbC5jemlm 414AAAAASUVORK5CYII= " + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAA +B3RJTUUH1gYMFyca8+vhYAAAEJpJREFUaN7tmcmPbddVxn9779Pfvm715XqdX+PnxI4VJ3aeHSth +FsEAFObMYBaJ8BeQKQMIMENikIhRBoghIJCM0hjSkLgJdvye/bpqb92+Ofc0u2Fwb9Vr8mKZhAwQ +2dLRuVdV95z1rW+tb621N/wfX+KX/eGLL/4RAHlekCQxSkmUHyCVQgiBsxZrDNYahBAI6SGlxMHy +byVWa0ptMMaglOJHP/qbXy+AL37xjwEIPccsFzgEcRxx872b1Os1gihGeh5CCLAWaw3WaoSQSOkh +pATAOYvVJbooeOW3Ps/bP3kHow1RIFFKoI3j9de//rFskr8sA9ZanHP8+Af/ydr6CkklIooDosh3 +Yei78PQeBi4IfReEngsCzwWB7/zAd0HgE8Uhb/zb9/izb/w51tpfyo6PzcCrr37l7PO8sOi8ACGR +UrCyUnWXL++wsbVKvVEhDH2UBOEczjksAm0gKw1ZrpnNMk46PY72jukeD4S1DoCDseL8usJTArd8 +1xvf+atfDcBrr30VAGM06WxKEEYY62i26jRbNRf4Ho1GwqWnt7n09A7nzm+wtdGkVo0IfA+lJP3R +lJP+lLSUDCcZneM+dz/c5/7tfXqdAVlWkmW5mI2nWOdwAjzp4ZxDCMEb3/3LX2if97GpEpAkCQiB +dLikEvGZl67z/PMX2dxoYpxFKUmjGtFqJsRRiEAgBBwfHvDuB3usnrtKVK2yFQSsb7b59GevMxpM +ePfdu/zs7Vsum80RzoqF9x3iY8THR/7La1/4E4w2SCWZDFMqtYhaLXbPf+oS1589z8VL22xs1Akj +j3RegvKp1ypst+sUWcpRp0On2+PgeMBMS9Z3r+CHCcYYAJqJR6QsJ0ddbt/a49bN+/z0nTscHw+F +0ZYi11QqIcpbpOp3v/31j8fAa68t4t0aw2xekMQBaxtNms2K295p89JL1/jcjes4YDKdcdzpkRWG +arNNBZ/RZEK/e8KH9/bZOzhGhRWaa9sIISm1RWsLzmIDSzVWrFxa5cJOk/PnV3HWEQS+6/fGlNqI +2SQjFh4IwSuvfIXvfe+vH7FVPQnA+fMvL+iRC033PMXmdtt94pMX+b3fvcHaeo3Dky7TuabQlqI0 +9EcT/CDC8xR3br7PQaePVhW2z12mVm/irAbp41BEgWK75ROJgul4RKfbR+DYWl/hmatPoZSg0x1S +5PprWhuUpxBCgnPcv//9j2bgxo2vYk2JQ5KlA2rNFlESu+efu8iNG9dprlSZaYe0PiuNGE840sxH +BhGVehPlBYiwQuJXiWot6vUWRZExm81A+VjrwGQMBxnTUY8iS1lbW6deq7LSqNJuVck/exXnHK+/ +/pabTVLhlsVOeh43bixE5Y03/uLJAOZTaK0pXvlSwT99K6TRqLiLl3b4zItXeOmz17i9d4yTARub +6+w0FUU6QTiNCisEcQU/CFnfPo+QCuUHGGNBxAgvwGiNzqYUeco8y5ilc3wp2NpYZa3dQglHURRc +fnqLMPA42D9Bl9odHw+FtRIlwZXeRzMQVeDqs+v887c6KM+ystLg97/8eZ5/7iJR6HNpd4OsNFij +0XnBcDii0+kyzQwrG0+xsf0USaW60H/ncFYgpQDtyLMUM5+R+I5r584RBpcASJIITymMWbQdxhha +rQq/89ufwfc9/uVf33LCOBFEitzqJ+fAjRtfZXf3BkEEd2/3iBOPq9d23bOfuMAXv/A8q6sNAHzf +Iw49FI7xeMzxSZ/BJEUFIbVGk6RSRUixiFnAOrDOYZzFWUclVKw1E9baDaqVhdx6SiGXbYYxhrIs +AUetltDtjTjpjXDOfe3keEoQKhCO3adeYW/v3x+0EkIohFBICUopEILLV3Z4+eXr1GrxGWLnHHle +MBxP6PT6jOcFMqrSWtuiUmssmjV3+kyx6IuEQClFNYlp1auEvsdhp8f+UYfeYMh0OiPP8zMGhBA4 +55BSsHtuleee2yWOfScV2OYPQRqEUI+GkHMLbY4rAXlmUEq5tXaDFz51kSQJH6Htzt17vPf+LTKr +WFnbZmt7hySp4Hn+mfEAblnIADwBtchRplNuHh7x9vt3CcOA3c1VGtWYlWadRqNOFIWLrtU5yrLk +wrk1dKl56827COEQ/c8Rt0bMh/6jAKwtAXjrh/u88OIVVtcarG80qdeSM4O01nQ6Jxz3RpQyptVe +o72+QaVax1MKxEPeX3hl+V2gjWE4G1GkY0ptaDZbaCvojEv2e3OCoym1yoCVisdaq0atEmGtJYlD +Vlo1ms0KrVbFpZNc9A8UUVQ+CuC02lXrCdVazCefu8DOdhtw5EUBblG0fvbBXaZasbpzma3NDaJw +4XW3cPlD3l9c1oHDYYwlm+coB6urbXbPnWeYag5ORnT7Q7rTkv50zCy2RL6kVolw1qGNQXmSra0m +o9GMu7Mu0pMIJR4D4C8+BnFIGAbu2tVdtrZWyLKc/YNDiqJgOi+4fTSmtrrNTmsVqTyse8jix5a1 +iwS21uH7HqubK1RDRRj4KKVoZwVbrRhjN5imGfMsJw4k1djHWkupSwrtAMu53Ta93oR79/oI6xBK +PgZALZPCVyhPsbnRYjQe8e6tDxjO7VlSetU2SW0FpEdhF92iemyqWExdDmMt2likMyS+o1VLSELv +THE8JanGAVJKSm0YT6YcHnXoZymh76F1yVF3xHF3jB8q/EBhnXXOWXE6P5wBOO3qpBAIoFqJOe53 ++P5bN4la2wRhTBKHrG5sktRqZIVeqLAPoSce6RydY2G8XgBIlKUWQOgrpFwoDICU8gxMFCrKMmSW +zhhPUqIopF4JGU/nHPVGNCsRxjicdYvcWlL/UBIvEDljsWbRGif1Fs21HVprG6iggpMeQgWUxiJK +g2MRHtoIfCWQQixldBHz2li0MfiBpBIplBSPqNQjrDlHGPhcOvcU79y8z/7JkGq8xsXtNknkc/94 +TFqYJWj3gMXTBxi9kFFrLGVRks4z1tcavHDtHNo5RoVgahS5djhhsBaMVRjjKPUSgFywJ5bAjLXg +HL63iHvxEQ3+6YgaxxFSwGw2YziOGY8G7B310X4DKzxwIE4V4hEGjD3zRKkN41lOe0OyUgsZDAeY +LMe4CkmQLH5kLBZLYSWFkCgpUAKkXISjdQ7nLBIoSoHWGt/3zir06bseBmC0RmtN6AuSQDKdpbzz +/j1u3utw9dkXENJ/NE4fBnBKiZQChCTVkrdu97lz/5BmoJFeSKUquNCqIoVlOs8xBMyNR24l8iHv +umWMGuuw1iLKKb5WbKy1CYKf30dwzi1VZwGg3ayBXWc0mWG9BKI2Fh+HYEkxyMdklCUAISVOSOa5 +ITOKUemj8VB5yao3Y7XmUY0DZnOfXMPxuGQ+yclPX3A6yC8BaGPI5xnptGSWzrE6J00zPN9jY32d +9bX2wviyRC8B+EpSTSLm8znWCealI8/1IzsXp9w9AHDqwWUiTmcZfjOmUm+R5galJyAESeTTrFeo +V2OKogA3JctzeqmlMBKLeAiARRvHuDAMhhmj4YB0PGAwnhEEAZ9+TtJq1s8AnF5m+X0wHDKZpWjj +mM8zdKkfWP54DoA9uxtr6Q+nNMKYQHlMrGWlXmd3p0YQBGc1IQgCdtYbRJHPT+906UwcuQuwy9Ax +9lSNYK49BlOJ1k1K2cRqOJ/5zPMclgYXRbEAYAyD0YRv/8fbHKYBtcYOeVpS5iXL3hApHssBdyaj +Bq01h/sn+ElCsrKCMZY4CFmtx3hKPESaIAx8VusJV3aatCclvalmvz9nUlhKKzBm4ZBCQ6Y9tFEY +Jyi15WgwZ/+wS6segztloWA6nXF4MuBOr0RENdbiiFmnS5bOwTnxoMd6aGfOlAZTGsqsJJ/n4v7t +fWbDMVGgcM6hyxyrs7MC8nAC+r7Hhc0VPnF+hafXfEQ+Ip1OyIqSrNBkRUlRGiwS66AsDaXWdHoj +7ux3mc7mlMWCgaIoGI5GdPsTctkgSBpECmaDEbPxFGvBGc7seEgSJCA5uHlMOplzePeQcX+ExCFx +9IYTbu93F5Tz5GoUhgG+J+js3abbOSTLNXmhyQpDXujlZShKTVEaRrOC7njOPMspipw8z8nzgvl8 +Tl4URFG82F+ymnQ8YzZOEQiMEWemPySji6Hl+o3LFHmOtYZBf8ThXodKEJNmipuHKTvtDsoZkkoC +iLMBRAhBns0ZDCeMC0hLgSj0WTIbY5aVeVFnSmMpfYe2kBcF0omzHNBliRKO1XqE1SXD7pwyLzBl +IXz/OlHlPXDxYzngCgCUlChlkApxfNR36md3uPbCM+R+xMFowtsfHoMznNtew/f9s35GCMFgMOTo +pE8ua2jpkxV6mcwWYx60F6UxlNpi44WclEWBtJBlGVmWMZqkzLOCRhLT7UzpHnTRWi+kX9xCoLBL +e39uqHd2EV/OCY7vH4FzXLiyS1KpM1EeP7ozxbg+USBp1KoEgY8QCwDj8ZjReEJhoLBAXmKWRern +ABhLnhvyeUmWeQgf5vM53V6fW/eOuX+SsrJaQc/mjE4GWG0EBpwnEeJBCJ8BON1n+TKO/Rt/SCHe +oxxeFlEcuFtv3+SpKxdoN1vcnuX0pwX9wRhfSawNKUtNtz/gv27e5ad3B0zcOkbIhxhwy2vZ4C27 +1OG0oBMJdts+ygrm84zxZIqTAV7g0TvsM+oOSKdjZtMuf/uNf+DVlyVCeDhXPpmBv0fwB1f+kW9+ +80s8c63FsId478fGeb7i4idjVmoRSmnGs4xqkiGA8XTGT9/7gB+8t8/tviNZX0UFbnlCY8+MX9SF +RS4YY+mXJQfKcW3mESApyoIsK/FUROzDwf6H9I47jEf7ott9n1dfFstwL8/sfeLW4ptv/h0Ag/4H +eGEFoYI/LQpDkZfs7KyyUvPx0ES+QGIZjib85N0P2Z8FFPEOVvoLL58mqzZovbgvjpQ0VmuKokA6 +w07dEfuOvLT0RnP29sbs3TlhcHLCoL8vDvZ/yGzawT1B/Z64uXu6rWFcwdHhmxirhXPGWWPwlCC4 +usnmxRZB4DEaT7h1d5+b+2NOTAtZD3CFWTR0Z5tbdnEudnpuZjTOaLAGXUJ/bLFlxnhScOfOmIO9 +PidHXXrde3RPbpKmfX7ReiKAh9vcbD7g/p3v4EwpTJm76WhEaJ5hrXaVSEJvMOD+8ZCJibAiQFqN +MUtjlwmMdQi3qEAKiy8s0rOESlLxoTfI6R5n9HpT9u92GXS7jIYHHB29JdJZl49aH/uIKQgq1BtP +0WpddFtbF9na3uTixVXqq3VcnDCxCaNcME4107QgL/WyPTYILJ4AT0LkL6azWuSRBB4UOYPDY3pH +PQbdAf3uffr9uwwH90SWjc72q35lAIvQktRru9Tqu661ssn2zibN1TUqzRWiRgsZJzilsEKePfl0 +sMEYnDFgNJQFNi9wRUGWpnSPO/Q6xwx7R4xG9xmP90RRTD+eTf8TAKdLSkWtvkW7fdVVK+sk1Sb1 +dpPW+irNdou4mhAEPp4nkUpijaEsSsqiYD6bMxmOGZz0mAzGpNMpadpjOLhHr3dLaJ09EsK/FgAA +SgWEYZ0gqBDFTVevr1FrrJFUmnh+jFQeUkikeDDkW2fQOiefT5mMu0zGHWbTLmWZiqKYUhQpv6jP ++l8H8MhDhKJaWSdJ2i6MaigVIaQCJBLOFMlhsbakLFPm6YBZeiKKYvK/YcJv1m/W/9v13w7H6VVl +iKVmAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0OjA5LTA2OjAwjtUZ/AAAACV0 +RVh0ZGF0ZTptb2RpZnkAMjAwNi0wNi0xM1QwNTozOToyNi0wNjowMHsLU9sAAAAASUVORK5CYII= +" preserveAspectRatio="none" height="48" width="48" /> @@ -2459,47 +2617,43 @@ preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJN AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAA -B3RJTUUH1gYMFyca8+vhYAAACHlJREFUWMPll1tsHOUVx39z2V3vrtf22mtjBzt2nMRNTC5g0wRj -kqCElGsLggcQTykVrVoVqVTw0IcitVLVCw9citQWiaStCi0t0BJxJykBTBJysUnikJg4dnzJen1d -27s7l2++memDxyYBB4Hat47012gu+s7v/M+ZMzPw/74pX+Xm1tbvxsLh0I2houg9iqJc5UlZ6bpO -QtVCOVXVxj3f73KF9TchnDePHn3a+J8BXH/9j8ocV3mkKKJ/f+sNLdq1160PrVheTUk8QiikM5Y1 -SE8U6Ds3yoF3O/MnjnysOdL7fSSk/Hzfvsen/yuA9vYH7tTDoV3fvv9bsVtuatEnsjk0XFYuq124 -53fP/IXmtptQfI+wroLn8srLHeL9Nz6wpOftONDx5D8vtb72RcE3bXrwZ3X1lz2+c+dDseWNVerA -4BCzBZNEZS3JmMbBQ4d5/qXd1K5cRySexLBdsjmblTVRtrU3aVd+/WuRI4d67kilrgoND3247ysB -bNry459sbLvip4/++jvhA0eOMW24oGoMnB+huqaG9/a+xawbY8PmG7Hy03iKjh4Ks7auiOx4mlNn -h1jVuIQ7br9WP9p1pj2RWCOHBg92fKkSbNr0wK11DZe/+KedD0X2d50mWtVIS12EdDqDoZdSVBRj -emqSWKIUx3GxHInneZjTY4xkRhk7f447b7+F8kQU0zSxbYf7v/eEPTWRu2v//t+++oUAbW0PRosT -4aEXXnikIlEcBSCXL+AIwanTPUzMmLS2bwXAdV1sx8USkuzEGLozTVvrWlRVBcDzPHK5HEIIxsay -/OCHf5iSgtoDBx4z5+OpnwUIF/HwjvtuTpYkYgvnEsVx0iMZxnKSpStX4wM+oGoaqqqiqAqlyRRr -V63Asm2E48wtrqpomoaUkoqKEq7fujqJ6j50SQfa2h6MRuP6+Juv/zKuaXNsvu/z3PP/QIZK2HDt -ZuKx+EXAjnQxbIeaqKDvbC8v7TlE6xXLqUmVsaz+cpJlpeRyOQzDwPdhx31PGK6jpeZduMgB33e2 -37C9Jazrn/bmv/e9T7J+HVu23UwsGl/Ifl6e7+P7Psd7BvAUnR333IGaWELH6Ul2vtHNi6/tQ1EU -PM9D1zWammoivu9sn19fv8j+aOTeG7e3hlzX5aPj3SiKQmf/NNu+0Y7ng6oEUReAfaQ7d6J1TSOl -xXNlW1IR56aNjYyMZYlGdHzfw7JsbCG4ZuMK7XRP5l5g9+cANE3b0Lishl889jSRy1YRD6usvbod -y5HkbYVEkXZRcMdxEdIlFRaUFpcsXCtJFAOwor6G3a/voaI8SXE0xN9fO0Lz0ipcKTcu2oSelKlo -NEJqaTPNTY1U1a9C+iqm7TBrCLJ5gSUklpCYtsQUEltIUqVFi84Sz/O4bmMrXZ+MEAmHuXPresYL -ElXVyhYFcISMZsanuPuG9VTqM+QLJpYtMSwHwxRM5wXjMzbTeZu8KTBsB8X3iYTDiwI4joPve+ie -Se9Aml899We8UAI8v3jRHlA1NT9hqGXPvH6IleU+0bhgY8NKxiYmsYgxaYZQFWWu+TwP1/VxpCQu -x2huavxc9kIIhBC0t6zm3HAGpWw50lVBVfKLAqBq45PZfFlF9VKGbZfI+DB1Va3UVZVQKBh88HGG -SScWBPCRroeQLnvHcqTTH/BJbx/x4mLuves2pJTYto1t26iqgopkaiZHfjaP7zO+aAnA6zrbnyER -0bCE5Oor1yxcicdjbGupJ+FPYViCvGmTN20MU2D5Ed7pVzkfvoJuo47ZfAHTNLEsawHiqT/+i9qG -JiYyU76q+J2LAkjbebbz4IlcqjSCYTlUXjxz0DSN29qb+ea6BIo1TcGcAymYAl8rwhIuhuXQceQU -pmku6OOeXsbVpVQnY6T7hvKe6z+3KICihN4+3XUaxfPQFJ8Dx3qRUn6uuSrKS+k+/B55Yy54wRQU -LDHXrLZDX2Zu8hmGgWmazMzMUp6sIKx4TKYnUJTQ2wtJXbjw8PBBWd+wMZS3vba16xr1w30Gpd44 -FclSPM/DD6Ze98nTHBwC9ChW8CjaYu6xtITDslSImhJtwYHR0THUSCl9J/rMwtT0b/bvf3LvJXoA -pFAfPdZxdNa1TKqTMXZ1TNLbd47Z2dkFpTMZHMKBA5+6YMy7kJuhUChgGAa9fefYc+QcEQVGzg7n -PS/86EVl/SzA8PBBmapYPTjQM3Tr5q1XhaYMn8qISUksjBCCt97pYNerRwmnlmM7LnYwmCxHYtlz -KhgmzdU6pmlyPj1K6WVNfPj2YSM7MfRwZ+euM4B1SQAgNjLSNVFc0hBLD0ys37xlva5Ig+IwCCHY -vfcQZmoDwgmsD/aWkAjh4DkWs3mb5kqJqqkMjOQ50nHGHksP/vVk9wsvAy7gBFoUIA4kRkeO9UZC -VWX9pwabNrev1qsqStj73kH2nMxBNDUH4EiEI5HCwRMWvmPhC5NEGCK+RU/fOIf3D4jM8Nk3Tna/ -+CwgAjmAeSmACBAFoqOZ7jOeDE1/1DXekh6dVIsqa5Tlq9ai+i6OsPGljbRNwoqkWPdZkgyzuraM -+lScnuND7qnOATnYf+i5s717XgOMQCaQA2xY/JswAlQA5YGSsViytmHZlrvLyuquqVpaTV3TslAy -VUZRUQg9rGEZFmbBYHJ0ivO9gzI7liWbHezs73v3FcuaTQNZYCrQJDACeJcCIHCgAii7QCWhULyy -unpNS3lFw9XhSEmNouoxDSXsep7j+dIQ9uzo5ET/8dHRE8eltKaA2UDTgSaBTNAHfBHAfHmSQCmQ -CFQMxALACHPvkvkyekFtRWCzARQCu2eA0eDYvzDIl/k1U4OAJQFEUaBQADA/S7wgMxHUtxBkvVDv -xbav9HN6AZB+QXA1yGoeQAZ7/8ss9h8QmIRvK18F5gAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNy0x -MC0xOVQwMDoxNDowOS0wNjowMI7VGfwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDYtMDYtMTNUMDU6 -Mzk6MjYtMDY6MDB7C1PbAAAAAElFTkSuQmCC +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 +YII= " id="icon:32-8" x="480" @@ -2508,29 +2662,45 @@ Mzk6MjYtMDY6MDB7C1PbAAAAAElFTkSuQmCC width="32" height="32" preserveAspectRatio="none" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABelBMVEUAAAAzM2YzM2ZERHdE -RHdERHdERHczRHdmd5kzM3czRGZERHdERHczRHdERGYzM2YzM3czM2ZERGYzRHczM2YzM2YzM2ZV -VYgzRGZVZogzM1UAAAAAAAAzM2YzM1UAAAAzM1UiM1UAAAAiIkQiIjMAAAAREREiM1UiIlUAABEA -AAAzM1UiIjMAAAAzM2ZERHeIiKq7zN3d7u7u7u7u///MzN2qqsyZqrvd3d3///+Zmaq7zO7M3e53 -iKpVVYjMzMy7zMyIiJmqu8yqzN3d3e5EVXd3d5m7u7uqqruqqqq7u8xVZojd7v/d3f+qu7t3iJnM -3f+ImbtmZoiImarM3d2IqrvM7v+qzO673e6Zu91VZmZ3mbtVd4iIqt2Iqsyqu92ZqsyZmZmZqqpE -Zoh3qsx3mcxEVWZmiKpmd5lmmcwzVYhmd4hmiLtEZpl3mapmd6pmmbtViLuImZlEd7tEZndEd6pV -d6qIiIiZu8xVd7tEZqozZpmImcxEd5kn8GoFAAAALnRSTlMAEVWq3e4RiO6IVYh3d0REEXfuqt3u -qu7u7mYRIpmZM6qqRIiZVWa7zHdm3ap3hPx+dwAAAAFiS0dEOdcAlUAAAAAHdElNRQfWBgwXJxrz -6+FgAAACRUlEQVQ4y62S7UPSQBzHEZhpWdkDPWFRJJVYw+1a3NjBzQGNIQELdSyCwFyIgISKPf/v -3W2wIHvZ993u89n3frubx/M/M+f1+RmW8fu8c//C8xdiGxwPXvLCqwVmcf4c9zJxAKEoiglJQijJ -XPyLX0oBgGVexJuKJKUzQMguzvCl10DlhFxGU1Cek3ic58HW5Sl+JSXKSIR8ARXeIMQpCV4EIHvV -5csMEMmKXCyQIE4mk5BHgVl2N8jRJaGIbAEBQAUIStfcAsq1eIbyQhngUk6GgHzT9XGFd4NwlSs4 -QTLOKLpOP/qt1xF8gohxpTwR7HkgD/B24oYj+MHmTlwq7zo78KKdooxL2k1HYMR42jCqVdKxW0YO -F0EC4krAEdgMwKZhSNUqInGF4judHTegWk7hBcmws+1wiIvv9XGDn6s3dsgaZxgfTLOptvbolFj9 -mBzP4Gua+xx9TTFNs163LIseAv7UPrg1PoeFtAWd4ma9sW9ZHYVw7bB22zs5ybQVd0brUtzp6RDj -Vv/ozuQylgbmZ5neAG5TPBzGMVaP23cnd0Eqmo0eBgCovR7Bw5OKqrZOkwH3Nsn/ZnZUCPdOhxSP -Rmeq9iXJ3AtOeHDlfuprEePu8NsJwaPvfU0rxR6EVoKuEHoYy8Pjw9HIxj/6pW7sUXhGCD9mu5Wf -vbNRv/9rkDzaYlcjU4KHCJEnT9nUoKbrevIgyz5bi1LB45mqCEfWVtcDLMsG1p+/iEZmuKtEonYI -ne6fKMQJEYskdJ7+sUhmVn4DYn6kFqJ4JssAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTAtMTlU -MDA6MTQ6MDktMDY6MDCO1Rn8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDA2LTA2LTEzVDA1OjM5OjI2 -LTA2OjAwewtT2wAAAABJRU5ErkJggg== + xlink:href="data:image/png;base64,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 +YII= " id="icon:32-4" x="520" @@ -2565,26 +2735,25 @@ MdodlQAAAABJRU5ErkJggg== height="16" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAACFlBMVEUAAABYdqBYdqBbeqRa -eqRZeKJYd6JaeqRYd6FeeqNZeaNaeqRWcZ1hf6ZaeaNphKlaeqRie6Nwiq1aeqRjgKhaeqRaeqRe -faZjf6hifKVhf6hRaZRZeaNLYYlpg6ZZd6AQEiFXb5Vadp9aeaNZeKJYdJ1XdZ+Dm7u7ydrc5O3m -6/TV3+uxwtZ+l7mxwNXg5evP2eK6v8S+y9q+1Ou+ytbZ4emjts6vv9Te4ufO0dPi7/7e7fvU5fa8 -yNTAxs7b3uDm6/CgtM2Bmrrw9Pjj5OXK1d/i8f/j8f/a6vrGz9jX2dv09PX7+/vV3+l5lLa1xdjg -4+TM3e/g7//h8P/a6/zHzdK+x9Cktcm1vsjk5uijuNDU3emqvtPM4/re7v/f7//O2+r9/f3+/v7i -5Obc3d+8zd9beqTb5O+syum81/LJ4fnV6PzS5fnIz9X5+fmutbzD0uPM2ee3ws3IztSzzOi10e6x -zuypvNH4+fnx8vPv7+/O0NG4yd2rvdPc4eXf4eOivdqcveCTttyEpsqLp8f19fXi4uKdpq6ds816 -lbfW3+nt7u+Dp86Ap9F1n8tslsXg4ODT09Olt8l1kbWcssvc4+n29va4v8Zxm8lrlsZij8FZiLzR -0dG8xMyUrMhdfaaasMvM1+JtkLdcir1WhrpPgLZWhbezwdCTq8d3kraftM63yNy+z+G0x9ybssx1 -kbRaeaT///97RkPcAAAAJ3RSTlMAZ833/vO9YTDoyi41/uzxx4Totv3q/P3lk/NQ7ln51gam7v77 -2WeTE3hRAAAAAWJLR0SxNGOeUgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9UKCAYiLJDE -QQMAAADrSURBVBjTY2AAAkYmZhZWNnYGKODgVNfQ1NLW0eXiBvN5ePX0DQyNjE1MzfjAIvzmFpZW -1ja2dvYOjgJAvqCTs4urm7uHp5e3j68f0Bwh/4DAoODgkNCw8IjIKGEGBpHomNi4+PiExKTE5JRU -UQaGtPSMzKzsnNykpKS8/AIxBgbxwqLiktKy8orKpKrqGqAKidq6pPqGxqbmlta29g6gGZKdXUlJ -3T29ff0TJk6aDHKt1JSp06bPmDlr9py580DuYJCev2DhosVLli5bvkIG4nZZuZWrVq9Zu269PDfU -dwqKSsobVFTVGLACAPRHQQF1AQg/AAAANXRFWHRDb21tZW50AChjKSAyMDA0IEpha3ViIFN0ZWlu -ZXIKCkNyZWF0ZWQgd2l0aCBUaGUgR0lNUJDZi28AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTAt -MTlUMDA6MTQ6MDktMDY6MDCO1Rn8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDA1LTEwLTA4VDEyOjM0 -OjQ0LTA2OjAwI8daAAAAAABJRU5ErkJggg== +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB+1BMVEUAAABYdqBaeqRYd6FW +cZ1RaZRLYYkQEiFXdZ9YdqBbeqRaeqRZeKJYd6JeeqODm7u7ydrc5O3m6/TV3+uxwtZ+l7lZeaNh +f6axwNXg5evP2eK6v8S+y9q+1Ou+ytbZ4emjts5aeaNphKmvv9Te4ufO0dPi7/7e7fvU5fa8yNTA +xs7b3uDm6/CgtM1ie6OBmrrw9Pjj5OXK1d/i8f/j8f/a6vrGz9jX2dv09PX7+/vV3+l5lLZwiq21 +xdjg4+TM3e/g7//h8P/a6/zHzdK+x9Cktcm1vsjk5uijuNBjgKjU3emqvtPM4/re7v/f7//O2+r9 +/f3+/v7i5Obc3d+8zd/b5O+syum81/LJ4fnV6PzS5fnIz9X5+fmutbzD0uNefabM2ee3ws3IztSz +zOi10e6xzuypvNH4+fnx8vPv7+/O0NG4yd1jf6irvdPc4eXf4eOivdqcveCTttyEpsqLp8f19fXi +4uKdpq6ds81ifKV6lbfW3+nt7u+Dp86Ap9F1n8tslsXg4ODT09Olt8l1kbVhf6icssvc4+n29va4 +v8Zxm8lrlsZij8FZiLzR0dG8xMyUrMhdfaaasMvM1+JtkLdcir1WhrpPgLZWhbezwdCTq8dpg6Z3 +kraftM63yNy+z+G0x9ybssx1kbRZd6BXb5Vadp9aeaRYdJ3///8MrB2GAAAACXRSTlMAAAAAAAAA +AABzZJuhAAAAAWJLR0SoUAg2kgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9UKCAYiLJDE +QQMAAADjSURBVBjTY2AAAkZOLm4eXiYGKGDm4xcQFBIWERWDCLGIS0hKScvIyskrKIJFlJRVVNXU +NTS1tHV0uYF8PX0DQyNjE1MzcwtLK2ugEhtbO3sHR0cnZxdXN3cPoBJPL28fXz8//4DAgKDgEKAA +V2hYeERkVHRgYGBMbBxQID4hMSk5JTUtPSMwMysbKJCTmxeYX1BYVFxSWlZeARSorKoODKypratv +aGxqbgE5pLWtvaOzq7unt69/AsgdDKwTJ02eMnXa9BkzZ0HdzjZ7ztx58xcsXLQY5j32JUsVl/Es +52DACgAVCzqJEii+ZQAAADV0RVh0Q29tbWVudAAoYykgMjAwNCBKYWt1YiBTdGVpbmVyCgpDcmVh +dGVkIHdpdGggVGhlIEdJTVCQ2YtvAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0 +OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0ZTptb2RpZnkAMjAwNS0xMC0wOFQxMjozNDo0NC0wNjow +MCPHWgAAAAAASUVORK5CYII= " id="icon:16-8" x="584" @@ -2594,19 +2763,25 @@ OjQ0LTA2OjAwI8daAAAAAABJRU5ErkJggg== height="16" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAqFBMVEUAAAARESJVd5lVd5lV -d6pVd6pVd6pVd5lmd6pVd6pVd6pmiKpmd6p3iKpmd6pmd6pVZplEZohVd5lVd5lVd5lVd6qImbu7 -zN3d3e7u7u6qu913mbtmd6rM3d27u8y7zO6qu8zMzMzd7v/M3e67zMzd3d2Zu8zu7v/MzN3////d -7u5miKrM3f+qzO673e6qu7uZu92IqsyZqqp3mcxmmcyZqsxmiLtViLtAZtkKAAAAFXRSTlMAAGbM -7rtmM+7MM+6I7t2ZVVXdqu79Lj6bAAAAAWJLR0QpyreFJAAAAAlwSFlzAAALEwAACxMBAJqcGAAA -AAd0SU1FB9UKCAYiLJDEQQMAAADFSURBVBjTbY/bVsJADEUjFgW8oOCQTIdO59IUIkWpMPD/f+ZU -eHS/7bOyThKAzOheqWL8ADceJyskTaWZzq6+LqmyWCO54i95cuRDiE3Dup1mf15tuAohbFkLmdzz -ghyzB984++nGALvouuxRRIixAFC0/+pCt82BfKMCWEfr63rvRIv2w8SrY+HycOh7zT9t7pgbEtF9 -fzyxd8MWmCTS9ng6X3yThjvgTaXqfMnYdL0U3nemRcRkFrPbd3fLD6XUYgT/8gsgyBahFA1FIAAA -ADV0RVh0Q29tbWVudAAoYykgMjAwNCBKYWt1YiBTdGVpbmVyCgpDcmVhdGVkIHdpdGggVGhlIEdJ -TVCQ2YtvAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0OjA5LTA2OjAwjtUZ/AAA -ACV0RVh0ZGF0ZTptb2RpZnkAMjAwNS0xMC0wOFQxMjozNDo0NC0wNjowMCPHWgAAAAAASUVORK5C -YII= +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB+1BMVEUAAABYdqBaeqRYd6FW +cZ1RaZRLYYkQEiFXdZ9YdqBbeqRaeqRZeKJYd6JeeqODm7u7ydrc5O3m6/TV3+uxwtZ+l7lZeaNh +f6axwNXg5evP2eK6v8S+y9q+1Ou+ytbZ4emjts5aeaNphKmvv9Te4ufO0dPi7/7e7fvU5fa8yNTA +xs7b3uDm6/CgtM1ie6OBmrrw9Pjj5OXK1d/i8f/j8f/a6vrGz9jX2dv09PX7+/vV3+l5lLZwiq21 +xdjg4+TM3e/g7//h8P/a6/zHzdK+x9Cktcm1vsjk5uijuNBjgKjU3emqvtPM4/re7v/f7//O2+r9 +/f3+/v7i5Obc3d+8zd/b5O+syum81/LJ4fnV6PzS5fnIz9X5+fmutbzD0uNefabM2ee3ws3IztSz +zOi10e6xzuypvNH4+fnx8vPv7+/O0NG4yd1jf6irvdPc4eXf4eOivdqcveCTttyEpsqLp8f19fXi +4uKdpq6ds81ifKV6lbfW3+nt7u+Dp86Ap9F1n8tslsXg4ODT09Olt8l1kbVhf6icssvc4+n29va4 +v8Zxm8lrlsZij8FZiLzR0dG8xMyUrMhdfaaasMvM1+JtkLdcir1WhrpPgLZWhbezwdCTq8dpg6Z3 +kraftM63yNy+z+G0x9ybssx1kbRZd6BXb5Vadp9aeaRYdJ3///8MrB2GAAAACXRSTlMAAAAAAAAA +AABzZJuhAAAAAWJLR0SoUAg2kgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9UKCAYiLJDE +QQMAAADjSURBVBjTY2AAAkZOLm4eXiYGKGDm4xcQFBIWERWDCLGIS0hKScvIyskrKIJFlJRVVNXU +NTS1tHV0uYF8PX0DQyNjE1MzcwtLK2ugEhtbO3sHR0cnZxdXN3cPoBJPL28fXz8//4DAgKDgEKAA +V2hYeERkVHRgYGBMbBxQID4hMSk5JTUtPSMwMysbKJCTmxeYX1BYVFxSWlZeARSorKoODKypratv +aGxqbgE5pLWtvaOzq7unt69/AsgdDKwTJ02eMnXa9BkzZ0HdzjZ7ztx58xcsXLQY5j32JUsVl/Es +52DACgAVCzqJEii+ZQAAADV0RVh0Q29tbWVudAAoYykgMjAwNCBKYWt1YiBTdGVpbmVyCgpDcmVh +dGVkIHdpdGggVGhlIEdJTVCQ2YtvAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0 +OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0ZTptb2RpZnkAMjAwNS0xMC0wOFQxMjozNDo0NC0wNjow +MCPHWgAAAAAASUVORK5CYII= " id="icon:16-4" x="608" -- 2.18.0

1 5

[PATCH] odbccp32: Implement SQLValidDSN/W
by Alistair Leslie-Hughes 21 Aug '18

21 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 25 ++++++++++++++----- dlls/odbccp32/tests/misc.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 6 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index c2342e6..5ef8336 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "winreg.h" #include "winnls.h" +#include "sqlext.h" #include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" @@ -1553,18 +1554,30 @@ BOOL WINAPI SQLSetConfigMode(UWORD wConfigMode) BOOL WINAPI SQLValidDSNW(LPCWSTR lpszDSN) { + static const WCHAR invalid[] = {'[',']','{','}','(',')',',',';','?','*','=','!','@','\\',0}; clear_errors(); - FIXME("%s\n", debugstr_w(lpszDSN)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%s\n", debugstr_w(lpszDSN)); + + if(strlenW(lpszDSN) > SQL_MAX_DSN_LENGTH || strpbrkW(lpszDSN, invalid) != NULL) + { + return FALSE; + } + + return TRUE; } BOOL WINAPI SQLValidDSN(LPCSTR lpszDSN) { + static const char *invalid = "[]{}(),;?*=!@\\"; clear_errors(); - FIXME("%s\n", debugstr_a(lpszDSN)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%s\n", debugstr_a(lpszDSN)); + + if(strlen(lpszDSN) > SQL_MAX_DSN_LENGTH || strpbrk(lpszDSN, invalid) != NULL) + { + return FALSE; + } + + return TRUE; } BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index be3873ac..dc65bdf 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -682,6 +682,65 @@ static void test_SQLGetInstalledDrivers(void) SQLRemoveDriver("Wine test", TRUE, NULL); } +static void test_SQLValidDSN(void) +{ + static const char *invalid = "[]{}(),;?*=!@\\"; + char str[10]; + int i; + BOOL ret; + + strcpy(str, "wine10"); + for(i = 0; i < strlen(invalid); i++) + { + str[4] = invalid[i]; + ret = SQLValidDSN(str); + ok(!ret, "got %d\n", ret); + } + + /* Too large */ + ret = SQLValidDSN("Wine123456789012345678901234567890"); + ok(!ret, "got %d\n", ret); + + /* Valid with a space */ + ret = SQLValidDSN("Wine Vinegar"); + ok(ret, "got %d\n", ret); + + /* Max DSN name value */ + ret = SQLValidDSN("12345678901234567890123456789012"); + ok(ret, "got %d\n", ret); +} + +static void test_SQLValidDSNW(void) +{ + static const WCHAR invalid[] = {'[',']','{','}','(',')',',',';','?','*','=','!','@','\\',0}; + static const WCHAR value[] = { 'w','i','n','e','1','0',0}; + static const WCHAR too_large[] = { 'W','i','n','e','1','2','3','4','5','6','7','8','9','0','1','2','3','4','5', + '6','7','8','9','0','1','2','3','4','5','6','7','8','9','0', 0}; + static const WCHAR with_space[] = { 'W','i','n','e',' ','V','i','n','e','g','a','r', 0}; + static const WCHAR max_dsn[] = { '1','2','3','4','5','6','7','8','9','0','1','2','3','4','5','6','7','8','9','0', + '1','2','3','4','5','6','7','8','9','0','1','2', 0}; + WCHAR str[10]; + int i; + BOOL ret; + + lstrcpyW(str, value); + for(i = 0; i < lstrlenW(invalid); i++) + { + str[4] = invalid[i]; + ret = SQLValidDSNW(str); + ok(!ret, "got %d\n", ret); + } + + ret = SQLValidDSNW(too_large); + ok(!ret, "got %d\n", ret); + + ret = SQLValidDSNW(with_space); + ok(ret, "got %d\n", ret); + + ret = SQLValidDSNW(max_dsn); + ok(ret, "got %d\n", ret); +} + START_TEST(misc) { test_SQLConfigMode(); @@ -693,4 +752,6 @@ START_TEST(misc) test_SQLInstallDriverEx(); test_SQLInstallTranslatorEx(); test_SQLGetInstalledDrivers(); + test_SQLValidDSN(); + test_SQLValidDSNW(); } -- 1.9.1

1 0

[PATCH v3] regedit: Dont expand items on initial tree creation.
by Alistair Leslie-Hughes 20 Aug '18

20 Aug '18

The Message TVM_EXPAND is captured in treeview_notify, then passes g_pChildWnd->hTreeWnd on to OnTreeExpanding which hasn't been initialized yet. The function get_last_key is already called after the hTreeWnd has been assigned to select the previous selected item (if it exists). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- programs/regedit/childwnd.c | 15 ++++++++++----- programs/regedit/treeview.c | 3 --- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index d8431f1..aa690f9 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -240,16 +240,21 @@ static void get_last_key(HWND hwndTV) if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_READ, NULL, &hkey, NULL) == ERROR_SUCCESS) { + HTREEITEM selection = NULL; if (RegQueryValueExW(hkey, wszLastKey, NULL, NULL, (LPBYTE)wszVal, &dwSize) == ERROR_SUCCESS) { - HTREEITEM selection; - if (!strcmpW(wszVal, g_pChildWnd->szPath)) - selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); - else + if (strcmpW(wszVal, g_pChildWnd->szPath)) selection = FindPathInTree(hwndTV, wszVal); - SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)selection); } + if(!selection) + { + selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); + SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)selection ); + } + else + SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)selection); + RegCloseKey(hkey); } } diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index d5a6767..15a5136 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -572,9 +572,6 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName) if (!AddEntryToTree(hwndTV, hRoot, hkcc, HKEY_CURRENT_CONFIG, 1)) return FALSE; if (!AddEntryToTree(hwndTV, hRoot, hkdd, HKEY_DYN_DATA, 1)) return FALSE; - /* expand and select host name */ - SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot ); - SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); return TRUE; } -- 1.9.1

1 0

[PATCH] dmusic: Fake success in two stub midi port methods
by Michael Stefaniuc 20 Aug '18

20 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- This lets MidiStation start. dlls/dmusic/port.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 9a18c8844d..1fa94694a9 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -977,7 +977,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_SetReadNotificationHandle(IDirectMus { FIXME("(%p, %p) stub!\n", iface, event); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI midi_IDirectMusicPort_Read(IDirectMusicPort *iface, @@ -1164,7 +1164,7 @@ static HRESULT WINAPI midi_IDirectMusicThru_ThruChannel(IDirectMusicThru *iface, FIXME("(%p, %u, %u, %u, %u, %p) stub!\n", iface, src_group, src_channel, dest_group, dest_channel, dest_port); - return E_NOTIMPL; + return S_OK; } static const IDirectMusicThruVtbl midi_thru_vtbl = { -- 2.14.4

1 0

Wine staging 3.14 release
by Alistair Leslie-Hughes 20 Aug '18

20 Aug '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.14 (880 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Updated patchsets * Corrected regression with sound not playing in Star Craft 2 * Updated ntdll-futex-condition-var Added * [41573] Stop a crash in Battle.Net. * [45524] Speed Improvements in Tital Fall 2. * [45568] dinput8 to share code with dinput. * [45327] Improvements to support for League of Legends. * [45550] Correct NtQuerySystemInformation implementation. * [45570] Refactor LdrInitializeThunk. * [45571] Allow hooking of NtCreateThreadEx. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: League of Legends, Titan Fall 2 * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/6] include: Fix definition of RAWHID.
by Zebediah Figura 20 Aug '18

20 Aug '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/winuser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index 8489d05..d09f8cd 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -486,7 +486,7 @@ typedef struct tagRAWINPUTDEVICELIST typedef struct tagRAWHID { DWORD dwSizeHid; DWORD dwCount; - BYTE bRawData; + BYTE bRawData[1]; } RAWHID, *LPRAWHID; typedef struct tagRAWKEYBOARD { -- 2.7.4

1 5

[PATCH] cmd: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 20 Aug '18

20 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 150 ++++++++++++++++++++--------------------------- programs/cmd/directory.c | 12 ++-- programs/cmd/wcmdmain.c | 66 ++++++++++----------- 4 files changed, 102 insertions(+), 128 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 1a78b55557..14e2539bf7 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -599,7 +599,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) if (memchrW(firstModifier, 's', modifierLen) != NULL) { if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); /* Don't flag as doneModifier - %~s on its own is processed later */ - GetShortPathNameW(outputparam, outputparam, sizeof(outputparam)/sizeof(outputparam[0])); + GetShortPathNameW(outputparam, outputparam, ARRAY_SIZE(outputparam)); } /* 5. Handle 'f' : Fully qualified path (File doesn't have to exist) */ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 088632f214..1da61556d9 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -191,12 +191,12 @@ static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText, /* Load the translated valid answers */ if (showSureText) - LoadStringW(hinst, WCMD_CONFIRM, confirm, sizeof(confirm)/sizeof(WCHAR)); + LoadStringW(hinst, WCMD_CONFIRM, confirm, ARRAY_SIZE(confirm)); msgid = optionAll ? WCMD_YESNOALL : WCMD_YESNO; - LoadStringW(hinst, msgid, options, sizeof(options)/sizeof(WCHAR)); - LoadStringW(hinst, WCMD_YES, Ybuffer, sizeof(Ybuffer)/sizeof(WCHAR)); - LoadStringW(hinst, WCMD_NO, Nbuffer, sizeof(Nbuffer)/sizeof(WCHAR)); - LoadStringW(hinst, WCMD_ALL, Abuffer, sizeof(Abuffer)/sizeof(WCHAR)); + LoadStringW(hinst, msgid, options, ARRAY_SIZE(options)); + LoadStringW(hinst, WCMD_YES, Ybuffer, ARRAY_SIZE(Ybuffer)); + LoadStringW(hinst, WCMD_NO, Nbuffer, ARRAY_SIZE(Nbuffer)); + LoadStringW(hinst, WCMD_ALL, Abuffer, ARRAY_SIZE(Abuffer)); /* Loop waiting on a valid answer */ if (optionAll) @@ -207,7 +207,7 @@ static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText, if (showSureText) WCMD_output_asis (confirm); WCMD_output_asis (options); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer)/sizeof(WCHAR), &count); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, ARRAY_SIZE(answer), &count); answer[0] = toupperW(answer[0]); if (answer[0] == Ybuffer[0]) return TRUE; @@ -370,8 +370,8 @@ void WCMD_choice (const WCHAR * args) { /* use default keys, when needed: localized versions of "Y"es and "No" */ if (!opt_c) { - LoadStringW(hinst, WCMD_YES, buffer, sizeof(buffer)/sizeof(WCHAR)); - LoadStringW(hinst, WCMD_NO, buffer + 1, sizeof(buffer)/sizeof(WCHAR) - 1); + LoadStringW(hinst, WCMD_YES, buffer, ARRAY_SIZE(buffer)); + LoadStringW(hinst, WCMD_NO, buffer + 1, ARRAY_SIZE(buffer) - 1); opt_c = buffer; buffer[2] = 0; } @@ -793,8 +793,8 @@ void WCMD_copy(WCHAR * args) { /* If COPYCMD is set, then we force the overwrite with /Y and ask for * confirmation with /-Y. If COPYCMD is neither of those, then we use the * default behavior. */ - len = GetEnvironmentVariableW(copyCmdW, copycmd, sizeof(copycmd)/sizeof(WCHAR)); - if (len && len < (sizeof(copycmd)/sizeof(WCHAR))) { + len = GetEnvironmentVariableW(copyCmdW, copycmd, ARRAY_SIZE(copycmd)); + if (len && len < ARRAY_SIZE(copycmd)) { if (!lstrcmpiW (copycmd, parmY)) prompt = FALSE; else if (!lstrcmpiW (copycmd, parmNoY)) @@ -825,7 +825,7 @@ void WCMD_copy(WCHAR * args) { WINE_TRACE("Destination supplied, processing to see if file or directory\n"); /* Convert to fully qualified path/filename */ - GetFullPathNameW(destination->name, sizeof(destname)/sizeof(WCHAR), destname, &filenamepart); + GetFullPathNameW(destination->name, ARRAY_SIZE(destname), destname, &filenamepart); WINE_TRACE("Full dest name is '%s'\n", wine_dbgstr_w(destname)); /* If parameter is a directory, ensure it ends in \ */ @@ -907,7 +907,7 @@ void WCMD_copy(WCHAR * args) { /* Convert to fully qualified path/filename in srcpath, file filenamepart pointing to where the filename portion begins (used for wildcard expansion). */ - GetFullPathNameW(thiscopy->name, sizeof(srcpath)/sizeof(WCHAR), srcpath, &filenamepart); + GetFullPathNameW(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart); WINE_TRACE("Full src name is '%s'\n", wine_dbgstr_w(srcpath)); /* If parameter is a directory, ensure it ends in \* */ @@ -917,7 +917,7 @@ void WCMD_copy(WCHAR * args) { /* We need to know where the filename part starts, so append * and recalculate the full resulting path */ strcatW(thiscopy->name, starW); - GetFullPathNameW(thiscopy->name, sizeof(srcpath)/sizeof(WCHAR), srcpath, &filenamepart); + GetFullPathNameW(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart); WINE_TRACE("Directory, so full name is now '%s'\n", wine_dbgstr_w(srcpath)); } else if ((strpbrkW(srcpath, wildcardsW) == NULL) && @@ -927,7 +927,7 @@ void WCMD_copy(WCHAR * args) { /* We need to know where the filename part starts, so append \* and recalculate the full resulting path */ strcatW(thiscopy->name, slashstarW); - GetFullPathNameW(thiscopy->name, sizeof(srcpath)/sizeof(WCHAR), srcpath, &filenamepart); + GetFullPathNameW(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart); WINE_TRACE("Directory, so full name is now '%s'\n", wine_dbgstr_w(srcpath)); } @@ -1216,7 +1216,7 @@ static BOOL WCMD_delete_confirm_wildcard(const WCHAR *filename, BOOL *pPrompted) WCHAR fpath[MAX_PATH]; /* Convert path into actual directory spec */ - GetFullPathNameW(filename, sizeof(fpath)/sizeof(WCHAR), fpath, NULL); + GetFullPathNameW(filename, ARRAY_SIZE(fpath), fpath, NULL); WCMD_splitpath(fpath, drive, dir, fname, ext); /* Only prompt for * and *.*, not *a, a*, *.a* etc */ @@ -1351,7 +1351,7 @@ static BOOL WCMD_delete_one (const WCHAR *thisArg) { WCHAR ext[MAX_PATH]; /* Convert path into actual directory spec */ - GetFullPathNameW(argCopy, sizeof(thisDir)/sizeof(WCHAR), thisDir, NULL); + GetFullPathNameW(argCopy, ARRAY_SIZE(thisDir), thisDir, NULL); WCMD_splitpath(thisDir, drive, dir, fname, ext); strcpyW(thisDir, drive); @@ -1598,16 +1598,13 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, /* End of the command - does 'ELSE ' follow as the next command? */ } else { - if (isIF - && WCMD_keyword_ws_found(ifElse, sizeof(ifElse)/sizeof(ifElse[0]), - (*cmdList)->command)) { - + if (isIF && WCMD_keyword_ws_found(ifElse, ARRAY_SIZE(ifElse), (*cmdList)->command)) { /* Swap between if and else processing */ processThese = !executecmds; /* Process the ELSE part */ if (processThese) { - const int keyw_len = sizeof(ifElse)/sizeof(ifElse[0]) + 1; + const int keyw_len = ARRAY_SIZE(ifElse) + 1; WCHAR *cmd = ((*cmdList)->command) + keyw_len; /* Skip leading whitespace between condition and the command */ @@ -1692,39 +1689,35 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, /* Save End of line character (Ignore line if first token (based on delims) starts with it) */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, sizeof(eolW)/sizeof(WCHAR), - eolW, sizeof(eolW)/sizeof(WCHAR)) == CSTR_EQUAL) { - *eol = *(pos + sizeof(eolW)/sizeof(WCHAR)); - pos = pos + sizeof(eolW)/sizeof(WCHAR) + 1; + pos, ARRAY_SIZE(eolW), eolW, ARRAY_SIZE(eolW)) == CSTR_EQUAL) { + *eol = *(pos + ARRAY_SIZE(eolW)); + pos = pos + ARRAY_SIZE(eolW) + 1; WINE_TRACE("Found eol as %c(%x)\n", *eol, *eol); /* Save number of lines to skip (Can be in base 10, hex (0x...) or octal (0xx) */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, sizeof(skipW)/sizeof(WCHAR), - skipW, sizeof(skipW)/sizeof(WCHAR)) == CSTR_EQUAL) { + pos, ARRAY_SIZE(skipW), skipW, ARRAY_SIZE(skipW)) == CSTR_EQUAL) { WCHAR *nextchar = NULL; - pos = pos + sizeof(skipW)/sizeof(WCHAR); + pos = pos + ARRAY_SIZE(skipW); *skip = strtoulW(pos, &nextchar, 0); WINE_TRACE("Found skip as %d lines\n", *skip); pos = nextchar; /* Save if usebackq semantics are in effect */ - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, sizeof(usebackqW)/sizeof(WCHAR), - usebackqW, sizeof(usebackqW)/sizeof(WCHAR)) == CSTR_EQUAL) { + } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, pos, + ARRAY_SIZE(usebackqW), usebackqW, ARRAY_SIZE(usebackqW)) == CSTR_EQUAL) { *usebackq = TRUE; - pos = pos + sizeof(usebackqW)/sizeof(WCHAR); + pos = pos + ARRAY_SIZE(usebackqW); WINE_TRACE("Found usebackq\n"); /* Save the supplied delims. Slightly odd as space can be a delimiter but only if you finish the optionsroot string with delims= otherwise the space is just a token delimiter! */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, sizeof(delimsW)/sizeof(WCHAR), - delimsW, sizeof(delimsW)/sizeof(WCHAR)) == CSTR_EQUAL) { + pos, ARRAY_SIZE(delimsW), delimsW, ARRAY_SIZE(delimsW)) == CSTR_EQUAL) { int i=0; - pos = pos + sizeof(delimsW)/sizeof(WCHAR); + pos = pos + ARRAY_SIZE(delimsW); while (*pos && *pos != ' ') { delims[i++] = *pos; pos++; @@ -1735,11 +1728,10 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, /* Save the tokens being requested */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, sizeof(tokensW)/sizeof(WCHAR), - tokensW, sizeof(tokensW)/sizeof(WCHAR)) == CSTR_EQUAL) { + pos, ARRAY_SIZE(tokensW), tokensW, ARRAY_SIZE(tokensW)) == CSTR_EQUAL) { int i=0; - pos = pos + sizeof(tokensW)/sizeof(WCHAR); + pos = pos + ARRAY_SIZE(tokensW); while (*pos && *pos != ' ') { tokens[i++] = *pos; pos++; @@ -2086,7 +2078,7 @@ static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd if (iscmd) { /* Get temp filename */ - GetTempPathW(sizeof(temp_str)/sizeof(WCHAR), temp_str); + GetTempPathW(ARRAY_SIZE(temp_str), temp_str); GetTempFileNameW(temp_str, cmdW, 0, temp_file); /* Redirect output to the temporary file */ @@ -2170,7 +2162,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* When recursing directories, use current directory as the starting point unless subsequently overridden */ doRecurse = (toupperW(*thisArg) == 'R'); - if (doRecurse) GetCurrentDirectoryW(sizeof(optionsRoot)/sizeof(WCHAR), optionsRoot); + if (doRecurse) GetCurrentDirectoryW(ARRAY_SIZE(optionsRoot), optionsRoot); doFileset = (toupperW(*thisArg) == 'F'); @@ -2227,8 +2219,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { thisArg = WCMD_parameter(p, parameterNo++, NULL, FALSE, FALSE); if (!thisArg || !(CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - thisArg, sizeof(inW)/sizeof(inW[0]), inW, - sizeof(inW)/sizeof(inW[0])) == CSTR_EQUAL)) { + thisArg, ARRAY_SIZE(inW), inW, ARRAY_SIZE(inW)) == CSTR_EQUAL)) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } @@ -2253,9 +2244,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Syntax error if missing close bracket, or nothing following it and once we have the complete set, we expect a DO */ WINE_TRACE("Looking for 'do ' in %p\n", *cmdList); - if ((*cmdList == NULL) - || !WCMD_keyword_ws_found(doW, sizeof(doW)/sizeof(doW[0]), (*cmdList)->command)) { - + if ((*cmdList == NULL) || !WCMD_keyword_ws_found(doW, ARRAY_SIZE(doW), (*cmdList)->command)) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } @@ -2418,7 +2407,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } else { /* Read line by line until end of file */ - while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input)) { + while (WCMD_fgets(buffer, ARRAY_SIZE(buffer), input)) { WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable[1], buffer, &doExecuted, &forf_skip, forf_eol, forf_delims, forf_tokens); buffer[0] = 0; @@ -2549,7 +2538,7 @@ void WCMD_give_help (const WCHAR *args) } } /* Launch the command with the /? option for external commands shipped with cmd.exe */ - for (i = 0; i <= (sizeof(externals)/sizeof(externals[0])); i++) { + for (i = 0; i <= ARRAY_SIZE(externals); i++) { if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, args, -1, externals[i], -1) == CSTR_EQUAL) { WCHAR cmd[128]; @@ -2622,7 +2611,7 @@ void WCMD_goto (CMD_LIST **cmdList) { if (loop==1) SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); } - while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { + while (WCMD_fgets (string, ARRAY_SIZE(string), context -> h)) { str = string; /* Ignore leading whitespace or no-echo character */ @@ -2947,8 +2936,8 @@ void WCMD_move (void) /* If 2nd parm is directory, then use original filename */ /* Convert partial path to full path */ - GetFullPathNameW(param1, sizeof(input)/sizeof(WCHAR), input, NULL); - GetFullPathNameW(param2, sizeof(output)/sizeof(WCHAR), output, NULL); + GetFullPathNameW(param1, ARRAY_SIZE(input), input, NULL); + GetFullPathNameW(param2, ARRAY_SIZE(output), output, NULL); WINE_TRACE("Move from '%s'('%s') to '%s'\n", wine_dbgstr_w(input), wine_dbgstr_w(param1), wine_dbgstr_w(output)); @@ -3000,9 +2989,8 @@ void WCMD_move (void) force = TRUE; else { static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; - len = GetEnvironmentVariableW(copyCmdW, copycmd, sizeof(copycmd)/sizeof(WCHAR)); - force = (len && len < (sizeof(copycmd)/sizeof(WCHAR)) - && ! lstrcmpiW (copycmd, parmY)); + len = GetEnvironmentVariableW(copyCmdW, copycmd, ARRAY_SIZE(copycmd)); + force = (len && len < ARRAY_SIZE(copycmd) && !lstrcmpiW(copycmd, parmY)); } /* Prompt if overwriting */ @@ -3169,7 +3157,7 @@ void WCMD_rename (void) } /* Convert partial path to full path */ - GetFullPathNameW(param1, sizeof(input)/sizeof(WCHAR), input, NULL); + GetFullPathNameW(param1, ARRAY_SIZE(input), input, NULL); WINE_TRACE("Rename from '%s'('%s') to '%s'\n", wine_dbgstr_w(input), wine_dbgstr_w(param1), wine_dbgstr_w(param2)); dotDst = strchrW(param2, '.'); @@ -3427,7 +3415,7 @@ void WCMD_setshow_default (const WCHAR *args) { args++; } - GetCurrentDirectoryW(sizeof(cwd)/sizeof(WCHAR), cwd); + GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); if (strlenW(args) == 0) { strcatW (cwd, newlineW); WCMD_output_asis (cwd); @@ -3458,7 +3446,7 @@ void WCMD_setshow_default (const WCHAR *args) { static const WCHAR fmt[] = {'%','s','%','s','%','s','\0'}; /* Convert path into actual directory spec */ - GetFullPathNameW(string, sizeof(fpath)/sizeof(WCHAR), fpath, NULL); + GetFullPathNameW(string, ARRAY_SIZE(fpath), fpath, NULL); WCMD_splitpath(fpath, drive, dir, fname, ext); /* Rebuild path */ @@ -3480,7 +3468,7 @@ void WCMD_setshow_default (const WCHAR *args) { } else { /* Save away the actual new directory, to store as current location */ - GetCurrentDirectoryW (sizeof(string)/sizeof(WCHAR), string); + GetCurrentDirectoryW(ARRAY_SIZE(string), string); /* Restore old directory if drive letter would change, and CD x:\directory /D (or pushd c:\directory) not supplied */ @@ -3521,12 +3509,11 @@ void WCMD_setshow_date (void) { static const WCHAR parmT[] = {'/','T','\0'}; if (strlenW(param1) == 0) { - if (GetDateFormatW(LOCALE_USER_DEFAULT, 0, NULL, NULL, - curdate, sizeof(curdate)/sizeof(WCHAR))) { + if (GetDateFormatW(LOCALE_USER_DEFAULT, 0, NULL, NULL, curdate, ARRAY_SIZE(curdate))) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTDATE), curdate); if (strstrW (quals, parmT) == NULL) { WCMD_output (WCMD_LoadMessage(WCMD_NEWDATE)); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, ARRAY_SIZE(buffer), &count); if (count > 2) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } @@ -4166,7 +4153,7 @@ void WCMD_setshow_env (WCHAR *s) { if (strlenW(p) != 0) WCMD_output_asis(p); /* Read the reply */ - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); if (count > 1) { string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ @@ -4263,7 +4250,7 @@ void WCMD_setshow_path (const WCHAR *args) { static const WCHAR pathEqW[] = {'P','A','T','H','=','\0'}; if (strlenW(param1) == 0 && strlenW(param2) == 0) { - status = GetEnvironmentVariableW(pathW, string, sizeof(string)/sizeof(WCHAR)); + status = GetEnvironmentVariableW(pathW, string, ARRAY_SIZE(string)); if (status != 0) { WCMD_output_asis ( pathEqW); WCMD_output_asis ( string); @@ -4320,12 +4307,11 @@ void WCMD_setshow_time (void) { if (strlenW(param1) == 0) { GetLocalTime(&st); - if (GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, - curtime, sizeof(curtime)/sizeof(WCHAR))) { + if (GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, curtime, ARRAY_SIZE(curtime))) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTTIME), curtime); if (strstrW (quals, parmT) == NULL) { WCMD_output (WCMD_LoadMessage(WCMD_NEWTIME)); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, ARRAY_SIZE(buffer), &count); if (count > 2) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } @@ -4547,7 +4533,7 @@ void WCMD_type (WCHAR *args) { static const WCHAR fmt[] = {'\n','%','1','\n','\n','\0'}; WCMD_output(fmt, thisArg); } - while (WCMD_ReadFile(h, buffer, sizeof(buffer)/sizeof(WCHAR) - 1, &count)) { + while (WCMD_ReadFile(h, buffer, ARRAY_SIZE(buffer) - 1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; WCMD_output_asis (buffer); @@ -4580,8 +4566,7 @@ void WCMD_more (WCHAR *args) { /* Prefix the NLS more with '-- ', then load the text */ errorlevel = 0; strcpyW(moreStr, moreStart); - LoadStringW(hinst, WCMD_MORESTR, &moreStr[3], - (sizeof(moreStr)/sizeof(WCHAR))-3); + LoadStringW(hinst, WCMD_MORESTR, &moreStr[3], ARRAY_SIZE(moreStr)-3); if (param1[0] == 0x00) { @@ -4601,7 +4586,7 @@ void WCMD_more (WCHAR *args) { wsprintfW(moreStrPage, moreFmt, moreStr); WCMD_enter_paged_mode(moreStrPage); - while (WCMD_ReadFile(hstdin, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count)) { + while (WCMD_ReadFile(hstdin, buffer, ARRAY_SIZE(buffer)-1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; WCMD_output_asis (buffer); @@ -4632,7 +4617,7 @@ void WCMD_more (WCHAR *args) { wsprintfW(moreStrPage, moreFmt2, moreStr, 100); WCMD_leave_paged_mode(); WCMD_output_asis(moreStrPage); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, ARRAY_SIZE(buffer), &count); WCMD_enter_paged_mode(moreStrPage); } @@ -4654,7 +4639,7 @@ void WCMD_more (WCHAR *args) { fileLen = (((ULONG64)fileInfo.nFileSizeHigh) << 32) + fileInfo.nFileSizeLow; needsPause = TRUE; - while (WCMD_ReadFile(h, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count)) { + while (WCMD_ReadFile(h, buffer, ARRAY_SIZE(buffer)-1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; curPos += count; @@ -4728,13 +4713,12 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) BOOL status; if (strlenW(path) == 0) { - status = GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); + status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); if (!status) { WCMD_print_error (); return 0; } - status = GetVolumeInformationW(NULL, label, sizeof(label)/sizeof(WCHAR), - &serial, NULL, NULL, NULL, 0); + status = GetVolumeInformationW(NULL, label, ARRAY_SIZE(label), &serial, NULL, NULL, NULL, 0); } else { static const WCHAR fmt[] = {'%','s','\\','\0'}; @@ -4743,9 +4727,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) return 0; } wsprintfW (curdir, fmt, path); - status = GetVolumeInformationW(curdir, label, sizeof(label)/sizeof(WCHAR), - &serial, NULL, - NULL, NULL, 0); + status = GetVolumeInformationW(curdir, label, ARRAY_SIZE(label), &serial, NULL, NULL, NULL, 0); } if (!status) { WCMD_print_error (); @@ -4763,7 +4745,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) HIWORD(serial), LOWORD(serial)); if (set_label) { WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEPROMPT)); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); if (count > 1) { string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ @@ -4856,7 +4838,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { if (RegOpenKeyExW(key, subkey, 0, accessOptions, &readKey) == ERROR_SUCCESS) { - valueLen = sizeof(keyValue)/sizeof(WCHAR); + valueLen = ARRAY_SIZE(keyValue); rc = RegQueryValueExW(readKey, NULL, NULL, NULL, (LPBYTE)keyValue, &valueLen); WCMD_output_asis(keyName); WCMD_output_asis(equalW); @@ -4902,9 +4884,9 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { /* Load the translated 'File association not found' */ if (assoc) { - LoadStringW(hinst, WCMD_NOASSOC, msgbuffer, sizeof(msgbuffer)/sizeof(WCHAR)); + LoadStringW(hinst, WCMD_NOASSOC, msgbuffer, ARRAY_SIZE(msgbuffer)); } else { - LoadStringW(hinst, WCMD_NOFTYPE, msgbuffer, sizeof(msgbuffer)/sizeof(WCHAR)); + LoadStringW(hinst, WCMD_NOFTYPE, msgbuffer, ARRAY_SIZE(msgbuffer)); } WCMD_output_stderr(msgbuffer, keyValue); errorlevel = 2; @@ -4939,11 +4921,9 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { /* Load the translated 'File association not found' */ if (assoc) { - LoadStringW(hinst, WCMD_NOASSOC, msgbuffer, - sizeof(msgbuffer)/sizeof(WCHAR)); + LoadStringW(hinst, WCMD_NOASSOC, msgbuffer, ARRAY_SIZE(msgbuffer)); } else { - LoadStringW(hinst, WCMD_NOFTYPE, msgbuffer, - sizeof(msgbuffer)/sizeof(WCHAR)); + LoadStringW(hinst, WCMD_NOFTYPE, msgbuffer, ARRAY_SIZE(msgbuffer)); } WCMD_output_stderr(msgbuffer, args); errorlevel = 2; diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 91142be670..70507892ea 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -370,7 +370,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if (usernames) { strcpyW (string, inputparms->dirName); strcatW (string, fd[i].cFileName); - WCMD_getfileowner(string, username, sizeof(username)/sizeof(WCHAR)); + WCMD_getfileowner(string, username, ARRAY_SIZE(username)); } if (dirTime == Written) { @@ -381,10 +381,8 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le FileTimeToLocalFileTime (&fd[i].ftCreationTime, &ft); } FileTimeToSystemTime (&ft, &st); - GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, - sizeof(datestring)/sizeof(WCHAR)); - GetTimeFormatW(0, TIME_NOSECONDS, &st, - NULL, timestring, sizeof(timestring)/sizeof(WCHAR)); + GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, ARRAY_SIZE(datestring)); + GetTimeFormatW(0, TIME_NOSECONDS, &st, NULL, timestring, ARRAY_SIZE(timestring)); if (wide) { @@ -612,7 +610,7 @@ void WCMD_directory (WCHAR *args) errorlevel = 0; /* Prefill quals with (uppercased) DIRCMD env var */ - if (GetEnvironmentVariableW(dircmdW, string, sizeof(string)/sizeof(WCHAR))) { + if (GetEnvironmentVariableW(dircmdW, string, ARRAY_SIZE(string))) { p = string; while ( (*p = toupper(*p)) ) ++p; strcatW(string,quals); @@ -823,7 +821,7 @@ void WCMD_directory (WCHAR *args) } WINE_TRACE("Using location '%s'\n", wine_dbgstr_w(fullname)); - status = GetFullPathNameW(fullname, sizeof(path)/sizeof(WCHAR), path, NULL); + status = GetFullPathNameW(fullname, ARRAY_SIZE(path), path, NULL); /* * If the path supplied does not include a wildcard, and the endpoint of the diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5135be4751..b269635c75 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -272,7 +272,7 @@ static void WCMD_output_asis_handle (DWORD std_handle, const WCHAR *message) { if (++line_count >= max_height - 1) { line_count = 0; WCMD_output_asis_len(pagedMessage, strlenW(pagedMessage), handle); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); } } while (((message = ptr) != NULL) && (*ptr)); } else { @@ -343,9 +343,8 @@ static void WCMD_show_prompt (void) { DWORD len; static const WCHAR envPrompt[] = {'P','R','O','M','P','T','\0'}; - len = GetEnvironmentVariableW(envPrompt, prompt_string, - sizeof(prompt_string)/sizeof(WCHAR)); - if ((len == 0) || (len >= (sizeof(prompt_string)/sizeof(WCHAR)))) { + len = GetEnvironmentVariableW(envPrompt, prompt_string, ARRAY_SIZE(prompt_string)); + if ((len == 0) || (len >= ARRAY_SIZE(prompt_string))) { static const WCHAR dfltPrompt[] = {'$','P','$','G','\0'}; strcpyW (prompt_string, dfltPrompt); } @@ -394,13 +393,13 @@ static void WCMD_show_prompt (void) { *q++ = '<'; break; case 'N': - status = GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); + status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); if (status) { *q++ = curdir[0]; } break; case 'P': - status = GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); + status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); if (status) { strcatW (q, curdir); while (*q) q++; @@ -641,8 +640,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR startchar) len = strlenW(thisVarContents); } else { - len = ExpandEnvironmentStringsW(thisVar, thisVarContents, - sizeof(thisVarContents)/sizeof(WCHAR)); + len = ExpandEnvironmentStringsW(thisVar, thisVarContents, ARRAY_SIZE(thisVarContents)); } if (len == 0) @@ -1060,8 +1058,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) if (strpbrkW (firstParam, delims) == NULL) { /* No explicit path given, search path */ static const WCHAR curDir[] = {'.',';','\0'}; strcpyW(pathtosearch, curDir); - len = GetEnvironmentVariableW(envPath, &pathtosearch[2], (sizeof(pathtosearch)/sizeof(WCHAR))-2); - if ((len == 0) || (len >= (sizeof(pathtosearch)/sizeof(WCHAR)) - 2)) { + len = GetEnvironmentVariableW(envPath, &pathtosearch[2], ARRAY_SIZE(pathtosearch)-2); + if ((len == 0) || (len >= ARRAY_SIZE(pathtosearch) - 2)) { static const WCHAR curDir[] = {'.','\0'}; strcpyW (pathtosearch, curDir); } @@ -1077,7 +1075,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) } else { /* Convert eg. ..\fred to include a directory by removing file part */ - GetFullPathNameW(firstParam, sizeof(pathtosearch)/sizeof(WCHAR), pathtosearch, NULL); + GetFullPathNameW(firstParam, ARRAY_SIZE(pathtosearch), pathtosearch, NULL); lastSlash = strrchrW(pathtosearch, '\\'); if (lastSlash && strchrW(lastSlash, '.') != NULL) extensionsupplied = TRUE; strcpyW(stemofsearch, lastSlash+1); @@ -1088,8 +1086,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) } /* Now extract PATHEXT */ - len = GetEnvironmentVariableW(envPathExt, pathext, sizeof(pathext)/sizeof(WCHAR)); - if ((len == 0) || (len >= (sizeof(pathext)/sizeof(WCHAR)))) { + len = GetEnvironmentVariableW(envPathExt, pathext, ARRAY_SIZE(pathext)); + if ((len == 0) || (len >= ARRAY_SIZE(pathext))) { strcpyW (pathext, dfltPathExt); } @@ -1315,7 +1313,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, piped = TRUE; /* Generate a unique temporary filename */ - GetTempPathW(sizeof(temp_path)/sizeof(WCHAR), temp_path); + GetTempPathW(ARRAY_SIZE(temp_path), temp_path); GetTempFileNameW(temp_path, cmdW, 0, (*cmdList)->nextcommand->pipeFile); WINE_TRACE("Using temporary file of %s\n", wine_dbgstr_w((*cmdList)->nextcommand->pipeFile)); @@ -1662,7 +1660,7 @@ WCHAR *WCMD_LoadMessage(UINT id) { static WCHAR msg[2048]; static const WCHAR failedMsg[] = {'F','a','i','l','e','d','!','\0'}; - if (!LoadStringW(GetModuleHandleW(NULL), id, msg, sizeof(msg)/sizeof(WCHAR))) { + if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); strcpyW(msg, failedMsg); } @@ -1879,7 +1877,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE static const WCHAR echoDot[] = {'e','c','h','o','.'}; static const WCHAR echoCol[] = {'e','c','h','o',':'}; static const WCHAR echoSlash[] = {'e','c','h','o','/'}; - const DWORD len = sizeof(echoDot)/sizeof(echoDot[0]); + const DWORD len = ARRAY_SIZE(echoDot); DWORD curr_size = strlenW(curPos); DWORD min_len = (curr_size < len ? curr_size : len); WCMD_show_prompt(); @@ -1929,11 +1927,10 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE static const WCHAR forDO[] = {'d','o'}; /* If command starts with 'rem ' or identifies a label, ignore any &&, ( etc. */ - if (WCMD_keyword_ws_found(remCmd, sizeof(remCmd)/sizeof(remCmd[0]), curPos) || - *curPos == ':') { + if (WCMD_keyword_ws_found(remCmd, ARRAY_SIZE(remCmd), curPos) || *curPos == ':') { inOneLine = TRUE; - } else if (WCMD_keyword_ws_found(forCmd, sizeof(forCmd)/sizeof(forCmd[0]), curPos)) { + } else if (WCMD_keyword_ws_found(forCmd, ARRAY_SIZE(forCmd), curPos)) { inFor = TRUE; /* If command starts with 'if ' or 'else ', handle ('s mid line. We should ensure this @@ -1942,11 +1939,11 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE FIXME: Silly syntax like "if 1(==1( ( echo they equal )" will be parsed wrong */ - } else if (WCMD_keyword_ws_found(ifCmd, sizeof(ifCmd)/sizeof(ifCmd[0]), curPos)) { + } else if (WCMD_keyword_ws_found(ifCmd, ARRAY_SIZE(ifCmd), curPos)) { inIf = TRUE; - } else if (WCMD_keyword_ws_found(ifElse, sizeof(ifElse)/sizeof(ifElse[0]), curPos)) { - const int keyw_len = sizeof(ifElse)/sizeof(ifElse[0]) + 1; + } else if (WCMD_keyword_ws_found(ifElse, ARRAY_SIZE(ifElse), curPos)) { + const int keyw_len = ARRAY_SIZE(ifElse) + 1; inElse = TRUE; lastWasElse = TRUE; onlyWhiteSpace = TRUE; @@ -1958,9 +1955,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* In a for loop, the DO command will follow a close bracket followed by whitespace, followed by DO, ie closeBracket inserts a NULL entry, curLen is then 0, and all whitespace is skipped */ - } else if (inFor && - WCMD_keyword_ws_found(forDO, sizeof(forDO)/sizeof(forDO[0]), curPos)) { - const int keyw_len = sizeof(forDO)/sizeof(forDO[0]) + 1; + } else if (inFor && WCMD_keyword_ws_found(forDO, ARRAY_SIZE(forDO), curPos)) { + const int keyw_len = ARRAY_SIZE(forDO) + 1; WINE_TRACE("Found 'DO '\n"); lastWasDo = TRUE; onlyWhiteSpace = TRUE; @@ -1977,8 +1973,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE WINE_TRACE("Found 'FOR ', comparing next parm: '%s'\n", wine_dbgstr_w(curPos)); - if (WCMD_keyword_ws_found(forIN, sizeof(forIN)/sizeof(forIN[0]), curPos)) { - const int keyw_len = sizeof(forIN)/sizeof(forIN[0]) + 1; + if (WCMD_keyword_ws_found(forIN, ARRAY_SIZE(forIN), curPos)) { + const int keyw_len = ARRAY_SIZE(forIN) + 1; WINE_TRACE("Found 'IN '\n"); lastWasIn = TRUE; onlyWhiteSpace = TRUE; @@ -2509,8 +2505,8 @@ int wmain (int argc, WCHAR *argvW[]) BOOL found = FALSE; /* Now extract PATHEXT */ - len = GetEnvironmentVariableW(envPathExt, pathext, sizeof(pathext)/sizeof(WCHAR)); - if ((len == 0) || (len >= (sizeof(pathext)/sizeof(WCHAR)))) { + len = GetEnvironmentVariableW(envPathExt, pathext, ARRAY_SIZE(pathext)); + if ((len == 0) || (len >= ARRAY_SIZE(pathext))) { strcpyW (pathext, dfltPathExt); } @@ -2518,7 +2514,7 @@ int wmain (int argc, WCHAR *argvW[]) WINE_TRACE("First parameter is '%s'\n", wine_dbgstr_w(thisArg)); if (strchrW(thisArg, '\\') != NULL) { - GetFullPathNameW(thisArg, sizeof(string)/sizeof(WCHAR), string, NULL); + GetFullPathNameW(thisArg, ARRAY_SIZE(string), string, NULL); WINE_TRACE("Full path name '%s'\n", wine_dbgstr_w(string)); p = string + strlenW(string); @@ -2553,7 +2549,7 @@ int wmain (int argc, WCHAR *argvW[]) /* Otherwise we now need to look in the path to see if we can find it */ } else { /* Does file exist with this name? */ - if (SearchPathW(NULL, thisArg, NULL, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + if (SearchPathW(NULL, thisArg, NULL, ARRAY_SIZE(string), string, NULL) != 0) { WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); found = TRUE; } else { @@ -2571,7 +2567,7 @@ int wmain (int argc, WCHAR *argvW[]) } /* Does file exist with this extension? */ - if (SearchPathW(NULL, thisArg, thisExt, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + if (SearchPathW(NULL, thisArg, thisExt, ARRAY_SIZE(string), string, NULL) != 0) { WINE_TRACE("Found on path as '%s' with extension '%s'\n", wine_dbgstr_w(string), wine_dbgstr_w(thisExt)); found = TRUE; @@ -2596,7 +2592,7 @@ int wmain (int argc, WCHAR *argvW[]) } /* Save cwd into appropriate env var (Must be before the /c processing */ - GetCurrentDirectoryW(sizeof(string)/sizeof(WCHAR), string); + GetCurrentDirectoryW(ARRAY_SIZE(string), string); if (IsCharAlphaW(string[0]) && string[1] == ':') { static const WCHAR fmt[] = {'=','%','c',':','\0'}; wsprintfW(envvar, fmt, string[0]); @@ -2656,7 +2652,7 @@ int wmain (int argc, WCHAR *argvW[]) RegQueryValueExW(key, dfltColorW, NULL, NULL, (LPBYTE)&value, &size); } else if (type == REG_SZ) { - size = sizeof(strvalue)/sizeof(WCHAR); + size = ARRAY_SIZE(strvalue); RegQueryValueExW(key, dfltColorW, NULL, NULL, (LPBYTE)strvalue, &size); value = strtoulW(strvalue, NULL, 10); @@ -2677,7 +2673,7 @@ int wmain (int argc, WCHAR *argvW[]) RegQueryValueExW(key, dfltColorW, NULL, NULL, (LPBYTE)&value, &size); } else if (type == REG_SZ) { - size = sizeof(strvalue)/sizeof(WCHAR); + size = ARRAY_SIZE(strvalue); RegQueryValueExW(key, dfltColorW, NULL, NULL, (LPBYTE)strvalue, &size); value = strtoulW(strvalue, NULL, 10); -- 2.14.4

1 0

[PATCH] ntdll: When an exception happens in DllMain(), print the code.
by Chip Davis 20 Aug '18

20 Aug '18

Also print exceptions from TLS callbacks. Useful for debugging exceptions that prevent DLLs from loading. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/ntdll/loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8d18af8b86..26b2431047 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1175,8 +1175,8 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) } __EXCEPT_ALL { - TRACE_(relay)("\1exception in TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", - callback, module, reason_names[reason] ); + TRACE_(relay)("\1exception %08x in TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", + GetExceptionCode(), callback, module, reason_names[reason] ); return; } __ENDTRY @@ -1222,9 +1222,9 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved } __EXCEPT_ALL { - TRACE_(relay)("\1exception in PE entry point (proc=%p,module=%p,reason=%s,res=%p)\n", - entry, module, reason_names[reason], lpReserved ); status = GetExceptionCode(); + TRACE_(relay)("\1exception %08x in PE entry point (proc=%p,module=%p,reason=%s,res=%p)\n", + status, entry, module, reason_names[reason], lpReserved ); } __ENDTRY -- 2.18.0

1 0

[RFC PATCH 0/5] Improved multi-monitor support for full-screen
by Kai Krakow 20 Aug '18

20 Aug '18

Hello! The following patch series from staging is required here for multiple games to display on the correct screen when switching to full-screen mode. I thus want to suggest these patches for inclusion into wine. I've tested the patches since multiple versions of wine now. It seems there's one (minor) annoyance with these: I have two very different displays attached: One 28" 4k monitor, and one 42" FHD TV. With this setup, some applications display very tiny fonts only on the TV display. It seems that DPI are incorrectly inferred from the display description. It shouldn't be a problem with very similar displays attached to the graphic card. Some Linux applications suffer the same problem, so it's probably nothing that Wine could easily fix. Especially, I had to make my 4k display implicitly the primary display in the Xorg configuration for applications to pickup the correct DPI for font size calculation (which is 144 dpi instead of 96 dpi). Thanks, Kai Ken Thomases (4): gdi32: Also accept "\\.\DISPLAY<n>" devices names with <n> other than 1 as display devices. winex11: Make GetMonitorInfo() give a different device name (\.\DISPLAY<n>) to each monitor user32: Implement EnumDisplayDevicesW() based on EnumDisplayMonitors() and GetMonitorInfoW(). winemac: Make GetMonitorInfo() give a different device name (\\.\DISPLAY<n>) to each monitor. Sebastian Lackner (1): user32: Return a more reasonable display DeviceID. dlls/gdi32/driver.c | 32 ++++++++++++-- dlls/user32/misc.c | 101 ++++++++++++++++++++++++++++++++++++++------ dlls/user32/tests/monitor.c | 16 +++++-- dlls/winemac.drv/display.c | 10 +++-- dlls/winex11.drv/xinerama.c | 12 +++++- 5 files changed, 146 insertions(+), 25 deletions(-) -- 2.16.4

1 5

[PATCH] setupapi: Only delete unregistered device interfaces when deleting a device.
by Zebediah Figura 20 Aug '18

20 Aug '18

Fixes a regression introduced by 86d26dded5560d6d8adb195372f0676d1f7229b0. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index e388a28..6986fb5 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -499,7 +499,7 @@ static void SETUPDI_RemoveDevice(struct device *device) struct device_iface, entry) { list_remove(&iface->entry); - if ((path = get_refstr_key_path(iface))) + if (device->phantom && (path = get_refstr_key_path(iface))) { RegDeleteKeyW(HKEY_LOCAL_MACHINE, path); heap_free(path); -- 2.7.4

2 1

[PATCH 2/2] user32/tests: Add test for desktop window procedure.
by Józef Kucia 20 Aug '18

20 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/user32/tests/msg.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 55d8994023ef..2bbeb296ea16 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14963,6 +14963,56 @@ static void test_defwinproc(void) DestroyWindow( hwnd); } +static void test_desktop_winproc(void) +{ + HINSTANCE instance = GetModuleHandleA(NULL); + WNDPROC desktop_proc; + char buffer[256]; + WNDCLASSA cls; + LRESULT res; + HWND hwnd; + BOOL ret; + + ret = GetClassInfoA(instance, (const CHAR *)MAKEINTATOM(32769), &cls); + ok(ret, "Failed to get desktop class.\n"); + desktop_proc = cls.lpfnWndProc; + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = desktop_proc; + cls.hInstance = instance; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszClassName = "TestDesktopClass"; + ret = !!RegisterClassA(&cls); + ok(ret, "Failed to register class.\n"); + + hwnd = CreateWindowExA(0, cls.lpszClassName, "test_desktop_wndproc", + WS_VISIBLE | WS_CAPTION | WS_OVERLAPPEDWINDOW, 0, 0, 500, 100, 0, 0, 0, NULL); + if (!hwnd) /* win2003 */ + { + skip("Failed to create window.\n"); + goto out_unregister; + } + + memset(&cls, 0, sizeof(cls)); + ret = GetClassInfoA(instance, "TestDesktopClass", &cls); + ok(ret, "Failed to get class info.\n"); + ok(cls.lpfnWndProc == desktop_proc, "Got %p, expected %p.\n", cls.lpfnWndProc, desktop_proc); + + GetWindowTextA(hwnd, buffer, ARRAY_SIZE(buffer)); + todo_wine ok(!strcmp(buffer, "test_desktop_wndproc"), "Got unexpected window text: %s.\n", buffer); + + res = CallWindowProcA(desktop_proc, hwnd, WM_SETTEXT, 0, (LPARAM)"test"); + ok(res == TRUE, "Failed to set text, %ld.\n", res); + GetWindowTextA(hwnd, buffer, ARRAY_SIZE(buffer)); + ok(!strcmp(buffer, "test"), "Got unexpected window text: %s.\n", buffer); + + DestroyWindow(hwnd); + +out_unregister: + UnregisterClassA("TestDesktopClass", instance); +} + #define clear_clipboard(hwnd) clear_clipboard_(__LINE__, (hwnd)) static void clear_clipboard_(int line, HWND hWnd) { @@ -17108,6 +17158,7 @@ START_TEST(msg) test_menu_messages(); test_paintingloop(); test_defwinproc(); + test_desktop_winproc(); test_clipboard_viewers(); test_keyflags(); test_hotkey(); -- 2.16.4

2 1

[PATCH 4/4] server: Require FILE_READ_ATTRIBUTES access in get_named_pipe_info.
by Jacek Caban 20 Aug '18

20 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 6 ++++-- server/named_pipe.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)

1 0

[PATCH 3/4] kernel32: Always create file with FILE_READ_ATTRIBUTES access in CreateFile.
by Jacek Caban 20 Aug '18

20 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/file.c | 4 ++-- dlls/kernel32/tests/pipe.c | 5 +++++ dlls/ntdll/tests/pipe.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-)

1 0

[PATCH 2/4] kernel32: Use proper access flags in CreatePipe.
by Jacek Caban 20 Aug '18

20 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/sync.c | 6 +++--- dlls/kernel32/tests/pipe.c | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-)

1 0

[PATCH 1/4] ntdll: Allow FileAccessInformation to be queried on files without fds.
by Jacek Caban 20 Aug '18

20 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/file.c | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-)

1 0

[PATCH 1/2] user32: Call DefWindowProc() in DesktopWndProc().
by Józef Kucia 20 Aug '18

20 Aug '18

This fixes a regression introduced by commit fc14753dc0188a52a05243d5d82c4062b93daaff. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45485 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Tests included in the next patch show that DesktopWndProc() should not ignore all messages. Unfortunately, an ugly check is needed to skip processing message while the graphics driver is being loaded. It is necessary because WM_NCCALCSIZE initiates loading the graphics driver again. Also, another way to fix the regression is to call DefWindowProc() in winex11.desktop_wndproc_wrapper(), but fixing DesktopWndProc() looks like a more correct solution to me. --- dlls/user32/desktop.c | 6 +++++- dlls/user32/driver.c | 5 +++++ dlls/user32/user_private.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index d22e732fd5b9..68d8ee9116be 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -32,6 +32,7 @@ #include "wingdi.h" #include "winnls.h" #include "controls.h" +#include "user_private.h" #include "wine/unicode.h" static HBRUSH hbrushPattern; @@ -128,7 +129,10 @@ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lP return TRUE; } default: - return 0; /* all other messages are ignored */ + /* Processing messages may initiate loading a driver recursively. */ + if (!USER_is_driver_loaded()) return 0; + + return DefWindowProcW( hwnd, message, wParam, lParam ); } } diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 561a126bd666..211c3466a7ee 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -190,6 +190,11 @@ void USER_unload_driver(void) HeapFree( GetProcessHeap(), 0, prev ); } +BOOL USER_is_driver_loaded(void) +{ + return USER_Driver != &lazy_load_driver; +} + /********************************************************************** * Null user driver diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7a70ae9c433c..4bdfda8d6353 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -118,6 +118,7 @@ typedef struct tagUSER_DRIVER { extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; +extern BOOL USER_is_driver_loaded(void) DECLSPEC_HIDDEN; struct received_message_info; -- 2.16.4

1 0

[PATCH v2] dinput8: Share source with dinput.
by Zebediah Figura 20 Aug '18

20 Aug '18

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Based on a patch by Andrew Wesie. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45568 --- v2: remove unnecessary #ifs, clean up formatting dlls/dinput/Makefile.in | 1 + dlls/dinput/dinput_main.c | 62 ++++++++++- dlls/dinput8/Makefile.in | 17 ++- dlls/dinput8/dinput8_main.c | 247 -------------------------------------------- 4 files changed, 77 insertions(+), 250 deletions(-) delete mode 100644 dlls/dinput8/dinput8_main.c diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index 5d287a3..b1107ee 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -1,6 +1,7 @@ MODULE = dinput.dll IMPORTLIB = dinput IMPORTS = dxguid uuid comctl32 ole32 user32 advapi32 +EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) C_SRCS = \ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index e4538a0..32eedf1 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -165,6 +165,63 @@ HRESULT WINAPI DirectInputCreateEx( } /****************************************************************************** + * DirectInput8Create (DINPUT8.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, + DWORD version, REFIID iid, void **out, IUnknown *outer) +{ + IDirectInputImpl *This; + HRESULT hr; + + TRACE("hinst %p, version %#x, iid %s, out %p, outer %p.\n", + hinst, version, debugstr_guid(iid), out, outer); + + if (!out) + return E_POINTER; + + if (!IsEqualGUID(&IID_IDirectInput8A, iid) && + !IsEqualGUID(&IID_IDirectInput8W, iid) && + !IsEqualGUID(&IID_IUnknown, iid)) + { + *out = NULL; + return DIERR_NOINTERFACE; + } + + hr = create_directinput_instance(iid, out, &This); + + if (FAILED(hr)) + { + ERR("Failed to create DirectInput, hr %#x.\n", hr); + return hr; + } + + /* When aggregation is used, the application needs to manually call Initialize(). */ + if (!outer && IsEqualGUID(&IID_IDirectInput8A, iid)) + { + hr = IDirectInput8_Initialize(&This->IDirectInput8A_iface, hinst, version); + if (FAILED(hr)) + { + IDirectInput8_Release(&This->IDirectInput8A_iface); + *out = NULL; + return hr; + } + } + + if (!outer && IsEqualGUID(&IID_IDirectInput8W, iid)) + { + hr = IDirectInput8_Initialize(&This->IDirectInput8W_iface, hinst, version); + if (FAILED(hr)) + { + IDirectInput8_Release(&This->IDirectInput8W_iface); + *out = NULL; + return hr; + } + } + + return S_OK; +} + +/****************************************************************************** * DirectInputCreateA (DINPUT.@) */ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter) @@ -1519,7 +1576,10 @@ static HRESULT WINAPI DICF_CreateInstance( IsEqualGUID( &IID_IDirectInput2A, riid ) || IsEqualGUID( &IID_IDirectInput2W, riid ) || IsEqualGUID( &IID_IDirectInput7A, riid ) || - IsEqualGUID( &IID_IDirectInput7W, riid ) ) { + IsEqualGUID( &IID_IDirectInput7W, riid ) || + IsEqualGUID( &IID_IDirectInput8A, riid ) || + IsEqualGUID( &IID_IDirectInput8W, riid ) ) + { return create_directinput_instance(riid, ppobj, NULL); } diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 26672ae..6b62969 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -1,9 +1,22 @@ MODULE = dinput8.dll IMPORTLIB = dinput8 -IMPORTS = uuid dxguid dinput ole32 advapi32 +IMPORTS = dxguid uuid comctl32 ole32 user32 advapi32 +EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800 +EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) +PARENTSRC = ../dinput C_SRCS = \ - dinput8_main.c + config.c \ + data_formats.c \ + device.c \ + dinput_main.c \ + effect_linuxinput.c \ + joystick.c \ + joystick_linux.c \ + joystick_linuxinput.c \ + joystick_osx.c \ + keyboard.c \ + mouse.c IDL_SRCS = dinput8.idl diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c deleted file mode 100644 index 9824c76..0000000 --- a/dlls/dinput8/dinput8_main.c +++ /dev/null @@ -1,247 +0,0 @@ -/* DirectInput 8 - * - * Copyright 2002 TransGaming Technologies Inc. - * Copyright 2006 Roderick Colenbrander - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> - -#define COBJMACROS - -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "objbase.h" -#include "rpcproxy.h" -#include "dinput.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dinput); - -static HINSTANCE instance; -static LONG dll_count; - -/* - * Dll lifetime tracking declaration - */ -static void LockModule(void) -{ - InterlockedIncrement(&dll_count); -} - -static void UnlockModule(void) -{ - InterlockedDecrement(&dll_count); -} - -/****************************************************************************** - * DirectInput8Create (DINPUT8.@) - */ -HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { - IDirectInputA *pDI; - HRESULT hr, hrCo; - - TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p)\n", hinst, dwVersion, debugstr_guid(riid), punkOuter); - - if (!ppDI) - return E_POINTER; - - if (!IsEqualGUID(&IID_IDirectInput8A, riid) && - !IsEqualGUID(&IID_IDirectInput8W, riid) && - !IsEqualGUID(&IID_IUnknown, riid)) - { - *ppDI = NULL; - return DIERR_NOINTERFACE; - } - - hrCo = CoInitialize(NULL); - - hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&pDI); - - /* Ensure balance of calls. */ - if (SUCCEEDED(hrCo)) - CoUninitialize(); - - if (FAILED(hr)) { - ERR("CoCreateInstance failed with hr = 0x%08x\n", hr); - return hr; - } - - hr = IDirectInput_QueryInterface(pDI, riid, ppDI); - IDirectInput_Release(pDI); - - if (FAILED(hr)) - return hr; - - /* When aggregation is used (punkOuter!=NULL) the application needs to manually call Initialize. */ - if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8A, riid)) { - IDirectInput8A *DI = *ppDI; - - hr = IDirectInput8_Initialize(DI, hinst, dwVersion); - if (FAILED(hr)) - { - IDirectInput8_Release(DI); - *ppDI = NULL; - return hr; - } - } - - if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8W, riid)) { - IDirectInput8W *DI = *ppDI; - - hr = IDirectInput8_Initialize(DI, hinst, dwVersion); - if (FAILED(hr)) - { - IDirectInput8_Release(DI); - *ppDI = NULL; - return hr; - } - } - - return S_OK; -} - -/******************************************************************************* - * DirectInput8 ClassFactory - */ -typedef struct -{ - /* IUnknown fields */ - IClassFactory IClassFactory_iface; -} IClassFactoryImpl; - -static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) -{ - return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); -} - -static HRESULT WINAPI DI8CF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - FIXME("%p %s %p\n",This,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI DI8CF_AddRef(LPCLASSFACTORY iface) { - LockModule(); - return 2; -} - -static ULONG WINAPI DI8CF_Release(LPCLASSFACTORY iface) { - UnlockModule(); - return 1; -} - -static HRESULT WINAPI DI8CF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - - TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); - if( IsEqualGUID( &IID_IDirectInput8A, riid ) || IsEqualGUID( &IID_IDirectInput8W, riid ) || IsEqualGUID( &IID_IUnknown, riid )) { - IDirectInputA *ppDI; - HRESULT hr; - - hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&ppDI); - if (FAILED(hr)) - return hr; - - hr = IDirectInput_QueryInterface(ppDI, riid, ppobj); - IDirectInput_Release(ppDI); - - return hr; - } - - ERR("(%p,%p,%s,%p) Interface not found!\n",This,pOuter,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; -} - -static HRESULT WINAPI DI8CF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - TRACE("(%p)->(%d)\n", iface, dolock); - - if(dolock) - LockModule(); - else - UnlockModule(); - - return S_OK; -} - -static const IClassFactoryVtbl DI8CF_Vtbl = { - DI8CF_QueryInterface, - DI8CF_AddRef, - DI8CF_Release, - DI8CF_CreateInstance, - DI8CF_LockServer -}; -static IClassFactoryImpl DINPUT8_CF = { { &DI8CF_Vtbl } }; - - -/*********************************************************************** - * DllCanUnloadNow (DINPUT8.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return dll_count == 0 ? S_OK : S_FALSE; -} - -/*********************************************************************** - * DllGetClassObject (DINPUT8.@) - */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) -{ - TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) { - *ppv = &DINPUT8_CF; - IClassFactory_AddRef((IClassFactory*)*ppv); - return S_OK; - } - - FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - return CLASS_E_CLASSNOTAVAILABLE; -} - -/*********************************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - instance = hInstDLL; - DisableThreadLibraryCalls( hInstDLL ); - break; - } - return TRUE; -} - -/*********************************************************************** - * DllRegisterServer (DINPUT8.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - return __wine_register_resources( instance ); -} - -/*********************************************************************** - * DllUnregisterServer (DINPUT8.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - return __wine_unregister_resources( instance ); -} -- 2.7.4

2 4

[PATCH 3/3] d3d10core/tests: Add a test for CopySubresourceRegion() with 1D textures.
by Józef Kucia 20 Aug '18

20 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 87 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8c95ee35c394..569c8eed51ac 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9241,6 +9241,92 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } +static void test_copy_subresource_region_1d(void) +{ + struct d3d10core_test_context test_context; + D3D10_SUBRESOURCE_DATA resource_data[4]; + D3D10_TEXTURE1D_DESC texture1d_desc; + D3D10_TEXTURE2D_DESC texture2d_desc; + struct resource_readback rb; + ID3D10Texture1D *texture1d; + ID3D10Texture2D *texture2d; + ID3D10Device *device; + unsigned int i, j; + D3D10_BOX box; + DWORD color; + HRESULT hr; + + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + texture1d_desc.Width = 4; + texture1d_desc.MipLevels = 1; + texture1d_desc.ArraySize = 4; + texture1d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture1d_desc.Usage = D3D10_USAGE_DEFAULT; + texture1d_desc.BindFlags = 0; + texture1d_desc.CPUAccessFlags = 0; + texture1d_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + resource_data[i].pSysMem = &bitmap_data[4 * i]; + resource_data[i].SysMemPitch = texture1d_desc.Width * sizeof(bitmap_data); + resource_data[i].SysMemSlicePitch = 0; + } + + hr = ID3D10Device_CreateTexture1D(device, &texture1d_desc, resource_data, &texture1d); + ok(hr == S_OK, "Failed to create 1d texture, hr %#x.\n", hr); + + texture2d_desc.Width = 4; + texture2d_desc.Height = 4; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 1; + texture2d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D10_USAGE_DEFAULT; + texture2d_desc.BindFlags = 0; + texture2d_desc.CPUAccessFlags = 0; + texture2d_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture2d_desc, NULL, &texture2d); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + set_box(&box, 0, 0, 0, 4, 1, 1); + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)texture2d, 0, + 0, i, 0, (ID3D10Resource *)texture1d, i, &box); + } + + get_texture_readback(texture2d, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, j, i); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + + ID3D10Texture1D_Release(texture1d); + ID3D10Texture2D_Release(texture2d); + release_test_context(&test_context); +} + #define check_buffer_cpu_access(a, b, c, d) check_buffer_cpu_access_(__LINE__, a, b, c, d) static void check_buffer_cpu_access_(unsigned int line, ID3D10Buffer *buffer, D3D10_USAGE usage, UINT bind_flags, UINT cpu_access) @@ -17112,6 +17198,7 @@ START_TEST(device) test_fragment_coords(); test_update_subresource(); test_copy_subresource_region(); + test_copy_subresource_region_1d(); test_resource_access(); test_check_multisample_quality_levels(); test_cb_relative_addressing(); -- 2.16.4

2 1

[PATCH 1/3] wined3d: Allow multisample resolve for typeless resources.
by Józef Kucia 20 Aug '18

20 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> It may perform an undesired format conversion in rare cases. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39754 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- This fixes black screen in a lot of Direct3D 11 games. The proper fix probably won't appear anytime soon. --- dlls/d3d10core/tests/device.c | 30 +++++++++++++++--------------- dlls/d3d11/tests/d3d11.c | 30 +++++++++++++++--------------- dlls/wined3d/device.c | 4 ++-- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f3c3d86ce178..8c95ee35c394 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16862,12 +16862,12 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, @@ -16877,69 +16877,69 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xffe1bc89}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xffe1bc89}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xffe1bc89}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, }; if (!init_test_context(&test_context)) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 60c88f4a24ce..bc2a53ed5840 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27295,12 +27295,12 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, @@ -27310,69 +27310,69 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xffe1bc89}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xffe1bc89}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xffe1bc89}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, }; if (!init_test_context(&test_context, NULL)) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5079113120eb..0f7ef67bc96d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4293,10 +4293,10 @@ void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, if (wined3d_format_is_typeless(dst_resource->format) || wined3d_format_is_typeless(src_resource->format)) { - FIXME("Unhandled multisample resolve, dst_format %s, src_format %s, format %s.\n", + FIXME("Multisample resolve is not fully supported for typeless formats " + "(dst_format %s, src_format %s, format %s).\n", debug_d3dformat(dst_resource->format->id), debug_d3dformat(src_resource->format->id), debug_d3dformat(format_id)); - return; } if (dst_resource->type != WINED3D_RTYPE_TEXTURE_2D) { -- 2.16.4

2 1

[PATCH 2/3] d3d11/tests: Add a test for CopySubresourceRegion() with 1D textures.
by Józef Kucia 20 Aug '18

20 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index bc2a53ed5840..e43b2f34f3b4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11908,6 +11908,94 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } +static void test_copy_subresource_region_1d(void) +{ + D3D11_SUBRESOURCE_DATA resource_data[4]; + struct d3d11_test_context test_context; + D3D11_TEXTURE1D_DESC texture1d_desc; + D3D11_TEXTURE2D_DESC texture2d_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture1D *texture1d; + ID3D11Texture2D *texture2d; + ID3D11Device *device; + unsigned int i, j; + D3D11_BOX box; + DWORD color; + HRESULT hr; + + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + texture1d_desc.Width = 4; + texture1d_desc.MipLevels = 1; + texture1d_desc.ArraySize = 4; + texture1d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture1d_desc.Usage = D3D11_USAGE_DEFAULT; + texture1d_desc.BindFlags = 0; + texture1d_desc.CPUAccessFlags = 0; + texture1d_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + resource_data[i].pSysMem = &bitmap_data[4 * i]; + resource_data[i].SysMemPitch = texture1d_desc.Width * sizeof(bitmap_data); + resource_data[i].SysMemSlicePitch = 0; + } + + hr = ID3D11Device_CreateTexture1D(device, &texture1d_desc, resource_data, &texture1d); + ok(hr == S_OK, "Failed to create 1d texture, hr %#x.\n", hr); + + texture2d_desc.Width = 4; + texture2d_desc.Height = 4; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 1; + texture2d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D11_USAGE_DEFAULT; + texture2d_desc.BindFlags = 0; + texture2d_desc.CPUAccessFlags = 0; + texture2d_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture2d_desc, NULL, &texture2d); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + set_box(&box, 0, 0, 0, 4, 1, 1); + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)texture2d, 0, + 0, i, 0, (ID3D11Resource *)texture1d, i, &box); + } + + get_texture_readback(texture2d, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, j, i, 0); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + + ID3D11Texture1D_Release(texture1d); + ID3D11Texture2D_Release(texture2d); + release_test_context(&test_context); +} + static void test_copy_subresource_region_3d(void) { ID3D11ShaderResourceView *dst_srv, *src_srv; @@ -28075,6 +28163,7 @@ START_TEST(d3d11) queue_test(test_fragment_coords); queue_test(test_update_subresource); queue_test(test_copy_subresource_region); + queue_test(test_copy_subresource_region_1d); queue_test(test_copy_subresource_region_3d); queue_test(test_resource_map); queue_for_each_feature_level(test_resource_access); -- 2.16.4

2 1

[PATCH v8 2/2] riched20: Call ITextHost_TxGetCharFormat() for setting default charformat.
by Jactry Zeng 20 Aug '18

20 Aug '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/para.c | 9 ++++++++ dlls/riched20/tests/txtsrv.c | 41 +++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index f2a70e5746..8f35342b8e 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -36,6 +36,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; CHARFORMAT2W cf; + const CHARFORMATW *host_cf; LOGFONTW lf; HFONT hf; ME_TextBuffer *text = editor->pBuffer; @@ -76,6 +77,14 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) style = ME_MakeStyle(&cf); text->pDefaultStyle = style; + if (ITextHost_TxGetCharFormat(editor->texthost, &host_cf) == S_OK) + { + ZeroMemory(&cf, sizeof(cf)); + cf.cbSize = sizeof(cf); + cfany_to_cf2w(&cf, (CHARFORMAT2W *)host_cf); + ME_SetDefaultCharFormat(editor, &cf); + } + eol_len = editor->bEmulateVersion10 ? 2 : 1; para->member.para.text = ME_MakeStringN( cr_lf, eol_len ); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 5d312ca2cd..4dee5fd269 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -85,6 +85,7 @@ typedef struct ITextHostTestImpl { ITextHost ITextHost_iface; LONG refCount; + CHARFORMAT2W char_format; } ITextHostTestImpl; static inline ITextHostTestImpl *impl_from_ITextHost(ITextHost *iface) @@ -330,7 +331,8 @@ static HRESULT WINAPI ITextHostImpl_TxGetCharFormat(ITextHost *iface, { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetCharFormat(%p, ppCF=%p)\n", This, ppCF); - return E_NOTIMPL; + *ppCF = (CHARFORMATW *)&This->char_format; + return S_OK; } static HRESULT WINAPI ITextHostImpl_TxGetParaFormat(ITextHost *iface, @@ -624,6 +626,7 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) ITextHostTestImpl *dummyTextHost; IUnknown *init; HRESULT result; + HFONT hf; dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); if (dummyTextHost == NULL) { @@ -632,6 +635,11 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) } dummyTextHost->ITextHost_iface.lpVtbl = &itextHostVtbl; dummyTextHost->refCount = 1; + memset(&dummyTextHost->char_format, 0, sizeof(dummyTextHost->char_format)); + dummyTextHost->char_format.cbSize = sizeof(dummyTextHost->char_format); + dummyTextHost->char_format.dwMask = CFM_ALL2; + hf = GetStockObject(DEFAULT_GUI_FONT); + hf_to_cf(hf, &dummyTextHost->char_format); /* MSDN states that an IUnknown object is returned by CreateTextServices which is then queried to obtain a @@ -952,6 +960,36 @@ static void test_QueryInterface(void) ITextHost_Release(host); } +static void test_default_format(void) +{ + ITextServices *txtserv; + ITextHost *host; + HRESULT result; + LRESULT lresult; + CHARFORMAT2W cf2; + const CHARFORMATW *host_cf; + DWORD expected_effects; + + if (!init_texthost(&txtserv, &host)) + return; + + cf2.cbSize = sizeof(CHARFORMAT2W); + result = ITextServices_TxSendMessage(txtserv, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf2, &lresult); + ok(result == S_OK, "ITextServices_TxSendMessage failed: 0x%08x.\n", result); + + ITextHostImpl_TxGetCharFormat(host, &host_cf); + ok(!lstrcmpW(host_cf->szFaceName, cf2.szFaceName), "got wrong font name: %s.\n", wine_dbgstr_w(cf2.szFaceName)); + ok(cf2.yHeight == host_cf->yHeight, "got wrong yHeight: %d, expetced %d.\n", cf2.yHeight, host_cf->yHeight); + expected_effects = (cf2.dwEffects & ~(CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR)); + ok(host_cf->dwEffects == expected_effects , "got wrong dwEffects: %x, expetced %x.\n", cf2.dwEffects, expected_effects); + ok(cf2.bPitchAndFamily == host_cf->bPitchAndFamily, "got wrong bPitchAndFamily: %x, expected %x.\n", + cf2.bPitchAndFamily, host_cf->bPitchAndFamily); + ok(cf2.bCharSet == host_cf->bCharSet, "got wrong bCharSet: %x, expected %x.\n", cf2.bCharSet, host_cf->bCharSet); + + ITextServices_Release(txtserv); + ITextHost_Release(host); +} + START_TEST( txtsrv ) { ITextServices *txtserv; @@ -982,6 +1020,7 @@ START_TEST( txtsrv ) test_TxGetNaturalSize(); test_TxDraw(); test_QueryInterface(); + test_default_format(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); } -- 2.18.0

2 1

[PATCH v8 1/2] riched20: Initialize style_list before ME_MakeFirstParagraph().
by Jactry Zeng 20 Aug '18

20 Aug '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8020117fd2..12f1fa67c1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3047,6 +3047,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->pBuffer = ME_MakeText(); ed->nZoomNumerator = ed->nZoomDenominator = 0; ed->nAvailWidth = 0; /* wrap to client area */ + list_init( &ed->style_list ); ME_MakeFirstParagraph(ed); /* The four cursors are for: * 0 - The position where the caret is shown @@ -3146,7 +3147,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->wheel_remain = 0; - list_init( &ed->style_list ); list_init( &ed->reobj_list ); OleInitialize(NULL); -- 2.18.0

2 1

[PATCH 2/2] shell32: Stop adding AllUsersProfile key to the registry.
by Dmitry Timoshkov 20 Aug '18

20 Aug '18

It's no longer needed, and recent Windows versions don't have it either. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shellpath.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index de4bf7d566..37e5a13b77 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -957,7 +957,6 @@ static const WCHAR ProgramDataVarW[] = {'%','P','r','o','g','r','a','m','D','a', static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'}; static const WCHAR ProfileListW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','P','r','o','f','i','l','e','L','i','s','t',0}; static const WCHAR ProfilesDirectoryW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; -static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szDefaultProfileDirW[] = {'u','s','e','r','s',0}; @@ -3804,17 +3803,8 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) strcpyW(szTemp, szSrc); while (SUCCEEDED(hr) && szTemp[0] == '%') { - if (!strncmpiW(szTemp, AllUsersProfileW, strlenW(AllUsersProfileW))) - { - WCHAR szAllUsers[MAX_PATH]; - - strcpyW(szDest, szProfilesPrefix); - hr = _SHGetProfilesValue(key, AllUsersProfileValueW, - szAllUsers, AllUsersW); - PathAppendW(szDest, szAllUsers); - PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); - } - else if (!strncmpiW(szTemp, ProgramDataVarW, strlenW(ProgramDataVarW))) + if (!strncmpiW(szTemp, AllUsersProfileW, strlenW(AllUsersProfileW)) || + !strncmpiW(szTemp, ProgramDataVarW, strlenW(ProgramDataVarW))) { WCHAR szProgramData[MAX_PATH], def_val[MAX_PATH]; HKEY shellFolderKey; -- 2.17.1

2 1

[PATCH] winegcc: Support distros using plain lib for 32-bit libraries in get_lib_dir.
by Jacek Caban 20 Aug '18

20 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH v7 2/2] riched20: Call ITextHost_TxGetCharFormat() for setting default charformat.
by Jactry Zeng 20 Aug '18

20 Aug '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/para.c | 11 +++++++++- dlls/riched20/tests/txtsrv.c | 41 +++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index f2a70e5746..27234b061a 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -35,7 +35,7 @@ static ME_DisplayItem *make_para(ME_TextEditor *editor) void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; - CHARFORMAT2W cf; + CHARFORMAT2W cf, cf_tmp; LOGFONTW lf; HFONT hf; ME_TextBuffer *text = editor->pBuffer; @@ -44,6 +44,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) ME_Style *style; int eol_len; WCHAR cr_lf[] = {'\r','\n',0}; + CHARFORMATW *host_cf; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); @@ -76,6 +77,14 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) style = ME_MakeStyle(&cf); text->pDefaultStyle = style; + if (ITextHost_TxGetCharFormat(editor->texthost, (const CHARFORMATW **)&host_cf) == S_OK) + { + ZeroMemory(&cf_tmp, sizeof(cf_tmp)); + cf_tmp.cbSize = sizeof(cf_tmp); + cfany_to_cf2w(&cf_tmp, (CHARFORMAT2W *)host_cf); + ME_SetDefaultCharFormat(editor, &cf_tmp); + } + eol_len = editor->bEmulateVersion10 ? 2 : 1; para->member.para.text = ME_MakeStringN( cr_lf, eol_len ); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 5d312ca2cd..9d3fc361d6 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -85,6 +85,7 @@ typedef struct ITextHostTestImpl { ITextHost ITextHost_iface; LONG refCount; + CHARFORMAT2W char_format; } ITextHostTestImpl; static inline ITextHostTestImpl *impl_from_ITextHost(ITextHost *iface) @@ -330,7 +331,8 @@ static HRESULT WINAPI ITextHostImpl_TxGetCharFormat(ITextHost *iface, { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetCharFormat(%p, ppCF=%p)\n", This, ppCF); - return E_NOTIMPL; + *ppCF = (CHARFORMATW *)&This->char_format; + return S_OK; } static HRESULT WINAPI ITextHostImpl_TxGetParaFormat(ITextHost *iface, @@ -624,6 +626,7 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) ITextHostTestImpl *dummyTextHost; IUnknown *init; HRESULT result; + HFONT hf; dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); if (dummyTextHost == NULL) { @@ -632,6 +635,11 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) } dummyTextHost->ITextHost_iface.lpVtbl = &itextHostVtbl; dummyTextHost->refCount = 1; + memset(&dummyTextHost->char_format, 0, sizeof(dummyTextHost->char_format)); + dummyTextHost->char_format.cbSize = sizeof(dummyTextHost->char_format); + dummyTextHost->char_format.dwMask = CFM_ALL2; + hf = GetStockObject(DEFAULT_GUI_FONT); + hf_to_cf(hf, &dummyTextHost->char_format); /* MSDN states that an IUnknown object is returned by CreateTextServices which is then queried to obtain a @@ -952,6 +960,36 @@ static void test_QueryInterface(void) ITextHost_Release(host); } +static void test_default_format(void) +{ + ITextServices *txtserv; + ITextHost *host; + HRESULT result; + LRESULT lresult; + CHARFORMAT2W cf2; + CHARFORMATW *host_cf; + DWORD expected_effects; + + if (!init_texthost(&txtserv, &host)) + return; + + cf2.cbSize = sizeof(CHARFORMAT2W); + result = ITextServices_TxSendMessage(txtserv, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf2, &lresult); + ok(result == S_OK, "ITextServices_TxSendMessage failed: 0x%08x.\n", result); + + ITextHostImpl_TxGetCharFormat(host, (const CHARFORMATW **)&host_cf); + ok(!lstrcmpW(host_cf->szFaceName, cf2.szFaceName), "got wrong font name: %s.\n", wine_dbgstr_w(cf2.szFaceName)); + ok(cf2.yHeight == host_cf->yHeight, "got wrong yHeight: %d, expetced %d.\n", cf2.yHeight, host_cf->yHeight); + expected_effects = (cf2.dwEffects & ~(CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR)); + ok(host_cf->dwEffects == expected_effects , "got wrong dwEffects: %x, expetced %x.\n", cf2.dwEffects, expected_effects); + ok(cf2.bPitchAndFamily == host_cf->bPitchAndFamily, "got wrong bPitchAndFamily: %x, expected %x.\n", + cf2.bPitchAndFamily, host_cf->bPitchAndFamily); + ok(cf2.bCharSet == host_cf->bCharSet, "got wrong bCharSet: %x, expected %x.\n", cf2.bCharSet, host_cf->bCharSet); + + ITextServices_Release(txtserv); + ITextHost_Release(host); +} + START_TEST( txtsrv ) { ITextServices *txtserv; @@ -982,6 +1020,7 @@ START_TEST( txtsrv ) test_TxGetNaturalSize(); test_TxDraw(); test_QueryInterface(); + test_default_format(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); } -- 2.18.0

2 1

[PATCH 1/2] ole32: Try 'dll' extension when looking for registration-free modules.
by Nikolay Sivov 20 Aug '18

20 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/compobj.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 3487cca572..00555bf74f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1442,13 +1442,14 @@ static DWORD COM_RegReadPath(const struct class_reg_data *regdata, WCHAR *dst, D } else { + static const WCHAR dllW[] = {'.','d','l','l',0}; ULONG_PTR cookie; WCHAR *nameW; *dst = 0; nameW = (WCHAR*)((BYTE*)regdata->u.actctx.section + regdata->u.actctx.data->name_offset); ActivateActCtx(regdata->u.actctx.hactctx, &cookie); - ret = SearchPathW(NULL, nameW, NULL, dstlen, dst, NULL); + ret = SearchPathW(NULL, nameW, dllW, dstlen, dst, NULL); DeactivateActCtx(0, cookie); return !*dst; } -- 2.18.0

2 3

[PATCH] msi: Don't assume that WoW64 redirection is enabled in custom_start_server().
by Zebediah Figura 20 Aug '18

20 Aug '18

As of 3a884c2ef the server is started on the main thread, so this is no longer a valid assumption. In particular, we disable WoW64 redirection while running standard actions, including the top-level INSTALL action. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45663 --- dlls/msi/custom.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 950681e..4502ca6 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -601,14 +601,17 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) if (pipe == INVALID_HANDLE_VALUE) ERR("Failed to create custom action client pipe: %u\n", GetLastError()); - if (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY) + if (!IsWow64Process(GetCurrentProcess(), &wow64)) + wow64 = FALSE; + + if ((sizeof(void *) == 8 || wow64) && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); else GetSystemDirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); strcatW(path, msiexecW); sprintfW(cmdline, argsW, path, GetCurrentProcessId()); - if (IsWow64Process(GetCurrentProcess(), &wow64) && wow64 && arch == SCS_64BIT_BINARY) + if (wow64 && arch == SCS_64BIT_BINARY) { Wow64DisableWow64FsRedirection(&cookie); CreateProcessW(path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); -- 2.7.4

2 2

[PATCH] wbemprox: Use WS_AF_INET instead of AF_INET in get_ipsubnet.
by Gerald Pfeifer 20 Aug '18

20 Aug '18

This is a revised patch based on Piotr's feedback to my patch yesterday (which doesn't show in the archive yet, so no link). Commit 88d52edcc4d5a81965627905278d1212250ae84d Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 1 17:23:29 2018 +0200 wbemprox: Add Win32_NetworkAdapterConfiguration::IPSubnet property. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> broke the build on FreeBSD 10.x and likely other versions: builtin.c: In function 'get_ipsubnet': builtin.c:2499:55: error: 'AF_INET' undeclared (first use in this function) 2499 | if (address->Address.lpSockaddr->sa_family == AF_INET) | ^~~~~~~ Using WS_AF_INET (and defining this in the __MINGW32__ case) addresses this. That way including sys/socket.h is also not required. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/wbemprox/builtin.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 72c6b4e933..9fe22d0034 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -37,6 +37,7 @@ #ifdef __MINGW32__ # include "winsock2.h" # include "ws2tcpip.h" +# define WS_AF_INET AF_INET # define WS_AF_UNSPEC AF_UNSPEC # define WS_NI_MAXHOST NI_MAXHOST # define WS_NI_NAMEREQD NI_NAMEREQD @@ -2496,14 +2497,14 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) } for (address = list; address; address = address->Next) { - if (address->Address.lpSockaddr->sa_family == AF_INET) + if (address->Address.lpSockaddr->sa_family == WS_AF_INET) { WCHAR buf[INET_ADDRSTRLEN]; SOCKADDR_IN addr; ULONG buflen = sizeof(buf)/sizeof(buf[0]); memset( &addr, 0, sizeof(addr) ); - addr.sin_family = AF_INET; + addr.sin_family = WS_AF_INET; if (ConvertLengthToIpv4Mask( address->OnLinkPrefixLength, &addr.sin_addr.S_un.S_addr ) != NO_ERROR || WSAAddressToStringW( (SOCKADDR*)&addr, sizeof(addr), NULL, buf, &buflen)) ptr[i] = NULL; -- 2.17.0

3 2

[PATCH] wmp: Improve URL property handling.
by Nikolay Sivov 20 Aug '18

20 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wmp/player.c | 17 ++++++--------- dlls/wmp/tests/media.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 11 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index fd8c17d60f..519ffa1d18 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -28,7 +28,7 @@ static ATOM player_msg_class; static INIT_ONCE class_init_once; static UINT WM_WMPEVENT; static const WCHAR WMPmessageW[] = {'_', 'W', 'M', 'P', 'M','e','s','s','a','g','e',0}; - +static const WCHAR emptyW[] = {0}; static void update_state(WindowsMediaPlayer *wmp, LONG type, LONG state) { @@ -135,9 +135,8 @@ static HRESULT WINAPI WMPPlayer4_get_URL(IWMPPlayer4 *iface, BSTR *url) TRACE("(%p)->(%p)\n", This, url); - if(This->media == NULL) { - return S_FALSE; - } + if (!This->media) + return return_bstr(emptyW, url); return return_bstr(This->media->url, url); } @@ -147,10 +146,8 @@ static HRESULT WINAPI WMPPlayer4_put_URL(IWMPPlayer4 *iface, BSTR url) WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); IWMPMedia *media; HRESULT hres; + TRACE("(%p)->(%s)\n", This, debugstr_w(url)); - if(url == NULL) { - return E_POINTER; - } hres = create_media_from_url(url, 0.0, &media); @@ -161,9 +158,8 @@ static HRESULT WINAPI WMPPlayer4_put_URL(IWMPPlayer4 *iface, BSTR url) } if (SUCCEEDED(hres)) { update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsReady); - if (This->auto_start == VARIANT_TRUE) { - hres = IWMPControls_play(&This->IWMPControls_iface); - } + if (This->auto_start == VARIANT_TRUE) + IWMPControls_play(&This->IWMPControls_iface); } return hres; @@ -2025,7 +2021,6 @@ WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) { - static const WCHAR emptyW[] = {0}; WMPMedia *media; media = heap_alloc_zero(sizeof(*media)); diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index bd9aefc975..dd6fdcbc91 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -562,6 +562,54 @@ todo_wine IWMPPlayer4_Release(player); } +static void test_player_url(void) +{ + IWMPPlayer4 *player; + BSTR str, str2; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IWMPPlayer4, (void **)&player); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("CLSID_WindowsMediaPlayer is not registered.\n"); + return; + } + ok(hr == S_OK, "Failed to create media player instance, hr %#x.\n", hr); + + hr = IWMPPlayer4_get_URL(player, &str); + ok(hr == S_OK, "Failed to get url, hr %#x.\n", hr); + ok(*str == 0, "Unexpected url %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str2 = SysAllocString(mp3file); + hr = IWMPPlayer4_put_URL(player, str2); + ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + + hr = IWMPPlayer4_put_URL(player, NULL); + ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + hr = IWMPPlayer4_get_URL(player, &str); + ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + ok(*str == 0, "Unexpected url, %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + /* Empty url */ + hr = IWMPPlayer4_put_URL(player, str2); + ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + + str = SysAllocStringLen(NULL, 0); + hr = IWMPPlayer4_put_URL(player, str); + ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + SysFreeString(str); + + hr = IWMPPlayer4_get_URL(player, &str); + ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + ok(*str == 0, "Unexpected url, %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + SysFreeString(str2); + IWMPPlayer4_Release(player); +} + START_TEST(media) { CoInitialize(NULL); @@ -571,6 +619,7 @@ START_TEST(media) completed_event = CreateEventW(NULL, FALSE, FALSE, NULL); test_media_item(); + test_player_url(); if (test_wmp()) { test_completion_event(); } else { -- 2.18.0

1 0

[PATCH] winevulkan: Properly retrieve queues that were created with non-zero flags.
by Józef Kucia 20 Aug '18

20 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan.c | 21 ++++++++++++++++++--- dlls/winevulkan/vulkan_thunks.h | 2 ++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 73bba7894f79..3be6a8de3bf1 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -161,7 +161,7 @@ FUNCTION_OVERRIDES = { "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : False}, "vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : False}, - "vkGetDeviceQueue2" : {"dispatch": False, "driver" : False, "thunk" : False}, + "vkGetDeviceQueue2" : {"dispatch": True, "driver" : False, "thunk" : False}, "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : False}, # VK_KHR_surface diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index e588d53f3cab..a1e970daff85 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -171,6 +171,7 @@ static void wine_vk_command_buffers_free(struct VkDevice_T *device, VkCommandPoo static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, uint32_t family_index, uint32_t queue_count, VkDeviceQueueCreateFlags flags) { + VkDeviceQueueInfo2 queue_info; struct VkQueue_T *queues; unsigned int i; @@ -188,10 +189,24 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, queue->device = device; queue->flags = flags; - /* The native device was already allocated with the required number of queues, - * so just fetch them from there. + /* The Vulkan spec says: + * + * "vkGetDeviceQueue must only be used to get queues that were created + * with the flags parameter of VkDeviceQueueCreateInfo set to zero." */ - device->funcs.p_vkGetDeviceQueue(device->device, family_index, i, &queue->queue); + if (flags && device->funcs.p_vkGetDeviceQueue2) + { + queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2; + queue_info.pNext = NULL; + queue_info.flags = flags; + queue_info.queueFamilyIndex = family_index; + queue_info.queueIndex = i; + device->funcs.p_vkGetDeviceQueue2(device->device, &queue_info, &queue->queue); + } + else + { + device->funcs.p_vkGetDeviceQueue(device->device, family_index, i, &queue->queue); + } } return queues; diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index a03d1150c969..94e56bb97300 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -889,6 +889,7 @@ struct vulkan_device_funcs VkResult (*p_vkGetDeviceGroupSurfacePresentModesKHR)(VkDevice, VkSurfaceKHR, VkDeviceGroupPresentModeFlagsKHR *); void (*p_vkGetDeviceMemoryCommitment)(VkDevice, VkDeviceMemory, VkDeviceSize *); void (*p_vkGetDeviceQueue)(VkDevice, uint32_t, uint32_t, VkQueue *); + void (*p_vkGetDeviceQueue2)(VkDevice, const VkDeviceQueueInfo2 *, VkQueue *); VkResult (*p_vkGetEventStatus)(VkDevice, VkEvent); VkResult (*p_vkGetFenceStatus)(VkDevice, VkFence); #if defined(USE_STRUCT_CONVERSION) @@ -1178,6 +1179,7 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkGetDeviceGroupSurfacePresentModesKHR) \ USE_VK_FUNC(vkGetDeviceMemoryCommitment) \ USE_VK_FUNC(vkGetDeviceQueue) \ + USE_VK_FUNC(vkGetDeviceQueue2) \ USE_VK_FUNC(vkGetEventStatus) \ USE_VK_FUNC(vkGetFenceStatus) \ USE_VK_FUNC(vkGetImageMemoryRequirements) \ -- 2.16.4

1 0

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-devel