December 2010 - Wine-Commits

Alexander Puzankov : winmm: Revert "Handle playing of files containing a '+ ' as part of the filename.".
by Alexandre Julliard Dec. 1, 2010

Dec. 1, 2010

Module: wine Branch: master Commit: cc5f2b2c766bbe4975d7ee4a7c3b269650cbf874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc5f2b2c766bbe4975d7ee4a7… Author: Alexander Puzankov <alxpnv(a)gmail.com> Date: Mon Nov 29 21:15:16 2010 +0300 winmm: Revert "Handle playing of files containing a '+' as part of the filename.". This reverts commit ed593fdf2f5e7851cb59aa5a2253f43e33d2f14f. --- dlls/winmm/mmio.c | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 3f0790d..0ebebf1 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -383,39 +383,40 @@ static FOURCC MMIO_ParseExtA(LPCSTR szFileName) LPSTR extEnd; LPSTR extStart; + CHAR ext[5]; + TRACE("(%s)\n", debugstr_a(szFileName)); if (!szFileName) return ret; - /* Find the last '.' */ - extStart = strrchr(szFileName,'.'); + /* Find the last '+' */ + extEnd = strrchr(szFileName,'+'); - if (!extStart) { - ERR("No . in szFileName: %s\n", debugstr_a(szFileName)); + if (!extEnd) { + /* No + so just an extension */ + return ret; } else { - CHAR ext[5]; + /* Find the first '.' before '+' */ + extStart = extEnd - 1; + while (*extStart != '.') { + if (extStart == szFileName) { + ERR("No extension in szFileName: %s\n", debugstr_a(szFileName)); + return ret; + } + extStart--; + } + } - /* Find the '+' afterwards */ - extEnd = strchr(extStart,'+'); - if (extEnd) { + if (extEnd - extStart - 1 > 4) + WARN("Extension length > 4\n"); + lstrcpynA(ext, extStart + 1, min(extEnd-extStart,5)); - if (extEnd - extStart - 1 > 4) - WARN("Extension length > 4\n"); - lstrcpynA(ext, extStart + 1, min(extEnd-extStart,5)); + TRACE("Got extension: %s\n", debugstr_a(ext)); - } else { - /* No + so just an extension */ - if (strlen(extStart) > 4) { - WARN("Extension length > 4\n"); - } - lstrcpynA(ext, extStart + 1, 5); - } - TRACE("Got extension: %s\n", debugstr_a(ext)); + /* FOURCC codes identifying file-extensions must be uppercase */ + ret = mmioStringToFOURCCA(ext, MMIO_TOUPPER); - /* FOURCC codes identifying file-extensions must be uppercase */ - ret = mmioStringToFOURCCA(ext, MMIO_TOUPPER); - } return ret; }

1 0

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to shader_update_float_pixel_constants( ).
by Alexandre Julliard Dec. 1, 2010

Dec. 1, 2010

