chore(build): refresh generated files

profile/3.3.5a-windows-386/ida/batch/import_data_types.idc

@@ -139,6 +139,7 @@ static import_data_types() {
 	apply_type(0x00681630, "void __stdcall func(CGxQuery** query, EGxQueryType type)");
 	apply_type(0x00681770, "void __stdcall func(uint32_t maxFPS)");
 	apply_type(0x00681790, "void __stdcall func(uint32_t maxFPSBk)");
+	apply_type(0x006817B0, "BlitFormat __stdcall func(EGxTexFormat format)");
 	apply_type(0x006817C0, "void __stdcall func()");
 	apply_type(0x006817E0, "int __stdcall func(char* format, ...)");
 	apply_type(0x00681950, "CGxFormat* __thiscall func(CGxFormat* this)");
@@ -150,6 +151,7 @@ static import_data_types() {
 	apply_type(0x006823A0, "void __stdcall func(EGxPrim primType, uint32_t indexCount, uint16_t* indices)");
 	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(0x00682C50, "void __thiscall func(CGxDevice* this)");
 	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, uintptr_t hwnd, CGxFormat* format)");
 	apply_type(0x00682CF0, "void __thiscall func(CGxDevice* this)");
@@ -181,6 +183,7 @@ static import_data_types() {
 	apply_type(0x00683650, "uint32_t* __thiscall func(CGxDevice* this)");
 	apply_type(0x00683660, "void __thiscall func(CGxDevice* this, float depth)");
 	apply_type(0x00683670, "void __stdcall func()");
+	apply_type(0x00683B90, "CGxMatrixStack* __thiscall func(CGxMatrixStack* this)");
 	apply_type(0x00683D60, "void __stdcall func(CiRect* windowRect)");
 	apply_type(0x00683DB0, "void __stdcall func(CiRect* windowRect)");
 	apply_type(0x00683E00, "void __stdcall func(CiRect* windowRect)");
@@ -190,6 +193,7 @@ static import_data_types() {
 	apply_type(0x00683F00, "void __stdcall func(CiRect* windowRect)");
 	apply_type(0x00683F30, "void __stdcall func(CiRect* windowRect)");
 	apply_type(0x00683FB0, "CGxLight* __thiscall func(CGxLight* this)");
+	apply_type(0x00684070, "void __thiscall func(CGxGammaRamp* this, float gamma)");
 	apply_type(0x006840F0, "int32_t __thiscall func(CGxDevice* this, CGxFormat* format)");
 	apply_type(0x00684170, "void __thiscall func(CGxDevice* this, float gamma)");
 	apply_type(0x00684190, "int32_t __thiscall func(CGxDevice* this, CGxGammaRamp* ramp)");
@@ -202,6 +206,7 @@ static import_data_types() {
 	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(0x00684620, "CGxApiLight* __thiscall func(CGxApiLight* this, CGxLight* light)");
 	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)");
@@ -232,6 +237,7 @@ static import_data_types() {
 	apply_type(0x00685EB0, "void __thiscall func(CGxDevice* this, EGxMasterEnables state, int32_t enable)");
 	apply_type(0x00685F50, "void __thiscall func(CGxDevice* this, EGxRenderState which, void* value)");
 	apply_type(0x00685FB0, "void __thiscall func(CGxDevice* this)");
+	apply_type(0x00686120, "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)");
@@ -254,6 +260,7 @@ static import_data_types() {
 	apply_type(0x0068A090, "CGxMonitorMode* __thiscall func(TSGrowableArray_CGxMonitorMode* this)");
 	apply_type(0x0068A0F0, "void __thiscall func(TSGrowableArray_CGxMonitorMode* this, uint32_t count)");
 	apply_type(0x0068A4C0, "void __stdcall func(TSGrowableArray_CGxMonitorMode* modes)");
+	apply_type(0x0068A9A0, "void __thiscall func(CGxDeviceOpenGl* this, CGxFormat* format)");
 	apply_type(0x0068BBC0, "void __thiscall func(CGxDeviceOpenGl* this)");
 	apply_type(0x0068BF20, "CGxDevice* __stdcall func()");
 	apply_type(0x0068C220, "CGxDevice* __stdcall func()");
@@ -289,7 +296,7 @@ static import_data_types() {
 	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(0x00690150, "void __thiscall func(CGxDeviceD3d* this, int32_t a2)");
+	apply_type(0x00690150, "void __thiscall func(CGxDeviceD3d* this, int32_t freeTextures)");
 	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)");
@@ -312,7 +319,9 @@ static import_data_types() {
 	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(0x006A0360, "LRESULT __stdcall func(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)");
+	apply_type(0x006A1690, "void __thiscall func(CGxDeviceD3d* this, int32_t freeQueries)");
 	apply_type(0x006A1950, "void __thiscall func(CGxDeviceD3d* this, CiRect* rect, TSGrowableArray_float* depths)");
+	apply_type(0x006A1C60, "void __thiscall func(CGxDeviceD3d* this, int32_t freePools)");
 	apply_type(0x006A2BB0, "void __thiscall func(CGxDeviceD3d* this, CGxTex* texId)");
 	apply_type(0x006A2C00, "void __thiscall func(CGxDeviceD3d* this, CGxTex* texId)");
 	apply_type(0x006A2D80, "void __thiscall func(CGxDeviceD3d* this, CGxTex* texId)");
@@ -330,8 +339,8 @@ static import_data_types() {
 	apply_type(0x006A39E0, "void __thiscall func(CGxDeviceD3d* this, uint32_t stream, LPDIRECT3DVERTEXBUFFER9 buffer, uint32_t offset, uint32_t stride)");
 	apply_type(0x006A3A60, "void __thiscall func(CGxDeviceD3d* this)");
 	apply_type(0x006A3C40, "void __thiscall func(CGxDeviceD3d* this, CGxDeviceD3d__EDeviceState state, uint32_t val)");
-	apply_type(0x006A4190, "void __thiscall func(CGxDeviceD3d* this, uint32_t a1, uint32_t val)");
+	apply_type(0x006A4190, "void __thiscall func(CGxDeviceD3d* this, uint32_t tmu, uint32_t op)");
-	apply_type(0x006A41F0, "void __thiscall func(CGxDeviceD3d* this, uint32_t a1, uint32_t val)");
+	apply_type(0x006A41F0, "void __thiscall func(CGxDeviceD3d* this, uint32_t tmu, uint32_t op)");
 	apply_type(0x006A43D0, "void __thiscall func(CGxDeviceD3d* this)");
 	apply_type(0x006A4700, "void __thiscall func(CGxDeviceD3d* this)");
 	apply_type(0x006A4850, "void __thiscall func(CGxDeviceD3d* this)");
@@ -343,9 +352,11 @@ static import_data_types() {
 	apply_type(0x006A5940, "void __thiscall func(CGxDeviceD3d* this)");
 	apply_type(0x006A5A00, "void __thiscall func(CGxDeviceD3d* this, CRect* dst)");
 	apply_type(0x006A5A30, "void __thiscall func(CGxDeviceD3d* this)");
+	apply_type(0x006A5AA0, "void __thiscall func(CGxDeviceD3d* this, uint32_t tmu)");
 	apply_type(0x006A5C70, "void __thiscall func(CGxDeviceD3d* this, CGxShader* ps)");
 	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(0x006A5E40, "void __thiscall func(CGxDeviceD3d* this, int32_t freeShaders)");
 	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(0x006A7940, "void __thiscall func(CGxDeviceD3d* this, uint32_t width, uint32_t height)");
@@ -375,6 +386,25 @@ static import_data_types() {
 	apply_type(0x006AB760, "MipBits* __stdcall func(uint32_t fourCC, uint32_t width, uint32_t height, char* filename, int32_t linenumber)");
 	apply_type(0x006AB810, "void __stdcall func(uint32_t fourCC, uint32_t width, uint32_t height, MipBits* bits)");
 	apply_type(0x006AB860, "void _stdcall func(C4Pixel* dest, uint32_t destWidth, uint32_t destHeight, C4Pixel* source, uint32_t sourceWidth, uint32_t sourceHeight)");
+	apply_type(0x006ABE00, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006ABE30, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006ABE60, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006ABE90, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006ABF40, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006ABFC0, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006AC030, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006AC0B0, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006ACCE0, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006ACCF0, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006ACD70, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006AE440, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006AE4A0, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006AE500, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006AE560, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006AE5C0, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006AE620, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006AE680, "void __stdcall func(C2iVector* size, void* in, uint32_t inStride, void* out, uint32_t outStride)");
+	apply_type(0x006AE7C0, "int32_t __stdcall func(C2iVector* size, BlitAlpha alpha, void* src, uint32_t srcStride, BlitFormat srcFmt, void* dst, uint32_t dstStride, BlitFormat dstFmt)");
 	apply_type(0x006AE8B0, "void __thiscall func(CBLPFile* this)");
 	apply_type(0x006AE900, "int32_t __thiscall func(CBLPFile* this, void* fileBits)");
 	apply_type(0x006AE990, "void __thiscall func(CBLPFile* this, uint8_t* data, void* tempbuffer, uint32_t colorSize)");
@@ -605,6 +635,8 @@ static import_data_types() {
 	apply_type(0x009E5630, "Blizzard__File__FileInfo");
 	apply_type(0x009E9EC8, "uint32_t[7]");
 	apply_type(0x009EA04C, "TInstanceId_EvtContext__v_table");
+	apply_type(0x00A2DAF8, "uint32_t[13]");
+	apply_type(0x00A2DB60, "uint32_t[13]");
 	apply_type(0x00A2DDC0, "CGxDevice__v_table");
 	apply_type(0x00A2E198, "CGxDevice__v_table");
 	apply_type(0x00A2E4A8, "D3DFORMAT[8]");
@@ -619,6 +651,8 @@ static import_data_types() {
 	apply_type(0x00A2F964, "D3DBLEND[12]");
 	apply_type(0x00A2F994, "D3DBLEND[12]");
 	apply_type(0x00A2F9C4, "D3DTEXTUREADDRESS[2]");
+	apply_type(0x00A2F9CC, "int32_t[6]");
+	apply_type(0x00A2F9E4, "int32_t[6][2]");
 	apply_type(0x00A2FA14, "D3DCMPFUNC[4]");
 	apply_type(0x00A2FA24, "D3DCULL[3]");
 	apply_type(0x00AB6350, "WowClientDB_Startup_StringsRec");
@@ -929,7 +963,10 @@ static import_data_types() {
 	apply_type(0x00C5FFF4, "uint32_t");
 	apply_type(0x00C5FFF8, "HSLOG");
 	apply_type(0x00C60300, "C2iVector");
+	apply_type(0x00C60618, "uint32_t");
 	apply_type(0x00C606F8, "D3DLIGHT9");
+	apply_type(0x00C60930, "BLIT_FUNCTION[13][13][4]");
+	apply_type(0x00C613C4, "int32_t");
 	apply_type(0x00CA1690, "float");
 	apply_type(0x00CA1694, "int32_t");
 	apply_type(0x00CA1718, "float");

profile/3.3.5a-windows-386/ida/batch/import_functions.idc

@@ -200,6 +200,7 @@ static import_functions() {
 	set_func_cmt(0x00681BE0, "UC", 0);
 	set_func_cmt(0x00682400, "this is one of the functions named 'GxPrimVertexPtr' that uses the fixed-function pipeline", 0);
 	set_func_cmt(0x00683670, "static void CGxDevice::LogOpen(void)", 0);
+	set_func_cmt(0x00684620, "CGxApiLight::operator=(CGxLight const&)", 0);
 	set_func_cmt(0x00684C40, "CGxDevice::Log(CGxCaps const&) const", 0);
 	set_func_cmt(0x006859E0, "CGxDevice::IRsForceUpdate(EGxRenderState)", 0);
 	set_func_cmt(0x00685A70, "CGxDevice::IRsForceUpdate()", 0);
@@ -211,6 +212,24 @@ static import_functions() {
 	set_func_cmt(0x006AA350, "UC", 0);
 	set_func_cmt(0x006AA420, "private utility method", 0);
 	set_func_cmt(0x006AB390, "public method", 0);
+	set_func_cmt(0x006ABE00, "s_blits[BlitFormat_Argb8888][BlitFormat_Argb4444][BlitAlpha_0]", 0);
+	set_func_cmt(0x006ABE30, "s_blits[BlitFormat_Argb8888][BlitFormat_Argb1555][BlitAlpha_0]", 0);
+	set_func_cmt(0x006ABE60, "s_blits[BlitFormat_Argb8888][BlitFormat_Rgb565][BlitAlpha_0]", 0);
+	set_func_cmt(0x006ABE90, "s_blits[BlitFormat_Argb4444][BlitFormat_Abgr8888][BlitAlpha_0]", 0);
+	set_func_cmt(0x006ABF40, "s_blits[BlitFormat_Argb8888][BlitFormat_Abgr8888][BlitAlpha_0]", 0);
+	set_func_cmt(0x006ABFC0, "s_blits[BlitFormat_Argb8888][BlitFormat_Argb8888][BlitAlpha_1]", 0);
+	set_func_cmt(0x006AC030, "s_blits[BlitFormat_Dxt1][BlitFormat_Dxt1][BlitAlpha_0]", 0);
+	set_func_cmt(0x006ACCE0, "Argb8888_Argb8888, Gr1616F_Gr1616F, R32F_R32F, D24X8_D24X8", 0);
+	set_func_cmt(0x006ACCF0, "s_blits[BlitFormat_Argb8888][BlitFormat_Argb8888][BlitAlpha_8]", 0);
+	set_func_cmt(0x006ACD70, "Rgb565_Rgb565, Argb4444_Argb4444, Argb1555_Argb1555, Uv88_Uv88", 0);
+	set_func_cmt(0x006AE440, "s_blits[BlitFormat_Dxt1][BlitFormat_Rgb565][BlitAlpha_0]", 0);
+	set_func_cmt(0x006AE4A0, "s_blits[BlitFormat_Dxt1][BlitFormat_Argb1555][BlitAlpha_0]", 0);
+	set_func_cmt(0x006AE500, "s_blits[BlitFormat_Dxt1][BlitFormat_Argb8888][BlitAlpha_0]", 0);
+	set_func_cmt(0x006AE560, "s_blits[BlitFormat_Dxt3][BlitFormat_Argb4444][BlitAlpha_0]", 0);
+	set_func_cmt(0x006AE5C0, "s_blits[BlitFormat_Dxt3][BlitFormat_Argb8888][BlitAlpha_0]", 0);
+	set_func_cmt(0x006AE620, "s_blits[BlitFormat_Dxt5][BlitFormat_Argb4444][BlitAlpha_0]", 0);
+	set_func_cmt(0x006AE680, "s_blits[BlitFormat_Dxt5][BlitFormat_Argb8888][BlitAlpha_0]", 0);
+	set_func_cmt(0x006AE7C0, "Blit(const C2iVector&, BlitAlpha, const void*, uint32_t, BlitFormat, void*, uint32_t, BlitFormat)", 0);
 	set_func_cmt(0x006B0940, "ClientConnection::Disconnect(DISCONNECT_REASON)", 0);
 	set_func_cmt(0x006B1100, "ClientConnection::PollStatus(WOWCS_OPS&, char const**, int&, int&)", 0);
 	set_func_cmt(0x006B1200, "ClientConnection::Cancel(int)", 0);

profile/3.3.5a-windows-386/x64dbg/types.json

@@ -1,5 +1,9 @@
 {
   "types": [
+    {
+      "type": "void**",
+      "name": "BLIT_FUNCTION"
+    },
     {
       "type": "int",
       "name": "BlitAlpha"
@@ -92,6 +96,10 @@
       "type": "long long",
       "name": "D3DCUBEMAP_FACES"
     },
+    {
+      "type": "int",
+      "name": "D3DDECLTYPE"
+    },
     {
       "type": "int",
       "name": "D3DDECLUSAGE"
@@ -10156,6 +10164,42 @@
         }
       ]
     },
+    {
+      "name": "D3DVIEWPORT9",
+      "size": 24,
+      "members": [
+        {
+          "type": "uint32_t",
+          "name": "X",
+          "offset": 0
+        },
+        {
+          "type": "uint32_t",
+          "name": "Y",
+          "offset": 4
+        },
+        {
+          "type": "uint32_t",
+          "name": "Width",
+          "offset": 8
+        },
+        {
+          "type": "uint32_t",
+          "name": "Height",
+          "offset": 12
+        },
+        {
+          "type": "float",
+          "name": "MinZ",
+          "offset": 16
+        },
+        {
+          "type": "float",
+          "name": "MaxZ",
+          "offset": 20
+        }
+      ]
+    },
     {
       "name": "D3DVSHADERCAPS2_0",
       "size": 16,
@@ -11302,6 +11346,33 @@
         }
       ]
     },
+    {
+      "name": "GUID",
+      "size": 16,
+      "members": [
+        {
+          "type": "uint32_t",
+          "name": "Data1",
+          "offset": 0
+        },
+        {
+          "type": "uint16_t",
+          "name": "Data2",
+          "offset": 4
+        },
+        {
+          "type": "uint16_t",
+          "name": "Data3",
+          "offset": 6
+        },
+        {
+          "type": "uint8_t",
+          "name": "Data4",
+          "arrsize": 8,
+          "offset": 8
+        }
+      ]
+    },
     {
       "name": "GameObjectArtKitRec",
       "size": 32,
@@ -20494,6 +20565,17 @@
         }
       ]
     },
+    {
+      "name": "LARGE_INTEGER",
+      "size": 8,
+      "members": [
+        {
+          "type": "int64_t",
+          "name": "QuadPart",
+          "offset": 0
+        }
+      ]
+    },
     {
       "name": "LFGDungeonExpansionRec",
       "size": 32,
@@ -30606,6 +30688,38 @@
         }
       ]
     },
+    {
+      "name": "C4Plane",
+      "size": 16,
+      "members": [
+        {
+          "type": "C3Vector",
+          "name": "n",
+          "offset": 0
+        },
+        {
+          "type": "float",
+          "name": "d",
+          "offset": 12
+        }
+      ]
+    },
+    {
+      "name": "CAaBox",
+      "size": 24,
+      "members": [
+        {
+          "type": "C3Vector",
+          "name": "b",
+          "offset": 0
+        },
+        {
+          "type": "C3Vector",
+          "name": "t",
+          "offset": 12
+        }
+      ]
+    },
     {
       "name": "CGxLight",
       "size": 64,
@@ -30652,38 +30766,6 @@
         }
       ]
     },
-    {
-      "name": "C4Plane",
-      "size": 16,
-      "members": [
-        {
-          "type": "C3Vector",
-          "name": "n",
-          "offset": 0
-        },
-        {
-          "type": "float",
-          "name": "d",
-          "offset": 12
-        }
-      ]
-    },
-    {
-      "name": "CAaBox",
-      "size": 24,
-      "members": [
-        {
-          "type": "C3Vector",
-          "name": "b",
-          "offset": 0
-        },
-        {
-          "type": "C3Vector",
-          "name": "t",
-          "offset": 12
-        }
-      ]
-    },
     {
       "name": "M2SkinSection",
       "size": 48,
@@ -30970,6 +31052,57 @@
         }
       ]
     },
+    {
+      "name": "CGxApiLight",
+      "size": 72,
+      "members": [
+        {
+          "type": "C4Vector",
+          "name": "m_dir",
+          "offset": 0
+        },
+        {
+          "type": "C3Vector",
+          "name": "m_ambColor",
+          "offset": 16
+        },
+        {
+          "type": "C3Vector",
+          "name": "m_dirColor",
+          "offset": 28
+        },
+        {
+          "type": "C3Vector",
+          "name": "m_specColor",
+          "offset": 40
+        },
+        {
+          "type": "float",
+          "name": "m_constantAttenuation",
+          "offset": 52
+        },
+        {
+          "type": "float",
+          "name": "m_linearAttenuation",
+          "offset": 56
+        },
+        {
+          "type": "float",
+          "name": "m_quadraticAttenuation",
+          "offset": 60
+        },
+        {
+          "type": "int32_t",
+          "name": "m_enable",
+          "offset": 64
+        },
+        {
+          "type": "uint32_t",
+          "name": "flags",
+          "offset": 68
+        }
+      ]
+    },
     {
       "name": "CDataRecycler__NodeBlock",
       "size": 16,
@@ -30993,7 +31126,7 @@
       "members": [
         {
           "type": "uint32_t",
-          "name": "unk0",
+          "name": "apiSpecificModeID",
           "offset": 0
         },
         {
@@ -31048,7 +31181,7 @@
         },
         {
           "type": "float",
-          "name": "multisampleQuality",
+          "name": "sampleQuality",
           "offset": 36
         },
         {
@@ -31072,35 +31205,11 @@
           "offset": 52
         },
         {
-          "type": "uint32_t",
+          "type": "int32_t",
-          "name": "unk38",
+          "name": "fixedFunction",
+          "arrsize": 6,
           "offset": 56
         },
-        {
-          "type": "uint32_t",
-          "name": "unk3C",
-          "offset": 60
-        },
-        {
-          "type": "uint32_t",
-          "name": "unk40",
-          "offset": 64
-        },
-        {
-          "type": "uint32_t",
-          "name": "unk44",
-          "offset": 68
-        },
-        {
-          "type": "uint32_t",
-          "name": "unk48",
-          "offset": 72
-        },
-        {
-          "type": "uint32_t",
-          "name": "unk4C",
-          "offset": 76
-        },
         {
           "type": "C2iVector",
           "name": "pos",
@@ -31479,6 +31588,32 @@
         }
       ]
     },
+    {
+      "name": "D3DDEVICE_CREATION_PARAMETERS",
+      "size": 24,
+      "members": [
+        {
+          "type": "uint32_t",
+          "name": "AdapterOrdinal",
+          "offset": 0
+        },
+        {
+          "type": "D3DDEVTYPE",
+          "name": "DeviceType",
+          "offset": 8
+        },
+        {
+          "type": "void*",
+          "name": "hFocusWindow",
+          "offset": 16
+        },
+        {
+          "type": "uint32_t",
+          "name": "BehaviorFlags",
+          "offset": 20
+        }
+      ]
+    },
     {
       "name": "D3DDISPLAYMODE",
       "size": 24,
@@ -32226,7 +32361,7 @@
         },
         {
           "type": "uint32_t",
-          "name": "unk68",
+          "name": "m_texNonPow2",
           "offset": 104
         },
         {
@@ -32235,70 +32370,11 @@
           "arrsize": 4,
           "offset": 108
         },
-        {
-          "type": "uint32_t",
-          "name": "unk7C",
-          "offset": 124
-        },
-        {
-          "type": "uint32_t",
-          "name": "unk80",
-          "offset": 128
-        },
-        {
-          "type": "uint32_t",
-          "name": "unk84",
-          "offset": 132
-        },
-        {
-          "type": "uint32_t",
-          "name": "unk88",
-          "offset": 136
-        },
-        {
-          "type": "uint32_t",
-          "name": "unk8C",
-          "offset": 140
-        },
-        {
-          "type": "uint32_t",
-          "name": "unk90",
-          "offset": 144
-        },
-        {
-          "type": "uint32_t",
-          "name": "unk94",
-          "offset": 148
-        },
-        {
-          "type": "uint32_t",
-          "name": "unk98",
-          "offset": 152
-        },
-        {
-          "type": "uint32_t",
-          "name": "unk9C",
-          "offset": 156
-        },
-        {
-          "type": "uint32_t",
-          "name": "unkA0",
-          "offset": 160
-        },
-        {
-          "type": "uint32_t",
-          "name": "unkA4",
-          "offset": 164
-        },
-        {
-          "type": "uint32_t",
-          "name": "unkA8",
-          "offset": 168
-        },
         {
           "type": "int32_t",
-          "name": "hwPcf",
+          "name": "m_rttFormat",
-          "offset": 172
+          "arrsize": 13,
+          "offset": 124
         },
         {
           "type": "uint32_t",
@@ -32338,8 +32414,8 @@
           "offset": 240
         },
         {
-          "type": "uint32_t",
+          "type": "int32_t",
-          "name": "unkF4",
+          "name": "m_colorWrite",
           "offset": 244
         },
         {
@@ -32349,21 +32425,45 @@
         },
         {
           "type": "int32_t",
-          "name": "m_hardwareCursor",
+          "name": "m_hwCursor",
           "offset": 252
         },
         {
-          "type": "uint32_t",
+          "type": "int32_t",
-          "name": "unk100",
+          "name": "m_occlusionQuery",
-          "arrsize": 5,
           "offset": 256
         },
+        {
+          "type": "int32_t",
+          "name": "m_pointParameters",
+          "offset": 260
+        },
+        {
+          "type": "float",
+          "name": "m_pointScaleMax",
+          "offset": 264
+        },
+        {
+          "type": "int32_t",
+          "name": "m_pointSprite",
+          "offset": 268
+        },
+        {
+          "type": "uint32_t",
+          "name": "m_blendFactor",
+          "offset": 272
+        },
         {
           "type": "uint32_t",
           "name": "unk114",
-          "arrsize": 6,
+          "arrsize": 5,
           "offset": 276
         },
+        {
+          "type": "int32_t",
+          "name": "m_oglRtAlpha",
+          "offset": 296
+        },
         {
           "type": "int32_t",
           "name": "m_stereoAvailable",
@@ -32562,6 +32662,65 @@
         }
       ]
     },
+    {
+      "name": "D3DADAPTER_IDENTIFIER9",
+      "size": 1104,
+      "members": [
+        {
+          "type": "char",
+          "name": "Driver",
+          "arrsize": 512,
+          "offset": 0
+        },
+        {
+          "type": "char",
+          "name": "Description",
+          "arrsize": 512,
+          "offset": 512
+        },
+        {
+          "type": "char",
+          "name": "DeviceName",
+          "arrsize": 32,
+          "offset": 1024
+        },
+        {
+          "type": "LARGE_INTEGER",
+          "name": "DriverVersion",
+          "offset": 1056
+        },
+        {
+          "type": "uint32_t",
+          "name": "VendorId",
+          "offset": 1064
+        },
+        {
+          "type": "uint32_t",
+          "name": "DeviceId",
+          "offset": 1068
+        },
+        {
+          "type": "uint32_t",
+          "name": "SubSysId",
+          "offset": 1072
+        },
+        {
+          "type": "uint32_t",
+          "name": "Revision",
+          "offset": 1076
+        },
+        {
+          "type": "GUID",
+          "name": "DeviceIdentifier",
+          "offset": 1080
+        },
+        {
+          "type": "uint32_t",
+          "name": "WHQLLevel",
+          "offset": 1096
+        }
+      ]
+    },
     {
       "name": "M2Array_C2Vector",
       "size": 8,
@@ -34086,12 +34245,17 @@
     },
     {
       "name": "EmergencyMem",
-      "size": 16,
+      "size": 20,
       "members": [
         {
           "type": "TSGrowableArray_uint8_t",
           "name": "m_data",
           "offset": 0
+        },
+        {
+          "type": "bool",
+          "name": "m_lock",
+          "offset": 16
         }
       ]
     },
@@ -39296,27 +39460,6 @@
         }
       ]
     },
