February 2011 - Wine-Commits

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionConstantBuffer::GetDesc().
by Alexandre Julliard Feb. 21, 2011

Feb. 21, 2011

Module: wine Branch: master Commit: c6ec32aec72d3ac04c326e90785d4054c9116190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ec32aec72d3ac04c326e907… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 20 21:21:21 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionConstantBuffer::GetDesc(). --- dlls/d3dcompiler_43/reflection.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 4aeb70f..d1f2fb7 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -480,12 +480,37 @@ const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl = /* ID3D11ShaderReflectionConstantBuffer methods */ +static inline struct d3dcompiler_shader_reflection_constant_buffer *impl_from_ID3D11ShaderReflectionConstantBuffer(ID3D11ShaderReflectionConstantBuffer *iface) +{ + return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_constant_buffer, ID3D11ShaderReflectionConstantBuffer_iface); +} + static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetDesc( ID3D11ShaderReflectionConstantBuffer *iface, D3D11_SHADER_BUFFER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p\n", iface, desc); + + if (This == &null_constant_buffer) + { + WARN("Null constant buffer specified\n"); + return E_FAIL; + } + + if (!desc) + { + WARN("Invalid argument specified\n"); + return E_FAIL; + } + + desc->Name = This->name; + desc->Type = This->type; + desc->Variables = This->variable_count; + desc->Size = This->size; + desc->uFlags = This->flags; + + return S_OK; } static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex(

1 0

Rico Schüller : d3dcompiler: Parse reflection variables.
by Alexandre Julliard Feb. 21, 2011

Feb. 21, 2011

Module: wine Branch: master Commit: 0e8d142ea6f0a1eb0b2641706932e95fdef5a6ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8d142ea6f0a1eb0b2641706… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 20 21:21:23 2011 +0100 d3dcompiler: Parse reflection variables. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 13 +++ dlls/d3dcompiler_43/reflection.c | 158 ++++++++++++++++++++++++++++- 2 files changed, 169 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index bec51e5..948a0c5 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -64,6 +64,17 @@ struct d3dcompiler_shader_signature char *string_data; }; +struct d3dcompiler_shader_reflection_variable +{ + ID3D11ShaderReflectionVariable ID3D11ShaderReflectionVariable_iface; + + char *name; + UINT start_offset; + UINT size; + UINT flags; + LPVOID default_value; +}; + struct d3dcompiler_shader_reflection_constant_buffer { ID3D11ShaderReflectionConstantBuffer ID3D11ShaderReflectionConstantBuffer_iface; @@ -75,6 +86,8 @@ struct d3dcompiler_shader_reflection_constant_buffer UINT variable_count; UINT size; UINT flags; + + struct d3dcompiler_shader_reflection_variable *variables; }; /* ID3D11ShaderReflection */ diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index d1f2fb7..27b1cd2 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -60,6 +60,22 @@ static BOOL copy_name(const char *ptr, char **name) return TRUE; } +static BOOL copy_value(const char *ptr, void **value, DWORD size) +{ + if (!ptr || !size) return TRUE; + + *value = HeapAlloc(GetProcessHeap(), 0, size); + if (!*value) + { + ERR("Failed to allocate vlaue memory.\n"); + return FALSE; + } + + memcpy(*value, ptr, size); + + return TRUE; +} + static void free_signature(struct d3dcompiler_shader_signature *sig) { TRACE("Free signature %p\n", sig); @@ -68,8 +84,28 @@ static void free_signature(struct d3dcompiler_shader_signature *sig) HeapFree(GetProcessHeap(), 0, sig->string_data); } +static void free_variable(struct d3dcompiler_shader_reflection_variable *var) +{ + if (var) + { + HeapFree(GetProcessHeap(), 0, var->name); + HeapFree(GetProcessHeap(), 0, var->default_value); + } +} + static void free_constant_buffer(struct d3dcompiler_shader_reflection_constant_buffer *cb) { + if (cb->variables) + { + unsigned int i; + + for (i = 0; i < cb->variable_count; ++i) + { + free_variable(&cb->variables[i]); + } + HeapFree(GetProcessHeap(), 0, cb->variables); + } + HeapFree(GetProcessHeap(), 0, cb->name); } @@ -537,6 +573,49 @@ const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflect d3dcompiler_shader_reflection_constant_buffer_GetVariableByName, }; +/* ID3D11ShaderReflectionVariable methods */ + +static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetDesc( + ID3D11ShaderReflectionVariable *iface, D3D11_SHADER_VARIABLE_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetType( + ID3D11ShaderReflectionVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetBuffer( + ID3D11ShaderReflectionVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetInterfaceSlot( + ID3D11ShaderReflectionVariable *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return 0; +} + +const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl = +{ + /* ID3D11ShaderReflectionVariable methods */ + d3dcompiler_shader_reflection_variable_GetDesc, + d3dcompiler_shader_reflection_variable_GetType, + d3dcompiler_shader_reflection_variable_GetBuffer, + d3dcompiler_shader_reflection_variable_GetInterfaceSlot, +}; + static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size) { const char *ptr = data; @@ -647,6 +726,75 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c return E_FAIL; } +static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_constant_buffer *cb, + const char *data, DWORD data_size, const char *ptr) +{ + struct d3dcompiler_shader_reflection_variable *variables; + unsigned int i; + HRESULT hr; + + variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cb->variable_count * sizeof(*variables)); + if (!variables) + { + ERR("Failed to allocate variables memory.\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < cb->variable_count; i++) + { + struct d3dcompiler_shader_reflection_variable *v = &variables[i]; + DWORD offset; + + v->ID3D11ShaderReflectionVariable_iface.lpVtbl = &d3dcompiler_shader_reflection_variable_vtbl; + + read_dword(&ptr, &offset); + if (!copy_name(data + offset, &v->name)) + { + ERR("Failed to copy name.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + TRACE("Variable name: %s.\n", debugstr_a(v->name)); + + read_dword(&ptr, &v->start_offset); + TRACE("Variable offset: %u\n", v->start_offset); + + read_dword(&ptr, &v->size); + TRACE("Variable size: %u\n", v->size); + + read_dword(&ptr, &v->flags); + TRACE("Variable flags: %u\n", v->flags); + + /* todo: Parse types */ + read_dword(&ptr, &offset); + FIXME("Variable type offset: %x\n", offset); + + read_dword(&ptr, &offset); + TRACE("Variable default value offset: %x\n", offset); + if (!copy_value(data + offset, &v->default_value, offset ? v->size : 0)) + { + ERR("Failed to copy name.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + if ((cb->reflection->target & 0xffff) >= 0x500) + skip_dword_unknown(&ptr, 4); + } + + cb->variables = variables; + + return S_OK; + +err_out: + for (i = 0; i < cb->variable_count; i++) + { + free_variable(&variables[i]); + } + HeapFree(GetProcessHeap(), 0, variables); + return hr; +} + static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size) { const char *ptr = data; @@ -779,9 +927,15 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c read_dword(&ptr, &cb->variable_count); TRACE("Variable count: %u\n", cb->variable_count); - /* todo: Parse variables */ read_dword(&ptr, &offset); - FIXME("Variable offset: %x\n", offset); + TRACE("Variable offset: %x\n", offset); + + hr = d3dcompiler_parse_variables(cb, data, data_size, data + offset); + if (hr != S_OK) + { + FIXME("Failed to parse variables."); + goto err_out; + } read_dword(&ptr, &cb->size); TRACE("Cbuffer size: %u\n", cb->size);

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Feb. 21, 2011

Feb. 21, 2011

Module: wine Branch: master Commit: 65c35aad8e8e8f019b246ab71887965815f0b16e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c35aad8e8e8f019b246ab71… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 18 18:17:51 2011 +0100 po: Update French translation. --- po/fr.po | 198 +++++++++++++++++++++++--------------------------------------- 1 files changed, 74 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65c35aad8e8e8f019b246…

1 0

Dmitry Timoshkov : gdi32: Add dumping of child GDI font cache.
by Alexandre Julliard Feb. 21, 2011

Feb. 21, 2011

Module: wine Branch: master Commit: 00c8250ff87cbc615b39051c228339d712aa7c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c8250ff87cbc615b39051c2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 21 18:20:01 2011 +0800 gdi32: Add dumping of child GDI font cache. --- dlls/gdi32/freetype.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 81c8e46..e0a93f8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3880,6 +3880,13 @@ static void dump_gdi_font_list(void) TRACE("gdiFont=%p %s %d\n", gdiFont, debugstr_w(gdiFont->font_desc.lf.lfFaceName), gdiFont->font_desc.lf.lfHeight); } + + TRACE("---------- Child gdiFont Cache ----------\n"); + LIST_FOR_EACH(elem_ptr, &child_font_list) { + gdiFont = LIST_ENTRY(elem_ptr, struct tagGdiFont, entry); + TRACE("gdiFont=%p %s %d\n", + gdiFont, debugstr_w(gdiFont->font_desc.lf.lfFaceName), gdiFont->font_desc.lf.lfHeight); + } } /*************************************************************

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflection::GetConstantBufferByIndex().
by Alexandre Julliard Feb. 21, 2011

Feb. 21, 2011

Module: wine Branch: master Commit: a7483f4bcc13f287c1f1b0150304ee471b12fcfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7483f4bcc13f287c1f1b0150… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 20 21:21:14 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflection::GetConstantBufferByIndex(). --- dlls/d3dcompiler_43/reflection.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index b382d83..3c4d138 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -31,6 +31,11 @@ enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7 = 7, }; +const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl; + +/* null objects - needed for invalid calls */ +static struct d3dcompiler_shader_reflection_constant_buffer null_constant_buffer = {{&d3dcompiler_shader_reflection_constant_buffer_vtbl}}; + static BOOL copy_name(const char *ptr, char **name) { size_t name_len; @@ -216,9 +221,17 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11Sha static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByIndex( ID3D11ShaderReflection *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + if (index >= This->constant_buffer_count) + { + WARN("Invalid argument specified\n"); + return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface; + } + + return &This->constant_buffers[index].ID3D11ShaderReflectionConstantBuffer_iface; } static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByName(

1 0

Rico Schüller : d3dcompiler: Parse reflection constant buffers.
by Alexandre Julliard Feb. 21, 2011

Feb. 21, 2011

Module: wine Branch: master Commit: 3f6c54f26306dee49064c20e7c780d1f49ffbbf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6c54f26306dee49064c20e7… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 20 21:21:11 2011 +0100 d3dcompiler: Parse reflection constant buffers. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 14 ++++ dlls/d3dcompiler_43/reflection.c | 106 +++++++++++++++++++++++++++- 2 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index bc99322..bec51e5 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -64,6 +64,19 @@ struct d3dcompiler_shader_signature char *string_data; }; +struct d3dcompiler_shader_reflection_constant_buffer +{ + ID3D11ShaderReflectionConstantBuffer ID3D11ShaderReflectionConstantBuffer_iface; + + struct d3dcompiler_shader_reflection *reflection; + + char *name; + D3D_CBUFFER_TYPE type; + UINT variable_count; + UINT size; + UINT flags; +}; + /* ID3D11ShaderReflection */ struct d3dcompiler_shader_reflection { @@ -109,6 +122,7 @@ struct d3dcompiler_shader_reflection struct d3dcompiler_shader_signature *pcsg; char *resource_string; D3D11_SHADER_INPUT_BIND_DESC *bound_resources; + struct d3dcompiler_shader_reflection_constant_buffer *constant_buffers; }; /* reflection handling */ diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index e1ba543..b382d83 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -63,6 +63,11 @@ static void free_signature(struct d3dcompiler_shader_signature *sig) HeapFree(GetProcessHeap(), 0, sig->string_data); } +static void free_constant_buffer(struct d3dcompiler_shader_reflection_constant_buffer *cb) +{ + HeapFree(GetProcessHeap(), 0, cb->name); +} + static void reflection_cleanup(struct d3dcompiler_shader_reflection *ref) { TRACE("Cleanup %p\n", ref); @@ -85,6 +90,17 @@ static void reflection_cleanup(struct d3dcompiler_shader_reflection *ref) HeapFree(GetProcessHeap(), 0, ref->pcsg); } + if (ref->constant_buffers) + { + unsigned int i; + + for (i = 0; i < ref->constant_buffer_count; ++i) + { + free_constant_buffer(&ref->constant_buffers[i]); + } + } + + HeapFree(GetProcessHeap(), 0, ref->constant_buffers); HeapFree(GetProcessHeap(), 0, ref->bound_resources); HeapFree(GetProcessHeap(), 0, ref->resource_string); HeapFree(GetProcessHeap(), 0, ref->creator); @@ -427,6 +443,40 @@ const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl = d3dcompiler_shader_reflection_GetThreadGroupSize, }; +/* ID3D11ShaderReflectionConstantBuffer methods */ + +static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetDesc( + ID3D11ShaderReflectionConstantBuffer *iface, D3D11_SHADER_BUFFER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex( + ID3D11ShaderReflectionConstantBuffer *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByName( + ID3D11ShaderReflectionConstantBuffer *iface, LPCSTR name) +{ + FIXME("iface %p, name %s stub!\n", iface, name); + + return NULL; +} + +const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl = +{ + /* ID3D11ShaderReflectionConstantBuffer methods */ + d3dcompiler_shader_reflection_constant_buffer_GetDesc, + d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex, + d3dcompiler_shader_reflection_constant_buffer_GetVariableByName, +}; + static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size) { const char *ptr = data; @@ -542,11 +592,10 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c const char *ptr = data; DWORD size = data_size >> 2; DWORD offset, cbuffer_offset, resource_offset, creator_offset; - unsigned int i; - unsigned int string_data_offset; - unsigned int string_data_size; + unsigned int i, string_data_offset, string_data_size; char *string_data = NULL, *creator = NULL; D3D11_SHADER_INPUT_BIND_DESC *bound_resources = NULL; + struct d3dcompiler_shader_reflection_constant_buffer *constant_buffers = NULL; HRESULT hr; TRACE("Size %u\n", size); @@ -640,15 +689,64 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c } } - /* todo: Parse Constant buffers */ + if (r->constant_buffer_count) + { + constant_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, r->constant_buffer_count * sizeof(*constant_buffers)); + if (!constant_buffers) + { + ERR("Failed to allocate constant buffer memory.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + ptr = data + cbuffer_offset; + for (i = 0; i < r->constant_buffer_count; i++) + { + struct d3dcompiler_shader_reflection_constant_buffer *cb = &constant_buffers[i]; + + cb->ID3D11ShaderReflectionConstantBuffer_iface.lpVtbl = &d3dcompiler_shader_reflection_constant_buffer_vtbl; + cb->reflection = r; + + read_dword(&ptr, &offset); + if (!copy_name(data + offset, &cb->name)) + { + ERR("Failed to copy name.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + TRACE("Name: %s.\n", debugstr_a(cb->name)); + + read_dword(&ptr, &cb->variable_count); + TRACE("Variable count: %u\n", cb->variable_count); + + /* todo: Parse variables */ + read_dword(&ptr, &offset); + FIXME("Variable offset: %x\n", offset); + + read_dword(&ptr, &cb->size); + TRACE("Cbuffer size: %u\n", cb->size); + + read_dword(&ptr, &cb->flags); + TRACE("Cbuffer flags: %u\n", cb->flags); + + read_dword(&ptr, &cb->type); + TRACE("Cbuffer type: %#x\n", cb->type); + } + } r->creator = creator; r->resource_string = string_data; r->bound_resources = bound_resources; + r->constant_buffers = constant_buffers; return S_OK; err_out: + for (i = 0; i < r->constant_buffer_count; ++i) + { + free_constant_buffer(&constant_buffers[i]); + } + HeapFree(GetProcessHeap(), 0, constant_buffers); HeapFree(GetProcessHeap(), 0, bound_resources); HeapFree(GetProcessHeap(), 0, string_data); HeapFree(GetProcessHeap(), 0, creator);

1 0

Dmitry Timoshkov : gdi32: Go through all hfontlist entries not just the first one when checking whether font is in the child font list .
by Alexandre Julliard Feb. 21, 2011

Feb. 21, 2011

Module: wine Branch: master Commit: 20bdd203aa82c3a20dbc4ffe4c5d93474a784fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20bdd203aa82c3a20dbc4ffe4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 21 18:20:59 2011 +0800 gdi32: Go through all hfontlist entries not just the first one when checking whether font is in the child font list. --- dlls/gdi32/freetype.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e0a93f8..edddde1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3908,14 +3908,16 @@ BOOL WineEngDestroyFontInstance(HFONT handle) LIST_FOR_EACH_ENTRY(gdiFont, &child_font_list, struct tagGdiFont, entry) { - struct list *first_hfont = list_head(&gdiFont->hfontlist); - hflist = LIST_ENTRY(first_hfont, HFONTLIST, entry); - if(hflist->hfont == handle) - { - TRACE("removing child font %p from child list\n", gdiFont); - list_remove(&gdiFont->entry); - LeaveCriticalSection( &freetype_cs ); - return TRUE; + hfontlist_elem_ptr = list_head(&gdiFont->hfontlist); + while(hfontlist_elem_ptr) { + hflist = LIST_ENTRY(hfontlist_elem_ptr, struct tagHFONTLIST, entry); + hfontlist_elem_ptr = list_next(&gdiFont->hfontlist, hfontlist_elem_ptr); + if(hflist->hfont == handle) { + TRACE("removing child font %p from child list\n", gdiFont); + list_remove(&gdiFont->entry); + LeaveCriticalSection( &freetype_cs ); + return TRUE; + } } }

1 0

Matteo Bruni : wpp: Let pp_add_define take the responsibility of copying strings (Valgrind).
by Alexandre Julliard Feb. 21, 2011

Feb. 21, 2011

Module: wine Branch: master Commit: 46caa0d225918d4ae5cf4feca9b1829fcd1fd0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=46caa0d225918d4ae5cf4feca… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 7 15:15:13 2011 +0100 wpp: Let pp_add_define take the responsibility of copying strings (Valgrind). --- libs/wpp/ppy.y | 2 +- libs/wpp/preproc.c | 37 ++++++++++++++++++++++--------------- libs/wpp/wpp.c | 10 +++++----- libs/wpp/wpp_private.h | 2 +- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index b50e120..a66072d 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -275,7 +275,7 @@ preprocessor } } | tUNDEF tIDENT tNL { pp_del_define($2); free($2); } - | tDEFINE opt_text tNL { pp_add_define($1, $2); } + | tDEFINE opt_text tNL { pp_add_define($1, $2); free($1); free($2); } | tMACRO res_arg allmargs tMACROEND opt_mtexts tNL { pp_add_macro($1, macro_args, nmacro_args, $5); } diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index c88bff5..99934d6 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -319,7 +319,7 @@ void pp_del_define(const char *name) printf("Deleted (%s, %d) <%s>\n", pp_status.input, pp_status.line_number, name); } -pp_entry_t *pp_add_define(char *def, char *text) +pp_entry_t *pp_add_define(const char *def, const char *text) { int len; char *cptr; @@ -339,38 +339,45 @@ pp_entry_t *pp_add_define(char *def, char *text) if(!ppp) return NULL; memset( ppp, 0, sizeof(*ppp) ); - ppp->ident = def; + ppp->ident = pp_xstrdup(def); + if(!ppp->ident) + goto error; ppp->type = def_define; - ppp->subst.text = text; + ppp->subst.text = text ? pp_xstrdup(text) : NULL; + if(text && !ppp->subst.text) + goto error; ppp->filename = pp_xstrdup(pp_status.input ? pp_status.input : "<internal or cmdline>"); if(!ppp->filename) - { - free(ppp); - return NULL; - } + goto error; ppp->linenumber = pp_status.input ? pp_status.line_number : 0; ppp->next = pp_def_state->defines[idx]; pp_def_state->defines[idx] = ppp; if(ppp->next) ppp->next->prev = ppp; - if(text) + if(ppp->subst.text) { /* Strip trailing white space from subst text */ - len = strlen(text); - while(len && strchr(" \t\r\n", text[len-1])) + len = strlen(ppp->subst.text); + while(len && strchr(" \t\r\n", ppp->subst.text[len-1])) { - text[--len] = '\0'; + ppp->subst.text[--len] = '\0'; } /* Strip leading white space from subst text */ - for(cptr = text; *cptr && strchr(" \t\r", *cptr); cptr++) + for(cptr = ppp->subst.text; *cptr && strchr(" \t\r", *cptr); cptr++) ; - if(text != cptr) - memmove(text, cptr, strlen(cptr)+1); + if(ppp->subst.text != cptr) + memmove(ppp->subst.text, cptr, strlen(cptr)+1); } if(pp_status.debug) - printf("Added define (%s, %d) <%s> to <%s>\n", pp_status.input, pp_status.line_number, ppp->ident, text ? text : "(null)"); + printf("Added define (%s, %d) <%s> to <%s>\n", pp_status.input, pp_status.line_number, ppp->ident, ppp->subst.text ? ppp->subst.text : "(null)"); return ppp; + +error: + free(ppp->ident); + free(ppp->subst.text); + free(ppp); + return NULL; } pp_entry_t *pp_add_macro(char *id, marg_t *args[], int nargs, mtext_t *exp) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 41ac54f..0c9c808 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -45,7 +45,7 @@ static void add_cmdline_defines(void) for (def = cmdline_defines; def; def = def->next) { - if (def->value) pp_add_define( pp_xstrdup(def->name), pp_xstrdup(def->value) ); + if (def->value) pp_add_define( def->name, def->value ); } } @@ -56,16 +56,16 @@ static void add_special_defines(void) char buf[32]; strftime(buf, sizeof(buf), "\"%b %d %Y\"", localtime(&now)); - pp_add_define( pp_xstrdup("__DATE__"), pp_xstrdup(buf) ); + pp_add_define( "__DATE__", buf ); strftime(buf, sizeof(buf), "\"%H:%M:%S\"", localtime(&now)); - pp_add_define( pp_xstrdup("__TIME__"), pp_xstrdup(buf) ); + pp_add_define( "__TIME__", buf ); - ppp = pp_add_define( pp_xstrdup("__FILE__"), pp_xstrdup("") ); + ppp = pp_add_define( "__FILE__", "" ); if(ppp) ppp->type = def_special; - ppp = pp_add_define( pp_xstrdup("__LINE__"), pp_xstrdup("") ); + ppp = pp_add_define( "__LINE__", "" ); if(ppp) ppp->type = def_special; } diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index 615a450..288d709 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -204,7 +204,7 @@ char *pp_xstrdup(const char *str); pp_entry_t *pplookup(const char *ident); int pp_push_define_state(void); void pp_pop_define_state(void); -pp_entry_t *pp_add_define(char *def, char *text); +pp_entry_t *pp_add_define(const char *def, const char *text); pp_entry_t *pp_add_macro(char *ident, marg_t *args[], int nargs, mtext_t *exp); void pp_del_define(const char *name); void *pp_open_include(const char *name, const char *parent_name, char **newpath);

