November 2014 - Wine-Commits

Henri Verbeet : d3d10core: Set wined3d state in d3d10_device_OMSetBlendState().
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: ed9188c4f80a56e774b1c4a8f0d846ce7f84b35b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9188c4f80a56e774b1c4a8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 4 08:47:46 2014 +0100 d3d10core: Set wined3d state in d3d10_device_OMSetBlendState(). --- dlls/d3d10core/d3d10core_private.h | 1 - dlls/d3d10core/device.c | 49 ++++++++++++++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 845ddab..29f5653 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -325,7 +325,6 @@ struct d3d10_device struct d3d10_blend_state *blend_state; float blend_factor[4]; - UINT sample_mask; struct d3d10_depthstencil_state *depth_stencil_state; UINT stencil_ref; struct d3d10_rasterizer_state *rasterizer_state; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 05639b9..ad6bc4d 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -462,13 +462,53 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface, ID3D10BlendState *blend_state, const FLOAT blend_factor[4], UINT sample_mask) { struct d3d10_device *device = impl_from_ID3D10Device(iface); + const D3D10_BLEND_DESC *desc; - TRACE("iface %p, blend_state %p, blend_factor [%f %f %f %f], sample_mask 0x%08x.\n", + TRACE("iface %p, blend_state %p, blend_factor {%.8e %.8e %.8e %.8e}, sample_mask 0x%08x.\n", iface, blend_state, blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3], sample_mask); - device->blend_state = unsafe_impl_from_ID3D10BlendState(blend_state); + if (blend_factor[0] != 1.0f || blend_factor[1] != 1.0f || blend_factor[2] != 1.0f || blend_factor[3] != 1.0f) + FIXME("Ignoring blend factor {%.8e %.8e %.8e %.8e}.\n", + blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3]); memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor)); - device->sample_mask = sample_mask; + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK, sample_mask); + if (!(device->blend_state = unsafe_impl_from_ID3D10BlendState(blend_state))) + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, FALSE); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE, D3D10_COLOR_WRITE_ENABLE_ALL); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE1, D3D10_COLOR_WRITE_ENABLE_ALL); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE2, D3D10_COLOR_WRITE_ENABLE_ALL); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE3, D3D10_COLOR_WRITE_ENABLE_ALL); + return; + } + + desc = &device->blend_state->desc; + /* glSampleCoverage() */ + if (desc->AlphaToCoverageEnable) + FIXME("Ignoring AlphaToCoverageEnable %#x.\n", desc->AlphaToCoverageEnable); + /* glEnableIndexedEXT(GL_BLEND, ...) */ + FIXME("Per-rendertarget blend enable not implemented.\n"); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, desc->BlendEnable[0]); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLEND, desc->SrcBlend); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLEND, desc->DestBlend); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, desc->BlendOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, desc->SrcBlendAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, desc->DestBlendAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, desc->BlendOpAlpha); + FIXME("Color mask > 3 not implemented.\n"); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE, desc->RenderTargetWriteMask[0]); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE1, desc->RenderTargetWriteMask[1]); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE2, desc->RenderTargetWriteMask[2]); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE3, desc->RenderTargetWriteMask[3]); } static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device1 *iface, @@ -1105,7 +1145,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface, if ((*blend_state = device->blend_state ? &device->blend_state->ID3D10BlendState_iface : NULL)) ID3D10BlendState_AddRef(*blend_state); memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor)); - *sample_mask = device->sample_mask; + *sample_mask = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK); } static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 *iface, @@ -2414,7 +2454,6 @@ HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) device->blend_factor[1] = 1.0f; device->blend_factor[2] = 1.0f; device->blend_factor[3] = 1.0f; - device->sample_mask = D3D10_DEFAULT_SAMPLE_MASK; if (wine_rb_init(&device->depthstencil_states, &d3d10_depthstencil_state_rb_ops) == -1) {

1 0

Henri Verbeet : d3d10core: Free the output signature after creating the wined3d shader.
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: a21784b116d6fb0a70662db1461273c3a6e5488c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a21784b116d6fb0a70662db14… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 4 08:47:44 2014 +0100 d3d10core: Free the output signature after creating the wined3d shader. --- dlls/d3d10core/d3d10core_private.h | 3 -- dlls/d3d10core/shader.c | 61 ++++++++++++-------------------------- include/wine/wined3d.h | 1 - 3 files changed, 19 insertions(+), 46 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 30ae928..80eafe2 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -190,7 +190,6 @@ struct d3d10_vertex_shader LONG refcount; struct wined3d_shader *wined3d_shader; - struct wined3d_shader_signature output_signature; ID3D10Device1 *device; }; @@ -205,7 +204,6 @@ struct d3d10_geometry_shader LONG refcount; struct wined3d_shader *wined3d_shader; - struct wined3d_shader_signature output_signature; }; HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d10_device *device, @@ -219,7 +217,6 @@ struct d3d10_pixel_shader LONG refcount; struct wined3d_shader *wined3d_shader; - struct wined3d_shader_signature output_signature; ID3D10Device1 *device; }; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 007dfc2..62f1e97 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -70,10 +70,7 @@ static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, st HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) { struct wined3d_shader_signature_element *e; - unsigned int string_data_offset; - unsigned int string_data_size; const char *ptr = data; - char *string_data; unsigned int i; DWORD count; @@ -89,24 +86,12 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d return E_OUTOFMEMORY; } - /* 2 DWORDs for the header, 6 for each element. */ - string_data_offset = 2 * sizeof(DWORD) + count * 6 * sizeof(DWORD); - string_data_size = data_size - string_data_offset; - string_data = HeapAlloc(GetProcessHeap(), 0, string_data_size); - if (!string_data) - { - ERR("Failed to allocate string data memory.\n"); - HeapFree(GetProcessHeap(), 0, e); - return E_OUTOFMEMORY; - } - memcpy(string_data, data + string_data_offset, string_data_size); - for (i = 0; i < count; ++i) { UINT name_offset; read_dword(&ptr, &name_offset); - e[i].semantic_name = string_data + (name_offset - string_data_offset); + e[i].semantic_name = data + name_offset; read_dword(&ptr, &e[i].semantic_idx); read_dword(&ptr, &e[i].sysval_semantic); read_dword(&ptr, &e[i].component_type); @@ -121,14 +106,12 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d s->elements = e; s->element_count = count; - s->string_data = string_data; return S_OK; } void shader_free_signature(struct wined3d_shader_signature *s) { - HeapFree(GetProcessHeap(), 0, s->string_data); HeapFree(GetProcessHeap(), 0, s->elements); } @@ -248,9 +231,7 @@ static const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl = static void STDMETHODCALLTYPE d3d10_vertex_shader_wined3d_object_destroyed(void *parent) { - struct d3d10_vertex_shader *shader = parent; - shader_free_signature(&shader->output_signature); - HeapFree(GetProcessHeap(), 0, shader); + HeapFree(GetProcessHeap(), 0, parent); } static const struct wined3d_parent_ops d3d10_vertex_shader_wined3d_parent_ops = @@ -261,13 +242,14 @@ static const struct wined3d_parent_ops d3d10_vertex_shader_wined3d_parent_ops = HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d10_device *device, const void *byte_code, SIZE_T byte_code_length) { + struct wined3d_shader_signature output_signature; struct d3d10_shader_info shader_info; HRESULT hr; shader->ID3D10VertexShader_iface.lpVtbl = &d3d10_vertex_shader_vtbl; shader->refcount = 1; - shader_info.output_signature = &shader->output_signature; + shader_info.output_signature = &output_signature; hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info); if (FAILED(hr)) { @@ -276,13 +258,12 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 } hr = wined3d_shader_create_vs(device->wined3d_device, shader_info.shader_code, - &shader->output_signature, shader, &d3d10_vertex_shader_wined3d_parent_ops, &shader->wined3d_shader, 4); + &output_signature, shader, &d3d10_vertex_shader_wined3d_parent_ops, &shader->wined3d_shader, 4); + shader_free_signature(&output_signature); if (FAILED(hr)) { WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); - shader_free_signature(&shader->output_signature); - hr = E_INVALIDARG; - return hr; + return E_INVALIDARG; } shader->device = &device->ID3D10Device1_iface; @@ -398,9 +379,7 @@ static const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl = static void STDMETHODCALLTYPE d3d10_geometry_shader_wined3d_object_destroyed(void *parent) { - struct d3d10_geometry_shader *shader = parent; - shader_free_signature(&shader->output_signature); - HeapFree(GetProcessHeap(), 0, shader); + HeapFree(GetProcessHeap(), 0, parent); } static const struct wined3d_parent_ops d3d10_geometry_shader_wined3d_parent_ops = @@ -411,13 +390,14 @@ static const struct wined3d_parent_ops d3d10_geometry_shader_wined3d_parent_ops HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d10_device *device, const void *byte_code, SIZE_T byte_code_length) { + struct wined3d_shader_signature output_signature; struct d3d10_shader_info shader_info; HRESULT hr; shader->ID3D10GeometryShader_iface.lpVtbl = &d3d10_geometry_shader_vtbl; shader->refcount = 1; - shader_info.output_signature = &shader->output_signature; + shader_info.output_signature = &output_signature; hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info); if (FAILED(hr)) { @@ -426,13 +406,12 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct } hr = wined3d_shader_create_gs(device->wined3d_device, shader_info.shader_code, - &shader->output_signature, shader, &d3d10_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader, 4); + &output_signature, shader, &d3d10_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader, 4); + shader_free_signature(&output_signature); if (FAILED(hr)) { WARN("Failed to create wined3d geometry shader, hr %#x.\n", hr); - shader_free_signature(&shader->output_signature); - hr = E_INVALIDARG; - return hr; + return E_INVALIDARG; } return S_OK; @@ -563,9 +542,7 @@ static const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl = static void STDMETHODCALLTYPE d3d10_pixel_shader_wined3d_object_destroyed(void *parent) { - struct d3d10_pixel_shader *shader = parent; - shader_free_signature(&shader->output_signature); - HeapFree(GetProcessHeap(), 0, shader); + HeapFree(GetProcessHeap(), 0, parent); } static const struct wined3d_parent_ops d3d10_pixel_shader_wined3d_parent_ops = @@ -576,13 +553,14 @@ static const struct wined3d_parent_ops d3d10_pixel_shader_wined3d_parent_ops = HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_device *device, const void *byte_code, SIZE_T byte_code_length) { + struct wined3d_shader_signature output_signature; struct d3d10_shader_info shader_info; HRESULT hr; shader->ID3D10PixelShader_iface.lpVtbl = &d3d10_pixel_shader_vtbl; shader->refcount = 1; - shader_info.output_signature = &shader->output_signature; + shader_info.output_signature = &output_signature; hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info); if (FAILED(hr)) { @@ -591,13 +569,12 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ } hr = wined3d_shader_create_ps(device->wined3d_device, shader_info.shader_code, - &shader->output_signature, shader, &d3d10_pixel_shader_wined3d_parent_ops, &shader->wined3d_shader, 4); + &output_signature, shader, &d3d10_pixel_shader_wined3d_parent_ops, &shader->wined3d_shader, 4); + shader_free_signature(&output_signature); if (FAILED(hr)) { WARN("Failed to create wined3d pixel shader, hr %#x.\n", hr); - shader_free_signature(&shader->output_signature); - hr = E_INVALIDARG; - return hr; + return E_INVALIDARG; } shader->device = &device->ID3D10Device1_iface; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 30b597d..e765224 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1970,7 +1970,6 @@ struct wined3d_shader_signature { UINT element_count; struct wined3d_shader_signature_element *elements; - char *string_data; }; struct wined3d_parent_ops

1 0

Sebastian Lackner : kernel32/tests: Add tests for FindFirstFileExW level FindExInfoBasic.
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: a10a4538b7958c7b4f0b333795e40ada1577f316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a10a4538b7958c7b4f0b33379… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 4 06:55:45 2014 +0100 kernel32/tests: Add tests for FindFirstFileExW level FindExInfoBasic. --- dlls/kernel32/tests/file.c | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0973efe..3a30fc2 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2562,7 +2562,7 @@ static void test_FindNextFileA(void) ok ( err == ERROR_NO_MORE_FILES, "GetLastError should return ERROR_NO_MORE_FILES\n"); } -static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags) +static void test_FindFirstFileExA(FINDEX_INFO_LEVELS level, FINDEX_SEARCH_OPS search_ops, DWORD flags) { WIN32_FIND_DATAA search_results; HANDLE handle; @@ -2574,12 +2574,15 @@ static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags) return; } + trace("Running FindFirstFileExA tests with level=%d, search_ops=%d, flags=%u\n", + level, search_ops, flags); + CreateDirectoryA("test-dir", NULL); _lclose(_lcreat("test-dir\\file1", 0)); _lclose(_lcreat("test-dir\\file2", 0)); CreateDirectoryA("test-dir\\dir1", NULL); SetLastError(0xdeadbeef); - handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, search_ops, NULL, flags); + handle = pFindFirstFileExA("test-dir\\*", level, &search_results, search_ops, NULL, flags); if (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("FindFirstFileExA is not implemented\n"); @@ -2590,16 +2593,26 @@ static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags) win_skip("FindFirstFileExA flag FIND_FIRST_EX_LARGE_FETCH not supported, skipping test\n"); goto cleanup; } - ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError()); - ok(strcmp(search_results.cFileName, ".") == 0, "First entry should be '.', is %s\n", search_results.cFileName); + if ((level == FindExInfoBasic) && handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_PARAMETER) + { + win_skip("FindFirstFileExA level FindExInfoBasic not supported, skipping test\n"); + goto cleanup; + } #define CHECK_NAME(fn) (strcmp((fn), "file1") == 0 || strcmp((fn), "file2") == 0 || strcmp((fn), "dir1") == 0) +#define CHECK_LEVEL(fn) (level != FindExInfoBasic || !(fn)[0]) + + ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError()); + ok(strcmp(search_results.cFileName, ".") == 0, "First entry should be '.', is %s\n", search_results.cFileName); + ok(CHECK_LEVEL(search_results.cAlternateFileName), "FindFirstFile unexpectedly returned an alternate filename\n"); ok(FindNextFileA(handle, &search_results), "Fetching second file failed\n"); ok(strcmp(search_results.cFileName, "..") == 0, "Second entry should be '..' is %s\n", search_results.cFileName); + ok(CHECK_LEVEL(search_results.cAlternateFileName), "FindFirstFile unexpectedly returned an alternate filename\n"); ok(FindNextFileA(handle, &search_results), "Fetching third file failed\n"); ok(CHECK_NAME(search_results.cFileName), "Invalid third entry - %s\n", search_results.cFileName); + ok(CHECK_LEVEL(search_results.cAlternateFileName), "FindFirstFile unexpectedly returned an alternate filename\n"); SetLastError(0xdeadbeef); ret = FindNextFileA(handle, &search_results); @@ -2608,26 +2621,31 @@ static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags) skip("File system supports directory filtering\n"); /* Results from the previous call are not cleared */ ok(strcmp(search_results.cFileName, "dir1") == 0, "Third entry should be 'dir1' is %s\n", search_results.cFileName); + ok(CHECK_LEVEL(search_results.cAlternateFileName), "FindFirstFile unexpectedly returned an alternate filename\n"); + } else { ok(ret, "Fetching fourth file failed\n"); ok(CHECK_NAME(search_results.cFileName), "Invalid fourth entry - %s\n", search_results.cFileName); + ok(CHECK_LEVEL(search_results.cAlternateFileName), "FindFirstFile unexpectedly returned an alternate filename\n"); ok(FindNextFileA(handle, &search_results), "Fetching fifth file failed\n"); ok(CHECK_NAME(search_results.cFileName), "Invalid fifth entry - %s\n", search_results.cFileName); + ok(CHECK_LEVEL(search_results.cAlternateFileName), "FindFirstFile unexpectedly returned an alternate filename\n"); ok(FindNextFileA(handle, &search_results) == FALSE, "Fetching sixth file should fail\n"); } #undef CHECK_NAME +#undef CHECK_LEVEL FindClose( handle ); /* Most Windows systems seem to ignore the FIND_FIRST_EX_CASE_SENSITIVE flag. Unofficial documentation * suggests that there are registry keys and that it might depend on the used filesystem. */ SetLastError(0xdeadbeef); - handle = pFindFirstFileExA("TEST-DIR\\*", FindExInfoStandard, &search_results, search_ops, NULL, flags); + handle = pFindFirstFileExA("TEST-DIR\\*", level, &search_results, search_ops, NULL, flags); if (flags & FIND_FIRST_EX_CASE_SENSITIVE) { ok(handle != INVALID_HANDLE_VALUE || GetLastError() == ERROR_PATH_NOT_FOUND, @@ -4192,13 +4210,15 @@ START_TEST(file) test_MoveFileW(); test_FindFirstFileA(); test_FindNextFileA(); - test_FindFirstFileExA(0, 0); - test_FindFirstFileExA(0, FIND_FIRST_EX_CASE_SENSITIVE); - test_FindFirstFileExA(0, FIND_FIRST_EX_LARGE_FETCH); + test_FindFirstFileExA(FindExInfoStandard, 0, 0); + test_FindFirstFileExA(FindExInfoStandard, 0, FIND_FIRST_EX_CASE_SENSITIVE); + test_FindFirstFileExA(FindExInfoStandard, 0, FIND_FIRST_EX_LARGE_FETCH); + test_FindFirstFileExA(FindExInfoBasic, 0, 0); /* FindExLimitToDirectories is ignored if the file system doesn't support directory filtering */ - test_FindFirstFileExA(FindExSearchLimitToDirectories, 0); - test_FindFirstFileExA(FindExSearchLimitToDirectories, FIND_FIRST_EX_CASE_SENSITIVE); - test_FindFirstFileExA(FindExSearchLimitToDirectories, FIND_FIRST_EX_LARGE_FETCH); + test_FindFirstFileExA(FindExInfoStandard, FindExSearchLimitToDirectories, 0); + test_FindFirstFileExA(FindExInfoStandard, FindExSearchLimitToDirectories, FIND_FIRST_EX_CASE_SENSITIVE); + test_FindFirstFileExA(FindExInfoStandard, FindExSearchLimitToDirectories, FIND_FIRST_EX_LARGE_FETCH); + test_FindFirstFileExA(FindExInfoBasic, FindExSearchLimitToDirectories, 0); test_LockFile(); test_file_sharing(); test_offset_in_overlapped_structure();

