April 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : kernel32/tests: Add tests for deleting readonly files with NtCreateFile.
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: 10ee3f44b1119c7b7e1d4684e691a6cea5713ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ee3f44b1119c7b7e1d4684e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 17 11:22:51 2015 +0200 kernel32/tests: Add tests for deleting readonly files with NtCreateFile. Wine currently implements DeleteFile based on NtCreateFile with access mask GENERIC_READ | GENERIC_WRITE | DELETE, but this is wrong. This test shows that NtCreateFile with FILE_DELETE_ON_CLOSE should also fail without explicitly requesting read/write access. --- dlls/kernel32/tests/file.c | 77 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 99fffab..9a6e972 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -28,10 +28,13 @@ #include <time.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "wine/test.h" #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winternl.h" #include "winnls.h" #include "fileapi.h" @@ -48,6 +51,10 @@ static HRESULT (WINAPI *pCopyFile2)(PCWSTR,PCWSTR,COPYFILE2_EXTENDED_PARAMETERS* static HANDLE (WINAPI *pCreateFile2)(LPCWSTR, DWORD, DWORD, DWORD, CREATEFILE2_EXTENDED_PARAMETERS*); static DWORD (WINAPI *pGetFinalPathNameByHandleA)(HANDLE, LPSTR, DWORD, DWORD); static DWORD (WINAPI *pGetFinalPathNameByHandleW)(HANDLE, LPWSTR, DWORD, DWORD); +static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, + PLARGE_INTEGER, ULONG, ULONG, ULONG, ULONG, PVOID, ULONG); +static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR*); +static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING, PCANSI_STRING, BOOLEAN); static const char filename[] = "testfile.xxx"; static const char sillytext[] = @@ -72,8 +79,13 @@ struct test_list { static void InitFunctionPointers(void) { + HMODULE hntdll = GetModuleHandleA("ntdll"); HMODULE hkernel32 = GetModuleHandleA("kernel32"); + pNtCreateFile = (void *)GetProcAddress(hntdll, "NtCreateFile"); + pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); + pRtlAnsiStringToUnicodeString = (void *)GetProcAddress(hntdll, "RtlAnsiStringToUnicodeString"); + pFindFirstFileExA=(void*)GetProcAddress(hkernel32, "FindFirstFileExA"); pReplaceFileA=(void*)GetProcAddress(hkernel32, "ReplaceFileA"); pReplaceFileW=(void*)GetProcAddress(hkernel32, "ReplaceFileW"); @@ -243,15 +255,36 @@ static void test__lclose( void ) ok( ret != 0, "DeleteFile failed (%d)\n", GetLastError( ) ); } +/* helper function for test__lcreat */ +static void get_nt_pathW( const char *name, UNICODE_STRING *nameW ) +{ + UNICODE_STRING strW; + ANSI_STRING str; + NTSTATUS status; + BOOLEAN ret; + RtlInitAnsiString( &str, name ); + + status = pRtlAnsiStringToUnicodeString( &strW, &str, TRUE ); + ok( !status, "RtlAnsiStringToUnicodeString failed with %08x\n", status ); + + ret = pRtlDosPathNameToNtPathName_U( strW.Buffer, nameW, NULL, NULL ); + ok( ret, "RtlDosPathNameToNtPathName_U failed\n" ); + + RtlFreeUnicodeString( &strW ); +} static void test__lcreat( void ) { + UNICODE_STRING filenameW; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; HFILE filehandle; char buffer[10000]; WIN32_FIND_DATAA search_results; char slashname[] = "testfi/"; int err; - HANDLE find; + HANDLE find, file; + NTSTATUS status; BOOL ret; filehandle = _lcreat( filename, 0 ); @@ -287,12 +320,54 @@ static void test__lcreat( void ) ok( INVALID_HANDLE_VALUE != find, "should be able to find file\n" ); FindClose( find ); + SetLastError( 0xdeadbeef ); ok( 0 == DeleteFileA( filename ), "shouldn't be able to delete a readonly file\n" ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError() ); ok( SetFileAttributesA(filename, FILE_ATTRIBUTE_NORMAL ) != 0, "couldn't change attributes on file\n" ); ok( DeleteFileA( filename ) != 0, "now it should be possible to delete the file!\n" ); + filehandle = _lcreat( filename, 1 ); /* readonly */ + ok( HFILE_ERROR != filehandle, "couldn't create file \"%s\" (err=%d)\n", filename, GetLastError() ); + ok( HFILE_ERROR != _hwrite( filehandle, sillytext, strlen(sillytext) ), + "_hwrite shouldn't be able to write never the less\n" ); + ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains\n" ); + + find = FindFirstFileA( filename, &search_results ); + ok( INVALID_HANDLE_VALUE != find, "should be able to find file\n" ); + FindClose( find ); + + get_nt_pathW( filename, &filenameW ); + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &filenameW; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = NtCreateFile( &file, GENERIC_READ | GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0 ); + ok( status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %08x\n", status ); + ok( GetFileAttributesA( filename ) != INVALID_FILE_ATTRIBUTES, "file was deleted\n" ); + + status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0 ); + todo_wine + ok( status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %08x\n", status ); + if (!status) CloseHandle( file ); + + RtlFreeUnicodeString( &filenameW ); + + todo_wine + ok( GetFileAttributesA( filename ) != INVALID_FILE_ATTRIBUTES, "file was deleted\n" ); + todo_wine + ok( SetFileAttributesA(filename, FILE_ATTRIBUTE_NORMAL ) != 0, "couldn't change attributes on file\n" ); + todo_wine + ok( DeleteFileA( filename ) != 0, "now it should be possible to delete the file\n" ); + filehandle = _lcreat( filename, 2 ); ok( HFILE_ERROR != filehandle, "couldn't create file \"%s\" (err=%d)\n", filename, GetLastError( ) );

1 0

Matteo Bruni : wined3d: Report ATI1N and ATI2N volume textures as not supported.
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: 15720f09de76c451f0f145cd2a6d2312324d9bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=15720f09de76c451f0f145cd2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 29 23:34:24 2015 +0200 wined3d: Report ATI1N and ATI2N volume textures as not supported. --- dlls/wined3d/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8a7075d..eb2cbfa 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2311,6 +2311,11 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = getFmtIdx(WINED3DFMT_DXT5); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + /* Similarly with ATI1N / ATI2N and GL_ARB_texture_compression_rgtc. */ + idx = getFmtIdx(WINED3DFMT_ATI1N); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = getFmtIdx(WINED3DFMT_ATI2N); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } static BOOL init_format_vertex_info(struct wined3d_gl_info *gl_info)

1 0

Matteo Bruni : wined3d: Allow texture updates in some cases even when mip levels don't match.
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: 5af656ea85e22a00304f1904e91ccfee52a6ccc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af656ea85e22a00304f1904e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 29 23:34:27 2015 +0200 wined3d: Allow texture updates in some cases even when mip levels don't match. --- dlls/wined3d/device.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a3fbe25..1f4216a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3533,7 +3533,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture) { enum wined3d_resource_type type; - unsigned int level_count, i; + unsigned int level_count, i, j, src_size, dst_size, src_skip_levels = 0; HRESULT hr; struct wined3d_context *context; @@ -3565,12 +3565,20 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - /* Check that both textures have the identical numbers of levels. */ - level_count = wined3d_texture_get_level_count(src_texture); - if (wined3d_texture_get_level_count(dst_texture) != level_count) + level_count = min(wined3d_texture_get_level_count(src_texture), + wined3d_texture_get_level_count(dst_texture)); + + src_size = max(src_texture->resource.width, src_texture->resource.height); + dst_size = max(dst_texture->resource.width, dst_texture->resource.height); + if (type == WINED3D_RTYPE_VOLUME) { - WARN("Source and destination have different level counts, returning WINED3DERR_INVALIDCALL.\n"); - return WINED3DERR_INVALIDCALL; + src_size = max(src_size, src_texture->resource.depth); + dst_size = max(dst_size, dst_texture->resource.depth); + } + while (src_size > dst_size) + { + src_size >>= 1; + ++src_skip_levels; } /* Make sure that the destination texture is loaded. */ @@ -3588,7 +3596,8 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, for (i = 0; i < level_count; ++i) { - src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, i)); + src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, + i + src_skip_levels)); dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, i)); hr = wined3d_device_update_surface(device, src_surface, NULL, dst_surface, NULL); if (FAILED(hr)) @@ -3604,16 +3613,23 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, { struct wined3d_surface *src_surface; struct wined3d_surface *dst_surface; + unsigned int src_levels = wined3d_texture_get_level_count(src_texture); + unsigned int dst_levels = wined3d_texture_get_level_count(dst_texture); - for (i = 0; i < level_count * 6; ++i) + for (i = 0; i < 6; ++i) { - src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, i)); - dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, i)); - hr = wined3d_device_update_surface(device, src_surface, NULL, dst_surface, NULL); - if (FAILED(hr)) + for (j = 0; j < level_count; ++j) { - WARN("Failed to update surface, hr %#x.\n", hr); - return hr; + src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, + i * src_levels + j + src_skip_levels)); + dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, + i * dst_levels + j)); + hr = wined3d_device_update_surface(device, src_surface, NULL, dst_surface, NULL); + if (FAILED(hr)) + { + WARN("Failed to update surface, hr %#x.\n", hr); + return hr; + } } } break; @@ -3624,7 +3640,8 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, for (i = 0; i < level_count; ++i) { hr = device_update_volume(device, - volume_from_resource(wined3d_texture_get_sub_resource(src_texture, i)), + volume_from_resource(wined3d_texture_get_sub_resource(src_texture, + i + src_skip_levels)), volume_from_resource(wined3d_texture_get_sub_resource(dst_texture, i))); if (FAILED(hr)) {

