September 2021 - Wine-Commits

Alexandre Julliard : makefiles: Build the unix library name when parsing the sources.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 0f62381f67c20940d46a9dedfaa9f51c3e4cb47d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f62381f67c20940d46a9ded… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 20 15:29:17 2021 +0200 makefiles: Build the unix library name when parsing the sources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 59857762edd..acc3dc67e25 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -203,6 +203,7 @@ struct makefile const char *staticlib; const char *staticimplib; const char *importlib; + const char *unixlib; int disabled; int use_msvcrt; int is_cross; @@ -594,7 +595,7 @@ static const char *get_base_name( const char *name ) { char *base; if (!strchr( name, '.' )) return name; - base = strdup( name ); + base = xstrdup( name ); *strrchr( base, '.' ) = 0; return base; } @@ -3229,6 +3230,23 @@ static int has_object_file( struct makefile *make ) } +/******************************************************************* + * get_unix_lib_name + */ +static char *get_unix_lib_name( struct makefile *make ) +{ + struct incl_file *source; + + if (!*dll_ext) return NULL; + LIST_FOR_EACH_ENTRY( source, &make->sources, struct incl_file, entry ) + { + if (!(source->file->flags & FLAG_C_UNIX)) continue; + return strmake( "%s%s", get_base_name( make->module ), dll_ext ); + } + return NULL; +} + + /******************************************************************* * output_man_pages */ @@ -3351,17 +3369,12 @@ static void output_module( struct makefile *make ) output_filename( make->is_cross ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" ); output( "\n" ); - if (make->unixobj_files.count) + if (make->unixlib) { struct strarray unix_libs = empty_strarray; struct strarray unix_deps = empty_strarray; struct strarray extra_libs = get_expanded_make_var_array( make, "EXTRALIBS" ); int native_unix_lib = strarray_exists( &extra_libs, "-Wl,--subsystem,unixlib" ); - char *ext, *unix_lib = xmalloc( strlen( make->module ) + strlen( dll_ext ) + 1 ); - - strcpy( unix_lib, make->module ); - if ((ext = get_extension( unix_lib ))) *ext = 0; - strcat( unix_lib, dll_ext ); if (native_unix_lib) { @@ -3388,9 +3401,9 @@ static void output_module( struct makefile *make ) strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps )); - strarray_add( &make->all_targets, unix_lib ); - add_install_rule( make, make->module, unix_lib, strmake( "p%s/%s", so_dir, unix_lib )); - output( "%s:", obj_dir_path( make, unix_lib )); + strarray_add( &make->all_targets, make->unixlib ); + add_install_rule( make, make->module, make->unixlib, strmake( "p%s/%s", so_dir, make->unixlib )); + output( "%s:", obj_dir_path( make, make->unixlib )); output_filenames_obj_dir( make, make->unixobj_files ); output_filenames( unix_deps ); if (!native_unix_lib) output_filename( tools_path( make, "winebuild" )); @@ -3612,12 +3625,7 @@ static void output_test_module( struct makefile *make ) { output_filename( parent->is_cross ? obj_dir_path( parent, make->testdll ) : strmake( "%s%s", obj_dir_path( parent, make->testdll ), dll_ext )); - if (parent->unixobj_files.count) - { - char *ext, *unix_lib = xstrdup( parent->module ); - if ((ext = get_extension( unix_lib ))) *ext = 0; - output_filename( strmake( "%s%s", obj_dir_path( parent, unix_lib ), dll_ext )); - } + if (parent->unixlib) output_filename( obj_dir_path( parent, parent->unixlib )); } output( "\n" ); output( "%s %s:", obj_dir_path( make, "check" ), obj_dir_path( make, "test" )); @@ -4284,6 +4292,7 @@ static void load_sources( struct makefile *make ) } add_generated_sources( make ); + make->unixlib = get_unix_lib_name( make ); if (!make->use_msvcrt && !has_object_file( make )) {

1 0

Alexandre Julliard : shell32: Use designated initializers and wide char string literals in known folder table.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 332b90c0064563a9e4f67fb2d9b26a940e5e745c URL: https://source.winehq.org/git/wine.git/?a=commit;h=332b90c0064563a9e4f67fb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 20 12:44:51 2021 +0200 shell32: Use designated initializers and wide char string literals in known folder table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 3103 +++++++++++++--------------------------------- 1 file changed, 852 insertions(+), 2251 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=332b90c0064563a9e4f6…

1 0

Nikolay Sivov : d3d10/effect: Reference pool in the child effect.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 5e5a97cf7f861f708813935a474560d19dcb15cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e5a97cf7f861f708813935a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 16 09:48:12 2021 +0300 d3d10/effect: Reference pool in the child effect. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 41 +++++++++++++++++++++++++++++++---------- dlls/d3d10/tests/effect.c | 4 ---- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index a230d0bcbe6..21530b3d30c 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -264,6 +264,7 @@ struct d3d10_effect LONG refcount; ID3D10Device *device; + ID3D10Effect *pool; DWORD version; DWORD local_buffer_count; DWORD variable_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index c757b82a529..9436d0277f2 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3104,6 +3104,8 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) wine_rb_destroy(&This->types, d3d10_effect_type_destroy, NULL); + if (This->pool) + This->pool->lpVtbl->Release(This->pool); ID3D10Device_Release(This->device); heap_free(This); } @@ -3144,26 +3146,32 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_GetDevice(ID3D10Effect *iface, ID3 static HRESULT STDMETHODCALLTYPE d3d10_effect_GetDesc(ID3D10Effect *iface, D3D10_EFFECT_DESC *desc) { struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); + D3D10_EFFECT_DESC pool_desc = { 0 }; unsigned int i; + HRESULT hr; - FIXME("iface %p, desc %p.\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); if (!desc) return E_INVALIDARG; - /* FIXME */ - desc->IsChildEffect = FALSE; - desc->SharedConstantBuffers = 0; - desc->SharedGlobalVariables = 0; + if (effect->pool && FAILED(hr = effect->pool->lpVtbl->GetDesc(effect->pool, &pool_desc))) + { + WARN("Failed to get pool description, hr %#x.\n", hr); + return hr; + } + desc->IsChildEffect = !!effect->pool; desc->ConstantBuffers = effect->local_buffer_count; - desc->Techniques = effect->technique_count; + desc->SharedConstantBuffers = pool_desc.ConstantBuffers; desc->GlobalVariables = effect->local_variable_count; for (i = 0; i < effect->local_buffer_count; ++i) { struct d3d10_effect_variable *l = &effect->local_buffers[i]; desc->GlobalVariables += l->type->member_count; } + desc->SharedGlobalVariables = pool_desc.GlobalVariables; + desc->Techniques = effect->technique_count; return S_OK; } @@ -8406,7 +8414,7 @@ static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry } static HRESULT d3d10_create_effect(void *data, SIZE_T data_size, ID3D10Device *device, - const ID3D10EffectVtbl *vtbl, struct d3d10_effect **effect) + ID3D10Effect *pool, const ID3D10EffectVtbl *vtbl, struct d3d10_effect **effect) { struct d3d10_effect *object; HRESULT hr; @@ -8420,6 +8428,8 @@ static HRESULT d3d10_create_effect(void *data, SIZE_T data_size, ID3D10Device *d object->refcount = 1; ID3D10Device_AddRef(device); object->device = device; + object->pool = pool; + if (pool) pool->lpVtbl->AddRef(pool); hr = d3d10_effect_parse(object, data, data_size); if (FAILED(hr)) @@ -8438,6 +8448,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect) { struct d3d10_effect *object; + ID3D10Effect *pool = NULL; HRESULT hr; FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", @@ -8446,7 +8457,17 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl if (!(flags & D3D10_EFFECT_COMPILE_CHILD_EFFECT) != !effect_pool) return E_INVALIDARG; - if (FAILED(hr = d3d10_create_effect(data, data_size, device, &d3d10_effect_vtbl, &object))) + if (effect_pool) + { + pool = effect_pool->lpVtbl->AsEffect(effect_pool); + if (pool->lpVtbl != &d3d10_effect_pool_effect_vtbl) + { + WARN("External pool implementations are not supported.\n"); + return E_INVALIDARG; + } + } + + if (FAILED(hr = d3d10_create_effect(data, data_size, device, pool, &d3d10_effect_vtbl, &object))) { WARN("Failed to create an effect, hr %#x.\n", hr); } @@ -8499,8 +8520,8 @@ HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UIN TRACE("data %p, data_size %lu, fx_flags %#x, device %p, effect_pool %p.\n", data, data_size, fx_flags, device, effect_pool); - if (FAILED(hr = d3d10_create_effect(data, data_size, device, &d3d10_effect_pool_effect_vtbl, - &object))) + if (FAILED(hr = d3d10_create_effect(data, data_size, device, NULL, + &d3d10_effect_pool_effect_vtbl, &object))) { WARN("Failed to create an effect, hr %#x.\n", hr); return hr; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 2ca78194d6a..3243e7b2713 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6574,19 +6574,15 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); refcount = get_refcount(pool); -todo_wine ok(refcount == 2, "Unexpected refcount %u.\n", refcount); hr = child_effect->lpVtbl->GetDesc(child_effect, &desc); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(desc.IsChildEffect, "Unexpected child flag.\n"); ok(desc.ConstantBuffers == 2, "Unexpected buffer count %u.\n", desc.ConstantBuffers); -todo_wine ok(desc.SharedConstantBuffers == 1, "Unexpected shared buffer count %u.\n", desc.SharedConstantBuffers); ok(desc.GlobalVariables == 2, "Unexpected variables count %u.\n", desc.GlobalVariables); -todo_wine ok(desc.SharedGlobalVariables == 5, "Unexpected shared variables count %u.\n", desc.SharedGlobalVariables);

1 0

Nikolay Sivov : d3d10/effect: Add a helper to parse annotations array.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: b6f4284bb10dbc7ea037ffa739147178bdc9b414 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6f4284bb10dbc7ea037ffa7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 16 09:48:10 2021 +0300 d3d10/effect: Add a helper to parse annotations array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 118 +++++++++++++++++++++------------------------------- 1 file changed, 47 insertions(+), 71 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 10b8565c8d7..a2595aac136 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1375,6 +1375,33 @@ static HRESULT parse_fx10_annotation(const char *data, size_t data_size, return S_OK; } +static HRESULT parse_fx10_annotations(const char *data, size_t data_size, const char **ptr, + struct d3d10_effect *effect, unsigned int annotation_count, + struct d3d10_effect_variable **annotations) +{ + unsigned int i; + HRESULT hr; + + if (!(*annotations = heap_calloc(annotation_count, sizeof(**annotations)))) + { + ERR("Failed to allocate annotations memory.\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < annotation_count; ++i) + { + struct d3d10_effect_variable *a = &(*annotations)[i]; + + a->effect = effect; + a->buffer = &null_local_buffer; + + if (FAILED(hr = parse_fx10_annotation(data, data_size, ptr, a))) + return hr; + } + + return hr; +} + static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_effect_anonymous_shader *s, enum d3d10_effect_object_type otype) { @@ -1904,21 +1931,11 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, read_dword(ptr, &p->annotation_count); TRACE("Pass has %u annotations.\n", p->annotation_count); - if (!(p->annotations = heap_calloc(p->annotation_count, sizeof(*p->annotations)))) - { - ERR("Failed to allocate pass annotations memory.\n"); - return E_OUTOFMEMORY; - } - - for (i = 0; i < p->annotation_count; ++i) + if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, p->technique->effect, + p->annotation_count, &p->annotations))) { - struct d3d10_effect_variable *a = &p->annotations[i]; - - a->effect = p->technique->effect; - a->buffer = &null_local_buffer; - - if (FAILED(hr = parse_fx10_annotation(data, data_size, ptr, a))) - return hr; + ERR("Failed to parse pass annotations, hr %#x.\n", hr); + return hr; } if (!(p->objects = heap_calloc(p->object_count, sizeof(*p->objects)))) @@ -1967,21 +1984,11 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, read_dword(ptr, &t->annotation_count); TRACE("Technique has %u annotations.\n", t->annotation_count); - if (!(t->annotations = heap_calloc(t->annotation_count, sizeof(*t->annotations)))) - { - ERR("Failed to allocate technique annotations memory.\n"); - return E_OUTOFMEMORY; - } - - for (i = 0; i < t->annotation_count; ++i) + if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, t->effect, + t->annotation_count, &t->annotations))) { - struct d3d10_effect_variable *a = &t->annotations[i]; - - a->effect = t->effect; - a->buffer = &null_local_buffer; - - if (FAILED(hr = parse_fx10_annotation(data, data_size, ptr, a))) - return hr; + ERR("Failed to parse technique annotations, hr %#x.\n", hr); + return hr; } if (!(t->passes = heap_calloc(t->pass_count, sizeof(*t->passes)))) @@ -2008,7 +2015,6 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *v) { DWORD offset, default_value_offset; - unsigned int i; HRESULT hr; if (FAILED(hr = parse_fx10_variable_head(data, data_size, ptr, v))) @@ -2038,21 +2044,11 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, read_dword(ptr, &v->annotation_count); TRACE("Variable has %u annotations.\n", v->annotation_count); - if (!(v->annotations = heap_calloc(v->annotation_count, sizeof(*v->annotations)))) - { - ERR("Failed to allocate variable annotations memory.\n"); - return E_OUTOFMEMORY; - } - - for (i = 0; i < v->annotation_count; ++i) + if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, v->effect, + v->annotation_count, &v->annotations))) { - struct d3d10_effect_variable *a = &v->annotations[i]; - - a->effect = v->effect; - a->buffer = &null_local_buffer; - - if (FAILED(hr = parse_fx10_annotation(data, data_size, ptr, a))) - return hr; + ERR("Failed to parse variable annotations, hr %#x.\n", hr); + return hr; } if (v->flag & D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT) @@ -2254,21 +2250,11 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, read_dword(ptr, &v->annotation_count); TRACE("Variable has %u annotations.\n", v->annotation_count); - if (!(v->annotations = heap_calloc(v->annotation_count, sizeof(*v->annotations)))) + if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, v->effect, + v->annotation_count, &v->annotations))) { - ERR("Failed to allocate variable annotations memory.\n"); - return E_OUTOFMEMORY; - } - - for (i = 0; i < v->annotation_count; ++i) - { - struct d3d10_effect_variable *a = &v->annotations[i]; - - a->effect = v->effect; - a->buffer = &null_local_buffer; - - if (FAILED(hr = parse_fx10_annotation(data, data_size, ptr, a))) - return hr; + ERR("Failed to parse variable annotations, hr %#x.\n", hr); + return hr; } return S_OK; @@ -2392,21 +2378,11 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, read_dword(ptr, &l->annotation_count); TRACE("Local buffer has %u annotations.\n", l->annotation_count); - if (!(l->annotations = heap_calloc(l->annotation_count, sizeof(*l->annotations)))) + if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, l->effect, + l->annotation_count, &l->annotations))) { - ERR("Failed to allocate local buffer annotations memory.\n"); - return E_OUTOFMEMORY; - } - - for (i = 0; i < l->annotation_count; ++i) - { - struct d3d10_effect_variable *a = &l->annotations[i]; - - a->effect = l->effect; - a->buffer = &null_local_buffer; - - if (FAILED(hr = parse_fx10_annotation(data, data_size, ptr, a))) - return hr; + ERR("Failed to parse buffer annotations, hr %#x.\n", hr); + return hr; } if (!(l->members = heap_calloc(l->type->member_count, sizeof(*l->members))))

1 0

Nikolay Sivov : d3d10/effect: Move effect creation API functions.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: d6359f0bba9e7cc74472c11061fd3db10a47c220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6359f0bba9e7cc74472c110… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 16 09:48:08 2021 +0300 d3d10/effect: Move effect creation API functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 53 ------------------------------------------------- dlls/d3d10/effect.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 2d08c82a3c4..6961589ca31 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -230,50 +230,6 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER return S_OK; } -static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry *entry) -{ - const struct d3d10_effect_type *t = WINE_RB_ENTRY_VALUE(entry, const struct d3d10_effect_type, entry); - const DWORD *id = key; - - return *id - t->id; -} - -HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, - ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect) -{ - struct d3d10_effect *object; - HRESULT hr; - - FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", - data, data_size, flags, device, effect_pool, effect); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - { - ERR("Failed to allocate D3D10 effect object memory\n"); - return E_OUTOFMEMORY; - } - - wine_rb_init(&object->types, d3d10_effect_type_compare); - object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl; - object->refcount = 1; - ID3D10Device_AddRef(device); - object->device = device; - - hr = d3d10_effect_parse(object, data, data_size); - if (FAILED(hr)) - { - ERR("Failed to parse effect\n"); - IUnknown_Release(&object->ID3D10Effect_iface); - return hr; - } - - *effect = &object->ID3D10Effect_iface; - - TRACE("Created ID3D10Effect %p\n", object); - - return S_OK; -} - HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, ID3D10Blob **effect, ID3D10Blob **errors) @@ -287,15 +243,6 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const NULL, "fx_4_0", hlsl_flags, fx_flags, effect, errors); } -HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, - ID3D10Device *device, ID3D10EffectPool **effect_pool) -{ - FIXME("data %p, data_size %lu, fx_flags %#x, device %p, effect_pool %p stub.\n", - data, data_size, fx_flags, device, effect_pool); - - return E_NOTIMPL; -} - const char * WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device) { FIXME("device %p stub!\n", device); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e77d0691fcf..7342c2dbe23 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8360,3 +8360,56 @@ static const struct ID3D10EffectTypeVtbl d3d10_effect_type_vtbl = d3d10_effect_type_GetMemberName, d3d10_effect_type_GetMemberSemantic, }; + +static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct d3d10_effect_type *t = WINE_RB_ENTRY_VALUE(entry, const struct d3d10_effect_type, entry); + const DWORD *id = key; + + return *id - t->id; +} + +HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, + ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect) +{ + struct d3d10_effect *object; + HRESULT hr; + + FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", + data, data_size, flags, device, effect_pool, effect); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + { + ERR("Failed to allocate D3D10 effect object memory\n"); + return E_OUTOFMEMORY; + } + + wine_rb_init(&object->types, d3d10_effect_type_compare); + object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl; + object->refcount = 1; + ID3D10Device_AddRef(device); + object->device = device; + + hr = d3d10_effect_parse(object, data, data_size); + if (FAILED(hr)) + { + ERR("Failed to parse effect\n"); + IUnknown_Release(&object->ID3D10Effect_iface); + return hr; + } + + *effect = &object->ID3D10Effect_iface; + + TRACE("Created effect %p\n", object); + + return S_OK; +} + +HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, + ID3D10Device *device, ID3D10EffectPool **effect_pool) +{ + FIXME("data %p, data_size %lu, fx_flags %#x, device %p, effect_pool %p stub.\n", + data, data_size, fx_flags, device, effect_pool); + + return E_NOTIMPL; +}

1 0

Alexandre Julliard : shell32: Use wide char string literals.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: b215536852dc5a132108db92c90a41c70b738e50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b215536852dc5a132108db92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 20 12:58:52 2021 +0200 shell32: Use wide char string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/appbar.c | 4 +- dlls/shell32/assoc.c | 79 ++++++-------------- dlls/shell32/autocomplete.c | 27 ++----- dlls/shell32/brsfolder.c | 19 +---- dlls/shell32/changenotify.c | 3 +- dlls/shell32/classes.c | 42 ++++------- dlls/shell32/control.c | 22 ++---- dlls/shell32/cpanelfolder.c | 4 +- dlls/shell32/dde.c | 95 ++++++++---------------- dlls/shell32/dialogs.c | 12 +-- dlls/shell32/ebrowser.c | 15 ++-- dlls/shell32/enumidlist.c | 7 +- dlls/shell32/folders.c | 27 ++----- dlls/shell32/iconcache.c | 26 ++----- dlls/shell32/recyclebin.c | 41 ++++------ dlls/shell32/shell32_main.c | 32 +++----- dlls/shell32/shelllink.c | 19 ++--- dlls/shell32/shellole.c | 9 +-- dlls/shell32/shellord.c | 31 ++------ dlls/shell32/shellpath.c | 68 ++++++----------- dlls/shell32/shellstring.c | 4 +- dlls/shell32/shfldr_desktop.c | 33 ++------- dlls/shell32/shfldr_fs.c | 68 +++++------------ dlls/shell32/shfldr_mycomp.c | 46 +++--------- dlls/shell32/shfldr_netplaces.c | 5 +- dlls/shell32/shlexec.c | 160 +++++++++++++++------------------------- dlls/shell32/shlfileop.c | 27 +++---- dlls/shell32/shlfolder.c | 21 ++---- dlls/shell32/shlfsbind.c | 4 +- dlls/shell32/shlmenu.c | 3 +- dlls/shell32/shlview.c | 24 ++---- dlls/shell32/shlview_cmenu.c | 60 +++++---------- dlls/shell32/shpolicy.c | 20 ++--- dlls/shell32/systray.c | 4 +- 34 files changed, 322 insertions(+), 739 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b215536852dc5a132108…

1 0

Nikolay Sivov : d3d10/effect: Partially implement D3D10CreateEffectPoolFromMemory().
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: cec812d86147c0359523a853e4d5b68278c057f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cec812d86147c0359523a853… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 16 09:48:09 2021 +0300 d3d10/effect: Partially implement D3D10CreateEffectPoolFromMemory(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 148 ++++++++++++++++++++++++++++++++++++++++----- dlls/d3d10/tests/effect.c | 122 ++++++++++++++++++++++++++++++------- 3 files changed, 235 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cec812d86147c0359523…

1 0

Nikolay Sivov : d3dx10_35/tests: Enable tests.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: ae2a772d2472f467a25d293e4f69ae130fcc3ca8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae2a772d2472f467a25d293e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 16 09:48:50 2021 +0300 d3dx10_35/tests: Enable tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_35/Makefile.in | 1 + dlls/d3dx10_35/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index 00a5be6a504..db592f0868d 100755 --- a/configure +++ b/configure @@ -20340,6 +20340,7 @@ wine_fn_config_makefile dlls/d3drm/tests enable_tests wine_fn_config_makefile dlls/d3dx10_33 enable_d3dx10_33 wine_fn_config_makefile dlls/d3dx10_34 enable_d3dx10_34 wine_fn_config_makefile dlls/d3dx10_35 enable_d3dx10_35 +wine_fn_config_makefile dlls/d3dx10_35/tests enable_tests wine_fn_config_makefile dlls/d3dx10_36 enable_d3dx10_36 wine_fn_config_makefile dlls/d3dx10_36/tests enable_tests wine_fn_config_makefile dlls/d3dx10_37 enable_d3dx10_37 diff --git a/configure.ac b/configure.ac index dea5fe61bf3..0bc46a1427b 100644 --- a/configure.ac +++ b/configure.ac @@ -3064,6 +3064,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3drm/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_33) WINE_CONFIG_MAKEFILE(dlls/d3dx10_34) WINE_CONFIG_MAKEFILE(dlls/d3dx10_35) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_35/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) diff --git a/dlls/d3dx10_35/Makefile.in b/dlls/d3dx10_35/Makefile.in index 419c221b324..0cbbf1841de 100644 --- a/dlls/d3dx10_35/Makefile.in +++ b/dlls/d3dx10_35/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_35.dll +IMPORTLIB = d3dx10_35 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_35/tests/Makefile.in b/dlls/d3dx10_35/tests/Makefile.in new file mode 100644 index 00000000000..8f08bb1ca6a --- /dev/null +++ b/dlls/d3dx10_35/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_35.dll +IMPORTS = d3dx10_35 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c

1 0

Nikolay Sivov : d3d10/effect: Validate flags vs pool instance when creating child effects.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: de49664d06d24e961e823aeca26643ee237426d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de49664d06d24e961e823aec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 16 09:48:11 2021 +0300 d3d10/effect: Validate flags vs pool instance when creating child effects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 3 +++ dlls/d3d10/tests/effect.c | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index a2595aac136..c757b82a529 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8443,6 +8443,9 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", data, data_size, flags, device, effect_pool, effect); + if (!(flags & D3D10_EFFECT_COMPILE_CHILD_EFFECT) != !effect_pool) + return E_INVALIDARG; + if (FAILED(hr = d3d10_create_effect(data, data_size, device, &d3d10_effect_vtbl, &object))) { WARN("Failed to create an effect, hr %#x.\n", hr); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 97331c2135e..2ca78194d6a 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6486,9 +6486,7 @@ todo_wine /* Create standalone effect from the same blob used for pool, */ hr = create_effect(fx_test_pool, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, NULL, &child_effect); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) child_effect->lpVtbl->Release(child_effect); hr = create_effect(fx_test_pool, 0, device, NULL, &effect2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -6564,14 +6562,10 @@ todo_wine /* When pool is specified, corresponding flag has to be set. */ hr = create_effect(fx_test_pool_child, 0, device, pool, &child_effect); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) child_effect->lpVtbl->Release(child_effect); hr = create_effect(fx_test_pool_child, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, NULL, &child_effect); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) child_effect->lpVtbl->Release(child_effect); refcount = get_refcount(pool); ok(refcount == 1, "Unexpected refcount %u.\n", refcount);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse the abs() intrinsic.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: vkd3d Branch: master Commit: c5e50ae658a9befb76c0c055973ebfb7a80eba89 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c5e50ae658a9befb76c0c05… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 17 16:06:37 2021 -0500 vkd3d-shader/hlsl: Parse the abs() intrinsic. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.y | 9 +++++++++ tests/abs.shader_test | 13 +++++++++++++ 3 files changed, 24 insertions(+) diff --git a/Makefile.am b/Makefile.am index c9ad388..3287ec7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,6 +54,7 @@ vkd3d_shader_runners = \ tests/shader_runner_d3d12 vkd3d_shader_tests = \ + tests/abs.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ @@ -273,6 +274,7 @@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ + tests/abs.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fe3c328..bd26603 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1555,6 +1555,14 @@ static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *c return args.decl; } +static bool intrinsic_abs(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *args[3] = {params->args[0]}; + + return !!add_expr(ctx, params->instrs, HLSL_OP1_ABS, args, &loc); +} + static bool intrinsic_clamp(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1594,6 +1602,7 @@ static const struct intrinsic_function } intrinsic_functions[] = { + {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, {"max", 2, true, intrinsic_max}, {"saturate", 1, true, intrinsic_saturate}, diff --git a/tests/abs.shader_test b/tests/abs.shader_test new file mode 100644 index 0000000..6fa6d1c --- /dev/null +++ b/tests/abs.shader_test @@ -0,0 +1,13 @@ +[pixel shader] +float4 main(uniform float2 u) : sv_target +{ + return float4(abs(u), abs(u.x - 0.5), abs(-0.4)); +} + +[test] +uniform 0 float4 0.1 0.7 0.0 0.0 +draw quad +probe all rgba (0.1, 0.7, 0.4, 0.4) +uniform 0 float4 -0.7 0.1 0.0 0.0 +draw quad +probe all rgba (0.7, 0.1, 1.2, 0.4)

1 0