From 7b06a5685a1cdc910f9051f58b4c63a696d57478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Wed, 4 Apr 2018 17:20:44 +0200 Subject: [PATCH] vrclient: Call IVRCompositor::PostPresentHandoff() on wined3d command stream thread IVRCompositor::PostPresentHandoff() has to be called on the same thread as IVRCompositor::Submit() --- vrclient_x64/gen_wrapper.py | 21 ++++- vrclient_x64/vrclient_main.c | 76 ++++++++++++++++-- vrclient_x64/vrclient_private.h | 27 +++++-- vrclient_x64/winIVRApplications.c | 12 +-- vrclient_x64/winIVRChaperone.c | 4 +- vrclient_x64/winIVRChaperoneSetup.c | 4 +- vrclient_x64/winIVRClientCore.c | 4 +- vrclient_x64/winIVRCompositor.c | 111 +++++++++++++++------------ vrclient_x64/winIVRDriverManager.c | 2 +- vrclient_x64/winIVRExtendedDisplay.c | 2 +- vrclient_x64/winIVRNotifications.c | 4 +- vrclient_x64/winIVROverlay.c | 30 ++++---- vrclient_x64/winIVRRenderModels.c | 8 +- vrclient_x64/winIVRResources.c | 2 +- vrclient_x64/winIVRScreenshots.c | 2 +- vrclient_x64/winIVRSettings.c | 4 +- vrclient_x64/winIVRSystem.c | 26 +++---- vrclient_x64/winIVRTrackedCamera.c | 6 +- 18 files changed, 232 insertions(+), 113 deletions(-) diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py index e2060b87..176f0ee0 100755 --- a/vrclient_x64/gen_wrapper.py +++ b/vrclient_x64/gen_wrapper.py @@ -138,9 +138,17 @@ def ivrcompositor_submit(cppname, method): return "ivrcompositor_008_submit" return "ivrcompositor_submit" +def ivrcompositor_post_present_handoff(cppname, method): + return "ivrcompositor_post_present_handoff" + method_overrides = [ ("IVRSystem", "GetDXGIOutputInfo", ivrsystem_get_dxgi_output_info), ("IVRCompositor", "Submit", ivrcompositor_submit), + ("IVRCompositor", "PostPresentHandoff", ivrcompositor_post_present_handoff), +] + +method_overrides_data = [ + ("IVRCompositor", "struct compositor_data"), ] def display_sdkver(s): @@ -262,10 +270,12 @@ def handle_method(cfile, classname, winclassname, cppname, method, cpp, cpp_h, e if should_gen_wrapper: cfile.write("create_win_interface(pchNameAndVersion,\n ") + is_method_overridden = False for classname_pattern, methodname, override_generator in method_overrides: if used_name == methodname and classname_pattern in classname: cfile.write(override_generator(cppname, method)) cfile.write("(%s_%s, _this->linux_side" % (cppname, used_name)) + is_method_overridden = True break else: cfile.write("%s_%s(_this->linux_side" % (cppname, used_name)) @@ -314,6 +324,11 @@ def handle_method(cfile, classname, winclassname, cppname, method, cpp, cpp_h, e cpp.write("(%s)%s" % (param.type.spelling, param.spelling)) if should_gen_wrapper: cfile.write(")") + if is_method_overridden: + for classname_pattern, user_data_type in method_overrides_data: + if classname_pattern in classname: + cfile.write(", &_this->user_data") + break cfile.write(");\n") cpp.write(");\n") if returns_record: @@ -399,6 +414,10 @@ 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: + if classname_pattern in classnode.spelling: + cfile.write(" %s user_data;\n" % user_data_type) + break cfile.write("} %s;\n\n" % winclassname) methods = [] for child in children: @@ -417,7 +436,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vrclient); cfile.write("}\n") cfile.write("#endif\n\n") cfile.write("%s *create_%s(void *linux_side)\n{\n" % (winclassname, winclassname)) - cfile.write(" %s *r = HeapAlloc(GetProcessHeap(), 0, sizeof(%s));\n" % (winclassname, winclassname)) + cfile.write(" %s *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(%s));\n" % (winclassname, winclassname)) cfile.write(" TRACE(\"-> %p\\n\", r);\n") cfile.write(" r->vtable = &%s_vtable;\n" % winclassname) cfile.write(" r->linux_side = linux_side;\n") diff --git a/vrclient_x64/vrclient_main.c b/vrclient_x64/vrclient_main.c index c93d67b7..927156e7 100644 --- a/vrclient_x64/vrclient_main.c +++ b/vrclient_x64/vrclient_main.c @@ -189,7 +189,8 @@ static CDECL void d3d11_texture_callback(unsigned int gl_texture, const void *da void ivrcompositor_005_submit( void (*cpp_func)(void *, Hmd_Eye, void *, Compositor_TextureBounds *), - void *linux_side, Hmd_Eye eye, void *texture, Compositor_TextureBounds *bounds) + void *linux_side, Hmd_Eye eye, void *texture, Compositor_TextureBounds *bounds, + struct compositor_data *user_data) { TRACE("%p, %#x, %p, %p\n", linux_side, eye, texture, bounds); @@ -198,7 +199,8 @@ void ivrcompositor_005_submit( VRCompositorError ivrcompositor_006_submit( VRCompositorError (*cpp_func)(void *, Hmd_Eye, void *, VRTextureBounds_t *), - void *linux_side, Hmd_Eye eye, void *texture, VRTextureBounds_t *bounds) + void *linux_side, Hmd_Eye eye, void *texture, VRTextureBounds_t *bounds, + struct compositor_data *user_data) { TRACE("%p, %#x, %p, %p\n", linux_side, eye, texture, bounds); @@ -207,7 +209,8 @@ VRCompositorError ivrcompositor_006_submit( VRCompositorError ivrcompositor_007_submit( VRCompositorError (*cpp_func)(void *, Hmd_Eye, GraphicsAPIConvention, void *, VRTextureBounds_t *), - void *linux_side, Hmd_Eye eye, GraphicsAPIConvention api, void *texture, VRTextureBounds_t *bounds) + void *linux_side, Hmd_Eye eye, GraphicsAPIConvention api, void *texture, VRTextureBounds_t *bounds, + struct compositor_data *user_data) { TRACE("%p, %#x, %#x, %p, %p\n", linux_side, eye, api, texture, bounds); @@ -221,7 +224,8 @@ VRCompositorError ivrcompositor_008_submit( VRCompositorError (*cpp_func)(void *, Hmd_Eye, GraphicsAPIConvention, void *, VRTextureBounds_t *, VRSubmitFlags_t), void *linux_side, Hmd_Eye eye, GraphicsAPIConvention api, void *texture, - VRTextureBounds_t *bounds, VRSubmitFlags_t flags) + VRTextureBounds_t *bounds, VRSubmitFlags_t flags, + struct compositor_data *user_data) { TRACE("%p, %#x, %#x, %p, %p, %#x\n", linux_side, eye, api, texture, bounds, flags); @@ -233,11 +237,14 @@ VRCompositorError ivrcompositor_008_submit( EVRCompositorError ivrcompositor_submit( EVRCompositorError (*cpp_func)(void *, EVREye, Texture_t *, VRTextureBounds_t *, EVRSubmitFlags), - void *linux_side, EVREye eye, Texture_t *texture, VRTextureBounds_t *bounds, EVRSubmitFlags flags) + void *linux_side, EVREye eye, Texture_t *texture, VRTextureBounds_t *bounds, EVRSubmitFlags flags, + struct compositor_data *user_data) { IWineD3D11Texture2D *wine_texture; + IWineD3D11Device *wined3d_device; struct submit_data submit_data; IUnknown *texture_iface; + ID3D11Device *device; HRESULT hr; TRACE("%p, %#x, %p, %p, %#x\n", linux_side, eye, texture, bounds, flags); @@ -262,6 +269,28 @@ EVRCompositorError ivrcompositor_submit( return cpp_func(linux_side, eye, texture, bounds, flags); } + wine_texture->lpVtbl->GetDevice(wine_texture, &device); + if (user_data->d3d11_device != device) + { + if (user_data->d3d11_device) + FIXME("Previous submit was from different D3D11 device.\n"); + + user_data->d3d11_device = device; + + if (SUCCEEDED(hr = device->lpVtbl->QueryInterface(device, + &IID_IWineD3D11Device, (void **)&wined3d_device))) + { + user_data->wined3d_device = wined3d_device; + wined3d_device->lpVtbl->Release(wined3d_device); + } + else + { + ERR("Failed to get device, hr %#x.\n", hr); + user_data->wined3d_device = NULL; + } + } + device->lpVtbl->Release(device); + submit_data.linux_side = linux_side; submit_data.submit = cpp_func; submit_data.eye = eye; @@ -278,3 +307,40 @@ EVRCompositorError ivrcompositor_submit( return cpp_func(linux_side, eye, texture, bounds, flags); } } + +struct post_present_handoff_data +{ + void *linux_side; + void (*post_present_handoff)(void *linux_side); +}; + +static CDECL void d3d11_post_present_handoff_callback(const void *data, unsigned int data_size) +{ + const struct post_present_handoff_data *callback_data = data; + + TRACE("data {%p, %u}\n", data, data_size); + + callback_data->post_present_handoff(callback_data->linux_side); +} + +void ivrcompositor_post_present_handoff(void (*cpp_func)(void *), + void *linux_side, struct compositor_data *user_data) +{ + struct post_present_handoff_data data; + IWineD3D11Device *wined3d_device; + + TRACE("%p\n", linux_side); + + if ((wined3d_device = user_data->wined3d_device)) + { + TRACE("wined3d device %p\n", wined3d_device); + + data.linux_side = linux_side; + data.post_present_handoff = cpp_func; + wined3d_device->lpVtbl->run_on_command_stream(wined3d_device, + d3d11_post_present_handoff_callback, &data, sizeof(data)); + return; + } + + cpp_func(linux_side); +} diff --git a/vrclient_x64/vrclient_private.h b/vrclient_x64/vrclient_private.h index 3b7b82d5..2912f7f7 100644 --- a/vrclient_x64/vrclient_private.h +++ b/vrclient_x64/vrclient_private.h @@ -35,26 +35,43 @@ unsigned int steamclient_unix_path_to_dos_path(unsigned int api_result, char *in void *create_LinuxMatchmakingServerListResponse(void *win); #ifndef __cplusplus +typedef struct ID3D11Device ID3D11Device; +typedef struct IWineD3D11Device IWineD3D11Device; + +struct compositor_data +{ + ID3D11Device *d3d11_device; + IWineD3D11Device *wined3d_device; +}; + void get_dxgi_output_info(void *cpp_func, void *linux_side, int32_t *adapter_idx); void get_dxgi_output_info2(void *cpp_func, void *linux_side, int32_t *adapter_idx, int32_t *output_idx); void ivrcompositor_005_submit( void (*cpp_func)(void *, Hmd_Eye, void *, Compositor_TextureBounds *), - void *linux_side, Hmd_Eye eye, void *texture, Compositor_TextureBounds *bounds); + void *linux_side, Hmd_Eye eye, void *texture, Compositor_TextureBounds *bounds, + struct compositor_data *user_data); VRCompositorError ivrcompositor_006_submit( VRCompositorError (*cpp_func)(void *, Hmd_Eye, void *, VRTextureBounds_t *), - void *linux_side, Hmd_Eye eye, void *texture, VRTextureBounds_t *bounds); + void *linux_side, Hmd_Eye eye, void *texture, VRTextureBounds_t *bounds, + struct compositor_data *user_data); VRCompositorError ivrcompositor_007_submit( VRCompositorError (*cpp_func)(void *, Hmd_Eye, GraphicsAPIConvention, void *, VRTextureBounds_t *), - void *linux_side, Hmd_Eye eye, GraphicsAPIConvention api, void *texture, VRTextureBounds_t *bounds); + void *linux_side, Hmd_Eye eye, GraphicsAPIConvention api, void *texture, VRTextureBounds_t *bounds, + struct compositor_data *user_data); VRCompositorError ivrcompositor_008_submit( VRCompositorError (*cpp_func)(void *, Hmd_Eye, GraphicsAPIConvention, void *, VRTextureBounds_t *, VRSubmitFlags_t), void *linux_side, Hmd_Eye eye, GraphicsAPIConvention texture_type, void *texture, - VRTextureBounds_t *bounds, VRSubmitFlags_t submit_flags); + VRTextureBounds_t *bounds, VRSubmitFlags_t submit_flags, + struct compositor_data *user_data); EVRCompositorError ivrcompositor_submit( EVRCompositorError (*cpp_func)(void *, EVREye, Texture_t *, VRTextureBounds_t *, EVRSubmitFlags), - void *linux_side, EVREye eye, Texture_t *texture, VRTextureBounds_t *bounds, EVRSubmitFlags submit_flags); + void *linux_side, EVREye eye, Texture_t *texture, VRTextureBounds_t *bounds, EVRSubmitFlags submit_flags, + struct compositor_data *user_data); + +void ivrcompositor_post_present_handoff(void (*cpp_func)(void *), + void *linux_side, struct compositor_data *user_data); #endif /* __cplusplus */ #define TRACE WINE_TRACE diff --git a/vrclient_x64/winIVRApplications.c b/vrclient_x64/winIVRApplications.c index 6ec82173..671c0196 100644 --- a/vrclient_x64/winIVRApplications.c +++ b/vrclient_x64/winIVRApplications.c @@ -284,7 +284,7 @@ void __asm_dummy_vtables(void) { winIVRApplications_IVRApplications_006 *create_winIVRApplications_IVRApplications_006(void *linux_side) { - winIVRApplications_IVRApplications_006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRApplications_IVRApplications_006)); + winIVRApplications_IVRApplications_006 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRApplications_IVRApplications_006)); TRACE("-> %p\n", r); r->vtable = &winIVRApplications_IVRApplications_006_vtable; r->linux_side = linux_side; @@ -503,7 +503,7 @@ void __asm_dummy_vtables(void) { winIVRApplications_IVRApplications_005 *create_winIVRApplications_IVRApplications_005(void *linux_side) { - winIVRApplications_IVRApplications_005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRApplications_IVRApplications_005)); + winIVRApplications_IVRApplications_005 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRApplications_IVRApplications_005)); TRACE("-> %p\n", r); r->vtable = &winIVRApplications_IVRApplications_005_vtable; r->linux_side = linux_side; @@ -714,7 +714,7 @@ void __asm_dummy_vtables(void) { winIVRApplications_IVRApplications_004 *create_winIVRApplications_IVRApplications_004(void *linux_side) { - winIVRApplications_IVRApplications_004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRApplications_IVRApplications_004)); + winIVRApplications_IVRApplications_004 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRApplications_IVRApplications_004)); TRACE("-> %p\n", r); r->vtable = &winIVRApplications_IVRApplications_004_vtable; r->linux_side = linux_side; @@ -909,7 +909,7 @@ void __asm_dummy_vtables(void) { winIVRApplications_IVRApplications_003 *create_winIVRApplications_IVRApplications_003(void *linux_side) { - winIVRApplications_IVRApplications_003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRApplications_IVRApplications_003)); + winIVRApplications_IVRApplications_003 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRApplications_IVRApplications_003)); TRACE("-> %p\n", r); r->vtable = &winIVRApplications_IVRApplications_003_vtable; r->linux_side = linux_side; @@ -1096,7 +1096,7 @@ void __asm_dummy_vtables(void) { winIVRApplications_IVRApplications_002 *create_winIVRApplications_IVRApplications_002(void *linux_side) { - winIVRApplications_IVRApplications_002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRApplications_IVRApplications_002)); + winIVRApplications_IVRApplications_002 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRApplications_IVRApplications_002)); TRACE("-> %p\n", r); r->vtable = &winIVRApplications_IVRApplications_002_vtable; r->linux_side = linux_side; @@ -1291,7 +1291,7 @@ void __asm_dummy_vtables(void) { winIVRApplications_IVRApplications_001 *create_winIVRApplications_IVRApplications_001(void *linux_side) { - winIVRApplications_IVRApplications_001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRApplications_IVRApplications_001)); + winIVRApplications_IVRApplications_001 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRApplications_IVRApplications_001)); TRACE("-> %p\n", r); r->vtable = &winIVRApplications_IVRApplications_001_vtable; r->linux_side = linux_side; diff --git a/vrclient_x64/winIVRChaperone.c b/vrclient_x64/winIVRChaperone.c index e3043b52..7b756988 100644 --- a/vrclient_x64/winIVRChaperone.c +++ b/vrclient_x64/winIVRChaperone.c @@ -100,7 +100,7 @@ void __asm_dummy_vtables(void) { winIVRChaperone_IVRChaperone_003 *create_winIVRChaperone_IVRChaperone_003(void *linux_side) { - winIVRChaperone_IVRChaperone_003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRChaperone_IVRChaperone_003)); + winIVRChaperone_IVRChaperone_003 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRChaperone_IVRChaperone_003)); TRACE("-> %p\n", r); r->vtable = &winIVRChaperone_IVRChaperone_003_vtable; r->linux_side = linux_side; @@ -199,7 +199,7 @@ void __asm_dummy_vtables(void) { winIVRChaperone_IVRChaperone_002 *create_winIVRChaperone_IVRChaperone_002(void *linux_side) { - winIVRChaperone_IVRChaperone_002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRChaperone_IVRChaperone_002)); + winIVRChaperone_IVRChaperone_002 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRChaperone_IVRChaperone_002)); TRACE("-> %p\n", r); r->vtable = &winIVRChaperone_IVRChaperone_002_vtable; r->linux_side = linux_side; diff --git a/vrclient_x64/winIVRChaperoneSetup.c b/vrclient_x64/winIVRChaperoneSetup.c index 17eec9b8..d9efc18a 100644 --- a/vrclient_x64/winIVRChaperoneSetup.c +++ b/vrclient_x64/winIVRChaperoneSetup.c @@ -196,7 +196,7 @@ void __asm_dummy_vtables(void) { winIVRChaperoneSetup_IVRChaperoneSetup_005 *create_winIVRChaperoneSetup_IVRChaperoneSetup_005(void *linux_side) { - winIVRChaperoneSetup_IVRChaperoneSetup_005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRChaperoneSetup_IVRChaperoneSetup_005)); + winIVRChaperoneSetup_IVRChaperoneSetup_005 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRChaperoneSetup_IVRChaperoneSetup_005)); TRACE("-> %p\n", r); r->vtable = &winIVRChaperoneSetup_IVRChaperoneSetup_005_vtable; r->linux_side = linux_side; @@ -351,7 +351,7 @@ void __asm_dummy_vtables(void) { winIVRChaperoneSetup_IVRChaperoneSetup_004 *create_winIVRChaperoneSetup_IVRChaperoneSetup_004(void *linux_side) { - winIVRChaperoneSetup_IVRChaperoneSetup_004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRChaperoneSetup_IVRChaperoneSetup_004)); + winIVRChaperoneSetup_IVRChaperoneSetup_004 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRChaperoneSetup_IVRChaperoneSetup_004)); TRACE("-> %p\n", r); r->vtable = &winIVRChaperoneSetup_IVRChaperoneSetup_004_vtable; r->linux_side = linux_side; diff --git a/vrclient_x64/winIVRClientCore.c b/vrclient_x64/winIVRClientCore.c index ba75b658..748ddecc 100644 --- a/vrclient_x64/winIVRClientCore.c +++ b/vrclient_x64/winIVRClientCore.c @@ -93,7 +93,7 @@ void __asm_dummy_vtables(void) { winIVRClientCore_IVRClientCore_003 *create_winIVRClientCore_IVRClientCore_003(void *linux_side) { - winIVRClientCore_IVRClientCore_003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRClientCore_IVRClientCore_003)); + winIVRClientCore_IVRClientCore_003 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRClientCore_IVRClientCore_003)); TRACE("-> %p\n", r); r->vtable = &winIVRClientCore_IVRClientCore_003_vtable; r->linux_side = linux_side; @@ -177,7 +177,7 @@ void __asm_dummy_vtables(void) { winIVRClientCore_IVRClientCore_002 *create_winIVRClientCore_IVRClientCore_002(void *linux_side) { - winIVRClientCore_IVRClientCore_002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRClientCore_IVRClientCore_002)); + winIVRClientCore_IVRClientCore_002 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRClientCore_IVRClientCore_002)); TRACE("-> %p\n", r); r->vtable = &winIVRClientCore_IVRClientCore_002_vtable; r->linux_side = linux_side; diff --git a/vrclient_x64/winIVRCompositor.c b/vrclient_x64/winIVRCompositor.c index 5874502d..90f51118 100644 --- a/vrclient_x64/winIVRCompositor.c +++ b/vrclient_x64/winIVRCompositor.c @@ -21,6 +21,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vrclient); typedef struct __winIVRCompositor_IVRCompositor_022 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_022; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_022_SetTrackingSpace, 8) @@ -62,7 +63,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_022_Submit, 28) EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_022_Submit(winIVRCompositor_IVRCompositor_022 *_this, EVREye eEye, Texture_t * pTexture, VRTextureBounds_t * pBounds, EVRSubmitFlags nSubmitFlags) { TRACE("%p\n", _this); - return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_022_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags); + return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_022_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_022_ClearLastSubmittedFrame, 4) @@ -76,7 +77,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_022_PostPresentHandoff, 4 void __thiscall winIVRCompositor_IVRCompositor_022_PostPresentHandoff(winIVRCompositor_IVRCompositor_022 *_this) { TRACE("%p\n", _this); - cppIVRCompositor_IVRCompositor_022_PostPresentHandoff(_this->linux_side); + ivrcompositor_post_present_handoff(cppIVRCompositor_IVRCompositor_022_PostPresentHandoff, _this->linux_side, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_022_GetFrameTiming, 16) @@ -381,7 +382,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_022 *create_winIVRCompositor_IVRCompositor_022(void *linux_side) { - winIVRCompositor_IVRCompositor_022 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_022)); + winIVRCompositor_IVRCompositor_022 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_022)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_022_vtable; r->linux_side = linux_side; @@ -393,6 +394,7 @@ winIVRCompositor_IVRCompositor_022 *create_winIVRCompositor_IVRCompositor_022(vo typedef struct __winIVRCompositor_IVRCompositor_021 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_021; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_021_SetTrackingSpace, 8) @@ -434,7 +436,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_021_Submit, 28) EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_021_Submit(winIVRCompositor_IVRCompositor_021 *_this, EVREye eEye, Texture_t * pTexture, VRTextureBounds_t * pBounds, EVRSubmitFlags nSubmitFlags) { TRACE("%p\n", _this); - return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_021_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags); + return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_021_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_021_ClearLastSubmittedFrame, 4) @@ -448,7 +450,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_021_PostPresentHandoff, 4 void __thiscall winIVRCompositor_IVRCompositor_021_PostPresentHandoff(winIVRCompositor_IVRCompositor_021 *_this) { TRACE("%p\n", _this); - cppIVRCompositor_IVRCompositor_021_PostPresentHandoff(_this->linux_side); + ivrcompositor_post_present_handoff(cppIVRCompositor_IVRCompositor_021_PostPresentHandoff, _this->linux_side, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_021_GetFrameTiming, 16) @@ -753,7 +755,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_021 *create_winIVRCompositor_IVRCompositor_021(void *linux_side) { - winIVRCompositor_IVRCompositor_021 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_021)); + winIVRCompositor_IVRCompositor_021 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_021)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_021_vtable; r->linux_side = linux_side; @@ -765,6 +767,7 @@ winIVRCompositor_IVRCompositor_021 *create_winIVRCompositor_IVRCompositor_021(vo typedef struct __winIVRCompositor_IVRCompositor_020 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_020; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_020_SetTrackingSpace, 8) @@ -806,7 +809,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_020_Submit, 28) EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_020_Submit(winIVRCompositor_IVRCompositor_020 *_this, EVREye eEye, Texture_t * pTexture, VRTextureBounds_t * pBounds, EVRSubmitFlags nSubmitFlags) { TRACE("%p\n", _this); - return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_020_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags); + return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_020_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_020_ClearLastSubmittedFrame, 4) @@ -820,7 +823,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_020_PostPresentHandoff, 4 void __thiscall winIVRCompositor_IVRCompositor_020_PostPresentHandoff(winIVRCompositor_IVRCompositor_020 *_this) { TRACE("%p\n", _this); - cppIVRCompositor_IVRCompositor_020_PostPresentHandoff(_this->linux_side); + ivrcompositor_post_present_handoff(cppIVRCompositor_IVRCompositor_020_PostPresentHandoff, _this->linux_side, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_020_GetFrameTiming, 16) @@ -1109,7 +1112,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_020 *create_winIVRCompositor_IVRCompositor_020(void *linux_side) { - winIVRCompositor_IVRCompositor_020 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_020)); + winIVRCompositor_IVRCompositor_020 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_020)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_020_vtable; r->linux_side = linux_side; @@ -1121,6 +1124,7 @@ winIVRCompositor_IVRCompositor_020 *create_winIVRCompositor_IVRCompositor_020(vo typedef struct __winIVRCompositor_IVRCompositor_019 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_019; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_019_SetTrackingSpace, 8) @@ -1162,7 +1166,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_019_Submit, 28) EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_019_Submit(winIVRCompositor_IVRCompositor_019 *_this, EVREye eEye, Texture_t * pTexture, VRTextureBounds_t * pBounds, EVRSubmitFlags nSubmitFlags) { TRACE("%p\n", _this); - return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_019_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags); + return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_019_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_019_ClearLastSubmittedFrame, 4) @@ -1176,7 +1180,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_019_PostPresentHandoff, 4 void __thiscall winIVRCompositor_IVRCompositor_019_PostPresentHandoff(winIVRCompositor_IVRCompositor_019 *_this) { TRACE("%p\n", _this); - cppIVRCompositor_IVRCompositor_019_PostPresentHandoff(_this->linux_side); + ivrcompositor_post_present_handoff(cppIVRCompositor_IVRCompositor_019_PostPresentHandoff, _this->linux_side, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_019_GetFrameTiming, 16) @@ -1457,7 +1461,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_019 *create_winIVRCompositor_IVRCompositor_019(void *linux_side) { - winIVRCompositor_IVRCompositor_019 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_019)); + winIVRCompositor_IVRCompositor_019 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_019)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_019_vtable; r->linux_side = linux_side; @@ -1469,6 +1473,7 @@ winIVRCompositor_IVRCompositor_019 *create_winIVRCompositor_IVRCompositor_019(vo typedef struct __winIVRCompositor_IVRCompositor_018 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_018; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_018_SetTrackingSpace, 8) @@ -1510,7 +1515,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_018_Submit, 28) EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_018_Submit(winIVRCompositor_IVRCompositor_018 *_this, EVREye eEye, Texture_t * pTexture, VRTextureBounds_t * pBounds, EVRSubmitFlags nSubmitFlags) { TRACE("%p\n", _this); - return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_018_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags); + return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_018_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_018_ClearLastSubmittedFrame, 4) @@ -1524,7 +1529,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_018_PostPresentHandoff, 4 void __thiscall winIVRCompositor_IVRCompositor_018_PostPresentHandoff(winIVRCompositor_IVRCompositor_018 *_this) { TRACE("%p\n", _this); - cppIVRCompositor_IVRCompositor_018_PostPresentHandoff(_this->linux_side); + ivrcompositor_post_present_handoff(cppIVRCompositor_IVRCompositor_018_PostPresentHandoff, _this->linux_side, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_018_GetFrameTiming, 16) @@ -1789,7 +1794,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_018 *create_winIVRCompositor_IVRCompositor_018(void *linux_side) { - winIVRCompositor_IVRCompositor_018 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_018)); + winIVRCompositor_IVRCompositor_018 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_018)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_018_vtable; r->linux_side = linux_side; @@ -1801,6 +1806,7 @@ winIVRCompositor_IVRCompositor_018 *create_winIVRCompositor_IVRCompositor_018(vo typedef struct __winIVRCompositor_IVRCompositor_016 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_016; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_016_SetTrackingSpace, 8) @@ -1842,7 +1848,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_016_Submit, 28) EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_016_Submit(winIVRCompositor_IVRCompositor_016 *_this, EVREye eEye, Texture_t * pTexture, VRTextureBounds_t * pBounds, EVRSubmitFlags nSubmitFlags) { TRACE("%p\n", _this); - return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_016_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags); + return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_016_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_016_ClearLastSubmittedFrame, 4) @@ -1856,7 +1862,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_016_PostPresentHandoff, 4 void __thiscall winIVRCompositor_IVRCompositor_016_PostPresentHandoff(winIVRCompositor_IVRCompositor_016 *_this) { TRACE("%p\n", _this); - cppIVRCompositor_IVRCompositor_016_PostPresentHandoff(_this->linux_side); + ivrcompositor_post_present_handoff(cppIVRCompositor_IVRCompositor_016_PostPresentHandoff, _this->linux_side, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_016_GetFrameTiming, 16) @@ -2096,7 +2102,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_016 *create_winIVRCompositor_IVRCompositor_016(void *linux_side) { - winIVRCompositor_IVRCompositor_016 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_016)); + winIVRCompositor_IVRCompositor_016 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_016)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_016_vtable; r->linux_side = linux_side; @@ -2108,6 +2114,7 @@ winIVRCompositor_IVRCompositor_016 *create_winIVRCompositor_IVRCompositor_016(vo typedef struct __winIVRCompositor_IVRCompositor_015 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_015; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_015_SetTrackingSpace, 8) @@ -2149,7 +2156,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_015_Submit, 28) EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_015_Submit(winIVRCompositor_IVRCompositor_015 *_this, EVREye eEye, Texture_t * pTexture, VRTextureBounds_t * pBounds, EVRSubmitFlags nSubmitFlags) { TRACE("%p\n", _this); - return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_015_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags); + return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_015_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_015_ClearLastSubmittedFrame, 4) @@ -2163,7 +2170,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_015_PostPresentHandoff, 4 void __thiscall winIVRCompositor_IVRCompositor_015_PostPresentHandoff(winIVRCompositor_IVRCompositor_015 *_this) { TRACE("%p\n", _this); - cppIVRCompositor_IVRCompositor_015_PostPresentHandoff(_this->linux_side); + ivrcompositor_post_present_handoff(cppIVRCompositor_IVRCompositor_015_PostPresentHandoff, _this->linux_side, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_015_GetFrameTiming, 16) @@ -2419,7 +2426,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_015 *create_winIVRCompositor_IVRCompositor_015(void *linux_side) { - winIVRCompositor_IVRCompositor_015 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_015)); + winIVRCompositor_IVRCompositor_015 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_015)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_015_vtable; r->linux_side = linux_side; @@ -2431,6 +2438,7 @@ winIVRCompositor_IVRCompositor_015 *create_winIVRCompositor_IVRCompositor_015(vo typedef struct __winIVRCompositor_IVRCompositor_014 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_014; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_014_SetTrackingSpace, 8) @@ -2472,7 +2480,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_014_Submit, 28) EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_014_Submit(winIVRCompositor_IVRCompositor_014 *_this, EVREye eEye, Texture_t * pTexture, VRTextureBounds_t * pBounds, EVRSubmitFlags nSubmitFlags) { TRACE("%p\n", _this); - return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_014_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags); + return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_014_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_014_ClearLastSubmittedFrame, 4) @@ -2486,7 +2494,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_014_PostPresentHandoff, 4 void __thiscall winIVRCompositor_IVRCompositor_014_PostPresentHandoff(winIVRCompositor_IVRCompositor_014 *_this) { TRACE("%p\n", _this); - cppIVRCompositor_IVRCompositor_014_PostPresentHandoff(_this->linux_side); + ivrcompositor_post_present_handoff(cppIVRCompositor_IVRCompositor_014_PostPresentHandoff, _this->linux_side, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_014_GetFrameTiming, 16) @@ -2678,7 +2686,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_014 *create_winIVRCompositor_IVRCompositor_014(void *linux_side) { - winIVRCompositor_IVRCompositor_014 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_014)); + winIVRCompositor_IVRCompositor_014 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_014)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_014_vtable; r->linux_side = linux_side; @@ -2690,6 +2698,7 @@ winIVRCompositor_IVRCompositor_014 *create_winIVRCompositor_IVRCompositor_014(vo typedef struct __winIVRCompositor_IVRCompositor_013 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_013; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_013_SetTrackingSpace, 8) @@ -2731,7 +2740,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_013_Submit, 28) EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_013_Submit(winIVRCompositor_IVRCompositor_013 *_this, EVREye eEye, Texture_t * pTexture, VRTextureBounds_t * pBounds, EVRSubmitFlags nSubmitFlags) { TRACE("%p\n", _this); - return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_013_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags); + return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_013_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_013_ClearLastSubmittedFrame, 4) @@ -2745,7 +2754,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_013_PostPresentHandoff, 4 void __thiscall winIVRCompositor_IVRCompositor_013_PostPresentHandoff(winIVRCompositor_IVRCompositor_013 *_this) { TRACE("%p\n", _this); - cppIVRCompositor_IVRCompositor_013_PostPresentHandoff(_this->linux_side); + ivrcompositor_post_present_handoff(cppIVRCompositor_IVRCompositor_013_PostPresentHandoff, _this->linux_side, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_013_GetFrameTiming, 16) @@ -2921,7 +2930,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_013 *create_winIVRCompositor_IVRCompositor_013(void *linux_side) { - winIVRCompositor_IVRCompositor_013 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_013)); + winIVRCompositor_IVRCompositor_013 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_013)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_013_vtable; r->linux_side = linux_side; @@ -2933,6 +2942,7 @@ winIVRCompositor_IVRCompositor_013 *create_winIVRCompositor_IVRCompositor_013(vo typedef struct __winIVRCompositor_IVRCompositor_012 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_012; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_012_SetTrackingSpace, 8) @@ -2974,7 +2984,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_012_Submit, 28) EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_012_Submit(winIVRCompositor_IVRCompositor_012 *_this, EVREye eEye, Texture_t * pTexture, VRTextureBounds_t * pBounds, EVRSubmitFlags nSubmitFlags) { TRACE("%p\n", _this); - return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_012_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags); + return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_012_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_012_ClearLastSubmittedFrame, 4) @@ -2988,7 +2998,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_012_PostPresentHandoff, 4 void __thiscall winIVRCompositor_IVRCompositor_012_PostPresentHandoff(winIVRCompositor_IVRCompositor_012 *_this) { TRACE("%p\n", _this); - cppIVRCompositor_IVRCompositor_012_PostPresentHandoff(_this->linux_side); + ivrcompositor_post_present_handoff(cppIVRCompositor_IVRCompositor_012_PostPresentHandoff, _this->linux_side, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_012_GetFrameTiming, 16) @@ -3156,7 +3166,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_012 *create_winIVRCompositor_IVRCompositor_012(void *linux_side) { - winIVRCompositor_IVRCompositor_012 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_012)); + winIVRCompositor_IVRCompositor_012 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_012)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_012_vtable; r->linux_side = linux_side; @@ -3168,6 +3178,7 @@ winIVRCompositor_IVRCompositor_012 *create_winIVRCompositor_IVRCompositor_012(vo typedef struct __winIVRCompositor_IVRCompositor_011 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_011; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_011_SetTrackingSpace, 8) @@ -3202,7 +3213,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_011_Submit, 28) EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_011_Submit(winIVRCompositor_IVRCompositor_011 *_this, EVREye eEye, Texture_t * pTexture, VRTextureBounds_t * pBounds, EVRSubmitFlags nSubmitFlags) { TRACE("%p\n", _this); - return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_011_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags); + return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_011_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_011_ClearLastSubmittedFrame, 4) @@ -3216,7 +3227,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_011_PostPresentHandoff, 4 void __thiscall winIVRCompositor_IVRCompositor_011_PostPresentHandoff(winIVRCompositor_IVRCompositor_011 *_this) { TRACE("%p\n", _this); - cppIVRCompositor_IVRCompositor_011_PostPresentHandoff(_this->linux_side); + ivrcompositor_post_present_handoff(cppIVRCompositor_IVRCompositor_011_PostPresentHandoff, _this->linux_side, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_011_GetFrameTiming, 16) @@ -3375,7 +3386,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_011 *create_winIVRCompositor_IVRCompositor_011(void *linux_side) { - winIVRCompositor_IVRCompositor_011 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_011)); + winIVRCompositor_IVRCompositor_011 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_011)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_011_vtable; r->linux_side = linux_side; @@ -3387,6 +3398,7 @@ winIVRCompositor_IVRCompositor_011 *create_winIVRCompositor_IVRCompositor_011(vo typedef struct __winIVRCompositor_IVRCompositor_010 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_010; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_010_SetTrackingSpace, 8) @@ -3421,7 +3433,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_010_Submit, 28) EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_010_Submit(winIVRCompositor_IVRCompositor_010 *_this, EVREye eEye, Texture_t * pTexture, VRTextureBounds_t * pBounds, EVRSubmitFlags nSubmitFlags) { TRACE("%p\n", _this); - return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_010_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags); + return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_010_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_010_ClearLastSubmittedFrame, 4) @@ -3435,7 +3447,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_010_PostPresentHandoff, 4 void __thiscall winIVRCompositor_IVRCompositor_010_PostPresentHandoff(winIVRCompositor_IVRCompositor_010 *_this) { TRACE("%p\n", _this); - cppIVRCompositor_IVRCompositor_010_PostPresentHandoff(_this->linux_side); + ivrcompositor_post_present_handoff(cppIVRCompositor_IVRCompositor_010_PostPresentHandoff, _this->linux_side, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_010_GetFrameTiming, 16) @@ -3594,7 +3606,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_010 *create_winIVRCompositor_IVRCompositor_010(void *linux_side) { - winIVRCompositor_IVRCompositor_010 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_010)); + winIVRCompositor_IVRCompositor_010 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_010)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_010_vtable; r->linux_side = linux_side; @@ -3606,6 +3618,7 @@ winIVRCompositor_IVRCompositor_010 *create_winIVRCompositor_IVRCompositor_010(vo typedef struct __winIVRCompositor_IVRCompositor_009 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_009; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_009_SetTrackingSpace, 8) @@ -3640,7 +3653,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_009_Submit, 28) EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_009_Submit(winIVRCompositor_IVRCompositor_009 *_this, EVREye eEye, Texture_t * pTexture, VRTextureBounds_t * pBounds, EVRSubmitFlags nSubmitFlags) { TRACE("%p\n", _this); - return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_009_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags); + return ivrcompositor_submit(cppIVRCompositor_IVRCompositor_009_Submit, _this->linux_side, eEye, pTexture, pBounds, nSubmitFlags, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_009_ClearLastSubmittedFrame, 4) @@ -3654,7 +3667,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_009_PostPresentHandoff, 4 void __thiscall winIVRCompositor_IVRCompositor_009_PostPresentHandoff(winIVRCompositor_IVRCompositor_009 *_this) { TRACE("%p\n", _this); - cppIVRCompositor_IVRCompositor_009_PostPresentHandoff(_this->linux_side); + ivrcompositor_post_present_handoff(cppIVRCompositor_IVRCompositor_009_PostPresentHandoff, _this->linux_side, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_009_GetFrameTiming, 16) @@ -3813,7 +3826,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_009 *create_winIVRCompositor_IVRCompositor_009(void *linux_side) { - winIVRCompositor_IVRCompositor_009 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_009)); + winIVRCompositor_IVRCompositor_009 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_009)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_009_vtable; r->linux_side = linux_side; @@ -3825,6 +3838,7 @@ winIVRCompositor_IVRCompositor_009 *create_winIVRCompositor_IVRCompositor_009(vo typedef struct __winIVRCompositor_IVRCompositor_008 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_008; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_008_GetLastError, 16) @@ -3873,7 +3887,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_008_Submit, 32) VRCompositorError __thiscall winIVRCompositor_IVRCompositor_008_Submit(winIVRCompositor_IVRCompositor_008 *_this, Hmd_Eye eEye, GraphicsAPIConvention eTextureType, void * pTexture, VRTextureBounds_t * pBounds, VRSubmitFlags_t nSubmitFlags) { TRACE("%p\n", _this); - return ivrcompositor_008_submit(cppIVRCompositor_IVRCompositor_008_Submit, _this->linux_side, eEye, eTextureType, pTexture, pBounds, nSubmitFlags); + return ivrcompositor_008_submit(cppIVRCompositor_IVRCompositor_008_Submit, _this->linux_side, eEye, eTextureType, pTexture, pBounds, nSubmitFlags, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_008_ClearLastSubmittedFrame, 4) @@ -4048,7 +4062,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_008 *create_winIVRCompositor_IVRCompositor_008(void *linux_side) { - winIVRCompositor_IVRCompositor_008 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_008)); + winIVRCompositor_IVRCompositor_008 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_008)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_008_vtable; r->linux_side = linux_side; @@ -4060,6 +4074,7 @@ winIVRCompositor_IVRCompositor_008 *create_winIVRCompositor_IVRCompositor_008(vo typedef struct __winIVRCompositor_IVRCompositor_007 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_007; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_007_GetLastError, 16) @@ -4108,7 +4123,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_007_Submit, 28) VRCompositorError __thiscall winIVRCompositor_IVRCompositor_007_Submit(winIVRCompositor_IVRCompositor_007 *_this, Hmd_Eye eEye, GraphicsAPIConvention eTextureType, void * pTexture, VRTextureBounds_t * pBounds) { TRACE("%p\n", _this); - return ivrcompositor_007_submit(cppIVRCompositor_IVRCompositor_007_Submit, _this->linux_side, eEye, eTextureType, pTexture, pBounds); + return ivrcompositor_007_submit(cppIVRCompositor_IVRCompositor_007_Submit, _this->linux_side, eEye, eTextureType, pTexture, pBounds, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_007_ClearLastSubmittedFrame, 4) @@ -4227,7 +4242,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_007 *create_winIVRCompositor_IVRCompositor_007(void *linux_side) { - winIVRCompositor_IVRCompositor_007 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_007)); + winIVRCompositor_IVRCompositor_007 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_007)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_007_vtable; r->linux_side = linux_side; @@ -4239,6 +4254,7 @@ winIVRCompositor_IVRCompositor_007 *create_winIVRCompositor_IVRCompositor_007(vo typedef struct __winIVRCompositor_IVRCompositor_006 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_006; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_006_GetLastError, 16) @@ -4294,7 +4310,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_006_Submit, 24) VRCompositorError __thiscall winIVRCompositor_IVRCompositor_006_Submit(winIVRCompositor_IVRCompositor_006 *_this, Hmd_Eye eEye, void * pTexture, VRTextureBounds_t * pBounds) { TRACE("%p\n", _this); - return ivrcompositor_006_submit(cppIVRCompositor_IVRCompositor_006_Submit, _this->linux_side, eEye, pTexture, pBounds); + return ivrcompositor_006_submit(cppIVRCompositor_IVRCompositor_006_Submit, _this->linux_side, eEye, pTexture, pBounds, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_006_ClearLastSubmittedFrame, 4) @@ -4414,7 +4430,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_006 *create_winIVRCompositor_IVRCompositor_006(void *linux_side) { - winIVRCompositor_IVRCompositor_006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_006)); + winIVRCompositor_IVRCompositor_006 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_006)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_006_vtable; r->linux_side = linux_side; @@ -4426,6 +4442,7 @@ winIVRCompositor_IVRCompositor_006 *create_winIVRCompositor_IVRCompositor_006(vo typedef struct __winIVRCompositor_IVRCompositor_005 { vtable_ptr *vtable; void *linux_side; + struct compositor_data user_data; } winIVRCompositor_IVRCompositor_005; DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_005_GetLastError, 16) @@ -4481,7 +4498,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_005_Submit, 24) void __thiscall winIVRCompositor_IVRCompositor_005_Submit(winIVRCompositor_IVRCompositor_005 *_this, Hmd_Eye eEye, void * pTexture, Compositor_TextureBounds * pBounds) { TRACE("%p\n", _this); - ivrcompositor_005_submit(cppIVRCompositor_IVRCompositor_005_Submit, _this->linux_side, eEye, pTexture, pBounds); + ivrcompositor_005_submit(cppIVRCompositor_IVRCompositor_005_Submit, _this->linux_side, eEye, pTexture, pBounds, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_005_ClearLastSubmittedFrame, 4) @@ -4633,7 +4650,7 @@ void __asm_dummy_vtables(void) { winIVRCompositor_IVRCompositor_005 *create_winIVRCompositor_IVRCompositor_005(void *linux_side) { - winIVRCompositor_IVRCompositor_005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRCompositor_IVRCompositor_005)); + winIVRCompositor_IVRCompositor_005 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRCompositor_IVRCompositor_005)); TRACE("-> %p\n", r); r->vtable = &winIVRCompositor_IVRCompositor_005_vtable; r->linux_side = linux_side; diff --git a/vrclient_x64/winIVRDriverManager.c b/vrclient_x64/winIVRDriverManager.c index 91ca16b9..5712f428 100644 --- a/vrclient_x64/winIVRDriverManager.c +++ b/vrclient_x64/winIVRDriverManager.c @@ -52,7 +52,7 @@ void __asm_dummy_vtables(void) { winIVRDriverManager_IVRDriverManager_001 *create_winIVRDriverManager_IVRDriverManager_001(void *linux_side) { - winIVRDriverManager_IVRDriverManager_001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRDriverManager_IVRDriverManager_001)); + winIVRDriverManager_IVRDriverManager_001 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRDriverManager_IVRDriverManager_001)); TRACE("-> %p\n", r); r->vtable = &winIVRDriverManager_IVRDriverManager_001_vtable; r->linux_side = linux_side; diff --git a/vrclient_x64/winIVRExtendedDisplay.c b/vrclient_x64/winIVRExtendedDisplay.c index c3b25f7d..6f31141a 100644 --- a/vrclient_x64/winIVRExtendedDisplay.c +++ b/vrclient_x64/winIVRExtendedDisplay.c @@ -60,7 +60,7 @@ void __asm_dummy_vtables(void) { winIVRExtendedDisplay_IVRExtendedDisplay_001 *create_winIVRExtendedDisplay_IVRExtendedDisplay_001(void *linux_side) { - winIVRExtendedDisplay_IVRExtendedDisplay_001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRExtendedDisplay_IVRExtendedDisplay_001)); + winIVRExtendedDisplay_IVRExtendedDisplay_001 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRExtendedDisplay_IVRExtendedDisplay_001)); TRACE("-> %p\n", r); r->vtable = &winIVRExtendedDisplay_IVRExtendedDisplay_001_vtable; r->linux_side = linux_side; diff --git a/vrclient_x64/winIVRNotifications.c b/vrclient_x64/winIVRNotifications.c index d3574445..5c92435b 100644 --- a/vrclient_x64/winIVRNotifications.c +++ b/vrclient_x64/winIVRNotifications.c @@ -52,7 +52,7 @@ void __asm_dummy_vtables(void) { winIVRNotifications_IVRNotifications_002 *create_winIVRNotifications_IVRNotifications_002(void *linux_side) { - winIVRNotifications_IVRNotifications_002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRNotifications_IVRNotifications_002)); + winIVRNotifications_IVRNotifications_002 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRNotifications_IVRNotifications_002)); TRACE("-> %p\n", r); r->vtable = &winIVRNotifications_IVRNotifications_002_vtable; r->linux_side = linux_side; @@ -103,7 +103,7 @@ void __asm_dummy_vtables(void) { winIVRNotifications_IVRNotifications_001 *create_winIVRNotifications_IVRNotifications_001(void *linux_side) { - winIVRNotifications_IVRNotifications_001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRNotifications_IVRNotifications_001)); + winIVRNotifications_IVRNotifications_001 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRNotifications_IVRNotifications_001)); TRACE("-> %p\n", r); r->vtable = &winIVRNotifications_IVRNotifications_001_vtable; r->linux_side = linux_side; diff --git a/vrclient_x64/winIVROverlay.c b/vrclient_x64/winIVROverlay.c index 4e9db84a..7958a226 100644 --- a/vrclient_x64/winIVROverlay.c +++ b/vrclient_x64/winIVROverlay.c @@ -692,7 +692,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_018 *create_winIVROverlay_IVROverlay_018(void *linux_side) { - winIVROverlay_IVROverlay_018 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_018)); + winIVROverlay_IVROverlay_018 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_018)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_018_vtable; r->linux_side = linux_side; @@ -1383,7 +1383,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_017 *create_winIVROverlay_IVROverlay_017(void *linux_side) { - winIVROverlay_IVROverlay_017 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_017)); + winIVROverlay_IVROverlay_017 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_017)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_017_vtable; r->linux_side = linux_side; @@ -2058,7 +2058,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_016 *create_winIVROverlay_IVROverlay_016(void *linux_side) { - winIVROverlay_IVROverlay_016 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_016)); + winIVROverlay_IVROverlay_016 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_016)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_016_vtable; r->linux_side = linux_side; @@ -2685,7 +2685,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_014 *create_winIVROverlay_IVROverlay_014(void *linux_side) { - winIVROverlay_IVROverlay_014 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_014)); + winIVROverlay_IVROverlay_014 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_014)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_014_vtable; r->linux_side = linux_side; @@ -3296,7 +3296,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_013 *create_winIVROverlay_IVROverlay_013(void *linux_side) { - winIVROverlay_IVROverlay_013 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_013)); + winIVROverlay_IVROverlay_013 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_013)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_013_vtable; r->linux_side = linux_side; @@ -3867,7 +3867,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_012 *create_winIVROverlay_IVROverlay_012(void *linux_side) { - winIVROverlay_IVROverlay_012 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_012)); + winIVROverlay_IVROverlay_012 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_012)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_012_vtable; r->linux_side = linux_side; @@ -4430,7 +4430,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_011 *create_winIVROverlay_IVROverlay_011(void *linux_side) { - winIVROverlay_IVROverlay_011 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_011)); + winIVROverlay_IVROverlay_011 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_011)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_011_vtable; r->linux_side = linux_side; @@ -4961,7 +4961,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_010 *create_winIVROverlay_IVROverlay_010(void *linux_side) { - winIVROverlay_IVROverlay_010 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_010)); + winIVROverlay_IVROverlay_010 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_010)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_010_vtable; r->linux_side = linux_side; @@ -5468,7 +5468,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_008 *create_winIVROverlay_IVROverlay_008(void *linux_side) { - winIVROverlay_IVROverlay_008 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_008)); + winIVROverlay_IVROverlay_008 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_008)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_008_vtable; r->linux_side = linux_side; @@ -5951,7 +5951,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_007 *create_winIVROverlay_IVROverlay_007(void *linux_side) { - winIVROverlay_IVROverlay_007 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_007)); + winIVROverlay_IVROverlay_007 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_007)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_007_vtable; r->linux_side = linux_side; @@ -6394,7 +6394,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_005 *create_winIVROverlay_IVROverlay_005(void *linux_side) { - winIVROverlay_IVROverlay_005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_005)); + winIVROverlay_IVROverlay_005 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_005)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_005_vtable; r->linux_side = linux_side; @@ -6805,7 +6805,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_004 *create_winIVROverlay_IVROverlay_004(void *linux_side) { - winIVROverlay_IVROverlay_004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_004)); + winIVROverlay_IVROverlay_004 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_004)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_004_vtable; r->linux_side = linux_side; @@ -7200,7 +7200,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_003 *create_winIVROverlay_IVROverlay_003(void *linux_side) { - winIVROverlay_IVROverlay_003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_003)); + winIVROverlay_IVROverlay_003 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_003)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_003_vtable; r->linux_side = linux_side; @@ -7563,7 +7563,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_002 *create_winIVROverlay_IVROverlay_002(void *linux_side) { - winIVROverlay_IVROverlay_002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_002)); + winIVROverlay_IVROverlay_002 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_002)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_002_vtable; r->linux_side = linux_side; @@ -7910,7 +7910,7 @@ void __asm_dummy_vtables(void) { winIVROverlay_IVROverlay_001 *create_winIVROverlay_IVROverlay_001(void *linux_side) { - winIVROverlay_IVROverlay_001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVROverlay_IVROverlay_001)); + winIVROverlay_IVROverlay_001 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVROverlay_IVROverlay_001)); TRACE("-> %p\n", r); r->vtable = &winIVROverlay_IVROverlay_001_vtable; r->linux_side = linux_side; diff --git a/vrclient_x64/winIVRRenderModels.c b/vrclient_x64/winIVRRenderModels.c index c4607152..d2398aa5 100644 --- a/vrclient_x64/winIVRRenderModels.c +++ b/vrclient_x64/winIVRRenderModels.c @@ -180,7 +180,7 @@ void __asm_dummy_vtables(void) { winIVRRenderModels_IVRRenderModels_005 *create_winIVRRenderModels_IVRRenderModels_005(void *linux_side) { - winIVRRenderModels_IVRRenderModels_005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRRenderModels_IVRRenderModels_005)); + winIVRRenderModels_IVRRenderModels_005 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRRenderModels_IVRRenderModels_005)); TRACE("-> %p\n", r); r->vtable = &winIVRRenderModels_IVRRenderModels_005_vtable; r->linux_side = linux_side; @@ -319,7 +319,7 @@ void __asm_dummy_vtables(void) { winIVRRenderModels_IVRRenderModels_004 *create_winIVRRenderModels_IVRRenderModels_004(void *linux_side) { - winIVRRenderModels_IVRRenderModels_004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRRenderModels_IVRRenderModels_004)); + winIVRRenderModels_IVRRenderModels_004 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRRenderModels_IVRRenderModels_004)); TRACE("-> %p\n", r); r->vtable = &winIVRRenderModels_IVRRenderModels_004_vtable; r->linux_side = linux_side; @@ -442,7 +442,7 @@ void __asm_dummy_vtables(void) { winIVRRenderModels_IVRRenderModels_002 *create_winIVRRenderModels_IVRRenderModels_002(void *linux_side) { - winIVRRenderModels_IVRRenderModels_002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRRenderModels_IVRRenderModels_002)); + winIVRRenderModels_IVRRenderModels_002 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRRenderModels_IVRRenderModels_002)); TRACE("-> %p\n", r); r->vtable = &winIVRRenderModels_IVRRenderModels_002_vtable; r->linux_side = linux_side; @@ -501,7 +501,7 @@ void __asm_dummy_vtables(void) { winIVRRenderModels_IVRRenderModels_001 *create_winIVRRenderModels_IVRRenderModels_001(void *linux_side) { - winIVRRenderModels_IVRRenderModels_001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRRenderModels_IVRRenderModels_001)); + winIVRRenderModels_IVRRenderModels_001 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRRenderModels_IVRRenderModels_001)); TRACE("-> %p\n", r); r->vtable = &winIVRRenderModels_IVRRenderModels_001_vtable; r->linux_side = linux_side; diff --git a/vrclient_x64/winIVRResources.c b/vrclient_x64/winIVRResources.c index 1839ecff..dd3a3ebf 100644 --- a/vrclient_x64/winIVRResources.c +++ b/vrclient_x64/winIVRResources.c @@ -52,7 +52,7 @@ void __asm_dummy_vtables(void) { winIVRResources_IVRResources_001 *create_winIVRResources_IVRResources_001(void *linux_side) { - winIVRResources_IVRResources_001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRResources_IVRResources_001)); + winIVRResources_IVRResources_001 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRResources_IVRResources_001)); TRACE("-> %p\n", r); r->vtable = &winIVRResources_IVRResources_001_vtable; r->linux_side = linux_side; diff --git a/vrclient_x64/winIVRScreenshots.c b/vrclient_x64/winIVRScreenshots.c index 5206cd35..55ba7a2e 100644 --- a/vrclient_x64/winIVRScreenshots.c +++ b/vrclient_x64/winIVRScreenshots.c @@ -92,7 +92,7 @@ void __asm_dummy_vtables(void) { winIVRScreenshots_IVRScreenshots_001 *create_winIVRScreenshots_IVRScreenshots_001(void *linux_side) { - winIVRScreenshots_IVRScreenshots_001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRScreenshots_IVRScreenshots_001)); + winIVRScreenshots_IVRScreenshots_001 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRScreenshots_IVRScreenshots_001)); TRACE("-> %p\n", r); r->vtable = &winIVRScreenshots_IVRScreenshots_001_vtable; r->linux_side = linux_side; diff --git a/vrclient_x64/winIVRSettings.c b/vrclient_x64/winIVRSettings.c index a44d5ba3..2aae9587 100644 --- a/vrclient_x64/winIVRSettings.c +++ b/vrclient_x64/winIVRSettings.c @@ -132,7 +132,7 @@ void __asm_dummy_vtables(void) { winIVRSettings_IVRSettings_002 *create_winIVRSettings_IVRSettings_002(void *linux_side) { - winIVRSettings_IVRSettings_002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSettings_IVRSettings_002)); + winIVRSettings_IVRSettings_002 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSettings_IVRSettings_002)); TRACE("-> %p\n", r); r->vtable = &winIVRSettings_IVRSettings_002_vtable; r->linux_side = linux_side; @@ -255,7 +255,7 @@ void __asm_dummy_vtables(void) { winIVRSettings_IVRSettings_001 *create_winIVRSettings_IVRSettings_001(void *linux_side) { - winIVRSettings_IVRSettings_001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSettings_IVRSettings_001)); + winIVRSettings_IVRSettings_001 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSettings_IVRSettings_001)); TRACE("-> %p\n", r); r->vtable = &winIVRSettings_IVRSettings_001_vtable; r->linux_side = linux_side; diff --git a/vrclient_x64/winIVRSystem.c b/vrclient_x64/winIVRSystem.c index 97c22cd7..f2e484e9 100644 --- a/vrclient_x64/winIVRSystem.c +++ b/vrclient_x64/winIVRSystem.c @@ -418,7 +418,7 @@ void __asm_dummy_vtables(void) { winIVRSystem_IVRSystem_019 *create_winIVRSystem_IVRSystem_019(void *linux_side) { - winIVRSystem_IVRSystem_019 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSystem_IVRSystem_019)); + winIVRSystem_IVRSystem_019 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSystem_IVRSystem_019)); TRACE("-> %p\n", r); r->vtable = &winIVRSystem_IVRSystem_019_vtable; r->linux_side = linux_side; @@ -811,7 +811,7 @@ void __asm_dummy_vtables(void) { winIVRSystem_IVRSystem_017 *create_winIVRSystem_IVRSystem_017(void *linux_side) { - winIVRSystem_IVRSystem_017 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSystem_IVRSystem_017)); + winIVRSystem_IVRSystem_017 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSystem_IVRSystem_017)); TRACE("-> %p\n", r); r->vtable = &winIVRSystem_IVRSystem_017_vtable; r->linux_side = linux_side; @@ -1204,7 +1204,7 @@ void __asm_dummy_vtables(void) { winIVRSystem_IVRSystem_016 *create_winIVRSystem_IVRSystem_016(void *linux_side) { - winIVRSystem_IVRSystem_016 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSystem_IVRSystem_016)); + winIVRSystem_IVRSystem_016 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSystem_IVRSystem_016)); TRACE("-> %p\n", r); r->vtable = &winIVRSystem_IVRSystem_016_vtable; r->linux_side = linux_side; @@ -1589,7 +1589,7 @@ void __asm_dummy_vtables(void) { winIVRSystem_IVRSystem_015 *create_winIVRSystem_IVRSystem_015(void *linux_side) { - winIVRSystem_IVRSystem_015 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSystem_IVRSystem_015)); + winIVRSystem_IVRSystem_015 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSystem_IVRSystem_015)); TRACE("-> %p\n", r); r->vtable = &winIVRSystem_IVRSystem_015_vtable; r->linux_side = linux_side; @@ -1974,7 +1974,7 @@ void __asm_dummy_vtables(void) { winIVRSystem_IVRSystem_014 *create_winIVRSystem_IVRSystem_014(void *linux_side) { - winIVRSystem_IVRSystem_014 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSystem_IVRSystem_014)); + winIVRSystem_IVRSystem_014 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSystem_IVRSystem_014)); TRACE("-> %p\n", r); r->vtable = &winIVRSystem_IVRSystem_014_vtable; r->linux_side = linux_side; @@ -2360,7 +2360,7 @@ void __asm_dummy_vtables(void) { winIVRSystem_IVRSystem_012 *create_winIVRSystem_IVRSystem_012(void *linux_side) { - winIVRSystem_IVRSystem_012 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSystem_IVRSystem_012)); + winIVRSystem_IVRSystem_012 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSystem_IVRSystem_012)); TRACE("-> %p\n", r); r->vtable = &winIVRSystem_IVRSystem_012_vtable; r->linux_side = linux_side; @@ -2762,7 +2762,7 @@ void __asm_dummy_vtables(void) { winIVRSystem_IVRSystem_011 *create_winIVRSystem_IVRSystem_011(void *linux_side) { - winIVRSystem_IVRSystem_011 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSystem_IVRSystem_011)); + winIVRSystem_IVRSystem_011 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSystem_IVRSystem_011)); TRACE("-> %p\n", r); r->vtable = &winIVRSystem_IVRSystem_011_vtable; r->linux_side = linux_side; @@ -3164,7 +3164,7 @@ void __asm_dummy_vtables(void) { winIVRSystem_IVRSystem_010 *create_winIVRSystem_IVRSystem_010(void *linux_side) { - winIVRSystem_IVRSystem_010 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSystem_IVRSystem_010)); + winIVRSystem_IVRSystem_010 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSystem_IVRSystem_010)); TRACE("-> %p\n", r); r->vtable = &winIVRSystem_IVRSystem_010_vtable; r->linux_side = linux_side; @@ -3534,7 +3534,7 @@ void __asm_dummy_vtables(void) { winIVRSystem_IVRSystem_009 *create_winIVRSystem_IVRSystem_009(void *linux_side) { - winIVRSystem_IVRSystem_009 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSystem_IVRSystem_009)); + winIVRSystem_IVRSystem_009 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSystem_IVRSystem_009)); TRACE("-> %p\n", r); r->vtable = &winIVRSystem_IVRSystem_009_vtable; r->linux_side = linux_side; @@ -3904,7 +3904,7 @@ void __asm_dummy_vtables(void) { winIVRSystem_IVRSystem_006 *create_winIVRSystem_IVRSystem_006(void *linux_side) { - winIVRSystem_IVRSystem_006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSystem_IVRSystem_006)); + winIVRSystem_IVRSystem_006 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSystem_IVRSystem_006)); TRACE("-> %p\n", r); r->vtable = &winIVRSystem_IVRSystem_006_vtable; r->linux_side = linux_side; @@ -4233,7 +4233,7 @@ void __asm_dummy_vtables(void) { winIVRSystem_IVRSystem_005 *create_winIVRSystem_IVRSystem_005(void *linux_side) { - winIVRSystem_IVRSystem_005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSystem_IVRSystem_005)); + winIVRSystem_IVRSystem_005 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSystem_IVRSystem_005)); TRACE("-> %p\n", r); r->vtable = &winIVRSystem_IVRSystem_005_vtable; r->linux_side = linux_side; @@ -4554,7 +4554,7 @@ void __asm_dummy_vtables(void) { winIVRSystem_IVRSystem_004 *create_winIVRSystem_IVRSystem_004(void *linux_side) { - winIVRSystem_IVRSystem_004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSystem_IVRSystem_004)); + winIVRSystem_IVRSystem_004 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSystem_IVRSystem_004)); TRACE("-> %p\n", r); r->vtable = &winIVRSystem_IVRSystem_004_vtable; r->linux_side = linux_side; @@ -4891,7 +4891,7 @@ void __asm_dummy_vtables(void) { winIVRSystem_IVRSystem_003 *create_winIVRSystem_IVRSystem_003(void *linux_side) { - winIVRSystem_IVRSystem_003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRSystem_IVRSystem_003)); + winIVRSystem_IVRSystem_003 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRSystem_IVRSystem_003)); TRACE("-> %p\n", r); r->vtable = &winIVRSystem_IVRSystem_003_vtable; r->linux_side = linux_side; diff --git a/vrclient_x64/winIVRTrackedCamera.c b/vrclient_x64/winIVRTrackedCamera.c index 8d210ac0..d2a6f429 100644 --- a/vrclient_x64/winIVRTrackedCamera.c +++ b/vrclient_x64/winIVRTrackedCamera.c @@ -132,7 +132,7 @@ void __asm_dummy_vtables(void) { winIVRTrackedCamera_IVRTrackedCamera_003 *create_winIVRTrackedCamera_IVRTrackedCamera_003(void *linux_side) { - winIVRTrackedCamera_IVRTrackedCamera_003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRTrackedCamera_IVRTrackedCamera_003)); + winIVRTrackedCamera_IVRTrackedCamera_003 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRTrackedCamera_IVRTrackedCamera_003)); TRACE("-> %p\n", r); r->vtable = &winIVRTrackedCamera_IVRTrackedCamera_003_vtable; r->linux_side = linux_side; @@ -223,7 +223,7 @@ void __asm_dummy_vtables(void) { winIVRTrackedCamera_IVRTrackedCamera_002 *create_winIVRTrackedCamera_IVRTrackedCamera_002(void *linux_side) { - winIVRTrackedCamera_IVRTrackedCamera_002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRTrackedCamera_IVRTrackedCamera_002)); + winIVRTrackedCamera_IVRTrackedCamera_002 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRTrackedCamera_IVRTrackedCamera_002)); TRACE("-> %p\n", r); r->vtable = &winIVRTrackedCamera_IVRTrackedCamera_002_vtable; r->linux_side = linux_side; @@ -394,7 +394,7 @@ void __asm_dummy_vtables(void) { winIVRTrackedCamera_IVRTrackedCamera_001 *create_winIVRTrackedCamera_IVRTrackedCamera_001(void *linux_side) { - winIVRTrackedCamera_IVRTrackedCamera_001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winIVRTrackedCamera_IVRTrackedCamera_001)); + winIVRTrackedCamera_IVRTrackedCamera_001 *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(winIVRTrackedCamera_IVRTrackedCamera_001)); TRACE("-> %p\n", r); r->vtable = &winIVRTrackedCamera_IVRTrackedCamera_001_vtable; r->linux_side = linux_side;