1 0

Matteo Bruni : d3dx9: Remove an unnecessary initialization (LLVM/Clang).
by Alexandre Julliard Feb. 21, 2011

Feb. 21, 2011

Module: wine Branch: master Commit: 6505aed5980083c3d180aa8f2815c996e1687ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6505aed5980083c3d180aa8f2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 7 20:17:14 2011 +0100 d3dx9: Remove an unnecessary initialization (LLVM/Clang). --- dlls/d3dx9_36/texture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index f107bbf..1c40d96 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -66,7 +66,7 @@ HRESULT WINAPI D3DXFilterTexture(LPDIRECT3DBASETEXTURE9 texture, UINT srclevel, DWORD filter) { - UINT level = srclevel + 1; + UINT level; HRESULT hr; D3DRESOURCETYPE type;

1 0

Charles Davis : ntdll: Fix IOCTL_CDROM_RAW_READ on Mac OS.
by Alexandre Julliard Feb. 21, 2011

Feb. 21, 2011

Module: wine Branch: master Commit: 03c29bf7f5e2d72b327c67643a1830c6146871df URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c29bf7f5e2d72b327c67643… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Fri Feb 18 10:36:24 2011 -0700 ntdll: Fix IOCTL_CDROM_RAW_READ on Mac OS. --- dlls/ntdll/cdrom.c | 153 +++++++-------------------------------------------- 1 files changed, 21 insertions(+), 132 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 6a6d8e0..c51ef6b 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1441,6 +1441,9 @@ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DW { int ret = STATUS_NOT_SUPPORTED; int io = -1; +#ifdef __APPLE__ + dk_cd_read_t cdrd; +#endif TRACE("RAW_READ_INFO: DiskOffset=%i,%i SectorCount=%i TrackMode=%i\n buffer=%p len=%i sz=%p\n", raw->DiskOffset.u.HighPart, raw->DiskOffset.u.LowPart, raw->SectorCount, raw->TrackMode, buffer, len, sz); @@ -1510,154 +1513,40 @@ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DW return STATUS_INVALID_PARAMETER; } #elif defined(__APPLE__) + /* Mac OS lets us read multiple parts of the sector at a time. + * We can read all the sectors in at once, unlike Linux. + */ + memset(&cdrd, 0, sizeof(cdrd)); + cdrd.offset = (raw->DiskOffset.QuadPart >> 11) * kCDSectorSizeWhole; + cdrd.buffer = buffer; + cdrd.bufferLength = raw->SectorCount * kCDSectorSizeWhole; switch (raw->TrackMode) { case YellowMode2: - { - /* Mac OS, on the other hand, DOES read only one part of the sector - * at a time. Therefore, we have to read each part of the sector, in - * order, to get the whole raw sector in. - * This means that we have to read each sector one at a time, as on - * Linux. - */ - dk_cd_read_t cdrd; - UInt64 lba = raw->DiskOffset.QuadPart >> 11; - PBYTE bp; - int i; - - for (i = 0, bp = buffer; i < raw->SectorCount; - i++, lba++, bp += kCDSectorSizeWhole) - { - cdrd.offset = lba * kCDSectorSizeWhole; - cdrd.sectorType = kCDSectorTypeMode2; - - /* First, the sync area */ - cdrd.sectorArea = kCDSectorAreaSync; - cdrd.buffer = bp; - cdrd.bufferLength = 12; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i; - return CDROM_GetStatusCode(io); - } - - /* Then the header */ - cdrd.offset += 12; - cdrd.sectorArea = kCDSectorAreaHeader; - cdrd.buffer = (PBYTE)cdrd.buffer + 12; - cdrd.bufferLength = 4; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 12; - return CDROM_GetStatusCode(io); - } - - /* And finally the sector proper */ - cdrd.offset += 4; - cdrd.sectorArea = kCDSectorAreaUser; - cdrd.buffer = (PBYTE)cdrd.buffer + 4; - cdrd.bufferLength = kCDSectorSizeMode2; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 16; - return CDROM_GetStatusCode(io); - } - } - + cdrd.sectorType = kCDSectorTypeMode2; + cdrd.sectorArea = kCDSectorAreaSync | kCDSectorAreaHeader | kCDSectorAreaUser; break; - } case XAForm2: - { - /* Same here */ - dk_cd_read_t cdrd; - UInt64 lba = raw->DiskOffset.QuadPart >> 11; - PBYTE bp; - int i; - - for (i = 0, bp = buffer; i < raw->SectorCount; - i++, lba++, bp += kCDSectorSizeWhole) - { - cdrd.offset = lba * kCDSectorSizeWhole; - cdrd.sectorType = kCDSectorTypeMode2Form2; - - /* First, the sync area */ - cdrd.sectorArea = kCDSectorAreaSync; - cdrd.buffer = bp; - cdrd.bufferLength = 12; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i; - return CDROM_GetStatusCode(io); - } - - /* Then the header */ - cdrd.offset += 12; - cdrd.sectorArea = kCDSectorAreaHeader; - cdrd.buffer = (PBYTE)cdrd.buffer + 12; - cdrd.bufferLength = 4; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 12; - return CDROM_GetStatusCode(io); - } - - /* And the sub-header */ - cdrd.offset += 4; - cdrd.sectorArea = kCDSectorAreaSubHeader; - cdrd.buffer = (PBYTE)cdrd.buffer + 4; - cdrd.bufferLength = 8; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 16; - return CDROM_GetStatusCode(io); - } - - /* And finally the sector proper */ - cdrd.offset += 8; - cdrd.sectorArea = kCDSectorAreaUser; - cdrd.buffer = (PBYTE)cdrd.buffer + 8; - cdrd.bufferLength = kCDSectorSizeMode2; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 24; - return CDROM_GetStatusCode(io); - } - } - + cdrd.sectorType = kCDSectorTypeMode2Form2; + cdrd.sectorArea = kCDSectorAreaSync | kCDSectorAreaHeader | kCDSectorAreaSubHeader | kCDSectorAreaUser; break; - } case CDDA: - { - /* With CDDA, the whole raw sector is considered user data, so there's - * no need to read one at a time. - */ - dk_cd_read_t cdrd; - - cdrd.offset = (raw->DiskOffset.QuadPart >> 11) * kCDSectorSizeCDDA; - cdrd.sectorArea = kCDSectorAreaUser; cdrd.sectorType = kCDSectorTypeCDDA; - cdrd.buffer = buffer; - cdrd.bufferLength = len < raw->SectorCount*kCDSectorSizeCDDA ? len : - raw->SectorCount*kCDSectorSizeCDDA; - - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) return CDROM_GetStatusCode(io); + cdrd.sectorArea = kCDSectorAreaUser; break; - } default: FIXME("NIY: %d\n", raw->TrackMode); return STATUS_INVALID_PARAMETER; } + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = cdrd.bufferLength; + return CDROM_GetStatusCode(io); + } #else switch (raw->TrackMode) {

1 0