1 0

Matteo Bruni : wined3d: Don' t use the same va_list multiple times in shader_vaddline().
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: f7e09276227e23a17626b292279326e51b2b2708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e09276227e23a17626b2922… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 29 23:34:28 2015 +0200 wined3d: Don't use the same va_list multiple times in shader_vaddline(). --- dlls/wined3d/glsl_shader.c | 14 ++++++-- dlls/wined3d/shader.c | 79 ++++++++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 58 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e814c66..19c3d31 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2762,6 +2762,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s struct color_fixup_desc fixup; BOOL np2_fixup = FALSE; va_list args; + int ret; shader_glsl_swizzle_to_str(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); @@ -2791,9 +2792,16 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s shader_addline(ins->ctx->buffer, "%s(%s_sampler%u, ", sample_function->name, shader_glsl_get_prefix(version->type), sampler); - va_start(args, coord_reg_fmt); - shader_vaddline(ins->ctx->buffer, coord_reg_fmt, args); - va_end(args); + for (;;) + { + va_start(args, coord_reg_fmt); + ret = shader_vaddline(ins->ctx->buffer, coord_reg_fmt, args); + va_end(args); + if (!ret) + break; + if (!string_buffer_resize(ins->ctx->buffer, ret)) + break; + } if(bias) { shader_addline(ins->ctx->buffer, ", %s)%s);\n", bias, dst_swizzle); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 87a22c2..279ec42 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -269,35 +269,35 @@ void string_buffer_free(struct wined3d_string_buffer *buffer) HeapFree(GetProcessHeap(), 0, buffer->buffer); } -int shader_vaddline(struct wined3d_string_buffer *buffer, const char *format, va_list args) +BOOL string_buffer_resize(struct wined3d_string_buffer *buffer, int rc) { - unsigned int rem; - int rc; char *new_buffer; - unsigned int new_buffer_size; + unsigned int new_buffer_size = buffer->buffer_size * 2; - for (;;) + while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) + new_buffer_size *= 2; + if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, new_buffer_size))) { - rem = buffer->buffer_size - buffer->content_size; - rc = vsnprintf(&buffer->buffer[buffer->content_size], rem, format, args); + ERR("Failed to grow buffer.\n"); + buffer->buffer[buffer->content_size] = '\0'; + return FALSE; + } + buffer->buffer = new_buffer; + buffer->buffer_size = new_buffer_size; + return TRUE; +} - if (rc >= 0 /* C89 */ && (unsigned int)rc < rem /* C99 */) - break; +int shader_vaddline(struct wined3d_string_buffer *buffer, const char *format, va_list args) +{ + unsigned int rem; + int rc; - new_buffer_size = buffer->buffer_size * 2; - while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) - new_buffer_size *= 2; - if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, new_buffer_size))) - { - ERR("Failed to grow buffer.\n"); - buffer->buffer[buffer->content_size] = '\0'; - return -1; - } - buffer->buffer = new_buffer; - buffer->buffer_size = new_buffer_size; - } - buffer->content_size += rc; + rem = buffer->buffer_size - buffer->content_size; + rc = vsnprintf(&buffer->buffer[buffer->content_size], rem, format, args); + if (rc < 0 /* C89 */ || (unsigned int)rc >= rem /* C99 */) + return rc; + buffer->content_size += rc; return 0; } @@ -306,11 +306,16 @@ int shader_addline(struct wined3d_string_buffer *buffer, const char *format, ... va_list args; int ret; - va_start(args, format); - ret = shader_vaddline(buffer, format, args); - va_end(args); - - return ret; + for (;;) + { + va_start(args, format); + ret = shader_vaddline(buffer, format, args); + va_end(args); + if (!ret) + return ret; + if (!string_buffer_resize(buffer, ret)) + return -1; + } } struct wined3d_string_buffer *string_buffer_get(struct wined3d_string_buffer_list *list) @@ -337,21 +342,29 @@ struct wined3d_string_buffer *string_buffer_get(struct wined3d_string_buffer_lis return buffer; } -static void string_buffer_vsprintf(struct wined3d_string_buffer *buffer, const char *format, va_list args) +static int string_buffer_vsprintf(struct wined3d_string_buffer *buffer, const char *format, va_list args) { if (!buffer) - return; + return 0; string_buffer_clear(buffer); - shader_vaddline(buffer, format, args); + return shader_vaddline(buffer, format, args); } void string_buffer_sprintf(struct wined3d_string_buffer *buffer, const char *format, ...) { va_list args; + int ret; - va_start(args, format); - string_buffer_vsprintf(buffer, format, args); - va_end(args); + for (;;) + { + va_start(args, format); + ret = string_buffer_vsprintf(buffer, format, args); + va_end(args); + if (!ret) + return; + if (!string_buffer_resize(buffer, ret)) + return; + } } void string_buffer_release(struct wined3d_string_buffer_list *list, struct wined3d_string_buffer *buffer) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 459c55a..fafdb20 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2896,6 +2896,7 @@ void string_buffer_list_init(struct wined3d_string_buffer_list *list) DECLSPEC_H void string_buffer_list_cleanup(struct wined3d_string_buffer_list *list) DECLSPEC_HIDDEN; int shader_addline(struct wined3d_string_buffer *buffer, const char *fmt, ...) PRINTF_ATTR(2,3) DECLSPEC_HIDDEN; +BOOL string_buffer_resize(struct wined3d_string_buffer *buffer, int rc) DECLSPEC_HIDDEN; int shader_vaddline(struct wined3d_string_buffer *buffer, const char *fmt, va_list args) DECLSPEC_HIDDEN; /* Vertex shader utility functions */

1 0

Henri Verbeet : dxgi: Initialize auto_restore_display_mode in dxgi_factory_CreateSwapChain() ( Valgrind).
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: eb27944e789745adc4738925bb6af68c77b5ca21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb27944e789745adc4738925b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 17:27:33 2015 +0200 dxgi: Initialize auto_restore_display_mode in dxgi_factory_CreateSwapChain() (Valgrind). --- dlls/dxgi/factory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index df36d82..a66585e 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -229,6 +229,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa wined3d_desc.flags = 0; /* WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL? */ wined3d_desc.refresh_rate = dxgi_rational_to_uint(&desc->BufferDesc.RefreshRate); wined3d_desc.swap_interval = WINED3DPRESENT_INTERVAL_DEFAULT; + wined3d_desc.auto_restore_display_mode = TRUE; hr = IWineDXGIDevice_create_swapchain(dxgi_device, &wined3d_desc, &wined3d_swapchain); IWineDXGIDevice_Release(dxgi_device);

1 0

Henri Verbeet : ddraw: Release the surface clipper (if any) in ddraw_surface_wined3d_object_destroyed() (Valgrind).
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: 4a416f8d37ca87d1f42cc536dee2be9f0fccba64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a416f8d37ca87d1f42cc536d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 17:27:34 2015 +0200 ddraw: Release the surface clipper (if any) in ddraw_surface_wined3d_object_destroyed() (Valgrind). --- dlls/ddraw/surface.c | 3 +++ dlls/ddraw/tests/ddraw1.c | 4 +++- dlls/ddraw/tests/ddraw2.c | 4 +++- dlls/ddraw/tests/ddraw4.c | 4 +++- dlls/ddraw/tests/ddraw7.c | 4 +++- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0d2d731..f716cfc 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5615,6 +5615,9 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren /* Reduce the ddraw surface count. */ list_remove(&surface->surface_list_entry); + if (surface->clipper) + IDirectDrawClipper_Release(&surface->clipper->IDirectDrawClipper_iface); + if (surface == surface->ddraw->primary) surface->ddraw->primary = NULL; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 839b2b7..9860957 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -627,6 +627,7 @@ static void test_clipper_blt(void) IDirectDraw *ddraw; RGNDATA *rgn_data; D3DCOLOR color; + ULONG refcount; HRGN r1, r2; HWND window; DDBLTFX fx; @@ -819,7 +820,8 @@ static void test_clipper_blt(void) IDirectDrawSurface_Release(dst_surface); IDirectDrawSurface_Release(src_surface); - IDirectDrawClipper_Release(clipper); + refcount = IDirectDrawClipper_Release(clipper); + ok(!refcount, "Clipper has %u references left.\n", refcount); IDirectDraw_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 42f65bc..29971e5 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -521,6 +521,7 @@ static void test_clipper_blt(void) IDirectDraw2 *ddraw; RGNDATA *rgn_data; D3DCOLOR color; + ULONG refcount; HRGN r1, r2; HWND window; DDBLTFX fx; @@ -713,7 +714,8 @@ static void test_clipper_blt(void) IDirectDrawSurface_Release(dst_surface); IDirectDrawSurface_Release(src_surface); - IDirectDrawClipper_Release(clipper); + refcount = IDirectDrawClipper_Release(clipper); + ok(!refcount, "Clipper has %u references left.\n", refcount); IDirectDraw2_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ddb7a1d..c3f6f95 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -742,6 +742,7 @@ static void test_clipper_blt(void) IDirectDraw4 *ddraw; RGNDATA *rgn_data; D3DCOLOR color; + ULONG refcount; HRGN r1, r2; HWND window; DDBLTFX fx; @@ -934,7 +935,8 @@ static void test_clipper_blt(void) IDirectDrawSurface4_Release(dst_surface); IDirectDrawSurface4_Release(src_surface); - IDirectDrawClipper_Release(clipper); + refcount = IDirectDrawClipper_Release(clipper); + ok(!refcount, "Clipper has %u references left.\n", refcount); IDirectDraw4_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1f43646..e151fb7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -666,6 +666,7 @@ static void test_clipper_blt(void) IDirectDraw7 *ddraw; RGNDATA *rgn_data; D3DCOLOR color; + ULONG refcount; HRGN r1, r2; HWND window; DDBLTFX fx; @@ -858,7 +859,8 @@ static void test_clipper_blt(void) IDirectDrawSurface7_Release(dst_surface); IDirectDrawSurface7_Release(src_surface); - IDirectDrawClipper_Release(clipper); + refcount = IDirectDrawClipper_Release(clipper); + ok(!refcount, "Clipper has %u references left.\n", refcount); IDirectDraw7_Release(ddraw); }

1 0

Henri Verbeet : ddraw: Check if the ddraw object still exists in d3d_device_inner_Release() ( Valgrind).
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: 4c5276042d2c3ddc27e754aacd5a0ca64634cd83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c5276042d2c3ddc27e754aac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 17:27:35 2015 +0200 ddraw: Check if the ddraw object still exists in d3d_device_inner_Release() (Valgrind). --- dlls/ddraw/ddraw.c | 3 +++ dlls/ddraw/device.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ffffa9c..b3caba2 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -435,6 +435,9 @@ static void ddraw_destroy(struct ddraw *This) wined3d_device_decref(This->wined3d_device); wined3d_decref(This->wined3d); + if (This->d3ddevice) + This->d3ddevice->ddraw = NULL; + /* Now free the object */ HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f0f4ac3..bc19897 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -316,7 +316,10 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) IUnknown_Release(rt_iface); TRACE("Render target release done.\n"); - This->ddraw->d3ddevice = NULL; + /* Releasing the render target above may have released the last + * reference to the ddraw object. */ + if (This->ddraw) + This->ddraw->d3ddevice = NULL; /* Now free the structure */ HeapFree(GetProcessHeap(), 0, This);

1 0

Henri Verbeet : ddraw/tests: Don' t destroy the background material until the viewport is done with it in test_material () (Valgrind).
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: 6569337cb78a78b4e80ec3303019b16b48d73535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6569337cb78a78b4e80ec3303… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 17:27:36 2015 +0200 ddraw/tests: Don't destroy the background material until the viewport is done with it in test_material() (Valgrind). --- dlls/ddraw/tests/ddraw1.c | 8 ++++---- dlls/ddraw/tests/ddraw2.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9860957..da550b5 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5195,10 +5195,10 @@ static void test_p8_rgb_blit(void) static void test_material(void) { + IDirect3DMaterial *background, *material; IDirect3DExecuteBuffer *execute_buffer; D3DMATERIALHANDLE mat_handle, tmp; D3DEXECUTEBUFFERDESC exec_desc; - IDirect3DMaterial *material; IDirect3DViewport *viewport; IDirect3DDevice *device; IDirectDrawSurface *rt; @@ -5245,11 +5245,10 @@ static void test_material(void) hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - material = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + background = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); viewport = create_viewport(device, 0, 0, 640, 480); - viewport_set_background(device, viewport, material); + viewport_set_background(device, viewport, background); - destroy_material(material); material = create_emissive_material(device, 0.0f, 1.0f, 0.0f, 0.0f); hr = IDirect3DMaterial_GetHandle(material, device, &mat_handle); ok(SUCCEEDED(hr), "Failed to get material handle, hr %#x.\n", hr); @@ -5342,6 +5341,7 @@ static void test_material(void) IDirect3DExecuteBuffer_Release(execute_buffer); destroy_viewport(device, viewport); + destroy_material(background); destroy_material(material); IDirectDrawSurface_Release(rt); refcount = IDirect3DDevice_Release(device); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 29971e5..ce31cd6 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6247,8 +6247,8 @@ static void test_p8_rgb_blit(void) static void test_material(void) { + IDirect3DMaterial2 *background, *material; D3DMATERIALHANDLE mat_handle, tmp; - IDirect3DMaterial2 *material; IDirect3DViewport2 *viewport; IDirect3DDevice2 *device; IDirectDrawSurface *rt; @@ -6293,13 +6293,12 @@ static void test_material(void) hr = IDirect3DDevice2_GetRenderTarget(device, &rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - material = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + background = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); viewport = create_viewport(device, 0, 0, 640, 480); - viewport_set_background(device, viewport, material); + viewport_set_background(device, viewport, background); hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); - destroy_material(material); material = create_emissive_material(device, 0.0f, 1.0f, 0.0f, 0.0f); hr = IDirect3DMaterial2_GetHandle(material, device, &mat_handle); ok(SUCCEEDED(hr), "Failed to get material handle, hr %#x.\n", hr); @@ -6377,6 +6376,7 @@ static void test_material(void) ok(compare_color(color, 0x00000000, 1), "Got unexpected color 0x%08x.\n", color); destroy_viewport(device, viewport); + destroy_material(background); destroy_material(material); IDirectDrawSurface_Release(rt); refcount = IDirect3DDevice2_Release(device);

1 0

Henri Verbeet : ddraw/tests: Release the palette after a GetPalette() call in PaletteTest() (Valgrind).
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: 8633fd625a8c7ce6835cc084bfdc717a814317d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8633fd625a8c7ce6835cc084b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 17:27:37 2015 +0200 ddraw/tests: Release the palette after a GetPalette() call in PaletteTest() (Valgrind). --- dlls/ddraw/tests/dsurface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index fe5b676..bfa1386 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2263,6 +2263,7 @@ static void PaletteTest(void) hr = IDirectDrawSurface_GetPalette(backbuffer, &palette); ok(hr == DD_OK, "CreateSurface returned: %x\n",hr); + IDirectDrawPalette_Release(palette); IDirectDrawSurface_Release(backbuffer); IDirectDrawSurface_Release(lpSurf);

1 0

Huw Davies : comctl32: Remove button wrap states when TBSTYLE_WRAPABLE is cleared.
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: eb8df37a696317bf4f067071fd351a1737da41b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8df37a696317bf4f067071f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 29 16:49:49 2015 +0100 comctl32: Remove button wrap states when TBSTYLE_WRAPABLE is cleared. --- dlls/comctl32/tests/toolbar.c | 10 ++++++++++ dlls/comctl32/toolbar.c | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 365bfe2..4bbffd3 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1085,6 +1085,7 @@ static void test_sizes(void) HWND hToolbar = NULL; HIMAGELIST himl, himl2; TBBUTTONINFOA tbinfo; + TBBUTTON button; int style; int i; int fontheight = system_font_height(); @@ -1100,9 +1101,13 @@ static void test_sizes(void) check_sizes(); SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0); check_sizes(); + SendMessageA(hToolbar, TB_GETBUTTON, 5, (LPARAM)&button); + ok(button.fsState == (TBSTATE_WRAP|TBSTATE_ENABLED), "got %08x\n", button.fsState); /* after setting the TBSTYLE_WRAPABLE the TBSTATE_WRAP is ignored */ SetWindowLongA(hToolbar, GWL_STYLE, style|TBSTYLE_WRAPABLE); check_sizes(); + SendMessageA(hToolbar, TB_GETBUTTON, 5, (LPARAM)&button); + ok(button.fsState == TBSTATE_ENABLED, "got %08x\n", button.fsState); /* adding new buttons with TBSTYLE_WRAPABLE doesn't add a new row */ SendMessageA(hToolbar, TB_ADDBUTTONSA, 2, (LPARAM)buttons1); check_sizes(); @@ -1111,6 +1116,11 @@ static void test_sizes(void) for (i=0; i<15; i++) SendMessageA(hToolbar, TB_ADDBUTTONSA, 2, (LPARAM)buttons1); check_sizes_todo(0x4); + SendMessageA(hToolbar, TB_GETBUTTON, 31, (LPARAM)&button); + ok(button.fsState == (TBSTATE_WRAP|TBSTATE_ENABLED), "got %08x\n", button.fsState); + SetWindowLongA(hToolbar, GWL_STYLE, style); + SendMessageA(hToolbar, TB_GETBUTTON, 31, (LPARAM)&button); + ok(button.fsState == TBSTATE_ENABLED, "got %08x\n", button.fsState); rebuild_toolbar_with_buttons(&hToolbar); SendMessageA(hToolbar, TB_ADDBUTTONSA, 2, (LPARAM)buttons1); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b2f13c5..b86ae9f 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4918,6 +4918,13 @@ TOOLBAR_SetState (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam) return TRUE; } +static inline void unwrap(TOOLBAR_INFO *info) +{ + int i; + + for (i = 0; i < info->nNumButtons; i++) + info->buttons[i].fsState &= ~TBSTATE_WRAP; +} static LRESULT TOOLBAR_SetStyle (TOOLBAR_INFO *infoPtr, DWORD style) @@ -4935,7 +4942,11 @@ TOOLBAR_SetStyle (TOOLBAR_INFO *infoPtr, DWORD style) TOOLBAR_CheckStyle(infoPtr); if ((dwOldStyle ^ style) & TBSTYLE_WRAPABLE) + { + if (dwOldStyle & TBSTYLE_WRAPABLE) + unwrap(infoPtr); TOOLBAR_CalcToolbar(infoPtr); + } else if ((dwOldStyle ^ style) & CCS_VERT) TOOLBAR_LayoutToolbar(infoPtr);

1 0