February 2010 - Wine-commits

Paul Chitescu : uuid.h: Added standard qedit CLSID_SampleGrabber.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: b2a8cca6cde2f1356ae8a02c09259a4b7a8c77b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a8cca6cde2f1356ae8a02c0… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Feb 2 14:32:27 2010 +0200 uuid.h: Added standard qedit CLSID_SampleGrabber. --- include/uuids.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/uuids.h b/include/uuids.h index 54a30fc..376cca7 100644 --- a/include/uuids.h +++ b/include/uuids.h @@ -135,6 +135,7 @@ OUR_GUID_ENTRY(CLSID_WAVEParser, 0xd51bd5a1, 0x7548, 0x11cf, OUR_GUID_ENTRY(CLSID_QTDec, 0xfdfe9681, 0x74a3, 0x11d0, 0xaf, 0xa7, 0x00, 0xaa, 0x00, 0xb6, 0x7a, 0x42) OUR_GUID_ENTRY(CLSID_AVIDoc, 0xd3588ab0, 0x0781, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) OUR_GUID_ENTRY(CLSID_AVIDocWriter, 0xd3588ab1, 0x0781, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) +OUR_GUID_ENTRY(CLSID_SampleGrabber, 0xc1f400a0, 0x3f08, 0x11d3, 0x9f, 0x0b, 0x00, 0x60, 0x08, 0x03, 0x9e, 0x37) OUR_GUID_ENTRY(CLSID_NullRenderer, 0xc1f400a4, 0x3f08, 0x11d3, 0x9f, 0x0b, 0x00, 0x60, 0x08, 0x03, 0x9e, 0x37) OUR_GUID_ENTRY(CLSID_VideoRenderer, 0x70e102b0, 0x5556, 0x11ce, 0x97, 0xc0, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) OUR_GUID_ENTRY(CLSID_VideoRendererDefault, 0x6bc1cffa, 0x8fc1, 0x4261, 0xac, 0x22, 0xcf, 0xb4, 0xcc, 0x38, 0xdb, 0x50)

1 0

Alexandre Julliard : server: Allow changing a thread affinity before it is initialized.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 2f3fa8596bc6410a3b535e2f12bf551841334ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3fa8596bc6410a3b535e2f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 15:58:02 2010 +0100 server: Allow changing a thread affinity before it is initialized. --- server/thread.c | 28 ++++++++++++++-------------- server/thread.h | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/server/thread.c b/server/thread.c index b50193a..148ca3b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -407,13 +407,9 @@ struct thread *get_thread_from_pid( int pid ) return NULL; } -void set_thread_affinity( struct thread *thread, affinity_t affinity ) +int set_thread_affinity( struct thread *thread, affinity_t affinity ) { - if ((affinity & thread->process->affinity) != affinity) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } + int ret = 0; #ifdef HAVE_SCHED_SETAFFINITY if (thread->unix_tid != -1) { @@ -425,15 +421,11 @@ void set_thread_affinity( struct thread *thread, affinity_t affinity ) for (i = 0, mask = 1; mask; i++, mask <<= 1) if (affinity & mask) CPU_SET( i, &set ); - if (!sched_setaffinity( thread->unix_tid, sizeof(set), &set )) - thread->affinity = affinity; - else - file_set_error(); + ret = sched_setaffinity( thread->unix_tid, sizeof(set), &set ); } - else set_error( STATUS_ACCESS_DENIED ); -#else - thread->affinity = affinity; #endif + if (!ret) thread->affinity = affinity; + return ret; } #define THREAD_PRIORITY_REALTIME_HIGHEST 6 @@ -460,7 +452,14 @@ static void set_thread_info( struct thread *thread, set_error( STATUS_INVALID_PARAMETER ); } if (req->mask & SET_THREAD_INFO_AFFINITY) - set_thread_affinity( thread, req->affinity ); + { + if ((req->affinity & thread->process->affinity) != req->affinity) + set_error( STATUS_INVALID_PARAMETER ); + else if (thread->state == TERMINATED) + set_error( STATUS_ACCESS_DENIED ); + else if (set_thread_affinity( thread, req->affinity )) + file_set_error(); + } if (req->mask & SET_THREAD_INFO_TOKEN) security_set_thread_token( thread, req->token ); } @@ -1158,6 +1157,7 @@ DECL_HANDLER(init_thread) generate_debug_event( current, CREATE_THREAD_DEBUG_EVENT, &req->entry ); } debug_level = max( debug_level, req->debug_level ); + set_thread_affinity( current, current->affinity ); reply->pid = get_process_id( process ); reply->tid = get_thread_id( current ); diff --git a/server/thread.h b/server/thread.h index 90f6061..1e95732 100644 --- a/server/thread.h +++ b/server/thread.h @@ -118,7 +118,7 @@ extern int thread_add_inflight_fd( struct thread *thread, int client, int server extern int thread_get_inflight_fd( struct thread *thread, int client ); extern struct thread_snapshot *thread_snap( int *count ); extern struct token *thread_get_impersonation_token( struct thread *thread ); -extern void set_thread_affinity( struct thread *thread, affinity_t affinity ); +extern int set_thread_affinity( struct thread *thread, affinity_t affinity ); /* ptrace functions */

1 0

Alexandre Julliard : server: Set the initial thread affinity from the process.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 9ce56b272948592942ccfe2555048d52fe813785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce56b272948592942ccfe255… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 15:58:25 2010 +0100 server: Set the initial thread affinity from the process. --- server/thread.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/thread.c b/server/thread.c index 148ca3b..bdb6c3c 100644 --- a/server/thread.c +++ b/server/thread.c @@ -222,6 +222,7 @@ struct thread *create_thread( int fd, struct process *process ) thread->process = (struct process *)grab_object( process ); thread->desktop = process->desktop; + thread->affinity = process->affinity; if (!current) current = thread; list_add_head( &thread_list, &thread->entry );

1 0

Stefan Dösinger : wined3d: Add GL_ARB_map_buffer_range .
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: f6bb86e196a8c72a70245cbe7d6ab3ddf697a07c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bb86e196a8c72a70245cbe7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 28 20:50:55 2010 +0100 wined3d: Add GL_ARB_map_buffer_range. --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_gl.h | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b708b33..7e98292 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -63,6 +63,7 @@ static const struct { {"GL_ARB_half_float_pixel", ARB_HALF_FLOAT_PIXEL, 0 }, {"GL_ARB_half_float_vertex", ARB_HALF_FLOAT_VERTEX, 0 }, {"GL_ARB_imaging", ARB_IMAGING, 0 }, + {"GL_ARB_map_buffer_range", ARB_MAP_BUFFER_RANGE, 0 }, {"GL_ARB_multisample", ARB_MULTISAMPLE, 0 }, /* needs GLX_ARB_MULTISAMPLE as well */ {"GL_ARB_multitexture", ARB_MULTITEXTURE, 0 }, {"GL_ARB_occlusion_query", ARB_OCCLUSION_QUERY, 0 }, @@ -1837,6 +1838,12 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str gl_info->supported[ARB_HALF_FLOAT_PIXEL] = TRUE; } } + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + { + /* GL_ARB_map_buffer_range and GL_APPLE_flush_buffer_range provide the same + * functionality. Prefer the ARB extension */ + gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] = FALSE; + } if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) { TRACE_(d3d_caps)(" IMPLIED: NVIDIA (NV) Texture Gen Reflection support.\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index f0367ce..07ce7af 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1743,6 +1743,7 @@ typedef enum wined3d_gl_extension ARB_HALF_FLOAT_PIXEL, ARB_HALF_FLOAT_VERTEX, ARB_IMAGING, + ARB_MAP_BUFFER_RANGE, ARB_MULTISAMPLE, ARB_MULTITEXTURE, ARB_OCCLUSION_QUERY, @@ -2225,6 +2226,19 @@ typedef void (WINE_GLAPI *PGLFNFRAMEBUFFERTEXTUREFACEARBPROC)(GLenum target, GLe typedef void (WINE_GLAPI *PGLFNBLENDCOLORPROC)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); typedef void (WINE_GLAPI *PGLFNBLENDEQUATIONPROC)(GLenum mode); +/* GL_ARB_map_buffer_range */ +#ifndef GL_ARB_map_buffer_range +#define GL_ARB_map_buffer_range 1 +#define GL_MAP_READ_BIT 0x0001 +#define GL_MAP_WRITE_BIT 0x0002 +#define GL_MAP_INVALIDATE_RANGE_BIT 0x0004 +#define GL_MAP_INVALIDATE_BUFFER_BIT 0x0008 +#define GL_MAP_FLUSH_EXPLICIT_BIT 0x0010 +#define GL_MAP_UNSYNCHRONIZED_BIT 0x0020 +#endif +typedef GLvoid *(WINE_GLAPI *PGLFNMAPBUFFERRANGEPROC)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); +typedef void (WINE_GLAPI *PGLFNFLUSHMAPPEDBUFFERRANGEPROC)(GLenum target, GLintptr offset, GLsizeiptr length); + /* GL_ARB_multisample */ #ifndef GL_ARB_multisample #define GL_ARB_multisample 1 @@ -3934,6 +3948,11 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelForma glBlendColorEXT, EXT_BLEND_COLOR, NULL) \ USE_GL_FUNC(PGLFNBLENDEQUATIONPROC, \ glBlendEquationEXT, EXT_BLEND_MINMAX, NULL) \ + /* GL_ARB_map_buffer_range */ \ + USE_GL_FUNC(PGLFNMAPBUFFERRANGEPROC, \ + glMapBufferRange, ARB_MAP_BUFFER_RANGE, NULL) \ + USE_GL_FUNC(PGLFNFLUSHMAPPEDBUFFERRANGEPROC, \ + glFlushMappedBufferRange, ARB_MAP_BUFFER_RANGE, NULL) \ /* GL_ARB_multisample */ \ USE_GL_FUNC(WINED3D_PFNGLSAMPLECOVERAGEARBPROC, \ glSampleCoverageARB, ARB_MULTISAMPLE, NULL) \

1 0

Stefan Dösinger : wined3d: Implement dynamic buffers with GL_ARB_map_buffer_range.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 224043d6cf8b56e9ff2537358646700211d54d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=224043d6cf8b56e9ff2537358… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 28 20:51:06 2010 +0100 wined3d: Implement dynamic buffers with GL_ARB_map_buffer_range. --- dlls/wined3d/buffer.c | 53 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e0cefc9..f3d3492 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -3,7 +3,7 @@ * Copyright 2002-2005 Raphael Junqueira * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber - * Copyright 2007 Stefan Dösinger for CodeWeavers + * Copyright 2007-2010 Stefan Dösinger for CodeWeavers * Copyright 2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -158,6 +158,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)"); This->flags |= WINED3D_BUFFER_FLUSH; } + /* No setup is needed here for GL_ARB_map_buffer_range */ } else { @@ -1058,6 +1059,25 @@ static DWORD buffer_sanitize_flags(DWORD flags) return flags; } +static GLbitfield buffer_gl_map_flags(DWORD d3d_flags) +{ + GLbitfield ret = GL_MAP_FLUSH_EXPLICIT_BIT; + + if (!(d3d_flags & WINED3DLOCK_READONLY)) ret |= GL_MAP_WRITE_BIT; + + if (d3d_flags & (WINED3DLOCK_DISCARD | WINED3DLOCK_NOOVERWRITE)) + { + if(d3d_flags & WINED3DLOCK_DISCARD) ret |= GL_MAP_INVALIDATE_BUFFER_BIT; + ret |= GL_MAP_UNSYNCHRONIZED_BIT; + } + else + { + ret |= GL_MAP_READ_BIT; + } + + return ret; +} + static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, UINT size, BYTE **data, DWORD flags) { struct wined3d_buffer *This = (struct wined3d_buffer *)iface; @@ -1076,6 +1096,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, { IWineD3DDeviceImpl *device = This->resource.device; struct wined3d_context *context; + const struct wined3d_gl_info *gl_info; if(This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) { @@ -1083,9 +1104,20 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, } context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); + gl_info = context->gl_info; ENTER_GL(); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); - This->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_READ_WRITE_ARB)); + + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + { + GLbitfield mapflags = buffer_gl_map_flags(flags); + This->resource.allocatedMemory = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, + This->resource.size, mapflags)); + } + else + { + This->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_READ_WRITE_ARB)); + } LEAVE_GL(); context_release(context); } @@ -1126,6 +1158,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) if(!(This->flags & WINED3D_BUFFER_DOUBLEBUFFER) && This->buffer_object) { IWineD3DDeviceImpl *device = This->resource.device; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; if(This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) @@ -1134,10 +1167,21 @@ static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) } context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); + gl_info = context->gl_info; ENTER_GL(); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); - if(This->flags & WINED3D_BUFFER_FLUSH) + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + { + for(i = 0; i < This->modified_areas; i++) + { + GL_EXTCALL(glFlushMappedBufferRange(This->buffer_type_hint, + This->maps[i].offset, + This->maps[i].size)); + checkGLcall("glFlushMappedBufferRange"); + } + } + else if (This->flags & WINED3D_BUFFER_FLUSH) { for(i = 0; i < This->modified_areas; i++) { @@ -1229,8 +1273,7 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format_desc->format), buffer->resource.allocatedMemory, buffer); - /* TODO: GL_ARB_map_buffer_range */ - dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]; + dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + * drawStridedFast (half-life 2 and others).

1 0

Stefan Dösinger : d3d9: Test buffer lock flags.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 1d486a5abe28a7dcccb8a4305e9c2dd6a35af069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d486a5abe28a7dcccb8a4305… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 30 12:13:12 2010 +0100 d3d9: Test buffer lock flags. --- dlls/d3d9/tests/Makefile.in | 1 + dlls/d3d9/tests/buffer.c | 133 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/Makefile.in b/dlls/d3d9/tests/Makefile.in index 7fa911d..0ed62c4 100644 --- a/dlls/d3d9/tests/Makefile.in +++ b/dlls/d3d9/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = user32 kernel32 CTESTS = \ d3d9ex.c \ + buffer.c \ device.c \ query.c \ shader.c \ diff --git a/dlls/d3d9/tests/buffer.c b/dlls/d3d9/tests/buffer.c new file mode 100644 index 0000000..c2e22c2 --- /dev/null +++ b/dlls/d3d9/tests/buffer.c @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2010 Stefan Dösinger(for CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include <d3d9.h> +#include "wine/test.h" + +static HMODULE d3d9_handle = 0; + +static HWND create_window(void) +{ + WNDCLASS wc = {0}; + wc.lpfnWndProc = DefWindowProc; + wc.lpszClassName = "d3d9_test_wc"; + RegisterClass(&wc); + + return CreateWindow("d3d9_test_wc", "d3d9_test", + 0, 0, 0, 0, 0, 0, 0, 0, 0); +} + +static IDirect3DDevice9 *init_d3d9(void) +{ + IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; + IDirect3D9 *d3d9_ptr = 0; + IDirect3DDevice9 *device_ptr = 0; + D3DPRESENT_PARAMETERS present_parameters; + HRESULT hr; + + d3d9_create = (void *)GetProcAddress(d3d9_handle, "Direct3DCreate9"); + ok(d3d9_create != NULL, "Failed to get address of Direct3DCreate9\n"); + if (!d3d9_create) return NULL; + + d3d9_ptr = d3d9_create(D3D_SDK_VERSION); + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return NULL; + } + + ZeroMemory(&present_parameters, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = create_window(); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + + if(FAILED(hr)) + { + skip("could not create device, IDirect3D9_CreateDevice returned 0x%08x\n", hr); + return NULL; + } + + return device_ptr; +} + +static void lock_flag_test(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3DVertexBuffer9 *buffer; + unsigned int i; + void *data; + const struct + { + DWORD flags; + const char *debug_string; + HRESULT result; + } + test_data[] = + { + {D3DLOCK_READONLY, "D3DLOCK_READONLY", D3D_OK }, + {D3DLOCK_DISCARD, "D3DLOCK_DISCARD", D3D_OK }, + {D3DLOCK_NOOVERWRITE, "D3DLOCK_NOOVERWRITE", D3D_OK }, + {D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, "D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", D3D_OK }, + {D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, "D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", D3D_OK }, + {D3DLOCK_READONLY | D3DLOCK_DISCARD, "D3DLOCK_READONLY | D3DLOCK_DISCARD", D3D_OK }, + /* Completely bogous flags aren't an error */ + {0xdeadbeef, "0xdeadbeef", D3D_OK }, + }; + + hr = IDirect3DDevice9_CreateVertexBuffer(device, 1024, D3DUSAGE_DYNAMIC, 0, D3DPOOL_DEFAULT, &buffer, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateBuffer failed, 0x%08x\n", hr); + + for(i = 0; i < (sizeof(test_data) / sizeof(*test_data)); i++) + { + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &data, test_data[i].flags); + ok(hr == test_data[i].result, "Lock flags %s returned 0x%08x, expected 0x%08x\n", + test_data[i].debug_string, hr, test_data[i].result); + + if(SUCCEEDED(hr)) + { + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Unlock failed, 0x%08x\n", hr); + } + } + + IDirect3DVertexBuffer9_Release(buffer); +} + +START_TEST(buffer) +{ + IDirect3DDevice9 *device_ptr; + ULONG refcount; + + d3d9_handle = LoadLibraryA("d3d9.dll"); + if (!d3d9_handle) + { + skip("Could not load d3d9.dll\n"); + return; + } + + device_ptr = init_d3d9(); + if (!device_ptr) return; + + lock_flag_test(device_ptr); + + refcount = IDirect3DDevice9_Release(device_ptr); + ok(!refcount, "Device has %u references left\n", refcount); +}

1 0

Stefan Dösinger : d3d9: Move the vertex buffer alignment test into buffer.c.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 8912b372ed97dfa4ce1cb56ce77eca1f92a311e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8912b372ed97dfa4ce1cb56ce… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 30 12:15:40 2010 +0100 d3d9: Move the vertex buffer alignment test into buffer.c. --- dlls/d3d9/tests/buffer.c | 51 +++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 76 ---------------------------------------------- 2 files changed, 51 insertions(+), 76 deletions(-) diff --git a/dlls/d3d9/tests/buffer.c b/dlls/d3d9/tests/buffer.c index c2e22c2..a10cefd 100644 --- a/dlls/d3d9/tests/buffer.c +++ b/dlls/d3d9/tests/buffer.c @@ -111,6 +111,56 @@ static void lock_flag_test(IDirect3DDevice9 *device) IDirect3DVertexBuffer9_Release(buffer); } +static inline const char *debug_d3dpool(D3DPOOL pool) +{ + switch(pool) + { + case D3DPOOL_DEFAULT: return "D3DPOOL_DEFAULT"; + case D3DPOOL_SYSTEMMEM: return "D3DPOOL_SYSTEMMEM"; + case D3DPOOL_SCRATCH: return "D3DPOOL_SCRATCH"; + case D3DPOOL_MANAGED: return "D3DPOOL_MANAGED"; + default: + return "unknown pool"; + } +} + +static void test_vertex_buffer_alignment(IDirect3DDevice9 *device) +{ + IDirect3DVertexBuffer9 *buffer = NULL; + HRESULT hr; + D3DPOOL pools[] = {D3DPOOL_DEFAULT, D3DPOOL_SYSTEMMEM, D3DPOOL_SCRATCH, D3DPOOL_MANAGED}; + DWORD sizes[] = {1, 4, 16, 17, 32, 33, 64, 65, 1024, 1025, 1048576, 1048577}; + unsigned int i, j; + void *data; + + for(i = 0; i < (sizeof(sizes) / sizeof(sizes[0])); i++) + { + for(j = 0; j < (sizeof(pools) / sizeof(pools[0])); j++) + { + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizes[i], 0, 0, pools[j], &buffer, NULL); + if(pools[j] == D3DPOOL_SCRATCH) + { + ok(hr == D3DERR_INVALIDCALL, "Creating a D3DPOOL_SCRATCH buffer returned (0x%08x)\n", hr); + } + else + { + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexBuffer failed (0x%08x). Pool = %s, size %d\n", hr, + debug_d3dpool(pools[j]), sizes[i]); + } + if(FAILED(hr)) continue; + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &data, 0); + ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Lock failed (0x%08x)\n", hr); + ok(((DWORD_PTR) data & 31) == 0, "Vertex buffer start address is not 32 byte aligned(size: %d, pool: %s, data: %p)\n", + sizes[i], debug_d3dpool(pools[j]), data); + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Unlock failed (0x%08x)\n", hr); + + if(buffer) IDirect3DVertexBuffer9_Release(buffer); + } + } +} + START_TEST(buffer) { IDirect3DDevice9 *device_ptr; @@ -127,6 +177,7 @@ START_TEST(buffer) if (!device_ptr) return; lock_flag_test(device_ptr); + test_vertex_buffer_alignment(device_ptr); refcount = IDirect3DDevice9_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 1e58008..de46082 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1902,81 +1902,6 @@ cleanup: if(d3d9) IDirect3D9_Release(d3d9); } -static inline const char *debug_d3dpool(D3DPOOL pool) { - switch(pool) { - case D3DPOOL_DEFAULT: return "D3DPOOL_DEFAULT"; - case D3DPOOL_SYSTEMMEM: return "D3DPOOL_SYSTEMMEM"; - case D3DPOOL_SCRATCH: return "D3DPOOL_SCRATCH"; - case D3DPOOL_MANAGED: return "D3DPOOL_MANAGED"; - default: - return "unknown pool"; - } -} - -static void test_vertex_buffer_alignment(void) -{ - IDirect3DVertexBuffer9 *buffer = NULL; - D3DPRESENT_PARAMETERS present_parameters; - IDirect3DDevice9 *device = NULL; - IDirect3D9 *d3d9; - HWND hwnd; - HRESULT hr; - D3DPOOL pools[] = {D3DPOOL_DEFAULT, D3DPOOL_SYSTEMMEM, D3DPOOL_SCRATCH, D3DPOOL_MANAGED}; - DWORD sizes[] = {1, 4, 16, 17, 32, 33, 64, 65, 1024, 1025, 1048576, 1048577}; - unsigned int i, j; - void *data; - - d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); - ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); - ok(hwnd != NULL, "Failed to create window\n"); - if (!d3d9 || !hwnd) goto cleanup; - - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = hwnd; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - - hr = IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, - D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %08x\n", hr); - if(!device) - { - skip("Failed to create a d3d device\n"); - goto cleanup; - } - - for(i = 0; i < (sizeof(sizes) / sizeof(sizes[0])); i++) { - for(j = 0; j < (sizeof(pools) / sizeof(pools[0])); j++) { - hr = IDirect3DDevice9_CreateVertexBuffer(device, sizes[i], 0, 0, pools[j], &buffer, NULL); - if(pools[j] == D3DPOOL_SCRATCH) { - ok(hr == D3DERR_INVALIDCALL, "Creating a D3DPOOL_SCRATCH buffer returned (0x%08x)\n", hr); - } else { - ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexBuffer failed (0x%08x). Pool = %s, size %d\n", hr, - debug_d3dpool(pools[j]), sizes[i]); - } - if(FAILED(hr)) continue; - - hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &data, 0); - ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Lock failed (0x%08x)\n", hr); - ok(((DWORD_PTR) data & 31) == 0, "Vertex buffer start address is not 32 byte aligned(size: %d, pool: %s, data: %p)\n", - sizes[i], debug_d3dpool(pools[j]), data); - hr = IDirect3DVertexBuffer9_Unlock(buffer); - ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Unlock failed (0x%08x)\n", hr); - - if(buffer) IDirect3DVertexBuffer9_Release(buffer); - } - } - -cleanup: - if (device) - { - UINT refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); - } - if (d3d9) IDirect3D9_Release(d3d9); -} - static void test_lights(void) { D3DPRESENT_PARAMETERS present_parameters; @@ -2660,7 +2585,6 @@ START_TEST(device) test_depthstenciltest(); test_draw_indexed(); test_null_stream(); - test_vertex_buffer_alignment(); test_lights(); test_set_stream_source(); test_scissor_size();

1 0

Stefan Dösinger : d3d8: Test buffer lock flags.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: e2f83db007806095ca89057afe66488d8c745c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f83db007806095ca89057af… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 30 12:21:31 2010 +0100 d3d8: Test buffer lock flags. --- dlls/d3d8/tests/Makefile.in | 1 + dlls/d3d8/tests/buffer.c | 135 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/Makefile.in b/dlls/d3d8/tests/Makefile.in index 9728d97..3e30e39 100644 --- a/dlls/d3d8/tests/Makefile.in +++ b/dlls/d3d8/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = user32 kernel32 CTESTS = \ d3d8_main.c \ + buffer.c \ device.c \ stateblock.c \ surface.c \ diff --git a/dlls/d3d8/tests/buffer.c b/dlls/d3d8/tests/buffer.c new file mode 100644 index 0000000..725e642 --- /dev/null +++ b/dlls/d3d8/tests/buffer.c @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2010 Stefan Dösinger(for CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include <d3d8.h> +#include "wine/test.h" + +static HWND create_window(void) +{ + WNDCLASS wc = {0}; + wc.lpfnWndProc = DefWindowProc; + wc.lpszClassName = "d3d8_test_wc"; + RegisterClass(&wc); + + return CreateWindow("d3d8_test_wc", "d3d8_test", + 0, 0, 0, 0, 0, 0, 0, 0, 0); +} + +static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle) +{ + IDirect3D8 * (__stdcall * d3d8_create)(UINT SDKVersion) = 0; + IDirect3D8 *d3d8_ptr = 0; + IDirect3DDevice8 *device_ptr = 0; + D3DPRESENT_PARAMETERS present_parameters; + D3DDISPLAYMODE d3ddm; + HRESULT hr; + + d3d8_create = (void *)GetProcAddress(d3d8_handle, "Direct3DCreate8"); + ok(d3d8_create != NULL, "Failed to get address of Direct3DCreate8\n"); + if (!d3d8_create) return NULL; + + d3d8_ptr = d3d8_create(D3D_SDK_VERSION); + if (!d3d8_ptr) + { + skip("could not create D3D8\n"); + return NULL; + } + + IDirect3D8_GetAdapterDisplayMode(d3d8_ptr, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory(&present_parameters, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = create_window(); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferFormat = d3ddm.Format; + + hr = IDirect3D8_CreateDevice(d3d8_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + + if(FAILED(hr)) + { + skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); + return NULL; + } + + return device_ptr; +} + +static void lock_flag_test(IDirect3DDevice8 *device) +{ + HRESULT hr; + IDirect3DVertexBuffer8 *buffer; + unsigned int i; + BYTE *data; + const struct + { + DWORD flags; + const char *debug_string; + HRESULT result; + } + test_data[] = + { + {D3DLOCK_READONLY, "D3DLOCK_READONLY", D3D_OK }, + {D3DLOCK_DISCARD, "D3DLOCK_DISCARD", D3D_OK }, + {D3DLOCK_NOOVERWRITE, "D3DLOCK_NOOVERWRITE", D3D_OK }, + {D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, "D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", D3D_OK }, + {D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, "D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", D3D_OK }, + {D3DLOCK_READONLY | D3DLOCK_DISCARD, "D3DLOCK_READONLY | D3DLOCK_DISCARD", D3D_OK }, + /* Completely bogous flags aren't an error */ + {0xdeadbeef, "0xdeadbeef", D3D_OK }, + }; + + hr = IDirect3DDevice8_CreateVertexBuffer(device, 1024, D3DUSAGE_DYNAMIC, 0, D3DPOOL_DEFAULT, &buffer); + ok(hr == D3D_OK, "IDirect3DDevice8_CreateBuffer failed, 0x%08x\n", hr); + + for(i = 0; i < (sizeof(test_data) / sizeof(*test_data)); i++) + { + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, &data, test_data[i].flags); + ok(hr == test_data[i].result, "Lock flags %s returned 0x%08x, expected 0x%08x\n", + test_data[i].debug_string, hr, test_data[i].result); + + if(SUCCEEDED(hr)) + { + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(hr == D3D_OK, "IDirect3DVertexBuffer8_Unlock failed, 0x%08x\n", hr); + } + } + + IDirect3DVertexBuffer8_Release(buffer); +} + +START_TEST(buffer) +{ + IDirect3DDevice8 *device_ptr; + ULONG refcount; + HMODULE d3d8_handle = 0; + + d3d8_handle = LoadLibraryA("d3d8.dll"); + if (!d3d8_handle) + { + skip("Could not load d3d8.dll\n"); + return; + } + + device_ptr = init_d3d8(d3d8_handle); + if (!device_ptr) return; + + lock_flag_test(device_ptr); + + refcount = IDirect3DDevice8_Release(device_ptr); + ok(!refcount, "Device has %u references left\n", refcount); +}

1 0

Henri Verbeet : wined3d: Dump ARB program shaders on compile failure.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 42c83f0260ab7972b4524dfe536323b033f1c633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c83f0260ab7972b4524dfe5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 2 12:06:53 2010 +0100 wined3d: Dump ARB program shaders on compile failure. Similar to the patch for GLSL. --- dlls/wined3d/arb_program_shader.c | 57 +++++++++++++++++++++++++++++++++---- 1 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a76cd66..e4653f0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -41,6 +41,45 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION (*gl_info) +/* Extract a line. Note that this modifies the source string. */ +static char *get_line(char **ptr) +{ + char *p, *q; + + p = *ptr; + if (!(q = strstr(p, "\n"))) + { + if (!*p) return NULL; + *ptr += strlen(p); + return p; + } + *q = '\0'; + *ptr = q + 1; + + return p; +} + +static void shader_arb_dump_program_source(const char *source) +{ + unsigned long source_size; + char *ptr, *line, *tmp; + + source_size = strlen(source) + 1; + tmp = HeapAlloc(GetProcessHeap(), 0, source_size); + if (!tmp) + { + ERR("Failed to allocate %lu bytes for shader source.\n", source_size); + return; + } + memcpy(tmp, source, source_size); + + ptr = tmp; + while ((line = get_line(&ptr))) FIXME(" %s\n", line); + FIXME("\n"); + + HeapFree(GetProcessHeap(), 0, tmp); +} + /* GL locking for state handlers is done by the caller. */ static BOOL need_mova_const(IWineD3DBaseShader *shader, const struct wined3d_gl_info *gl_info) { @@ -3047,8 +3086,9 @@ static GLuint create_arb_blt_vertex_program(const struct wined3d_gl_info *gl_inf glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); if (pos != -1) { - FIXME("Vertex program error at position %d: %s\n", pos, + FIXME("Vertex program error at position %d: %s\n\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + shader_arb_dump_program_source(blt_vprogram); } else { @@ -3109,8 +3149,9 @@ static GLuint create_arb_blt_fragment_program(const struct wined3d_gl_info *gl_i glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); if (pos != -1) { - FIXME("Fragment program error at position %d: %s\n", pos, + FIXME("Fragment program error at position %d: %s\n\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + shader_arb_dump_program_source(blt_fprograms[tex_type]); } else { @@ -3565,8 +3606,9 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); if (errPos != -1) { - FIXME("HW PixelShader Error at position %d: %s\n", + FIXME("HW PixelShader Error at position %d: %s\n\n", errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + shader_arb_dump_program_source(buffer->buffer); retval = 0; } else @@ -3975,8 +4017,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); if (errPos != -1) { - FIXME("HW VertexShader Error at position %d: %s\n", + FIXME("HW VertexShader Error at position %d: %s\n\n", errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + shader_arb_dump_program_source(buffer->buffer); ret = -1; } else @@ -5864,8 +5907,9 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); if (pos != -1) { - FIXME("Fragment program error at position %d: %s\n", pos, + FIXME("Fragment program error at position %d: %s\n\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + shader_arb_dump_program_source(buffer.buffer); } else { @@ -6568,8 +6612,9 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); if (pos != -1) { - FIXME("Fragment program error at position %d: %s\n", pos, + FIXME("Fragment program error at position %d: %s\n\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + shader_arb_dump_program_source(buffer.buffer); } else {

1 0

Henri Verbeet : wined3d: TRACE IWineD3DDeviceImpl_CreateSurface() parameters.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 97700f05a91e8891f5381eb08e1d04bf832207b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97700f05a91e8891f5381eb08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 2 12:06:54 2010 +0100 wined3d: TRACE IWineD3DDeviceImpl_CreateSurface() parameters. --- dlls/wined3d/device.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0cc27c9..955b221 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -596,7 +596,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, UI IWineD3DSurfaceImpl *object; HRESULT hr; - TRACE("(%p) Create surface\n",This); + TRACE("iface %p, width %u, height %u, format %s (%#x), lockable %#x, discard %#x, level %u\n", + iface, Width, Height, debug_d3dformat(Format), Format, Lockable, Discard, Level); + TRACE("surface %p, usage %s (%#x), pool %s (%#x), multisample_type %#x, multisample_quality %u\n", + ppSurface, debug_d3dusage(Usage), Usage, debug_d3dpool(Pool), Pool, MultiSample, MultisampleQuality); + TRACE("surface_type %#x, parent %p, parent_ops %p.\n", Impl, parent, parent_ops); if (Impl == SURFACE_OPENGL && !This->adapter) {

1 0