- Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Pass parent ops to wined3d_resource_set_parent().
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: a18bc5f9d78475de22bf94485c5c5968061e3124 URL: https://gitlab.winehq.org/wine/wine/-/commit/a18bc5f9d78475de22bf94485c5c59… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 25 17:11:58 2022 -0600 wined3d: Pass parent ops to wined3d_resource_set_parent(). So that we can "detach" a wined3d surface from ddraw after creating it, in turn so that we can recreate the backing wined3d texture for a surface, namely for SetSurfaceDesc(). --- dlls/ddraw/surface.c | 14 ++++++++++---- dlls/wined3d/resource.c | 3 ++- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a881572e027..3caee53ee73 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -30,6 +30,7 @@ static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSur static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface); static const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops; +static const struct wined3d_parent_ops ddraw_texture_wined3d_parent_ops; static inline struct ddraw_surface *impl_from_IDirectDrawGammaControl(IDirectDrawGammaControl *iface) { @@ -1349,15 +1350,18 @@ static void ddraw_texture_rename_to(struct ddraw_texture *dst_texture, struct wi { wined3d_texture_set_sub_resource_parent(draw_texture, 0, dst_surface, &ddraw_surface_wined3d_parent_ops); wined3d_texture_set_sub_resource_parent(wined3d_texture, 0, dst_surface, &ddraw_null_wined3d_parent_ops); + wined3d_resource_set_parent(wined3d_texture_get_resource(draw_texture), + dst_texture, &ddraw_texture_wined3d_parent_ops); + wined3d_resource_set_parent(wined3d_texture_get_resource(wined3d_texture), + dst_texture, &ddraw_null_wined3d_parent_ops); } else { wined3d_texture_set_sub_resource_parent(wined3d_texture, 0, dst_surface, &ddraw_surface_wined3d_parent_ops); + wined3d_resource_set_parent(wined3d_texture_get_resource(wined3d_texture), + dst_texture, &ddraw_texture_wined3d_parent_ops); } - wined3d_resource_set_parent(wined3d_texture_get_resource(wined3d_texture), dst_texture); - if (draw_texture) - wined3d_resource_set_parent(wined3d_texture_get_resource(draw_texture), dst_texture); dst_surface->wined3d_texture = wined3d_texture; dst_surface->draw_texture = draw_texture; @@ -6134,7 +6138,9 @@ static HRESULT ddraw_texture_init(struct ddraw_texture *texture, struct ddraw *d NULL, &ddraw_null_wined3d_parent_ops, &wined3d_texture))) goto fail; - wined3d_resource_set_parent(wined3d_texture_get_resource(wined3d_texture), texture); + wined3d_resource_set_parent(wined3d_texture_get_resource(wined3d_texture), + texture, &ddraw_null_wined3d_parent_ops); + for (i = 0; i < layers * levels; ++i) { parent = wined3d_texture_get_sub_resource_parent(draw_texture, i); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index e2100627198..c1e16c71799 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -292,9 +292,10 @@ void * CDECL wined3d_resource_get_parent(const struct wined3d_resource *resource return resource->parent; } -void CDECL wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent) +void CDECL wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { resource->parent = parent; + resource->parent_ops = parent_ops; } void CDECL wined3d_resource_get_desc(const struct wined3d_resource *resource, struct wined3d_resource_desc *desc) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0f7c7938c39..300fc2978da 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -195,7 +195,7 @@ @ cdecl wined3d_resource_get_priority(ptr) @ cdecl wined3d_resource_map(ptr long ptr ptr long) @ cdecl wined3d_resource_preload(ptr) -@ cdecl wined3d_resource_set_parent(ptr ptr) +@ cdecl wined3d_resource_set_parent(ptr ptr ptr) @ cdecl wined3d_resource_set_priority(ptr long) @ cdecl wined3d_resource_unmap(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4535892fb5f..ea4be6100f2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2679,7 +2679,8 @@ unsigned int __cdecl wined3d_resource_get_priority(const struct wined3d_resource HRESULT __cdecl wined3d_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, uint32_t flags); void __cdecl wined3d_resource_preload(struct wined3d_resource *resource); -void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent); +void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops); unsigned int __cdecl wined3d_resource_set_priority(struct wined3d_resource *resource, unsigned int priority); HRESULT __cdecl wined3d_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx);

1 0

Zebediah Figura : ddraw: Make ddraw_surface_init() static.
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: 107c2608936ed333b71cf06c652763584420dcad URL: https://gitlab.winehq.org/wine/wine/-/commit/107c2608936ed333b71cf06c652763… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 25 01:06:43 2022 -0600 ddraw: Make ddraw_surface_init() static. --- dlls/ddraw/ddraw_private.h | 2 -- dlls/ddraw/surface.c | 86 +++++++++++++++++++++++----------------------- 2 files changed, 43 insertions(+), 45 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 42ec8868257..18ec1d84a5b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -238,8 +238,6 @@ struct ddraw_texture HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view *ddraw_surface_get_rendertarget_view(struct ddraw_surface *surface) DECLSPEC_HIDDEN; -void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read, unsigned int swap_interval) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 30aeb650d5b..b75775cf252 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5912,6 +5912,49 @@ static const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops = ddraw_surface_wined3d_object_destroyed, }; +static void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx) +{ + struct ddraw_texture *texture = wined3d_texture_get_parent(wined3d_texture); + unsigned int version = texture->version; + + surface->IDirectDrawSurface7_iface.lpVtbl = &ddraw_surface7_vtbl; + surface->IDirectDrawSurface4_iface.lpVtbl = &ddraw_surface4_vtbl; + surface->IDirectDrawSurface3_iface.lpVtbl = &ddraw_surface3_vtbl; + surface->IDirectDrawSurface2_iface.lpVtbl = &ddraw_surface2_vtbl; + surface->IDirectDrawSurface_iface.lpVtbl = &ddraw_surface1_vtbl; + surface->IDirectDrawGammaControl_iface.lpVtbl = &ddraw_gamma_control_vtbl; + surface->IDirect3DTexture2_iface.lpVtbl = &d3d_texture2_vtbl; + surface->IDirect3DTexture_iface.lpVtbl = &d3d_texture1_vtbl; + surface->iface_count = 1; + surface->version = version; + surface->ddraw = ddraw; + + if (version == 7) + { + surface->ref7 = 1; + surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface7_iface; + } + else if (version == 4) + { + surface->ref4 = 1; + surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface4_iface; + } + else + { + surface->ref1 = 1; + surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface_iface; + } + + surface->first_attached = surface; + + wined3d_texture_incref(surface->wined3d_texture = wined3d_texture); + surface->sub_resource_idx = sub_resource_idx; + surface->texture_location = DDRAW_SURFACE_LOCATION_DEFAULT; + + wined3d_private_store_init(&surface->private_store); +} + static void STDMETHODCALLTYPE ddraw_texture_wined3d_object_destroyed(void *parent) { struct ddraw_texture *texture = parent; @@ -6836,49 +6879,6 @@ fail: return hr; } -void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx) -{ - struct ddraw_texture *texture = wined3d_texture_get_parent(wined3d_texture); - unsigned int version = texture->version; - - surface->IDirectDrawSurface7_iface.lpVtbl = &ddraw_surface7_vtbl; - surface->IDirectDrawSurface4_iface.lpVtbl = &ddraw_surface4_vtbl; - surface->IDirectDrawSurface3_iface.lpVtbl = &ddraw_surface3_vtbl; - surface->IDirectDrawSurface2_iface.lpVtbl = &ddraw_surface2_vtbl; - surface->IDirectDrawSurface_iface.lpVtbl = &ddraw_surface1_vtbl; - surface->IDirectDrawGammaControl_iface.lpVtbl = &ddraw_gamma_control_vtbl; - surface->IDirect3DTexture2_iface.lpVtbl = &d3d_texture2_vtbl; - surface->IDirect3DTexture_iface.lpVtbl = &d3d_texture1_vtbl; - surface->iface_count = 1; - surface->version = version; - surface->ddraw = ddraw; - - if (version == 7) - { - surface->ref7 = 1; - surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface7_iface; - } - else if (version == 4) - { - surface->ref4 = 1; - surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface4_iface; - } - else - { - surface->ref1 = 1; - surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface_iface; - } - - surface->first_attached = surface; - - wined3d_texture_incref(surface->wined3d_texture = wined3d_texture); - surface->sub_resource_idx = sub_resource_idx; - surface->texture_location = DDRAW_SURFACE_LOCATION_DEFAULT; - - wined3d_private_store_init(&surface->private_store); -} - static void STDMETHODCALLTYPE view_wined3d_object_destroyed(void *parent) { struct ddraw_surface *surface = parent;

1 0

Alexandre Julliard : wow64: Convert token and debug port in NtCreateUserProcess().
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: c4adc651df11f038cf9470ebcd951e4ae1c56574 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4adc651df11f038cf9470ebcd951e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 22 15:23:48 2023 +0100 wow64: Convert token and debug port in NtCreateUserProcess(). --- dlls/wow64/process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 48e5ad57228..2182491bbfb 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -184,6 +184,8 @@ static PS_ATTRIBUTE_LIST *ps_attributes_32to64( PS_ATTRIBUTE_LIST **attr, const } break; case PS_ATTRIBUTE_PARENT_PROCESS: + case PS_ATTRIBUTE_DEBUG_PORT: + case PS_ATTRIBUTE_TOKEN: ret->Attributes[i].Size = sizeof(HANDLE); ret->Attributes[i].ValuePtr = LongToHandle( attr32->Attributes[i].Value ); break;

1 0

