From 15f874803d9d1181d7ae9981571acb0bae7a99e4 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Tue, 25 Jun 2024 14:11:09 +0200 Subject: [PATCH] d3drm: store LPVOID data instead of DWORD --- 3rdparty/d3drm/CMakeLists.txt | 2 +- 3rdparty/d3drm/d3drm_private.h | 2 +- 3rdparty/d3drm/d3drmwin.h | 4 +- 3rdparty/d3drm/device.c | 16 +-- 3rdparty/d3drm/face.c | 8 +- 3rdparty/d3drm/frame.c | 20 +-- 3rdparty/d3drm/include/d3drmobj.h | 132 +++++++++--------- 3rdparty/d3drm/include/d3drmwin.h | 4 +- 3rdparty/d3drm/light.c | 4 +- 3rdparty/d3drm/material.c | 4 +- 3rdparty/d3drm/meshbuilder.c | 16 +-- 3rdparty/d3drm/texture.c | 12 +- 3rdparty/d3drm/viewport.c | 8 +- CMakeLists.txt | 1 + .../legoomni/src/common/legotextureinfo.cpp | 2 +- LEGO1/lego/sources/misc/legocontainer.cpp | 2 +- LEGO1/tgl/d3drm/impl.h | 6 + LEGO1/tgl/d3drm/texture.cpp | 6 +- LEGO1/tgl/d3drm/view.cpp | 2 +- LEGO1/viewmanager/viewmanager.cpp | 10 +- 20 files changed, 134 insertions(+), 127 deletions(-) diff --git a/3rdparty/d3drm/CMakeLists.txt b/3rdparty/d3drm/CMakeLists.txt index 76cf1be3..4837d0b0 100644 --- a/3rdparty/d3drm/CMakeLists.txt +++ b/3rdparty/d3drm/CMakeLists.txt @@ -20,7 +20,7 @@ add_library(d3drm-wine SHARED EXCLUDE_FROM_ALL d3drm.def ) -target_include_directories(d3drm-wine SYSTEM INTERFACE "${CMAKE_CURRENT_LIST_DIR}/include") +target_include_directories(d3drm-wine SYSTEM PUBLIC "${CMAKE_CURRENT_LIST_DIR}/include") target_link_libraries(d3drm-wine PRIVATE d3dxof ddraw) set_property(TARGET d3drm-wine PROPERTY PREFIX "") set_property(TARGET d3drm-wine PROPERTY OUTPUT_NAME "d3drm") diff --git a/3rdparty/d3drm/d3drm_private.h b/3rdparty/d3drm/d3drm_private.h index e07efa1c..6aa3ec9e 100644 --- a/3rdparty/d3drm/d3drm_private.h +++ b/3rdparty/d3drm/d3drm_private.h @@ -46,7 +46,7 @@ static inline struct d3drm_matrix *d3drm_matrix(D3DRMMATRIX4D m) struct d3drm_object { LONG ref; - DWORD appdata; + LPVOID appdata; struct list destroy_callbacks; const char *classname; char *name; diff --git a/3rdparty/d3drm/d3drmwin.h b/3rdparty/d3drm/d3drmwin.h index bd3a40d8..269420aa 100644 --- a/3rdparty/d3drm/d3drmwin.h +++ b/3rdparty/d3drm/d3drmwin.h @@ -49,8 +49,8 @@ DECLARE_INTERFACE_(IDirect3DRMWinDevice,IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; diff --git a/3rdparty/d3drm/device.c b/3rdparty/d3drm/device.c index 1a433746..5e83517b 100644 --- a/3rdparty/d3drm/device.c +++ b/3rdparty/d3drm/device.c @@ -471,7 +471,7 @@ static HRESULT WINAPI d3drm_device1_DeleteDestroyCallback(IDirect3DRMDevice *ifa return d3drm_device3_DeleteDestroyCallback(&device->IDirect3DRMDevice3_iface, cb, ctx); } -static HRESULT WINAPI d3drm_device3_SetAppData(IDirect3DRMDevice3 *iface, DWORD data) +static HRESULT WINAPI d3drm_device3_SetAppData(IDirect3DRMDevice3 *iface, LPVOID data) { struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); @@ -482,7 +482,7 @@ static HRESULT WINAPI d3drm_device3_SetAppData(IDirect3DRMDevice3 *iface, DWORD return D3DRM_OK; } -static HRESULT WINAPI d3drm_device2_SetAppData(IDirect3DRMDevice2 *iface, DWORD data) +static HRESULT WINAPI d3drm_device2_SetAppData(IDirect3DRMDevice2 *iface, LPVOID data) { struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); @@ -491,7 +491,7 @@ static HRESULT WINAPI d3drm_device2_SetAppData(IDirect3DRMDevice2 *iface, DWORD return d3drm_device3_SetAppData(&device->IDirect3DRMDevice3_iface, data); } -static HRESULT WINAPI d3drm_device1_SetAppData(IDirect3DRMDevice *iface, DWORD data) +static HRESULT WINAPI d3drm_device1_SetAppData(IDirect3DRMDevice *iface, LPVOID data) { struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); @@ -500,7 +500,7 @@ static HRESULT WINAPI d3drm_device1_SetAppData(IDirect3DRMDevice *iface, DWORD d return d3drm_device3_SetAppData(&device->IDirect3DRMDevice3_iface, data); } -static DWORD WINAPI d3drm_device3_GetAppData(IDirect3DRMDevice3 *iface) +static LPVOID WINAPI d3drm_device3_GetAppData(IDirect3DRMDevice3 *iface) { struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); @@ -509,7 +509,7 @@ static DWORD WINAPI d3drm_device3_GetAppData(IDirect3DRMDevice3 *iface) return device->obj.appdata; } -static DWORD WINAPI d3drm_device2_GetAppData(IDirect3DRMDevice2 *iface) +static LPVOID WINAPI d3drm_device2_GetAppData(IDirect3DRMDevice2 *iface) { struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); @@ -518,7 +518,7 @@ static DWORD WINAPI d3drm_device2_GetAppData(IDirect3DRMDevice2 *iface) return d3drm_device3_GetAppData(&device->IDirect3DRMDevice3_iface); } -static DWORD WINAPI d3drm_device1_GetAppData(IDirect3DRMDevice *iface) +static LPVOID WINAPI d3drm_device1_GetAppData(IDirect3DRMDevice *iface) { struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); @@ -1568,7 +1568,7 @@ static HRESULT WINAPI d3drm_device_win_DeleteDestroyCallback(IDirect3DRMWinDevic return E_NOTIMPL; } -static HRESULT WINAPI d3drm_device_win_SetAppData(IDirect3DRMWinDevice *iface, DWORD data) +static HRESULT WINAPI d3drm_device_win_SetAppData(IDirect3DRMWinDevice *iface, LPVOID data) { struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface); @@ -1577,7 +1577,7 @@ static HRESULT WINAPI d3drm_device_win_SetAppData(IDirect3DRMWinDevice *iface, D return d3drm_device3_SetAppData(&device->IDirect3DRMDevice3_iface, data); } -static DWORD WINAPI d3drm_device_win_GetAppData(IDirect3DRMWinDevice *iface) +static LPVOID WINAPI d3drm_device_win_GetAppData(IDirect3DRMWinDevice *iface) { struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface); diff --git a/3rdparty/d3drm/face.c b/3rdparty/d3drm/face.c index 34810894..ad463ae2 100644 --- a/3rdparty/d3drm/face.c +++ b/3rdparty/d3drm/face.c @@ -113,7 +113,7 @@ static HRESULT WINAPI d3drm_face1_DeleteDestroyCallback(IDirect3DRMFace *iface, return IDirect3DRMFace2_DeleteDestroyCallback(&face->IDirect3DRMFace2_iface, cb, ctx); } -static HRESULT WINAPI d3drm_face2_SetAppData(IDirect3DRMFace2 *iface, DWORD data) +static HRESULT WINAPI d3drm_face2_SetAppData(IDirect3DRMFace2 *iface, LPVOID data) { struct d3drm_face *face = impl_from_IDirect3DRMFace2(iface); @@ -124,7 +124,7 @@ static HRESULT WINAPI d3drm_face2_SetAppData(IDirect3DRMFace2 *iface, DWORD data return D3DRM_OK; } -static HRESULT WINAPI d3drm_face1_SetAppData(IDirect3DRMFace *iface, DWORD data) +static HRESULT WINAPI d3drm_face1_SetAppData(IDirect3DRMFace *iface, LPVOID data) { struct d3drm_face *face = impl_from_IDirect3DRMFace(iface); @@ -133,7 +133,7 @@ static HRESULT WINAPI d3drm_face1_SetAppData(IDirect3DRMFace *iface, DWORD data) return d3drm_face2_SetAppData(&face->IDirect3DRMFace2_iface, data); } -static DWORD WINAPI d3drm_face2_GetAppData(IDirect3DRMFace2 *iface) +static LPVOID WINAPI d3drm_face2_GetAppData(IDirect3DRMFace2 *iface) { struct d3drm_face *face = impl_from_IDirect3DRMFace2(iface); @@ -142,7 +142,7 @@ static DWORD WINAPI d3drm_face2_GetAppData(IDirect3DRMFace2 *iface) return face->obj.appdata; } -static DWORD WINAPI d3drm_face1_GetAppData(IDirect3DRMFace *iface) +static LPVOID WINAPI d3drm_face1_GetAppData(IDirect3DRMFace *iface) { struct d3drm_face *face = impl_from_IDirect3DRMFace(iface); diff --git a/3rdparty/d3drm/frame.c b/3rdparty/d3drm/frame.c index 7a5bd18c..e3122f4f 100644 --- a/3rdparty/d3drm/frame.c +++ b/3rdparty/d3drm/frame.c @@ -733,7 +733,7 @@ static HRESULT WINAPI d3drm_frame1_DeleteDestroyCallback(IDirect3DRMFrame *iface return IDirect3DRMFrame3_DeleteDestroyCallback(&frame->IDirect3DRMFrame3_iface, cb, ctx); } -static HRESULT WINAPI d3drm_frame3_SetAppData(IDirect3DRMFrame3 *iface, DWORD data) +static HRESULT WINAPI d3drm_frame3_SetAppData(IDirect3DRMFrame3 *iface, LPVOID data) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); @@ -744,7 +744,7 @@ static HRESULT WINAPI d3drm_frame3_SetAppData(IDirect3DRMFrame3 *iface, DWORD da return D3DRM_OK; } -static HRESULT WINAPI d3drm_frame2_SetAppData(IDirect3DRMFrame2 *iface, DWORD data) +static HRESULT WINAPI d3drm_frame2_SetAppData(IDirect3DRMFrame2 *iface, LPVOID data) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); @@ -753,7 +753,7 @@ static HRESULT WINAPI d3drm_frame2_SetAppData(IDirect3DRMFrame2 *iface, DWORD da return d3drm_frame3_SetAppData(&frame->IDirect3DRMFrame3_iface, data); } -static HRESULT WINAPI d3drm_frame1_SetAppData(IDirect3DRMFrame *iface, DWORD data) +static HRESULT WINAPI d3drm_frame1_SetAppData(IDirect3DRMFrame *iface, LPVOID data) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); @@ -762,7 +762,7 @@ static HRESULT WINAPI d3drm_frame1_SetAppData(IDirect3DRMFrame *iface, DWORD dat return d3drm_frame3_SetAppData(&frame->IDirect3DRMFrame3_iface, data); } -static DWORD WINAPI d3drm_frame3_GetAppData(IDirect3DRMFrame3 *iface) +static LPVOID WINAPI d3drm_frame3_GetAppData(IDirect3DRMFrame3 *iface) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); @@ -771,7 +771,7 @@ static DWORD WINAPI d3drm_frame3_GetAppData(IDirect3DRMFrame3 *iface) return frame->obj.appdata; } -static DWORD WINAPI d3drm_frame2_GetAppData(IDirect3DRMFrame2 *iface) +static LPVOID WINAPI d3drm_frame2_GetAppData(IDirect3DRMFrame2 *iface) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); @@ -780,7 +780,7 @@ static DWORD WINAPI d3drm_frame2_GetAppData(IDirect3DRMFrame2 *iface) return d3drm_frame3_GetAppData(&frame->IDirect3DRMFrame3_iface); } -static DWORD WINAPI d3drm_frame1_GetAppData(IDirect3DRMFrame *iface) +static LPVOID WINAPI d3drm_frame1_GetAppData(IDirect3DRMFrame *iface) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); @@ -3302,7 +3302,7 @@ static HRESULT WINAPI d3drm_animation1_DeleteDestroyCallback(IDirect3DRMAnimatio return IDirect3DRMAnimation2_DeleteDestroyCallback(&animation->IDirect3DRMAnimation2_iface, cb, ctx); } -static HRESULT WINAPI d3drm_animation2_SetAppData(IDirect3DRMAnimation2 *iface, DWORD data) +static HRESULT WINAPI d3drm_animation2_SetAppData(IDirect3DRMAnimation2 *iface, LPVOID data) { struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); @@ -3313,7 +3313,7 @@ static HRESULT WINAPI d3drm_animation2_SetAppData(IDirect3DRMAnimation2 *iface, return D3DRM_OK; } -static HRESULT WINAPI d3drm_animation1_SetAppData(IDirect3DRMAnimation *iface, DWORD data) +static HRESULT WINAPI d3drm_animation1_SetAppData(IDirect3DRMAnimation *iface, LPVOID data) { struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); @@ -3322,7 +3322,7 @@ static HRESULT WINAPI d3drm_animation1_SetAppData(IDirect3DRMAnimation *iface, D return d3drm_animation2_SetAppData(&animation->IDirect3DRMAnimation2_iface, data); } -static DWORD WINAPI d3drm_animation2_GetAppData(IDirect3DRMAnimation2 *iface) +static LPVOID WINAPI d3drm_animation2_GetAppData(IDirect3DRMAnimation2 *iface) { struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); @@ -3331,7 +3331,7 @@ static DWORD WINAPI d3drm_animation2_GetAppData(IDirect3DRMAnimation2 *iface) return animation->obj.appdata; } -static DWORD WINAPI d3drm_animation1_GetAppData(IDirect3DRMAnimation *iface) +static LPVOID WINAPI d3drm_animation1_GetAppData(IDirect3DRMAnimation *iface) { struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); diff --git a/3rdparty/d3drm/include/d3drmobj.h b/3rdparty/d3drm/include/d3drmobj.h index 7e48d989..e91d50ab 100644 --- a/3rdparty/d3drm/include/d3drmobj.h +++ b/3rdparty/d3drm/include/d3drmobj.h @@ -205,8 +205,8 @@ DECLARE_INTERFACE_(IDirect3DRMObject,IUnknown) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -315,8 +315,8 @@ DECLARE_INTERFACE_(IDirect3DRMVisual,IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -370,8 +370,8 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -497,8 +497,8 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -642,8 +642,8 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -802,8 +802,8 @@ DECLARE_INTERFACE_(IDirect3DRMViewport,IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -942,8 +942,8 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -1090,8 +1090,8 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -1323,8 +1323,8 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -1605,8 +1605,8 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -1903,8 +1903,8 @@ DECLARE_INTERFACE_(IDirect3DRMMesh,IDirect3DRMVisual) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -2018,8 +2018,8 @@ DECLARE_INTERFACE_(IDirect3DRMProgressiveMesh,IDirect3DRMVisual) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -2128,8 +2128,8 @@ DECLARE_INTERFACE_(IDirect3DRMShadow,IDirect3DRMVisual) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -2187,8 +2187,8 @@ DECLARE_INTERFACE_(IDirect3DRMShadow2,IDirect3DRMVisual) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -2275,8 +2275,8 @@ DECLARE_INTERFACE_(IDirect3DRMFace,IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -2385,8 +2385,8 @@ DECLARE_INTERFACE_(IDirect3DRMFace2,IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -2495,8 +2495,8 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -2667,8 +2667,8 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -2848,8 +2848,8 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -3085,8 +3085,8 @@ DECLARE_INTERFACE_(IDirect3DRMLight,IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -3197,8 +3197,8 @@ DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -3309,8 +3309,8 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -3433,8 +3433,8 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -3569,8 +3569,8 @@ DECLARE_INTERFACE_(IDirect3DRMWrap, IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -3635,8 +3635,8 @@ DECLARE_INTERFACE_(IDirect3DRMMaterial, IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -3708,8 +3708,8 @@ DECLARE_INTERFACE_(IDirect3DRMMaterial2, IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -3787,8 +3787,8 @@ DECLARE_INTERFACE_(IDirect3DRMAnimation, IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -3866,8 +3866,8 @@ DECLARE_INTERFACE_(IDirect3DRMAnimation2, IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -3960,8 +3960,8 @@ DECLARE_INTERFACE_(IDirect3DRMAnimationSet, IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -4028,8 +4028,8 @@ DECLARE_INTERFACE_(IDirect3DRMAnimationSet2, IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -4099,8 +4099,8 @@ DECLARE_INTERFACE_(IDirect3DRMUserVisual, IDirect3DRMVisual) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -4560,8 +4560,8 @@ DECLARE_INTERFACE_(IDirect3DRMInterpolator, IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; @@ -4633,8 +4633,8 @@ DECLARE_INTERFACE_(IDirect3DRMClippedVisual, IDirect3DRMVisual) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; diff --git a/3rdparty/d3drm/include/d3drmwin.h b/3rdparty/d3drm/include/d3drmwin.h index bd3a40d8..269420aa 100644 --- a/3rdparty/d3drm/include/d3drmwin.h +++ b/3rdparty/d3drm/include/d3drmwin.h @@ -49,8 +49,8 @@ DECLARE_INTERFACE_(IDirect3DRMWinDevice,IDirect3DRMObject) STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK cb, void *ctx) PURE; - STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; - STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetAppData)(THIS_ LPVOID data) PURE; + STDMETHOD_(LPVOID, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; diff --git a/3rdparty/d3drm/light.c b/3rdparty/d3drm/light.c index 704c11c0..1cc5b115 100644 --- a/3rdparty/d3drm/light.c +++ b/3rdparty/d3drm/light.c @@ -101,7 +101,7 @@ static HRESULT WINAPI d3drm_light_DeleteDestroyCallback(IDirect3DRMLight *iface, return d3drm_object_delete_destroy_callback(&light->obj, cb, ctx); } -static HRESULT WINAPI d3drm_light_SetAppData(IDirect3DRMLight *iface, DWORD data) +static HRESULT WINAPI d3drm_light_SetAppData(IDirect3DRMLight *iface, LPVOID data) { struct d3drm_light *light = impl_from_IDirect3DRMLight(iface); @@ -112,7 +112,7 @@ static HRESULT WINAPI d3drm_light_SetAppData(IDirect3DRMLight *iface, DWORD data return D3DRM_OK; } -static DWORD WINAPI d3drm_light_GetAppData(IDirect3DRMLight *iface) +static LPVOID WINAPI d3drm_light_GetAppData(IDirect3DRMLight *iface) { struct d3drm_light *light = impl_from_IDirect3DRMLight(iface); diff --git a/3rdparty/d3drm/material.c b/3rdparty/d3drm/material.c index 726768fa..d9bfbc01 100644 --- a/3rdparty/d3drm/material.c +++ b/3rdparty/d3drm/material.c @@ -102,7 +102,7 @@ static HRESULT WINAPI d3drm_material_DeleteDestroyCallback(IDirect3DRMMaterial2 return d3drm_object_delete_destroy_callback(&material->obj, cb, ctx); } -static HRESULT WINAPI d3drm_material_SetAppData(IDirect3DRMMaterial2 *iface, DWORD data) +static HRESULT WINAPI d3drm_material_SetAppData(IDirect3DRMMaterial2 *iface, LPVOID data) { struct d3drm_material *material = impl_from_IDirect3DRMMaterial2(iface); @@ -113,7 +113,7 @@ static HRESULT WINAPI d3drm_material_SetAppData(IDirect3DRMMaterial2 *iface, DWO return D3DRM_OK; } -static DWORD WINAPI d3drm_material_GetAppData(IDirect3DRMMaterial2 *iface) +static LPVOID WINAPI d3drm_material_GetAppData(IDirect3DRMMaterial2 *iface) { struct d3drm_material *material = impl_from_IDirect3DRMMaterial2(iface); diff --git a/3rdparty/d3drm/meshbuilder.c b/3rdparty/d3drm/meshbuilder.c index 27e76c1c..5d4a3b6d 100644 --- a/3rdparty/d3drm/meshbuilder.c +++ b/3rdparty/d3drm/meshbuilder.c @@ -427,7 +427,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_DeleteDestroyCallback(IDirect3DRMMeshB return IDirect3DRMMeshBuilder3_DeleteDestroyCallback(&mesh_builder->IDirect3DRMMeshBuilder3_iface, cb, ctx); } -static HRESULT WINAPI d3drm_mesh_builder3_SetAppData(IDirect3DRMMeshBuilder3 *iface, DWORD data) +static HRESULT WINAPI d3drm_mesh_builder3_SetAppData(IDirect3DRMMeshBuilder3 *iface, LPVOID data) { struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); @@ -438,7 +438,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetAppData(IDirect3DRMMeshBuilder3 *if return D3DRM_OK; } -static HRESULT WINAPI d3drm_mesh_builder2_SetAppData(IDirect3DRMMeshBuilder2 *iface, DWORD data) +static HRESULT WINAPI d3drm_mesh_builder2_SetAppData(IDirect3DRMMeshBuilder2 *iface, LPVOID data) { struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); @@ -447,7 +447,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetAppData(IDirect3DRMMeshBuilder2 *if return d3drm_mesh_builder3_SetAppData(&mesh_builder->IDirect3DRMMeshBuilder3_iface, data); } -static DWORD WINAPI d3drm_mesh_builder3_GetAppData(IDirect3DRMMeshBuilder3 *iface) +static LPVOID WINAPI d3drm_mesh_builder3_GetAppData(IDirect3DRMMeshBuilder3 *iface) { struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); @@ -456,7 +456,7 @@ static DWORD WINAPI d3drm_mesh_builder3_GetAppData(IDirect3DRMMeshBuilder3 *ifac return mesh_builder->obj.appdata; } -static DWORD WINAPI d3drm_mesh_builder2_GetAppData(IDirect3DRMMeshBuilder2 *iface) +static LPVOID WINAPI d3drm_mesh_builder2_GetAppData(IDirect3DRMMeshBuilder2 *iface) { struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); @@ -2444,7 +2444,7 @@ static HRESULT WINAPI d3drm_mesh_DeleteDestroyCallback(IDirect3DRMMesh *iface, return d3drm_object_delete_destroy_callback(&mesh->obj, cb, ctx); } -static HRESULT WINAPI d3drm_mesh_SetAppData(IDirect3DRMMesh *iface, DWORD data) +static HRESULT WINAPI d3drm_mesh_SetAppData(IDirect3DRMMesh *iface, LPVOID data) { struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); @@ -2455,7 +2455,7 @@ static HRESULT WINAPI d3drm_mesh_SetAppData(IDirect3DRMMesh *iface, DWORD data) return D3DRM_OK; } -static DWORD WINAPI d3drm_mesh_GetAppData(IDirect3DRMMesh *iface) +static LPVOID WINAPI d3drm_mesh_GetAppData(IDirect3DRMMesh *iface) { struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); @@ -2928,7 +2928,7 @@ static HRESULT WINAPI d3drm_wrap_DeleteDestroyCallback(IDirect3DRMWrap *iface, return d3drm_object_delete_destroy_callback(&wrap->obj, cb, ctx); } -static HRESULT WINAPI d3drm_wrap_SetAppData(IDirect3DRMWrap *iface, DWORD data) +static HRESULT WINAPI d3drm_wrap_SetAppData(IDirect3DRMWrap *iface, LPVOID data) { struct d3drm_wrap *wrap = impl_from_IDirect3DRMWrap(iface); @@ -2939,7 +2939,7 @@ static HRESULT WINAPI d3drm_wrap_SetAppData(IDirect3DRMWrap *iface, DWORD data) return D3DRM_OK; } -static DWORD WINAPI d3drm_wrap_GetAppData(IDirect3DRMWrap *iface) +static LPVOID WINAPI d3drm_wrap_GetAppData(IDirect3DRMWrap *iface) { struct d3drm_wrap *wrap = impl_from_IDirect3DRMWrap(iface); diff --git a/3rdparty/d3drm/texture.c b/3rdparty/d3drm/texture.c index 09228372..9ccf73a3 100644 --- a/3rdparty/d3drm/texture.c +++ b/3rdparty/d3drm/texture.c @@ -421,7 +421,7 @@ static HRESULT WINAPI d3drm_texture1_DeleteDestroyCallback(IDirect3DRMTexture *i return IDirect3DRMTexture3_DeleteDestroyCallback(&texture->IDirect3DRMTexture3_iface, cb, ctx); } -static HRESULT WINAPI d3drm_texture1_SetAppData(IDirect3DRMTexture *iface, DWORD data) +static HRESULT WINAPI d3drm_texture1_SetAppData(IDirect3DRMTexture *iface, LPVOID data) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); @@ -430,7 +430,7 @@ static HRESULT WINAPI d3drm_texture1_SetAppData(IDirect3DRMTexture *iface, DWORD return IDirect3DRMTexture3_SetAppData(&texture->IDirect3DRMTexture3_iface, data); } -static DWORD WINAPI d3drm_texture1_GetAppData(IDirect3DRMTexture *iface) +static LPVOID WINAPI d3drm_texture1_GetAppData(IDirect3DRMTexture *iface) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); @@ -730,7 +730,7 @@ static HRESULT WINAPI d3drm_texture2_DeleteDestroyCallback(IDirect3DRMTexture2 * return IDirect3DRMTexture3_DeleteDestroyCallback(&texture->IDirect3DRMTexture3_iface, cb, ctx); } -static HRESULT WINAPI d3drm_texture2_SetAppData(IDirect3DRMTexture2 *iface, DWORD data) +static HRESULT WINAPI d3drm_texture2_SetAppData(IDirect3DRMTexture2 *iface, LPVOID data) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); @@ -739,7 +739,7 @@ static HRESULT WINAPI d3drm_texture2_SetAppData(IDirect3DRMTexture2 *iface, DWOR return IDirect3DRMTexture3_SetAppData(&texture->IDirect3DRMTexture3_iface, data); } -static DWORD WINAPI d3drm_texture2_GetAppData(IDirect3DRMTexture2 *iface) +static LPVOID WINAPI d3drm_texture2_GetAppData(IDirect3DRMTexture2 *iface) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); @@ -1090,7 +1090,7 @@ static HRESULT WINAPI d3drm_texture3_DeleteDestroyCallback(IDirect3DRMTexture3 * return d3drm_object_delete_destroy_callback(&texture->obj, cb, ctx); } -static HRESULT WINAPI d3drm_texture3_SetAppData(IDirect3DRMTexture3 *iface, DWORD data) +static HRESULT WINAPI d3drm_texture3_SetAppData(IDirect3DRMTexture3 *iface, LPVOID data) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); @@ -1101,7 +1101,7 @@ static HRESULT WINAPI d3drm_texture3_SetAppData(IDirect3DRMTexture3 *iface, DWOR return D3DRM_OK; } -static DWORD WINAPI d3drm_texture3_GetAppData(IDirect3DRMTexture3 *iface) +static LPVOID WINAPI d3drm_texture3_GetAppData(IDirect3DRMTexture3 *iface) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); diff --git a/3rdparty/d3drm/viewport.c b/3rdparty/d3drm/viewport.c index 821eb1ff..a29bac76 100644 --- a/3rdparty/d3drm/viewport.c +++ b/3rdparty/d3drm/viewport.c @@ -209,7 +209,7 @@ static HRESULT WINAPI d3drm_viewport1_DeleteDestroyCallback(IDirect3DRMViewport return d3drm_viewport2_DeleteDestroyCallback(&viewport->IDirect3DRMViewport2_iface, cb, ctx); } -static HRESULT WINAPI d3drm_viewport2_SetAppData(IDirect3DRMViewport2 *iface, DWORD data) +static HRESULT WINAPI d3drm_viewport2_SetAppData(IDirect3DRMViewport2 *iface, LPVOID data) { struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); @@ -219,7 +219,7 @@ static HRESULT WINAPI d3drm_viewport2_SetAppData(IDirect3DRMViewport2 *iface, DW return S_OK; } -static HRESULT WINAPI d3drm_viewport1_SetAppData(IDirect3DRMViewport *iface, DWORD data) +static HRESULT WINAPI d3drm_viewport1_SetAppData(IDirect3DRMViewport *iface, LPVOID data) { struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); @@ -228,7 +228,7 @@ static HRESULT WINAPI d3drm_viewport1_SetAppData(IDirect3DRMViewport *iface, DWO return d3drm_viewport2_SetAppData(&viewport->IDirect3DRMViewport2_iface, data); } -static DWORD WINAPI d3drm_viewport2_GetAppData(IDirect3DRMViewport2 *iface) +static LPVOID WINAPI d3drm_viewport2_GetAppData(IDirect3DRMViewport2 *iface) { struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); @@ -237,7 +237,7 @@ static DWORD WINAPI d3drm_viewport2_GetAppData(IDirect3DRMViewport2 *iface) return viewport->obj.appdata; } -static DWORD WINAPI d3drm_viewport1_GetAppData(IDirect3DRMViewport *iface) +static LPVOID WINAPI d3drm_viewport1_GetAppData(IDirect3DRMViewport *iface) { struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); diff --git a/CMakeLists.txt b/CMakeLists.txt index 9501f2a2..83326a05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -468,6 +468,7 @@ target_link_libraries(lego1 PRIVATE tglrl viewmanager realtime mxdirectx roi geo foreach(tgt IN LISTS lego1_targets) target_link_libraries(${tgt} PRIVATE $<$:DirectX5::DirectX5> SDL3::SDL3) + target_compile_definitions(${tgt} PRIVATE $<$:DIRECTX5_SDK>) endforeach() # Make sure filenames are ALL CAPS diff --git a/LEGO1/lego/legoomni/src/common/legotextureinfo.cpp b/LEGO1/lego/legoomni/src/common/legotextureinfo.cpp index 51775a03..d141dd8c 100644 --- a/LEGO1/lego/legoomni/src/common/legotextureinfo.cpp +++ b/LEGO1/lego/legoomni/src/common/legotextureinfo.cpp @@ -127,7 +127,7 @@ LegoTextureInfo* LegoTextureInfo::Create(const char* p_name, LegoTexture* p_text goto done; } - textureInfo->m_texture->SetAppData((DWORD) textureInfo); + textureInfo->m_texture->SetAppData((LPD3DRM_APPDATA) textureInfo); return textureInfo; done: diff --git a/LEGO1/lego/sources/misc/legocontainer.cpp b/LEGO1/lego/sources/misc/legocontainer.cpp index d9bdc0eb..34dccc26 100644 --- a/LEGO1/lego/sources/misc/legocontainer.cpp +++ b/LEGO1/lego/sources/misc/legocontainer.cpp @@ -92,7 +92,7 @@ LegoTextureInfo* LegoTextureContainer::GetCached(LegoTextureInfo* p_textureInfo) return NULL; } else { - textureInfo->m_texture->SetAppData((DWORD) textureInfo); + textureInfo->m_texture->SetAppData((LPD3DRM_APPDATA) textureInfo); m_cached.push_back(LegoCachedTexture(textureInfo, TRUE)); textureInfo->m_texture->AddRef(); diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h index c49ffd1a..413f7110 100644 --- a/LEGO1/tgl/d3drm/impl.h +++ b/LEGO1/tgl/d3drm/impl.h @@ -5,6 +5,12 @@ #include +#ifdef DIRECTX5_SDK +typedef DWORD LPD3DRM_APPDATA; +#else +typedef LPVOID LPD3DRM_APPDATA; +#endif + // Forward declare D3D types struct IDirect3DRM2; struct IDirect3DRMDevice2; diff --git a/LEGO1/tgl/d3drm/texture.cpp b/LEGO1/tgl/d3drm/texture.cpp index b0ee3813..a51a5c0b 100644 --- a/LEGO1/tgl/d3drm/texture.cpp +++ b/LEGO1/tgl/d3drm/texture.cpp @@ -15,16 +15,16 @@ void TextureDestroyCallback(IDirect3DRMObject* pObject, void* pArg); // FUNCTION: LEGO1 0x100a12a0 Result TextureImpl::SetImage(IDirect3DRMTexture* pSelf, TglD3DRMIMAGE* pImage) { - unsigned long appData; + void* appData; Result result; - appData = reinterpret_cast(pImage); + appData = pImage; // This is here because in the original code they asserted // on the return value being NULL. TextureGetImage(pSelf); - result = ResultVal(pSelf->SetAppData(appData)); + result = ResultVal(pSelf->SetAppData((LPD3DRM_APPDATA) appData)); if (Succeeded(result) && pImage) { result = ResultVal(pSelf->AddDestroyCallback(TextureDestroyCallback, NULL)); if (!Succeeded(result)) { diff --git a/LEGO1/tgl/d3drm/view.cpp b/LEGO1/tgl/d3drm/view.cpp index 457c54d2..759496e6 100644 --- a/LEGO1/tgl/d3drm/view.cpp +++ b/LEGO1/tgl/d3drm/view.cpp @@ -50,7 +50,7 @@ Result ViewImpl::ViewportCreateAppData(IDirect3DRM2* pDevice, IDirect3DRMViewpor { ViewportAppData* data = new ViewportAppData(pDevice); data->m_pCamera = pCamera; - Result result = ResultVal(pView->SetAppData(reinterpret_cast(data))); + Result result = ResultVal(pView->SetAppData((LPD3DRM_APPDATA) data)); if (Succeeded(result)) { result = ResultVal(pView->AddDestroyCallback(ViewportDestroyCallback, data)); } diff --git a/LEGO1/viewmanager/viewmanager.cpp b/LEGO1/viewmanager/viewmanager.cpp index 3531381c..0760c0d5 100644 --- a/LEGO1/viewmanager/viewmanager.cpp +++ b/LEGO1/viewmanager/viewmanager.cpp @@ -29,7 +29,7 @@ float g_unk0x1010105c = 0.000125F; // GLOBAL: LEGO1 0x10101060 float g_elapsedSeconds = 0; -inline void SetAppData(ViewROI* p_roi, DWORD data); +inline void SetAppData(ViewROI* p_roi, LPVOID data); inline undefined4 GetD3DRM(IDirect3DRM2*& d3drm, Tgl::Renderer* pRenderer); inline undefined4 GetFrame(IDirect3DRMFrame2*& frame, Tgl::Group* scene); @@ -165,7 +165,7 @@ void ViewManager::UpdateROIDetailBasedOnLOD(ViewROI* p_roi, int p_und) if (lod->GetUnknown0x08() & ViewLOD::c_bit4) { scene->Add((Tgl::MeshBuilder*) group); - SetAppData(p_roi, (DWORD) p_roi); + SetAppData(p_roi, (LPVOID) p_roi); } } else { @@ -187,7 +187,7 @@ void ViewManager::UpdateROIDetailBasedOnLOD(ViewROI* p_roi, int p_und) if (meshBuilder != NULL) { group->Add(meshBuilder); - SetAppData(p_roi, (DWORD) p_roi); + SetAppData(p_roi, (LPVOID) p_roi); p_roi->SetUnknown0xe0(p_und); return; } @@ -533,12 +533,12 @@ ViewROI* ViewManager::Pick(Tgl::View* p_view, unsigned long x, unsigned long y) return result; } -inline void SetAppData(ViewROI* p_roi, DWORD data) +inline void SetAppData(ViewROI* p_roi, LPVOID data) { IDirect3DRMFrame2* frame = NULL; if (GetFrame(frame, p_roi->GetGeometry()) == 0) { - frame->SetAppData(data); + frame->SetAppData((LPD3DRM_APPDATA) data); } }