diff --git a/profile/3.3.5a-windows-386/ida/batch/import_data_types.idc b/profile/3.3.5a-windows-386/ida/batch/import_data_types.idc index 73d30ff..3867d7c 100644 --- a/profile/3.3.5a-windows-386/ida/batch/import_data_types.idc +++ b/profile/3.3.5a-windows-386/ida/batch/import_data_types.idc @@ -19,9 +19,12 @@ static import_data_types() { apply_type(0x004B78A0, "int32_t __usercall func@(char* ext@, char* filename, int32_t a3, MipBits** mipBits, uint32_t* width, uint32_t* height, PIXEL_FORMAT* texFormat, int32_t* isOpaque@, uint32_t* alphaBits, PIXEL_FORMAT* dataFormat)"); apply_type(0x004B8070, "int32_t __usercall func@(char* ext@, char* filename@, int32_t a3, MipBits** mipBits, uint32_t* width, uint32_t* height, uint32_t* isOpaque, uint32_t* alphaBits, PIXEL_FORMAT* dataFormat)"); apply_type(0x004B81D0, "MipBits* func(const char* filename, uint32_t* width, uint32_t* height, PIXEL_FORMAT* dataFormat, int32_t* isOpaque, CStatus* status, uint32_t* alphaBits, int32_t a8)"); + apply_type(0x004C4B80, "void __thiscall func(TSGrowableArray_C3Vector* this, uint32_t count)"); apply_type(0x00532AF0, "CGxCaps* __thiscall func(CGxDevice* this)"); + apply_type(0x0057FDD0, "void __thiscall func(TSGrowableArray_C2Vector* this, uint32_t count)"); apply_type(0x006160B0, "int32_t __usercall func@(uint32_t** image@, MipBits* mipImages@, uint32_t width@, uint32_t height)"); apply_type(0x00616800, "void __stdcall func(CURSORMODE mode)"); + apply_type(0x00616CA0, "void __thiscall func(TSGrowableArray_CImVector* this, uint32_t count)"); apply_type(0x00681A60, "void __stdcall func()"); apply_type(0x00681AB0, "void __stdcall func(uint32_t indexCount, uint16_t* indices)"); apply_type(0x00681B00, "void __stdcall func(CGxBuf* buf, EGxVertexBufferFormat format)"); @@ -31,7 +34,7 @@ static import_data_types() { apply_type(0x00682400, "void __stdcall func(uint32_t vertexCount, C3Vector* pos, uint32_t posStride, C3Vector* normal, uint32_t normalStride, CImVector* color, uint32_t colorStride, C2Vector* tex0, uint32_t tex0Stride, C2Vector* tex1, uint32_t tex1Stride)"); apply_type(0x006828C0, "void __stdcall func(uint32_t vertexCount, C3Vector* pos, uint32_t posStride, C3Vector* normal, uint32_t normalStride, CImVector* color, uint32_t colorStride, uint8_t* bone, uint32_t boneStride, C2Vector* tex0, uint32_t tex0Stride, C2Vector* tex1, uint32_t tex1Stride)"); apply_type(0x00682CB0, "void __thiscall func(CGxDevice* this, int32_t (*windowProc)(void*, uint32_t, uintptr_t, intptr_t), CGxFormat* format)"); - apply_type(0x00682CD0, "void __thiscall func(CGxDevice* this, CGxFormat* format)"); + apply_type(0x00682CD0, "void __thiscall func(CGxDevice* this, uintptr_t hwnd, CGxFormat* format)"); apply_type(0x00682CF0, "void __thiscall func(CGxDevice* this)"); apply_type(0x00682D00, "void __thiscall func(CGxDevice* this, uint32_t baseMipLevel)"); apply_type(0x00682D20, "EGxApi __thiscall func(CGxDevice* this)"); @@ -43,6 +46,8 @@ static import_data_types() { apply_type(0x00682E50, "void __thiscall func(CGxDevice* this)"); apply_type(0x00682F10, "void __thiscall func(CGxDevice* this, CGxBuf* buf)"); apply_type(0x00682F40, "uint32_t __stdcall func(EGxPrim primType, uint32_t indexCount)"); + apply_type(0x00682F70, "void __thiscall func(CGxDevice* this, C3Vector* n)"); + apply_type(0x00682FA0, "void __thiscall func(CGxDevice* this, uint32_t tmu, C2Vector* t)"); apply_type(0x00683080, "void __thiscall func(CGxDevice* this, uint32_t whichLight, int32_t enable)"); apply_type(0x006830B0, "int32_t __thiscall func(CGxDevice* this, uint32_t app, uint32_t hw, uint32_t appDisables, uint32_t hwDisables, uint32_t flagPos, int32_t* enable)"); apply_type(0x00683100, "int32_t __thiscall func(CGxDevice* this, EGxMasterEnables state)"); @@ -62,11 +67,14 @@ static import_data_types() { apply_type(0x00684170, "void __thiscall func(CGxDevice* this, float gamma)"); apply_type(0x00684190, "int32_t __thiscall func(CGxDevice* this, CGxGammaRamp* ramp)"); apply_type(0x00684260, "void __thiscall func(CGxDevice* this, uint32_t* w, uint32_t* h, CImVector** pixels)"); + apply_type(0x006842A0, "void __thiscall func(CGxDevice* this, EGxBuffer buffer, CGxTex* texture, uint32_t plane)"); apply_type(0x00684360, "void __thiscall func(CGxDevice* this, CRect* rect)"); apply_type(0x006843B0, "void __thiscall func(CGxDevice* this)"); apply_type(0x006843E0, "void __thiscall func(CGxDevice* this)"); apply_type(0x00684410, "void __thiscall func(CGxDevice* this)"); apply_type(0x00684440, "void __thiscall func(CGxDevice* this, uint32_t a2, C4Plane* plane)"); + apply_type(0x00684590, "void __thiscall func(CGxDevice* this, CImVector* c)"); + apply_type(0x006845B0, "void __thiscall func(CGxDevice* this)"); apply_type(0x006847D0, "void __thiscall func(CGxDevice* this, uint32_t a2, CGxLight* light, C3Vector* pos)"); apply_type(0x00684850, "void __thiscall func(CGxDevice* this, EGxPoolTarget target, uint32_t itemSize, uint32_t itemCount)"); apply_type(0x006848A0, "void __thiscall func(CGxDevice* this, CGxTex* texId, CiRect* updateRect, int32_t immediate)"); @@ -77,12 +85,15 @@ static import_data_types() { apply_type(0x00684C20, "void __stdcall func(char* format, ...)"); apply_type(0x00684C40, "void __stdcall func(CGxCaps* caps)"); apply_type(0x00684D10, "void __stdcall func(CGxFormat* format)"); + apply_type(0x00684FE0, "void __thiscall func(CGxDevice* this, EGxOverride override, uint32_t value)"); apply_type(0x006853B0, "void __thiscall func(CGxDevice* this, DEVICERESTOREDCALLBACK fn)"); apply_type(0x006853D0, "int32_t __thiscall func(CGxDevice* this, DEVICERESTOREDCALLBACK fn)"); apply_type(0x00685460, "void __thiscall func(CGxDevice* this, TEXTURERECREATIONCALLBACK fn)"); apply_type(0x00685480, "int32_t __thiscall func(CGxDevice* this, TEXTURERECREATIONCALLBACK fn)"); apply_type(0x00685510, "void __thiscall func(CGxDevice* this, STEREOCHANGEDCALLBACK fn)"); apply_type(0x00685530, "int32_t __thiscall func(CGxDevice* this, STEREOCHANGEDCALLBACK fn)"); + apply_type(0x006855C0, "void __thiscall func(CGxDevice* this, EGxPrim primType)"); + apply_type(0x00685640, "void __thiscall func(CGxDevice* this, C3Vector* v)"); apply_type(0x00685970, "void __thiscall func(CGxDevice* this, EGxRenderState which)"); apply_type(0x006859E0, "void __thiscall func(CGxDevice* this, EGxRenderState which)"); apply_type(0x00685A70, "void __thiscall func(CGxDevice* this)"); @@ -93,17 +104,81 @@ static import_data_types() { apply_type(0x00685FB0, "void __thiscall func(CGxDevice* this)"); apply_type(0x00687660, "CGxBuf* __thiscall func(CGxDevice* this, CGxPool* pool, uint32_t itemSize, uint32_t itemCount, uint32_t index)"); apply_type(0x006876D0, "CGxPool* __thiscall func(CGxDevice* this, EGxPoolTarget target, EGxPoolUsage usage, uint32_t size, EGxPoolHintBits hint, char* name)"); + apply_type(0x006877C0, "void __thiscall func(CGxDevice* this, CGxQuery** query, EGxQueryType queryType)"); + apply_type(0x00687820, "void __thiscall func(CGxDevice* this, CGxShader** shader)"); + apply_type(0x00687980, "void __thiscall func(CGxDevice* this, CGxTex* texId)"); + apply_type(0x006879F0, "void __thiscall func(CGxDevice* this, CGxQuery** query)"); apply_type(0x00687A90, "void __thiscall func(CGxDevice* this)"); apply_type(0x00688340, "void __thiscall func(CGxDevice* this, CGxPool* pool)"); apply_type(0x00688690, "void __thiscall func(CGxDevice* this)"); + apply_type(0x00689040, "void __thiscall func(CGxDevice* this, C44Matrix* matrix)"); + apply_type(0x00689050, "void __thiscall func(CGxDevice* this, C44Matrix* matrix)"); apply_type(0x006890C0, "void __thiscall func(CGxDevice* this)"); - apply_type(0x00689690, "void __thiscall func(CGxDevice *this, uint8_t __flags)"); + apply_type(0x00689690, "void __thiscall func(CGxDevice* this, uint8_t __flags)"); apply_type(0x006897C0, "void __thiscall func(CGxDevice* this, CGxShader**, EGxShTarget, char*, char*, int32_t)"); apply_type(0x00689EF0, "CGxDevice* __stdcall func()"); apply_type(0x0068BF20, "CGxDevice* __stdcall func()"); apply_type(0x0068C220, "CGxDevice* __stdcall func()"); + apply_type(0x0068E450, "void __thiscall func(CGxDeviceD3d* this)"); + apply_type(0x0068E4A0, "void __thiscall func(CGxDeviceD3d* this, uint32_t level)"); + apply_type(0x0068E4C0, "void __thiscall func(CGxDeviceD3d* this, float gamma)"); + apply_type(0x0068E570, "void __thiscall func(CGxDeviceD3d* this, char* buffer, uint32_t size)"); + apply_type(0x0068E720, "void __thiscall func(CGxDeviceD3d* this, CGxPool* this)"); + apply_type(0x0068E750, "void __thiscall func(CGxDeviceD3d* this, int32_t visible)"); + apply_type(0x0068E7E0, "void __thiscall func(CGxDeviceD3d* this, uint32_t x, uint32_t y)"); + apply_type(0x0068E810, "void __thiscall func(CGxDeviceD3d* this)"); + apply_type(0x0068E900, "void __thiscall func(CGxDeviceD3d* this, CGxFormat* format)"); + apply_type(0x0068E980, "void __thiscall func(CGxDeviceD3d* this, float c)"); + apply_type(0x0068E9A0, "void __thiscall func(CGxDeviceD3d* this, float s)"); + apply_type(0x0068E9C0, "void __thiscall func(CGxDeviceD3d* this, CGxQuery** query, EGxQueryType queryType)"); + apply_type(0x0068EA10, "bool __thiscall func(CGxDeviceD3d* this, CGxQuery* query)"); + apply_type(0x0068EA90, "bool __thiscall func(CGxDeviceD3d* this, CGxQuery* query, EGxQueryParam param, uint32_t* data)"); + apply_type(0x0068F770, "void __thiscall func(CGxDeviceD3d* this, EGxBuffer buffer, CGxTex* texture, uint32_t plane)"); + apply_type(0x0068F900, "void __thiscall func(CGxDeviceD3d* this, CGxTex* texId)"); + apply_type(0x0068F950, "void __thiscall func(CGxDeviceD3d* this, CGxTex* a1, int32_t a2, CGxTex* a3, int32_t a4)"); + apply_type(0x0068FAE0, "int32_t __thiscall func(CGxDeviceD3d* this, CGxBuf* buf, uint32_t size)"); + apply_type(0x0068FCE0, "char* __thiscall func(CGxDeviceD3d* this, CGxBuf* buf)"); + apply_type(0x0068FD00, "void __thiscall func(CGxDeviceD3d* this, CGxBuf* buf, const void* data, uint32_t size, uint32_t offset)"); + apply_type(0x0068FD50, "void __thiscall func(CGxDeviceD3d* this)"); + apply_type(0x0068FE80, "void __thiscall func(CGxDeviceD3d* this, uint8_t __flags)"); + apply_type(0x0068FED0, "void __thiscall func(CGxDeviceD3d* this, CiRect* rect, TSGrowableArray_CImVector* pixels)"); + apply_type(0x00690230, "void __thiscall func(CGxDeviceD3d* this, EGxWM wm, int32_t param1, int32_t param2)"); + apply_type(0x006904D0, "int32_t __thiscall func(CGxDeviceD3d* this, CGxFormat* format)"); + apply_type(0x006905F0, "void __thiscall func(CGxDeviceD3d* this)"); + apply_type(0x00690750, "void __thiscall func(CGxDeviceD3d* this, int32_t (*windowProc)(void*, uint32_t, uintptr_t, intptr_t), CGxFormat* format)"); + apply_type(0x00690830, "void __thiscall func(CGxDeviceD3d* this, uintptr_t hwnd, CGxFormat* format)"); + apply_type(0x0069FE80, "void __thiscall func(CGxDeviceD3d* this, CGxGammaRamp* ramp)"); + apply_type(0x0069FED0, "void* __thiscall func(CGxDeviceD3d* this)"); + apply_type(0x0069FF40, "void __thiscall func(CGxDeviceD3d* this, EGxOverride override, uint32_t value)"); + apply_type(0x0069FF80, "void __thiscall func(CGxDeviceD3d* this, CGxPool* pool, uint32_t size)"); + apply_type(0x006A00C0, "void __thiscall func(CGxDeviceD3d* this)"); + apply_type(0x006A0110, "float __thiscall func(CGxDeviceD3d* this)"); + apply_type(0x006A0120, "float __thiscall func(CGxDeviceD3d* this)"); + apply_type(0x006A0130, "bool __thiscall func(CGxDeviceD3d* this)"); + apply_type(0x006A0190, "bool __thiscall func(CGxDeviceD3d* this, CGxQuery** query)"); + apply_type(0x006A0240, "bool __thiscall func(CGxDeviceD3d* this, CGxQuery* query)"); + apply_type(0x006A0310, "bool __thiscall func(CGxDeviceD3d* this, CGxQuery* query, uint32_t* data)"); + apply_type(0x006A1950, "void __thiscall func(CGxDeviceD3d* this, CiRect* rect, TSGrowableArray_float* depths)"); + apply_type(0x006A2BB0, "void __thiscall func(CGxDeviceD3d* this, CGxTex* texId)"); + apply_type(0x006A3070, "void __thiscall func(CGxDeviceD3d* this, CGxTex* texId)"); + apply_type(0x006A30D0, "void __thiscall func(CGxDeviceD3d* this, CGxTex* a1, CGxTex* a2, C2iVector* a3, C2iVector* a4, uint32_t a5, uint32_t a6)"); + apply_type(0x006A31E0, "void __thiscall func(CGxDeviceD3d* this, CGxTex* a1, CGxTex* a2, CiRect* a3, CiRect* a4, uint32_t a5, uint32_t a6)"); + apply_type(0x006A3450, "void __thiscall func(CGxDeviceD3d* this, uint32_t mask)"); + apply_type(0x006A3620, "void __thiscall func(CGxDeviceD3d* this, CGxBatch* batch)"); + apply_type(0x006A4C30, "void __thiscall func(CGxDeviceD3d* this, EGxRenderState rs)"); + apply_type(0x006A5A00, "void __thiscall func(CGxDeviceD3d* this, CRect* dst)"); apply_type(0x006A5A30, "void __thiscall func(CGxDeviceD3d* this)"); + apply_type(0x006A5D50, "void __thiscall func(CGxDeviceD3d* this, CGxShader* shader, const char* a2, const char* a3)"); + apply_type(0x006A5E10, "void __thiscall func(CGxDeviceD3d* this, CGxShader* shader)"); apply_type(0x006A5EF0, "void __thiscall func(CGxDevice* this, CGxTex* texId, uint32_t* width, uint32_t* height, uint32_t* baseMip, uint32_t* mipCount)"); + apply_type(0x006A74B0, "void __thiscall func(CGxDeviceD3d* this, uint32_t mask, CImVector color)"); + apply_type(0x006A9920, "void __thiscall func(CGxDeviceD3d* this, CRect* dst)"); + apply_type(0x006A9B40, "void __thiscall func(CGxDeviceD3d* this, C44Matrix* matrix)"); + apply_type(0x006A9E00, "void __thiscall func(CGxDeviceD3d* this, C44Matrix* matrix)"); + apply_type(0x006AA070, "void __thiscall func(CGxDeviceD3d* this, CGxShader* shader)"); + apply_type(0x006AA0D0, "void __thiscall func(CGxDeviceD3d* this, CGxShader* shader)"); + apply_type(0x006AA130, "void __thiscall func(CGxShader** shaders, EGxShTarget target, char* a3, char* a4, int32_t permutations)"); + apply_type(0x006AA190, "void __thiscall func(CGxDeviceD3d* this, CGxShader** shader)"); apply_type(0x006AA3B0, "int32_t __thiscall func(CTgaFile* this)"); apply_type(0x006AA3E0, "uint32_t __thiscall func(CTgaFile* this)"); apply_type(0x006AA420, "void __thiscall func(CTgaFile* this, uint8_t* pAlphaData, uint8_t* pNoAlphaData, uint8_t* alpha)"); @@ -187,6 +262,7 @@ static import_data_types() { apply_type(0x0077C720, "void __stdcall func(BigBuffer* a, BigBuffer* b, BigBuffer* c, BigBuffer* d, BigStack* stack)"); apply_type(0x0077C980, "void __stdcall func(BigData* a, BigData* b, BigData* c, BigData* d)"); apply_type(0x00819EA0, "void __stdcall func(int32_t function, FrameScript_Object* object, int32_t args, char* args_fmt, FrameScript_EventObject* eventObject)"); + apply_type(0x0086E200, "void __thiscall func(TSExplicitList_CGxBuf* this, CGxBuf* ptr)"); apply_type(0x0095F3A0, "void __thiscall func(CSimpleModel* this)"); apply_type(0x0095F420, "FrameScript_Object__ScriptIx* __thiscall func(CSimpleModel* this, char* name, FrameScript_Object__ScriptData* data)"); apply_type(0x0095F4D0, "void __stdcall func(CM2Model* model, void* arg)"); diff --git a/profile/3.3.5a-windows-386/ida/batch/import_symbols.idc b/profile/3.3.5a-windows-386/ida/batch/import_symbols.idc index 3a26732..d57407d 100644 --- a/profile/3.3.5a-windows-386/ida/batch/import_symbols.idc +++ b/profile/3.3.5a-windows-386/ida/batch/import_symbols.idc @@ -189,6 +189,7 @@ static import_symbols() { set_name(0x004C33C0, "C44Matrix__Rotate"); set_name(0x004C3420, "C3Vector__Normalize_1"); set_name(0x004C3600, "C3Vector__Normalize_2"); + set_name(0x004C4B80, "TSGrowableArray_C3Vector__SetCount"); set_name(0x004C51B0, "C33Matrix__operator_assign_C33Matrix"); set_name(0x004D7F60, "CGlueMgr__SetCurrentAccount"); set_name(0x004D80C0, "CGlueMgr__DisplayLoginStatus"); @@ -1081,6 +1082,7 @@ static import_symbols() { set_name(0x0057F1B0, "Script_GetTrackingInfo"); set_name(0x0057F380, "Script_SetTracking"); set_name(0x0057F4F0, "Script_GetTrackingTexture"); + set_name(0x0057FDD0, "TSGrowableArray_C2Vector__SetCount"); set_name(0x005841D0, "Script_GetMerchantNumItems"); set_name(0x00584200, "Script_GetMerchantItemLink"); set_name(0x005842D0, "Script_GetMerchantItemMaxStack"); @@ -2092,6 +2094,7 @@ static import_symbols() { set_name(0x006163B0, "CursorInitialize"); set_name(0x00616800, "CursorSetMode"); set_name(0x00616AD0, "GxXformPush_EGxXform_C44Matrix"); + set_name(0x00616CA0, "TSGrowableArray_CImVector__SetCount"); set_name(0x00632050, "nullsub_4"); set_name(0x00653A10, "nullsub_5"); set_name(0x00681290, "GxDevCreate"); @@ -2109,8 +2112,8 @@ static import_symbols() { set_name(0x00682400, "GxPrimVertexPtr@2"); set_name(0x006828C0, "GxPrimLockVertexPtrs"); set_name(0x00682A00, "GxScenePresent"); - set_name(0x00682CB0, "CGxDevice__DeviceCreate_WindowProc_CGxFormat"); - set_name(0x00682CD0, "CGxDevice__DeviceCreate_CGxFormat"); + set_name(0x00682CB0, "CGxDevice__DeviceCreate"); + set_name(0x00682CD0, "CGxDevice__DeviceCreate@2"); set_name(0x00682CF0, "CGxDevice__DeviceDestroy"); set_name(0x00682D00, "CGxDevice__DeviceSetBaseMipLevel"); set_name(0x00682D20, "CGxDevice__DeviceApi"); @@ -2122,6 +2125,8 @@ static import_symbols() { set_name(0x00682E50, "CGxDevice__ScenePresent"); set_name(0x00682F10, "CGxDevice__PrimIndexPtr"); set_name(0x00682F40, "CGxDevice__PrimCalcCount"); + set_name(0x00682F70, "CGxDevice__PrimNormal"); + set_name(0x00682FA0, "CGxDevice__PrimTexCoord"); set_name(0x00683080, "CGxDevice__LightEnable"); set_name(0x006830B0, "CGxDevice__NeedsUpdate"); set_name(0x00683100, "CGxDevice__MasterEnable"); @@ -2138,14 +2143,17 @@ static import_symbols() { set_name(0x00683650, "CGxDevice__CursorLock"); set_name(0x00683660, "CGxDevice__CursorSetDepth"); set_name(0x006840F0, "CGxDevice__DeviceSetFormat"); - set_name(0x00684170, "CGxDevice__DeviceSetGamma_float"); - set_name(0x00684190, "CGxDevice__DeviceSetGamma_CGxGammaRamp"); + set_name(0x00684170, "CGxDevice__DeviceSetGamma"); + set_name(0x00684190, "CGxDevice__DeviceSetGamma@2"); set_name(0x00684260, "CGxDevice__DeviceReadScreenShot"); + set_name(0x006842A0, "CGxDevice__DeviceSetRenderTarget"); set_name(0x00684360, "CGxDevice__DeviceSetDefWindow"); set_name(0x006843B0, "CGxDevice__NotifyOnDeviceRestored"); set_name(0x006843E0, "CGxDevice__NotifyOnTextureRecreation"); set_name(0x00684410, "CGxDevice__NotifyOnStereoChanged"); set_name(0x00684440, "CGxDevice__ClipPlaneSet"); + set_name(0x00684590, "CGxDevice__PrimColor"); + set_name(0x006845B0, "CGxDevice__PrimDrawElements"); set_name(0x006847D0, "CGxDevice__LightSet"); set_name(0x00684850, "CGxDevice__BufStream"); set_name(0x006848A0, "CGxDevice__TexMarkForUpdate"); @@ -2156,12 +2164,15 @@ static import_symbols() { set_name(0x00684C20, "CGxDevice__Log"); set_name(0x00684C40, "CGxDevice__Log_CGxCaps"); set_name(0x00684D10, "CGxDevice__Log_CGxFormat"); + set_name(0x00684FE0, "CGxDevice__DeviceOverride"); set_name(0x006853B0, "CGxDevice__AddDeviceRestoredCallback"); set_name(0x006853D0, "CGxDevice__RemoveDeviceRestoredCallback"); set_name(0x00685460, "CGxDevice__AddTextureRecreationCallback"); set_name(0x00685480, "CGxDevice__RemoveTextureRecreationCallback"); set_name(0x00685510, "CGxDevice__AddStereoChangedCallback"); set_name(0x00685530, "CGxDevice__RemoveStereoChangedCallback"); + set_name(0x006855C0, "CGxDevice__PrimBegin"); + set_name(0x00685640, "CGxDevice__PrimVertex"); set_name(0x00685970, "CGxDevice__IRsDirty"); set_name(0x006859E0, "CGxDevice__IRsForceUpdate_EGxRenderState"); set_name(0x00685A70, "CGxDevice__IRsForceUpdate"); @@ -2172,9 +2183,15 @@ static import_symbols() { set_name(0x00685FB0, "CGxDevice__RsPop"); set_name(0x00687660, "CGxDevice__BufCreate"); set_name(0x006876D0, "CGxDevice__PoolCreate"); + set_name(0x006877C0, "CGxDevice__QueryCreate"); + set_name(0x00687820, "CGxDevice__ShaderDestroy"); + set_name(0x00687980, "CGxDevice__TexDestroy"); + set_name(0x006879F0, "CGxDevice__QueryDestroy"); set_name(0x00687A90, "CGxDevice__ICursorDraw"); set_name(0x00688340, "CGxDevice__PoolDestroy"); set_name(0x00688690, "CGxDevice__CGxDevice"); + set_name(0x00689040, "CGxDevice__XformSetProjection"); + set_name(0x00689050, "CGxDevice__XformSetView"); set_name(0x006890C0, "CGxDevice__destructor"); set_name(0x00689690, "CGxDevice__scalar_deleting_destructor"); set_name(0x006897C0, "CGxDevice__ShaderCreate"); @@ -2185,34 +2202,65 @@ static import_symbols() { set_name(0x0068C220, "CGxDevice__NewD3d9Ex"); set_name(0x0068E180, "CGxDeviceD3d__ICreateD3dIB"); set_name(0x0068E250, "CGxDeviceD3d__ISetPresentParms"); + set_name(0x0068E450, "CGxDeviceD3d__DeviceEvictResources"); + set_name(0x0068E4A0, "CGxDeviceD3d__DeviceSetBaseMipLevel"); + set_name(0x0068E4C0, "CGxDeviceD3d__DeviceSetGamma"); + set_name(0x0068E570, "CGxDeviceD3d__LogCrashInfo"); set_name(0x0068E720, "CGxDeviceD3d__PoolDestroy"); set_name(0x0068E750, "CGxDeviceD3d__CursorSetVisible"); + set_name(0x0068E7E0, "CGxDeviceD3d__CursorUnlock"); set_name(0x0068E810, "CGxDeviceD3d__ICursorDraw"); set_name(0x0068E900, "CGxDeviceD3d__ICursorCreate"); + set_name(0x0068E980, "CGxDeviceD3d__StereoSetConvergence"); + set_name(0x0068E9A0, "CGxDeviceD3d__StereoSetSeparation"); + set_name(0x0068E9C0, "CGxDeviceD3d__QueryCreate"); + set_name(0x0068EA10, "CGxDeviceD3d__QueryBegin"); + set_name(0x0068EA90, "CGxDeviceD3d__QueryGetParam"); set_name(0x0068EBB0, "CGxDeviceD3d__ICreateWindow"); set_name(0x0068ED80, "CGxDeviceD3d__ILoadD3dLib"); set_name(0x0068EE20, "CGxDeviceD3d__ISetCaps"); set_name(0x0068F3D0, "CGxDeviceD3d__ICreateD3dDevice"); + set_name(0x0068F770, "CGxDeviceD3d__DeviceSetRenderTarget"); + set_name(0x0068F900, "CGxDeviceD3d__DeviceResolveDepthBuffer"); + set_name(0x0068F950, "CGxDeviceD3d__DeviceCopyTex"); set_name(0x0068FA60, "CGxDeviceD3d__IBufUnlock"); set_name(0x0068FAE0, "CGxDeviceD3d__BufUnlock"); set_name(0x0068FB10, "CGxDeviceD3d__IBufLock"); set_name(0x0068FCE0, "CGxDeviceD3d__BufLock"); set_name(0x0068FD00, "CGxDeviceD3d__BufData"); set_name(0x0068FD50, "CGxDeviceD3d__CGxDeviceD3d"); + set_name(0x0068FE80, "CGxDeviceD3d__scalar_deleting_destructor"); + set_name(0x0068FED0, "CGxDeviceD3d__DeviceReadPixels"); set_name(0x00690150, "CGxDeviceD3d__IReleaseD3dResources"); set_name(0x00690230, "CGxDeviceD3d__DeviceWM"); set_name(0x006904D0, "CGxDeviceD3d__DeviceSetFormat"); + set_name(0x006905F0, "CGxDeviceD3d__DeviceDestroy"); set_name(0x00690680, "CGxDeviceD3d__ICreateD3d"); - set_name(0x00690750, "CGxDeviceD3d__DeviceCreate_WindowProc_CGxFormat"); + set_name(0x00690750, "CGxDeviceD3d__DeviceCreate"); + set_name(0x00690830, "CGxDeviceD3d__DeviceCreate@2"); set_name(0x0069FB00, "CGxDeviceD3d__ICreateD3dVB"); set_name(0x0069FB70, "CGxDeviceD3d__CreatePoolAPI"); set_name(0x0069FE10, "CGxDeviceD3d__ICursorClip"); + set_name(0x0069FE80, "CGxDeviceD3d__DeviceSetGamma@2"); + set_name(0x0069FED0, "CGxDeviceD3d__DeviceWindow"); + set_name(0x0069FF40, "CGxDeviceD3d__DeviceOverride"); + set_name(0x0069FF80, "CGxDeviceD3d__PoolSizeSet"); set_name(0x006A00C0, "CGxDeviceD3d__ICursorDestroy"); + set_name(0x006A0110, "CGxDeviceD3d__StereoGetConvergence"); + set_name(0x006A0120, "CGxDeviceD3d__StereoGetSeparation"); + set_name(0x006A0130, "CGxDeviceD3d__StereoEnabled"); + set_name(0x006A0190, "CGxDeviceD3d__QueryDestroy"); + set_name(0x006A0240, "CGxDeviceD3d__QueryEnd"); + set_name(0x006A0310, "CGxDeviceD3d__QueryGetData"); set_name(0x006A0360, "CGxDeviceD3d__WindowProcD3d"); + set_name(0x006A1950, "CGxDeviceD3d__DeviceReadDepths"); set_name(0x006A1A90, "CGxDeviceD3d9Ex__CGxDeviceD3d9Ex"); + set_name(0x006A2BB0, "CGxDeviceD3d__TexDestroy"); set_name(0x006A2C00, "CGxDeviceD3d__ITexCreate"); set_name(0x006A2D80, "CGxDeviceD3d__ITexUpload"); set_name(0x006A3070, "CGxDeviceD3d__ITexMarkAsUpdated"); + set_name(0x006A30D0, "CGxDeviceD3d__TexCopy"); + set_name(0x006A31E0, "CGxDeviceD3d__TexStretch"); set_name(0x006A3350, "CGxDeviceD3d__ISceneBegin"); set_name(0x006A3420, "CGxDeviceD3d__ISceneEnd"); set_name(0x006A3450, "CGxDeviceD3d__ScenePresent"); @@ -2233,6 +2281,7 @@ static import_symbols() { set_name(0x006A5A00, "CGxDeviceD3d__CapsWindowSize"); set_name(0x006A5A30, "CGxDeviceD3d__IXformSetWorld"); set_name(0x006A5C70, "CGxDeviceD3d__IBindPixelShader"); + set_name(0x006A5D50, "CGxDeviceD3d__IShaderReload"); set_name(0x006A5E10, "CGxDeviceD3d__IShaderCreate"); set_name(0x006A5EF0, "CGxDevice__ITexWHDStartEnd"); set_name(0x006A74B0, "CGxDeviceD3d__SceneClear"); @@ -2243,6 +2292,7 @@ static import_symbols() { set_name(0x006AA070, "CGxDeviceD3d__IShaderCreatePixel"); set_name(0x006AA0D0, "CGxDeviceD3d__IShaderCreateVertex"); set_name(0x006AA130, "CGxDeviceD3d__ShaderCreate"); + set_name(0x006AA190, "CGxDeviceD3d__ShaderDestroy"); set_name(0x006AA2F0, "CGxDeviceD3d__IBindVertexShader"); set_name(0x006AA350, "CTgaFile__ColorMapEntryBytes"); set_name(0x006AA380, "CTgaFile__ColorMapBytes"); @@ -2544,6 +2594,7 @@ static import_symbols() { set_name(0x0086C6A0, "OsGuiGetWindow"); set_name(0x0086D0A0, "OsIMEInitialize"); set_name(0x0086D0C0, "OsIMEDestroy"); + set_name(0x0086E200, "TSExplicitList_CGxBuf__LinkToTail"); set_name(0x0086F5A0, "OsCallSetContext"); set_name(0x0086F760, "OsCallInitialize"); set_name(0x0086F880, "OsCallInitializeContext"); diff --git a/profile/3.3.5a-windows-386/include/gx/device.h b/profile/3.3.5a-windows-386/include/gx/device.h index f6ac61f..97ac1db 100644 --- a/profile/3.3.5a-windows-386/include/gx/device.h +++ b/profile/3.3.5a-windows-386/include/gx/device.h @@ -23,11 +23,13 @@ #include "gx/matrix_stack.h" #include "gx/buffer.h" #include "gx/texture.h" +#include "gx/query.h" DECLARE_STRUCT(CGxAppRenderState); DECLARE_STRUCT(CGxPushedRenderState); DECLARE_STRUCT(ShaderConstants); DECLARE_STRUCT(CGxDevice); +DECLARE_STRUCT(CGxDevice__TextureTarget); DECLARE_STRUCT(CGxDevice__vtable); typedef void (*DEVICERESTOREDCALLBACK)(); @@ -59,6 +61,12 @@ struct ShaderConstants { uint32_t unk2; }; +struct CGxDevice__TextureTarget { + CGxTex* m_texture; + uint32_t m_plane; + void* m_apiSpecific; +}; + // 84 functions struct CGxDevice__vtable { // void ITexMarkAsUpdated(CGxTex* texId); @@ -84,7 +92,7 @@ struct CGxDevice__vtable { void* v_fn_7_NotifyOnStereoChanged; // void `scalar deleting destructor'(uint32_t __flags) void* v_fn_8_scalar_deleting_destructor; - // int32_t DeviceCreate(const CGxFormat& format); + // int32_t DeviceCreate(uintptr_t hwnd, const CGxFormat& format); void* v_fn_9_DeviceCreate; // int32_t DeviceCreate(long (*windowProc)(void*, uint32_t, uint32_t, int32_t), CGxFormat const& format); void* v_fn_10_DeviceCreate; @@ -96,7 +104,7 @@ struct CGxDevice__vtable { void* v_fn_13_DeviceSetFormat; // void DeviceSetBaseMipLevel(uint32_t mipLevel); void* v_fn_14_DeviceSetBaseMipLevel; - // void DeviceSetGamma(CGxGammaRamp const& ramp); + // void DeviceSetGamma(const CGxGammaRamp& ramp); void* v_fn_15_DeviceSetGamma; // void DeviceSetGamma(float gamma); void* v_fn_16_DeviceSetGamma; @@ -167,7 +175,7 @@ struct CGxDevice__vtable { void* v_fn_40_XformSetProjection; // void XformSetView(const C44Matrix& matrix); void* v_fn_41_XformSetView; - // void Draw(CGxBatch*, int32_t); + // void Draw(CGxBatch* batch, int32_t indexed); void* v_fn_42_Draw; // void PrimBegin(EGxPrim primType); void* v_fn_43_PrimBegin; @@ -201,7 +209,7 @@ struct CGxDevice__vtable { void* v_fn_57_TexCreate; // void TexDestroy(CGxTex* texId); void* v_fn_58_TexDestroy; - // int32_t TexCopy(CGxTex* a1, CGxTex* a2, const C2iVector& a3, const C2iVector& a4, const C2iVector& a5, uint32_t a6); + // int32_t TexCopy(CGxTex* a1, CGxTex* a2, const C2iVector& a3, const C2iVector& a4, uint32_t a5, uint32_t a6); void* v_fn_59_TexCopy; // bool TexStretch(CGxTex* a1, CGxTex* a2, const CiRect* a3, const CiRect* a4, uint32_t a5, uint32_t a6); void* v_fn_60_TexStretch; @@ -209,7 +217,7 @@ struct CGxDevice__vtable { void* v_fn_61_TexSetCacheSize; // void QueryCreate(CGxQuery*& query, EGxQueryType queryType); void* v_fn_62_QueryCreate; - // bool QueryDestroy(CGxQuery* query); + // bool QueryDestroy(CGxQuery*& query); void* v_fn_63_QueryDestroy; // bool QueryBegin(CGxQuery* query); void* v_fn_64_QueryBegin; @@ -219,10 +227,10 @@ struct CGxDevice__vtable { void* v_fn_66_QueryGetParam; // bool QueryGetData(CGxQuery* query, uint32_t* data); void* v_fn_67_QueryGetData; - // void ShaderCreate(CGxShader*[] shaders, EGxShTarget target, const char* a3, const char* a4, int32_t permutations); + // void ShaderCreate(CGxShader*[] shaders[], EGxShTarget target, const char* a3, const char* a4, int32_t permutations); void* v_fn_68_ShaderCreate; - // void ShaderRelease(CGxShader*& shader); - void* v_fn_69_ShaderRelease; + // void ShaderDestroy(CGxShader*& shader); + void* v_fn_69_ShaderDestroy; // void ShaderConstantsSet(EGxShTarget target, uint32_t index, const float* constraints, uint32_t count); void* v_fn_70_ShaderConstantsSet; // void IShaderReload(CGxShader* shader, const char* a2, const char* a3); @@ -237,7 +245,7 @@ struct CGxDevice__vtable { void* v_fn_75_CursorUnlock; // void StereoSetConvergence(float c); void* v_fn_76_StereoSetConvergence; - // double StereoGetConvergence(); + // float StereoGetConvergence(); void* v_fn_77_StereoGetConvergence; // void StereoSetSeparation(float s); void* v_fn_78_StereoSetSeparation; @@ -261,7 +269,8 @@ struct CGxDevice { TSGrowableArray_uint32_t m_stackOffsets; // 0x18 (size: 0x14) TSGrowableArray_EGxRenderState m_dirtyStates; // 0x2C (size: 0x14) EGxPrim m_primType; - uint32_t m_unk38[2]; // m_indexLocked-m_vertexLocked? + int32_t m_indexLocked; + int32_t m_vertexLocked; int32_t m_inBeginEnd; C3Vector m_primVertex; C2Vector m_primTexCoord[8]; @@ -329,7 +338,7 @@ struct CGxDevice { uint32_t unk28C8; uint32_t unk28CC; uint32_t unk28D0; - uint32_t unk28D4; + uint8_t unk28D4; uint32_t unk28D8; uint32_t unk28DC; uint32_t unk28E0; @@ -337,13 +346,15 @@ struct CGxDevice { uint32_t unk28E8; TSFixedArray_CGxAppRenderState m_appRenderStates; TSFixedArray_CGxStateBom m_hwRenderStates; - uint32_t unk2904[12]; // 0x2904 (size 0x30) + uint32_t unk2904[3]; // 0x2904 (size 0xC) + CGxDevice__TextureTarget m_textureTarget[2]; + TSExplicitList_CGxQuery m_queryList; // 0x2928 int32_t m_scrShotClick; // 0x2934 uint32_t m_scrShotWidth; // 0x2938 uint32_t m_scrShotHeight; // 0x293C TSGrowableArray_CImVector m_scrShotPixels; // 0x2940 int32_t m_cursorVisible; - int32_t m_hardwareCursor; // 0x2954 (size 0x4) + int32_t m_hwCursor; // 0x2954 (size 0x4) uint32_t m_cursorHotspotX; uint32_t m_cursorHotspotY; uint32_t m_cursor[1024]; // 0x2960 (size 0x4) diff --git a/profile/3.3.5a-windows-386/include/gx/query.h b/profile/3.3.5a-windows-386/include/gx/query.h new file mode 100644 index 0000000..a731656 --- /dev/null +++ b/profile/3.3.5a-windows-386/include/gx/query.h @@ -0,0 +1,16 @@ +#ifndef GX_QUERY_H +#define GX_QUERY_H + +DECLARE_STRUCT(CGxQuery); + +#include "storm/list.h" +#include "gx/types.h" + +STORM_TS_LIST(CGxQuery); +struct CGxQuery { + void* m_apiSpecific; + EGxQueryType m_type; + TSLink_CGxQuery m_link; +}; + +#endif \ No newline at end of file diff --git a/profile/3.3.5a-windows-386/include/gx/types.h b/profile/3.3.5a-windows-386/include/gx/types.h index 08208bb..1e768c8 100644 --- a/profile/3.3.5a-windows-386/include/gx/types.h +++ b/profile/3.3.5a-windows-386/include/gx/types.h @@ -9,16 +9,19 @@ DECLARE_ENUM(BlitAlpha); DECLARE_ENUM(BlitFormat); DECLARE_ENUM(EGxApi); DECLARE_ENUM(EGxBlend); +DECLARE_ENUM(EGxBuffer); DECLARE_ENUM(EGxColorFormat); DECLARE_ENUM(EGxFontHJusts); DECLARE_ENUM(EGxFontVJusts); DECLARE_ENUM(EGxMasterEnables); +DECLARE_ENUM(EGxOverride); DECLARE_ENUM(EGxPrim); DECLARE_ENUM(EGxPrimMask); DECLARE_ENUM(EGxRenderState); DECLARE_ENUM(EGxShPS); DECLARE_ENUM(EGxShTarget); DECLARE_ENUM(EGxShVS); +DECLARE_ENUM(EGxQueryType); DECLARE_ENUM(EGxTexCommand); DECLARE_ENUM(EGxTexFilter); DECLARE_ENUM(EGxTexFormat); @@ -86,6 +89,12 @@ enum EGxBlend { GxBlends_Last = 12 }; +enum EGxBuffer { + GxBuffers_Color = 0, + GxBuffers_Depth = 1, + GxBuffers_Last = 2 +}; + enum EGxColorFormat { GxCF_argb = 0, GxCF_rgba = 1, @@ -119,6 +128,19 @@ enum EGxMasterEnables { GxMasterEnables_Last = 9 }; +enum EGxOverride { + GxOverride_PixelShader = 0, + GxOverride_Unk1 = 1, + GxOverride_Unk2 = 2, + GxOverride_Unk3 = 3, + GxOverride_Unk4 = 4, + GxOverride_Unk5 = 5, + GxOverride_Unk6 = 6, + GxOverride_Unk7 = 7, + GxOverride_Unk8 = 8, + GxOverrides_Last = 9 +}; + enum EGxPrim { GxPrim_Points = 0, GxPrim_Lines = 1, @@ -322,6 +344,7 @@ enum EGxTexWrapMode { enum EGxQueryType { GxQueryType_Occlusion = 0, + // TODO }; enum EGxXform { diff --git a/profile/3.3.5a-windows-386/include/main.h b/profile/3.3.5a-windows-386/include/main.h index 3071e63..79102c9 100644 --- a/profile/3.3.5a-windows-386/include/main.h +++ b/profile/3.3.5a-windows-386/include/main.h @@ -53,6 +53,7 @@ #include "gx/types.h" #include "gx/batch.h" #include "gx/d3d9.h" +#include "gx/query.h" #include "m2/cache.h" #include "m2/data.h" @@ -107,6 +108,7 @@ #include "storm/array/pointer_to_void.h" #include "storm/array/uint8_t.h" #include "storm/array/uint32_t.h" +#include "storm/array/float.h" #include "storm/queue/timer_priority_uint32_t.h" diff --git a/profile/3.3.5a-windows-386/include/storm/array/float.h b/profile/3.3.5a-windows-386/include/storm/array/float.h new file mode 100644 index 0000000..9e0c57a --- /dev/null +++ b/profile/3.3.5a-windows-386/include/storm/array/float.h @@ -0,0 +1,10 @@ +#ifndef STORM_ARRAY_FLOAT_H +#define STORM_ARRAY_FLOAT_H + +#include "system/types.h" + +#include "storm/array.h" + +STORM_TS_GROWABLE_ARRAY(float); + +#endif \ No newline at end of file diff --git a/profile/3.3.5a-windows-386/symbol/gxbuf/func.sym b/profile/3.3.5a-windows-386/symbol/gxbuf/func.sym new file mode 100644 index 0000000..214ba6e --- /dev/null +++ b/profile/3.3.5a-windows-386/symbol/gxbuf/func.sym @@ -0,0 +1 @@ +TSExplicitList_CGxBuf__LinkToTail 0086E200 f end=0086E25F type="void __thiscall func(TSExplicitList_CGxBuf* this, CGxBuf* ptr)" \ No newline at end of file diff --git a/profile/3.3.5a-windows-386/symbol/gxdevice/func.sym b/profile/3.3.5a-windows-386/symbol/gxdevice/func.sym index 5f971c0..fe373dd 100644 --- a/profile/3.3.5a-windows-386/symbol/gxdevice/func.sym +++ b/profile/3.3.5a-windows-386/symbol/gxdevice/func.sym @@ -1,10 +1,11 @@ CGxDevice__RsPush 00409670 f end=004096CC type="void __thiscall func(CGxDevice* this)" CGxDevice__Caps 00532AF0 f end=00532AF7 type="CGxCaps* __thiscall func(CGxDevice* this)" ; public: class CGxCaps const & __thiscall CGxDevice::Caps(void)const -CGxDevice__DeviceCreate_WindowProc_CGxFormat 00682CB0 f end=00682CCB type="void __thiscall func(CGxDevice* this, int32_t (*windowProc)(void*, uint32_t, uintptr_t, intptr_t), CGxFormat* format)" -CGxDevice__DeviceCreate_CGxFormat 00682CD0 f end=00682CF0 type="void __thiscall func(CGxDevice* this, CGxFormat* format)" +CGxDevice__DeviceCreate 00682CB0 f end=00682CCB type="void __thiscall func(CGxDevice* this, int32_t (*windowProc)(void*, uint32_t, uintptr_t, intptr_t), CGxFormat* format)" +CGxDevice__DeviceCreate 00682CD0 f end=00682CF0 type="void __thiscall func(CGxDevice* this, uintptr_t hwnd, CGxFormat* format)" CGxDevice__DeviceDestroy 00682CF0 f end=00682CFB type="void __thiscall func(CGxDevice* this)" CGxDevice__DeviceSetBaseMipLevel 00682D00 f end=00682D10 type="void __thiscall func(CGxDevice* this, uint32_t baseMipLevel)" CGxDevice__DeviceApi 00682D20 f end=00682D27 type="EGxApi __thiscall func(CGxDevice* this)" +CGxDevice__DeviceTakeScreenShot 00682D30 f end=00682D3B type="void __thiscall func(CGxDevice* this)" CGxDevice__IDevIsWindowed 00682D40 f end=00682D48 type="int32_t __thiscall func(CGxDevice* this)" CGxDevice__DeviceCurWindow 00682D70 f end=00682D76 type="CRect* __thiscall func(CGxDevice* this)" CGxDevice__CapsIsWindowVisible 00682DC0 f end=00682DE7 type="int32_t __thiscall func(CGxDevice* this, int32_t a2)" @@ -12,6 +13,8 @@ CGxDevice__CapsHasContext 00682E20 f end=00682E47 type="int32_t __thiscall func( CGxDevice__ScenePresent 00682E50 f end=00682E66 type="void __thiscall func(CGxDevice* this)" CGxDevice__PrimIndexPtr 00682F10 f end=00682F3C type="void __thiscall func(CGxDevice* this, CGxBuf* buf)" CGxDevice__PrimCalcCount 00682F40 f end=00682F66 type="uint32_t __stdcall func(EGxPrim primType, uint32_t indexCount)" +CGxDevice__PrimNormal 00682F70 f end=00682F9E type="void __thiscall func(CGxDevice* this, C3Vector* n)" +CGxDevice__PrimTexCoord 00682FA0 f end=00682FCB type="void __thiscall func(CGxDevice* this, uint32_t tmu, C2Vector* t)" CGxDevice__LightEnable 00683080 f end=006830A4 type="void __thiscall func(CGxDevice* this, uint32_t whichLight, int32_t enable)" CGxDevice__NeedsUpdate 006830B0 f end=006830F9 type="int32_t __thiscall func(CGxDevice* this, uint32_t app, uint32_t hw, uint32_t appDisables, uint32_t hwDisables, uint32_t flagPos, int32_t* enable)" CGxDevice__MasterEnable 00683100 f end=00683121 type="int32_t __thiscall func(CGxDevice* this, EGxMasterEnables state)" @@ -28,13 +31,17 @@ CGxDevice__CursorSetVisible 00683640 f end=00683650 type="void __thiscall func(C CGxDevice__CursorLock 00683650 f end=00683657 type="uint32_t* __thiscall func(CGxDevice* this)" CGxDevice__CursorSetDepth 00683660 f end=00683670 type="void __thiscall func(CGxDevice* this, float depth)" CGxDevice__DeviceSetFormat 006840F0 f end=0068416C type="int32_t __thiscall func(CGxDevice* this, CGxFormat* format)" -CGxDevice__DeviceSetGamma_float 00684170 f end=00684189 type="void __thiscall func(CGxDevice* this, float gamma)" -CGxDevice__DeviceSetGamma_CGxGammaRamp 00684190 f end=006841AF type="int32_t __thiscall func(CGxDevice* this, CGxGammaRamp* ramp)" +CGxDevice__DeviceSetGamma 00684170 f end=00684189 type="void __thiscall func(CGxDevice* this, float gamma)" +CGxDevice__DeviceSetGamma 00684190 f end=006841AF type="int32_t __thiscall func(CGxDevice* this, CGxGammaRamp* ramp)" +CGxDevice__DeviceReadScreenShot 00684260 f end=0068429E type="void __thiscall func(CGxDevice* this, uint32_t* w, uint32_t* h, CImVector** pixels)" +CGxDevice__DeviceSetRenderTarget 006842A0 f end=0068435D type="void __thiscall func(CGxDevice* this, EGxBuffer buffer, CGxTex* texture, uint32_t plane)" CGxDevice__DeviceSetDefWindow 00684360 f end=006843B0 type="void __thiscall func(CGxDevice* this, CRect* rect)" CGxDevice__NotifyOnDeviceRestored 006843B0 f end=006843D9 type="void __thiscall func(CGxDevice* this)" CGxDevice__NotifyOnTextureRecreation 006843E0 f end=00684409 type="void __thiscall func(CGxDevice* this)" CGxDevice__NotifyOnStereoChanged 00684410 f end=00684439 type="void __thiscall func(CGxDevice* this)" CGxDevice__ClipPlaneSet 00684440 f end=006844B9 type="void __thiscall func(CGxDevice* this, uint32_t a2, C4Plane* plane)" +CGxDevice__PrimColor 00684590 f end=006845AC type="void __thiscall func(CGxDevice* this, CImVector* c)" +CGxDevice__PrimDrawElements 006845B0 f end=0068461D type="void __thiscall func(CGxDevice* this)" CGxDevice__LightSet 006847D0 f end=00684843 type="void __thiscall func(CGxDevice* this, uint32_t a2, CGxLight* light, C3Vector* pos)" CGxDevice__BufStream 00684850 f end=0068489F type="void __thiscall func(CGxDevice* this, EGxPoolTarget target, uint32_t itemSize, uint32_t itemCount)" CGxDevice__TexMarkForUpdate 006848A0 f end=000684900 type="void __thiscall func(CGxDevice* this, CGxTex* texId, CiRect* updateRect, int32_t immediate)" @@ -45,12 +52,15 @@ CGxDevice__CursorUnlock 00684B50 f end=00684B99 type="void __thiscall func(CGxDe CGxDevice__Log 00684C20 f end=00684C3E type="void __stdcall func(char* format, ...)" CGxDevice__Log_CGxCaps 00684C40 f end=00684D07 type="void __stdcall func(CGxCaps* caps)" ; CGxDevice::Log(CGxCaps const&) const CGxDevice__Log_CGxFormat 00684D10 f end=00684D6C type="void __stdcall func(CGxFormat* format)" +CGxDevice__DeviceOverride 00684FE0 f end=00685036 type="void __thiscall func(CGxDevice* this, EGxOverride override, uint32_t value)" CGxDevice__AddDeviceRestoredCallback 006853B0 f end=006853C6 type="void __thiscall func(CGxDevice* this, DEVICERESTOREDCALLBACK fn)" CGxDevice__RemoveDeviceRestoredCallback 006853D0 f end=0068545C type="int32_t __thiscall func(CGxDevice* this, DEVICERESTOREDCALLBACK fn)" CGxDevice__AddTextureRecreationCallback 00685460 f end=00685476 type="void __thiscall func(CGxDevice* this, TEXTURERECREATIONCALLBACK fn)" CGxDevice__RemoveTextureRecreationCallback 00685480 f end=0068550C type="int32_t __thiscall func(CGxDevice* this, TEXTURERECREATIONCALLBACK fn)" CGxDevice__AddStereoChangedCallback 00685510 f end=00685526 type="void __thiscall func(CGxDevice* this, STEREOCHANGEDCALLBACK fn)" CGxDevice__RemoveStereoChangedCallback 00685530 f end=006855BC type="int32_t __thiscall func(CGxDevice* this, STEREOCHANGEDCALLBACK fn)" +CGxDevice__PrimBegin 006855C0 f end=00685638 type="void __thiscall func(CGxDevice* this, EGxPrim primType)" +CGxDevice__PrimVertex 00685640 f end=00685961 type="void __thiscall func(CGxDevice* this, C3Vector* v)" CGxDevice__IRsDirty 00685970 f end=006859DB type="void __thiscall func(CGxDevice* this, EGxRenderState which)" CGxDevice__IRsForceUpdate_EGxRenderState 006859E0 f end=00685A65 type="void __thiscall func(CGxDevice* this, EGxRenderState which)" ; CGxDevice::IRsForceUpdate(EGxRenderState) CGxDevice__IRsForceUpdate 00685A70 f end=00685B4E type="void __thiscall func(CGxDevice* this)" ; CGxDevice::IRsForceUpdate() @@ -61,15 +71,19 @@ CGxDevice__RsSet_pointer_to_void 00685F50 f end=00685FB0 type="void __thiscall f CGxDevice__RsPop 00685FB0 f end=00686116 type="void __thiscall func(CGxDevice* this)" CGxDevice__BufCreate 00687660 f end=006876C9 type="CGxBuf* __thiscall func(CGxDevice* this, CGxPool* pool, uint32_t itemSize, uint32_t itemCount, uint32_t index)" CGxDevice__PoolCreate 006876D0 f end=0068773F type="CGxPool* __thiscall func(CGxDevice* this, EGxPoolTarget target, EGxPoolUsage usage, uint32_t size, EGxPoolHintBits hint, char* name)" +CGxDevice__QueryCreate 006877C0 f end=00687811 type="void __thiscall func(CGxDevice* this, CGxQuery** query, EGxQueryType queryType)" +CGxDevice__ShaderDestroy 00687820 f end=00687862 type="void __thiscall func(CGxDevice* this, CGxShader** shader)" +CGxDevice__TexDestroy 00687980 f end=006879E1 type="void __thiscall func(CGxDevice* this, CGxTex* texId)" +CGxDevice__QueryDestroy 006879F0 f end=00687A8E type="void __thiscall func(CGxDevice* this, CGxQuery** query)" CGxDevice__ICursorDraw 00687A90 f end=00687FCA type="void __thiscall func(CGxDevice* this)" CGxDevice__PoolDestroy 00688340 f end=00688372 type="void __thiscall func(CGxDevice* this, CGxPool* pool)" CGxDevice__CGxDevice 00688690 f end=0068903F type="void __thiscall func(CGxDevice* this)" +CGxDevice__XformSetProjection 00689040 f end=0068904F type="void __thiscall func(CGxDevice* this, C44Matrix* matrix)" +CGxDevice__XformSetView 00689050 f end=006890C0 type="void __thiscall func(CGxDevice* this, C44Matrix* matrix)" CGxDevice__destructor 006890C0 f end=00689460 type="void __thiscall func(CGxDevice* this)" -CGxDevice__scalar_deleting_destructor 00689690 f end=006896BB type="void __thiscall func(CGxDevice *this, uint8_t __flags)" +CGxDevice__scalar_deleting_destructor 00689690 f end=006896BB type="void __thiscall func(CGxDevice* this, uint8_t __flags)" CGxDevice__ShaderCreate 006897C0 f end=00689A49 type="void __thiscall func(CGxDevice* this, CGxShader**, EGxShTarget, char*, char*, int32_t)" CGxDevice__NewD3d 00689EF0 f end=00689F14 type="CGxDevice* __stdcall func()" CGxDevice__NewOpenGl 0068BF20 f end=0068BF44 type="CGxDevice* __stdcall func()" CGxDevice__NewD3d9Ex 0068C220 f end=0068C244 type="CGxDevice* __stdcall func()" CGxDevice__ITexWHDStartEnd 006A5EF0 f end=006A5FDF type="void __thiscall func(CGxDevice* this, CGxTex* texId, uint32_t* width, uint32_t* height, uint32_t* baseMip, uint32_t* mipCount)" -CGxDevice__DeviceTakeScreenShot 00682D30 f end=00682D3B type="void __thiscall func(CGxDevice* this)" -CGxDevice__DeviceReadScreenShot 00684260 f end=0068429E type="void __thiscall func(CGxDevice* this, uint32_t* w, uint32_t* h, CImVector** pixels)" \ No newline at end of file diff --git a/profile/3.3.5a-windows-386/symbol/gxdeviced3d/func.sym b/profile/3.3.5a-windows-386/symbol/gxdeviced3d/func.sym index d184bd6..2b35d81 100644 --- a/profile/3.3.5a-windows-386/symbol/gxdeviced3d/func.sym +++ b/profile/3.3.5a-windows-386/symbol/gxdeviced3d/func.sym @@ -1,34 +1,67 @@ CGxDeviceD3d__ICreateD3dIB 0068E180 f end=0068E1E8 CGxDeviceD3d__ISetPresentParms 0068E250 f end=0068E448 -CGxDeviceD3d__PoolDestroy 0068E720 f end=0068E742 -CGxDeviceD3d__CursorSetVisible 0068E750 f end=0068E7D6 -CGxDeviceD3d__ICursorDraw 0068E810 f end=0068E8F2 -CGxDeviceD3d__ICursorCreate 0068E900 f end=0068E975 +CGxDeviceD3d__DeviceEvictResources 0068E450 f end=0068E49E type="void __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__DeviceSetBaseMipLevel 0068E4A0 f end=0068E4BD type="void __thiscall func(CGxDeviceD3d* this, uint32_t level)" +CGxDeviceD3d__DeviceSetGamma 0068E4C0 f end=0068E507 type="void __thiscall func(CGxDeviceD3d* this, float gamma)" +CGxDeviceD3d__LogCrashInfo 0068E570 f end=0068E719 type="void __thiscall func(CGxDeviceD3d* this, char* buffer, uint32_t size)" +CGxDeviceD3d__PoolDestroy 0068E720 f end=0068E742 type="void __thiscall func(CGxDeviceD3d* this, CGxPool* this)" +CGxDeviceD3d__CursorSetVisible 0068E750 f end=0068E7D6 type="void __thiscall func(CGxDeviceD3d* this, int32_t visible)" +CGxDeviceD3d__CursorUnlock 0068E7E0 f end=0068E804 type="void __thiscall func(CGxDeviceD3d* this, uint32_t x, uint32_t y)" +CGxDeviceD3d__ICursorDraw 0068E810 f end=0068E8F2 type="void __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__ICursorCreate 0068E900 f end=0068E975 type="void __thiscall func(CGxDeviceD3d* this, CGxFormat* format)" +CGxDeviceD3d__StereoSetConvergence 0068E980 f end=0068E99A type="void __thiscall func(CGxDeviceD3d* this, float c)" +CGxDeviceD3d__StereoSetSeparation 0068E9A0 f end=0068E9BA type="void __thiscall func(CGxDeviceD3d* this, float s)" +CGxDeviceD3d__QueryCreate 0068E9C0 f end=0068EA0A type="void __thiscall func(CGxDeviceD3d* this, CGxQuery** query, EGxQueryType queryType)" +CGxDeviceD3d__QueryBegin 0068EA10 f end=0068EA81 type="bool __thiscall func(CGxDeviceD3d* this, CGxQuery* query)" +CGxDeviceD3d__QueryGetParam 0068EA90 f end=0068EB1D type="bool __thiscall func(CGxDeviceD3d* this, CGxQuery* query, EGxQueryParam param, uint32_t* data)" CGxDeviceD3d__ICreateWindow 0068EBB0 f end=0068ED78 CGxDeviceD3d__ILoadD3dLib 0068ED80 f end=0068EE13 CGxDeviceD3d__ISetCaps 0068EE20 f end=0068F36D CGxDeviceD3d__ICreateD3dDevice 0068F3D0 f end=0068F692 +CGxDeviceD3d__DeviceSetRenderTarget 0068F770 f end=0068F8F2 type="void __thiscall func(CGxDeviceD3d* this, EGxBuffer buffer, CGxTex* texture, uint32_t plane)" +CGxDeviceD3d__DeviceResolveDepthBuffer 0068F900 f end=0068F94A type="void __thiscall func(CGxDeviceD3d* this, CGxTex* texId)" +CGxDeviceD3d__DeviceCopyTex 0068F950 f end=0068FA5E type="void __thiscall func(CGxDeviceD3d* this, CGxTex* a1, int32_t a2, CGxTex* a3, int32_t a4)" CGxDeviceD3d__IBufUnlock 0068FA60 f end=0068FADC -CGxDeviceD3d__BufUnlock 0068FAE0 f end=0068FB07 +CGxDeviceD3d__BufUnlock 0068FAE0 f end=0068FB07 type="int32_t __thiscall func(CGxDeviceD3d* this, CGxBuf* buf, uint32_t size)" CGxDeviceD3d__IBufLock 0068FB10 f end=0068FCDC -CGxDeviceD3d__BufLock 0068FCE0 f end=0068FCFE -CGxDeviceD3d__BufData 0068FD00 f end=0068FD49 -CGxDeviceD3d__CGxDeviceD3d 0068FD50 f end=0068FE80 -CGxDeviceD3d__DeviceWM 00690230 f end=0069038D -CGxDeviceD3d__DeviceSetFormat 006904D0 f end=006905E8 +CGxDeviceD3d__BufLock 0068FCE0 f end=0068FCFE type="char* __thiscall func(CGxDeviceD3d* this, CGxBuf* buf)" +CGxDeviceD3d__BufData 0068FD00 f end=0068FD49 type="void __thiscall func(CGxDeviceD3d* this, CGxBuf* buf, const void* data, uint32_t size, uint32_t offset)" +CGxDeviceD3d__CGxDeviceD3d 0068FD50 f end=0068FE80 type="void __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__scalar_deleting_destructor 0068FE80 f end=0068FEC8 type="void __thiscall func(CGxDeviceD3d* this, uint8_t __flags)" +CGxDeviceD3d__DeviceReadPixels 0068FED0 f end=00690144 type="void __thiscall func(CGxDeviceD3d* this, CiRect* rect, TSGrowableArray_CImVector* pixels)" +CGxDeviceD3d__IReleaseD3dResources 00690150 f end=00690223 +CGxDeviceD3d__DeviceWM 00690230 f end=0069038D type="void __thiscall func(CGxDeviceD3d* this, EGxWM wm, int32_t param1, int32_t param2)" +CGxDeviceD3d__DeviceSetFormat 006904D0 f end=006905E8 type="int32_t __thiscall func(CGxDeviceD3d* this, CGxFormat* format)" +CGxDeviceD3d__DeviceDestroy 006905F0 f end=00690679 type="void __thiscall func(CGxDeviceD3d* this)" CGxDeviceD3d__ICreateD3d 00690680 f end=00690742 -CGxDeviceD3d__DeviceCreate_WindowProc_CGxFormat 00690750 f end=00690821 +CGxDeviceD3d__DeviceCreate 00690750 f end=00690821 type="void __thiscall func(CGxDeviceD3d* this, int32_t (*windowProc)(void*, uint32_t, uintptr_t, intptr_t), CGxFormat* format)" +CGxDeviceD3d__DeviceCreate 00690830 f end=00690897 type="void __thiscall func(CGxDeviceD3d* this, uintptr_t hwnd, CGxFormat* format)" CGxDeviceD3d__ICreateD3dVB 0069FB00 f end=0069FB68 CGxDeviceD3d__CreatePoolAPI 0069FB70 f end=0069FBB8 -CGxDeviceD3d__ICursorDestroy 006A00C0 f end=006A0102 +CGxDeviceD3d__ICursorClip 0069FE10 f end=0069FE57 ; UC (invented name) +CGxDeviceD3d__DeviceSetGamma 0069FE80 f end=0069FEC4 type="void __thiscall func(CGxDeviceD3d* this, CGxGammaRamp* ramp)" +CGxDeviceD3d__DeviceWindow 0069FED0 f end=0069FED7 type="void* __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__DeviceOverride 0069FF40 f end=0069FF7F type="void __thiscall func(CGxDeviceD3d* this, EGxOverride override, uint32_t value)" +CGxDeviceD3d__PoolSizeSet 0069FF80 f end=0069FFCD type="void __thiscall func(CGxDeviceD3d* this, CGxPool* pool, uint32_t size)" +CGxDeviceD3d__ICursorDestroy 006A00C0 f end=006A0102 type="void __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__StereoGetConvergence 006A0110 f end=006A0117 type="float __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__StereoGetSeparation 006A0120 f end=006A0127 type="float __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__StereoEnabled 006A0130 f end=006A013D type="bool __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__QueryDestroy 006A0190 f end=006A01C0 type="bool __thiscall func(CGxDeviceD3d* this, CGxQuery** query)" +CGxDeviceD3d__QueryEnd 006A0240 f end=006A0272 type="bool __thiscall func(CGxDeviceD3d* this, CGxQuery* query)" +CGxDeviceD3d__QueryGetData 006A0310 f end=006A035F type="bool __thiscall func(CGxDeviceD3d* this, CGxQuery* query, uint32_t* data)" CGxDeviceD3d__WindowProcD3d 006A0360 f end=006A0834 +CGxDeviceD3d__DeviceReadDepths 006A1950 f end=006A19C4 type="void __thiscall func(CGxDeviceD3d* this, CiRect* rect, TSGrowableArray_float* depths)" +CGxDeviceD3d__TexDestroy 006A2BB0 f end=006A2BF1 type="void __thiscall func(CGxDeviceD3d* this, CGxTex* texId)" CGxDeviceD3d__ITexCreate 006A2C00 f end=006A2D7E CGxDeviceD3d__ITexUpload 006A2D80 f end=006A3062 -CGxDeviceD3d__ITexMarkAsUpdated 006A3070 f end=006A30CF +CGxDeviceD3d__ITexMarkAsUpdated 006A3070 f end=006A30CF type="void __thiscall func(CGxDeviceD3d* this, CGxTex* texId)" +CGxDeviceD3d__TexCopy 006A30D0 f end=006A31D6 type="void __thiscall func(CGxDeviceD3d* this, CGxTex* a1, CGxTex* a2, C2iVector* a3, C2iVector* a4, uint32_t a5, uint32_t a6)" +CGxDeviceD3d__TexStretch 006A31E0 f end=006A3349 type="void __thiscall func(CGxDeviceD3d* this, CGxTex* a1, CGxTex* a2, CiRect* a3, CiRect* a4, uint32_t a5, uint32_t a6)" CGxDeviceD3d__ISceneBegin 006A3350 f end=006A3417 CGxDeviceD3d__ISceneEnd 006A3420 f end=006A3449 -CGxDeviceD3d__ScenePresent 006A3450 f end=006A3611 -CGxDeviceD3d__Draw 006A3620 f end=006A3716 +CGxDeviceD3d__ScenePresent 006A3450 f end=006A3611 type="void __thiscall func(CGxDeviceD3d* this, uint32_t mask)" +CGxDeviceD3d__Draw 006A3620 f end=006A3716 type="void __thiscall func(CGxDeviceD3d* this, CGxBatch* batch)" CGxDeviceD3d__IStateSyncEnables 006A3810 f end=006A386E CGxDeviceD3d__ISetVertexBuffer 006A39E0 f end=006A3A59 CGxDeviceD3d__IStateSetD3DDefaults 006A3A60 f end=006A3C34 @@ -38,22 +71,22 @@ CGxDeviceD3d__ISetAlphaOp 006A41F0 f end=006A424C CGxDeviceD3d__IStateSyncMaterial 006A4700 f end=006A4846 CGxDeviceD3d__IStateSyncXforms 006A4850 f end=006A48FE CGxDeviceD3d__ISetTexture 006A4900 f end=006A4AB3 -CGxDeviceD3d__IRsSendToHw 006A4C30 f end=006A5499 +CGxDeviceD3d__IRsSendToHw 006A4C30 f end=006A5499 type="void __thiscall func(CGxDeviceD3d* this, EGxRenderState rs)" CGxDeviceD3d__ICreateD3dVertexDecl 006A5540 f end=006A5677 CGxDeviceD3d__IStateSyncVertexPtrs 006A5700 f end=006A5934 CGxDeviceD3d__IStateSync 006A5940 f end=006A59f5 -CGxDeviceD3d__CapsWindowSize 006A5A00 f end=006A5A25 +CGxDeviceD3d__CapsWindowSize 006A5A00 f end=006A5A25 type="void __thiscall func(CGxDeviceD3d* this, CRect* dst)" CGxDeviceD3d__IXformSetWorld 006A5A30 f end=006A5A92 type="void __thiscall func(CGxDeviceD3d* this)" CGxDeviceD3d__IBindPixelShader 006A5C70 f end=006A5D48 -CGxDeviceD3d__IShaderCreate 006A5E10 f end=006A5E36 -CGxDeviceD3d__SceneClear 006A74B0 f end=006A7538 -CGxDeviceD3d__CapsWindowSizeInScreenCoords 006A9920 f end=006A99D4 -CGxDeviceD3d__XformSetProjection 006A9B40 f end=006A9D88 -CGxDeviceD3d__XformSetView 006A9E00 f end=006A9E09 +CGxDeviceD3d__IShaderReload 006A5D50 f end=006A5E07 type="void __thiscall func(CGxDeviceD3d* this, CGxShader* shader, const char* a2, const char* a3)" +CGxDeviceD3d__IShaderCreate 006A5E10 f end=006A5E36 type="void __thiscall func(CGxDeviceD3d* this, CGxShader* shader)" +CGxDeviceD3d__SceneClear 006A74B0 f end=006A7538 type="void __thiscall func(CGxDeviceD3d* this, uint32_t mask, CImVector color)" +CGxDeviceD3d__CapsWindowSizeInScreenCoords 006A9920 f end=006A99D4 type="void __thiscall func(CGxDeviceD3d* this, CRect* dst)" +CGxDeviceD3d__XformSetProjection 006A9B40 f end=006A9D88 type="void __thiscall func(CGxDeviceD3d* this, C44Matrix* matrix)" +CGxDeviceD3d__XformSetView 006A9E00 f end=006A9E09 type="void __thiscall func(CGxDeviceD3d* this, C44Matrix* matrix)" CGxDeviceD3d__IShaderConstantsFlush 006A9FE0 f end=006AA06D -CGxDeviceD3d__IShaderCreatePixel 006AA070 f end=006AA0C5 -CGxDeviceD3d__IShaderCreateVertex 006AA0D0 f end=006AA125 -CGxDeviceD3d__ShaderCreate 006AA130 f end=006AA18A +CGxDeviceD3d__IShaderCreatePixel 006AA070 f end=006AA0C5 type="void __thiscall func(CGxDeviceD3d* this, CGxShader* shader)" +CGxDeviceD3d__IShaderCreateVertex 006AA0D0 f end=006AA125 type="void __thiscall func(CGxDeviceD3d* this, CGxShader* shader)" +CGxDeviceD3d__ShaderCreate 006AA130 f end=006AA18A type="void __thiscall func(CGxShader** shaders, EGxShTarget target, char* a3, char* a4, int32_t permutations)" +CGxDeviceD3d__ShaderDestroy 006AA190 f end=006AA207 type="void __thiscall func(CGxDeviceD3d* this, CGxShader** shader)" CGxDeviceD3d__IBindVertexShader 006AA2F0 f end=006AA346 -CGxDeviceD3d__IReleaseD3dResources 00690150 f end=00690223 -CGxDeviceD3d__ICursorClip 0069FE10 f end=0069FE57 ; UC (invented name) \ No newline at end of file diff --git a/profile/3.3.5a-windows-386/symbol/main.sym b/profile/3.3.5a-windows-386/symbol/main.sym index 9fce952..7122194 100644 --- a/profile/3.3.5a-windows-386/symbol/main.sym +++ b/profile/3.3.5a-windows-386/symbol/main.sym @@ -185,6 +185,7 @@ C44Matrix__RotateAroundZ 004C3380 f C44Matrix__Rotate 004C33C0 f C3Vector__Normalize_1 004C3420 f C3Vector__Normalize_2 004C3600 f +TSGrowableArray_C3Vector__SetCount 004C4B80 f end=004C4C75 type="void __thiscall func(TSGrowableArray_C3Vector* this, uint32_t count)" C33Matrix__operator_assign_C33Matrix 004C51B0 f CGlueMgr__SetCurrentAccount 004D7F60 f end=004D7F82 CGlueMgr__DisplayLoginStatus 004D80C0 f end=004D8200 @@ -1077,6 +1078,7 @@ Script_GetNumTrackingTypes 0057F170 f end=0057F1AE Script_GetTrackingInfo 0057F1B0 f end=0057F37A Script_SetTracking 0057F380 f end=0057F4F0 Script_GetTrackingTexture 0057F4F0 f end=0057F5CE +TSGrowableArray_C2Vector__SetCount 0057FDD0 f end=0057FE93 type="void __thiscall func(TSGrowableArray_C2Vector* this, uint32_t count)" Script_GetMerchantNumItems 005841D0 f end=005841F2 Script_GetMerchantItemLink 00584200 f end=005842C4 Script_GetMerchantItemMaxStack 005842D0 f end=00584389 @@ -2088,6 +2090,7 @@ UpdateCursor 006162C0 f end=006163AD CursorInitialize 006163B0 f end=006164A5 CursorSetMode 00616800 f end=0061682E type="void __stdcall func(CURSORMODE mode)" GxXformPush_EGxXform_C44Matrix 00616AD0 f end=00616AE8 +TSGrowableArray_CImVector__SetCount 00616CA0 f end=00616D07 type="void __thiscall func(TSGrowableArray_CImVector* this, uint32_t count)" nullsub_4 00632050 f nullsub_5 00653A10 f GxDevCreate 00681290 f end=00681301 @@ -2105,8 +2108,8 @@ GxPrimLockIndexPtr 006823A0 f end=006823F8 type="void __stdcall func(EGxPrim pri GxPrimVertexPtr 00682400 f end=00682781 type="void __stdcall func(uint32_t vertexCount, C3Vector* pos, uint32_t posStride, C3Vector* normal, uint32_t normalStride, CImVector* color, uint32_t colorStride, C2Vector* tex0, uint32_t tex0Stride, C2Vector* tex1, uint32_t tex1Stride)" ; this is one of the functions named 'GxPrimVertexPtr' that uses the fixed-function pipeline GxPrimLockVertexPtrs 006828C0 f end=006828FE type="void __stdcall func(uint32_t vertexCount, C3Vector* pos, uint32_t posStride, C3Vector* normal, uint32_t normalStride, CImVector* color, uint32_t colorStride, uint8_t* bone, uint32_t boneStride, C2Vector* tex0, uint32_t tex0Stride, C2Vector* tex1, uint32_t tex1Stride)" GxScenePresent 00682A00 f end=00682A33 -CGxDevice__DeviceCreate_WindowProc_CGxFormat 00682CB0 f end=00682CCB type="void __thiscall func(CGxDevice* this, int32_t (*windowProc)(void*, uint32_t, uintptr_t, intptr_t), CGxFormat* format)" -CGxDevice__DeviceCreate_CGxFormat 00682CD0 f end=00682CF0 type="void __thiscall func(CGxDevice* this, CGxFormat* format)" +CGxDevice__DeviceCreate 00682CB0 f end=00682CCB type="void __thiscall func(CGxDevice* this, int32_t (*windowProc)(void*, uint32_t, uintptr_t, intptr_t), CGxFormat* format)" +CGxDevice__DeviceCreate 00682CD0 f end=00682CF0 type="void __thiscall func(CGxDevice* this, uintptr_t hwnd, CGxFormat* format)" CGxDevice__DeviceDestroy 00682CF0 f end=00682CFB type="void __thiscall func(CGxDevice* this)" CGxDevice__DeviceSetBaseMipLevel 00682D00 f end=00682D10 type="void __thiscall func(CGxDevice* this, uint32_t baseMipLevel)" CGxDevice__DeviceApi 00682D20 f end=00682D27 type="EGxApi __thiscall func(CGxDevice* this)" @@ -2118,6 +2121,8 @@ CGxDevice__CapsHasContext 00682E20 f end=00682E47 type="int32_t __thiscall func( CGxDevice__ScenePresent 00682E50 f end=00682E66 type="void __thiscall func(CGxDevice* this)" CGxDevice__PrimIndexPtr 00682F10 f end=00682F3C type="void __thiscall func(CGxDevice* this, CGxBuf* buf)" CGxDevice__PrimCalcCount 00682F40 f end=00682F66 type="uint32_t __stdcall func(EGxPrim primType, uint32_t indexCount)" +CGxDevice__PrimNormal 00682F70 f end=00682F9E type="void __thiscall func(CGxDevice* this, C3Vector* n)" +CGxDevice__PrimTexCoord 00682FA0 f end=00682FCB type="void __thiscall func(CGxDevice* this, uint32_t tmu, C2Vector* t)" CGxDevice__LightEnable 00683080 f end=006830A4 type="void __thiscall func(CGxDevice* this, uint32_t whichLight, int32_t enable)" CGxDevice__NeedsUpdate 006830B0 f end=006830F9 type="int32_t __thiscall func(CGxDevice* this, uint32_t app, uint32_t hw, uint32_t appDisables, uint32_t hwDisables, uint32_t flagPos, int32_t* enable)" CGxDevice__MasterEnable 00683100 f end=00683121 type="int32_t __thiscall func(CGxDevice* this, EGxMasterEnables state)" @@ -2134,14 +2139,17 @@ CGxDevice__CursorSetVisible 00683640 f end=00683650 type="void __thiscall func(C CGxDevice__CursorLock 00683650 f end=00683657 type="uint32_t* __thiscall func(CGxDevice* this)" CGxDevice__CursorSetDepth 00683660 f end=00683670 type="void __thiscall func(CGxDevice* this, float depth)" CGxDevice__DeviceSetFormat 006840F0 f end=0068416C type="int32_t __thiscall func(CGxDevice* this, CGxFormat* format)" -CGxDevice__DeviceSetGamma_float 00684170 f end=00684189 type="void __thiscall func(CGxDevice* this, float gamma)" -CGxDevice__DeviceSetGamma_CGxGammaRamp 00684190 f end=006841AF type="int32_t __thiscall func(CGxDevice* this, CGxGammaRamp* ramp)" +CGxDevice__DeviceSetGamma 00684170 f end=00684189 type="void __thiscall func(CGxDevice* this, float gamma)" +CGxDevice__DeviceSetGamma 00684190 f end=006841AF type="int32_t __thiscall func(CGxDevice* this, CGxGammaRamp* ramp)" CGxDevice__DeviceReadScreenShot 00684260 f end=0068429E type="void __thiscall func(CGxDevice* this, uint32_t* w, uint32_t* h, CImVector** pixels)" +CGxDevice__DeviceSetRenderTarget 006842A0 f end=0068435D type="void __thiscall func(CGxDevice* this, EGxBuffer buffer, CGxTex* texture, uint32_t plane)" CGxDevice__DeviceSetDefWindow 00684360 f end=006843B0 type="void __thiscall func(CGxDevice* this, CRect* rect)" CGxDevice__NotifyOnDeviceRestored 006843B0 f end=006843D9 type="void __thiscall func(CGxDevice* this)" CGxDevice__NotifyOnTextureRecreation 006843E0 f end=00684409 type="void __thiscall func(CGxDevice* this)" CGxDevice__NotifyOnStereoChanged 00684410 f end=00684439 type="void __thiscall func(CGxDevice* this)" CGxDevice__ClipPlaneSet 00684440 f end=006844B9 type="void __thiscall func(CGxDevice* this, uint32_t a2, C4Plane* plane)" +CGxDevice__PrimColor 00684590 f end=006845AC type="void __thiscall func(CGxDevice* this, CImVector* c)" +CGxDevice__PrimDrawElements 006845B0 f end=0068461D type="void __thiscall func(CGxDevice* this)" CGxDevice__LightSet 006847D0 f end=00684843 type="void __thiscall func(CGxDevice* this, uint32_t a2, CGxLight* light, C3Vector* pos)" CGxDevice__BufStream 00684850 f end=0068489F type="void __thiscall func(CGxDevice* this, EGxPoolTarget target, uint32_t itemSize, uint32_t itemCount)" CGxDevice__TexMarkForUpdate 006848A0 f end=000684900 type="void __thiscall func(CGxDevice* this, CGxTex* texId, CiRect* updateRect, int32_t immediate)" @@ -2152,12 +2160,15 @@ CGxDevice__CursorUnlock 00684B50 f end=00684B99 type="void __thiscall func(CGxDe CGxDevice__Log 00684C20 f end=00684C3E type="void __stdcall func(char* format, ...)" CGxDevice__Log_CGxCaps 00684C40 f end=00684D07 type="void __stdcall func(CGxCaps* caps)" ; CGxDevice::Log(CGxCaps const&) const CGxDevice__Log_CGxFormat 00684D10 f end=00684D6C type="void __stdcall func(CGxFormat* format)" +CGxDevice__DeviceOverride 00684FE0 f end=00685036 type="void __thiscall func(CGxDevice* this, EGxOverride override, uint32_t value)" CGxDevice__AddDeviceRestoredCallback 006853B0 f end=006853C6 type="void __thiscall func(CGxDevice* this, DEVICERESTOREDCALLBACK fn)" CGxDevice__RemoveDeviceRestoredCallback 006853D0 f end=0068545C type="int32_t __thiscall func(CGxDevice* this, DEVICERESTOREDCALLBACK fn)" CGxDevice__AddTextureRecreationCallback 00685460 f end=00685476 type="void __thiscall func(CGxDevice* this, TEXTURERECREATIONCALLBACK fn)" CGxDevice__RemoveTextureRecreationCallback 00685480 f end=0068550C type="int32_t __thiscall func(CGxDevice* this, TEXTURERECREATIONCALLBACK fn)" CGxDevice__AddStereoChangedCallback 00685510 f end=00685526 type="void __thiscall func(CGxDevice* this, STEREOCHANGEDCALLBACK fn)" CGxDevice__RemoveStereoChangedCallback 00685530 f end=006855BC type="int32_t __thiscall func(CGxDevice* this, STEREOCHANGEDCALLBACK fn)" +CGxDevice__PrimBegin 006855C0 f end=00685638 type="void __thiscall func(CGxDevice* this, EGxPrim primType)" +CGxDevice__PrimVertex 00685640 f end=00685961 type="void __thiscall func(CGxDevice* this, C3Vector* v)" CGxDevice__IRsDirty 00685970 f end=006859DB type="void __thiscall func(CGxDevice* this, EGxRenderState which)" CGxDevice__IRsForceUpdate_EGxRenderState 006859E0 f end=00685A65 type="void __thiscall func(CGxDevice* this, EGxRenderState which)" ; CGxDevice::IRsForceUpdate(EGxRenderState) CGxDevice__IRsForceUpdate 00685A70 f end=00685B4E type="void __thiscall func(CGxDevice* this)" ; CGxDevice::IRsForceUpdate() @@ -2168,11 +2179,17 @@ CGxDevice__RsSet_pointer_to_void 00685F50 f end=00685FB0 type="void __thiscall f CGxDevice__RsPop 00685FB0 f end=00686116 type="void __thiscall func(CGxDevice* this)" CGxDevice__BufCreate 00687660 f end=006876C9 type="CGxBuf* __thiscall func(CGxDevice* this, CGxPool* pool, uint32_t itemSize, uint32_t itemCount, uint32_t index)" CGxDevice__PoolCreate 006876D0 f end=0068773F type="CGxPool* __thiscall func(CGxDevice* this, EGxPoolTarget target, EGxPoolUsage usage, uint32_t size, EGxPoolHintBits hint, char* name)" +CGxDevice__QueryCreate 006877C0 f end=00687811 type="void __thiscall func(CGxDevice* this, CGxQuery** query, EGxQueryType queryType)" +CGxDevice__ShaderDestroy 00687820 f end=00687862 type="void __thiscall func(CGxDevice* this, CGxShader** shader)" +CGxDevice__TexDestroy 00687980 f end=006879E1 type="void __thiscall func(CGxDevice* this, CGxTex* texId)" +CGxDevice__QueryDestroy 006879F0 f end=00687A8E type="void __thiscall func(CGxDevice* this, CGxQuery** query)" CGxDevice__ICursorDraw 00687A90 f end=00687FCA type="void __thiscall func(CGxDevice* this)" CGxDevice__PoolDestroy 00688340 f end=00688372 type="void __thiscall func(CGxDevice* this, CGxPool* pool)" CGxDevice__CGxDevice 00688690 f end=0068903F type="void __thiscall func(CGxDevice* this)" +CGxDevice__XformSetProjection 00689040 f end=0068904F type="void __thiscall func(CGxDevice* this, C44Matrix* matrix)" +CGxDevice__XformSetView 00689050 f end=006890C0 type="void __thiscall func(CGxDevice* this, C44Matrix* matrix)" CGxDevice__destructor 006890C0 f end=00689460 type="void __thiscall func(CGxDevice* this)" -CGxDevice__scalar_deleting_destructor 00689690 f end=006896BB type="void __thiscall func(CGxDevice *this, uint8_t __flags)" +CGxDevice__scalar_deleting_destructor 00689690 f end=006896BB type="void __thiscall func(CGxDevice* this, uint8_t __flags)" CGxDevice__ShaderCreate 006897C0 f end=00689A49 type="void __thiscall func(CGxDevice* this, CGxShader**, EGxShTarget, char*, char*, int32_t)" CGxShader__Valid 00689A50 f end=00689A6F CGxDevice__NewD3d 00689EF0 f end=00689F14 type="CGxDevice* __stdcall func()" @@ -2181,38 +2198,69 @@ CGxDevice__NewOpenGl 0068BF20 f end=0068BF44 type="CGxDevice* __stdcall func()" CGxDevice__NewD3d9Ex 0068C220 f end=0068C244 type="CGxDevice* __stdcall func()" CGxDeviceD3d__ICreateD3dIB 0068E180 f end=0068E1E8 CGxDeviceD3d__ISetPresentParms 0068E250 f end=0068E448 -CGxDeviceD3d__PoolDestroy 0068E720 f end=0068E742 -CGxDeviceD3d__CursorSetVisible 0068E750 f end=0068E7D6 -CGxDeviceD3d__ICursorDraw 0068E810 f end=0068E8F2 -CGxDeviceD3d__ICursorCreate 0068E900 f end=0068E975 +CGxDeviceD3d__DeviceEvictResources 0068E450 f end=0068E49E type="void __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__DeviceSetBaseMipLevel 0068E4A0 f end=0068E4BD type="void __thiscall func(CGxDeviceD3d* this, uint32_t level)" +CGxDeviceD3d__DeviceSetGamma 0068E4C0 f end=0068E507 type="void __thiscall func(CGxDeviceD3d* this, float gamma)" +CGxDeviceD3d__LogCrashInfo 0068E570 f end=0068E719 type="void __thiscall func(CGxDeviceD3d* this, char* buffer, uint32_t size)" +CGxDeviceD3d__PoolDestroy 0068E720 f end=0068E742 type="void __thiscall func(CGxDeviceD3d* this, CGxPool* this)" +CGxDeviceD3d__CursorSetVisible 0068E750 f end=0068E7D6 type="void __thiscall func(CGxDeviceD3d* this, int32_t visible)" +CGxDeviceD3d__CursorUnlock 0068E7E0 f end=0068E804 type="void __thiscall func(CGxDeviceD3d* this, uint32_t x, uint32_t y)" +CGxDeviceD3d__ICursorDraw 0068E810 f end=0068E8F2 type="void __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__ICursorCreate 0068E900 f end=0068E975 type="void __thiscall func(CGxDeviceD3d* this, CGxFormat* format)" +CGxDeviceD3d__StereoSetConvergence 0068E980 f end=0068E99A type="void __thiscall func(CGxDeviceD3d* this, float c)" +CGxDeviceD3d__StereoSetSeparation 0068E9A0 f end=0068E9BA type="void __thiscall func(CGxDeviceD3d* this, float s)" +CGxDeviceD3d__QueryCreate 0068E9C0 f end=0068EA0A type="void __thiscall func(CGxDeviceD3d* this, CGxQuery** query, EGxQueryType queryType)" +CGxDeviceD3d__QueryBegin 0068EA10 f end=0068EA81 type="bool __thiscall func(CGxDeviceD3d* this, CGxQuery* query)" +CGxDeviceD3d__QueryGetParam 0068EA90 f end=0068EB1D type="bool __thiscall func(CGxDeviceD3d* this, CGxQuery* query, EGxQueryParam param, uint32_t* data)" CGxDeviceD3d__ICreateWindow 0068EBB0 f end=0068ED78 CGxDeviceD3d__ILoadD3dLib 0068ED80 f end=0068EE13 CGxDeviceD3d__ISetCaps 0068EE20 f end=0068F36D CGxDeviceD3d__ICreateD3dDevice 0068F3D0 f end=0068F692 +CGxDeviceD3d__DeviceSetRenderTarget 0068F770 f end=0068F8F2 type="void __thiscall func(CGxDeviceD3d* this, EGxBuffer buffer, CGxTex* texture, uint32_t plane)" +CGxDeviceD3d__DeviceResolveDepthBuffer 0068F900 f end=0068F94A type="void __thiscall func(CGxDeviceD3d* this, CGxTex* texId)" +CGxDeviceD3d__DeviceCopyTex 0068F950 f end=0068FA5E type="void __thiscall func(CGxDeviceD3d* this, CGxTex* a1, int32_t a2, CGxTex* a3, int32_t a4)" CGxDeviceD3d__IBufUnlock 0068FA60 f end=0068FADC -CGxDeviceD3d__BufUnlock 0068FAE0 f end=0068FB07 +CGxDeviceD3d__BufUnlock 0068FAE0 f end=0068FB07 type="int32_t __thiscall func(CGxDeviceD3d* this, CGxBuf* buf, uint32_t size)" CGxDeviceD3d__IBufLock 0068FB10 f end=0068FCDC -CGxDeviceD3d__BufLock 0068FCE0 f end=0068FCFE -CGxDeviceD3d__BufData 0068FD00 f end=0068FD49 -CGxDeviceD3d__CGxDeviceD3d 0068FD50 f end=0068FE80 +CGxDeviceD3d__BufLock 0068FCE0 f end=0068FCFE type="char* __thiscall func(CGxDeviceD3d* this, CGxBuf* buf)" +CGxDeviceD3d__BufData 0068FD00 f end=0068FD49 type="void __thiscall func(CGxDeviceD3d* this, CGxBuf* buf, const void* data, uint32_t size, uint32_t offset)" +CGxDeviceD3d__CGxDeviceD3d 0068FD50 f end=0068FE80 type="void __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__scalar_deleting_destructor 0068FE80 f end=0068FEC8 type="void __thiscall func(CGxDeviceD3d* this, uint8_t __flags)" +CGxDeviceD3d__DeviceReadPixels 0068FED0 f end=00690144 type="void __thiscall func(CGxDeviceD3d* this, CiRect* rect, TSGrowableArray_CImVector* pixels)" CGxDeviceD3d__IReleaseD3dResources 00690150 f end=00690223 -CGxDeviceD3d__DeviceWM 00690230 f end=0069038D -CGxDeviceD3d__DeviceSetFormat 006904D0 f end=006905E8 +CGxDeviceD3d__DeviceWM 00690230 f end=0069038D type="void __thiscall func(CGxDeviceD3d* this, EGxWM wm, int32_t param1, int32_t param2)" +CGxDeviceD3d__DeviceSetFormat 006904D0 f end=006905E8 type="int32_t __thiscall func(CGxDeviceD3d* this, CGxFormat* format)" +CGxDeviceD3d__DeviceDestroy 006905F0 f end=00690679 type="void __thiscall func(CGxDeviceD3d* this)" CGxDeviceD3d__ICreateD3d 00690680 f end=00690742 -CGxDeviceD3d__DeviceCreate_WindowProc_CGxFormat 00690750 f end=00690821 +CGxDeviceD3d__DeviceCreate 00690750 f end=00690821 type="void __thiscall func(CGxDeviceD3d* this, int32_t (*windowProc)(void*, uint32_t, uintptr_t, intptr_t), CGxFormat* format)" +CGxDeviceD3d__DeviceCreate 00690830 f end=00690897 type="void __thiscall func(CGxDeviceD3d* this, uintptr_t hwnd, CGxFormat* format)" CGxDeviceD3d__ICreateD3dVB 0069FB00 f end=0069FB68 CGxDeviceD3d__CreatePoolAPI 0069FB70 f end=0069FBB8 CGxDeviceD3d__ICursorClip 0069FE10 f end=0069FE57 ; UC (invented name) -CGxDeviceD3d__ICursorDestroy 006A00C0 f end=006A0102 +CGxDeviceD3d__DeviceSetGamma 0069FE80 f end=0069FEC4 type="void __thiscall func(CGxDeviceD3d* this, CGxGammaRamp* ramp)" +CGxDeviceD3d__DeviceWindow 0069FED0 f end=0069FED7 type="void* __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__DeviceOverride 0069FF40 f end=0069FF7F type="void __thiscall func(CGxDeviceD3d* this, EGxOverride override, uint32_t value)" +CGxDeviceD3d__PoolSizeSet 0069FF80 f end=0069FFCD type="void __thiscall func(CGxDeviceD3d* this, CGxPool* pool, uint32_t size)" +CGxDeviceD3d__ICursorDestroy 006A00C0 f end=006A0102 type="void __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__StereoGetConvergence 006A0110 f end=006A0117 type="float __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__StereoGetSeparation 006A0120 f end=006A0127 type="float __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__StereoEnabled 006A0130 f end=006A013D type="bool __thiscall func(CGxDeviceD3d* this)" +CGxDeviceD3d__QueryDestroy 006A0190 f end=006A01C0 type="bool __thiscall func(CGxDeviceD3d* this, CGxQuery** query)" +CGxDeviceD3d__QueryEnd 006A0240 f end=006A0272 type="bool __thiscall func(CGxDeviceD3d* this, CGxQuery* query)" +CGxDeviceD3d__QueryGetData 006A0310 f end=006A035F type="bool __thiscall func(CGxDeviceD3d* this, CGxQuery* query, uint32_t* data)" CGxDeviceD3d__WindowProcD3d 006A0360 f end=006A0834 +CGxDeviceD3d__DeviceReadDepths 006A1950 f end=006A19C4 type="void __thiscall func(CGxDeviceD3d* this, CiRect* rect, TSGrowableArray_float* depths)" CGxDeviceD3d9Ex__CGxDeviceD3d9Ex 006A1A90 f end=006A1C24 +CGxDeviceD3d__TexDestroy 006A2BB0 f end=006A2BF1 type="void __thiscall func(CGxDeviceD3d* this, CGxTex* texId)" CGxDeviceD3d__ITexCreate 006A2C00 f end=006A2D7E CGxDeviceD3d__ITexUpload 006A2D80 f end=006A3062 -CGxDeviceD3d__ITexMarkAsUpdated 006A3070 f end=006A30CF +CGxDeviceD3d__ITexMarkAsUpdated 006A3070 f end=006A30CF type="void __thiscall func(CGxDeviceD3d* this, CGxTex* texId)" +CGxDeviceD3d__TexCopy 006A30D0 f end=006A31D6 type="void __thiscall func(CGxDeviceD3d* this, CGxTex* a1, CGxTex* a2, C2iVector* a3, C2iVector* a4, uint32_t a5, uint32_t a6)" +CGxDeviceD3d__TexStretch 006A31E0 f end=006A3349 type="void __thiscall func(CGxDeviceD3d* this, CGxTex* a1, CGxTex* a2, CiRect* a3, CiRect* a4, uint32_t a5, uint32_t a6)" CGxDeviceD3d__ISceneBegin 006A3350 f end=006A3417 CGxDeviceD3d__ISceneEnd 006A3420 f end=006A3449 -CGxDeviceD3d__ScenePresent 006A3450 f end=006A3611 -CGxDeviceD3d__Draw 006A3620 f end=006A3716 +CGxDeviceD3d__ScenePresent 006A3450 f end=006A3611 type="void __thiscall func(CGxDeviceD3d* this, uint32_t mask)" +CGxDeviceD3d__Draw 006A3620 f end=006A3716 type="void __thiscall func(CGxDeviceD3d* this, CGxBatch* batch)" CGxDeviceD3d__IStateSyncEnables 006A3810 f end=006A386E CGxDeviceD3d__ISetVertexBuffer 006A39E0 f end=006A3A59 CGxDeviceD3d__IStateSetD3DDefaults 006A3A60 f end=006A3C34 @@ -2222,23 +2270,25 @@ CGxDeviceD3d__ISetAlphaOp 006A41F0 f end=006A424C CGxDeviceD3d__IStateSyncMaterial 006A4700 f end=006A4846 CGxDeviceD3d__IStateSyncXforms 006A4850 f end=006A48FE CGxDeviceD3d__ISetTexture 006A4900 f end=006A4AB3 -CGxDeviceD3d__IRsSendToHw 006A4C30 f end=006A5499 +CGxDeviceD3d__IRsSendToHw 006A4C30 f end=006A5499 type="void __thiscall func(CGxDeviceD3d* this, EGxRenderState rs)" CGxDeviceD3d__ICreateD3dVertexDecl 006A5540 f end=006A5677 CGxDeviceD3d__IStateSyncVertexPtrs 006A5700 f end=006A5934 CGxDeviceD3d__IStateSync 006A5940 f end=006A59f5 -CGxDeviceD3d__CapsWindowSize 006A5A00 f end=006A5A25 +CGxDeviceD3d__CapsWindowSize 006A5A00 f end=006A5A25 type="void __thiscall func(CGxDeviceD3d* this, CRect* dst)" CGxDeviceD3d__IXformSetWorld 006A5A30 f end=006A5A92 type="void __thiscall func(CGxDeviceD3d* this)" CGxDeviceD3d__IBindPixelShader 006A5C70 f end=006A5D48 -CGxDeviceD3d__IShaderCreate 006A5E10 f end=006A5E36 +CGxDeviceD3d__IShaderReload 006A5D50 f end=006A5E07 type="void __thiscall func(CGxDeviceD3d* this, CGxShader* shader, const char* a2, const char* a3)" +CGxDeviceD3d__IShaderCreate 006A5E10 f end=006A5E36 type="void __thiscall func(CGxDeviceD3d* this, CGxShader* shader)" CGxDevice__ITexWHDStartEnd 006A5EF0 f end=006A5FDF type="void __thiscall func(CGxDevice* this, CGxTex* texId, uint32_t* width, uint32_t* height, uint32_t* baseMip, uint32_t* mipCount)" -CGxDeviceD3d__SceneClear 006A74B0 f end=006A7538 -CGxDeviceD3d__CapsWindowSizeInScreenCoords 006A9920 f end=006A99D4 -CGxDeviceD3d__XformSetProjection 006A9B40 f end=006A9D88 -CGxDeviceD3d__XformSetView 006A9E00 f end=006A9E09 +CGxDeviceD3d__SceneClear 006A74B0 f end=006A7538 type="void __thiscall func(CGxDeviceD3d* this, uint32_t mask, CImVector color)" +CGxDeviceD3d__CapsWindowSizeInScreenCoords 006A9920 f end=006A99D4 type="void __thiscall func(CGxDeviceD3d* this, CRect* dst)" +CGxDeviceD3d__XformSetProjection 006A9B40 f end=006A9D88 type="void __thiscall func(CGxDeviceD3d* this, C44Matrix* matrix)" +CGxDeviceD3d__XformSetView 006A9E00 f end=006A9E09 type="void __thiscall func(CGxDeviceD3d* this, C44Matrix* matrix)" CGxDeviceD3d__IShaderConstantsFlush 006A9FE0 f end=006AA06D -CGxDeviceD3d__IShaderCreatePixel 006AA070 f end=006AA0C5 -CGxDeviceD3d__IShaderCreateVertex 006AA0D0 f end=006AA125 -CGxDeviceD3d__ShaderCreate 006AA130 f end=006AA18A +CGxDeviceD3d__IShaderCreatePixel 006AA070 f end=006AA0C5 type="void __thiscall func(CGxDeviceD3d* this, CGxShader* shader)" +CGxDeviceD3d__IShaderCreateVertex 006AA0D0 f end=006AA125 type="void __thiscall func(CGxDeviceD3d* this, CGxShader* shader)" +CGxDeviceD3d__ShaderCreate 006AA130 f end=006AA18A type="void __thiscall func(CGxShader** shaders, EGxShTarget target, char* a3, char* a4, int32_t permutations)" +CGxDeviceD3d__ShaderDestroy 006AA190 f end=006AA207 type="void __thiscall func(CGxDeviceD3d* this, CGxShader** shader)" CGxDeviceD3d__IBindVertexShader 006AA2F0 f end=006AA346 CTgaFile__ColorMapEntryBytes 006AA350 f end=006AA379 ; UC CTgaFile__ColorMapBytes 006AA380 f end=006AA3B0 @@ -2540,6 +2590,7 @@ OsGetExePath 0086BEA0 f end=0086BEBE OsGuiGetWindow 0086C6A0 f end=0086C6CE OsIMEInitialize 0086D0A0 f end=0086D0B8 OsIMEDestroy 0086D0C0 f end=0086D0Df +TSExplicitList_CGxBuf__LinkToTail 0086E200 f end=0086E25F type="void __thiscall func(TSExplicitList_CGxBuf* this, CGxBuf* ptr)" OsCallSetContext 0086F5A0 f end=0086F5EA OsCallInitialize 0086F760 f end=0086F875 OsCallInitializeContext 0086F880 f end=0086F902 diff --git a/profile/3.3.5a-windows-386/symbol/storm/func.sym b/profile/3.3.5a-windows-386/symbol/storm/func.sym index a5f9eaa..cd2b55a 100644 --- a/profile/3.3.5a-windows-386/symbol/storm/func.sym +++ b/profile/3.3.5a-windows-386/symbol/storm/func.sym @@ -71,4 +71,4 @@ Square 0077C330 f end=0077C69F type="void __stdcall func(BigBuffer* a, BigBuffer SBigDel 0077C6A0 f end=0077C6F6 type="void __stdcall func(BigData* num)" SBigMul 0077C700 f end=0077C71F type="void __stdcall func(BigData* a, BigData* b, BigData* c)" PowMod 0077C720 f end=0077C97B type="void __stdcall func(BigBuffer* a, BigBuffer* b, BigBuffer* c, BigBuffer* d, BigStack* stack)" -SBigPowMod 0077C980 f end=0077C9A4 type="void __stdcall func(BigData* a, BigData* b, BigData* c, BigData* d)" +SBigPowMod 0077C980 f end=0077C9A4 type="void __stdcall func(BigData* a, BigData* b, BigData* c, BigData* d)" \ No newline at end of file diff --git a/profile/3.3.5a-windows-386/symbol/tempest/func.sym b/profile/3.3.5a-windows-386/symbol/tempest/func.sym index 145938d..57cb1d8 100644 --- a/profile/3.3.5a-windows-386/symbol/tempest/func.sym +++ b/profile/3.3.5a-windows-386/symbol/tempest/func.sym @@ -20,4 +20,7 @@ C44Matrix__RotateAroundZ 004C3380 f C44Matrix__Rotate 004C33C0 f C3Vector__Normalize_1 004C3420 f C3Vector__Normalize_2 004C3600 f -C33Matrix__operator_assign_C33Matrix 004C51B0 f \ No newline at end of file +C33Matrix__operator_assign_C33Matrix 004C51B0 f +TSGrowableArray_C3Vector__SetCount 004C4B80 f end=004C4C75 type="void __thiscall func(TSGrowableArray_C3Vector* this, uint32_t count)" +TSGrowableArray_CImVector__SetCount 00616CA0 f end=00616D07 type="void __thiscall func(TSGrowableArray_CImVector* this, uint32_t count)" +TSGrowableArray_C2Vector__SetCount 0057FDD0 f end=0057FE93 type="void __thiscall func(TSGrowableArray_C2Vector* this, uint32_t count)" \ No newline at end of file diff --git a/profile/3.3.5a-windows-386/x64dbg/game.dd32 b/profile/3.3.5a-windows-386/x64dbg/game.dd32 index 0c431f3..a06f03b 100644 Binary files a/profile/3.3.5a-windows-386/x64dbg/game.dd32 and b/profile/3.3.5a-windows-386/x64dbg/game.dd32 differ diff --git a/profile/3.3.5a-windows-386/x64dbg/types.json b/profile/3.3.5a-windows-386/x64dbg/types.json index 52512c9..9d99492 100644 --- a/profile/3.3.5a-windows-386/x64dbg/types.json +++ b/profile/3.3.5a-windows-386/x64dbg/types.json @@ -72,6 +72,10 @@ "type": "int", "name": "EGxBlend" }, + { + "type": "int", + "name": "EGxBuffer" + }, { "type": "int", "name": "EGxColorFormat" @@ -88,6 +92,10 @@ "type": "int", "name": "EGxMasterEnables" }, + { + "type": "int", + "name": "EGxOverride" + }, { "type": "int", "name": "EGxPoolHintBits" @@ -108,6 +116,10 @@ "type": "int", "name": "EGxPrimMask" }, + { + "type": "int", + "name": "EGxQueryType" + }, { "type": "int", "name": "EGxRenderState" @@ -428,6 +440,10 @@ "type": "TSList_CGxPool", "name": "TSExplicitList_CGxPool" }, + { + "type": "TSList_CGxQuery", + "name": "TSExplicitList_CGxQuery" + }, { "type": "TSList_CShaderEffect", "name": "TSExplicitList_CShaderEffect" @@ -948,6 +964,27 @@ } ] }, + { + "name": "CGxDevice__TextureTarget", + "size": 12, + "members": [ + { + "type": "CGxTex*", + "name": "m_texture", + "offset": 0 + }, + { + "type": "uint32_t", + "name": "m_plane", + "offset": 4 + }, + { + "type": "void*", + "name": "m_apiSpecific", + "offset": 8 + } + ] + }, { "name": "CGxDevice__vtable", "size": 336, @@ -1299,7 +1336,7 @@ }, { "type": "void*", - "name": "v_fn_69_ShaderRelease", + "name": "v_fn_69_ShaderDestroy", "offset": 276 }, { @@ -9765,6 +9802,32 @@ } ] }, + { + "name": "TSGrowableArray_float", + "size": 16, + "members": [ + { + "type": "uint32_t", + "name": "m_alloc", + "offset": 0 + }, + { + "type": "uint32_t", + "name": "m_count", + "offset": 4 + }, + { + "type": "float*", + "name": "m_data", + "offset": 8 + }, + { + "type": "uint32_t", + "name": "m_chunk", + "offset": 12 + } + ] + }, { "name": "TSGrowableArray_pointer_to_EvtTimer", "size": 16, @@ -10033,6 +10096,22 @@ } ] }, + { + "name": "TSLink_CGxQuery", + "size": 8, + "members": [ + { + "type": "TSLink_CGxQuery*", + "name": "m_prevlink", + "offset": 0 + }, + { + "type": "CGxQuery*", + "name": "m_next", + "offset": 4 + } + ] + }, { "name": "TSLink_CGxShader", "size": 8, @@ -13930,6 +14009,38 @@ } ] }, + { + "name": "CGxQuery", + "size": 16, + "members": [ + { + "type": "void*", + "name": "m_apiSpecific", + "offset": 0 + }, + { + "type": "EGxQueryType", + "name": "m_type", + "offset": 4 + }, + { + "type": "TSLink_CGxQuery", + "name": "m_link", + "offset": 8 + } + ] + }, + { + "name": "TSLinkedNode_CGxQuery", + "size": 8, + "members": [ + { + "type": "TSLink_CGxQuery", + "name": "m_link", + "offset": 0 + } + ] + }, { "name": "TSHashObject_CGxShader_HASHKEY_STRI", "size": 24, @@ -14842,6 +14953,22 @@ } ] }, + { + "name": "TSList_CGxQuery", + "size": 12, + "members": [ + { + "type": "ptrdiff_t", + "name": "m_linkoffset", + "offset": 0 + }, + { + "type": "TSLink_CGxQuery", + "name": "m_terminator", + "offset": 4 + } + ] + }, { "name": "TSList_CShaderEffect", "size": 12, @@ -18201,6 +18328,179 @@ } ] }, + { + "name": "BATCHEDRENDERFONTDESC", + "size": 40, + "members": [ + { + "type": "TSHashObject_BATCHEDRENDERFONTDESC_HASHKEY_PTR", + "name": "b_base", + "offset": 0 + }, + { + "type": "CGxFont*", + "name": "m_face", + "offset": 24 + }, + { + "type": "TSExplicitList_CGxString", + "name": "m_strings", + "offset": 28 + } + ] + }, + { + "name": "TEXTURECACHEROW", + "size": 16, + "members": [ + { + "type": "uint32_t", + "name": "widestFreeSlot", + "offset": 0 + }, + { + "type": "TSExplicitList_CHARCODEDESC", + "name": "glyphList", + "offset": 4 + } + ] + }, + { + "name": "CGxFont", + "size": 592, + "members": [ + { + "type": "TSLinkedNode_CGxFont", + "name": "b_base", + "offset": 0 + }, + { + "type": "TSExplicitList_CGxString", + "name": "m_strings", + "offset": 8 + }, + { + "type": "TSHashTable_CHARCODEDESC_HASHKEY_NONE", + "name": "m_activeCharacters", + "offset": 20 + }, + { + "type": "TSHashTable_KERNNODE_KERNINGHASHKEY", + "name": "m_kernInfo", + "offset": 60 + }, + { + "type": "TSExplicitList_CHARCODEDESC", + "name": "m_activeCharacterCache", + "offset": 100 + }, + { + "type": "HFACE", + "name": "m_faceHandle", + "offset": 112 + }, + { + "type": "char", + "name": "m_fontName", + "arrsize": 260, + "offset": 116 + }, + { + "type": "uint32_t", + "name": "m_cellHeight", + "offset": 376 + }, + { + "type": "uint32_t", + "name": "m_baseline", + "offset": 380 + }, + { + "type": "uint32_t", + "name": "m_flags", + "offset": 384 + }, + { + "type": "float", + "name": "float184", + "offset": 388 + }, + { + "type": "float", + "name": "m_pixelsPerUnit", + "offset": 392 + }, + { + "type": "TEXTURECACHE", + "name": "m_textureCache", + "arrsize": 8, + "offset": 396 + }, + { + "type": "uint32_t", + "name": "m_pixelSize", + "offset": 588 + } + ] + }, + { + "name": "CGxStringBatch", + "size": 52, + "members": [ + { + "type": "TSLinkedNode_CGxStringBatch", + "name": "b_base", + "offset": 0 + }, + { + "type": "TSHashTable_BATCHEDRENDERFONTDESC_HASHKEY_PTR", + "name": "m_fontBatch", + "offset": 8 + }, + { + "type": "uint32_t", + "name": "m_flags", + "offset": 48 + } + ] + }, + { + "name": "CFrameStrataNode", + "size": 264, + "members": [ + { + "type": "TSExplicitList_CSimpleFrame", + "name": "pendingFrames", + "offset": 0 + }, + { + "type": "TSExplicitList_CSimpleFrame", + "name": "frames", + "offset": 12 + }, + { + "type": "CSimpleFrame*", + "name": "pendingFrame", + "offset": 24 + }, + { + "type": "CRenderBatch", + "name": "batches", + "arrsize": 5, + "offset": 28 + }, + { + "type": "int32_t", + "name": "batchDirty", + "offset": 248 + }, + { + "type": "TSExplicitList_CRenderBatch", + "name": "renderList", + "offset": 252 + } + ] + }, { "name": "CGxDevice", "size": 14696, @@ -18231,11 +18531,15 @@ "offset": 52 }, { - "type": "uint32_t", - "name": "m_unk38", - "arrsize": 2, + "type": "int32_t", + "name": "m_indexLocked", "offset": 56 }, + { + "type": "int32_t", + "name": "m_vertexLocked", + "offset": 60 + }, { "type": "int32_t", "name": "m_inBeginEnd", @@ -18538,7 +18842,7 @@ "offset": 10448 }, { - "type": "uint32_t", + "type": "uint8_t", "name": "unk28D4", "offset": 10452 }, @@ -18580,9 +18884,20 @@ { "type": "uint32_t", "name": "unk2904", - "arrsize": 12, + "arrsize": 3, "offset": 10500 }, + { + "type": "CGxDevice__TextureTarget", + "name": "m_textureTarget", + "arrsize": 2, + "offset": 10512 + }, + { + "type": "TSExplicitList_CGxQuery", + "name": "m_queryList", + "offset": 10536 + }, { "type": "int32_t", "name": "m_scrShotClick", @@ -18610,7 +18925,7 @@ }, { "type": "int32_t", - "name": "m_hardwareCursor", + "name": "m_hwCursor", "offset": 10580 }, { @@ -18641,179 +18956,6 @@ } ] }, - { - "name": "BATCHEDRENDERFONTDESC", - "size": 40, - "members": [ - { - "type": "TSHashObject_BATCHEDRENDERFONTDESC_HASHKEY_PTR", - "name": "b_base", - "offset": 0 - }, - { - "type": "CGxFont*", - "name": "m_face", - "offset": 24 - }, - { - "type": "TSExplicitList_CGxString", - "name": "m_strings", - "offset": 28 - } - ] - }, - { - "name": "TEXTURECACHEROW", - "size": 16, - "members": [ - { - "type": "uint32_t", - "name": "widestFreeSlot", - "offset": 0 - }, - { - "type": "TSExplicitList_CHARCODEDESC", - "name": "glyphList", - "offset": 4 - } - ] - }, - { - "name": "CGxFont", - "size": 592, - "members": [ - { - "type": "TSLinkedNode_CGxFont", - "name": "b_base", - "offset": 0 - }, - { - "type": "TSExplicitList_CGxString", - "name": "m_strings", - "offset": 8 - }, - { - "type": "TSHashTable_CHARCODEDESC_HASHKEY_NONE", - "name": "m_activeCharacters", - "offset": 20 - }, - { - "type": "TSHashTable_KERNNODE_KERNINGHASHKEY", - "name": "m_kernInfo", - "offset": 60 - }, - { - "type": "TSExplicitList_CHARCODEDESC", - "name": "m_activeCharacterCache", - "offset": 100 - }, - { - "type": "HFACE", - "name": "m_faceHandle", - "offset": 112 - }, - { - "type": "char", - "name": "m_fontName", - "arrsize": 260, - "offset": 116 - }, - { - "type": "uint32_t", - "name": "m_cellHeight", - "offset": 376 - }, - { - "type": "uint32_t", - "name": "m_baseline", - "offset": 380 - }, - { - "type": "uint32_t", - "name": "m_flags", - "offset": 384 - }, - { - "type": "float", - "name": "float184", - "offset": 388 - }, - { - "type": "float", - "name": "m_pixelsPerUnit", - "offset": 392 - }, - { - "type": "TEXTURECACHE", - "name": "m_textureCache", - "arrsize": 8, - "offset": 396 - }, - { - "type": "uint32_t", - "name": "m_pixelSize", - "offset": 588 - } - ] - }, - { - "name": "CGxStringBatch", - "size": 52, - "members": [ - { - "type": "TSLinkedNode_CGxStringBatch", - "name": "b_base", - "offset": 0 - }, - { - "type": "TSHashTable_BATCHEDRENDERFONTDESC_HASHKEY_PTR", - "name": "m_fontBatch", - "offset": 8 - }, - { - "type": "uint32_t", - "name": "m_flags", - "offset": 48 - } - ] - }, - { - "name": "CFrameStrataNode", - "size": 264, - "members": [ - { - "type": "TSExplicitList_CSimpleFrame", - "name": "pendingFrames", - "offset": 0 - }, - { - "type": "TSExplicitList_CSimpleFrame", - "name": "frames", - "offset": 12 - }, - { - "type": "CSimpleFrame*", - "name": "pendingFrame", - "offset": 24 - }, - { - "type": "CRenderBatch", - "name": "batches", - "arrsize": 5, - "offset": 28 - }, - { - "type": "int32_t", - "name": "batchDirty", - "offset": 248 - }, - { - "type": "TSExplicitList_CRenderBatch", - "name": "renderList", - "offset": 252 - } - ] - }, { "name": "M2Attachment", "size": 40,