Zebediah Figura : ddraw: Factor out a ddraw_texture_rename_to() helper from ddraw_surface1_Flip().
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: f103da7c69cc18aaf63f08a752d870b7049d9d20 URL: https://gitlab.winehq.org/wine/wine/-/commit/f103da7c69cc18aaf63f08a752d870… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 25 17:00:20 2022 -0600 ddraw: Factor out a ddraw_texture_rename_to() helper from ddraw_surface1_Flip(). --- dlls/ddraw/surface.c | 94 +++++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 53 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4d8812cf106..eaa036b21bf 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1325,6 +1325,36 @@ static unsigned int ddraw_swap_interval_from_flags(DWORD flags) } } +static void ddraw_texture_rename_to(struct ddraw_texture *dst_texture, struct wined3d_texture *wined3d_texture, + struct wined3d_texture *draw_texture, struct wined3d_rendertarget_view *rtv, void *texture_memory) +{ + struct ddraw_surface *dst_surface = dst_texture->root; + struct wined3d_rendertarget_view *current_rtv; + + /* We don't have to worry about potential texture bindings, since + * flippable surfaces can never be textures. */ + + current_rtv = wined3d_device_context_get_rendertarget_view(dst_surface->ddraw->immediate_context, 0); + if (current_rtv == dst_surface->wined3d_rtv) + wined3d_device_context_set_rendertarget_views(dst_surface->ddraw->immediate_context, 0, 1, &rtv, FALSE); + wined3d_rendertarget_view_set_parent(rtv, dst_surface); + dst_surface->wined3d_rtv = rtv; + + if (dst_surface->sub_resource_idx) + ERR("Invalid sub-resource index %u for surface %p.\n", dst_surface->sub_resource_idx, dst_surface); + + wined3d_texture_set_sub_resource_parent(wined3d_texture, 0, dst_surface); + if (draw_texture) + wined3d_texture_set_sub_resource_parent(draw_texture, 0, dst_surface); + wined3d_resource_set_parent(wined3d_texture_get_resource(wined3d_texture), dst_texture); + if (draw_texture) + wined3d_resource_set_parent(wined3d_texture_get_resource(draw_texture), dst_texture); + dst_surface->wined3d_texture = wined3d_texture; + dst_surface->draw_texture = draw_texture; + + dst_texture->texture_memory = texture_memory; +} + /* FRAPS hooks IDirectDrawSurface::Flip and expects the version 1 method to be called when the * game uses later interfaces. */ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *iface, @@ -1333,9 +1363,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface); struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src); struct ddraw_texture *dst_ddraw_texture, *src_ddraw_texture; - struct wined3d_rendertarget_view *tmp_rtv, *src_rtv, *rtv; - DDSCAPS caps = {DDSCAPS_FLIP}; struct wined3d_texture *texture, *draw_texture; + struct wined3d_rendertarget_view *tmp_rtv; + DDSCAPS caps = {DDSCAPS_FLIP}; IDirectDrawSurface *current; void *texture_memory; HRESULT hr; @@ -1359,10 +1389,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * } tmp_rtv = ddraw_surface_get_rendertarget_view(dst_impl); - if (dst_impl->sub_resource_idx) - ERR("Invalid sub-resource index %u on surface %p.\n", dst_impl->sub_resource_idx, dst_impl); texture = dst_impl->wined3d_texture; - rtv = wined3d_device_context_get_rendertarget_view(dst_impl->ddraw->immediate_context, 0); dst_ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); texture_memory = dst_ddraw_texture->texture_memory; draw_texture = dst_impl->draw_texture; @@ -1386,24 +1413,12 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * } } - src_rtv = ddraw_surface_get_rendertarget_view(src_impl); - if (rtv == dst_impl->wined3d_rtv) - wined3d_device_context_set_rendertarget_views(dst_impl->ddraw->immediate_context, 0, 1, &src_rtv, FALSE); - wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); - dst_impl->wined3d_rtv = src_rtv; - wined3d_texture_set_sub_resource_parent(src_impl->wined3d_texture, 0, dst_impl); - if (src_impl->draw_texture) - wined3d_texture_set_sub_resource_parent(src_impl->draw_texture, 0, dst_impl); src_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); - dst_ddraw_texture->texture_memory = src_ddraw_texture->texture_memory; - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), dst_ddraw_texture); - if (src_impl->draw_texture) - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->draw_texture), dst_ddraw_texture); + + ddraw_texture_rename_to(dst_ddraw_texture, src_impl->wined3d_texture, src_impl->draw_texture, + ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory); + dst_ddraw_texture = src_ddraw_texture; - if (src_impl->sub_resource_idx) - ERR("Invalid sub-resource index %u on surface %p.\n", src_impl->sub_resource_idx, src_impl); - dst_impl->wined3d_texture = src_impl->wined3d_texture; - dst_impl->draw_texture = src_impl->draw_texture; } else { @@ -1423,44 +1438,17 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * } src_impl = impl_from_IDirectDrawSurface(current); - src_rtv = ddraw_surface_get_rendertarget_view(src_impl); - if (rtv == dst_impl->wined3d_rtv) - wined3d_device_context_set_rendertarget_views(dst_impl->ddraw->immediate_context, - 0, 1, &src_rtv, FALSE); - wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); - dst_impl->wined3d_rtv = src_rtv; - wined3d_texture_set_sub_resource_parent(src_impl->wined3d_texture, 0, dst_impl); - if (src_impl->draw_texture) - wined3d_texture_set_sub_resource_parent(src_impl->draw_texture, 0, dst_impl); src_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); - dst_ddraw_texture->texture_memory = src_ddraw_texture->texture_memory; - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), dst_ddraw_texture); - if (src_impl->draw_texture) - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->draw_texture), dst_ddraw_texture); + + ddraw_texture_rename_to(dst_ddraw_texture, src_impl->wined3d_texture, src_impl->draw_texture, + ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory); + dst_ddraw_texture = src_ddraw_texture; - if (src_impl->sub_resource_idx) - ERR("Invalid sub-resource index %u on surface %p.\n", src_impl->sub_resource_idx, src_impl); - dst_impl->wined3d_texture = src_impl->wined3d_texture; - dst_impl->draw_texture = src_impl->draw_texture; dst_impl = src_impl; } } - /* We don't have to worry about potential texture bindings, since - * flippable surfaces can never be textures. */ - if (rtv == src_impl->wined3d_rtv) - wined3d_device_context_set_rendertarget_views(dst_impl->ddraw->immediate_context, 0, 1, &tmp_rtv, FALSE); - wined3d_rendertarget_view_set_parent(tmp_rtv, src_impl); - src_impl->wined3d_rtv = tmp_rtv; - wined3d_texture_set_sub_resource_parent(texture, 0, src_impl); - if (draw_texture) - wined3d_texture_set_sub_resource_parent(draw_texture, 0, src_impl); - dst_ddraw_texture->texture_memory = texture_memory; - wined3d_resource_set_parent(wined3d_texture_get_resource(texture), dst_ddraw_texture); - if (draw_texture) - wined3d_resource_set_parent(wined3d_texture_get_resource(draw_texture), dst_ddraw_texture); - src_impl->wined3d_texture = texture; - src_impl->draw_texture = draw_texture; + ddraw_texture_rename_to(dst_ddraw_texture, texture, draw_texture, tmp_rtv, texture_memory); if (flags & ~(DDFLIP_NOVSYNC | DDFLIP_INTERVAL2 | DDFLIP_INTERVAL3 | DDFLIP_INTERVAL4)) {

