March 2019 - Wine-Devel - list.winehq.org

[PATCH 7/8] ntoskrnl.exe: Support waiting on kernel objects.
by Jacek Caban March 25, 2019

March 25, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/sync.c | 11 ++++++----- dlls/ntoskrnl.exe/tests/driver.c | 3 +-- server/device.c | 19 +++++++++++++++++++ server/protocol.def | 10 ++++++++++ 6 files changed, 51 insertions(+), 7 deletions(-)

2 1

[PATCH 6/8] ntoskrnl.exe: Support creating event objects from server handle.
by Jacek Caban March 25, 2019

March 25, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl_private.h | 2 + dlls/ntoskrnl.exe/sync.c | 63 ++++++++++++++++++++++------ dlls/ntoskrnl.exe/tests/driver.c | 41 ++++++++++++++++-- server/event.c | 11 ++++- 4 files changed, 101 insertions(+), 16 deletions(-)

2 1

[PATCH 3/8] server: Allow kernel to keep reference to server objects by client pointer.
by Jacek Caban March 25, 2019

March 25, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 46 +++++++++++++++++++++++++--- server/device.c | 59 ++++++++++++++++++++++++++++++++++++ server/protocol.def | 14 +++++++++ 3 files changed, 115 insertions(+), 4 deletions(-)

2 1

[PATCH 5/8] server: Notify client about freed object so that it may free associated kernel object.
by Jacek Caban March 25, 2019

March 25, 2019

Long term, we may consider making interface between server and device manager more generic so that it could be used for messages other than IRPs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++++++++++- server/device.c | 15 +++++++++++++++ server/protocol.def | 6 ++++++ 3 files changed, 34 insertions(+), 1 deletion(-)

1 0

[PATCH 4/8] server: Allow queuing IRPs with no file associated.
by Jacek Caban March 25, 2019

March 25, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/device.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)

1 0

[PATCH 2/8] server: Store pointers to objects created by kernel_object_from_handle in server.
by Jacek Caban March 25, 2019

March 25, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 126 +++++++++++++++++++++++++---------- server/device.c | 87 ++++++++++++++++++++++++ server/protocol.def | 17 +++++ 3 files changed, 194 insertions(+), 36 deletions(-)

1 0

[PATCH 1/8] server: Introduce kernel_object struct for generic association between server and kernel objects.
by Jacek Caban March 25, 2019

March 25, 2019

1 0

[PATCH 1/8] server: Introduce kernel_object struct for generic association between server and kernel objects.
by Jacek Caban March 25, 2019

March 25, 2019

3 3

[PATCH] wined3d: Adjust video memory when resizing swapchain buffers.
by Stefan Dösinger March 25, 2019

March 25, 2019

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/wined3d/texture.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 55c9543f30b..949492063d2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1531,6 +1531,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; + const struct wined3d *d3d; struct wined3d_device *device; unsigned int resource_size; DWORD valid_location = 0; @@ -1541,6 +1542,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture, width, height, debug_d3dformat(format_id), multisample_type, multisample_quality, mem, pitch); device = texture->resource.device; + d3d = device->wined3d; gl_info = &device->adapter->gl_info; d3d_info = &device->adapter->d3d_info; format = wined3d_get_format(device->adapter, format_id, texture->resource.bind_flags); @@ -1608,6 +1610,8 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture->resource.multisample_quality = multisample_quality; texture->resource.width = width; texture->resource.height = height; + if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); texture->resource.size = texture->slice_pitch; sub_resource->size = texture->slice_pitch; sub_resource->locations = WINED3D_LOCATION_DISCARDED; -- 2.19.2

2 1

[PATCH] wined3d: Clean up lights in wined3d_stateblock_cleanup().
by Zebediah Figura March 25, 2019

March 25, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46829 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 7495d217c4..e9c1fe2374 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -523,6 +523,7 @@ void state_unbind_resources(struct wined3d_state *state) void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) { + struct wined3d_light_info *light, *cursor; struct wined3d_vertex_declaration *decl; struct wined3d_texture *texture; struct wined3d_buffer *buffer; @@ -570,6 +571,15 @@ void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) wined3d_texture_decref(texture); } } + + for (i = 0; i < LIGHTMAP_SIZE; ++i) + { + LIST_FOR_EACH_ENTRY_SAFE(light, cursor, &state->light_state.light_map[i], struct wined3d_light_info, entry) + { + list_remove(&light->entry); + heap_free(light); + } + } } void state_cleanup(struct wined3d_state *state) -- 2.17.1

2 1