1 0

Sebastian Lackner : kernel32: Implement FindFirstFileExW level FindExInfoBasic.
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: 91f2bdd05289f3d25753906574e9a80046c07231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f2bdd05289f3d2575390657… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 4 06:55:27 2014 +0100 kernel32: Implement FindFirstFileExW level FindExInfoBasic. --- dlls/kernel32/file.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 4a6fc13..006db1c 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -57,6 +57,7 @@ typedef struct HANDLE handle; /* handle to directory */ CRITICAL_SECTION cs; /* crit section protecting this structure */ FINDEX_SEARCH_OPS search_op; /* Flags passed to FindFirst. */ + FINDEX_INFO_LEVELS level; /* Level passed to FindFirst */ UNICODE_STRING mask; /* file mask */ UNICODE_STRING path; /* NT path used to open the directory */ BOOL is_root; /* is directory the root of the drive? */ @@ -1875,7 +1876,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, SetLastError( ERROR_INVALID_PARAMETER ); return INVALID_HANDLE_VALUE; } - if (level != FindExInfoStandard) + if (level != FindExInfoStandard && level != FindExInfoBasic) { FIXME("info level %d not implemented\n", level ); SetLastError( ERROR_INVALID_PARAMETER ); @@ -1979,6 +1980,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, info->data_size = 0; info->data = NULL; info->search_op = search_op; + info->level = level; if (device) { @@ -2141,8 +2143,14 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) memcpy( data->cFileName, dir_info->FileName, dir_info->FileNameLength ); data->cFileName[dir_info->FileNameLength/sizeof(WCHAR)] = 0; - memcpy( data->cAlternateFileName, dir_info->ShortName, dir_info->ShortNameLength ); - data->cAlternateFileName[dir_info->ShortNameLength/sizeof(WCHAR)] = 0; + + if (info->level != FindExInfoBasic) + { + memcpy( data->cAlternateFileName, dir_info->ShortName, dir_info->ShortNameLength ); + data->cAlternateFileName[dir_info->ShortNameLength/sizeof(WCHAR)] = 0; + } + else + data->cAlternateFileName[0] = 0; TRACE("returning %s (%s)\n", debugstr_w(data->cFileName), debugstr_w(data->cAlternateFileName) );

1 0

Sebastian Lackner : winealsa.drv: Avoid endless loop if registry keys are not accessible.
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: ef1aad985ddf2c4d2cfe38e4b8f4cc3d35d138da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef1aad985ddf2c4d2cfe38e4b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 4 04:54:56 2014 +0100 winealsa.drv: Avoid endless loop if registry keys are not accessible. --- dlls/winealsa.drv/mmdevdrv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index a4c02bf..5f623c0 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -719,7 +719,7 @@ static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EData GUID reg_guid; key_name_size = sizeof(key_name)/sizeof(WCHAR); - if(RegEnumKeyExW(devices_key, i, key_name, &key_name_size, NULL, + if(RegEnumKeyExW(devices_key, i++, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break; @@ -753,8 +753,6 @@ static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EData } RegCloseKey(key); - - ++i; } RegCloseKey(devices_key);

1 0

Matteo Bruni : d3d8/tests: Add an ATI1N entry to the test_volume_blocks test.
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: e16016227f602a1bc1b1ed75a08d973e93f5f168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16016227f602a1bc1b1ed75a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 3 22:38:31 2014 +0100 d3d8/tests: Add an ATI1N entry to the test_volume_blocks test. --- dlls/d3d8/tests/device.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9d498dc..a7b87a2 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -5255,25 +5255,28 @@ static void test_volume_blocks(void) unsigned int block_height; unsigned int block_depth; unsigned int block_size; - BOOL broken; + unsigned int broken; BOOL create_size_checked, core_fmt; } formats[] = { /* Scratch volumes enforce DXTn block locks, unlike their surface counterparts. * ATI2N and YUV blocks are not enforced on any tested card (r200, gtx 460). */ - {D3DFMT_DXT1, "D3DFMT_DXT1", 4, 4, 1, 8, FALSE, TRUE, TRUE }, - {D3DFMT_DXT2, "D3DFMT_DXT2", 4, 4, 1, 16, FALSE, TRUE, TRUE }, - {D3DFMT_DXT3, "D3DFMT_DXT3", 4, 4, 1, 16, FALSE, TRUE, TRUE }, - {D3DFMT_DXT4, "D3DFMT_DXT4", 4, 4, 1, 16, FALSE, TRUE, TRUE }, - {D3DFMT_DXT5, "D3DFMT_DXT5", 4, 4, 1, 16, FALSE, TRUE, TRUE }, - {D3DFMT_DXT5, "D3DFMT_DXT5", 4, 4, 1, 16, FALSE, TRUE, TRUE }, + {D3DFMT_DXT1, "D3DFMT_DXT1", 4, 4, 1, 8, 0, TRUE, TRUE }, + {D3DFMT_DXT2, "D3DFMT_DXT2", 4, 4, 1, 16, 0, TRUE, TRUE }, + {D3DFMT_DXT3, "D3DFMT_DXT3", 4, 4, 1, 16, 0, TRUE, TRUE }, + {D3DFMT_DXT4, "D3DFMT_DXT4", 4, 4, 1, 16, 0, TRUE, TRUE }, + {D3DFMT_DXT5, "D3DFMT_DXT5", 4, 4, 1, 16, 0, TRUE, TRUE }, + {D3DFMT_DXT5, "D3DFMT_DXT5", 4, 4, 1, 16, 0, TRUE, TRUE }, /* ATI2N has 2x2 blocks on all AMD cards and Geforce 7 cards, * which doesn't match the format spec. On newer Nvidia cards - * it has the correct 4x4 block size */ - {MAKEFOURCC('A','T','I','2'), "ATI2N", 4, 4, 1, 16, TRUE, FALSE, FALSE}, - {D3DFMT_YUY2, "D3DFMT_YUY2", 2, 1, 1, 4, TRUE, FALSE, TRUE }, - {D3DFMT_UYVY, "D3DFMT_UYVY", 2, 1, 1, 4, TRUE, FALSE, TRUE }, + * it has the correct 4x4 block size. + * ATI1N volume textures are only supported by AMD GPUs right + * now and locking offsets seem just wrong. */ + {MAKEFOURCC('A','T','I','1'), "ATI1N", 4, 4, 1, 8, 2, FALSE, FALSE}, + {MAKEFOURCC('A','T','I','2'), "ATI2N", 4, 4, 1, 16, 1, FALSE, FALSE}, + {D3DFMT_YUY2, "D3DFMT_YUY2", 2, 1, 1, 4, 1, FALSE, TRUE }, + {D3DFMT_UYVY, "D3DFMT_UYVY", 2, 1, 1, 4, 1, FALSE, TRUE }, }; static const struct { @@ -5421,10 +5424,14 @@ static void test_volume_blocks(void) ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); base = locked_box.pBits; - if (formats[i].broken) + if (formats[i].broken == 1) { expected_row_pitch = bytes_per_pixel * 24; } + else if (formats[i].broken == 2) + { + expected_row_pitch = 24; + } else { expected_row_pitch = (24 /* tex width */ + formats[i].block_height - 1) / formats[i].block_width @@ -5459,12 +5466,18 @@ static void test_volume_blocks(void) ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x, j %u.\n", hr, j); offset = (BYTE *)locked_box.pBits - base; - if (formats[i].broken) + if (formats[i].broken == 1) { expected_offset = box.Front * expected_slice_pitch + box.Top * expected_row_pitch + box.Left * bytes_per_pixel; } + else if (formats[i].broken == 2) + { + expected_offset = box.Front * expected_slice_pitch + + box.Top * expected_row_pitch + + box.Left; + } else { expected_offset = (box.Front / formats[i].block_depth) * expected_slice_pitch

1 0

Henri Verbeet : wined3d: Use the input signature to setup SM4 pixel shader input semantics.
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: 875a7c5426411a08b0e8df620d0f325575b9dd87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875a7c5426411a08b0e8df620… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 4 08:47:45 2014 +0100 wined3d: Use the input signature to setup SM4 pixel shader input semantics. --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/shader.c | 61 ++++++++++++++----- dlls/d3d8/shader.c | 24 ++++++-- dlls/d3d9/shader.c | 20 +++++-- dlls/wined3d/shader.c | 116 +++++++++++++++++++++++-------------- include/wine/wined3d.h | 23 +++++--- 6 files changed, 169 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=875a7c5426411a08b0e8d…

1 0

Henri Verbeet : wined3d: Make a copy of shader signature string data.
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: 909c5cc6fa3edb5ad1c0709e31f67ba927f686ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=909c5cc6fa3edb5ad1c0709e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 4 08:47:42 2014 +0100 wined3d: Make a copy of shader signature string data. --- dlls/wined3d/shader.c | 33 ++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5ae4abc..230b82c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1603,6 +1603,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe static void shader_cleanup(struct wined3d_shader *shader) { + HeapFree(GetProcessHeap(), 0, shader->signature_strings); shader->device->shader_backend->shader_destroy(shader); HeapFree(GetProcessHeap(), 0, shader->reg_maps.constf); HeapFree(GetProcessHeap(), 0, shader->function); @@ -2011,11 +2012,41 @@ static HRESULT vertexshader_init(struct wined3d_shader *shader, struct wined3d_d if (output_signature) { + struct wined3d_shader_signature_element *e; + SIZE_T total, len; + char *ptr; + + total = 0; for (i = 0; i < output_signature->element_count; ++i) { - struct wined3d_shader_signature_element *e = &output_signature->elements[i]; + e = &output_signature->elements[i]; + len = strlen(e->semantic_name); + if (len >= ~(SIZE_T)0 - total) + { + shader_cleanup(shader); + return E_OUTOFMEMORY; + } + + total += len + 1; + } + + if (!(shader->signature_strings = HeapAlloc(GetProcessHeap(), 0, total))) + { + shader_cleanup(shader); + return E_OUTOFMEMORY; + } + ptr = shader->signature_strings; + + for (i = 0; i < output_signature->element_count; ++i) + { + e = &output_signature->elements[i]; reg_maps->output_registers |= 1 << e->register_idx; shader->output_signature[e->register_idx] = *e; + + len = strlen(e->semantic_name); + memcpy(ptr, e->semantic_name, len + 1); + shader->output_signature[e->register_idx].semantic_name = ptr; + ptr += len + 1; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f4ded4f..e5154d3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2879,6 +2879,7 @@ struct wined3d_shader struct wined3d_shader_signature_element input_signature[max(MAX_ATTRIBS, MAX_REG_INPUT)]; struct wined3d_shader_signature_element output_signature[MAX_REG_OUTPUT]; + char *signature_strings; /* Pointer to the parent device */ struct wined3d_device *device;

1 0

Bruno Jesus : dinput: Ensure variable is initialized when #define is not found (Cppcheck).
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: 7e2f26d6fa5d69650eaeb1994328840d0f2251d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2f26d6fa5d69650eaeb1994… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 3 20:23:02 2014 -0200 dinput: Ensure variable is initialized when #define is not found (Cppcheck). --- dlls/dinput/joystick_linux.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index ce04986..4d40124 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -169,6 +169,9 @@ static INT find_joystick_devices(void) WARN("ioctl(%s,JSIOCGAXES) failed: %s, defauting to 2\n", joydev.device, strerror(errno)); joydev.axis_count = 2; } +#else + WARN("reading number of joystick axes unsupported in this platform, defaulting to 2\n"); + joydev.axis_count = 2; #endif #ifdef JSIOCGBUTTONS if (ioctl(fd, JSIOCGBUTTONS, &joydev.button_count) < 0) @@ -176,6 +179,9 @@ static INT find_joystick_devices(void) WARN("ioctl(%s,JSIOCGBUTTONS) failed: %s, defauting to 2\n", joydev.device, strerror(errno)); joydev.button_count = 2; } +#else + WARN("reading number of joystick buttons unsupported in this platform, defaulting to 2\n"); + joydev.button_count = 2; #endif if (ioctl(fd, JSIOCGAXMAP, axes_map) < 0)

1 0

Jonathan Vollebregt : reg/tests: Delete keys manually to prevent timeout on winxp/win2k.
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: 375f9c990562cc352e1dbe014cc7faed271bb06b URL: http://source.winehq.org/git/wine.git/?a=commit;h=375f9c990562cc352e1dbe014… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Mon Nov 3 22:10:44 2014 +0100 reg/tests: Delete keys manually to prevent timeout on winxp/win2k. --- programs/reg/tests/reg.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 3de6f70..cb209a3 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -104,26 +104,39 @@ static void test_add(void) run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest0"); + ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", r); + run_reg_exe("reg add \\\\HKCU\\" KEY_BASE "\\keytest1 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest1"); + ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest2\\\\ /f", &r); todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest2"); + todo_wine ok(err == ERROR_FILE_NOT_FOUND || broken(err == ERROR_SUCCESS /* WinXP */), + "got exit code %d\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3", 0, KEY_READ, &hkey); ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); RegCloseKey(hkey); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3"); + ok(err == ERROR_SUCCESS, "got exit code %d\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest4 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4", 0, KEY_READ, &hkey); ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); RegCloseKey(hkey); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4"); + ok(err == ERROR_SUCCESS, "got exit code %d\n", r); - err = RegDeleteTreeA(HKEY_CURRENT_USER, KEY_BASE); - ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS, "got exit code %d\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: dd0924367e6958f8c73ec7a482a93d5fea9d4255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0924367e6958f8c73ec7a48… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 3 20:35:05 2014 -0200 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 108 +++++++++++++++--------------------------------------------- 1 file changed, 27 insertions(+), 81 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 9b537f0..628abf2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1043,10 +1043,8 @@ msgid "Open File" msgstr "Abrir Arquivo" #: comdlg32.rc:147 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "Nova Pasta" +msgstr "Selecionar pasta" #: comdlg32.rc:83 oleview.rc:98 msgid "Ready" @@ -3554,16 +3552,12 @@ msgid "Expected ')'" msgstr "')' esperado" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Identificador da Chave" +msgstr "Identificador esperado" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "';' esperado" +msgstr "'=' esperado" #: jscript.rc:42 msgid "Invalid character" @@ -3594,20 +3588,16 @@ msgid "Label not found" msgstr "Rótulo não encontrado" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "';' esperado" +msgstr "'@end' esperado" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "Compilação condicional está desligada" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "';' esperado" +msgstr "'@' esperado" #: jscript.rc:54 msgid "Number expected" @@ -6635,10 +6625,8 @@ msgid "This network connection does not exist.\n" msgstr "Esta conexão de rede não existe.\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "Conexão recusada.\n" +msgstr "Conexão redefinida pelo cliente.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -7173,39 +7161,29 @@ msgid "outline button" msgstr "botão de contorno" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "Normal" +msgstr "normal" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Indisponível" +msgstr "indisponível" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "Selecionar" +msgstr "selecionado" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Pausado" +msgstr "focado" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "&Comprimido" +msgstr "pressionado" #: oleacc.rc:102 msgctxt "object state" @@ -7213,32 +7191,24 @@ msgid "checked" msgstr "" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Misturado" +msgstr "misturado" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "&Apenas leitura" +msgstr "somente leitura" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Elemento Ativo" +msgstr "elemento ativo" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "Dispositivos Padrões" +msgstr "padrão" #: oleacc.rc:107 msgctxt "object state" @@ -7266,11 +7236,9 @@ msgid "marqueed" msgstr "" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "animação" +msgstr "animado" #: oleacc.rc:113 msgctxt "object state" @@ -7283,18 +7251,14 @@ msgid "offscreen" msgstr "" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "&habilitar" +msgstr "expansível" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "&habilitar" +msgstr "movível" #: oleacc.rc:117 msgctxt "object state" @@ -7302,25 +7266,19 @@ msgid "self voicing" msgstr "" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Pausado" +msgstr "focável" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "tabela" +msgstr "selecionável" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "atalho" +msgstr "ligado" #: oleacc.rc:121 msgctxt "object state" @@ -7328,46 +7286,34 @@ msgid "traversed" msgstr "" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "tabela" +msgstr "multi selecionável" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Por favor, selecione um arquivo." +msgstr "seleção estendível" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "alerta" +msgstr "alerta baixo" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "alerta" +msgstr "alerta médio" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "alerta" +msgstr "alerta alto" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Protegido contra escrita.\n" +msgstr "protegido" #: oleacc.rc:128 msgctxt "object state"

1 0

Michael Stefaniuc : shlwapi/tests: Simplify empty string check (PVS-Studio ).
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: e3c44185edbaa44f80234bf265790b6fd9ac1585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c44185edbaa44f80234bf26… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 3 23:21:35 2014 +0100 shlwapi/tests: Simplify empty string check (PVS-Studio). --- dlls/shlwapi/tests/path.c | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 1edb31e..7ffa000 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -634,8 +634,7 @@ static void test_PathCombineA(void) ok(str == NULL || broken(str != NULL), /* Win95 and some W2K */ "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0 || - broken(!lstrcmpA(dest, "control")), /* Win95 and some W2K */ + ok(!dest[0] || broken(!lstrcmpA(dest, "control")), /* Win95 and some W2K */ "Expected 0 length, got %i\n", lstrlenA(dest)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); @@ -724,8 +723,7 @@ static void test_PathCombineA(void) lstrcpyA(dest, "control"); str = PathCombineA(dest, "C:\\", too_long); ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0 || - broken(!lstrcmpA(dest, "control")), /* Win95 and some W2K */ + ok(!dest[0] || broken(!lstrcmpA(dest, "control")), /* Win95 and some W2K */ "Expected 0 length, got %i\n", lstrlenA(dest)); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); @@ -734,8 +732,7 @@ static void test_PathCombineA(void) lstrcpyA(dest, "control"); str = PathCombineA(dest, too_long, "one\\two\\three"); ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0 || - broken(!lstrcmpA(dest, "control")), /* Win95 and some W2K */ + ok(!dest[0] || broken(!lstrcmpA(dest, "control")), /* Win95 and some W2K */ "Expected 0 length, got %i\n", lstrlenA(dest)); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); @@ -749,8 +746,7 @@ static void test_PathCombineA(void) lstrcpyA(dest, "control"); str = PathCombineA(dest, one, two); ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0 || - broken(!lstrcmpA(dest, "control")), /* Win95 and some W2K */ + ok(!dest[0] || broken(!lstrcmpA(dest, "control")), /* Win95 and some W2K */ "Expected 0 length, got %i\n", lstrlenA(dest)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); } @@ -772,7 +768,7 @@ static void test_PathAddBackslash(void) SetLastError(0xdeadbeef); str = PathAddBackslashA(path); ok(str == (path + lstrlenA(path)), "Expected str to point to end of path, got %p\n", str); - ok(lstrlenA(path) == 0, "Expected empty string, got %i\n", lstrlenA(path)); + ok(!path[0], "Expected empty string, got %i\n", lstrlenA(path)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try a relative path */ @@ -917,8 +913,7 @@ static void test_PathAppendA(void) res = PathAppendA(too_long, "two\\three"); ok(!res, "Expected failure\n"); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlenA(too_long) == 0 || - broken(lstrlenA(too_long) == (LONG_LEN - 1)), /* Win95 and some W2K */ + ok(!too_long[0] || broken(lstrlenA(too_long) == (LONG_LEN - 1)), /* Win95 and some W2K */ "Expected length of too_long to be zero, got %i\n", lstrlenA(too_long)); /* pszMore is too long */ @@ -929,8 +924,7 @@ static void test_PathAppendA(void) res = PathAppendA(path, too_long); ok(!res, "Expected failure\n"); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlenA(path) == 0 || - broken(!lstrcmpA(path, "C:\\one")), /* Win95 and some W2K */ + ok(!path[0] || broken(!lstrcmpA(path, "C:\\one")), /* Win95 and some W2K */ "Expected length of path to be zero, got %i\n", lstrlenA(path)); /* both params combined are too long */ @@ -941,8 +935,7 @@ static void test_PathAppendA(void) SetLastError(0xdeadbeef); res = PathAppendA(path, half); ok(!res, "Expected failure\n"); - ok(lstrlenA(path) == 0 || - broken(lstrlenA(path) == (HALF_LEN - 1)), /* Win95 and some W2K */ + ok(!path[0] || broken(lstrlenA(path) == (HALF_LEN - 1)), /* Win95 and some W2K */ "Expected length of path to be zero, got %i\n", lstrlenA(path)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); } @@ -1092,7 +1085,7 @@ static void test_PathFindExtensionA(void) SetLastError(0xdeadbeef); ext = PathFindExtensionA(path); ok(ext == path, "Expected ext == path, got %p\n", ext); - ok(lstrlenA(ext) == 0, "Expected length 0, got %i\n", lstrlenA(ext)); + ok(!ext[0], "Expected length 0, got %i\n", lstrlenA(ext)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try a path without an extension */ @@ -1100,7 +1093,7 @@ static void test_PathFindExtensionA(void) SetLastError(0xdeadbeef); ext = PathFindExtensionA(path); ok(ext == path + lstrlenA(path), "Expected ext == path, got %p\n", ext); - ok(lstrlenA(ext) == 0, "Expected length 0, got %i\n", lstrlenA(ext)); + ok(!ext[0], "Expected length 0, got %i\n", lstrlenA(ext)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try a path with an extension */ @@ -1169,8 +1162,7 @@ static void test_PathBuildRootA(void) lstrcpyA(path, "aaaaaaaaa"); root = PathBuildRootA(path, -1); ok(root == path, "Expected root == path, got %p\n", root); - ok(!lstrcmpA(path, "aaaaaaaaa") || - lstrlenA(path) == 0, /* Vista */ + ok(!lstrcmpA(path, "aaaaaaaaa") || !path[0], /* Vista */ "Expected aaaaaaaaa or empty string, got %s\n", path); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); @@ -1179,8 +1171,7 @@ static void test_PathBuildRootA(void) lstrcpyA(path, "aaaaaaaaa"); root = PathBuildRootA(path, 26); ok(root == path, "Expected root == path, got %p\n", root); - ok(!lstrcmpA(path, "aaaaaaaaa") || - lstrlenA(path) == 0, /* Vista */ + ok(!lstrcmpA(path, "aaaaaaaaa") || !path[0], /* Vista */ "Expected aaaaaaaaa or empty string, got %s\n", path); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); @@ -1238,8 +1229,8 @@ static void test_PathCommonPrefixA(void) lstrcpyA(out, "aaa"); count = PathCommonPrefixA(path1, path2, out); ok(count == 0, "Expected 0, got %i\n", count); - ok(lstrlenA(out) == 0, "Expected 0 length out, got %i\n", lstrlenA(out)); - ok(lstrlenA(path1) == 0, "Expected 0 length path1, got %i\n", lstrlenA(path1)); + ok(!out[0], "Expected 0 length out, got %i\n", lstrlenA(out)); + ok(!path1[0], "Expected 0 length path1, got %i\n", lstrlenA(path1)); ok(!lstrcmpA(path2, "C:\\"), "Expected C:\\, got %s\n", path2); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); @@ -1250,8 +1241,8 @@ static void test_PathCommonPrefixA(void) lstrcpyA(out, "aaa"); count = PathCommonPrefixA(path1, path2, out); ok(count == 0, "Expected 0, got %i\n", count); - ok(lstrlenA(out) == 0, "Expected 0 length out, got %i\n", lstrlenA(out)); - ok(lstrlenA(path2) == 0, "Expected 0 length path2, got %i\n", lstrlenA(path2)); + ok(!out[0], "Expected 0 length out, got %i\n", lstrlenA(out)); + ok(!path2[0], "Expected 0 length path2, got %i\n", lstrlenA(path2)); ok(!lstrcmpA(path1, "C:\\"), "Expected C:\\, got %s\n", path1); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); @@ -1406,7 +1397,7 @@ static void test_PathCommonPrefixA(void) ok(count == 0, "Expected 0, got %i\n", count); ok(!lstrcmpA(path1, "one\\..\\two"), "Expected one\\..\\two, got %s\n", path1); ok(!lstrcmpA(path2, "two"), "Expected two, got %s\n", path2); - ok(lstrlenA(out) == 0, "Expected 0 length out, got %i\n", lstrlenA(out)); + ok(!out[0], "Expected 0 length out, got %i\n", lstrlenA(out)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); }

1 0

Iván Matellanes : msvcrt: Use correct type for fread and fwrite return values.
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: 89d91168a08ebe3b14b092755622f1ca69660e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d91168a08ebe3b14b092755… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Nov 3 22:40:53 2014 +0100 msvcrt: Use correct type for fread and fwrite return values. --- dlls/msvcrt/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 295cbdc..fefab94 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3755,7 +3755,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) */ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) { - int ret; + MSVCRT_size_t ret; MSVCRT__lock_file(file); ret = MSVCRT__fwrite_nolock(ptr, size, nmemb, file); @@ -4016,7 +4016,7 @@ int CDECL MSVCRT__fputchar(int c) */ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) { - int ret; + MSVCRT_size_t ret; MSVCRT__lock_file(file); ret = MSVCRT__fread_nolock(ptr, size, nmemb, file);

1 0

Iván Matellanes : msvcrt: Avoid locking the file in _fclose_nolock.
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: 20e0a6f20d094a0a499422a9579597e20eeea722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e0a6f20d094a0a499422a95… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Nov 3 22:40:45 2014 +0100 msvcrt: Avoid locking the file in _fclose_nolock. --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index fe3525c..295cbdc 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3428,7 +3428,7 @@ int CDECL MSVCRT__fclose_nolock(MSVCRT_FILE* file) file->_tmpfname = NULL; /* flush stdio buffers */ if(file->_flag & MSVCRT__IOWRT) - MSVCRT_fflush(file); + MSVCRT__fflush_nolock(file); if(file->_flag & MSVCRT__IOMYBUF) MSVCRT_free(file->_base);

1 0

Michael Stefaniuc : advapi32/tests: Simplify empty string check ( PVS-Studio).
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: bd6c16628f480b6a9acbb9068b59d441ae733db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6c16628f480b6a9acbb9068… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 3 23:06:05 2014 +0100 advapi32/tests: Simplify empty string check (PVS-Studio). --- dlls/advapi32/tests/registry.c | 11 +++++------ dlls/advapi32/tests/service.c | 8 ++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1445f6f..382d8cc 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1546,7 +1546,7 @@ static void test_reg_query_value(void) ret = RegQueryValueA(hkey_main, "subkey", val, NULL); ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlenA(val) == 0, "Expected val to be untouched, got %s\n", val); + ok(!val[0], "Expected val to be untouched, got %s\n", val); /* try a NULL value and size */ ret = RegQueryValueA(hkey_main, "subkey", NULL, NULL); @@ -1559,7 +1559,7 @@ static void test_reg_query_value(void) ret = RegQueryValueA(hkey_main, "subkey", val, &size); ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlenA(val) == 0, "Expected val to be untouched, got %s\n", val); + ok(!val[0], "Expected val to be untouched, got %s\n", val); ok(size == 5, "Expected 5, got %d\n", size); /* successfully read the value using 'subkey' */ @@ -1588,7 +1588,7 @@ static void test_reg_query_value(void) } ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlenW(valW) == 0, "Expected valW to be untouched\n"); + ok(!valW[0], "Expected valW to be untouched\n"); ok(size == sizeof(expected), "Got wrong size: %d\n", size); /* unicode - try size in WCHARS */ @@ -1597,7 +1597,7 @@ static void test_reg_query_value(void) ret = RegQueryValueW(subkey, NULL, valW, &size); ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlenW(valW) == 0, "Expected valW to be untouched\n"); + ok(!valW[0], "Expected valW to be untouched\n"); ok(size == sizeof(expected), "Got wrong size: %d\n", size); /* unicode - successfully read the value */ @@ -1764,8 +1764,7 @@ static void test_reg_delete_tree(void) ret = RegQueryValueA(subkey, NULL, buffer, &size); ok(ret == ERROR_SUCCESS, "Default value of subkey is not present\n"); - ok(!lstrlenA(buffer), - "Expected length 0 got length %u(%s)\n", lstrlenA(buffer), buffer); + ok(!buffer[0], "Expected length 0 got length %u(%s)\n", lstrlenA(buffer), buffer); size = MAX_PATH; ok(RegQueryValueA(subkey, "value", buffer, &size), "Value is still present\n"); diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index beb589d..ad81a25 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1398,8 +1398,8 @@ static void test_enum_svc(void) SERVICE_STATUS status = services[i].ServiceStatus; /* lpServiceName and lpDisplayName should always be filled */ - ok(lstrlenA(services[i].lpServiceName) > 0, "Expected a service name\n"); - ok(lstrlenA(services[i].lpDisplayName) > 0, "Expected a display name\n"); + ok(services[i].lpServiceName[0], "Expected a service name\n"); + ok(services[i].lpDisplayName[0], "Expected a display name\n"); /* Decrement the counters to see if the functions calls return the same * numbers as the contents of these structures. @@ -1701,8 +1701,8 @@ static void test_enum_svc(void) SERVICE_STATUS_PROCESS status = exservices[i].ServiceStatusProcess; /* lpServiceName and lpDisplayName should always be filled */ - ok(lstrlenA(exservices[i].lpServiceName) > 0, "Expected a service name\n"); - ok(lstrlenA(exservices[i].lpDisplayName) > 0, "Expected a display name\n"); + ok(exservices[i].lpServiceName[0], "Expected a service name\n"); + ok(exservices[i].lpDisplayName[0], "Expected a display name\n"); /* Decrement the counters to see if the functions calls return the * same numbers as the contents of these structures.

1 0

Jonathan Vollebregt : reg/tests: Move key format test section below first key creation.
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: 1256177dc2a2975bccad2912f171f1fae97bab14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1256177dc2a2975bccad2912f… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Mon Nov 3 22:10:45 2014 +0100 reg/tests: Move key format test section below first key creation. --- programs/reg/tests/reg.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index cb209a3..9449429 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -88,7 +88,7 @@ static void verify_reg_(unsigned line, HKEY hkey, const char* value, static void test_add(void) { - HKEY hkey; + HKEY hkey, subkey; LONG err; DWORD r, dword, type, size; char buffer[22]; @@ -102,6 +102,13 @@ static void test_add(void) err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); + + /* Test input key formats */ run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest0"); @@ -121,29 +128,20 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3", 0, KEY_READ, &hkey); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3", 0, KEY_READ, &subkey); ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); - RegCloseKey(hkey); + RegCloseKey(subkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3"); ok(err == ERROR_SUCCESS, "got exit code %d\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest4 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4", 0, KEY_READ, &hkey); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4", 0, KEY_READ, &subkey); ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); - RegCloseKey(hkey); + RegCloseKey(subkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4"); ok(err == ERROR_SUCCESS, "got exit code %d\n", r); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS, "got exit code %d\n", r); - - run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); - /* REG_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),

1 0

Austin English : ntoskrnl.exe: Add a stub for IoRegisterPlugPlayNotification.
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: 825673210ffebc7193dede0c5e7247ded221561a URL: http://source.winehq.org/git/wine.git/?a=commit;h=825673210ffebc7193dede0c5… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 3 13:08:24 2014 -0600 ntoskrnl.exe: Add a stub for IoRegisterPlugPlayNotification. --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 23379b8..a31b186 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1936,3 +1936,14 @@ NTSTATUS WINAPI ObQueryNameString(PVOID object, POBJECT_NAME_INFORMATION name, U FIXME("(%p %p %u %p) stub\n", object, name, maxlength, returnlength); return STATUS_NOT_IMPLEMENTED; } + +/***************************************************** + * IoRegisterPlugPlayNotification (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoRegisterPlugPlayNotification(IO_NOTIFICATION_EVENT_CATEGORY category, ULONG flags, PVOID data, + PDRIVER_OBJECT driver, PDRIVER_NOTIFICATION_CALLBACK_ROUTINE callback, + PVOID context, PVOID *notification) +{ + FIXME("(%u %u %p %p %p %p %p) stub\n", category, flags, data, driver, callback, context, notification); + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 1512cf8..4ead907 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -430,7 +430,7 @@ @ stdcall IoRegisterFileSystem(ptr) @ stub IoRegisterFsRegistrationChange @ stub IoRegisterLastChanceShutdownNotification -@ stub IoRegisterPlugPlayNotification +@ stdcall IoRegisterPlugPlayNotification(long long ptr ptr ptr ptr ptr) @ stdcall IoRegisterShutdownNotification(ptr) @ stdcall IoReleaseCancelSpinLock(ptr) @ stub IoReleaseRemoveLockAndWaitEx diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index f6aef8f..56f2f35 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -127,11 +127,20 @@ typedef struct _IMAGE_INFO ULONG ImageSectionNumber; } IMAGE_INFO, *PIMAGE_INFO; +typedef enum _IO_NOTIFICATION_EVENT_CATEGORY +{ + EventCategoryReserved, + EventCategoryHardwareProfileChange, + EventCategoryDeviceInterfaceChange, + EventCategoryTargetDeviceChange +} IO_NOTIFICATION_EVENT_CATEGORY; + typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION { LARGE_INTEGER ValidDataLength; } FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION; +typedef VOID (WINAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(PVOID,PVOID); typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO); typedef NTSTATUS (WINAPI *PIO_QUERY_DEVICE_ROUTINE)(PVOID,PUNICODE_STRING,INTERFACE_TYPE,ULONG,

1 0

Bruno Jesus : ws2_32: Add tests and implement inet_pton.
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Module: wine Branch: master Commit: 344bc6d72bb901eba97414fe367718a89b8778a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=344bc6d72bb901eba97414fe3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 3 19:16:14 2014 -0200 ws2_32: Add tests and implement inet_pton. Special thanks to Erich Hoover. --- dlls/ws2_32/socket.c | 34 ++++++++++++++ dlls/ws2_32/tests/sock.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + 3 files changed, 149 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0bcce40..b3db306 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6911,6 +6911,40 @@ PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, SIZE_T len ) } /*********************************************************************** +* inet_pton (WS2_32.@) +*/ +INT WINAPI WS_inet_pton( INT family, PCSTR addr, PVOID buffer) +{ +#ifdef HAVE_INET_PTON + int unixaf, ret; + + TRACE("family %d, addr '%s', buffer (%p)\n", family, addr ? addr : "(null)", buffer); + + if (!addr || !buffer) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + unixaf = convert_af_w2u(family); + if (unixaf != AF_INET && unixaf != AF_INET6) + { + SetLastError(WSAEAFNOSUPPORT); + return SOCKET_ERROR; + } + + ret = inet_pton(unixaf, addr, buffer); + if (ret == -1) SetLastError(wsaErrno()); + return ret; +#else + FIXME( "not supported on this platform\n" ); + WSASetLastError( WSAEAFNOSUPPORT ); + return SOCKET_ERROR; +#endif +} + + +/*********************************************************************** * WSAStringToAddressA (WS2_32.80) */ INT WINAPI WSAStringToAddressA(LPSTR AddressString, diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0ad6e8a..0c39545 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -67,6 +67,7 @@ static int (WINAPI *pgetaddrinfo)(LPCSTR,LPCSTR,const struct addrinfo *,struct static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW); static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *); static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); +static int (WINAPI *pInetPton)(INT,LPSTR,LPVOID); static int (WINAPI *pWSALookupServiceBeginW)(LPWSAQUERYSETW,DWORD,LPHANDLE); static int (WINAPI *pWSALookupServiceEnd)(HANDLE); static int (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); @@ -1139,6 +1140,7 @@ static void Init (void) pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); + pInetPton = (void *)GetProcAddress(hws2_32, "inet_pton"); pWSALookupServiceBeginW = (void *)GetProcAddress(hws2_32, "WSALookupServiceBeginW"); pWSALookupServiceEnd = (void *)GetProcAddress(hws2_32, "WSALookupServiceEnd"); pWSALookupServiceNextW = (void *)GetProcAddress(hws2_32, "WSALookupServiceNextW"); @@ -3987,6 +3989,117 @@ static void test_addr_to_print(void) pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, 18); ok(pdst != NULL, "The pointer should be returned (%p)\n", pdst); } +static void test_inet_pton(void) +{ + struct TEST_DATA + { + int family, ret; + DWORD err; + const char *printable, *collapsed, *raw_data; + } tests[] = { + {AF_UNSPEC, -1, WSAEFAULT, /* Test 0 */ + NULL, NULL, NULL}, + {AF_INET, -1, WSAEFAULT, + NULL, NULL, NULL}, + {AF_INET6, -1, WSAEFAULT, + NULL, NULL, NULL}, + {AF_UNSPEC, -1, WSAEAFNOSUPPORT, + "127.0.0.1", NULL, NULL}, + {AF_INET, 1, 0, + "127.0.0.1", "127.0.0.1", + "\x7f\x00\x00\x01"}, + {AF_INET6, 0, 0, + "127.0.0.1", "127.0.0.1", NULL}, + {AF_INET, 0, 0, + "::1/128", NULL, NULL}, + {AF_INET6, 0, 0, + "::1/128", NULL, NULL}, + {AF_UNSPEC, -1, WSAEAFNOSUPPORT, + "broken", NULL, NULL}, + {AF_INET, 0, 0, + "broken", NULL, NULL}, + {AF_INET6, 0, 0, /* Test 10 */ + "broken", NULL, NULL}, + {AF_UNSPEC, -1, WSAEAFNOSUPPORT, + "177.32.45.20", NULL, NULL}, + {AF_INET, 1, 0, + "177.32.45.20", "177.32.45.20", + "\xb1\x20\x2d\x14"}, + {AF_INET6, 0, 0, + "177.32.45.20", NULL, NULL}, + {AF_INET, 0, 0, + "2607:f0d0:1002:51::4", NULL, NULL}, + {AF_INET6, 1, 0, + "2607:f0d0:1002:51::4", "2607:f0d0:1002:51::4", + "\x26\x07\xf0\xd0\x10\x02\x00\x51\x00\x00\x00\x00\x00\x00\x00\x04"}, + {AF_INET, 0, 0, + "::177.32.45.20", NULL, NULL}, + {AF_INET6, 1, 0, + "::177.32.45.20", "::177.32.45.20", + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xb1\x20\x2d\x14"}, + {AF_INET, 0, 0, + "fe80::0202:b3ff:fe1e:8329", NULL, NULL}, + {AF_INET6, 1, 0, + "fe80::0202:b3ff:fe1e:8329", "fe80::202:b3ff:fe1e:8329", + "\xfe\x80\x00\x00\x00\x00\x00\x00\x02\x02\xb3\xff\xfe\x1e\x83\x29"}, + {AF_INET6, 1, 0, /* Test 20 */ + "fe80::202:b3ff:fe1e:8329", "fe80::202:b3ff:fe1e:8329", + "\xfe\x80\x00\x00\x00\x00\x00\x00\x02\x02\xb3\xff\xfe\x1e\x83\x29"}, + {AF_INET, 0, 0, + "a", NULL, NULL}, + {AF_INET, 0, 0, + "a.b", NULL, NULL}, + {AF_INET, 0, 0, + "a.b.c", NULL, NULL}, + {AF_INET, 0, 0, + "a.b.c.d", NULL, NULL}, + {AF_INET6, 1, 0, + "2001:cdba:0000:0000:0000:0000:3257:9652", "2001:cdba::3257:9652", + "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"}, + {AF_INET6, 1, 0, + "2001:cdba::3257:9652", "2001:cdba::3257:9652", + "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"}, + {AF_INET6, 1, 0, + "2001:cdba:0:0:0:0:3257:9652", "2001:cdba::3257:9652", + "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"} + }; + int i, ret; + DWORD err; + char buffer[64],str[64]; + const char *ptr; + + /* InetNtop and InetPton became available in Vista and Win2008 */ + if (!pInetNtop || !pInetPton) + { + win_skip("InetNtop and/or InetPton not present, not executing tests\n"); + return; + } + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + WSASetLastError(0xdeadbeef); + ret = pInetPton(tests[i].family, (char *)tests[i].printable, buffer); + ok (ret == tests[i].ret, "Test [%d]: Expected %d, got %d\n", i, tests[i].ret, ret); + if (tests[i].ret == -1) + { + err = WSAGetLastError(); + ok (tests[i].err == err, "Test [%d]: Expected 0x%x, got 0x%x\n", i, tests[i].err, err); + } + if (tests[i].ret != 1) continue; + ok (memcmp(buffer, tests[i].raw_data, + tests[i].family == AF_INET ? sizeof(struct in_addr) : sizeof(struct in6_addr)) == 0, + "Test [%d]: Expected binary data differs\n", i); + + /* Test the result from Pton with Ntop */ + strcpy (str, "deadbeef"); + ptr = pInetNtop(tests[i].family, buffer, str, sizeof(str)); + ok (ptr != NULL, "Test [%d]: Failed with NULL\n", i); + ok (ptr == str, "Test [%d]: Pointers differ (%p != %p)\n", i, ptr, str); + if (!ptr) continue; + ok (strcmp(ptr, tests[i].collapsed) == 0, "Test [%d]: Expected '%s', got '%s'\n", + i, tests[i].collapsed, ptr); + } +} static void test_ioctlsocket(void) { @@ -7739,6 +7852,7 @@ START_TEST( sock ) Init(); test_inet_ntoa(); + test_inet_pton(); test_set_getsockopt(); test_so_reuseaddr(); test_ip_pktinfo(); diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 0811b74..f7c6c2d 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -121,3 +121,4 @@ @ stdcall getaddrinfo(str str ptr ptr) WS_getaddrinfo @ stdcall getnameinfo(ptr long ptr long ptr long long) WS_getnameinfo @ stdcall inet_ntop(long ptr ptr long) WS_inet_ntop +@ stdcall inet_pton(long ptr ptr) WS_inet_pton

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.30
by Jeremy Newman Nov. 3, 2014

Nov. 3, 2014

Module: website Branch: master Commit: fcc2e914d561397b1317aa37233c05e0c2c880e5 URL: http://source.winehq.org/git/website.git/?a=commit;h=fcc2e914d561397b1317aa… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Oct 31 17:23:03 2014 +0100 Polish translation for release 1.7.30 --- news/pl/2014103101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2014103101.xml b/news/pl/2014103101.xml new file mode 100644 index 0000000..db5c5f7 --- /dev/null +++ b/news/pl/2014103101.xml @@ -0,0 +1,16 @@ +<news> +<date>Październik 31, 2014</date> +<title>Wydano Wine 1.7.30</title> +<body> + Wydanie rozwojowe Wine 1.7.30 jest już dostępne. + <a href="{$root}/announce/1.7.30">Co nowego</a> w tym wydaniu: +<ul> + <li>Pełniejsza obsługa czcionek w DirectWrite.</li> + <li>Ulepszono obsługę ATL thunk.</li> + <li>Dodano więcej funkcji bibliotek uruchomieniowych C.</li> + <li>Poprawiono importowanie/eksportowanie w regedit.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.30.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.30
by Jeremy Newman Nov. 3, 2014

Nov. 3, 2014

Module: website Branch: master Commit: 91dbeb545c5aa7220ca2b3b879b53b38a112d37d URL: http://source.winehq.org/git/website.git/?a=commit;h=91dbeb545c5aa7220ca2b3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 1 21:26:31 2014 +0100 French translation for release 1.7.30 --- news/fr/2014103101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014103101.xml b/news/fr/2014103101.xml new file mode 100644 index 0000000..74aff99 --- /dev/null +++ b/news/fr/2014103101.xml @@ -0,0 +1,15 @@ +<news> +<date>31 octobre 2014</date> +<title>Sortie de Wine 1.7.30</title> +<body> + La version de développement 1.7.30 de Wine est disponible. + <a href="{$root}/announce/1.7.30">Nouveautés</a> de cette version : +<ul> + <li>Meilleure prise en charge des polices de caractères dans DirectWrite.</li> + <li>Prise en charge améliorée des thunks ATL.</li> + <li>Plusieurs fonctions additionnelles dans le moteur d'exécution C.</li> + <li>Correctifs dans l'import/export de regedit</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.30.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Bruno Jesus : comctl32/tests: Remove a dead assignment in misc.c (Cppcheck ).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: a2818db03b9c74ac1ca5f0f0cd2df13dcd7501c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2818db03b9c74ac1ca5f0f0c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 23:43:57 2014 -0200 comctl32/tests: Remove a dead assignment in misc.c (Cppcheck). --- dlls/comctl32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 69a7db4..280b46c 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -75,7 +75,7 @@ static void test_GetPtrAW(void) static char dest[MAX_PATH]; int sourcelen; int destsize = MAX_PATH; - int count = -1; + int count; sourcelen = strlen(source) + 1;

1 0

Michael Stefaniuc : d3d8/tests: Remove an always false condition ( PVS-Studio).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 4a67e66a3dd5473dbddf37a535673b95451801d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a67e66a3dd5473dbddf37a53… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 22:29:55 2014 +0100 d3d8/tests: Remove an always false condition (PVS-Studio). --- dlls/d3d8/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ba73bb6..163110c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -66,7 +66,7 @@ static DWORD getPixelColor(IDirect3DDevice8 *device, UINT x, UINT y) return 0xdeadbeef; } hr = IDirect3DTexture8_GetSurfaceLevel(tex, 0, &surf); - if(FAILED(hr) || !tex ) /* This is not a test */ + if (FAILED(hr)) /* This is not a test */ { trace("Can't get surface from texture, hr=%#08x\n", hr); ret = 0xdeadbeee;

1 0

Henri Verbeet : d2d1: Pass the correct vtbl in d2d_linear_gradient_brush_init().
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 56a0e32317dd711f50bdcdc0e19e4418fe404ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a0e32317dd711f50bdcdc0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:36 2014 +0100 d2d1: Pass the correct vtbl in d2d_linear_gradient_brush_init(). --- dlls/d2d1/brush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index ed92d60..6e46036 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -412,5 +412,5 @@ void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget * { FIXME("Ignoring brush properties.\n"); - d2d_brush_init(brush, render_target, brush_desc, (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl); + d2d_brush_init(brush, render_target, brush_desc, (ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl); }

1 0

Sebastian Lackner : user32: Fix invalid argument passed to ExtCreateRegion.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: b43f13f8926b3610db4effeba7f531a8ecc0c2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43f13f8926b3610db4effeba… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 3 06:54:16 2014 +0100 user32: Fix invalid argument passed to ExtCreateRegion. --- dlls/user32/painting.c | 4 ++-- dlls/user32/winpos.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 63e09c5..5c1dc69 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -139,7 +139,7 @@ static void update_visible_region( struct dce *dce ) data->rdh.iType = RDH_RECTANGLES; data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nRgnSize = reply_size; - vis_rgn = ExtCreateRegion( NULL, size, data ); + vis_rgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); top_win = wine_server_ptr_handle( reply->top_win ); win_rect.left = reply->win_rect.left; @@ -557,7 +557,7 @@ static HRGN get_update_region( HWND hwnd, UINT *flags, HWND *child ) data->rdh.iType = RDH_RECTANGLES; data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nRgnSize = reply_size; - hrgn = ExtCreateRegion( NULL, size, data ); + hrgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); if (child) *child = wine_server_ptr_handle( reply->child ); *flags = reply->flags; } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 0a70942..5373733 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -131,7 +131,7 @@ int WINAPI GetWindowRgn ( HWND hwnd, HRGN hrgn ) data->rdh.iType = RDH_RECTANGLES; data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nRgnSize = reply_size; - win_rgn = ExtCreateRegion( NULL, size, data ); + win_rgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); } } else size = reply->total_size; @@ -532,7 +532,7 @@ void map_window_region( HWND from, HWND to, HRGN hrgn ) rect[i].top += offset.y; rect[i].bottom += offset.y; } - if ((new_rgn = ExtCreateRegion( NULL, data->rdh.nCount, data ))) + if ((new_rgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ))) { CombineRgn( hrgn, new_rgn, 0, RGN_COPY ); DeleteObject( new_rgn ); @@ -2018,7 +2018,7 @@ static void update_surface_region( HWND hwnd ) data->rdh.iType = RDH_RECTANGLES; data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nRgnSize = reply_size; - region = ExtCreateRegion( NULL, size, data ); + region = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); OffsetRgn( region, -reply->visible_rect.left, -reply->visible_rect.top ); } }