1 0

Alexandre Julliard : kernelbase: Use RtlGetNativeSystemInformation() to implement GetNativeSystemInfo().
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: ccd964049334df285e5caba54fea42c031bdec5a URL: https://gitlab.winehq.org/wine/wine/-/commit/ccd964049334df285e5caba54fea42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 22 13:19:43 2023 +0100 kernelbase: Use RtlGetNativeSystemInformation() to implement GetNativeSystemInfo(). --- dlls/kernel32/tests/process.c | 18 ++++-- dlls/kernelbase/memory.c | 130 +++++++++++++++++++++--------------------- 2 files changed, 77 insertions(+), 71 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 1e30ba73bbf..3c4a02e7cc8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2202,12 +2202,12 @@ static void test_IsWow64Process2(void) #if defined(__i386__) || defined(__x86_64__) ok(machine == IMAGE_FILE_MACHINE_I386, "got %#x\n", machine); - expect_native = IMAGE_FILE_MACHINE_AMD64; + ok( native_machine == IMAGE_FILE_MACHINE_AMD64 || + native_machine == IMAGE_FILE_MACHINE_ARM64, "got %#x\n", native_machine); + expect_native = native_machine; #else skip("not supported architecture\n"); #endif - ok(native_machine == expect_native, "got %#x\n", native_machine); - ret = TerminateProcess(pi.hProcess, 0); ok(ret, "TerminateProcess error\n"); @@ -2279,6 +2279,7 @@ static void test_SystemInfo(void) { SYSTEM_INFO si, nsi; BOOL is_wow64; + USHORT machine, native_machine; if (!pGetNativeSystemInfo) { @@ -2297,9 +2298,14 @@ static void test_SystemInfo(void) ok(S(U(nsi)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64, "Expected PROCESSOR_ARCHITECTURE_AMD64, got %d\n", S(U(nsi)).wProcessorArchitecture); - ok(nsi.dwProcessorType == PROCESSOR_AMD_X8664, - "Expected PROCESSOR_AMD_X8664, got %ld\n", - nsi.dwProcessorType); + if (pIsWow64Process2 && pIsWow64Process2(GetCurrentProcess(), &machine, &native_machine) && + native_machine == IMAGE_FILE_MACHINE_ARM64) + { + ok(nsi.dwProcessorType == PROCESSOR_INTEL_PENTIUM, "got %ld\n", nsi.dwProcessorType); + ok(nsi.wProcessorLevel == 15, "got %d\n", nsi.wProcessorLevel); + ok(nsi.wProcessorRevision == 0x40a, "got %d\n", nsi.wProcessorRevision); + } + else ok(nsi.dwProcessorType == PROCESSOR_AMD_X8664, "got %ld\n", nsi.dwProcessorType); } } else diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 094556eaba2..c4a484b5a30 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -83,61 +83,24 @@ SIZE_T WINAPI GetLargePageMinimum(void) } -/*********************************************************************** - * GetNativeSystemInfo (kernelbase.@) - */ -void WINAPI DECLSPEC_HOTPATCH GetNativeSystemInfo( SYSTEM_INFO *si ) -{ - USHORT current_machine, native_machine; - - GetSystemInfo( si ); - RtlWow64GetProcessMachines( GetCurrentProcess(), &current_machine, &native_machine ); - if (!current_machine) return; - switch (native_machine) - { - case IMAGE_FILE_MACHINE_AMD64: - si->u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; - si->dwProcessorType = PROCESSOR_AMD_X8664; - break; - case IMAGE_FILE_MACHINE_ARM64: - si->u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM64; - si->dwProcessorType = 0; - break; - default: - FIXME( "Add the proper information for %x in wow64 mode\n", native_machine ); - } -} - - -/*********************************************************************** - * GetSystemInfo (kernelbase.@) - */ -void WINAPI DECLSPEC_HOTPATCH GetSystemInfo( SYSTEM_INFO *si ) +static void fill_system_info( SYSTEM_INFO *si, const SYSTEM_BASIC_INFORMATION *basic_info, + const SYSTEM_CPU_INFORMATION *cpu_info ) { - SYSTEM_BASIC_INFORMATION basic_info; - SYSTEM_CPU_INFORMATION cpu_info; - - if (!set_ntstatus( NtQuerySystemInformation( SystemBasicInformation, - &basic_info, sizeof(basic_info), NULL )) || - !set_ntstatus( NtQuerySystemInformation( SystemCpuInformation, - &cpu_info, sizeof(cpu_info), NULL ))) - return; - - si->u.s.wProcessorArchitecture = cpu_info.ProcessorArchitecture; + si->u.s.wProcessorArchitecture = cpu_info->ProcessorArchitecture; si->u.s.wReserved = 0; - si->dwPageSize = basic_info.PageSize; - si->lpMinimumApplicationAddress = basic_info.LowestUserAddress; - si->lpMaximumApplicationAddress = basic_info.HighestUserAddress; - si->dwActiveProcessorMask = basic_info.ActiveProcessorsAffinityMask; - si->dwNumberOfProcessors = basic_info.NumberOfProcessors; - si->dwAllocationGranularity = basic_info.AllocationGranularity; - si->wProcessorLevel = cpu_info.ProcessorLevel; - si->wProcessorRevision = cpu_info.ProcessorRevision; - - switch (cpu_info.ProcessorArchitecture) + si->dwPageSize = basic_info->PageSize; + si->lpMinimumApplicationAddress = basic_info->LowestUserAddress; + si->lpMaximumApplicationAddress = basic_info->HighestUserAddress; + si->dwActiveProcessorMask = basic_info->ActiveProcessorsAffinityMask; + si->dwNumberOfProcessors = basic_info->NumberOfProcessors; + si->dwAllocationGranularity = basic_info->AllocationGranularity; + si->wProcessorLevel = cpu_info->ProcessorLevel; + si->wProcessorRevision = cpu_info->ProcessorRevision; + + switch (cpu_info->ProcessorArchitecture) { case PROCESSOR_ARCHITECTURE_INTEL: - switch (cpu_info.ProcessorLevel) + switch (cpu_info->ProcessorLevel) { case 3: si->dwProcessorType = PROCESSOR_INTEL_386; break; case 4: si->dwProcessorType = PROCESSOR_INTEL_486; break; @@ -146,23 +109,11 @@ void WINAPI DECLSPEC_HOTPATCH GetSystemInfo( SYSTEM_INFO *si ) default: si->dwProcessorType = PROCESSOR_INTEL_PENTIUM; break; } break; - case PROCESSOR_ARCHITECTURE_PPC: - switch (cpu_info.ProcessorLevel) - { - case 1: si->dwProcessorType = PROCESSOR_PPC_601; break; - case 3: - case 6: si->dwProcessorType = PROCESSOR_PPC_603; break; - case 4: si->dwProcessorType = PROCESSOR_PPC_604; break; - case 9: si->dwProcessorType = PROCESSOR_PPC_604; break; - case 20: si->dwProcessorType = PROCESSOR_PPC_620; break; - default: si->dwProcessorType = 0; - } - break; case PROCESSOR_ARCHITECTURE_AMD64: si->dwProcessorType = PROCESSOR_AMD_X8664; break; case PROCESSOR_ARCHITECTURE_ARM: - switch (cpu_info.ProcessorLevel) + switch (cpu_info->ProcessorLevel) { case 4: si->dwProcessorType = PROCESSOR_ARM_7TDMI; break; default: si->dwProcessorType = PROCESSOR_ARM920; @@ -172,13 +123,62 @@ void WINAPI DECLSPEC_HOTPATCH GetSystemInfo( SYSTEM_INFO *si ) si->dwProcessorType = 0; break; default: - FIXME( "Unknown processor architecture %x\n", cpu_info.ProcessorArchitecture ); + FIXME( "Unknown processor architecture %x\n", cpu_info->ProcessorArchitecture ); si->dwProcessorType = 0; break; } } +/*********************************************************************** + * GetNativeSystemInfo (kernelbase.@) + */ +void WINAPI DECLSPEC_HOTPATCH GetNativeSystemInfo( SYSTEM_INFO *si ) +{ + SYSTEM_BASIC_INFORMATION basic_info; + SYSTEM_CPU_INFORMATION cpu_info; + + if (is_wow64) + { + USHORT current_machine, native_machine; + + RtlWow64GetProcessMachines( 0, &current_machine, &native_machine ); + if (native_machine != IMAGE_FILE_MACHINE_AMD64) + { + GetSystemInfo( si ); + si->u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; + return; + } + } + + if (!set_ntstatus( RtlGetNativeSystemInformation( SystemBasicInformation, + &basic_info, sizeof(basic_info), NULL )) || + !set_ntstatus( RtlGetNativeSystemInformation( SystemCpuInformation, + &cpu_info, sizeof(cpu_info), NULL ))) + return; + + fill_system_info( si, &basic_info, &cpu_info ); +} + + +/*********************************************************************** + * GetSystemInfo (kernelbase.@) + */ +void WINAPI DECLSPEC_HOTPATCH GetSystemInfo( SYSTEM_INFO *si ) +{ + SYSTEM_BASIC_INFORMATION basic_info; + SYSTEM_CPU_INFORMATION cpu_info; + + if (!set_ntstatus( NtQuerySystemInformation( SystemBasicInformation, + &basic_info, sizeof(basic_info), NULL )) || + !set_ntstatus( NtQuerySystemInformation( SystemCpuInformation, + &cpu_info, sizeof(cpu_info), NULL ))) + return; + + fill_system_info( si, &basic_info, &cpu_info ); +} + + /*********************************************************************** * GetSystemFileCacheSize (kernelbase.@) */

