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

[PATCH 5/6] wined3d: Free shader backend and fragment pipe context data in device_context_remove().
by Henri Verbeet 03 May '19

03 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 2 -- dlls/wined3d/device.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b239813d226..4a73cbbda13 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2347,8 +2347,6 @@ void wined3d_context_destroy(struct wined3d_context *context) return; } - device->shader_backend->shader_free_context_data(context); - device->adapter->fragment_pipe->free_context_data(context); device_context_remove(device, context); wined3d_context_gl_destroy(wined3d_context_gl(context)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e25565da7f5..df491e1641e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -168,6 +168,9 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context TRACE("Removing context %p.\n", context); + device->adapter->fragment_pipe->free_context_data(context); + device->shader_backend->shader_free_context_data(context); + for (i = 0; i < device->context_count; ++i) { if (device->contexts[i] == context) -- 2.11.0

1 0

[PATCH 4/6] wined3d: Introduce wined3d_context_gl_destroy().
by Henri Verbeet 03 May '19

03 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 46 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 148d69f5cf1..b239813d226 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1482,6 +1482,32 @@ static void wined3d_context_cleanup(struct wined3d_context *context) heap_free(context->texture_type); } +static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) +{ + wined3d_context_cleanup(&context_gl->c); +} + +static void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) +{ + if (context_gl->c.current && context_gl->c.tid != GetCurrentThreadId()) + { + struct wined3d_gl_info *gl_info; + + /* Make a copy of gl_info for wined3d_context_gl_cleanup() use, the + * one in wined3d_adapter may go away in the meantime. */ + gl_info = heap_alloc(sizeof(*gl_info)); + *gl_info = *context_gl->c.gl_info; + context_gl->c.gl_info = gl_info; + context_gl->c.destroyed = 1; + + return; + } + + wined3d_context_gl_cleanup(context_gl); + TlsSetValue(wined3d_context_tls_idx, NULL); + heap_free(context_gl); +} + DWORD context_get_tls_idx(void) { return wined3d_context_tls_idx; @@ -1512,7 +1538,7 @@ BOOL context_set_current(struct wined3d_context *ctx) if (old->destroyed) { TRACE("Switching away from destroyed context %p.\n", old); - wined3d_context_cleanup(old); + wined3d_context_gl_cleanup(wined3d_context_gl(old)); heap_free((void *)old->gl_info); heap_free(old); } @@ -2325,23 +2351,7 @@ void wined3d_context_destroy(struct wined3d_context *context) device->adapter->fragment_pipe->free_context_data(context); device_context_remove(device, context); - if (context->current && context->tid != GetCurrentThreadId()) - { - struct wined3d_gl_info *gl_info; - - /* Make a copy of gl_info for wined3d_context_cleanup() use, the - * one in wined3d_adapter may go away in the meantime. */ - gl_info = heap_alloc(sizeof(*gl_info)); - *gl_info = *context->gl_info; - context->gl_info = gl_info; - context->destroyed = 1; - - return; - } - - wined3d_context_cleanup(context); - TlsSetValue(wined3d_context_tls_idx, NULL); - heap_free(context); + wined3d_context_gl_destroy(wined3d_context_gl(context)); } const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 138cefb5ffe..e698c792813 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2034,6 +2034,11 @@ struct wined3d_context_gl struct wined3d_context c; }; +static inline struct wined3d_context_gl *wined3d_context_gl(struct wined3d_context *context) +{ + return CONTAINING_RECORD(context, struct wined3d_context_gl, c); +} + struct wined3d_fb_state { struct wined3d_rendertarget_view *render_targets[MAX_RENDER_TARGET_VIEWS]; -- 2.11.0

1 0

[PATCH 3/6] wined3d: Free the "texture_type" array in wined3d_context_cleanup().
by Henri Verbeet 03 May '19

03 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3f9605c2566..148d69f5cf1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1478,6 +1478,8 @@ static void wined3d_context_cleanup(struct wined3d_context *context) DWORD err = GetLastError(); ERR("wglDeleteContext(%p) failed, last error %#x.\n", context->glCtx, err); } + + heap_free(context->texture_type); } DWORD context_get_tls_idx(void) @@ -2321,7 +2323,6 @@ void wined3d_context_destroy(struct wined3d_context *context) device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->texture_type); device_context_remove(device, context); if (context->current && context->tid != GetCurrentThreadId()) -- 2.11.0

1 0

[PATCH 2/6] wined3d: Rename context_destroy_gl_resources() to wined3d_context_cleanup().
by Henri Verbeet 03 May '19

