[xiph-commits] r6972 - in trunk/oggdsf: build/oggcodecs

illiminable at dactyl.lonelymoon.com illiminable
Sun Jul 4 00:52:37 PDT 2004


sln/oggdsf_all src/lib/codecs/flac/libs/libflac/src/libFLAC
src/lib/codecs/theora/filters/dsfTheoraDecoder
src/lib/codecs/theora/filters/dsfTheoraEncoder
src/lib/core/directshow/dsfAbstractVideoDecoder
src/lib/core/directshow/dsfOggDemux src/lib/core/ogg/libogg/win32
Message-ID: <20040704075237.7D5CA9AAAD at dactyl.lonelymoon.com>

Author: illiminable
Date: Sun Jul  4 00:52:37 2004
New Revision: 6972

Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/ITheoraEncodeSettings.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.aps
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.rc
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.aps
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.rc
trunk/oggdsf/src/lib/core/ogg/libogg/win32/
Log:
* Fixed stack corruption by an improperly specified COM interface on the theora encoder property page.
* Modified the theora decoder to properly handle offsetted video.
* Fixed the too long string bug in the ogg dmux property page.
* Modified the theora property page to allow higher keyframe intervals.

Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj	2004-07-03 21:30:01 UTC (rev 6971)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj	2004-07-04 07:52:35 UTC (rev 6972)
@@ -63,138 +63,138 @@
}
"Entry"
{
-        "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:E:\\PROJECTS\\C++\\OGG\\LIBOOOGG\\LIBOOTHEORA\\RELEASE\\LIBOOTHEORA.DLL"
+        "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+        "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSXML3.DLL"
}
"Entry"
{
-        "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:E:\\PROJECTS\\C++\\OGG\\LIBOOOGG\\DSFTHEORADECODER\\RELEASE\\DSFTHEORADECODER.DLL"
+        "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+        "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
+        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSXML3.DLL"
}
"Entry"
{
-        "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
-        "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\WSOCK32.DLL"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
+        "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:E:\\PROJECTS\\C++\\OGG\\LIBOOOGG\\DSFOGGMUX\\RELEASE\\DSFOGGMUX.DLL"
+        "MsmSig" = "8:E:\\PROJECTS\\C++\\OGG\\LIBOOOGG\\LIBOOTHEORA\\RELEASE\\LIBOOTHEORA.DLL"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
-        "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
-        "OwnerKey" = "8:_65EFE52655DF4119A626446C8F593760"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
+        "MsmKey" = "8:_4FCB947B6E2145568A6FDEFD9F71D8E6"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
+        "MsmSig" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
+        "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:E:\\PROJECTS\\C++\\OGG\\LIBOOOGG\\DSFTHEORADECODER\\RELEASE\\DSFTHEORADECODER.DLL"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
+        "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\WSOCK32.DLL"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:E:\\PROJECTS\\C++\\OGG\\LIBOOOGG\\DSFOGGMUX\\RELEASE\\DSFOGGMUX.DLL"
+        }
+        "Entry"
+        {
"MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:E:\\PROJECTS\\C++\\OGG\\LIBOOOGG\\LIBOOOGG\\RELEASE\\LIBOOOGG.DLL"
@@ -268,203 +268,203 @@
"Entry"
{
"MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
-        "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
+        "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:E:\\PROJECTS\\C++\\OGG\\LIBOOOGG\\DSFSEEKING\\RELEASE\\DSFSEEKING.DLL"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
+        "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
-        "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_DD3F37DC11D54B5996F597343A185E03"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_AFF84F5FBA224F8A8D4BB3ACA539DC8B"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_7508A3C0459B47439D67D2C7249DD169"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_695A6D70DADB417491C0662D82245C2B"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_65EFE52655DF4119A626446C8F593760"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+        "MsmKey" = "8:_A8FE2DF420CD4194BCD87F0977DD6D87"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+        "MsmSig" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
}
"Entry"
{
-        "MsmKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:E:\\PROJECTS\\C++\\OGG\\LIBOOOGG\\DSFSEEKING\\RELEASE\\DSFSEEKING.DLL"
-        }
-        "Entry"
-        {
"MsmKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:G:\\DEV\\OGGDSF\\SRC\\LIB\\CODECS\\THEORA\\FILTERS\\DSFTHEORAENCODER\\DEBUG\\DSFTHEORAENCODER.DLL"
@@ -477,18 +477,18 @@
}
"Entry"
{
-        "MsmKey" = "8:_B2784574F1B848EABBE013669B46808C"
-        "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
-        "MsmSig" = "8:G:\\DEV\\OGGDSF\\SRC\\LIB\\CODECS\\FLAC\\LIBS\\LIBFLAC\\OBJ\\DEBUG\\BIN\\LIBFLAC.DLL"
-        }
-        "Entry"
-        {
"MsmKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:G:\\DEV\\OGGDSF\\SRC\\LIB\\CORE\\DIRECTSHOW\\DSFSUBTITLEVMR9\\DEBUG\\DSFSUBTITLEVMR9.DLL"
}
"Entry"
{
+        "MsmKey" = "8:_D7835E050C942DE27CB20AF3D1EC70F4"
+        "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+        "MsmSig" = "8:G:\\DEV\\OGGDSF\\SRC\\LIB\\CODECS\\FLAC\\LIBS\\LIBFLAC\\OBJ\\RELEASE\\BIN\\LIBFLAC.DLL"
+        }
+        "Entry"
+        {
"MsmKey" = "8:_D9BE90D398094F15B881B22369C3A231"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:G:\\DEV\\OGGDSF\\VERSIONS"
@@ -633,11 +633,11 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-            "{54DA9790-1474-11D3-8E00-00C04F6837D0}:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
+            "{54DA9790-1474-11D3-8E00-00C04F6837D0}:_4812D148C77C9833CE1C0D8D175B84A4"
{
-            "Signature" = "8:2000000000207c22cb2bc101bea35d3d2c61c40100207c22cb2bc10100000000005400000000000000000000770073006f0063006b00330032002e0064006c006c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "SourcePath" = "8:WSOCK32.dll"
-            "TargetName" = "8:WSOCK32.dll"
+            "Signature" = "8:2000000088d0784fc03fc401ea054b724461c4010062bddaca4ec201000000000020110000000000000000006d00730078006d006c0033002e0064006c006c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+            "SourcePath" = "8:msxml3.dll"
+            "TargetName" = "8:msxml3.dll"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -649,16 +649,16 @@
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
-            "Register" = "3:1"
+            "Register" = "3:4"
"Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
-            "{54DA9790-1474-11D3-8E00-00C04F6837D0}:_57E27F72FF7790C3FF18D6AB1F49D444"
+            "{54DA9790-1474-11D3-8E00-00C04F6837D0}:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
{
-            "Signature" = "8:2000000080dd2a10d295c1011a971a402c61c40180dd2a10d295c1010000000000400b0000000000000000006d0073007600630070003700300064002e0064006c006c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "SourcePath" = "8:MSVCP70D.dll"
-            "TargetName" = "8:MSVCP70D.dll"
+            "Signature" = "8:2000000000207c22cb2bc101042ccc163e61c40100207c22cb2bc10100000000005400000000000000000000770073006f0063006b00330032002e0064006c006c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+            "SourcePath" = "8:WSOCK32.dll"
+            "TargetName" = "8:WSOCK32.dll"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -671,7 +671,7 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
-            "Exclude" = "11:FALSE"
+            "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
@@ -697,7 +697,7 @@
}
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_9A2ADE669A100D71F9E0B3753CDA677A"
{
-            "Signature" = "8:20000000803a49fed195c101b271d2362961c401803a49fed195c101000000000030080000000000000000006d0073007600630072003700300064002e0064006c006c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+            "Signature" = "8:20000000803a49fed195c101beba96414661c401803a49fed195c101000000000030080000000000000000006d0073007600630072003700300064002e0064006c006c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:MSVCR70D.dll"
"TargetName" = "8:MSVCR70D.dll"
"Tag" = "8:"
@@ -716,9 +716,9 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
-            "{54DA9790-1474-11D3-8E00-00C04F6837D0}:_B2784574F1B848EABBE013669B46808C"
+            "{54DA9790-1474-11D3-8E00-00C04F6837D0}:_D7835E050C942DE27CB20AF3D1EC70F4"
{
-            "Signature" = "8:2000000010047b48bb5bc401da7f29dd2c61c401a2e8ff202d61c401000000000080030000000000000000006c006900620046004c00410043002e0064006c006c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+            "Signature" = "8:20000000269ccbeb4561c401269ccbeb4561c40188da2eed4561c4010000000000ea010000000000000000006c006900620046004c00410043002e0064006c006c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:libFLAC.dll"
"TargetName" = "8:libFLAC.dll"
"Tag" = "8:"
@@ -997,7 +997,7 @@
{
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_02E7D9728C8944F1BD021329177F5140"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTags\\Debug\\libCMMLTags.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTags\\Release\\libCMMLTags.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1026,7 +1026,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_0A1E63E5852E4F759F1A27E8F097727B"
{
-            "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Debug\\OOOggDump.exe"
+            "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Release\\OOOggDump.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1055,7 +1055,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_13E9F6D7ED35430BA31BDDF95E6327B3"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoEncoder\\Debug\\dsfAbstractVideoEncoder.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoEncoder\\Release\\dsfAbstractVideoEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1084,7 +1084,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_14E3067B71584FB5A245A2DA9D65D139"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libWinCMMLParse\\Debug\\libWinCMMLParse.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libWinCMMLParse\\Release\\libWinCMMLParse.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1113,7 +1113,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_3C7C3E6B832E481C8A36701A33FF3721"
{
-            "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Debug\\OOOggStat.exe"
+            "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Release\\OOOggStat.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1142,7 +1142,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_408749AC43894882BEEBFF43737E505B"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexDecoder\\Debug\\dsfSpeexDecoder.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexDecoder\\Release\\dsfSpeexDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1171,7 +1171,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_4EB6175B98B54613A5087D8EA257D00A"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libOOTheora\\Debug\\libOOTheora.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libOOTheora\\Release\\libOOTheora.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1200,7 +1200,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraDecoder\\Debug\\dsfTheoraDecoder.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraDecoder\\Release\\dsfTheoraDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1229,7 +1229,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_578B89273D59478F861AA5BC3600D074"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggMux\\Debug\\dsfOggMux.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggMux\\Release\\dsfOggMux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1258,7 +1258,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_58F56CD02F64413B9459F3E151760A57"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Debug\\libOOOgg.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Release\\libOOOgg.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1287,7 +1287,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_5EB08DD30B564283AA9C9F27D80CF9E4"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOggSeek\\Debug\\libOOOggSeek.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOggSeek\\Release\\libOOOggSeek.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1316,7 +1316,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_65015192414F476999A68339F89BEA57"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLDecoder\\Debug\\dsfCMMLDecoder.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLDecoder\\Release\\dsfCMMLDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1345,7 +1345,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_65EFE52655DF4119A626446C8F593760"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractAudioEncoder\\Debug\\dsfAbstractAudioEncoder.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractAudioEncoder\\Release\\dsfAbstractAudioEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1374,7 +1374,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_695A6D70DADB417491C0662D82245C2B"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoDecoder\\Debug\\dsfAbstractVideoDecoder.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoDecoder\\Release\\dsfAbstractVideoDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1403,7 +1403,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractAudioDecoder\\Debug\\dsfAbstracOggAudioDecoder.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractAudioDecoder\\Release\\dsfAbstracOggAudioDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1432,7 +1432,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_7508A3C0459B47439D67D2C7249DD169"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libogg\\win32\\Dynamic_Debug\\ogg_d.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libogg\\win32\\Dynamic_Release\\ogg.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1461,7 +1461,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_83AF8D74700947168B69E69E5160F082"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\debug\\bin\\libFLAC.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\release\\bin\\libFLAC.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1490,7 +1490,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_8976C400668B453CB941859C4F3C6E27"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACDecoder\\Debug\\dsfFLACDecoder.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACDecoder\\Release\\dsfFLACDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1519,7 +1519,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_8D9A2E4C592D4118B80A4AE8394D8963"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexEncoder\\Debug\\dsfSpeexEncoder.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexEncoder\\Release\\dsfSpeexEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1548,7 +1548,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_8F970C0B2593413CA2A3BBF5F2600387"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxDemux\\Debug\\dsfAnxDemux.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxDemux\\Release\\dsfAnxDemux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1577,7 +1577,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_A5AAB8CB90C548F1820BC101A765616C"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSeeking\\Debug\\dsfSeeking.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSeeking\\Release\\dsfSeeking.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1606,7 +1606,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_AC8962A7F212481095173AB7C8C89025"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraEncoder\\Debug\\dsfTheoraEncoder.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraEncoder\\Release\\dsfTheoraEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1635,7 +1635,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_AFF84F5FBA224F8A8D4BB3ACA539DC8B"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Debug\\vorbis_d.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Release\\vorbis.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1664,7 +1664,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_D2048C8B212841C88E42F6ADDCA8B0A2"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSubtitleVMR9\\Debug\\dsfSubtitleVMR9.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSubtitleVMR9\\Release\\dsfSubtitleVMR9.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1693,7 +1693,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_DB60960DC12343B89500B86D5AB10D02"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\debug\\bin\\libFLAC++.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\release\\bin\\libFLAC++.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1722,7 +1722,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_DCF4ED7597F8492AA49DC521111ED0F5"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggDemux\\Debug\\dsfOggDemux.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggDemux\\Release\\dsfOggDemux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1751,7 +1751,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_DD3F37DC11D54B5996F597343A185E03"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libtheora\\win32\\libtheora\\Debug\\libtheora.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libtheora\\win32\\libtheora\\Release\\libtheora.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1780,7 +1780,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_E1E372FA955046E6928BF533EA0AE6C3"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Debug\\libVorbisComment.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Release\\libVorbisComment.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1809,7 +1809,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\helper\\libfishsound\\win32\\Debug\\libfishsound.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\helper\\libfishsound\\win32\\Release\\libfishsound.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1838,7 +1838,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_EB09F87C612C40BCA34AC87060CFEFF1"
{
-            "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Debug\\OOOggCommentDump.exe"
+            "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Release\\OOOggCommentDump.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1867,7 +1867,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_EFEA71FFF2864107815DBDECCCCA1178"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisDecoder\\Debug\\dsfVorbisDecoder.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisDecoder\\Release\\dsfVorbisDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1896,7 +1896,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_FD547F0196C24DFBB9CAFCCEC06561BC"
{
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisEncoder\\Debug\\dsfVorbisEncoder.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisEncoder\\Release\\dsfVorbisEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -1929,7 +1929,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{778DA93A-8AE4-4AD8-BF3E-43DA8AC06994}"
-        "PackageCode" = "8:{EF7C7443-9B8B-4532-873C-ACFDC650DF79}"
+        "PackageCode" = "8:{FD51BFFA-0E15-4F9A-ABB7-909DD8EB97EC}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
@@ -1955,6 +1955,58 @@
}
"MergeModule"
{
+            "{AC8774A4-3E09-11D3-8E14-00C04F6837D0}:_4FCB947B6E2145568A6FDEFD9F71D8E6"
+            {
+            "UseDynamicProperties" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "SourcePath" = "8:vc_stl.msm"
+            "ModuleSignature" = "8:VC_User_STL.BA9B76E9_0DE0_11D5_A548_0090278A1BB8"
+                "Properties"
+                {
+                    "DIR_RETARGET_TARGETDIR"
+                    {
+                    "Name" = "8:DIR_RETARGET_TARGETDIR"
+                    "DisplayName" = "8:Module Retargetable Folder"
+                    "Description" = "8:"
+                    "Type" = "3:10"
+                    "ContextData" = "8:IsolationDir"
+                    "Attributes" = "3:6"
+                    "Setting" = "3:1"
+                    "UsePlugInResources" = "11:FALSE"
+                    }
+                }
+            "LanguageId" = "3:0"
+            "Exclude" = "11:FALSE"
+            "Folder" = "8:"
+            "Feature" = "8:"
+            "IsolateTo" = "8:"
+            }
+            "{AC8774A4-3E09-11D3-8E14-00C04F6837D0}:_A8FE2DF420CD4194BCD87F0977DD6D87"
+            {
+            "UseDynamicProperties" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "SourcePath" = "8:vc_crt.msm"
+            "ModuleSignature" = "8:VC_User_CRT.BA9B6D09_0DE0_11D5_A548_0090278A1BB8"
+                "Properties"
+                {
+                    "DIR_RETARGET_TARGETDIR"
+                    {
+                    "Name" = "8:DIR_RETARGET_TARGETDIR"
+                    "DisplayName" = "8:Module Retargetable Folder"
+                    "Description" = "8:"
+                    "Type" = "3:10"
+                    "ContextData" = "8:IsolationDir"
+                    "Attributes" = "3:6"
+                    "Setting" = "3:1"
+                    "UsePlugInResources" = "11:FALSE"
+                    }
+                }
+            "LanguageId" = "3:0"
+            "Exclude" = "11:FALSE"
+            "Folder" = "8:"
+            "Feature" = "8:"
+            "IsolateTo" = "8:"
+            }
}
"UserInterface"
{

Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-07-03 21:30:01 UTC (rev 6971)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-07-04 07:52:35 UTC (rev 6972)
@@ -81,60 +81,60 @@
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.0 = {A882A968-3013-4A27-B653-E18CF5C791FE}
{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.1 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{4906E533-2864-4840-ABC1-00CD844623EB}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{4906E533-2864-4840-ABC1-00CD844623EB}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{4906E533-2864-4840-ABC1-00CD844623EB}.1 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{4906E533-2864-4840-ABC1-00CD844623EB}.2 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{4906E533-2864-4840-ABC1-00CD844623EB}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.1 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{AE32588D-2807-4796-9E68-C9104817BC1A}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{AE32588D-2807-4796-9E68-C9104817BC1A}.1 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{AE32588D-2807-4796-9E68-C9104817BC1A}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{AE32588D-2807-4796-9E68-C9104817BC1A}.3 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.2 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{AE32588D-2807-4796-9E68-C9104817BC1A}.0 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{AE32588D-2807-4796-9E68-C9104817BC1A}.1 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{AE32588D-2807-4796-9E68-C9104817BC1A}.2 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{AE32588D-2807-4796-9E68-C9104817BC1A}.3 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.1 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.2 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{6B548F29-04A2-4F61-946F-72B86B4845DA}.0 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.0 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.1 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.1 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.2 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.3 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.4 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.3 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.4 = {A882A968-3013-4A27-B653-E18CF5C791FE}
{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.0 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.1 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.1 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.3 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.4 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.0 = {6D653C6F-8722-4B10-9C3A-CB7094DD159F}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.3 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.4 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.0 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.1 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.2 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.0 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.1 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.2 = {6D653C6F-8722-4B10-9C3A-CB7094DD159F}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.1 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
{D74A626E-C8CB-4787-913E-2E637FC04F2B}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.3 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.4 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.1 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.3 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.4 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.1 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.3 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.4 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.1 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.3 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.4 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.1 = {4906E533-2864-4840-ABC1-00CD844623EB}
{419E0701-9C9A-4671-B3B6-79FA206DEE25}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.3 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.4 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.3 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.4 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}.0 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.0 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.1 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.1 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.1 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.1 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.3 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.4 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.3 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.4 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{73D3CA81-3BDC-42F1-8456-76224F6B337C}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.0 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.1 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
@@ -198,370 +198,370 @@
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.59 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.60 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.61 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.62 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.63 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.64 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.65 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.66 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.67 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.68 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.69 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.70 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.71 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.72 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.73 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.74 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.75 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.76 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.77 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.78 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.79 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.80 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.81 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.82 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.83 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.84 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.85 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.86 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.87 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.88 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.89 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.90 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.91 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.92 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.93 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.94 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.95 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.96 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.97 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.98 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.99 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.100 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.101 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.102 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.103 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.104 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.105 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.106 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.107 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.108 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.109 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.110 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.111 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.112 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.113 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.114 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.115 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.116 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.117 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.118 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.119 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.120 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.121 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.122 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.123 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.124 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.125 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.126 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.127 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.128 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.129 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.130 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.131 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.132 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.133 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.134 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.135 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.136 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.137 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.138 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.139 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.140 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.141 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.142 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.143 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.144 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.145 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.146 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.147 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.148 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.149 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.150 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.151 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.152 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.153 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.154 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.155 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.156 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.157 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.158 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.159 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.160 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.161 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.162 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.163 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.164 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.165 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.166 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.167 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.168 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.169 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.170 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.171 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.172 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.173 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.174 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.175 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.176 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.177 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.178 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.179 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.180 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.181 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.182 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.183 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.184 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.185 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.186 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.62 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.63 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.64 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.65 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.66 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.67 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.68 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.69 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.70 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.71 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.72 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.73 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.74 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.75 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.76 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.77 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.78 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.79 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.80 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.81 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.82 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.83 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.84 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.85 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.86 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.87 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.88 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.89 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.90 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.91 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.92 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.93 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.94 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.95 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.96 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.97 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.98 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.99 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.100 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.101 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.102 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.103 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.104 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.105 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.106 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.107 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.108 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.109 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.110 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.111 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.112 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.113 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.114 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.115 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.116 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.117 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.118 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.119 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.120 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.121 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.122 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.123 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.124 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.125 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.126 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.127 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.128 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.129 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.130 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.131 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.132 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.133 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.134 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.135 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.136 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.137 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.138 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.139 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.140 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.141 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.142 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.143 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.144 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.145 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.146 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.147 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.148 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.149 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.150 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.151 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.152 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.153 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.154 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.155 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.156 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.157 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.158 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.159 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.160 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.161 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.162 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.163 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.164 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.165 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.166 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.167 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.168 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.169 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.170 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.171 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.172 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.173 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.174 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.175 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.176 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.177 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.178 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.179 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.180 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.181 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.182 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.183 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.184 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.185 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.186 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.187 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.188 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.189 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.190 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.191 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.192 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.193 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.194 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.195 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.196 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.197 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.198 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.199 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.200 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.201 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.202 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.203 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.204 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.205 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.206 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.207 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.208 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.209 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.188 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.189 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.190 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.191 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.192 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.193 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.194 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.195 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.196 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.197 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.198 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.199 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.200 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.201 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.202 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.203 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.204 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.205 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.206 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.207 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.208 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.209 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.210 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.211 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.212 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.213 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.214 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.215 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.216 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.217 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.218 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.219 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.220 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.211 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.212 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.213 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.214 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.215 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.216 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.217 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.218 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.219 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.220 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.221 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.222 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.223 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.224 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.225 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.226 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.227 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.228 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.229 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.230 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.231 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.232 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.233 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.234 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.235 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.236 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.237 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.238 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.239 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.240 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.241 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.242 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.243 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.244 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.245 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.246 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.247 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.248 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.249 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.250 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.251 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.252 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.253 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.254 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.255 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.256 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.257 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.258 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.259 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.260 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.261 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.262 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.263 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.264 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.265 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.222 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.223 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.224 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.225 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.226 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.227 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.228 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.229 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.230 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.231 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.232 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.233 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.234 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.235 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.236 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.237 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.238 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.239 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.240 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.241 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.242 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.243 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.244 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.245 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.246 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.247 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.248 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.249 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.250 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.251 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.252 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.253 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.254 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.255 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.256 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.257 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.258 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.259 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.260 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.261 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.262 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.263 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.264 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.265 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.266 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.267 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.268 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.269 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.270 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.271 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.272 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.273 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.274 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.275 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.276 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.267 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.268 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.269 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.270 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.271 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.272 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.273 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.274 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.275 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.276 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.277 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.278 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.279 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.280 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.281 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.282 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.283 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.284 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.285 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.286 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.287 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.288 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.289 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.290 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.291 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.292 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.293 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.294 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.295 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.296 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.297 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.298 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.299 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.278 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.279 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.280 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.281 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.282 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.283 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.284 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.285 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.286 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.287 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.288 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.289 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.290 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.291 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.292 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.293 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.294 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.295 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.296 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.297 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.298 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.299 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.300 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.301 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.302 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.303 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.304 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.305 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.306 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.307 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.308 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.309 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.310 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.311 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.312 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.313 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.314 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.315 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.316 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.317 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.318 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.319 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.320 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.321 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.322 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.323 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.324 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.325 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.326 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.327 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.328 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.329 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.330 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.331 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.332 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.333 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.334 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.335 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.336 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.337 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.338 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.339 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.340 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.341 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.342 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.343 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.344 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.345 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.346 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.347 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.348 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.349 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.350 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.351 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.352 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.353 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.354 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.355 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.356 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.357 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.358 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.359 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.360 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.361 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.362 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.363 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.364 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.365 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.366 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.367 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.368 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.369 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.370 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.371 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.372 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.373 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.374 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.375 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.376 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.377 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.378 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.379 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.380 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.381 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.382 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.383 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.384 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.385 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.386 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.387 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.388 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.389 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.390 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.391 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.392 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.393 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.394 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.395 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.396 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.397 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.398 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.399 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.400 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.401 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.402 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.403 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.404 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.405 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.406 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.407 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.408 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.409 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.410 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.411 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.412 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.413 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.414 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.415 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.416 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.417 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.418 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.419 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.420 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.421 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.422 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.423 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.424 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.425 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.301 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.302 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.303 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.304 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.305 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.306 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.307 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.308 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.309 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.310 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.311 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.312 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.313 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.314 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.315 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.316 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.317 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.318 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.319 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.320 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.321 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.322 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.323 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.324 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.325 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.326 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.327 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.328 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.329 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.330 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.331 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.332 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.333 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.334 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.335 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.336 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.337 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.338 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.339 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.340 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.341 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.342 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.343 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.344 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.345 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.346 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.347 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.348 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.349 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.350 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.351 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.352 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.353 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.354 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.355 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.356 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.357 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.358 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.359 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.360 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.361 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.362 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.363 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.364 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.365 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.366 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.367 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.368 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.369 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.370 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.371 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.372 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.373 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.374 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.375 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.376 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.377 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.378 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.379 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.380 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.381 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.382 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.383 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.384 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.385 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.386 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.387 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.388 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.389 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.390 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.391 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.392 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.393 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.394 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.395 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.396 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.397 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.398 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.399 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.400 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.401 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.402 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.403 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.404 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.405 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.406 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.407 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.408 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.409 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.410 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.411 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.412 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.413 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.414 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.415 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.416 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.417 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.418 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.419 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.420 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.421 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.422 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.423 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.424 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.425 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.426 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.427 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.428 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
@@ -625,23 +625,23 @@
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.486 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.487 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
{48CFEC13-E2BC-412F-8ECA-29090C7193B6}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.0 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.1 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.0 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.1 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{F9F22B14-22FE-4651-81B8-5AE267A6B189}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.3 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.4 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.3 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.4 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
{AD2DC5BB-AC7B-482D-9472-19BB98A833CE}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.0 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.1 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.1 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.2 = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.3 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.4 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.3 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.4 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.0 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.0 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.0 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.1 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.2 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.0 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.1 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.2 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.1 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.Debug.ActiveCfg = Debug|Win32
@@ -1006,7 +1006,6 @@
{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.Release Unicode.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
-		Item:1 = ..\..\docs\oggdsf_all.vsd
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection


Property changes on: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC
___________________________________________________________________
Name: svn:ignore
+ Release_dynamic


Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp	2004-07-03 21:30:01 UTC (rev 6971)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp	2004-07-04 07:52:35 UTC (rev 6972)
@@ -35,6 +35,8 @@

TheoraDecodeInputPin::TheoraDecodeInputPin(AbstractVideoDecodeFilter* inFilter, CCritSec* inFilterLock, AbstractVideoDecodeOutputPin* inOutputPin, CMediaType* inAcceptMediaType)
:	AbstractVideoDecodeInputPin(inFilter, inFilterLock, inOutputPin, NAME("TheoraDecodeInputPin"), L"Theora In", inAcceptMediaType)
+	,	mXOffset(0)
+	,	mYOffset(0)

{
ConstructCodec();
@@ -148,66 +150,135 @@
//Fill the buffer with yuv data...
//

-	//Y Data.
-	for ( long line = 0; line < inYUVBuffer->y_height; line++) {
-		memcpy((void*)locBuffer, (const void*)(inYUVBuffer->y + (inYUVBuffer->y_stride * (line))), inYUVBuffer->y_width);
-		locBuffer += inYUVBuffer->y_width;

-		if (mWidth > inYUVBuffer->y_width) {
-			memset((void*)locBuffer, 0, mWidth - inYUVBuffer->y_width);
-		}
-		locBuffer += mWidth - inYUVBuffer->y_width;
-	}

-	//Pad height...
-	for ( long line = 0; line < mHeight - inYUVBuffer->y_height; line++) {
-		memset((void*)locBuffer, 0, mWidth);
-		locBuffer += mWidth;
-	}
+	//Set up the pointers
+	unsigned char* locDestUptoPtr = locBuffer;
+	char* locSourceUptoPtr = inYUVBuffer->y;

-	//V Data
-	for ( long line = 0; line < inYUVBuffer->uv_height; line++) {
-		memcpy((void*)locBuffer, (const void*)(inYUVBuffer->v + (inYUVBuffer->uv_stride * (line))), inYUVBuffer->uv_width);
-		locBuffer += inYUVBuffer->uv_width;
+	//
+	//Y DATA
+	//

-		if (mWidth/2 > inYUVBuffer->uv_width) {
-			memset((void*)locBuffer, 0, (mWidth/2) - inYUVBuffer->uv_width);
-		}
-		locBuffer += (mWidth/2) - inYUVBuffer->uv_width;
+	//NEW WAY with offsets Y Data
+	long locTopPad = inYUVBuffer->y_height - mHeight - mYOffset;
+	ASSERT(locTopPad >= 0);
+	if (locTopPad < 0) {
+		locTopPad = 0;
}

-	//Pad height...
-	for ( long line = 0; line < (mHeight/2) - inYUVBuffer->uv_height; line++) {
-		memset((void*)locBuffer, 0, mWidth/2);
-		locBuffer += mWidth/2;
+	//Skip the top padding
+	locSourceUptoPtr += (locTopPad * inYUVBuffer->y_stride);
+
+	for (long line = 0; line < mHeight; line++) {
+		memcpy((void*)(locDestUptoPtr), (const void*)(locSourceUptoPtr + mXOffset), mWidth);
+		locSourceUptoPtr += inYUVBuffer->y_stride;
+		locDestUptoPtr += mWidth;
}

-	//U Data
-	for (long line = 0; line < inYUVBuffer->uv_height; line++) {
-		memcpy((void*)locBuffer, (const void*)(inYUVBuffer->u + (inYUVBuffer->uv_stride * (line))), inYUVBuffer->uv_width);
-		locBuffer += inYUVBuffer->uv_width;
+	locSourceUptoPtr += (mYOffset * inYUVBuffer->y_stride);

-		if (mWidth/2 > inYUVBuffer->uv_width) {
-			memset((void*)locBuffer, 0, (mWidth/2) - inYUVBuffer->uv_width);
-		}
-		locBuffer += (mWidth/2) - inYUVBuffer->uv_width;
+	//Source advances by (y_height * y_stride)
+	//Dest advances by (mHeight * mWidth)
+
+	//
+	//V DATA
+	//
+
+	//Half the padding for uv planes... is this correct ?
+	locTopPad = locTopPad /2;
+
+	locSourceUptoPtr = inYUVBuffer->v;
+
+	//Skip the top padding
+	locSourceUptoPtr += (locTopPad * inYUVBuffer->y_stride);
+
+	for (long line = 0; line < mHeight / 2; line++) {
+		memcpy((void*)(locDestUptoPtr), (const void*)(locSourceUptoPtr + (mXOffset / 2)), mWidth / 2);
+		locSourceUptoPtr += inYUVBuffer->uv_stride;
+		locDestUptoPtr += (mWidth / 2);
}
+	locSourceUptoPtr += ((mYOffset/2) * inYUVBuffer->uv_stride);

-	//Pad height...
-	for ( long line = 0; line < (mHeight/2) - inYUVBuffer->uv_height; line++) {
-		memset((void*)locBuffer, 0, mWidth/2);
-		locBuffer += mWidth/2;
+	//Source advances by (locTopPad + mYOffset/2 + mHeight /2) * uv_stride
+	//where locTopPad for uv = (inYUVBuffer->y_height - mHeight - mYOffset) / 2
+	//						=	(inYUVBuffer->yheight/2 - mHeight/2 - mYOffset/2)
+	// so source advances by (y_height/2) * uv_stride
+	//Dest advances by (mHeight * mWidth) /4
+
+
+	//
+	//U DATA
+	//
+
+	locSourceUptoPtr = inYUVBuffer->u;
+
+	//Skip the top padding
+	locSourceUptoPtr += (locTopPad * inYUVBuffer->y_stride);
+
+	for (long line = 0; line < mHeight / 2; line++) {
+		memcpy((void*)(locDestUptoPtr), (const void*)(locSourceUptoPtr + (mXOffset / 2)), mWidth / 2);
+		locSourceUptoPtr += inYUVBuffer->uv_stride;
+		locDestUptoPtr += (mWidth / 2);
}
+	locSourceUptoPtr += ((mYOffset/2) * inYUVBuffer->uv_stride);


+	////Y Data.
+	//for ( long line = 0; line < inYUVBuffer->y_height; line++) {
+	//	memcpy((void*)locBuffer, (const void*)(inYUVBuffer->y + (inYUVBuffer->y_stride * (line))), inYUVBuffer->y_width);
+	//	locBuffer += inYUVBuffer->y_width;

+	//	if (mWidth > inYUVBuffer->y_width) {
+	//		memset((void*)locBuffer, 0, mWidth - inYUVBuffer->y_width);
+	//	}
+	//	locBuffer += mWidth - inYUVBuffer->y_width;
+	//}

+	////Pad height...
+	//for ( long line = 0; line < mHeight - inYUVBuffer->y_height; line++) {
+	//	memset((void*)locBuffer, 0, mWidth);
+	//	locBuffer += mWidth;
+	//}

-	//memcpy((void*)locBuffer, (const void*)(inYUVBuffer->y + (inYUVBuffer->y_stride * (inYUVBuffer->y_height - 1))), inYUVBuffer->y_height* inYUVBuffer->y_width);
-	//locBuffer += inYUVBuffer->y_height* inYUVBuffer->y_width;
-	//memcpy((void*)locBuffer, (const void*)(inYUVBuffer->u + (inYUVBuffer->y_stride * (inYUVBuffer->y_height - 1))), inYUVBuffer->uv_height* inYUVBuffer->uv_width);
-	//locBuffer += inYUVBuffer->uv_height* inYUVBuffer->uv_width;
-	//memcpy((void*)locBuffer, (const void*)(inYUVBuffer->v + (inYUVBuffer->y_stride * (inYUVBuffer->y_height - 1))), inYUVBuffer->uv_height* inYUVBuffer->uv_width);
+	////V Data
+	//for ( long line = 0; line < inYUVBuffer->uv_height; line++) {
+	//	memcpy((void*)locBuffer, (const void*)(inYUVBuffer->v + (inYUVBuffer->uv_stride * (line))), inYUVBuffer->uv_width);
+	//	locBuffer += inYUVBuffer->uv_width;
+
+	//	if (mWidth/2 > inYUVBuffer->uv_width) {
+	//		memset((void*)locBuffer, 0, (mWidth/2) - inYUVBuffer->uv_width);
+	//	}
+	//	locBuffer += (mWidth/2) - inYUVBuffer->uv_width;
+	//}
+
+	////Pad height...
+	//for ( long line = 0; line < (mHeight/2) - inYUVBuffer->uv_height; line++) {
+	//	memset((void*)locBuffer, 0, mWidth/2);
+	//	locBuffer += mWidth/2;
+	//}
+
+	////U Data
+	//for (long line = 0; line < inYUVBuffer->uv_height; line++) {
+	//	memcpy((void*)locBuffer, (const void*)(inYUVBuffer->u + (inYUVBuffer->uv_stride * (line))), inYUVBuffer->uv_width);
+	//	locBuffer += inYUVBuffer->uv_width;
+
+	//	if (mWidth/2 > inYUVBuffer->uv_width) {
+	//		memset((void*)locBuffer, 0, (mWidth/2) - inYUVBuffer->uv_width);
+	//	}
+	//	locBuffer += (mWidth/2) - inYUVBuffer->uv_width;
+	//}
+
+	////Pad height...
+	//for ( long line = 0; line < (mHeight/2) - inYUVBuffer->uv_height; line++) {
+	//	memset((void*)locBuffer, 0, mWidth/2);
+	//	locBuffer += mWidth/2;
+	//}
+
+
+
+
+
//Set the sample parameters.
SetSampleParams(locSample, mFrameSize, &locFrameStart, &locFrameEnd);

@@ -251,6 +322,10 @@
if (inMediaType->subtype == MEDIASUBTYPE_Theora) {
((TheoraDecodeFilter*)mParentFilter)->setTheoraFormat((sTheoraFormatBlock*)inMediaType->pbFormat);
mParentFilter->mVideoFormat = AbstractVideoDecodeFilter::THEORA;
+		//Set some other stuff here too...
+		mXOffset = ((sTheoraFormatBlock*)inMediaType->pbFormat)->xOffset;
+		mYOffset = ((sTheoraFormatBlock*)inMediaType->pbFormat)->yOffset;
+
} else {
//Failed... should never be here !
throw 0;

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h	2004-07-03 21:30:01 UTC (rev 6971)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h	2004-07-04 07:52:35 UTC (rev 6972)
@@ -67,6 +67,8 @@
//FishSound* mFishSound;
//FishSoundInfo mFishInfo;
TheoraDecoder* mTheoraDecoder;
+	unsigned long mXOffset;
+	unsigned long mYOffset;




Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.cpp	2004-07-03 21:30:01 UTC (rev 6971)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeOutputPin.cpp	2004-07-04 07:52:35 UTC (rev 6972)
@@ -74,23 +74,23 @@
inFormatBuffer->bmiHeader.biClrImportant = 0;   //All colours important
inFormatBuffer->bmiHeader.biClrUsed = 0;        //Use max colour depth
inFormatBuffer->bmiHeader.biCompression = MAKEFOURCC('Y','V','1','2');
-	inFormatBuffer->bmiHeader.biHeight = locFilter->mTheoraFormatInfo->height;   //Not sure
+	inFormatBuffer->bmiHeader.biHeight = locFilter->mTheoraFormatInfo->frameHeight;   //Not sure
inFormatBuffer->bmiHeader.biPlanes = 1;    //Must be 1
inFormatBuffer->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);    //????? Size of what ?
-	inFormatBuffer->bmiHeader.biSizeImage = ((locFilter->mTheoraFormatInfo->height * locFilter->mTheoraFormatInfo->width) * 3)/2;    //Size in bytes of image ??
-	inFormatBuffer->bmiHeader.biWidth = locFilter->mTheoraFormatInfo->width;
+	inFormatBuffer->bmiHeader.biSizeImage = ((locFilter->mTheoraFormatInfo->frameHeight * locFilter->mTheoraFormatInfo->frameWidth) * 3)/2;    //Size in bytes of image ??
+	inFormatBuffer->bmiHeader.biWidth = locFilter->mTheoraFormatInfo->frameWidth;
inFormatBuffer->bmiHeader.biXPelsPerMeter = 2000;   //Fuck knows
inFormatBuffer->bmiHeader.biYPelsPerMeter = 2000;   //" " " " "

inFormatBuffer->rcSource.top = 0;
-	inFormatBuffer->rcSource.bottom = locFilter->mTheoraFormatInfo->height;
+	inFormatBuffer->rcSource.bottom = locFilter->mTheoraFormatInfo->frameHeight;
inFormatBuffer->rcSource.left = 0;
-	inFormatBuffer->rcSource.right = locFilter->mTheoraFormatInfo->width;
+	inFormatBuffer->rcSource.right = locFilter->mTheoraFormatInfo->frameWidth;

inFormatBuffer->rcTarget.top = 0;
-	inFormatBuffer->rcTarget.bottom = locFilter->mTheoraFormatInfo->height;
+	inFormatBuffer->rcTarget.bottom = locFilter->mTheoraFormatInfo->frameHeight;
inFormatBuffer->rcTarget.left = 0;
-	inFormatBuffer->rcTarget.right = locFilter->mTheoraFormatInfo->width;
+	inFormatBuffer->rcTarget.right = locFilter->mTheoraFormatInfo->frameWidth;

inFormatBuffer->dwBitErrorRate=0;
return true;

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/ITheoraEncodeSettings.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/ITheoraEncodeSettings.h	2004-07-03 21:30:01 UTC (rev 6971)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/ITheoraEncodeSettings.h	2004-07-04 07:52:35 UTC (rev 6972)
@@ -1,21 +1,49 @@
#pragma once

-class ITheoraEncodeSettings
-{
-public:
+//class ITheoraEncodeSettings
+//{
+//public:
+//	DECLARE_IUNKNOWN
+//	virtual unsigned long targetBitrate() = 0;
+//	virtual unsigned char quality() = 0;
+//	virtual unsigned long keyframeFreq() = 0;
+//
+//	virtual bool setTargetBitrate(unsigned long inBitrate) = 0;
+//	virtual bool setQuality(unsigned char inQuality) = 0;
+//	virtual bool setKeyframeFreq(unsigned long inKeyframeFreq) = 0;
+//protected:
+//	//unsigned long mTargetBitrate;
+//
+//	//unsigned char mQuality;
+//
+//	//unsigned long mKeyframeFreq;
+//
+//};
+
+#ifndef __IGARGLEDMO__
+#define __IGARGLEDMO__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+DECLARE_INTERFACE_(ITheoraEncodeSettings, IUnknown) {
+
+	virtual STDMETHODIMP_(unsigned long) targetBitrate() PURE;

-	virtual unsigned long targetBitrate() = 0;
-	virtual unsigned char quality() = 0;
-	virtual unsigned long keyframeFreq() = 0;
+	virtual STDMETHODIMP_(unsigned char) quality() PURE;
+	virtual STDMETHODIMP_(unsigned long) keyframeFreq() PURE;

-	virtual bool setTargetBitrate(unsigned long inBitrate) = 0;
-	virtual bool setQuality(unsigned char inQuality) = 0;
-	virtual bool setKeyframeFreq(unsigned long inKeyframeFreq) = 0;
-protected:
-	//unsigned long mTargetBitrate;
-
-	//unsigned char mQuality;
-
-	//unsigned long mKeyframeFreq;
-
+	virtual STDMETHODIMP_(bool) setTargetBitrate(unsigned long inBitrate) PURE;
+	virtual STDMETHODIMP_(bool) setQuality(unsigned char inQuality) PURE;
+	virtual STDMETHODIMP_(bool) setKeyframeFreq(unsigned long inKeyframeFreq) PURE;
+
+
};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.cpp	2004-07-03 21:30:01 UTC (rev 6971)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.cpp	2004-07-04 07:52:35 UTC (rev 6972)
@@ -96,7 +96,7 @@
SendDlgItemMessage(m_Dlg, IDC_SLIDER_QUALITY, TBM_SETTICFREQ, 1, 0);
SendDlgItemMessage(m_Dlg, IDC_SLIDER_QUALITY, TBM_SETPOS, 1, mTheoraEncodeSettings->quality());

-	SendDlgItemMessage(m_Dlg, IDC_SLIDER_LOG_KEYFRAME, TBM_SETRANGE, TRUE, MAKELONG(0, 6));
+	SendDlgItemMessage(m_Dlg, IDC_SLIDER_LOG_KEYFRAME, TBM_SETRANGE, TRUE, MAKELONG(0, 13));
SendDlgItemMessage(m_Dlg, IDC_SLIDER_LOG_KEYFRAME, TBM_SETTICFREQ, 1, 0);
SendDlgItemMessage(m_Dlg, IDC_SLIDER_LOG_KEYFRAME, TBM_SETPOS, 1, log2(mTheoraEncodeSettings->keyframeFreq()));


Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.cpp	2004-07-03 21:30:01 UTC (rev 6971)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.cpp	2004-07-04 07:52:35 UTC (rev 6972)
@@ -106,29 +106,29 @@
}

//Implementation of ITheoraEncodeSEttings
-unsigned long TheoraEncodeFilter::targetBitrate() {
+STDMETHODIMP_(unsigned long) TheoraEncodeFilter::targetBitrate() {
return ((TheoraEncodeInputPin*)mInputPin)->theoraInfo()->target_bitrate;
}
-unsigned char TheoraEncodeFilter::quality() {
+STDMETHODIMP_(unsigned char) TheoraEncodeFilter::quality() {
return ((TheoraEncodeInputPin*)mInputPin)->theoraInfo()->quality;
}
-unsigned long TheoraEncodeFilter::keyframeFreq() {
+STDMETHODIMP_(unsigned long) TheoraEncodeFilter::keyframeFreq() {
return ((TheoraEncodeInputPin*)mInputPin)->theoraInfo()->keyframe_frequency;
}

-bool TheoraEncodeFilter::setTargetBitrate(unsigned long inBitrate) {
+STDMETHODIMP_(bool) TheoraEncodeFilter::setTargetBitrate(unsigned long inBitrate) {
//Needs error checking
((TheoraEncodeInputPin*)mInputPin)->theoraInfo()->target_bitrate = inBitrate;
((TheoraEncodeInputPin*)mInputPin)->theoraInfo()->keyframe_data_target_bitrate = (inBitrate * 3)/2;
return true;

}
-bool TheoraEncodeFilter::setQuality(unsigned char inQuality) {
+STDMETHODIMP_(bool) TheoraEncodeFilter::setQuality(unsigned char inQuality) {
//Needs error checking
((TheoraEncodeInputPin*)mInputPin)->theoraInfo()->quality = inQuality;
return true;
}
-bool TheoraEncodeFilter::setKeyframeFreq(unsigned long inKeyframeFreq) {
+STDMETHODIMP_(bool) TheoraEncodeFilter::setKeyframeFreq(unsigned long inKeyframeFreq) {
//Needs error checking
((TheoraEncodeInputPin*)mInputPin)->theoraInfo()->keyframe_frequency = inKeyframeFreq;
((TheoraEncodeInputPin*)mInputPin)->theoraInfo()->keyframe_frequency_force = inKeyframeFreq;

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.h	2004-07-03 21:30:01 UTC (rev 6971)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.h	2004-07-04 07:52:35 UTC (rev 6972)
@@ -62,13 +62,13 @@
STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);

//ITheoraEncodeSettings Implementation
-	unsigned long targetBitrate();
-	unsigned char quality();
-	unsigned long keyframeFreq();
+	STDMETHODIMP_(unsigned long) targetBitrate();
+	STDMETHODIMP_(unsigned char) quality();
+	STDMETHODIMP_(unsigned long) keyframeFreq();

-	bool setTargetBitrate(unsigned long inBitrate);
-	bool setQuality(unsigned char inQuality);
-	bool setKeyframeFreq(unsigned long inKeyframeFreq);
+	STDMETHODIMP_(bool) setTargetBitrate(unsigned long inBitrate);
+	STDMETHODIMP_(bool) setQuality(unsigned char inQuality);
+	STDMETHODIMP_(bool) setKeyframeFreq(unsigned long inKeyframeFreq);
//

//AbstractVideoEncodeFilter pure virtuals

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.aps
===================================================================
(Binary files differ)

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.rc
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.rc	2004-07-03 21:30:01 UTC (rev 6971)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.rc	2004-07-04 07:52:35 UTC (rev 6972)
@@ -58,7 +58,7 @@
IDD_THEORA_ENCODE_SETTINGS, DIALOG
BEGIN
LEFTMARGIN, 7
-        RIGHTMARGIN, 189
+        RIGHTMARGIN, 205
TOPMARGIN, 7
BOTTOMMARGIN, 119
END
@@ -71,7 +71,7 @@
// Dialog
//

-IDD_THEORA_ENCODE_SETTINGS DIALOGEX 0, 0, 196, 126
+IDD_THEORA_ENCODE_SETTINGS DIALOGEX 0, 0, 212, 126
STYLE DS_SETFONT | WS_CHILD | WS_BORDER
FONT 8, "MS Sans Serif", 400, 0, 0x0
BEGIN

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp	2004-07-03 21:30:01 UTC (rev 6971)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp	2004-07-04 07:52:35 UTC (rev 6972)
@@ -151,6 +151,9 @@
}
HRESULT AbstractVideoDecodeOutputPin::CheckMediaType(const CMediaType *inMediaType) {
if ((inMediaType->majortype == MEDIATYPE_Video) && (inMediaType->subtype == MEDIASUBTYPE_YV12) && (inMediaType->formattype == FORMAT_VideoInfo)) {
+
+		//FIX::: SHould this stuff be in a check routine ??? Shouldn't it be in set mediatype ?
+
//debugLog << "CheckMediaType : Accepting..."<<endl;

VIDEOINFOHEADER* locVideoHeader = (VIDEOINFOHEADER*)inMediaType->Format();

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.aps
===================================================================
(Binary files differ)

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.rc
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.rc	2004-07-03 21:30:01 UTC (rev 6971)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.rc	2004-07-04 07:52:35 UTC (rev 6972)
@@ -58,7 +58,7 @@
BEGIN
CTEXT           "illiminable Directshow Filter Package 0.60",
IDC_ABOUT_HEADER,13,15,183,11,WS_BORDER
-    LTEXT           "This filter package provides support for various ogg based media types, including vorbis, speex, theora, cmml, annodex and ogm. This package of filters was written by Zentaro Kavanagh, however several libraries by various other authors are used. Please see the AUTHORS file that accompanies this package for detailed information. The source of these filters is released under a BSD license, please read the COPYRIGHTS files which accompanied this package for detailed license information. Sorry these things are so damn ugly, I hate using MFC. I'll spend some time prettying later !",
+    LTEXT           "This filter package provides support for various ogg based media types, including vorbis, speex, theora, cmml, annodex and ogm. Read AUTHORS and COPYRIGHTS for details.",
IDC_STATIC,13,33,183,106,WS_BORDER
END



Property changes on: trunk/oggdsf/src/lib/core/ogg/libogg/win32
___________________________________________________________________
Name: svn:ignore
+ Dynamic_Release




More information about the commits mailing list