diff --git a/LEGO1/library_msvc.h b/LEGO1/library_msvc.h index dfd217d4..5ac63a53 100644 --- a/LEGO1/library_msvc.h +++ b/LEGO1/library_msvc.h @@ -937,8 +937,22 @@ // GLOBAL: LEGO1 0x100db6e0 // GUID_SysKeyboard -// Cannot be handled right now due to anonymous pointer in struct +// GLOBAL: LEGO1 0x100dd1c0 +// IID_IDirect3DRM2 + +// Cannot be handled right now due to anonymous pointer in struct. +// We can annotate it on the original side, but we have no symbol on the recomp side. +// We would need a way of annotating "the pointer at c_dfDIKeyboard+0x14 has orig address 0x10097f80". // // GLOBAL: LEGO1 0x10098f80 // c_dfDIKeyboard + +/// Globals from libraries without symbols + +// STRING: LEGO1 0x100dabb0 +static const char* ___crtLCMapStringA_str = "\0"; + +// STRING: LEGO1 0x100dabb4 +static const wchar_t *___crtLCMapStringA_wstr = L"\0"; + #endif diff --git a/LEGO1/omni/src/audio/mxsoundmanager.cpp b/LEGO1/omni/src/audio/mxsoundmanager.cpp index 660bda0d..85e6cde3 100644 --- a/LEGO1/omni/src/audio/mxsoundmanager.cpp +++ b/LEGO1/omni/src/audio/mxsoundmanager.cpp @@ -11,7 +11,7 @@ DECOMP_SIZE_ASSERT(MxSoundManager, 0x3c); -// GLOBAL LEGO1 0x10101420 +// GLOBAL: LEGO1 0x10101420 MxS32 g_volumeAttenuation[100] = {-6643, -5643, -5058, -4643, -4321, -4058, -3836, -3643, -3473, -3321, -3184, -3058, -2943, -2836, -2736, -2643, -2556, -2473, -2395, -2321, -2251, -2184, -2120, -2058, -2000, -1943, -1888, -1836, -1785, -1736, -1689, -1643, -1599, -1556, -1514, -1473, diff --git a/LEGO1/tgl/d3drm/renderer.cpp b/LEGO1/tgl/d3drm/renderer.cpp index c295b4b3..b537589b 100644 --- a/LEGO1/tgl/d3drm/renderer.cpp +++ b/LEGO1/tgl/d3drm/renderer.cpp @@ -88,8 +88,7 @@ inline Result RendererCreateDevice( if (Succeeded(result)) { if (rCreateData.m_pBackBuffer) { - // LEGO1 0x10101040 - // GLOBAL: BETA10 0x102055f4 + // annotated below static int g_setBufferCount = 1; if (g_setBufferCount) { Result result2 = ResultVal(rpDevice->SetBufferCount(2)); @@ -101,6 +100,10 @@ inline Result RendererCreateDevice( return result; } +// GLOBAL: LEGO1 0x10101040 +// GLOBAL: BETA10 0x102055f4 +// ?g_setBufferCount@?3??RendererCreateDevice@@YA?AW4Result@Tgl@@PAUIDirect3DRM2@@ABUDeviceDirectDrawCreateData@3@AAPAUIDirect3DRMDevice2@@@Z@4HA + // FUNCTION: BETA10 0x1016cf40 inline Result RendererImpl::CreateDevice(const DeviceDirectDrawCreateData& rCreateData, DeviceImpl& rDevice) {