1 0

Zebediah Figura : wined3d: Pass parent ops to wined3d_texture_set_sub_resource_parent().
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: 4f8635bd78a4858426e02fa1defe61fae11bfc9f URL: https://gitlab.winehq.org/wine/wine/-/commit/4f8635bd78a4858426e02fa1defe61… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 23 23:42:22 2022 -0600 wined3d: Pass parent ops to wined3d_texture_set_sub_resource_parent(). So that we can allow setting the sub resource and parent ops not from the texture_sub_resource_created() callback, and also that we can "detach" a wined3d surface from ddraw after creating it, so that we can recreate the backing wined3d texture, viz. in SetSurfaceDesc(). --- dlls/ddraw/surface.c | 15 ++++++++++++--- dlls/wined3d/texture.c | 3 ++- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index eaa036b21bf..a881572e027 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -29,6 +29,8 @@ WINE_DECLARE_DEBUG_CHANNEL(fps); static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface); static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface); +static const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops; + static inline struct ddraw_surface *impl_from_IDirectDrawGammaControl(IDirectDrawGammaControl *iface) { return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawGammaControl_iface); @@ -1343,9 +1345,16 @@ static void ddraw_texture_rename_to(struct ddraw_texture *dst_texture, struct wi if (dst_surface->sub_resource_idx) ERR("Invalid sub-resource index %u for surface %p.\n", dst_surface->sub_resource_idx, dst_surface); - wined3d_texture_set_sub_resource_parent(wined3d_texture, 0, dst_surface); if (draw_texture) - wined3d_texture_set_sub_resource_parent(draw_texture, 0, dst_surface); + { + wined3d_texture_set_sub_resource_parent(draw_texture, 0, dst_surface, &ddraw_surface_wined3d_parent_ops); + wined3d_texture_set_sub_resource_parent(wined3d_texture, 0, dst_surface, &ddraw_null_wined3d_parent_ops); + } + else + { + wined3d_texture_set_sub_resource_parent(wined3d_texture, 0, dst_surface, &ddraw_surface_wined3d_parent_ops); + } + wined3d_resource_set_parent(wined3d_texture_get_resource(wined3d_texture), dst_texture); if (draw_texture) wined3d_resource_set_parent(wined3d_texture_get_resource(draw_texture), dst_texture); @@ -6132,7 +6141,7 @@ static HRESULT ddraw_texture_init(struct ddraw_texture *texture, struct ddraw *d assert(parent->wined3d_texture == draw_texture); parent->draw_texture = draw_texture; parent->wined3d_texture = wined3d_texture; - wined3d_texture_set_sub_resource_parent(wined3d_texture, i, parent); + wined3d_texture_set_sub_resource_parent(wined3d_texture, i, parent, &ddraw_null_wined3d_parent_ops); wined3d_texture_incref(wined3d_texture); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 33b938ad460..c6e80f45766 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4329,7 +4329,7 @@ void * CDECL wined3d_texture_get_sub_resource_parent(struct wined3d_texture *tex } void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture, - unsigned int sub_resource_idx, void *parent) + unsigned int sub_resource_idx, void *parent, const struct wined3d_parent_ops *parent_ops) { TRACE("texture %p, sub_resource_idx %u, parent %p.\n", texture, sub_resource_idx, parent); @@ -4337,6 +4337,7 @@ void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *textu return; texture->sub_resources[sub_resource_idx].parent = parent; + texture->sub_resources[sub_resource_idx].parent_ops = parent_ops; } HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture *texture, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2980568d94e..0f7c7938c39 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -307,7 +307,7 @@ @ cdecl wined3d_texture_set_color_key(ptr long ptr) @ cdecl wined3d_texture_set_lod(ptr long) @ cdecl wined3d_texture_set_overlay_position(ptr long long long) -@ cdecl wined3d_texture_set_sub_resource_parent(ptr long ptr) +@ cdecl wined3d_texture_set_sub_resource_parent(ptr long ptr ptr) @ cdecl wined3d_texture_update_desc(ptr long long long long long long ptr long) @ cdecl wined3d_texture_update_overlay(ptr long ptr ptr long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5d8a1156b21..4535892fb5f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2866,7 +2866,7 @@ unsigned int __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, un HRESULT __cdecl wined3d_texture_set_overlay_position(struct wined3d_texture *texture, unsigned int sub_resource_idx, LONG x, LONG y); void __cdecl wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture, - unsigned int sub_resource_idx, void *parent); + unsigned int sub_resource_idx, void *parent, const struct wined3d_parent_ops *parent_ops); HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, unsigned int sub_resource_idx, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality,

1 0

Alexandre Julliard : wow64: Allow the CPU backend to override CPU information.
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: d41117b61ed3ccc34900c76611f6ce7b534521ce URL: https://gitlab.winehq.org/wine/wine/-/commit/d41117b61ed3ccc34900c76611f6ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 22 13:20:00 2023 +0100 wow64: Allow the CPU backend to override CPU information. --- dlls/wow64/syscall.c | 3 ++- dlls/wow64/system.c | 4 +++- dlls/wow64/wow64_private.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index d057fcc256e..06dd9822a08 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -110,7 +110,7 @@ static void (WINAPI *pBTCpuSimulate)(void); static NTSTATUS (WINAPI *pBTCpuResetToConsistentState)( EXCEPTION_POINTERS * ); static void * (WINAPI *p__wine_get_unix_opcode)(void); static void * (WINAPI *pKiRaiseUserExceptionDispatcher)(void); - +void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ) = NULL; void *dummy = RtlUnwind; @@ -842,6 +842,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex GET_PTR( BTCpuResetToConsistentState ); GET_PTR( BTCpuSetContext ); GET_PTR( BTCpuSimulate ); + GET_PTR( BTCpuUpdateProcessorInformation ); GET_PTR( __wine_get_unix_opcode ); module = load_64bit_module( L"wow64win.dll" ); diff --git a/dlls/wow64/system.c b/dlls/wow64/system.c index 5d111cc942d..21e191b8a29 100644 --- a/dlls/wow64/system.c +++ b/dlls/wow64/system.c @@ -337,7 +337,9 @@ NTSTATUS WINAPI wow64_NtQuerySystemInformation( UINT *args ) case SystemCpuInformation: /* SYSTEM_CPU_INFORMATION */ case SystemEmulationProcessorInformation: /* SYSTEM_CPU_INFORMATION */ - return NtQuerySystemInformation( SystemEmulationProcessorInformation, ptr, len, retlen ); + status = NtQuerySystemInformation( SystemEmulationProcessorInformation, ptr, len, retlen ); + if (!status && pBTCpuUpdateProcessorInformation) pBTCpuUpdateProcessorInformation( ptr ); + return status; case SystemBasicInformation: /* SYSTEM_BASIC_INFORMATION */ case SystemEmulationBasicInformation: /* SYSTEM_BASIC_INFORMATION */ diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 7eef4da3ad9..bba191ad439 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -38,6 +38,7 @@ extern ULONG_PTR args_alignment DECLSPEC_HIDDEN; extern ULONG_PTR highest_user_address DECLSPEC_HIDDEN; extern ULONG_PTR default_zero_bits DECLSPEC_HIDDEN; extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock DECLSPEC_HIDDEN; +extern void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ) DECLSPEC_HIDDEN; struct object_attr64 {

1 0

Alexandre Julliard : include: Declare some missing ntdll functions, and fix the sorting.
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: 687068e7d6b52f170312ebae65cd8bc884cfd097 URL: https://gitlab.winehq.org/wine/wine/-/commit/687068e7d6b52f170312ebae65cd8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 22 13:12:44 2023 +0100 include: Declare some missing ntdll functions, and fix the sorting. --- dlls/kernel32/heap.c | 2 - dlls/kernelbase/memory.c | 3 -- include/winternl.h | 131 +++++++++++++++++++++++++++-------------------- 3 files changed, 75 insertions(+), 61 deletions(-)

1 0

Rémi Bernon : dinput: Return DI_SETTINGSNOTSAVED when DIDSAM_FORCESAVE is used.
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: bf22424e2af276d0e1b9641bcbbfe63f25159824 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf22424e2af276d0e1b9641bcbbfe6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 20 16:57:27 2023 +0100 dinput: Return DI_SETTINGSNOTSAVED when DIDSAM_FORCESAVE is used. --- dlls/dinput/device.c | 1 + dlls/dinput/tests/joystick8.c | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 0df0199317b..41baa630989 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -2022,6 +2022,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D free( data_format.rgodf ); if (FAILED(hr)) return hr; + if (flags == DIDSAM_FORCESAVE) return DI_SETTINGSNOTSAVED; if (!data_format.dwNumObjs) return DI_NOEFFECT; return hr; } diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 7947e6e33cc..a74dab6dc52 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -818,7 +818,6 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e /* first SetActionMap call for a user always return DI_SETTINGSNOTSAVED */ hr = IDirectInputDevice8_SetActionMap( device, &voice_action_format, NULL, DIDSAM_FORCESAVE ); - todo_wine ok( hr == DI_SETTINGSNOTSAVED, "SetActionMap returned %#lx\n", hr ); memset( prop_username.wsz, 0, sizeof(prop_username.wsz) ); @@ -829,7 +828,6 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e hr = IDirectInputDevice8_SetActionMap( device, &voice_action_format, NULL, DIDSAM_DEFAULT ); ok( hr == DI_NOEFFECT, "SetActionMap returned %#lx\n", hr ); hr = IDirectInputDevice8_SetActionMap( device, &voice_action_format, NULL, DIDSAM_FORCESAVE ); - todo_wine ok( hr == DI_SETTINGSNOTSAVED, "SetActionMap returned %#lx\n", hr ); memset( prop_username.wsz, 0, sizeof(prop_username.wsz) ); @@ -874,10 +872,8 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e /* DIDSAM_FORCESAVE always returns DI_SETTINGSNOTSAVED */ hr = IDirectInputDevice8_SetActionMap( device, &action_format, L"username", DIDSAM_FORCESAVE ); - todo_wine ok( hr == DI_SETTINGSNOTSAVED, "SetActionMap returned %#lx\n", hr ); hr = IDirectInputDevice8_SetActionMap( device, &action_format, L"username", DIDSAM_FORCESAVE ); - todo_wine ok( hr == DI_SETTINGSNOTSAVED, "SetActionMap returned %#lx\n", hr ); check_diactionformatw( &action_format, &expect_action_format_1 ); @@ -946,7 +942,6 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e ok( hr == DI_OK, "SetActionMap returned %#lx\n", hr ); check_diactionformatw( &action_format, &expect_action_format_2_filled ); hr = IDirectInputDevice8_SetActionMap( device, &action_format, L"username", DIDSAM_FORCESAVE ); - todo_wine ok( hr == DI_SETTINGSNOTSAVED, "SetActionMap returned %#lx\n", hr ); check_diactionformatw( &action_format, &expect_action_format_2_filled );

