Mirrors/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-06-12 21:27:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

vrclient: Wait for pending command stream operations before IVRClientCore::Cleanup()

Browse Source 
Command stream callbacks may try to access VR client objects.
This commit is contained in:
Józef Kucia
2018-04-19 16:11:32 +02:00
parent a1031dbce4
commit bd96c106ce
5 changed files with 60 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vrclient_x64/gen_wrapper.py
View File

@ -180,8 +180,8 @@ method_overrides = [
]
method_overrides_data = [
("IVRClientCore", "struct client_core_data"),
("IVRCompositor", "struct compositor_data"),
("IVRClientCore", "struct client_core_data", None),
("IVRCompositor", "struct compositor_data", "destroy_compositor_data"),
]
def display_sdkver(s):
@ -359,7 +359,7 @@ def handle_method(cfile, classname, winclassname, cppname, method, cpp, cpp_h, e
cfile.write(")")
if is_method_overridden:
cfile.write(", %s" % iface_version[iface_version.find("_") + 1:].lstrip("0"))
for classname_pattern, user_data_type in method_overrides_data:
for classname_pattern, user_data_type, _ in method_overrides_data:
if classname_pattern in classname:
cfile.write(", &_this->user_data")
break
@ -448,7 +448,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
cfile.write("typedef struct __%s {\n" % winclassname)
cfile.write(" vtable_ptr *vtable;\n")
cfile.write(" void *linux_side;\n")
for classname_pattern, user_data_type in method_overrides_data:
for classname_pattern, user_data_type, _ in method_overrides_data:
if classname_pattern in classnode.spelling:
cfile.write(" %s user_data;\n" % user_data_type)
break
@ -477,6 +477,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
cfile.write(" return r;\n}\n\n")
cfile.write("void destroy_%s(void *object)\n{\n" % winclassname)
cfile.write(" TRACE(\"%p\\n\", object);\n")
for classname_pattern, user_data_type, user_data_destructor in method_overrides_data:
if user_data_destructor and classname_pattern in classnode.spelling:
cfile.write(" struct __%s *win_object = object;\n" % winclassname)
cfile.write(" %s(&win_object->user_data);\n" % user_data_destructor)
break
cfile.write(" HeapFree(GetProcessHeap(), 0, object);\n}\n\n")
cpp.write("#ifdef __cplusplus\n}\n#endif\n")