mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fix Mac bustage (I hope). I think these names conflicted with other names

This commit is contained in:
jband%netscape.com 2001-11-01 01:15:53 +00:00
Родитель 27db070415
Коммит 6d98c8cf02
5 изменённых файлов: 422 добавлений и 422 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

50
js/src/xpconnect/src/xpcvariant.cpp
Просмотреть файл

@ -151,7 +151,7 @@ XPCVariant::VariantDataToJS(XPCCallContext& ccx,
if(xpcvariant)
{
jsval realVal = xpcvariant->GetJSVal();
if(JSVAL_IS_PRIMITIVE(realVal) || type == nsIDataType::TYPE_ID)
if(JSVAL_IS_PRIMITIVE(realVal) || type == nsIDataType::VTYPE_ID)
{
// Not a JSObject (or is a JSObject representing an nsID),.
// So, just pass through the underlying data.
@ -180,23 +180,23 @@ XPCVariant::VariantDataToJS(XPCCallContext& ccx,
switch(type)
{
case nsIDataType::TYPE_INT8:
case nsIDataType::TYPE_INT16:
case nsIDataType::TYPE_INT32:
case nsIDataType::TYPE_INT64:
case nsIDataType::TYPE_UINT8:
case nsIDataType::TYPE_UINT16:
case nsIDataType::TYPE_UINT32:
case nsIDataType::TYPE_UINT64:
case nsIDataType::TYPE_FLOAT:
case nsIDataType::TYPE_DOUBLE:
case nsIDataType::VTYPE_INT8:
case nsIDataType::VTYPE_INT16:
case nsIDataType::VTYPE_INT32:
case nsIDataType::VTYPE_INT64:
case nsIDataType::VTYPE_UINT8:
case nsIDataType::VTYPE_UINT16:
case nsIDataType::VTYPE_UINT32:
case nsIDataType::VTYPE_UINT64:
case nsIDataType::VTYPE_FLOAT:
case nsIDataType::VTYPE_DOUBLE:
{
// Easy. Handle inline.
if(NS_FAILED(variant->GetAsDouble(&xpctvar.val.d)))
return JS_FALSE;
return JS_NewNumberValue(ccx, xpctvar.val.d, pJSVal);
}
case nsIDataType::TYPE_BOOL:
case nsIDataType::VTYPE_BOOL:
{
// Easy. Handle inline.
if(NS_FAILED(variant->GetAsBool(&xpctvar.val.b)))
@ -204,54 +204,54 @@ XPCVariant::VariantDataToJS(XPCCallContext& ccx,
*pJSVal = BOOLEAN_TO_JSVAL(xpctvar.val.b);
return JS_TRUE;
}
case nsIDataType::TYPE_CHAR:
case nsIDataType::VTYPE_CHAR:
if(NS_FAILED(variant->GetAsChar(&xpctvar.val.c)))
return JS_FALSE;
xpctvar.type = (uint8)TD_CHAR;
break;
case nsIDataType::TYPE_WCHAR:
case nsIDataType::VTYPE_WCHAR:
if(NS_FAILED(variant->GetAsWChar(&xpctvar.val.wc)))
return JS_FALSE;
xpctvar.type = (uint8)TD_WCHAR;
break;
case nsIDataType::TYPE_ID:
case nsIDataType::VTYPE_ID:
if(NS_FAILED(variant->GetAsID(&iid)))
return JS_FALSE;
xpctvar.type = (uint8)(TD_PNSIID | XPT_TDP_POINTER);
xpctvar.val.p = &iid;
break;
case nsIDataType::TYPE_ASTRING:
case nsIDataType::VTYPE_ASTRING:
if(NS_FAILED(variant->GetAsAString(astring)))
return JS_FALSE;
xpctvar.type = (uint8)(TD_DOMSTRING | XPT_TDP_POINTER);
xpctvar.val.p = &astring;
break;
case nsIDataType::TYPE_CHAR_STR:
case nsIDataType::VTYPE_CHAR_STR:
if(NS_FAILED(variant->GetAsString((char**)&xpctvar.val.p)))
return JS_FALSE;
xpctvar.type = (uint8)(TD_PSTRING | XPT_TDP_POINTER);
xpctvar.SetValIsAllocated();
break;
case nsIDataType::TYPE_STRING_SIZE_IS:
case nsIDataType::VTYPE_STRING_SIZE_IS:
if(NS_FAILED(variant->GetAsStringWithSize(&size,
(char**)&xpctvar.val.p)))
return JS_FALSE;
xpctvar.type = (uint8)(TD_PSTRING_SIZE_IS | XPT_TDP_POINTER);
break;
case nsIDataType::TYPE_WCHAR_STR:
case nsIDataType::VTYPE_WCHAR_STR:
if(NS_FAILED(variant->GetAsWString((PRUnichar**)&xpctvar.val.p)))
return JS_FALSE;
xpctvar.type = (uint8)(TD_PWSTRING | XPT_TDP_POINTER);
xpctvar.SetValIsAllocated();
break;
case nsIDataType::TYPE_WSTRING_SIZE_IS:
case nsIDataType::VTYPE_WSTRING_SIZE_IS:
if(NS_FAILED(variant->GetAsWStringWithSize(&size,
(PRUnichar**)&xpctvar.val.p)))
return JS_FALSE;
xpctvar.type = (uint8)(TD_PWSTRING_SIZE_IS | XPT_TDP_POINTER);
break;
case nsIDataType::TYPE_INTERFACE:
case nsIDataType::TYPE_INTERFACE_IS:
case nsIDataType::VTYPE_INTERFACE:
case nsIDataType::VTYPE_INTERFACE_IS:
{
nsID* piid;
if(NS_FAILED(variant->GetAsInterface(&piid, &xpctvar.val.p)))
@ -265,11 +265,11 @@ XPCVariant::VariantDataToJS(XPCCallContext& ccx,
xpctvar.SetValIsInterface();
break;
}
case nsIDataType::TYPE_ARRAY:
case nsIDataType::VTYPE_ARRAY:
// XXX FIXME
return JS_FALSE;
case nsIDataType::TYPE_VOID:
case nsIDataType::TYPE_EMPTY:
case nsIDataType::VTYPE_VOID:
case nsIDataType::VTYPE_EMPTY:
*pJSVal = JSVAL_VOID;
return JS_TRUE;
default:

52
js/src/xpconnect/tests/components/xpctest_variant.cpp
Просмотреть файл

@ -103,55 +103,55 @@ static nsresult ConvertAndCopyVariant(nsIVariant *inVar, PRUint16 type, nsIVaria
switch(type)
{
case nsIDataType::TYPE_INT8:
case nsIDataType::VTYPE_INT8:
MEMBER_COPY_CAST(Int8, PRUint8)
break;
case nsIDataType::TYPE_INT16:
case nsIDataType::VTYPE_INT16:
MEMBER_COPY(Int16)
break;
case nsIDataType::TYPE_INT32:
case nsIDataType::VTYPE_INT32:
MEMBER_COPY(Int32)
break;
case nsIDataType::TYPE_INT64:
case nsIDataType::VTYPE_INT64:
MEMBER_COPY(Int64)
break;
case nsIDataType::TYPE_UINT8:
case nsIDataType::VTYPE_UINT8:
MEMBER_COPY(Uint8)
break;
case nsIDataType::TYPE_UINT16:
case nsIDataType::VTYPE_UINT16:
MEMBER_COPY(Uint16)
break;
case nsIDataType::TYPE_UINT32:
case nsIDataType::VTYPE_UINT32:
MEMBER_COPY(Uint32)
break;
case nsIDataType::TYPE_UINT64:
case nsIDataType::VTYPE_UINT64:
MEMBER_COPY(Uint64)
break;
case nsIDataType::TYPE_FLOAT:
case nsIDataType::VTYPE_FLOAT:
MEMBER_COPY(Float)
break;
case nsIDataType::TYPE_DOUBLE:
case nsIDataType::VTYPE_DOUBLE:
MEMBER_COPY(Double)
break;
case nsIDataType::TYPE_BOOL:
case nsIDataType::VTYPE_BOOL:
MEMBER_COPY(Bool)
break;
case nsIDataType::TYPE_CHAR:
case nsIDataType::VTYPE_CHAR:
MEMBER_COPY(Char)
break;
case nsIDataType::TYPE_WCHAR:
case nsIDataType::VTYPE_WCHAR:
MEMBER_COPY(WChar)
break;
case nsIDataType::TYPE_VOID:
if(inVarType != nsIDataType::TYPE_VOID)
case nsIDataType::VTYPE_VOID:
if(inVarType != nsIDataType::VTYPE_VOID)
return NS_ERROR_CANNOT_CONVERT_DATA;
rv = outVar->SetAsVoid();
NS_ENSURE_SUCCESS(rv,rv);
break;
case nsIDataType::TYPE_ID:
case nsIDataType::VTYPE_ID:
MEMBER_COPY(ID)
break;
case nsIDataType::TYPE_ASTRING:
case nsIDataType::VTYPE_ASTRING:
{
nsAutoString str;
rv = inVar->GetAsAString(str);
@ -160,7 +160,7 @@ static nsresult ConvertAndCopyVariant(nsIVariant *inVar, PRUint16 type, nsIVaria
NS_ENSURE_SUCCESS(rv,rv);
break;
}
case nsIDataType::TYPE_CHAR_STR:
case nsIDataType::VTYPE_CHAR_STR:
{
char* str;
rv = inVar->GetAsString(&str);
@ -170,7 +170,7 @@ static nsresult ConvertAndCopyVariant(nsIVariant *inVar, PRUint16 type, nsIVaria
NS_ENSURE_SUCCESS(rv,rv);
break;
}
case nsIDataType::TYPE_STRING_SIZE_IS:
case nsIDataType::VTYPE_STRING_SIZE_IS:
{
char* str;
PRUint32 size;
@ -181,7 +181,7 @@ static nsresult ConvertAndCopyVariant(nsIVariant *inVar, PRUint16 type, nsIVaria
NS_ENSURE_SUCCESS(rv,rv);
break;
}
case nsIDataType::TYPE_WCHAR_STR:
case nsIDataType::VTYPE_WCHAR_STR:
{
PRUnichar* str;
rv = inVar->GetAsWString(&str);
@ -191,7 +191,7 @@ static nsresult ConvertAndCopyVariant(nsIVariant *inVar, PRUint16 type, nsIVaria
NS_ENSURE_SUCCESS(rv,rv);
break;
}
case nsIDataType::TYPE_WSTRING_SIZE_IS:
case nsIDataType::VTYPE_WSTRING_SIZE_IS:
{
PRUnichar* str;
PRUint32 size;
@ -202,7 +202,7 @@ static nsresult ConvertAndCopyVariant(nsIVariant *inVar, PRUint16 type, nsIVaria
NS_ENSURE_SUCCESS(rv,rv);
break;
}
case nsIDataType::TYPE_INTERFACE:
case nsIDataType::VTYPE_INTERFACE:
{
nsISupports* ptr;
rv = inVar->GetAsISupports(&ptr);
@ -212,7 +212,7 @@ static nsresult ConvertAndCopyVariant(nsIVariant *inVar, PRUint16 type, nsIVaria
NS_ENSURE_SUCCESS(rv,rv);
break;
}
case nsIDataType::TYPE_INTERFACE_IS:
case nsIDataType::VTYPE_INTERFACE_IS:
{
nsISupports* ptr;
nsIID* iid;
@ -225,10 +225,10 @@ static nsresult ConvertAndCopyVariant(nsIVariant *inVar, PRUint16 type, nsIVaria
break;
}
break;
case nsIDataType::TYPE_ARRAY:
case nsIDataType::VTYPE_ARRAY:
return NS_ERROR_NOT_IMPLEMENTED;
case nsIDataType::TYPE_EMPTY:
if(inVarType != nsIDataType::TYPE_EMPTY)
case nsIDataType::VTYPE_EMPTY:
if(inVarType != nsIDataType::VTYPE_EMPTY)
return NS_ERROR_CANNOT_CONVERT_DATA;
rv = outVar->SetAsEmpty();
NS_ENSURE_SUCCESS(rv,rv);

96
js/src/xpconnect/tests/js/old/xpctest_variant.js
Просмотреть файл

@ -5,57 +5,57 @@ const TestVariant = Components.Constructor("@mozilla.org/js/xpc/test/TestVariant
var tv = new TestVariant;
const DataTypeArray = [
Components.interfaces.nsIDataType.TYPE_INT8 ,
Components.interfaces.nsIDataType.TYPE_INT16 ,
Components.interfaces.nsIDataType.TYPE_INT32 ,
Components.interfaces.nsIDataType.TYPE_INT64 ,
Components.interfaces.nsIDataType.TYPE_UINT8 ,
Components.interfaces.nsIDataType.TYPE_UINT16 ,
Components.interfaces.nsIDataType.TYPE_UINT32 ,
Components.interfaces.nsIDataType.TYPE_UINT64 ,
Components.interfaces.nsIDataType.TYPE_FLOAT ,
Components.interfaces.nsIDataType.TYPE_DOUBLE ,
Components.interfaces.nsIDataType.TYPE_BOOL ,
Components.interfaces.nsIDataType.TYPE_CHAR ,
Components.interfaces.nsIDataType.TYPE_WCHAR ,
Components.interfaces.nsIDataType.TYPE_VOID ,
Components.interfaces.nsIDataType.TYPE_ID ,
Components.interfaces.nsIDataType.TYPE_ASTRING ,
Components.interfaces.nsIDataType.TYPE_CHAR_STR ,
Components.interfaces.nsIDataType.TYPE_WCHAR_STR ,
Components.interfaces.nsIDataType.TYPE_INTERFACE ,
Components.interfaces.nsIDataType.TYPE_INTERFACE_IS ,
Components.interfaces.nsIDataType.TYPE_ARRAY ,
Components.interfaces.nsIDataType.TYPE_STRING_SIZE_IS ,
Components.interfaces.nsIDataType.TYPE_WSTRING_SIZE_IS ,
Components.interfaces.nsIDataType.TYPE_EMPTY
Components.interfaces.nsIDataType.VTYPE_INT8 ,
Components.interfaces.nsIDataType.VTYPE_INT16 ,
Components.interfaces.nsIDataType.VTYPE_INT32 ,
Components.interfaces.nsIDataType.VTYPE_INT64 ,
Components.interfaces.nsIDataType.VTYPE_UINT8 ,
Components.interfaces.nsIDataType.VTYPE_UINT16 ,
Components.interfaces.nsIDataType.VTYPE_UINT32 ,
Components.interfaces.nsIDataType.VTYPE_UINT64 ,
Components.interfaces.nsIDataType.VTYPE_FLOAT ,
Components.interfaces.nsIDataType.VTYPE_DOUBLE ,
Components.interfaces.nsIDataType.VTYPE_BOOL ,
Components.interfaces.nsIDataType.VTYPE_CHAR ,
Components.interfaces.nsIDataType.VTYPE_WCHAR ,
Components.interfaces.nsIDataType.VTYPE_VOID ,
Components.interfaces.nsIDataType.VTYPE_ID ,
Components.interfaces.nsIDataType.VTYPE_ASTRING ,
Components.interfaces.nsIDataType.VTYPE_CHAR_STR ,
Components.interfaces.nsIDataType.VTYPE_WCHAR_STR ,
Components.interfaces.nsIDataType.VTYPE_INTERFACE ,
Components.interfaces.nsIDataType.VTYPE_INTERFACE_IS ,
Components.interfaces.nsIDataType.VTYPE_ARRAY ,
Components.interfaces.nsIDataType.VTYPE_STRING_SIZE_IS ,
Components.interfaces.nsIDataType.VTYPE_WSTRING_SIZE_IS ,
Components.interfaces.nsIDataType.VTYPE_EMPTY
];
const ShortNames = [
{name: "I1", number: Components.interfaces.nsIDataType.TYPE_INT8 },
{name: "I2", number: Components.interfaces.nsIDataType.TYPE_INT16 },
{name: "I4", number: Components.interfaces.nsIDataType.TYPE_INT32 },
{name: "I8", number: Components.interfaces.nsIDataType.TYPE_INT64 },
{name: "U1", number: Components.interfaces.nsIDataType.TYPE_UINT8 },
{name: "U2", number: Components.interfaces.nsIDataType.TYPE_UINT16 },
{name: "U4", number: Components.interfaces.nsIDataType.TYPE_UINT32 },
{name: "U8", number: Components.interfaces.nsIDataType.TYPE_UINT64 },
{name: "FL", number: Components.interfaces.nsIDataType.TYPE_FLOAT },
{name: "DB", number: Components.interfaces.nsIDataType.TYPE_DOUBLE },
{name: "BO", number: Components.interfaces.nsIDataType.TYPE_BOOL },
{name: "CH", number: Components.interfaces.nsIDataType.TYPE_CHAR },
{name: "WC", number: Components.interfaces.nsIDataType.TYPE_WCHAR },
{name: "VD", number: Components.interfaces.nsIDataType.TYPE_VOID },
{name: "ID", number: Components.interfaces.nsIDataType.TYPE_ID },
{name: "AS", number: Components.interfaces.nsIDataType.TYPE_ASTRING },
{name: "ST", number: Components.interfaces.nsIDataType.TYPE_CHAR_STR },
{name: "WS", number: Components.interfaces.nsIDataType.TYPE_WCHAR_STR },
{name: "NS", number: Components.interfaces.nsIDataType.TYPE_INTERFACE },
{name: "IF", number: Components.interfaces.nsIDataType.TYPE_INTERFACE_IS },
{name: "AR", number: Components.interfaces.nsIDataType.TYPE_ARRAY },
{name: "Ss", number: Components.interfaces.nsIDataType.TYPE_STRING_SIZE_IS },
{name: "Ws", number: Components.interfaces.nsIDataType.TYPE_WSTRING_SIZE_IS},
{name: "EM", number: Components.interfaces.nsIDataType.TYPE_EMPTY }
{name: "I1", number: Components.interfaces.nsIDataType.VTYPE_INT8 },
{name: "I2", number: Components.interfaces.nsIDataType.VTYPE_INT16 },
{name: "I4", number: Components.interfaces.nsIDataType.VTYPE_INT32 },
{name: "I8", number: Components.interfaces.nsIDataType.VTYPE_INT64 },
{name: "U1", number: Components.interfaces.nsIDataType.VTYPE_UINT8 },
{name: "U2", number: Components.interfaces.nsIDataType.VTYPE_UINT16 },
{name: "U4", number: Components.interfaces.nsIDataType.VTYPE_UINT32 },
{name: "U8", number: Components.interfaces.nsIDataType.VTYPE_UINT64 },
{name: "FL", number: Components.interfaces.nsIDataType.VTYPE_FLOAT },
{name: "DB", number: Components.interfaces.nsIDataType.VTYPE_DOUBLE },
{name: "BO", number: Components.interfaces.nsIDataType.VTYPE_BOOL },
{name: "CH", number: Components.interfaces.nsIDataType.VTYPE_CHAR },
{name: "WC", number: Components.interfaces.nsIDataType.VTYPE_WCHAR },
{name: "VD", number: Components.interfaces.nsIDataType.VTYPE_VOID },
{name: "ID", number: Components.interfaces.nsIDataType.VTYPE_ID },
{name: "AS", number: Components.interfaces.nsIDataType.VTYPE_ASTRING },
{name: "ST", number: Components.interfaces.nsIDataType.VTYPE_CHAR_STR },
{name: "WS", number: Components.interfaces.nsIDataType.VTYPE_WCHAR_STR },
{name: "NS", number: Components.interfaces.nsIDataType.VTYPE_INTERFACE },
{name: "IF", number: Components.interfaces.nsIDataType.VTYPE_INTERFACE_IS },
{name: "AR", number: Components.interfaces.nsIDataType.VTYPE_ARRAY },
{name: "Ss", number: Components.interfaces.nsIDataType.VTYPE_STRING_SIZE_IS },
{name: "Ws", number: Components.interfaces.nsIDataType.VTYPE_WSTRING_SIZE_IS},
{name: "EM", number: Components.interfaces.nsIDataType.VTYPE_EMPTY }
];

48
xpcom/ds/nsIVariant.idl
Просмотреть файл

@ -35,31 +35,31 @@ interface nsIDataType : nsISupports
// These MUST match the declarations in xpt_struct.h.
// Otherwise the world is likely to explode.
// From xpt_struct.h ...
const PRUint16 TYPE_INT8 = 0; // TD_INT8 = 0,
const PRUint16 TYPE_INT16 = 1; // TD_INT16 = 1,
const PRUint16 TYPE_INT32 = 2; // TD_INT32 = 2,
const PRUint16 TYPE_INT64 = 3; // TD_INT64 = 3,
const PRUint16 TYPE_UINT8 = 4; // TD_UINT8 = 4,
const PRUint16 TYPE_UINT16 = 5; // TD_UINT16 = 5,
const PRUint16 TYPE_UINT32 = 6; // TD_UINT32 = 6,
const PRUint16 TYPE_UINT64 = 7; // TD_UINT64 = 7,
const PRUint16 TYPE_FLOAT = 8; // TD_FLOAT = 8,
const PRUint16 TYPE_DOUBLE = 9; // TD_DOUBLE = 9,
const PRUint16 TYPE_BOOL = 10; // TD_BOOL = 10,
const PRUint16 TYPE_CHAR = 11; // TD_CHAR = 11,
const PRUint16 TYPE_WCHAR = 12; // TD_WCHAR = 12,
const PRUint16 TYPE_VOID = 13; // TD_VOID = 13,
const PRUint16 TYPE_ID = 14; // TD_PNSIID = 14,
const PRUint16 TYPE_ASTRING = 15; // TD_DOMSTRING = 15,
const PRUint16 TYPE_CHAR_STR = 16; // TD_PSTRING = 16,
const PRUint16 TYPE_WCHAR_STR = 17; // TD_PWSTRING = 17,
const PRUint16 TYPE_INTERFACE = 18; // TD_INTERFACE_TYPE = 18,
const PRUint16 TYPE_INTERFACE_IS = 19; // TD_INTERFACE_IS_TYPE = 19,
const PRUint16 TYPE_ARRAY = 20; // TD_ARRAY = 20,
const PRUint16 TYPE_STRING_SIZE_IS = 21; // TD_PSTRING_SIZE_IS = 21,
const PRUint16 TYPE_WSTRING_SIZE_IS = 22; // TD_PWSTRING_SIZE_IS = 22
const PRUint16 VTYPE_INT8 = 0; // TD_INT8 = 0,
const PRUint16 VTYPE_INT16 = 1; // TD_INT16 = 1,
const PRUint16 VTYPE_INT32 = 2; // TD_INT32 = 2,
const PRUint16 VTYPE_INT64 = 3; // TD_INT64 = 3,
const PRUint16 VTYPE_UINT8 = 4; // TD_UINT8 = 4,
const PRUint16 VTYPE_UINT16 = 5; // TD_UINT16 = 5,
const PRUint16 VTYPE_UINT32 = 6; // TD_UINT32 = 6,
const PRUint16 VTYPE_UINT64 = 7; // TD_UINT64 = 7,
const PRUint16 VTYPE_FLOAT = 8; // TD_FLOAT = 8,
const PRUint16 VTYPE_DOUBLE = 9; // TD_DOUBLE = 9,
const PRUint16 VTYPE_BOOL = 10; // TD_BOOL = 10,
const PRUint16 VTYPE_CHAR = 11; // TD_CHAR = 11,
const PRUint16 VTYPE_WCHAR = 12; // TD_WCHAR = 12,
const PRUint16 VTYPE_VOID = 13; // TD_VOID = 13,
const PRUint16 VTYPE_ID = 14; // TD_PNSIID = 14,
const PRUint16 VTYPE_ASTRING = 15; // TD_DOMSTRING = 15,
const PRUint16 VTYPE_CHAR_STR = 16; // TD_PSTRING = 16,
const PRUint16 VTYPE_WCHAR_STR = 17; // TD_PWSTRING = 17,
const PRUint16 VTYPE_INTERFACE = 18; // TD_INTERFACE_TYPE = 18,
const PRUint16 VTYPE_INTERFACE_IS = 19; // TD_INTERFACE_IS_TYPE = 19,
const PRUint16 VTYPE_ARRAY = 20; // TD_ARRAY = 20,
const PRUint16 VTYPE_STRING_SIZE_IS = 21; // TD_PSTRING_SIZE_IS = 21,
const PRUint16 VTYPE_WSTRING_SIZE_IS = 22; // TD_PWSTRING_SIZE_IS = 22
const PRUint16 TYPE_EMPTY = 255;
const PRUint16 VTYPE_EMPTY = 255;
};

598
xpcom/ds/nsVariant.cpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу