wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

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

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

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

Aaryaman Vasishta : d3drm: Move Release from frame2->frame3.
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: dbee90a728a9c2a8bf3009f2a81c4b3d7f5b9eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbee90a728a9c2a8bf3009f2a… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Apr 26 17:07:01 2015 +0530 d3drm: Move Release from frame2->frame3. --- dlls/d3drm/frame.c | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 22daec4..4f9d952 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -485,32 +485,10 @@ static ULONG WINAPI d3drm_frame2_AddRef(IDirect3DRMFrame2 *iface) static ULONG WINAPI d3drm_frame2_Release(IDirect3DRMFrame2 *iface) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - ULONG refcount = InterlockedDecrement(&frame->ref); - ULONG i; - - TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!refcount) - { - for (i = 0; i < frame->nb_children; ++i) - { - IDirect3DRMFrame3_Release(frame->children[i]); - } - HeapFree(GetProcessHeap(), 0, frame->children); - for (i = 0; i < frame->nb_visuals; ++i) - { - IDirect3DRMVisual_Release(frame->visuals[i]); - } - HeapFree(GetProcessHeap(), 0, frame->visuals); - for (i = 0; i < frame->nb_lights; ++i) - { - IDirect3DRMLight_Release(frame->lights[i]); - } - HeapFree(GetProcessHeap(), 0, frame->lights); - HeapFree(GetProcessHeap(), 0, frame); - } + TRACE("iface %p.\n", iface); - return refcount; + return IDirect3DRMFrame3_Release(&frame->IDirect3DRMFrame3_iface); } static HRESULT WINAPI d3drm_frame2_Clone(IDirect3DRMFrame2 *iface, @@ -1248,10 +1226,32 @@ static ULONG WINAPI d3drm_frame3_AddRef(IDirect3DRMFrame3 *iface) static ULONG WINAPI d3drm_frame3_Release(IDirect3DRMFrame3 *iface) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + ULONG refcount = InterlockedDecrement(&frame->ref); + ULONG i; - TRACE("iface %p.\n", iface); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - return d3drm_frame2_Release(&frame->IDirect3DRMFrame2_iface); + if (!refcount) + { + for (i = 0; i < frame->nb_children; ++i) + { + IDirect3DRMFrame3_Release(frame->children[i]); + } + HeapFree(GetProcessHeap(), 0, frame->children); + for (i = 0; i < frame->nb_visuals; ++i) + { + IDirect3DRMVisual_Release(frame->visuals[i]); + } + HeapFree(GetProcessHeap(), 0, frame->visuals); + for (i = 0; i < frame->nb_lights; ++i) + { + IDirect3DRMLight_Release(frame->lights[i]); + } + HeapFree(GetProcessHeap(), 0, frame->lights); + HeapFree(GetProcessHeap(), 0, frame); + } + + return refcount; } static HRESULT WINAPI d3drm_frame3_Clone(IDirect3DRMFrame3 *iface,

1 0

Aaryaman Vasishta : d3drm: Move AddRef from frame2->frame3.
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: 1e3737f15266970e4d67ab7761e786e412e3e166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3737f15266970e4d67ab776… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Apr 26 17:07:00 2015 +0530 d3drm: Move AddRef from frame2->frame3. --- dlls/d3drm/frame.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 6737cc4..22daec4 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -476,11 +476,10 @@ static HRESULT WINAPI d3drm_frame2_QueryInterface(IDirect3DRMFrame2 *iface, REFI static ULONG WINAPI d3drm_frame2_AddRef(IDirect3DRMFrame2 *iface) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - ULONG refcount = InterlockedIncrement(&frame->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("iface %p.\n", iface); - return refcount; + return IDirect3DRMFrame3_AddRef(&frame->IDirect3DRMFrame3_iface); } static ULONG WINAPI d3drm_frame2_Release(IDirect3DRMFrame2 *iface) @@ -1239,10 +1238,11 @@ static HRESULT WINAPI d3drm_frame3_QueryInterface(IDirect3DRMFrame3 *iface, REFI static ULONG WINAPI d3drm_frame3_AddRef(IDirect3DRMFrame3 *iface) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + ULONG refcount = InterlockedIncrement(&frame->ref); - TRACE("iface %p.\n", iface); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return d3drm_frame2_AddRef(&frame->IDirect3DRMFrame2_iface); + return refcount; } static ULONG WINAPI d3drm_frame3_Release(IDirect3DRMFrame3 *iface)

1 0

Aaryaman Vasishta : d3drm: Move QueryInterface from frame2->frame3.
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: b8b7a72f26d731498a22c05c79b81d25b8d58108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b7a72f26d731498a22c05c7… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Apr 26 17:06:59 2015 +0530 d3drm: Move QueryInterface from frame2->frame3. --- dlls/d3drm/frame.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 39c2e7b..6737cc4 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -470,27 +470,7 @@ static HRESULT WINAPI d3drm_frame2_QueryInterface(IDirect3DRMFrame2 *iface, REFI TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IDirect3DRMFrame2) - || IsEqualGUID(riid, &IID_IDirect3DRMFrame) - || IsEqualGUID(riid, &IID_IDirect3DRMObject) - || IsEqualGUID(riid, &IID_IDirect3DRMVisual) - || IsEqualGUID(riid, &IID_IUnknown)) - { - *out = &frame->IDirect3DRMFrame2_iface; - } - else if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) - { - *out = &frame->IDirect3DRMFrame3_iface; - } - else - { - *out = NULL; - WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); - return CLASS_E_CLASSNOTAVAILABLE; - } - - IUnknown_AddRef((IUnknown *)*out); - return S_OK; + return IDirect3DRMFrame3_QueryInterface(&frame->IDirect3DRMFrame3_iface, riid, out); } static ULONG WINAPI d3drm_frame2_AddRef(IDirect3DRMFrame2 *iface) @@ -1233,7 +1213,27 @@ static HRESULT WINAPI d3drm_frame3_QueryInterface(IDirect3DRMFrame3 *iface, REFI TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - return d3drm_frame2_QueryInterface(&frame->IDirect3DRMFrame2_iface, riid, out); + if (IsEqualGUID(riid, &IID_IDirect3DRMFrame2) + || IsEqualGUID(riid, &IID_IDirect3DRMFrame) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) + || IsEqualGUID(riid, &IID_IUnknown)) + { + *out = &frame->IDirect3DRMFrame2_iface; + } + else if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) + { + *out = &frame->IDirect3DRMFrame3_iface; + } + else + { + *out = NULL; + WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static ULONG WINAPI d3drm_frame3_AddRef(IDirect3DRMFrame3 *iface)

1 0

Nikolay Sivov : shell32: Update to IShellView3.
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: 5d288771c9962245346ca94f5d9dad48741e06c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d288771c9962245346ca94f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 29 20:53:39 2015 +0300 shell32: Update to IShellView3. --- dlls/shell32/shlview.c | 407 +++++++++++++++++++++---------------------------- include/shobjidl.idl | 29 ++++ 2 files changed, 204 insertions(+), 232 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d288771c9962245346ca…

1 0

Nikolay Sivov : shell32/tests: Some more tests for IShellWindows implementation.
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: f57b5ea2fb6e210e7d349865f01aabb207bbb180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57b5ea2fb6e210e7d349865f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 29 20:20:57 2015 +0300 shell32/tests: Some more tests for IShellWindows implementation. --- dlls/shell32/tests/shelldispatch.c | 87 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 925bf78..f973f1f 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -502,13 +502,100 @@ todo_wine { todo_wine ok(hr == S_OK || broken(hr == S_FALSE), "got 0x%08x\n", hr); if (hr == S_FALSE) /* winxp and earlier */ { + win_skip("SWC_DESKTOP is not supported, some tests will be skipped.\n"); /* older versions allowed to regiser SWC_DESKTOP and access it with FindWindowSW */ ok(disp == NULL, "got %p\n", disp); ok(ret == 0, "got %d\n", ret); } else { + IShellFolderViewDual *view; + IShellBrowser *sb, *sb2; + IServiceProvider *sp; + IDispatch *doc, *app; + ITypeInfo *typeinfo; + TYPEATTR *typeattr; + IWebBrowser2 *wb; + IShellView *sv; + IUnknown *unk; + UINT count; + todo_wine ok(disp != NULL, "got %p\n", disp); + if (disp) { + + /* IDispatch-related tests */ + count = 10; + hr = IDispatch_GetTypeInfoCount(disp, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 1, "got %u\n", count); + + hr = IDispatch_GetTypeInfo(disp, 0, LOCALE_SYSTEM_DEFAULT, &typeinfo); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&typeattr->guid, &IID_IWebBrowser2), "type guid %s\n", wine_dbgstr_guid(&typeattr->guid)); + + ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); + ITypeInfo_Release(typeinfo); + + /* IWebBrowser2 */ + hr = IDispatch_QueryInterface(disp, &IID_IWebBrowser2, (void**)&wb); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IWebBrowser2_Refresh(wb); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IWebBrowser2_get_Application(wb, &app); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(disp == app, "got %p, %p\n", app, disp); + IDispatch_Release(app); + + hr = IWebBrowser2_get_Document(wb, &doc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispatch_GetTypeInfo(doc, 0, LOCALE_SYSTEM_DEFAULT, &typeinfo); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&typeattr->guid, &IID_IShellFolderViewDual3), "type guid %s\n", wine_dbgstr_guid(&typeattr->guid)); + IDispatch_Release(doc); + + ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); + ITypeInfo_Release(typeinfo); + + IWebBrowser2_Release(wb); + + /* IServiceProvider */ + hr = IDispatch_QueryInterface(disp, &IID_IShellFolderViewDual, (void**)&view); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IDispatch_QueryInterface(disp, &IID_IServiceProvider, (void**)&sp); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&sb); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&sb2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(sb == sb2, "got %p, %p\n", sb, sb2); + IShellBrowser_Release(sb2); + IShellBrowser_Release(sb); + + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IShellBrowser, (void**)&sb2); + ok(hr == S_OK, "got 0x%08x\n", hr); + IShellBrowser_Release(sb2); + IUnknown_Release(unk); + + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IShellView, (void**)&sv); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + IServiceProvider_Release(sp); + } ok(ret != HandleToUlong(hwnd), "got %d\n", ret); if (disp) IDispatch_Release(disp); }

1 0

Nikolay Sivov : shell32: Added a stub implementation of IShellFolderViewDual3.
by Alexandre Julliard 30 Apr '15

30 Apr '15

Module: wine Branch: master Commit: dd9813b5f7a859854851e7f9d0d3ecbfaebe0e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd9813b5f7a859854851e7f9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 29 20:15:06 2015 +0300 shell32: Added a stub implementation of IShellFolderViewDual3. --- dlls/shell32/shlview.c | 263 +++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/shelldispatch.c | 55 +++++++- dlls/shell32/tests/shlview.c | 2 +- 3 files changed, 315 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd9813b5f7a859854851e…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2015