Module: wine Branch: master Commit: 77923346dab0567def625b4da1e2dffde7f43876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77923346dab0567def625b4da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 30 18:39:38 2010 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to shader_update_float_pixel_constants(). --- dlls/wined3d/arb_program_shader.c | 7 +++---- dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 7 +++---- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 502dfec..67eeef0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -665,17 +665,16 @@ static void shader_arb_update_float_vertex_constants(IWineD3DDeviceImpl *device, device->highest_dirty_vs_const = max(device->highest_dirty_vs_const, start + count); } -static void shader_arb_update_float_pixel_constants(IWineD3DDevice *iface, UINT start, UINT count) +static void shader_arb_update_float_pixel_constants(IWineD3DDeviceImpl *device, UINT start, UINT count) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct wined3d_context *context = context_get_current(); /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active * context. On a context switch the old context will be fully dirtified */ - if (!context || context->swapchain->device != This) return; + if (!context || context->swapchain->device != device) return; memset(context->pshader_const_dirty + start, 1, sizeof(*context->pshader_const_dirty) * count); - This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start + count); + device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, start + count); } static DWORD *local_const_mapping(IWineD3DBaseShaderImpl *This) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 02c79da..b6f6d29 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3861,7 +3861,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShaderConstantF( if (!This->isRecordingState) { - This->shader_backend->shader_update_float_pixel_constants(iface, start, count); + This->shader_backend->shader_update_float_pixel_constants(This, start, count); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADERCONSTANT); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2d2df26..9f4940e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -878,16 +878,15 @@ static void shader_glsl_update_float_vertex_constants(IWineD3DDeviceImpl *device } } -static void shader_glsl_update_float_pixel_constants(IWineD3DDevice *iface, UINT start, UINT count) +static void shader_glsl_update_float_pixel_constants(IWineD3DDeviceImpl *device, UINT start, UINT count) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - struct shader_glsl_priv *priv = This->shader_priv; + struct shader_glsl_priv *priv = device->shader_priv; struct constant_heap *heap = &priv->pconst_heap; UINT i; for (i = start; i < count + start; ++i) { - if (!This->stateBlock->changed.pixelShaderConstantsF[i]) + if (!device->stateBlock->changed.pixelShaderConstantsF[i]) update_heap_entry(heap, i, heap->size++, priv->next_constant_version); else update_heap_entry(heap, i, heap->positions[i], priv->next_constant_version); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0962eef..1caa3b6 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1514,7 +1514,7 @@ static void shader_none_select_depth_blt(void *shader_priv, const struct wined3d enum tex_types tex_type, const SIZE *ds_mask_size) {} static void shader_none_deselect_depth_blt(void *shader_priv, const struct wined3d_gl_info *gl_info) {} static void shader_none_update_float_vertex_constants(IWineD3DDeviceImpl *device, UINT start, UINT count) {} -static void shader_none_update_float_pixel_constants(IWineD3DDevice *iface, UINT start, UINT count) {} +static void shader_none_update_float_pixel_constants(IWineD3DDeviceImpl *device, UINT start, UINT count) {} static void shader_none_load_constants(const struct wined3d_context *context, char usePS, char useVS) {} static void shader_none_load_np2fixup_constants(void *shader_priv, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) {} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7cb6c78..566e67f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -754,7 +754,7 @@ typedef struct { enum tex_types tex_type, const SIZE *ds_mask_size); void (*shader_deselect_depth_blt)(void *shader_priv, const struct wined3d_gl_info *gl_info); void (*shader_update_float_vertex_constants)(IWineD3DDeviceImpl *device, UINT start, UINT count); - void (*shader_update_float_pixel_constants)(IWineD3DDevice *iface, UINT start, UINT count); + void (*shader_update_float_pixel_constants)(IWineD3DDeviceImpl *device, UINT start, UINT count); void (*shader_load_constants)(const struct wined3d_context *context, char usePS, char useVS); void (*shader_load_np2fixup_constants)(void *shader_priv, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state);

1 0

André Hentschel : winemaker: Fix current directory recognition.
by Alexandre Julliard Dec. 1, 2010

Dec. 1, 2010

Module: wine Branch: master Commit: 4dd043a5834a47a217dbfd71a514201f1dcea8e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd043a5834a47a217dbfd71a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 30 23:54:58 2010 +0100 winemaker: Fix current directory recognition. Also fixed some comments --- tools/winemaker | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 7eb45ec..200d5ce 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1732,12 +1732,12 @@ sub fix_file_and_directory_names($) next if ($new_name !~ /(^makefile|\.(c|cpp|h|rc))$/i); # Only all lowercase extensions are supported (because of - # rules like '.c.o:'. + # rules like '.c.o:'). $new_name =~ s/\.C$/.c/; $new_name =~ s/\.cpp$/.cpp/i; $warn=1 if ($new_name =~ s/\.cxx$/.cpp/i); $new_name =~ s/\.rc$/.rc/i; - # And this last one is to avoid confusion then running make + # And this last one is to avoid confusion when running make $warn=1 if ($new_name =~ s/^makefile$/makefile.win/i); } @@ -1748,7 +1748,7 @@ sub fix_file_and_directory_names($) $new_name=lc $new_name; } - # autoconf and make don't support these characters well + # make doesn't support these characters well $new_name =~ s/[ \$]/_/g; # And finally, perform the renaming @@ -1791,6 +1791,7 @@ sub search_from($$) my $path=$_[1]; my $real_path=""; + $dirname =~ s/(\.\/)+//; if ($dirname eq "" or $dirname eq "." or $dirname eq "./") { $dirname=cwd; } elsif ($dirname !~ m+^/+) { @@ -1860,7 +1861,7 @@ sub get_real_include_name($$$$$) my $project=$_[3]; my $target=$_[4]; - if ($filename =~ /^([a-zA-Z]:)?[\/]/ or $filename =~ /^[a-zA-Z]:[\/]?/) { + if ($filename =~ /^([a-zA-Z]:)?[\/\\]/ or $filename =~ /^[a-zA-Z]:[\/\\]?/) { # This is not a relative path, we cannot make any check my $warning="path:$filename"; if (!defined $warnings{$warning}) {

1 0

André Hentschel : winemaker: Fix going up one directory level.
by Alexandre Julliard Dec. 1, 2010

Dec. 1, 2010

Module: wine Branch: master Commit: c8f415487438a0551149e03b5d7dae27663801f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8f415487438a0551149e03b5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 30 23:55:59 2010 +0100 winemaker: Fix going up one directory level. --- tools/winemaker | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 200d5ce..484cf72 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1810,7 +1810,11 @@ sub search_from($$) $real_path.="./"; } elsif ($component eq "..") { # Go up one level - $dirname=dirname($dirname) . "/"; + if ($dirname =~ /\.\.\/$/) { + $dirname.="../"; + } else { + $dirname=dirname($dirname) . "/"; + } $real_path.="../"; } else { # The file/directory may have been renamed before. Also try to

1 0

Adam Martinson : msxml3/domdoc: Add a ref to the schema cache in copy_properties().
by Alexandre Julliard Dec. 1, 2010

Dec. 1, 2010

Module: wine Branch: master Commit: a4b0152c27a040bf956ecad927eb5e05921cd546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b0152c27a040bf956ecad92… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Tue Nov 30 10:41:19 2010 -0600 msxml3/domdoc: Add a ref to the schema cache in copy_properties(). --- dlls/msxml3/domdoc.c | 2 ++ dlls/msxml3/schema.c | 1 - 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 27f6a9f..dbc9b75 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -294,6 +294,8 @@ static domdoc_properties* copy_properties(domdoc_properties const* properties) pcopy->version = properties->version; pcopy->preserving = properties->preserving; pcopy->schemaCache = properties->schemaCache; + if (pcopy->schemaCache) + IXMLDOMSchemaCollection2_AddRef(pcopy->schemaCache); pcopy->XPath = properties->XPath; pcopy->selectNsStr_len = properties->selectNsStr_len; list_init( &pcopy->selectNsList ); diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index fa609a9..e262f2e 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -38,7 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); /* We use a chained hashtable, which can hold any number of schemas - * TODO: versioned constructor * TODO: grow/shrink hashtable depending on load factor * TODO: implement read-only where appropriate */