1 0

Michael Stefaniuc : gdi32: Remove a basically unused variable (PVS-Studio) .
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: b5a405af2f8034811bc120698fb0cbd0b9fa3dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a405af2f8034811bc120698… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 22:31:29 2014 +0100 gdi32: Remove a basically unused variable (PVS-Studio). --- dlls/gdi32/freetype.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d49a3f8..924f5f3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6937,7 +6937,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, INT x, src_pitch, src_width, src_height, rgb_interval, hmul, vmul; INT x_shift, y_shift; BOOL rgb; - FT_LcdFilter lcdfilter = FT_LCD_FILTER_DEFAULT; FT_Render_Mode render_mode = (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_HBGR_BITMAP)? FT_RENDER_MODE_LCD: FT_RENDER_MODE_LCD_V; @@ -6948,20 +6947,17 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, return GDI_ERROR; } - if ( lcdfilter == FT_LCD_FILTER_DEFAULT || lcdfilter == FT_LCD_FILTER_LIGHT ) + if ( render_mode == FT_RENDER_MODE_LCD) { - if ( render_mode == FT_RENDER_MODE_LCD) - { - gm.gmBlackBoxX += 2; - gm.gmptGlyphOrigin.x -= 1; - left -= (1 << 6); - } - else - { - gm.gmBlackBoxY += 2; - gm.gmptGlyphOrigin.y += 1; - top += (1 << 6); - } + gm.gmBlackBoxX += 2; + gm.gmptGlyphOrigin.x -= 1; + left -= (1 << 6); + } + else + { + gm.gmBlackBoxY += 2; + gm.gmptGlyphOrigin.y += 1; + top += (1 << 6); } width = gm.gmBlackBoxX; @@ -6981,7 +6977,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki); if ( pFT_Library_SetLcdFilter ) - pFT_Library_SetLcdFilter( library, lcdfilter ); + pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT ); pFT_Render_Glyph (ft_face->glyph, render_mode); src = ft_face->glyph->bitmap.buffer;

1 0