-    {
-      "name": "CGxDevice__GxLight",
-      "size": 72,
-      "members": [
-        {
-          "type": "CGxLight",
-          "name": "light",
-          "offset": 0
-        },
-        {
-          "type": "int32_t",
-          "name": "enable",
-          "offset": 64
-        },
-        {
-          "type": "uint16_t",
-          "name": "flags",
-          "offset": 68
-        }
-      ]
-    },
     {
       "name": "CM2Shared",
       "size": 424,
@@ -47753,7 +47896,7 @@
     },
     {
       "name": "CGxDevice",
-      "size": 14688,
+      "size": 14696,
       "members": [
         {
           "type": "CGxDevice__v_table*",
@@ -47991,7 +48134,7 @@
           "offset": 9528
         },
         {
-          "type": "CGxDevice__GxLight",
+          "type": "CGxApiLight",
           "name": "m_lights",
           "arrsize": 4,
           "offset": 9544
@@ -48101,84 +48244,84 @@
         {
           "type": "TSFixedArray_CGxAppRenderState",
           "name": "m_appRenderStates",
-          "offset": 10468
+          "offset": 10476
         },
         {
           "type": "TSFixedArray_CGxStateBom",
           "name": "m_hwRenderStates",
-          "offset": 10480
+          "offset": 10488
         },
         {
           "type": "TSExplicitList_CGxTex",
           "name": "m_textures",
-          "offset": 10492
+          "offset": 10500
         },
         {
           "type": "CGxDevice__TextureTarget",
           "name": "m_textureTarget",
           "arrsize": 2,
-          "offset": 10504
+          "offset": 10512
         },
         {
           "type": "TSExplicitList_CGxQuery",
           "name": "m_queryList",
-          "offset": 10528
+          "offset": 10536
         },
         {
           "type": "int32_t",
           "name": "m_scrShotClick",
-          "offset": 10540
+          "offset": 10548
         },
         {
           "type": "uint32_t",
           "name": "m_scrShotWidth",
-          "offset": 10544
+          "offset": 10552
         },
         {
           "type": "uint32_t",
           "name": "m_scrShotHeight",
-          "offset": 10548
+          "offset": 10556
         },
         {
           "type": "TSGrowableArray_CImVector",
           "name": "m_scrShotPixels",
-          "offset": 10552
+          "offset": 10560
         },
         {
           "type": "int32_t",
           "name": "m_cursorVisible",
-          "offset": 10568
+          "offset": 10576
         },
         {
           "type": "int32_t",
           "name": "m_hwCursor",
-          "offset": 10572
+          "offset": 10580
         },
         {
           "type": "uint32_t",
           "name": "m_cursorHotspotX",
-          "offset": 10576
+          "offset": 10584
         },
         {
           "type": "uint32_t",
           "name": "m_cursorHotspotY",
-          "offset": 10580
+          "offset": 10588
         },
         {
           "type": "uint32_t",
           "name": "m_cursor",
           "arrsize": 1024,
-          "offset": 10584
+          "offset": 10592
         },
         {
           "type": "CGxTex*",
           "name": "m_cursorTexture",
-          "offset": 14680
+          "offset": 14688
         },
         {
           "type": "float",
           "name": "m_cursorDepth",
-          "offset": 14684
+          "offset": 14692
         }
       ]
     },
@@ -49426,7 +49569,7 @@
     },
     {
       "name": "CGxDeviceOpenGl",
-      "size": 15256,
+      "size": 15264,
       "members": [
         {
           "type": "CGxDevice",
@@ -49437,13 +49580,13 @@
           "type": "uint32_t",
           "name": "unk3968",
           "arrsize": 142,
-          "offset": 14688
+          "offset": 14696
         }
       ]
     },
     {
       "name": "CGxDeviceD3d",
-      "size": 16056,
+      "size": 16064,
       "members": [
         {
           "type": "CGxDevice",
@@ -49453,203 +49596,203 @@
         {
           "type": "void*",
           "name": "m_hwnd",
-          "offset": 14688
+          "offset": 14696
         },
         {
           "type": "uint16_t",
           "name": "m_hwndClass",
-          "offset": 14692
+          "offset": 14700
         },
         {
           "type": "uint16_t",
           "name": "unk396E",
-          "offset": 14694
+          "offset": 14702
         },
         {
           "type": "int32_t",
           "name": "m_ownhwnd",
-          "offset": 14696
+          "offset": 14704
         },
         {
           "type": "void*",
           "name": "m_d3dLib",
-          "offset": 14700
+          "offset": 14708
         },
         {
           "type": "LPDIRECT3D9",
           "name": "m_d3d",
-          "offset": 14704
+          "offset": 14712
         },
         {
           "type": "LPDIRECT3DDEVICE9",
           "name": "m_d3dDevice",
-          "offset": 14708
+          "offset": 14716
         },
         {
           "type": "D3DCAPS9",
           "name": "m_d3dCaps",
-          "offset": 14712
+          "offset": 14720
         },
         {
           "type": "int32_t",
           "name": "m_d3dIsHwDevice",
-          "offset": 15024
+          "offset": 15032
         },
         {
           "type": "int32_t",
           "name": "m_d3dNVAPI",
-          "offset": 15028
-        },
-        {
-          "type": "uint32_t",
-          "name": "m_d3dStereoEnabled",
-          "offset": 15032
-        },
-        {
-          "type": "uint32_t",
-          "name": "m_d3dStereoRestore",
           "offset": 15036
         },
         {
           "type": "uint32_t",
-          "name": "m_d3dStereoHandle",
+          "name": "m_d3dStereoEnabled",
           "offset": 15040
         },
+        {
+          "type": "uint32_t",
+          "name": "m_d3dStereoRestore",
+          "offset": 15044
+        },
+        {
+          "type": "uint32_t",
+          "name": "m_d3dStereoHandle",
+          "offset": 15048
+        },
         {
           "type": "float",
           "name": "m_d3dStereoConvergence",
-          "offset": 15044
+          "offset": 15052
         },
         {
           "type": "float",
           "name": "m_d3dStereoSeparation",
-          "offset": 15048
+          "offset": 15056
         },
         {
           "type": "int32_t",
           "name": "m_d3dStereoDirty",
-          "offset": 15052
+          "offset": 15060
         },
         {
           "type": "TSGrowableArray_CGxDeviceD3d__GxVertexDecl",
           "name": "m_gxVertexDecl",
-          "offset": 15056
+          "offset": 15064
         },
         {
           "type": "LPDIRECT3DVERTEXDECLARATION9",
           "name": "m_d3dVertexDecl",
           "arrsize": 14,
-          "offset": 15072
+          "offset": 15080
         },
         {
           "type": "D3DDISPLAYMODE",
           "name": "m_desktopDisplayMode",
-          "offset": 15128
+          "offset": 15136
         },
         {
           "type": "int32_t",
           "name": "m_inScene",
-          "offset": 15152
+          "offset": 15160
         },
         {
           "type": "int32_t",
           "name": "int3B2C",
-          "offset": 15156
+          "offset": 15164
         },
         {
           "type": "D3DFORMAT",
           "name": "m_devDepthFormat",
-          "offset": 15160
+          "offset": 15168
         },
         {
           "type": "D3DFORMAT",
           "name": "m_devAdapterFormat",
-          "offset": 15168
-        },
-        {
-          "type": "LPDIRECT3DSURFACE9",
-          "name": "m_defDepthStencilSurface",
           "offset": 15176
         },
         {
           "type": "LPDIRECT3DSURFACE9",
-          "name": "m_defColorSurface",
+          "name": "m_defDepthStencilSurface",
-          "offset": 15180
-        },
-        {
-          "type": "LPDIRECT3DSURFACE9",
-          "name": "m_defDepthSurface",
           "offset": 15184
         },
         {
           "type": "LPDIRECT3DSURFACE9",
-          "name": "surface3B44",
+          "name": "m_defColorSurface",
           "offset": 15188
         },
+        {
+          "type": "LPDIRECT3DSURFACE9",
+          "name": "m_defDepthSurface",
+          "offset": 15192
+        },
+        {
+          "type": "LPDIRECT3DSURFACE9",
+          "name": "surface3B44",
+          "offset": 15196
+        },
         {
           "type": "LPDIRECT3DQUERY9",
           "name": "m_eventQuery",
-          "offset": 15192
+          "offset": 15200
         },
         {
           "type": "int32_t",
           "name": "m_hwCursorDirty",
-          "offset": 15196
+          "offset": 15204
         },
         {
           "type": "LPDIRECT3DTEXTURE9",
           "name": "m_hwCursorTexture",
-          "offset": 15200
+          "offset": 15208
         },
         {
           "type": "LPDIRECT3DSURFACE9",
           "name": "m_hwCursorBitmap",
-          "offset": 15204
+          "offset": 15212
         },
         {
           "type": "CGxTex*",
           "name": "texture3B58",
-          "offset": 15208
+          "offset": 15216
         },
         {
           "type": "LPDIRECT3DVERTEXDECLARATION9",
           "name": "m_d3dCurrentVertexDecl",
-          "offset": 15212
+          "offset": 15220
         },
         {
           "type": "LPDIRECT3DINDEXBUFFER9",
           "name": "m_d3dCurrentIndexBuf",
-          "offset": 15216
+          "offset": 15224
         },
         {
           "type": "LPDIRECT3DVERTEXBUFFER9",
           "name": "m_d3dVertexStreamBuf",
           "arrsize": 8,
-          "offset": 15220
+          "offset": 15228
         },
         {
           "type": "uint32_t",
           "name": "m_d3dVertexStreamOfs",
           "arrsize": 8,
-          "offset": 15252
+          "offset": 15260
         },
         {
           "type": "uint32_t",
           "name": "m_d3dVertexStreamStride",
           "arrsize": 8,
-          "offset": 15284
+          "offset": 15292
         },
         {
           "type": "uint32_t",
           "name": "m_deviceStates",
           "arrsize": 182,
-          "offset": 15316
+          "offset": 15324
         },
         {
           "type": "bool",
           "name": "m_texEnabled",
           "arrsize": 8,
-          "offset": 16044
+          "offset": 16052
         }
       ]
     },