July 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : ddraw: Use a less offensive handle table implementation for surfaces.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 51a315386e8ecfce65e23c6bb8639d1d20b88f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a315386e8ecfce65e23c6bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 30 10:15:24 2010 +0200 ddraw: Use a less offensive handle table implementation for surfaces. --- dlls/ddraw/ddraw_private.h | 15 +----- dlls/ddraw/device.c | 136 ++++++++----------------------------------- dlls/ddraw/direct3d.c | 3 - dlls/ddraw/surface.c | 3 +- dlls/ddraw/texture.c | 11 ++- 5 files changed, 35 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51a315386e8ecfce65e23…

1 0

Henri Verbeet : wined3d: The stateblock doesn't have a parent.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 3ad82a82bb62019e491800e5117983059ae4540e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad82a82bb62019e491800e51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 30 10:15:25 2010 +0200 wined3d: The stateblock doesn't have a parent. --- dlls/d3d8/device.c | 3 +-- dlls/d3d9/stateblock.c | 4 ++-- dlls/ddraw/device.c | 2 +- dlls/wined3d/device.c | 15 ++++++--------- include/wine/wined3d.idl | 3 +-- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 12ed0fb..fad94e4 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1415,8 +1415,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateStateBlock(IDirect3DDevice8 *if } wined3d_mutex_lock(); - hr = IWineD3DDevice_CreateStateBlock(This->WineD3DDevice, (WINED3DSTATEBLOCKTYPE)Type, - &stateblock, NULL); + hr = IWineD3DDevice_CreateStateBlock(This->WineD3DDevice, (WINED3DSTATEBLOCKTYPE)Type, &stateblock); if (FAILED(hr)) { wined3d_mutex_unlock(); diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index c4941db..01a882e 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -138,8 +138,8 @@ HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, IDirect3DDevice9Im else { wined3d_mutex_lock(); - hr = IWineD3DDevice_CreateStateBlock(device->WineD3DDevice, (WINED3DSTATEBLOCKTYPE)type, - &stateblock->wineD3DStateBlock, (IUnknown *)stateblock); + hr = IWineD3DDevice_CreateStateBlock(device->WineD3DDevice, + (WINED3DSTATEBLOCKTYPE)type, &stateblock->wineD3DStateBlock); wined3d_mutex_unlock(); if (FAILED(hr)) { diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index da6a5c4..6cd0f80 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5927,7 +5927,7 @@ IDirect3DDeviceImpl_7_CreateStateBlock(IDirect3DDevice7 *iface, EnterCriticalSection(&ddraw_cs); /* The D3DSTATEBLOCKTYPE enum is fine here. */ - hr = IWineD3DDevice_CreateStateBlock(This->wineD3DDevice, Type, &wined3d_sb, NULL); + hr = IWineD3DDevice_CreateStateBlock(This->wineD3DDevice, Type, &wined3d_sb); if (FAILED(hr)) { WARN("Failed to create stateblock, hr %#x.\n", hr); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 11a6b9a..d74b1f4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1012,7 +1012,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface } static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice *iface, - WINED3DSTATEBLOCKTYPE type, IWineD3DStateBlock **stateblock, IUnknown *parent) + WINED3DSTATEBLOCKTYPE type, IWineD3DStateBlock **stateblock) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DStateBlockImpl *object; @@ -1790,12 +1790,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, if(!This->adapter->opengl) return WINED3DERR_INVALIDCALL; TRACE("(%p) : Creating stateblock\n", This); - /* Creating the startup stateBlock - Note Special Case: 0 => Don't fill in yet! */ - hr = IWineD3DDevice_CreateStateBlock(iface, - WINED3DSBT_INIT, - (IWineD3DStateBlock **)&This->stateBlock, - NULL); - if (WINED3D_OK != hr) { /* Note: No parent needed for initial internal stateblock */ + hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, (IWineD3DStateBlock **)&This->stateBlock); + if (FAILED(hr)) + { WARN("Failed to create stateblock\n"); goto err_out; } @@ -4488,7 +4485,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) if (This->isRecordingState) return WINED3DERR_INVALIDCALL; - hr = IWineD3DDeviceImpl_CreateStateBlock(iface, WINED3DSBT_RECORDED, &stateblock, NULL); + hr = IWineD3DDeviceImpl_CreateStateBlock(iface, WINED3DSBT_RECORDED, &stateblock); if (FAILED(hr)) return hr; IWineD3DStateBlock_Release((IWineD3DStateBlock*)This->updateStateBlock); @@ -6469,7 +6466,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE } /* Note: No parent needed for initial internal stateblock */ - hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, (IWineD3DStateBlock **)&This->stateBlock, NULL); + hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, (IWineD3DStateBlock **)&This->stateBlock); if (FAILED(hr)) ERR("Resetting the stateblock failed with error 0x%08x\n", hr); else TRACE("Created stateblock %p\n", This->stateBlock); This->updateStateBlock = This->stateBlock; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 7eebb39..e15ea4d 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2843,8 +2843,7 @@ interface IWineD3DDevice : IWineD3DBase ); HRESULT CreateStateBlock( [in] WINED3DSTATEBLOCKTYPE type, - [out] IWineD3DStateBlock **stateblock, - [in] IUnknown *parent + [out] IWineD3DStateBlock **stateblock ); HRESULT CreateSurface( [in] UINT width,

1 0

Henri Verbeet : wined3d: Move the draw buffer array to the context.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 237f39377f57d82a58d0006cd30f4aaa5d8908fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=237f39377f57d82a58d0006cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 30 10:15:26 2010 +0200 wined3d: Move the draw buffer array to the context. --- dlls/wined3d/context.c | 21 +++++++++++++-------- dlls/wined3d/device.c | 8 ++------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2ddb02b..7e3e813 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1408,6 +1408,10 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3 gl_info->limits.buffers * sizeof(*ret->blit_targets)); if (!ret->blit_targets) goto out; + ret->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + gl_info->limits.buffers * sizeof(*ret->draw_buffers)); + if (!ret->draw_buffers) goto out; + ret->free_occlusion_query_size = 4; ret->free_occlusion_queries = HeapAlloc(GetProcessHeap(), 0, ret->free_occlusion_query_size * sizeof(*ret->free_occlusion_queries)); @@ -1558,6 +1562,7 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3 out: HeapFree(GetProcessHeap(), 0, ret->free_event_queries); HeapFree(GetProcessHeap(), 0, ret->free_occlusion_queries); + HeapFree(GetProcessHeap(), 0, ret->draw_buffers); HeapFree(GetProcessHeap(), 0, ret->blit_targets); HeapFree(GetProcessHeap(), 0, ret->pshader_const_dirty); HeapFree(GetProcessHeap(), 0, ret->vshader_const_dirty); @@ -1593,6 +1598,7 @@ void context_destroy(IWineD3DDeviceImpl *This, struct wined3d_context *context) destroy = FALSE; } + HeapFree(GetProcessHeap(), 0, context->draw_buffers); HeapFree(GetProcessHeap(), 0, context->blit_targets); HeapFree(GetProcessHeap(), 0, context->vshader_const_dirty); HeapFree(GetProcessHeap(), 0, context->pshader_const_dirty); @@ -1953,19 +1959,19 @@ static void context_apply_draw_buffer(struct wined3d_context *context, BOOL blit for (i = 0; i < gl_info->limits.buffers; ++i) { if (device->render_targets[i]) - device->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; + context->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; else - device->draw_buffers[i] = GL_NONE; + context->draw_buffers[i] = GL_NONE; } if (gl_info->supported[ARB_DRAW_BUFFERS]) { - GL_EXTCALL(glDrawBuffersARB(gl_info->limits.buffers, device->draw_buffers)); + GL_EXTCALL(glDrawBuffersARB(gl_info->limits.buffers, context->draw_buffers)); checkGLcall("glDrawBuffers()"); } else { - glDrawBuffer(device->draw_buffers[0]); + glDrawBuffer(context->draw_buffers[0]); checkGLcall("glDrawBuffer()"); } } else { @@ -2139,18 +2145,17 @@ void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceIm else { const struct wined3d_gl_info *gl_info = context->gl_info; - GLenum buffers[gl_info->limits.buffers]; for (i = 0; i < gl_info->limits.buffers; ++i) { if (i < rt_count && rts[i]) - buffers[i] = GL_COLOR_ATTACHMENT0 + i; + context->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; else - buffers[i] = GL_NONE; + context->draw_buffers[i] = GL_NONE; } ENTER_GL(); - GL_EXTCALL(glDrawBuffersARB(gl_info->limits.buffers, buffers)); + GL_EXTCALL(glDrawBuffersARB(gl_info->limits.buffers, context->draw_buffers)); checkGLcall("glDrawBuffers()"); LEAVE_GL(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d74b1f4..7f6eb8e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1802,12 +1802,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, This->render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->render_targets) * gl_info->limits.buffers); - This->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(GLenum) * gl_info->limits.buffers); This->NumberOfPalettes = 1; This->palettes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PALETTEENTRY*)); - if(!This->palettes || !This->render_targets || !This->draw_buffers) { + if (!This->palettes || !This->render_targets) + { ERR("Out of memory!\n"); hr = E_OUTOFMEMORY; goto err_out; @@ -1946,7 +1945,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, err_out: HeapFree(GetProcessHeap(), 0, This->render_targets); - HeapFree(GetProcessHeap(), 0, This->draw_buffers); HeapFree(GetProcessHeap(), 0, This->swapchains); This->NumberOfSwapChains = 0; if(This->palettes) { @@ -2150,9 +2148,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, This->NumberOfPalettes = 0; HeapFree(GetProcessHeap(), 0, This->render_targets); - HeapFree(GetProcessHeap(), 0, This->draw_buffers); This->render_targets = NULL; - This->draw_buffers = NULL; This->d3d_initialized = FALSE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b7a0b1..4205dd5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1060,6 +1060,7 @@ struct wined3d_context GLuint fbo_draw_binding; BOOL rebind_fbo; IWineD3DSurfaceImpl **blit_targets; + GLenum *draw_buffers; /* Queries */ GLuint *free_occlusion_queries; @@ -1637,7 +1638,6 @@ struct IWineD3DDeviceImpl UINT currentPalette; /* For rendering to a texture using glCopyTexImage */ - GLenum *draw_buffers; GLuint depth_blt_texture; GLuint depth_blt_rb; UINT depth_blt_rb_w;

1 0

Henri Verbeet : wined3d: Add support for ARB_texture_compression_rgtc.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: a99bf6c017a142c3ed8ff26f39936cd7b87b5181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a99bf6c017a142c3ed8ff26f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 30 10:15:27 2010 +0200 wined3d: Add support for ARB_texture_compression_rgtc. --- dlls/wined3d/directx.c | 8 +++++++- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_gl.h | 10 ++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3e6e38d..4820737 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -77,6 +77,7 @@ static const struct { {"GL_ARB_sync", ARB_SYNC, 0 }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP, 0 }, {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION, 0 }, + {"GL_ARB_texture_compression_rgtc", ARB_TEXTURE_COMPRESSION_RGTC, 0 }, {"GL_ARB_texture_cube_map", ARB_TEXTURE_CUBE_MAP, 0 }, {"GL_ARB_texture_env_add", ARB_TEXTURE_ENV_ADD, 0 }, {"GL_ARB_texture_env_combine", ARB_TEXTURE_ENV_COMBINE, 0 }, @@ -2358,6 +2359,11 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) TRACE_(d3d_caps)(" IMPLIED: ARB_vertex_array_bgra support (by EXT_vertex_array_bgra).\n"); gl_info->supported[ARB_VERTEX_ARRAY_BGRA] = TRUE; } + if (!gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC && gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]]) + { + TRACE_(d3d_caps)(" IMPLIED: ARB_texture_compression_rgtc support (by EXT_texture_compression_rgtc).\n"); + gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] = TRUE; + } if (gl_info->supported[NV_TEXTURE_SHADER2]) { if (gl_info->supported[NV_REGISTER_COMBINERS]) @@ -3619,7 +3625,7 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, const struct /* Vendor specific formats */ case WINED3DFMT_ATI2N: if (gl_info->supported[ATI_TEXTURE_COMPRESSION_3DC] - || gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) + || gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) { if (adapter->shader_backend->shader_color_fixup_supported(format_desc->color_fixup) && adapter->fragment_pipe->color_fixup_supported(format_desc->color_fixup)) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 661139c..f2bb60e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -847,10 +847,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, 0, ATI_TEXTURE_COMPRESSION_3DC, NULL}, - {WINED3DFMT_ATI2N, GL_COMPRESSED_RED_GREEN_RGTC2_EXT, GL_COMPRESSED_RED_GREEN_RGTC2_EXT, 0, + {WINED3DFMT_ATI2N, GL_COMPRESSED_RED_GREEN_RGTC2, GL_COMPRESSED_RED_GREEN_RGTC2, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, 0, - EXT_TEXTURE_COMPRESSION_RGTC, NULL}, + ARB_TEXTURE_COMPRESSION_RGTC, NULL}, }; static inline int getFmtIdx(WINED3DFORMAT fmt) { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index c76a753..7003a60 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1760,6 +1760,7 @@ typedef enum wined3d_gl_extension ARB_SYNC, ARB_TEXTURE_BORDER_CLAMP, ARB_TEXTURE_COMPRESSION, + ARB_TEXTURE_COMPRESSION_RGTC, ARB_TEXTURE_CUBE_MAP, ARB_TEXTURE_ENV_ADD, ARB_TEXTURE_ENV_COMBINE, @@ -2451,6 +2452,15 @@ typedef GLvoid (WINE_GLAPI *PGLFNGETSYNCIVPROC)(GLsync sync, GLenum pname, GLsiz #define GL_CLAMP_TO_BORDER_ARB 0x812d #endif +/* GL_ARB_texture_compression_rgtc */ +#ifndef GL_ARB_texture_compression_rgtc +#define GL_ARB_texture_compression_rgtc 1 +#define GL_COMPRESSED_RED_RGTC1 0x8dbb +#define GL_COMPRESSED_SIGNED_RED_RGTC1 0x8dbc +#define GL_COMPRESSED_RED_GREEN_RGTC2 0x8dbd +#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2 0x8dbe +#endif + /* GL_ARB_texture_cube_map */ #ifndef GL_ARB_texture_cube_map #define GL_ARB_texture_cube_map 1

1 0

Stefan Dösinger : wined3d: The flag parameter in shader_hw_sample is a WORD.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 51cd12f35af75c03a5ca6e767ce2e0ed15326bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51cd12f35af75c03a5ca6e767… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 15:43:16 2010 +0200 wined3d: The flag parameter in shader_hw_sample is a WORD. --- dlls/wined3d/arb_program_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 665c02b..ab82bb8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1887,7 +1887,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) char reg_dest[40]; char reg_coord[40]; DWORD reg_sampler_code; - DWORD myflags = 0; + WORD myflags = 0; /* All versions have a destination register */ shader_arb_get_dst_param(ins, dst, reg_dest); @@ -3052,7 +3052,7 @@ static void shader_hw_texldd(const struct wined3d_shader_instruction *ins) DWORD sampler_idx = ins->src[1].reg.idx; char reg_dest[40]; char reg_src[3][40]; - DWORD flags = TEX_DERIV; + WORD flags = TEX_DERIV; shader_arb_get_dst_param(ins, &ins->dst[0], reg_dest); shader_arb_get_src_param(ins, &ins->src[0], 0, reg_src[0]); @@ -3070,7 +3070,7 @@ static void shader_hw_texldl(const struct wined3d_shader_instruction *ins) DWORD sampler_idx = ins->src[1].reg.idx; char reg_dest[40]; char reg_coord[40]; - DWORD flags = TEX_LOD; + WORD flags = TEX_LOD; shader_arb_get_dst_param(ins, &ins->dst[0], reg_dest); shader_arb_get_src_param(ins, &ins->src[0], 0, reg_coord);

1 0

Henri Verbeet : ddraw: Use a less offensive handle table implementation for stateblocks.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 91193b6eeccfe2c4d0eae9622338371b3ec35375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91193b6eeccfe2c4d0eae9622… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 30 10:15:23 2010 +0200 ddraw: Use a less offensive handle table implementation for stateblocks. --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 122 ++++++++++++++++++++++++------------------- 2 files changed, 69 insertions(+), 55 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 49ec317..f41a695 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -326,7 +326,6 @@ typedef enum { DDrawHandle_Unknown = 0, DDrawHandle_Texture = 1, - DDrawHandle_StateBlock = 4 } DDrawHandleTypes; struct HandleEntry @@ -342,6 +341,7 @@ enum ddraw_handle_type DDRAW_HANDLE_FREE, DDRAW_HANDLE_MATERIAL, DDRAW_HANDLE_MATRIX, + DDRAW_HANDLE_STATEBLOCK, }; struct ddraw_handle_entry diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 449ca4d..5814158 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -382,14 +382,6 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) } break; - case DDrawHandle_StateBlock: - { - /* No fixme here because this might happen because of sloppy apps */ - WARN("Leftover stateblock handle %d, deleting\n", i + 1); - IDirect3DDevice7_DeleteStateBlock((IDirect3DDevice7 *)This, i + 1); - } - break; - default: FIXME("Unknown handle %d not unset properly\n", i + 1); } @@ -423,6 +415,14 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) break; } + case DDRAW_HANDLE_STATEBLOCK: + { + /* No FIXME here because this might happen because of sloppy applications. */ + WARN("Leftover stateblock handle %#x (%p), deleting.\n", i + 1, entry->object); + IDirect3DDevice7_DeleteStateBlock(iface, i + 1); + break; + } + default: FIXME("Handle %#x (%p) has unknown type %#x.\n", i + 1, entry->object, entry->type); break; @@ -5604,7 +5604,10 @@ IDirect3DDeviceImpl_7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *BlockHandle) { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; + IWineD3DStateBlock *wined3d_sb; HRESULT hr; + DWORD h; + TRACE("(%p)->(%p): Relay!\n", This, BlockHandle); if(!BlockHandle) @@ -5614,17 +5617,29 @@ IDirect3DDeviceImpl_7_EndStateBlock(IDirect3DDevice7 *iface, } EnterCriticalSection(&ddraw_cs); - *BlockHandle = IDirect3DDeviceImpl_CreateHandle(This); - if(!*BlockHandle) + + hr = IWineD3DDevice_EndStateBlock(This->wineD3DDevice, &wined3d_sb); + if (FAILED(hr)) + { + WARN("Failed to end stateblock, hr %#x.\n", hr); + LeaveCriticalSection(&ddraw_cs); + *BlockHandle = 0; + return hr_ddraw_from_wined3d(hr); + } + + h = ddraw_allocate_handle(&This->handle_table, wined3d_sb, DDRAW_HANDLE_STATEBLOCK); + if (h == DDRAW_INVALID_HANDLE) { - ERR("Cannot get a handle number for the stateblock\n"); + ERR("Failed to allocate a stateblock handle.\n"); + IWineD3DStateBlock_Release(wined3d_sb); LeaveCriticalSection(&ddraw_cs); + *BlockHandle = 0; return DDERR_OUTOFMEMORY; } - This->Handles[*BlockHandle - 1].type = DDrawHandle_StateBlock; - hr = IWineD3DDevice_EndStateBlock(This->wineD3DDevice, - (IWineD3DStateBlock **) &This->Handles[*BlockHandle - 1].ptr); + LeaveCriticalSection(&ddraw_cs); + *BlockHandle = h + 1; + return hr_ddraw_from_wined3d(hr); } @@ -5723,25 +5738,23 @@ IDirect3DDeviceImpl_7_ApplyStateBlock(IDirect3DDevice7 *iface, DWORD BlockHandle) { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; + IWineD3DStateBlock *wined3d_sb; HRESULT hr; TRACE("(%p)->(%08x): Relay!\n", This, BlockHandle); EnterCriticalSection(&ddraw_cs); - if(!BlockHandle || BlockHandle > This->numHandles) - { - WARN("Out of range handle %d, returning D3DERR_INVALIDSTATEBLOCK\n", BlockHandle); - LeaveCriticalSection(&ddraw_cs); - return D3DERR_INVALIDSTATEBLOCK; - } - if(This->Handles[BlockHandle - 1].type != DDrawHandle_StateBlock) + + wined3d_sb = ddraw_get_object(&This->handle_table, BlockHandle - 1, DDRAW_HANDLE_STATEBLOCK); + if (!wined3d_sb) { - WARN("Handle %d is not a stateblock, returning D3DERR_INVALIDSTATEBLOCK\n", BlockHandle); + WARN("Invalid stateblock handle.\n"); LeaveCriticalSection(&ddraw_cs); return D3DERR_INVALIDSTATEBLOCK; } - hr = IWineD3DStateBlock_Apply((IWineD3DStateBlock *) This->Handles[BlockHandle - 1].ptr); + hr = IWineD3DStateBlock_Apply(wined3d_sb); LeaveCriticalSection(&ddraw_cs); + return hr_ddraw_from_wined3d(hr); } @@ -5787,24 +5800,21 @@ IDirect3DDeviceImpl_7_CaptureStateBlock(IDirect3DDevice7 *iface, DWORD BlockHandle) { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; + IWineD3DStateBlock *wined3d_sb; HRESULT hr; TRACE("(%p)->(%08x): Relay!\n", This, BlockHandle); EnterCriticalSection(&ddraw_cs); - if(BlockHandle == 0 || BlockHandle > This->numHandles) - { - WARN("Out of range handle %d, returning D3DERR_INVALIDSTATEBLOCK\n", BlockHandle); - LeaveCriticalSection(&ddraw_cs); - return D3DERR_INVALIDSTATEBLOCK; - } - if(This->Handles[BlockHandle - 1].type != DDrawHandle_StateBlock) + + wined3d_sb = ddraw_get_object(&This->handle_table, BlockHandle - 1, DDRAW_HANDLE_STATEBLOCK); + if (!wined3d_sb) { - WARN("Handle %d is not a stateblock, returning D3DERR_INVALIDSTATEBLOCK\n", BlockHandle); + WARN("Invalid stateblock handle.\n"); LeaveCriticalSection(&ddraw_cs); return D3DERR_INVALIDSTATEBLOCK; } - hr = IWineD3DStateBlock_Capture((IWineD3DStateBlock *) This->Handles[BlockHandle - 1].ptr); + hr = IWineD3DStateBlock_Capture(wined3d_sb); LeaveCriticalSection(&ddraw_cs); return hr_ddraw_from_wined3d(hr); } @@ -5850,30 +5860,24 @@ IDirect3DDeviceImpl_7_DeleteStateBlock(IDirect3DDevice7 *iface, DWORD BlockHandle) { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; + IWineD3DStateBlock *wined3d_sb; ULONG ref; TRACE("(%p)->(%08x): Relay!\n", This, BlockHandle); EnterCriticalSection(&ddraw_cs); - if(BlockHandle == 0 || BlockHandle > This->numHandles) - { - WARN("Out of range handle %d, returning D3DERR_INVALIDSTATEBLOCK\n", BlockHandle); - LeaveCriticalSection(&ddraw_cs); - return D3DERR_INVALIDSTATEBLOCK; - } - if(This->Handles[BlockHandle - 1].type != DDrawHandle_StateBlock) + + wined3d_sb = ddraw_free_handle(&This->handle_table, BlockHandle - 1, DDRAW_HANDLE_STATEBLOCK); + if (!wined3d_sb) { - WARN("Handle %d is not a stateblock, returning D3DERR_INVALIDSTATEBLOCK\n", BlockHandle); + WARN("Invalid stateblock handle.\n"); LeaveCriticalSection(&ddraw_cs); return D3DERR_INVALIDSTATEBLOCK; } - ref = IWineD3DStateBlock_Release((IWineD3DStateBlock *) This->Handles[BlockHandle - 1].ptr); - if(ref) + if ((ref = IWineD3DStateBlock_Release(wined3d_sb))) { - ERR("Something is still holding the stateblock %p(Handle %d). Ref = %d\n", This->Handles[BlockHandle - 1].ptr, BlockHandle, ref); + ERR("Something is still holding stateblock %p (refcount %u).\n", wined3d_sb, ref); } - This->Handles[BlockHandle - 1].ptr = NULL; - This->Handles[BlockHandle - 1].type = DDrawHandle_Unknown; LeaveCriticalSection(&ddraw_cs); return D3D_OK; @@ -5922,7 +5926,10 @@ IDirect3DDeviceImpl_7_CreateStateBlock(IDirect3DDevice7 *iface, DWORD *BlockHandle) { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; + IWineD3DStateBlock *wined3d_sb; HRESULT hr; + DWORD h; + TRACE("(%p)->(%08x,%p)!\n", This, Type, BlockHandle); if(!BlockHandle) @@ -5937,21 +5944,28 @@ IDirect3DDeviceImpl_7_CreateStateBlock(IDirect3DDevice7 *iface, } EnterCriticalSection(&ddraw_cs); - *BlockHandle = IDirect3DDeviceImpl_CreateHandle(This); - if(!*BlockHandle) + + /* The D3DSTATEBLOCKTYPE enum is fine here. */ + hr = IWineD3DDevice_CreateStateBlock(This->wineD3DDevice, Type, &wined3d_sb, NULL); + if (FAILED(hr)) { - ERR("Cannot get a handle number for the stateblock\n"); + WARN("Failed to create stateblock, hr %#x.\n", hr); + LeaveCriticalSection(&ddraw_cs); + return hr_ddraw_from_wined3d(hr); + } + + h = ddraw_allocate_handle(&This->handle_table, wined3d_sb, DDRAW_HANDLE_STATEBLOCK); + if (h == DDRAW_INVALID_HANDLE) + { + ERR("Failed to allocate stateblock handle.\n"); + IWineD3DStateBlock_Release(wined3d_sb); LeaveCriticalSection(&ddraw_cs); return DDERR_OUTOFMEMORY; } - This->Handles[*BlockHandle - 1].type = DDrawHandle_StateBlock; - /* The D3DSTATEBLOCKTYPE enum is fine here */ - hr = IWineD3DDevice_CreateStateBlock(This->wineD3DDevice, - Type, - (IWineD3DStateBlock **) &This->Handles[*BlockHandle - 1].ptr, - NULL /* Parent, hope that works */); + *BlockHandle = h + 1; LeaveCriticalSection(&ddraw_cs); + return hr_ddraw_from_wined3d(hr); }

1 0

Henri Verbeet : d3d9/tests: Read from the appropriate pixels in test_constant_clamp_vs().
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: bb201bb510777c04e5951d181d69a40b4dd52685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb201bb510777c04e5951d181… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 30 10:15:28 2010 +0200 d3d9/tests: Read from the appropriate pixels in test_constant_clamp_vs(). --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1aecb86..48aad75 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4806,12 +4806,12 @@ static void test_constant_clamp_vs(IDirect3DDevice9 *device) ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0xbf, 0x80), 1), "quad 2 has color %08x, expected 0x00bfbf80\n", color); if(shader_20) { - color = getPixelColor(device, 160, 120); + color = getPixelColor(device, 480, 120); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0xbf, 0x80), 1), "quad 3 has color %08x, expected 0x00bfbf80\n", color); } if(shader_20_2) { - color = getPixelColor(device, 480, 120); + color = getPixelColor(device, 160, 120); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0xbf, 0x80), 1), "quad 4 has color %08x, expected 0x00bfbf80\n", color); }