1 0

Rémi Bernon : dinput: Allow action formats with no matching actions.
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: 0fe8da86e33331e9e4c41a59fb65c63797445530 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fe8da86e33331e9e4c41a59fb65c6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 22 09:21:48 2023 +0100 dinput: Allow action formats with no matching actions. --- dlls/dinput/device.c | 14 +++++--------- dlls/dinput/tests/joystick8.c | 4 ---- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 16c4409b9b3..2817ca9839b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1964,8 +1964,8 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D }; WCHAR username_buf[MAX_PATH]; DWORD username_len = MAX_PATH; - int i, index, num_actions = 0; unsigned int offset = 0; + int i, index; HRESULT hr; FIXME( "iface %p, format %p, username %s, flags %#lx stub!\n", iface, format, @@ -1973,14 +1973,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D if (!format) return DIERR_INVALIDPARAM; - /* Count the actions */ - for (i = 0; i < format->dwNumActions; i++) - if (IsEqualGUID( &impl->guid, &format->rgoAction[i].guidInstance )) - num_actions++; - - if (num_actions == 0) return DI_NOEFFECT; - - if (!(data_format.rgodf = malloc( sizeof(DIOBJECTDATAFORMAT) * num_actions ))) return DIERR_OUTOFMEMORY; + if (!(data_format.rgodf = malloc( sizeof(DIOBJECTDATAFORMAT) * format->dwNumActions ))) return DIERR_OUTOFMEMORY; data_format.dwDataSize = format->dwDataSize; for (i = 0; i < format->dwNumActions; i++, offset += sizeof(ULONG)) @@ -2026,6 +2019,9 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D LeaveCriticalSection( &impl->crit ); free( data_format.rgodf ); + + if (FAILED(hr)) return hr; + if (!data_format.dwNumObjs) return DI_NOEFFECT; return hr; } diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index c3866e4e177..6e8a9292f84 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -824,9 +824,7 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e memset( prop_username.wsz, 0, sizeof(prop_username.wsz) ); hr = IDirectInputDevice_GetProperty( device, DIPROP_USERNAME, &prop_username.diph ); - todo_wine ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); - todo_wine ok( !wcscmp( prop_username.wsz, username ), "got username %s\n", debugstr_w(prop_username.wsz) ); hr = IDirectInputDevice8_SetActionMap( device, &voice_action_format, NULL, DIDSAM_DEFAULT ); @@ -837,9 +835,7 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e memset( prop_username.wsz, 0, sizeof(prop_username.wsz) ); hr = IDirectInputDevice_GetProperty( device, DIPROP_USERNAME, &prop_username.diph ); - todo_wine ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); - todo_wine ok( !wcscmp( prop_username.wsz, username ), "got username %s\n", debugstr_w(prop_username.wsz) );

1 0