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

[PATCH 3/8] server: Allow kernel to keep reference to server objects by client pointer.
by Jacek Caban 25 Mar '19

25 Mar '19

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 25 Mar '19

25 Mar '19

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 25 Mar '19

25 Mar '19

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 25 Mar '19

25 Mar '19

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 25 Mar '19

25 Mar '19

1 0

[PATCH 1/8] server: Introduce kernel_object struct for generic association between server and kernel objects.
by Jacek Caban 25 Mar '19

25 Mar '19

3 3

[PATCH] wined3d: Adjust video memory when resizing swapchain buffers.
by Stefan Dösinger 25 Mar '19

25 Mar '19

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 25 Mar '19

25 Mar '19

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

[PATCH 1/2] hid/tests: Do not access uninitialized memory
by Detlef Riekenberg 25 Mar '19

25 Mar '19

Most api-calls in test_device_info access uninitialized memory, when called with INVALID_HANDLE_VALUE this results in broken device names and crashes Example failures: http://test.winehq.org/data/6325d85406fbf7f46770bc739da4b7e2c9b199d7/win8_d… Patch tested: https://testbot.winehq.org/JobDetails.pl?Key=49763 -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/hid/tests/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index f20677fb1b..ff17229785 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -82,7 +82,8 @@ static void run_for_each_device(device_test *test) ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", wine_dbgstr_w(data->DevicePath), GetLastError()); - test(file); + if (file != INVALID_HANDLE_VALUE) + test(file); CloseHandle(file); } -- 2.21.0.windows.1

2 3

[PATCH] include/commctrl: Add style definitions for split buttons
by Gabriel Ivăncescu 25 Mar '19

25 Mar '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Wanted to get this out of the way before the split button implementation. I still have a few corner cases left to do and proper wine tests. include/commctrl.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 9b86bdb..f1af7de 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1096,6 +1096,15 @@ typedef struct tagNMBCHOTITEM #define BS_COMMANDLINK 0x0000000E #define BS_DEFCOMMANDLINK 0x0000000F +#define BCSIF_GLYPH 0x00000001 +#define BCSIF_IMAGE 0x00000002 +#define BCSIF_STYLE 0x00000004 +#define BCSIF_SIZE 0x00000008 +#define BCSS_NOSPLIT 0x00000001 +#define BCSS_STRETCH 0x00000002 +#define BCSS_ALIGNLEFT 0x00000004 +#define BCSS_IMAGE 0x00000008 + /* Button macros */ #define Button_SetNote(button, note) \ (BOOL)SNDMSG(button, BCM_SETNOTE, 0, (LPARAM)(note)) -- 2.20.1

1 0