1 0

Stefan Dösinger : wined3d: The ARB loop unroller' s iteration is unsigned.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 728dd55f62aed6d3cf34fbff60f2f3e7bfc409d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=728dd55f62aed6d3cf34fbff6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 15:41:16 2010 +0200 wined3d: The ARB loop unroller's iteration is unsigned. --- dlls/wined3d/arb_program_shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0617fe3..665c02b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5244,7 +5244,8 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio if(control_frame->outer_loop) { - int iteration, aL = 0; + unsigned int iteration; + int aL = 0; struct list copy; /* Turn off recording before playback */ @@ -5276,11 +5277,11 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio if(ins->handler_idx == WINED3DSIH_ENDLOOP) { priv->aL = aL; - shader_addline(buffer, "#Iteration %d, aL=%d\n", iteration, aL); + shader_addline(buffer, "#Iteration %u, aL=%d\n", iteration, aL); } else { - shader_addline(buffer, "#Iteration %d\n", iteration); + shader_addline(buffer, "#Iteration %u\n", iteration); } LIST_FOR_EACH_ENTRY(rec_ins, &copy, struct recorded_instruction, entry)

1 0

David Hedberg : shell32: Fixup IShellItemArray_Constructor helper.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 56f39b0d88a1252cc43768d4045367895cb84701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f39b0d88a1252cc43768d40… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Jul 29 21:41:06 2010 +0200 shell32: Fixup IShellItemArray_Constructor helper. --- dlls/shell32/shellitem.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 5b01262..dbf9b4d 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -755,7 +755,7 @@ static const IShellItemArrayVtbl vt_IShellItemArray = { IShellItemArray_fnEnumItems }; -static HRESULT WINAPI IShellItemArray_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) +static HRESULT IShellItemArray_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) { IShellItemArrayImpl *This; HRESULT ret; @@ -771,6 +771,8 @@ static HRESULT WINAPI IShellItemArray_Constructor(IUnknown *pUnkOuter, REFIID ri This->ref = 1; This->lpVtbl = &vt_IShellItemArray; + This->array = NULL; + This->item_count = 0; ret = IShellItemArray_QueryInterface((IShellItemArray*)This, riid, ppv); IShellItemArray_Release((IShellItemArray*)This);

1 0

André Hentschel : jscript: Fix typo in registry information.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: bb53f8a782fd4ce92ab4ae58a853a7c151e3cad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb53f8a782fd4ce92ab4ae58a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 29 18:36:03 2010 +0200 jscript: Fix typo in registry information. --- dlls/jscript/jscript.inf | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.inf b/dlls/jscript/jscript.inf index 3e2994b..d6a6f8c 100644 --- a/dlls/jscript/jscript.inf +++ b/dlls/jscript/jscript.inf @@ -96,8 +96,8 @@ HKCR,"LiveScript Author\OLEScript",,16 ;; FIXME: This probably should go to wshext.dll [FileType.Reg] HKCR,".js",,,"JSFile" -HKCR,"JSFile",,,"JSCript Script File" -HKCR,"JSFile\ScriptEngine",,,"JSCript" +HKCR,"JSFile",,,"JScript Script File" +HKCR,"JSFile\ScriptEngine",,,"JScript" [Strings]

1 0