03 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5978627baed..3f9605c2566 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1312,7 +1312,7 @@ static void context_update_window(struct wined3d_context *context) } } -static void context_destroy_gl_resources(struct wined3d_context *context) +static void wined3d_context_cleanup(struct wined3d_context *context) { struct wined3d_pipeline_statistics_query *pipeline_statistics_query; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -1510,7 +1510,7 @@ BOOL context_set_current(struct wined3d_context *ctx) if (old->destroyed) { TRACE("Switching away from destroyed context %p.\n", old); - context_destroy_gl_resources(old); + wined3d_context_cleanup(old); heap_free((void *)old->gl_info); heap_free(old); } @@ -2328,7 +2328,7 @@ void wined3d_context_destroy(struct wined3d_context *context) { struct wined3d_gl_info *gl_info; - /* Make a copy of gl_info for context_destroy_gl_resources() use, the + /* Make a copy of gl_info for wined3d_context_cleanup() use, the * one in wined3d_adapter may go away in the meantime. */ gl_info = heap_alloc(sizeof(*gl_info)); *gl_info = *context->gl_info; @@ -2338,7 +2338,7 @@ void wined3d_context_destroy(struct wined3d_context *context) return; } - context_destroy_gl_resources(context); + wined3d_context_cleanup(context); TlsSetValue(wined3d_context_tls_idx, NULL); heap_free(context); } -- 2.11.0

1 0

[PATCH 1/6] wined3d: Simplify wined3d_context_destroy().
by Henri Verbeet 03 May '19

03 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 223e6b22962..5978627baed 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2302,7 +2302,6 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, void wined3d_context_destroy(struct wined3d_context *context) { struct wined3d_device *device = context->device; - BOOL destroy; TRACE("Destroying ctx %p\n", context); @@ -2320,29 +2319,28 @@ void wined3d_context_destroy(struct wined3d_context *context) return; } - if (context->tid == GetCurrentThreadId() || !context->current) - { - context_destroy_gl_resources(context); - TlsSetValue(wined3d_context_tls_idx, NULL); - destroy = TRUE; - } - else + device->shader_backend->shader_free_context_data(context); + device->adapter->fragment_pipe->free_context_data(context); + heap_free(context->texture_type); + device_context_remove(device, context); + + if (context->current && context->tid != GetCurrentThreadId()) { - /* Make a copy of gl_info for context_destroy_gl_resources use, the one - in wined3d_adapter may go away in the meantime */ - struct wined3d_gl_info *gl_info = heap_alloc(sizeof(*gl_info)); + struct wined3d_gl_info *gl_info; + + /* Make a copy of gl_info for context_destroy_gl_resources() use, the + * one in wined3d_adapter may go away in the meantime. */ + gl_info = heap_alloc(sizeof(*gl_info)); *gl_info = *context->gl_info; context->gl_info = gl_info; context->destroyed = 1; - destroy = FALSE; + + return; } - device->shader_backend->shader_free_context_data(context); - device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->texture_type); - device_context_remove(device, context); - if (destroy) - heap_free(context); + context_destroy_gl_resources(context); + TlsSetValue(wined3d_context_tls_idx, NULL); + heap_free(context); } const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, -- 2.11.0

1 0

[PATCH] winebus.sys: Add more traces on hidraw communication errors.
by Piotr Caban 03 May '19

03 May '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

Re: [PATCH 1/2] xaudio2: Fix support for FAudio 19.06 and newer
by Ethan Lee 03 May '19

03 May '19