1 0

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to shader_free_private().
by Alexandre Julliard Dec. 1, 2010

Dec. 1, 2010

Module: wine Branch: master Commit: f45aeb4abe00c290d772e4d114c669c438096902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45aeb4abe00c290d772e4d11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 30 18:39:40 2010 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to shader_free_private(). --- dlls/wined3d/arb_program_shader.c | 10 +++++----- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/glsl_shader.c | 12 ++++++------ dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index becaa5f..ac2b0c9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4770,10 +4770,10 @@ static void release_signature(struct wine_rb_entry *entry, void *context) } /* Context activation is done by the caller. */ -static void shader_arb_free(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; - struct shader_arb_priv *priv = This->shader_priv; +static void shader_arb_free(IWineD3DDeviceImpl *device) +{ + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + struct shader_arb_priv *priv = device->shader_priv; int i; ENTER_GL(); @@ -4794,7 +4794,7 @@ static void shader_arb_free(IWineD3DDevice *iface) { LEAVE_GL(); wine_rb_destroy(&priv->signature_tree, release_signature, NULL); - HeapFree(GetProcessHeap(), 0, This->shader_priv); + HeapFree(GetProcessHeap(), 0, device->shader_priv); } static BOOL shader_arb_dirty_const(IWineD3DDevice *iface) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4efade0..102b65c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2056,7 +2056,7 @@ err_out: This->frag_pipe->free_private(iface); } if (This->shader_priv) { - This->shader_backend->shader_free_private(iface); + This->shader_backend->shader_free_private(This); } return hr; } @@ -2187,7 +2187,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ This->blitter->free_private(iface); This->frag_pipe->free_private(iface); - This->shader_backend->shader_free_private(iface); + This->shader_backend->shader_free_private(This); /* Release the buffers (with sanity checks)*/ if (This->onscreen_depth_stencil) @@ -6201,7 +6201,7 @@ static void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChainImpl This->blitter->free_private(iface); This->frag_pipe->free_private(iface); - This->shader_backend->shader_free_private(iface); + This->shader_backend->shader_free_private(This); destroy_dummy_textures(This, gl_info); context_release(context); @@ -6255,7 +6255,7 @@ static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwap if (FAILED(hr)) { ERR("Failed to allocate fragment pipe private data, hr %#x.\n", hr); - This->shader_backend->shader_free_private(iface); + This->shader_backend->shader_free_private(This); goto err; } @@ -6264,7 +6264,7 @@ static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwap { ERR("Failed to allocate blitter private data, hr %#x.\n", hr); This->frag_pipe->free_private(iface); - This->shader_backend->shader_free_private(iface); + This->shader_backend->shader_free_private(This); goto err; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2d19a34..58bb1b0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4871,10 +4871,10 @@ fail: } /* Context activation is done by the caller. */ -static void shader_glsl_free(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; - struct shader_glsl_priv *priv = This->shader_priv; +static void shader_glsl_free(IWineD3DDeviceImpl *device) +{ + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + struct shader_glsl_priv *priv = device->shader_priv; int i; ENTER_GL(); @@ -4897,8 +4897,8 @@ static void shader_glsl_free(IWineD3DDevice *iface) { HeapFree(GetProcessHeap(), 0, priv->stack); shader_buffer_free(&priv->shader_buffer); - HeapFree(GetProcessHeap(), 0, This->shader_priv); - This->shader_priv = NULL; + HeapFree(GetProcessHeap(), 0, device->shader_priv); + device->shader_priv = NULL; } static BOOL shader_glsl_dirty_const(IWineD3DDevice *iface) { diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0af7667..1804f58 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1520,7 +1520,7 @@ static void shader_none_load_np2fixup_constants(void *shader_priv, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) {} static void shader_none_destroy(IWineD3DBaseShader *iface) {} static HRESULT shader_none_alloc(IWineD3DDeviceImpl *device) {return WINED3D_OK;} -static void shader_none_free(IWineD3DDevice *iface) {} +static void shader_none_free(IWineD3DDeviceImpl *device) {} static BOOL shader_none_dirty_const(IWineD3DDevice *iface) {return FALSE;} static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4240832..8da99db 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -760,7 +760,7 @@ typedef struct { const struct wined3d_state *state); void (*shader_destroy)(IWineD3DBaseShader *iface); HRESULT (*shader_alloc_private)(IWineD3DDeviceImpl *device); - void (*shader_free_private)(IWineD3DDevice *iface); + void (*shader_free_private)(IWineD3DDeviceImpl *device); BOOL (*shader_dirtifyable_constants)(IWineD3DDevice *iface); void (*shader_get_caps)(const struct wined3d_gl_info *gl_info, struct shader_caps *caps); BOOL (*shader_color_fixup_supported)(struct color_fixup_desc fixup);

1 0

Henri Verbeet : wined3d: Move the PrivateData structure to resource.c.
by Alexandre Julliard Dec. 1, 2010

Dec. 1, 2010

Module: wine Branch: master Commit: fad461eefae8ea0eab4c677799d002b94faf036b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad461eefae8ea0eab4c67779… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 30 18:39:36 2010 +0100 wined3d: Move the PrivateData structure to resource.c. --- dlls/wined3d/resource.c | 35 ++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 17 ----------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 08175b5..b8b8594 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -27,6 +27,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +struct private_data +{ + struct list entry; + + GUID tag; + DWORD flags; /* DDSPD_* */ + + union + { + void *data; + IUnknown *object; + } ptr; + + DWORD size; +}; + HRESULT resource_init(IWineD3DResource *iface, WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format *format, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) @@ -80,8 +96,8 @@ HRESULT resource_init(IWineD3DResource *iface, WINED3DRESOURCETYPE resource_type void resource_cleanup(IWineD3DResource *iface) { IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; + struct private_data *data; struct list *e1, *e2; - PrivateData *data; HRESULT hr; TRACE("(%p) Cleaning up resource\n", This); @@ -90,8 +106,9 @@ void resource_cleanup(IWineD3DResource *iface) WineD3DAdapterChangeGLRam(This->resource.device, -This->resource.size); } - LIST_FOR_EACH_SAFE(e1, e2, &This->resource.privateData) { - data = LIST_ENTRY(e1, PrivateData, entry); + LIST_FOR_EACH_SAFE(e1, e2, &This->resource.privateData) + { + data = LIST_ENTRY(e1, struct private_data, entry); hr = resource_free_private_data(iface, &data->tag); if(hr != WINED3D_OK) { ERR("Failed to free private data when destroying resource %p, hr = %08x\n", This, hr); @@ -111,15 +128,15 @@ void resource_unload(IWineD3DResourceImpl *resource) resource->resource.resourceType); } -static PrivateData* resource_find_private_data(IWineD3DResourceImpl *This, REFGUID tag) +static struct private_data *resource_find_private_data(IWineD3DResourceImpl *This, REFGUID tag) { - PrivateData *data; + struct private_data *data; struct list *entry; TRACE("Searching for private data %s\n", debugstr_guid(tag)); LIST_FOR_EACH(entry, &This->resource.privateData) { - data = LIST_ENTRY(entry, PrivateData, entry); + data = LIST_ENTRY(entry, struct private_data, entry); if (IsEqualGUID(&data->tag, tag)) { TRACE("Found %p\n", data); return data; @@ -133,7 +150,7 @@ HRESULT resource_set_private_data(IWineD3DResource *iface, REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD flags) { IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - PrivateData *data; + struct private_data *data; TRACE("iface %p, riid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(refguid), pData, SizeOfData, flags); @@ -177,7 +194,7 @@ HRESULT resource_set_private_data(IWineD3DResource *iface, REFGUID refguid, HRESULT resource_get_private_data(IWineD3DResource *iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - PrivateData *data; + struct private_data *data; TRACE("(%p) : %p %p %p\n", This, refguid, pData, pSizeOfData); data = resource_find_private_data(This, refguid); @@ -208,7 +225,7 @@ HRESULT resource_get_private_data(IWineD3DResource *iface, REFGUID refguid, void HRESULT resource_free_private_data(IWineD3DResource *iface, REFGUID refguid) { IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - PrivateData *data; + struct private_data *data; TRACE("(%p) : %s\n", This, debugstr_guid(refguid)); data = resource_find_private_data(This, refguid); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9c9a952..48dc21c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1795,23 +1795,6 @@ static inline BOOL isStateDirty(struct wined3d_context *context, DWORD state) return context->isStateDirty[idx] & (1 << shift); } -/* Support for IWineD3DResource ::Set/Get/FreePrivateData. */ -typedef struct PrivateData -{ - struct list entry; - - GUID tag; - DWORD flags; /* DDSPD_* */ - - union - { - LPVOID data; - LPUNKNOWN object; - } ptr; - - DWORD size; -} PrivateData; - /***************************************************************************** * IWineD3DResource implementation structure */

1 0

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to shader_update_float_vertex_constants ().
by Alexandre Julliard Dec. 1, 2010

Dec. 1, 2010

Module: wine Branch: master Commit: 4a6d0da207e88ebd7d5539232b0f22f26dca6345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6d0da207e88ebd7d5539232… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 30 18:39:37 2010 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to shader_update_float_vertex_constants(). --- dlls/wined3d/arb_program_shader.c | 7 +++---- dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 9 ++++----- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 15 +++++++-------- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 32dbaa3..502dfec 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -653,17 +653,16 @@ static void shader_arb_load_constants(const struct wined3d_context *context, cha } } -static void shader_arb_update_float_vertex_constants(IWineD3DDevice *iface, UINT start, UINT count) +static void shader_arb_update_float_vertex_constants(IWineD3DDeviceImpl *device, UINT start, UINT count) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct wined3d_context *context = context_get_current(); /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active * context. On a context switch the old context will be fully dirtified */ - if (!context || context->swapchain->device != This) return; + if (!context || context->swapchain->device != device) return; memset(context->vshader_const_dirty + start, 1, sizeof(*context->vshader_const_dirty) * count); - This->highest_dirty_vs_const = max(This->highest_dirty_vs_const, start + count); + device->highest_dirty_vs_const = max(device->highest_dirty_vs_const, start + count); } static void shader_arb_update_float_pixel_constants(IWineD3DDevice *iface, UINT start, UINT count) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5e8c8cc..02c79da 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3460,7 +3460,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexShaderConstantF( if (!This->isRecordingState) { - This->shader_backend->shader_update_float_vertex_constants(iface, start, count); + This->shader_backend->shader_update_float_vertex_constants(This, start, count); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VERTEXSHADERCONSTANT); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 992b6bb..2d2df26 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4,7 +4,7 @@ * Copyright 2006 Jason Green * Copyright 2006-2007 Henri Verbeet * Copyright 2007-2008 Stefan Dösinger for CodeWeavers - * Copyright 2009 Henri Verbeet for CodeWeavers + * Copyright 2009-2010 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -863,16 +863,15 @@ static inline void update_heap_entry(struct constant_heap *heap, unsigned int id positions[idx] = heap_idx; } -static void shader_glsl_update_float_vertex_constants(IWineD3DDevice *iface, UINT start, UINT count) +static void shader_glsl_update_float_vertex_constants(IWineD3DDeviceImpl *device, UINT start, UINT count) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - struct shader_glsl_priv *priv = This->shader_priv; + struct shader_glsl_priv *priv = device->shader_priv; struct constant_heap *heap = &priv->vconst_heap; UINT i; for (i = start; i < count + start; ++i) { - if (!This->stateBlock->changed.vertexShaderConstantsF[i]) + if (!device->stateBlock->changed.vertexShaderConstantsF[i]) update_heap_entry(heap, i, heap->size++, priv->next_constant_version); else update_heap_entry(heap, i, heap->positions[i], priv->next_constant_version); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ed37fe1..0962eef 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1513,7 +1513,7 @@ static void shader_none_select(const struct wined3d_context *context, BOOL usePS static void shader_none_select_depth_blt(void *shader_priv, const struct wined3d_gl_info *gl_info, enum tex_types tex_type, const SIZE *ds_mask_size) {} static void shader_none_deselect_depth_blt(void *shader_priv, const struct wined3d_gl_info *gl_info) {} -static void shader_none_update_float_vertex_constants(IWineD3DDevice *iface, UINT start, UINT count) {} +static void shader_none_update_float_vertex_constants(IWineD3DDeviceImpl *device, UINT start, UINT count) {} static void shader_none_update_float_pixel_constants(IWineD3DDevice *iface, UINT start, UINT count) {} static void shader_none_load_constants(const struct wined3d_context *context, char usePS, char useVS) {} static void shader_none_load_np2fixup_constants(void *shader_priv, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 48dc21c..7cb6c78 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -52,6 +52,12 @@ #define WINED3D_QUIRK_NV_CLIP_BROKEN 0x00000010 #define WINED3D_QUIRK_FBO_TEX_UPDATE 0x00000020 +typedef struct IWineD3DStateBlockImpl IWineD3DStateBlockImpl; +typedef struct IWineD3DSurfaceImpl IWineD3DSurfaceImpl; +typedef struct IWineD3DPaletteImpl IWineD3DPaletteImpl; +typedef struct IWineD3DDeviceImpl IWineD3DDeviceImpl; +typedef struct IWineD3DSwapChainImpl IWineD3DSwapChainImpl; + /* Texture format fixups */ enum fixup_channel_source @@ -747,7 +753,7 @@ typedef struct { void (*shader_select_depth_blt)(void *shader_priv, const struct wined3d_gl_info *gl_info, enum tex_types tex_type, const SIZE *ds_mask_size); void (*shader_deselect_depth_blt)(void *shader_priv, const struct wined3d_gl_info *gl_info); - void (*shader_update_float_vertex_constants)(IWineD3DDevice *iface, UINT start, UINT count); + void (*shader_update_float_vertex_constants)(IWineD3DDeviceImpl *device, UINT start, UINT count); void (*shader_update_float_pixel_constants)(IWineD3DDevice *iface, UINT start, UINT count); void (*shader_load_constants)(const struct wined3d_context *context, char usePS, char useVS); void (*shader_load_np2fixup_constants)(void *shader_priv, const struct wined3d_gl_info *gl_info, @@ -848,13 +854,6 @@ do { si->elements[name].data, si->elements[name].stride, si->elements[name].format->id, \ si->elements[name].buffer_object, si->elements[name].stream_idx); } while(0) -/* Advance declaration of structures to satisfy compiler */ -typedef struct IWineD3DStateBlockImpl IWineD3DStateBlockImpl; -typedef struct IWineD3DSurfaceImpl IWineD3DSurfaceImpl; -typedef struct IWineD3DPaletteImpl IWineD3DPaletteImpl; -typedef struct IWineD3DDeviceImpl IWineD3DDeviceImpl; -typedef struct IWineD3DSwapChainImpl IWineD3DSwapChainImpl; - /* Global variables */ extern const float identity[16] DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to shader_alloc_private().
by Alexandre Julliard Dec. 1, 2010

Dec. 1, 2010

Module: wine Branch: master Commit: 4a698749384f019c4a4af24a821b286b78ce5bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a698749384f019c4a4af24a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 30 18:39:39 2010 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to shader_alloc_private(). --- dlls/wined3d/arb_program_shader.c | 6 +++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 67eeef0..becaa5f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4744,8 +4744,8 @@ static const struct wine_rb_functions sig_tree_functions = sig_tree_compare }; -static HRESULT shader_arb_alloc(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; +static HRESULT shader_arb_alloc(IWineD3DDeviceImpl *device) +{ struct shader_arb_priv *priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*priv)); if(wine_rb_init(&priv->signature_tree, &sig_tree_functions) == -1) { @@ -4753,7 +4753,7 @@ static HRESULT shader_arb_alloc(IWineD3DDevice *iface) { HeapFree(GetProcessHeap(), 0, priv); return E_OUTOFMEMORY; } - This->shader_priv = priv; + device->shader_priv = priv; return WINED3D_OK; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b6f6d29..4efade0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1963,7 +1963,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, if (This->depth_stencil) IWineD3DSurface_AddRef((IWineD3DSurface *)This->depth_stencil); - hr = This->shader_backend->shader_alloc_private(iface); + hr = This->shader_backend->shader_alloc_private(This); if(FAILED(hr)) { TRACE("Shader private data couldn't be allocated\n"); goto err_out; @@ -6244,7 +6244,7 @@ static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwap create_dummy_textures(This); context_release(context); - hr = This->shader_backend->shader_alloc_private(iface); + hr = This->shader_backend->shader_alloc_private(This); if (FAILED(hr)) { ERR("Failed to allocate shader private data, hr %#x.\n", hr); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9f4940e..2d19a34 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4818,9 +4818,9 @@ static const struct wine_rb_functions wined3d_glsl_program_rb_functions = glsl_program_key_compare, }; -static HRESULT shader_glsl_alloc(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; +static HRESULT shader_glsl_alloc(IWineD3DDeviceImpl *device) +{ + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct shader_glsl_priv *priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_glsl_priv)); SIZE_T stack_size = wined3d_log2i(max(gl_info->limits.glsl_vs_float_constants, gl_info->limits.glsl_ps_float_constants)) + 1; @@ -4858,7 +4858,7 @@ static HRESULT shader_glsl_alloc(IWineD3DDevice *iface) { priv->next_constant_version = 1; - This->shader_priv = priv; + device->shader_priv = priv; return WINED3D_OK; fail: diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1caa3b6..0af7667 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1519,7 +1519,7 @@ static void shader_none_load_constants(const struct wined3d_context *context, ch static void shader_none_load_np2fixup_constants(void *shader_priv, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) {} static void shader_none_destroy(IWineD3DBaseShader *iface) {} -static HRESULT shader_none_alloc(IWineD3DDevice *iface) {return WINED3D_OK;} +static HRESULT shader_none_alloc(IWineD3DDeviceImpl *device) {return WINED3D_OK;} static void shader_none_free(IWineD3DDevice *iface) {} static BOOL shader_none_dirty_const(IWineD3DDevice *iface) {return FALSE;} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 566e67f..4240832 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -759,7 +759,7 @@ typedef struct { void (*shader_load_np2fixup_constants)(void *shader_priv, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state); void (*shader_destroy)(IWineD3DBaseShader *iface); - HRESULT (*shader_alloc_private)(IWineD3DDevice *iface); + HRESULT (*shader_alloc_private)(IWineD3DDeviceImpl *device); void (*shader_free_private)(IWineD3DDevice *iface); BOOL (*shader_dirtifyable_constants)(IWineD3DDevice *iface); void (*shader_get_caps)(const struct wined3d_gl_info *gl_info, struct shader_caps *caps);

1 0