Those names definitely look messy, but not quite messy enough… I’ll keep thinking of a good name, but for now (at least for demonstration purposes) I’ve gone ahead and used ‘BADABI’ to lay out how this is going to go down: https://github.com/FNA-XNA/FAudio/blob/16d1dfeb92a4ae18eacb67c3dcf3f75de513… <https://github.com/FNA-XNA/FAudio/blob/16d1dfeb92a4ae18eacb67c3dcf3f75de513…> https://github.com/FNA-XNA/FAudio/blob/16d1dfeb92a4ae18eacb67c3dcf3f75de513… <https://github.com/FNA-XNA/FAudio/blob/16d1dfeb92a4ae18eacb67c3dcf3f75de513…> So I’ve added the fixed functions and that’ll work for the rest of 2019 - this can safely be used for all of Wine 4.x and 5.0, and the function used by 4.3 through 4.7 (or 8 or 9, depending on when you want to move to the corrected function) can still build against the old function. It won’t work (and absolutely positively never will and never could have worked, just to emphasize one more time), but it’s at least there for compilation purposes. By the time 5.0 is out the proper function will be available and the 5.x series can use the new function, while 5.0.x maintenance releases can continue to use the BADABI function safely without having to worry about it getting lost before 6.0 is out. Once 6.0 is out, both the stable/unstable branches of Wine will be on the right function and the old functions won’t apply at that point. If someone really _really_ needs to do a multi-year bisect, they can pass --disable-faudio and save themselves the build time. If the XAudio2 subsystem is what’s being examined, they’re most likely looking at FAudio and not Wine. -Ethan > The idea of backwards compatibility is that a program should still be > able to compile and run with any respective combination of old and new > versions of the library. Renaming the old function breaks this. It also > means that you want to load the new function at runtime rather than > assuming it'll be present if compile-time support is there. > > As for naming convention, a few suggestions are: > > * FAudio_CommitChanges_a (e.g. libdwarf), or FAudio_CommitChangesA if > you insist on title case > * FAudio_CommitChangesBySet > * FAudio_CommitChanges_v2 > * FAudio_CommitChanges_ex (or FAudio_CommitChangesEx, but this has the > risk of colliding with a future function Microsoft adds) > > Personally I'm a fan of a descriptive name like CommitChangesBySet(), > but ultimately it's your choice.

6 6

Re: [PATCH 1/2] xaudio2: Fix support for FAudio 19.06 and newer
by Ethan Lee 03 May '19

03 May '19

I’m really glad you butted in because this is actually a very good point (sorry I didn’t see it earlier, I only get wine-devel messages as digests). So maybe what I can do is add something totally different like `FAudio_CommitOperationSet` and in the documentation deliberately put the phrase “CommitChanges” in so users wondering where that function went can go find it quickly. I still think my bogus CommitChanges needs to be scrapped somehow but if we can agree that any use of CommitChanges is a bug (yes, even retroactively), maybe I can just make it do something extremely unpleasant that still allows the program to run, but make it so anyone using it can see something is wrong (stderr messages maybe?). The main thing that is a concern is that CommitChanges affects a HUGE amount of how the library works, which is why I want to destroy it as soon as I possibly can. The next release of FAudio is going to support operation sets, meaning any call that uses an operation set value other than `NOW` is going to be put in a queue somewhere, and will not be fired until Commit is called. We can’t ignore the old CommitChanges because doing so means leaving a stub, meaning commands will never be fired and will halt lots of audio activity and basically introduce a massive memory leak into the program. We also can’t make any assumptions about a default operation set because that breaks timing accuracy, meaning data can go missing and crash, or deadlocks can occur if callbacks contain threading activity in them. So the question is: Can we agree that use of CommitChanges is an _application_ bug and tell users to migrate to CommitOperationSet, or do people expect me to somehow make CommitChanges not break as described above? If the former, cool, I can maybe make that work and deprecate the old function (I still really want to delete it at some point, though). If the latter, I’d rather people get mad at me over something that, based on the feedback presented, was a good decision compared to letting users deliberately do something that breaks programs for “compatibility”, if that phrase makes _any_ sense. -Ethan > Apologies for butting in, but I'm not sure this is any better. Code > that's written to call FAudio_CommitChanges would expect this function > to have the same specified behavior after an update. If code needs > updating to use the new version, having a separate > FAudio_CommitChangesBADAPI function seems a bit pointless; for the same > effort of changing the call to restore old behavior, you could just > ensure FAudio_CommitChanges is used correctly (unless the behavior > change is that significant, in which case it really should be a new > function). > > When it comes to ABI changes, it should represent a massive change for > the interface and be a complete refresh. If you have libfaudio.so.0 and > libfaudio.so.1, for example, what happens if a process tries to pull in > both (e.g. the main app links against libfaudio.so.1, but the app also > links against libfoo.so which links to libfaudio.so.0)? Now you have two > separate FAudio_CommitChanges symbols with two different behaviors, and > something will break. I've actually run into this problem with SDL, > where I link against SDL2 and SDL_sound, but on some distros SDL_sound > links against SDL1; it all compiles and links fine, but misbehaves at > runtime for no immediately obvious reason (if I didn't know SDL_sound > might be linked against SDL1, while I link against SDL2, I'd be baffled > as to why seemingly correct calls are just failing for some people and > not others).

2 3

[PATCH v2] setupapi: Add magic bytes to struct file_queue and validate them in SetupCloseFileQueue().
by Zebediah Figura 03 May '19

03 May '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12332 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/queue.c | 11 +++++++++++ dlls/setupapi/tests/install.c | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index c065c6e7dd..f267380a2c 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -79,6 +79,7 @@ struct file_op_queue struct file_queue { + DWORD magic; struct file_op_queue copy_queue; struct file_op_queue delete_queue; struct file_op_queue rename_queue; @@ -87,6 +88,7 @@ struct file_queue unsigned int source_count; }; +#define FILE_QUEUE_MAGIC 0x21514653 /* append a file operation to a queue */ static inline void queue_file_op( struct file_op_queue *queue, struct file_op *op ) @@ -434,6 +436,7 @@ HSPFILEQ WINAPI SetupOpenFileQueue(void) if (!(queue = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*queue)))) return INVALID_HANDLE_VALUE; + queue->magic = FILE_QUEUE_MAGIC; return queue; } @@ -446,6 +449,14 @@ BOOL WINAPI SetupCloseFileQueue( HSPFILEQ handle ) struct file_queue *queue = handle; unsigned int i; + /* Windows XP DDK installer passes the handle returned from + * SetupInitDefaultQueueCallback() to this function. */ + if (queue->magic != FILE_QUEUE_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + free_file_op_queue( &queue->copy_queue ); free_file_op_queue( &queue->rename_queue ); free_file_op_queue( &queue->delete_queue ); diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 15b789fe82..85f532a78b 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1815,6 +1815,21 @@ static void test_need_media(void) ok(ret, "Failed to delete INF file, error %u.\n", GetLastError()); } +static void test_close_queue(void) +{ + void *context; + BOOL ret; + + context = SetupInitDefaultQueueCallback(NULL); + ok(!!context, "Failed to create callback context, error %#x.\n", GetLastError()); + + ret = SetupCloseFileQueue(context); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %u.\n", GetLastError()); + + SetupTermDefaultQueueCallback(context); +} + START_TEST(install) { char temp_path[MAX_PATH], prev_path[MAX_PATH]; @@ -1841,6 +1856,7 @@ START_TEST(install) test_dirid(); test_install_files_queue(); test_need_media(); + test_close_queue(); UnhookWindowsHookEx(hhook); -- 2.21.0

1 0

[PATCH] setupapi: Add magic bytes to struct file_queue and validate them in SetupCloseFileQueue().
by Zebediah Figura 03 May '19

03 May '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12332 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/queue.c | 11 +++++++++++ dlls/setupapi/tests/install.c | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index c065c6e7dd..f267380a2c 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -79,6 +79,7 @@ struct file_op_queue struct file_queue { + DWORD magic; struct file_op_queue copy_queue; struct file_op_queue delete_queue; struct file_op_queue rename_queue; @@ -87,6 +88,7 @@ struct file_queue unsigned int source_count; }; +#define FILE_QUEUE_MAGIC 0x21514653 /* append a file operation to a queue */ static inline void queue_file_op( struct file_op_queue *queue, struct file_op *op ) @@ -434,6 +436,7 @@ HSPFILEQ WINAPI SetupOpenFileQueue(void) if (!(queue = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*queue)))) return INVALID_HANDLE_VALUE; + queue->magic = FILE_QUEUE_MAGIC; return queue; } @@ -446,6 +449,14 @@ BOOL WINAPI SetupCloseFileQueue( HSPFILEQ handle ) struct file_queue *queue = handle; unsigned int i; + /* Windows XP DDK installer passes the handle returned from + * SetupInitDefaultQueueCallback() to this function. */ + if (queue->magic != FILE_QUEUE_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + free_file_op_queue( &queue->copy_queue ); free_file_op_queue( &queue->rename_queue ); free_file_op_queue( &queue->delete_queue ); diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 15b789fe82..88e430af50 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1815,6 +1815,21 @@ static void test_need_media(void) ok(ret, "Failed to delete INF file, error %u.\n", GetLastError()); } +static void test_close_queue(void) +{ + void *context; + BOOL ret; + + context = SetupInitDefaultQueueCallback(NULL); + ok(!!context, "Failed to create callback context, error %#x.\n", GetLastError()); + + ret = SetupCloseFileQueue(context); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %u.\n", GetLastError()); + + SetupTermDefaultQueueCallback(context); +} + START_TEST(install) { char temp_path[MAX_PATH], prev_path[MAX_PATH]; @@ -1841,6 +1856,7 @@ START_TEST(install) test_dirid(); test_install_files_queue(); test_need_media(); + test_close_queue(); UnhookWindowsHookEx(hhook); -- 2.21.0

2 1