Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[pschweitzer] 64610: [NTFS] - Remove magic value usage in NtfsDumpFileAttributes() - Implement GetFileNameFromRecord() which returns the $FILE_NAME attribute from a FILE record - On record lookup, ...
by pschweitzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: pschweitzer Date: Wed Oct 8 19:12:48 2014 New Revision: 64610 URL: http://svn.reactos.org/svn/reactos?rev=64610&view=rev Log: [NTFS] - Remove magic value usage in NtfsDumpFileAttributes() - Implement GetFileNameFromRecord() which returns the $FILE_NAME attribute from a FILE record - On record lookup, also return the MFT index of the found record - Finally implement NtfsMakeFCBFromDirEntry() which allows creating a FCB from a dir entry. It is still incomplete though, it doesn't copy any data yet from the entry Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/a… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Wed Oct 8 19:12:48 2014 @@ -278,7 +278,7 @@ Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && - Attribute->Type != (ATTRIBUTE_TYPE)-1) + Attribute->Type != AttributeEnd) { NtfsDumpAttribute(Attribute); @@ -286,4 +286,22 @@ } } +PFILENAME_ATTRIBUTE +GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord) +{ + PNTFS_ATTR_RECORD Attribute; + + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); + while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && + Attribute->Type != AttributeEnd) + { + if (Attribute->Type == AttributeFileName) + return (PFILENAME_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); + + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); + } + + return NULL; +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Wed Oct 8 19:12:48 2014 @@ -354,57 +354,53 @@ NTSTATUS NtfsMakeFCBFromDirEntry(PNTFS_VCB Vcb, PNTFS_FCB DirectoryFCB, - PWSTR Name, + PUNICODE_STRING Name, PFILE_RECORD_HEADER Record, + ULONGLONG MFTIndex, PNTFS_FCB * fileFCB) { -#if 0 - WCHAR pathName[MAX_PATH]; - PFCB rcFCB; - ULONG Size; - - if (Name [0] != 0 && wcslen (DirectoryFCB->PathName) + - sizeof(WCHAR) + wcslen (Name) > MAX_PATH) - { - return(STATUS_OBJECT_NAME_INVALID); - } - - wcscpy(pathName, DirectoryFCB->PathName); - if (!NtfsFCBIsRoot(DirectoryFCB)) - { - wcscat(pathName, L"\\"); - } - - if (Name[0] != 0) - { - wcscat(pathName, Name); - } - else - { - WCHAR entryName[MAX_PATH]; - - NtfsGetDirEntryName(Vcb, Record, entryName); - wcscat(pathName, entryName); - } - - rcFCB = NtfsCreateFCB(pathName, Vcb); - memcpy(&rcFCB->Entry, Record, sizeof(DIR_RECORD)); - - Size = rcFCB->Entry.DataLengthL; - - rcFCB->RFCB.FileSize.QuadPart = Size; - rcFCB->RFCB.ValidDataLength.QuadPart = Size; - rcFCB->RFCB.AllocationSize.QuadPart = ROUND_UP(Size, BLOCKSIZE); -// DPRINT1("%S %d %d\n", longName, Size, (ULONG)rcFCB->RFCB.AllocationSize.QuadPart); - NtfsFCBInitializeCache(Vcb, rcFCB); - rcFCB->RefCount++; - NtfsAddFCBToTable(Vcb, rcFCB); - *fileFCB = rcFCB; - - return(STATUS_SUCCESS); -#else - return STATUS_NOT_IMPLEMENTED; -#endif + WCHAR pathName[MAX_PATH]; + PFILENAME_ATTRIBUTE FileName; + PNTFS_FCB rcFCB; + + DPRINT1("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p)\n", Vcb, DirectoryFCB, Name, Record, fileFCB); + + FileName = GetFileNameFromRecord(Record); + if (!FileName) + { + return STATUS_OBJECT_NAME_NOT_FOUND; // Not sure that's the best here + } + + if (Name->Buffer[0] != 0 && wcslen(DirectoryFCB->PathName) + + sizeof(WCHAR) + Name->Length / sizeof(WCHAR) > MAX_PATH) + { + return STATUS_OBJECT_NAME_INVALID; + } + + wcscpy(pathName, DirectoryFCB->PathName); + if (!NtfsFCBIsRoot(DirectoryFCB)) + { + wcscat(pathName, L"\\"); + } + wcscat(pathName, Name->Buffer); + + rcFCB = NtfsCreateFCB(pathName, Vcb); + if (!rcFCB) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + rcFCB->RFCB.FileSize.QuadPart = FileName->DataSize; + rcFCB->RFCB.ValidDataLength.QuadPart = FileName->DataSize; + rcFCB->RFCB.AllocationSize.QuadPart = FileName->AllocatedSize; + + NtfsFCBInitializeCache(Vcb, rcFCB); + rcFCB->RefCount = 1; + rcFCB->MFTIndex = MFTIndex; + NtfsAddFCBToTable(Vcb, rcFCB); + *fileFCB = rcFCB; + + return STATUS_SUCCESS; } @@ -460,18 +456,21 @@ UNICODE_STRING File; PFILE_RECORD_HEADER FileRecord; PNTFS_ATTR_CONTEXT DataContext; + ULONGLONG MFTIndex; + + DPRINT1("NtfsDirFindFile(%p, %p, %S, %p)\n", Vcb, DirectoryFcb, FileToFind, FoundFCB); *FoundFCB = NULL; RtlInitUnicodeString(&File, FileToFind); CurrentDir = DirectoryFcb->MFTIndex; - Status = NtfsLookupFileAt(Vcb, &File, &FileRecord, &DataContext, CurrentDir); + Status = NtfsLookupFileAt(Vcb, &File, &FileRecord, &DataContext, &MFTIndex, CurrentDir); if (!NT_SUCCESS(Status)) { return Status; } - Status = NtfsMakeFCBFromDirEntry(Vcb, DirectoryFcb, FileToFind, FileRecord, FoundFCB); + Status = NtfsMakeFCBFromDirEntry(Vcb, DirectoryFcb, &File, FileRecord, MFTIndex, FoundFCB); ExFreePoolWithTag(FileRecord, TAG_NTFS); return Status; Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Wed Oct 8 19:12:48 2014 @@ -649,6 +649,7 @@ PUNICODE_STRING PathName, PFILE_RECORD_HEADER *FileRecord, PNTFS_ATTR_CONTEXT *DataContext, + PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex) { UNICODE_STRING Current, Remaining; @@ -693,6 +694,8 @@ ExFreePoolWithTag(FileRecord, TAG_NTFS); return Status; } + + *MFTIndex = CurrentMFTIndex; return STATUS_SUCCESS; } @@ -701,8 +704,9 @@ NtfsLookupFile(PDEVICE_EXTENSION Vcb, PUNICODE_STRING PathName, PFILE_RECORD_HEADER *FileRecord, - PNTFS_ATTR_CONTEXT *DataContext) -{ - return NtfsLookupFileAt(Vcb, PathName, FileRecord, DataContext, NTFS_FILE_ROOT); + PNTFS_ATTR_CONTEXT *DataContext, + PULONGLONG MFTIndex) +{ + return NtfsLookupFileAt(Vcb, PathName, FileRecord, DataContext, MFTIndex, NTFS_FILE_ROOT); } /* EOF */ Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Wed Oct 8 19:12:48 2014 @@ -433,6 +433,8 @@ VOID NtfsDumpFileAttributes(PFILE_RECORD_HEADER FileRecord); +PFILENAME_ATTRIBUTE +GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord); /* blockdev.c */ @@ -632,13 +634,15 @@ NtfsLookupFile(PDEVICE_EXTENSION Vcb, PUNICODE_STRING PathName, PFILE_RECORD_HEADER *FileRecord, - PNTFS_ATTR_CONTEXT *DataContext); + PNTFS_ATTR_CONTEXT *DataContext, + PULONGLONG MFTIndex); NTSTATUS NtfsLookupFileAt(PDEVICE_EXTENSION Vcb, PUNICODE_STRING PathName, PFILE_RECORD_HEADER *FileRecord, PNTFS_ATTR_CONTEXT *DataContext, + PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex); /* misc.c */

1 0

[akhaldi] 64609: [VBSCRIPT_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: akhaldi Date: Wed Oct 8 19:03:40 2014 New Revision: 64609 URL: http://svn.reactos.org/svn/reactos?rev=64609&view=rev Log: [VBSCRIPT_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/vbscript/api.vbs trunk/rostests/winetests/vbscript/error.vbs trunk/rostests/winetests/vbscript/lang.vbs trunk/rostests/winetests/vbscript/run.c Modified: trunk/rostests/winetests/vbscript/api.vbs URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/api.vb… ============================================================================== --- trunk/rostests/winetests/vbscript/api.vbs [iso-8859-1] (original) +++ trunk/rostests/winetests/vbscript/api.vbs [iso-8859-1] Wed Oct 8 19:03:40 2014 @@ -1,4 +1,3 @@ -' ' Copyright 2011 Jacek Caban for CodeWeavers ' ' This library is free software; you can redistribute it and/or @@ -136,6 +135,31 @@ Call ok(Chr(0) <> "", "Chr(0) = """"") Call ok(Chr(120.5) = "x", "Chr(120.5) = " & Chr(120.5)) Call ok(Chr(119.5) = "x", "Chr(119.5) = " & Chr(119.5)) +Call ok(Chr("120") = "x", "Chr(""120"") = " & Chr("120")) + +sub testChrError + on error resume next + + if isEnglishLang then + call Err.clear() + call Chr(-1) + call ok(Err.number = 5, "Err.number = " & Err.number) + + call Err.clear() + call Chr(256) + call ok(Err.number = 5, "Err.number = " & Err.number) + end if + + call Err.clear() + call Chr(65536) + call ok(Err.number = 5, "Err.number = " & Err.number) + + call Err.clear() + call Chr(-32769) + call ok(Err.number = 5, "Err.number = " & Err.number) +end sub + +call testChrError Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") Set x = new EmptyClass @@ -170,6 +194,31 @@ Call ok(not isNull("x"), "isNull(""x"") is true?") Call ok(isNull(Null), "isNull(Null) is not true?") +Call ok(isNumeric(Empty), "isNumeric(empty) is not true?") +Call ok(not isNumeric(Null), "isNumeric(Null) is not true?") +Call ok(isNumeric(32767), "isNumeric(32767) is true?") +Call ok(isNumeric(32768), "isNumeric(32768) is true?") +Call ok(isNumeric(CSng(3242.4)), "isNumeric(CSng(3242.4)) is true?") +Call ok(isNumeric(32768.4), "isNumeric(32768.4) is true?") +Call ok(isNumeric(CCur(32768.4)), "isNumeric(CCur(32768.4)) is true?") +Call ok(isNumeric("44"), "isNumeric(""44"") is true?") +Call ok(not isNumeric("rwrf"), "isNumeric(""rwrf"") is not true?") +Call ok(not isNumeric(Nothing), "isNumeric(Nothing) is not true?") +Call ok(not isNumeric(New EmptyClass), "isNumeric(New EmptyClass) is not true?") +Call ok(isNumeric(true), "isNumeric(true) is true?") +Call ok(isNumeric(CByte(32)), "isNumeric(CByte(32)) is true?") +Dim arr(2) +arr(0) = 2 +arr(1) = 3 +Call ok(not isNumeric(arr), "isNumeric(arr) is not true?") + +Dim newObject +Set newObject = New ValClass +newObject.myval = 1 +Call ok(isNumeric(newObject), "isNumeric(newObject) is true?") +newObject.myval = "test" +Call ok(not isNumeric(newObject), "isNumeric(newObject) is not true?") + Call ok(getVT(err) = "VT_DISPATCH", "getVT(err) = " & getVT(err)) Sub TestHex(x, ex) @@ -297,6 +346,7 @@ Call ok(Space(4.5) = " ", "Space(4.5) = " & Space(4.5) & """") Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") +Call ok(Space("1") = " ", "Space(""1"") = " & Space("1") & """") Sub TestStrReverse(str, ex) Call ok(StrReverse(str) = ex, "StrReverse(" & str & ") = " & StrReverse(str)) @@ -317,6 +367,7 @@ TestLeft 123, 2, "12" TestLeft "123456", 1.5, "12" TestLeft "123456", 2.5, "12" +TestLeft "test", "2", "te" if isEnglishLang then TestLeft true, 2, "Tr" Sub TestRight(str, len, ex) @@ -464,4 +515,729 @@ Call ok(CBool(-5) = true, "CBool(-5) = " & CBool(-5)) Call ok(getVT(CBool(-5)) = "VT_BOOL", "getVT(CBool(-5)) = " & getVT(CBool(-5))) +Sub testCBoolError(strings, error_num) + on error resume next + + Call Err.clear() + Call CBool(strings) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +Class ValClass + Public myval + + Public default Property Get defprop + defprop = myval + End Property +End Class + +Dim MyObject +Set MyObject = New ValClass + +Call ok(CBool(Empty) = False, "CBool(Empty) = " & CBool(Empty)) +Call ok(getVT(CBool(Empty)) = "VT_BOOL", "getVT(CBool(Empty)) = " & getVT(CBool(Empty))) +Call ok(CBool(1) = True, "CBool(1) = " & CBool(1)) +Call ok(getVT(CBool(1)) = "VT_BOOL", "getVT(CBool(1)) = " & getVT(CBool(1))) +Call ok(CBool(0) = False, "CBool(0) = " & CBool(0)) +Call ok(getVT(CBool(0)) = "VT_BOOL", "getVT(CBool(0)) = " & getVT(CBool(0))) +Call ok(CBool(-0.56) = True, "CBool(-0.56) = " & CBool(-0.56)) +Call ok(getVT(CBool(-0.56)) = "VT_BOOL", "getVT(CBool(-0.56)) = " & getVT(CBool(-0.56))) +Call testCBoolError("", 13) +Call ok(CBool("0") = False, "CBool(""0"") = " & CBool("0")) +Call ok(getVT(CBool("0")) = "VT_BOOL", "getVT(CBool(""0"")) = " & getVT(CBool("0"))) +If isEnglishLang Then + Call ok(CBool("0.1") = True, "CBool(""0.1"") = " & CBool("0.1")) + Call ok(getVT(CBool("0.1")) = "VT_BOOL", "getVT(CBool(""0.1"")) = " & getVT(CBool("0.1"))) +End If + Call ok(CBool("true") = True, "CBool(""true"") = " & CBool("true")) +Call ok(getVT(CBool("true")) = "VT_BOOL", "getVT(CBool(""true"")) = " & getVT(CBool("true"))) +Call ok(CBool("false") = False, "CBool(""false"") = " & CBool("false")) +Call ok(getVT(CBool("false")) = "VT_BOOL", "getVT(CBool(""false"")) = " & getVT(CBool("false"))) +Call ok(CBool("TRUE") = True, "CBool(""TRUE"") = " & CBool("TRUE")) +Call ok(getVT(CBool("TRUE")) = "VT_BOOL", "getVT(CBool(""TRUE"")) = " & getVT(CBool("TRUE"))) +Call ok(CBool("FALSE") = False, "CBool(""FALSE"") = " & CBool("FALSE")) +Call ok(getVT(CBool("FALSE")) = "VT_BOOL", "getVT(CBool(""FALSE"")) = " & getVT(CBool("FALSE"))) +Call ok(CBool("#TRUE#") = True, "CBool(""#TRUE#"") = " & CBool("#TRUE#")) +Call ok(getVT(CBool("#TRUE#")) = "VT_BOOL", "getVT(CBool(""#TRUE#"")) = " & getVT(CBool("#TRUE#"))) +Call ok(CBool("#FALSE#") = False, "CBool(""#FALSE#"") = " & CBool("#FALSE#")) +Call ok(getVT(CBool("#FALSE#")) = "VT_BOOL", "getVT(CBool(""#FALSE#"")) = " & getVT(CBool("#FALSE#"))) +Call ok(CBool(MyObject) = False, "CBool(MyObject) = " & CBool(MyObject)) +Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) +MyObject.myval = 1 +Call ok(CBool(MyObject) = True, "CBool(MyObject) = " & CBool(MyObject)) +Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) +MyObject.myval = 0 +Call ok(CBool(MyObject) = False, "CBool(MyObject) = " & CBool(MyObject)) +Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) + +Sub testCByteError(strings, error_num1,error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CByte(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CByte(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CByte(Empty) = 0, "CByte(Empty) = " & CByte(Empty)) +Call ok(getVT(CByte(Empty)) = "VT_UI1", "getVT(CByte(Empty)) = " & getVT(CByte(Empty))) +Call ok(CByte(255) = 255, "CByte(255) = " & CByte(255)) +Call ok(getVT(CByte(255)) = "VT_UI1", "getVT(CByte(255)) = " & getVT(CByte(255))) +Call ok(CByte(255.49) = 255, "CByte(255.49) = " & CByte(255.49)) +Call ok(getVT(CByte(255.49)) = "VT_UI1", "getVT(CByte(255.49)) = " & getVT(CByte(255.49))) +Call testCByteError(1, 0, 458) +Call testCByteError("", 13, 13) +Call testCByteError("-1", 6, 6) +Call testCByteError("258", 6, 6) +Call testCByteError("TRUE", 13, 13) +Call testCByteError("FALSE", 13, 13) +Call testCByteError("#TRue#", 13, 13) +Call testCByteError("#fAlSE#", 13, 13) +If isEnglishLang Then + Call ok(CByte("-0.5") = 0, "CByte(""-0.5"") = " & CByte("-0.5")) + Call ok(getVT(CByte("-0.5")) = "VT_UI1", "getVT(CByte(""-0.5"")) = " & getVT(CByte("-0.5"))) +End If +Call ok(CByte(True) = 255, "CByte(True) = " & CByte(True)) +Call ok(getVT(CByte(True)) = "VT_UI1", "getVT(CByte(True)) = " & getVT(CByte(True))) +Call ok(CByte(False) = 0, "CByte(False) = " & CByte(False)) +Call ok(getVT(CByte(False)) = "VT_UI1", "getVT(CByte(False)) = " & getVT(CByte(False))) +Call ok(CByte(MyObject) = 0, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) +MyObject.myval = 1 +Call ok(CByte(MyObject) = 1, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) +MyObject.myval = 0 +Call ok(CByte(MyObject) = 0, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) + +Sub testCCurError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CCur(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CCur(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CCur(Empty) = 0, "CCur(Empty) = " & CCur(Empty)) +Call ok(getVT(CCur(Empty)) = "VT_CY", "getVT(CCur(Empty)) = " & getVT(CCur(Empty))) +Call ok(CCur(-32768) = -32768, "CCur(-32768) = " & CCur(-32768)) +Call ok(getVT(CCur(-32768)) = "VT_CY", "getVT(CCur(-32768)) = " & getVT(CCur(-32768))) +Call ok(CCur(32768) = 32768, "CCur(32768) = " & CCur(32768)) +Call ok(getVT(CCur(32768)) = "VT_CY", "getVT(CCur(32768)) = " & getVT(CCur(32768))) +Call ok(CCur(0.000149) = 0.0001, "CCur(0.000149) = " & CCur(0.000149)) +Call ok(getVT(CCur(0.000149)) = "VT_CY", "getVT(CCur(0.000149)) = " & getVT(CCur(0.000149))) +Call ok(CCur(2147483647.99) = 2147483647.99, "CCur(2147483647.99) = " & CCur(2147483647.99)) +Call ok(getVT(CCur(2147483647.99)) = "VT_CY", "getVT(CCur(2147483647.99)) = " & getVT(CCur(2147483647.99))) +Call ok(CCur("-1") = -1, "CCur(""-1"") = " & CCur("-1")) +Call ok(getVT(CCur("-1")) = "VT_CY", "getVT(CCur(""-1"")) = " & getVT(CCur("-1"))) +If isEnglishLang Then + Call ok(CCur("-0.5") = -0.5, "CCur(""-0.5"") = " & CCur("-0.5")) + Call ok(getVT(CCur("-0.5")) = "VT_CY", "getVT(CCur(""-0.5"")) = " & getVT(CCur("-0.5"))) +End If +Call testCCurError("", 13, 13) +Call testCCurError("-1", 0, 458) +Call testCCurError("TRUE", 13, 13) +Call testCCurError("FALSE", 13, 13) +Call testCCurError("#TRue#", 13, 13) +Call testCCurError("#fAlSE#", 13, 13) +Call testCCurError(1, 0, 458) +Call ok(CCur(True) = -1, "CCur(True) = " & CCur(True)) +Call ok(getVT(CCur(True)) = "VT_CY", "getVT(CCur(True)) = " & getVT(CCur(True))) +Call ok(CCur(False) = 0, "CCur(False) = " & CCur(False)) +Call ok(getVT(CCur(False)) = "VT_CY", "getVT(CCur(False)) = " & getVT(CCur(False))) +MyObject.myval = 0.1 +Call ok(CCur(MyObject) = 0.1, "CCur(MyObject) = " & CCur(MyObject)) +Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +MyObject.myval = 0 +Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) +Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) + +Sub testCDblError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CDbl(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CDbl(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CDbl(Empty) = 0, "CDbl(Empty) = " & CDbl(Empty)) +Call ok(getVT(CDbl(Empty)) = "VT_R8", "getVT(CDbl(Empty)) = " & getVT(CDbl(Empty))) +Call ok(CDbl(CByte(0)) = 0, "CDbl(CByte(0)) = " & CDbl(CByte(0))) +Call ok(getVT(CDbl(CCur(0))) = "VT_R8", "getVT(CDbl(CCur(0))) = " & getVT(CDbl(CCur(0)))) +Call ok(CDbl(CCur(0)) = 0, "CDbl(CCur(0)) = " & CDbl(CCur(0))) +Call ok(getVT(CDbl(CCur(0))) = "VT_R8", "getVT(CDbl(CCur(0))) = " & getVT(CDbl(CCur(0)))) +Call ok(CDbl(0) = 0, "CDbl(0) = " & CDbl(0)) +Call ok(getVT(CDbl(0)) = "VT_R8", "getVT(CDbl(0)) = " & getVT(CDbl(0))) +Call ok(CDbl(32768) = 32768, "CDbl(32768) = " & CDbl(32768)) +Call ok(getVT(CDbl(32768)) = "VT_R8", "getVT(CDbl(32768)) = " & getVT(CDbl(32768))) +Call ok(CDbl(0.001 * 0.001) = 0.000001, "CDbl(0.001 * 0.001) = " & CDbl(0.001 * 0.001)) +Call ok(getVT(CDbl(0.001 * 0.001)) = "VT_R8", "getVT(CDbl(0.001 * 0.001)) = " & getVT(CDbl(0.001 * 0.001))) +Call ok(CDbl("-1") = -1, "CDbl(""-1"") = " & CDbl("-1")) +Call ok(getVT(CDbl("-1")) = "VT_R8", "getVT(CDbl(""-1"")) = " & getVT(CDbl("-1"))) +If isEnglishLang Then + Call ok(CDbl("-0.5") = -0.5, "CDbl(""-0.5"") = " & CDbl("-0.5")) + Call ok(getVT(CDbl("-0.5")) = "VT_R8", "getVT(CDbl(""-0.5"")) = " & getVT(CDbl("-0.5"))) +End If +Call testCDblError("", 13, 13) +Call testCDblError("TRUE", 13, 13) +Call testCDblError("FALSE", 13, 13) +Call testCDblError("#TRue#", 13, 13) +Call testCDblError("#fAlSE#", 13, 13) +Call testCDblError(1, 0, 458) +Call ok(CDbl(True) = -1, "CDbl(True) = " & CDbl(True)) +Call ok(getVT(CDbl(True)) = "VT_R8", "getVT(CDbl(True)) = " & getVT(CDbl(True))) +Call ok(CDbl(False) = 0, "CDbl(False) = " & CDbl(False)) +Call ok(getVT(CDbl(False)) = "VT_R8", "getVT(CDbl(False)) = " & getVT(CDbl(False))) +MyObject.myval = 0.1 +Call ok(CDbl(MyObject) = 0.1, "CDbl(MyObject) = " & CDbl(MyObject)) +Call ok(getVT(CDbl(MyObject)) = "VT_R8", "getVT(CDbl(MyObject)) = " & getVT(CDbl(MyObject))) +MyObject.myval = 0 +Call ok(CDbl(MyObject) = 0, "CDbl(MyObject) = " & CDbl(MyObject)) +Call ok(getVT(CDbl(MyObject)) = "VT_R8", "getVT(CDbl(MyObject)) = " & getVT(CDbl(MyObject))) + +Sub testCLngError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CLng(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CLng(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CLng(Empty) = 0, "CLng(Empty) = " & CLng(Empty)) +Call ok(getVT(CLng(Empty)) = "VT_I4", "getVT(CLng(Empty)) = " & getVT(CLng(Empty))) +Call ok(CLng(CByte(0)) = 0, "CLng(CByte(0)) = " & CLng(CByte(0))) +Call ok(getVT(CLng(CCur(0))) = "VT_I4", "getVT(CLng(CCur(0))) = " & getVT(CLng(CCur(0)))) +Call ok(CLng(CCur(0)) = 0, "CLng(CCur(0)) = " & CLng(CCur(0))) +Call ok(getVT(CLng(CCur(0))) = "VT_I4", "getVT(CLng(CCur(0))) = " & getVT(CLng(CCur(0)))) +Call ok(CLng(0) = 0, "CLng(0) = " & CLng(0)) +Call ok(getVT(CLng(0)) = "VT_I4", "getVT(CLng(0)) = " & getVT(CLng(0))) +Call ok(CLng(0.49) = 0, "CLng(0.49) = " & CLng(0.49)) +Call ok(getVT(CLng(0.49)) = "VT_I4", "getVT(CLng(0.49)) = " & getVT(CLng(0.49))) +Call ok(CLng(0.5) = 0, "CLng(0.5) = " & CLng(0.5)) +Call ok(getVT(CLng(0.5)) = "VT_I4", "getVT(CLng(0.5)) = " & getVT(CLng(0.5))) +Call ok(CLng(0.51) = 1, "CLng(0.51) = " & CLng(0.51)) +Call ok(getVT(CLng(0.51)) = "VT_I4", "getVT(CLng(0.51)) = " & getVT(CLng(0.51))) +Call ok(CLng(1.49) = 1, "CLng(1.49) = " & CLng(1.49)) +Call ok(getVT(CLng(1.49)) = "VT_I4", "getVT(CLng(1.49)) = " & getVT(CLng(1.49))) +Call ok(CLng(1.5) = 2, "CLng(1.5) = " & CLng(1.5)) +Call ok(getVT(CLng(1.5)) = "VT_I4", "getVT(CLng(1.5)) = " & getVT(CLng(1.5))) +Call ok(CLng(1.51) = 2, "CLng(1.51) = " & CLng(1.51)) +Call ok(getVT(CLng(1.51)) = "VT_I4", "getVT(CLng(1.51)) = " & getVT(CLng(1.51))) +Call ok(CLng("-1") = -1, "CLng(""-1"") = " & CLng("-1")) +Call ok(getVT(CLng("-1")) = "VT_I4", "getVT(CLng(""-1"")) = " & getVT(CLng("-1"))) +If isEnglishLang Then + Call ok(CLng("-0.5") = 0, "CLng(""-0.5"") = " & CLng("-0.5")) + Call ok(getVT(CLng("-0.5")) = "VT_I4", "getVT(CLng(""-0.5"")) = " & getVT(CLng("-0.5"))) +End If +Call testCLngError("", 13, 13) +Call testCLngError("TRUE", 13, 13) +Call testCLngError("FALSE", 13, 13) +Call testCLngError("#TRue#", 13, 13) +Call testCLngError("#fAlSE#", 13, 13) +Call testCLngError(1, 0, 458) +Call ok(CLng(True) = -1, "CLng(True) = " & CLng(True)) +Call ok(getVT(CLng(True)) = "VT_I4", "getVT(CLng(True)) = " & getVT(CLng(True))) +Call ok(CLng(False) = 0, "CLng(False) = " & CLng(False)) +Call ok(getVT(CLng(False)) = "VT_I4", "getVT(CLng(False)) = " & getVT(CLng(False))) +MyObject.myval = 1 +Call ok(CLng(MyObject) = 1, "CLng(MyObject) = " & CLng(MyObject)) +Call ok(getVT(CLng(MyObject)) = "VT_I4", "getVT(CLng(MyObject)) = " & getVT(CLng(MyObject))) +MyObject.myval = 0 +Call ok(CLng(MyObject) = 0, "CLng(MyObject) = " & CLng(MyObject)) +Call ok(getVT(CLng(MyObject)) = "VT_I4", "getVT(CLng(MyObject)) = " & getVT(CLng(MyObject))) + +Sub testCIntError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CInt(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CInt(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CInt(Empty) = 0, "CInt(Empty) = " & CInt(Empty)) +Call ok(getVT(CInt(Empty)) = "VT_I2", "getVT(CInt(Empty)) = " & getVT(CInt(Empty))) +Call ok(CInt(CByte(0)) = 0, "CInt(CByte(0)) = " & CInt(CByte(0))) +Call ok(getVT(CInt(CByte(0))) = "VT_I2", "getVT(CInt(CByte(0))) = " & getVT(CInt(CByte(0)))) +Call ok(CInt(CCur(0)) = 0, "CInt(CCur(0)) = " & CInt(CCur(0))) +Call ok(getVT(CInt(CCur(0))) = "VT_I2", "getVT(CInt(CCur(0))) = " & getVT(CInt(CCur(0)))) +Call ok(CInt(0.49) = 0, "CInt(0.49) = " & CInt(0.49)) +Call ok(getVT(CInt(0.49)) = "VT_I2", "getVT(CInt(0.49)) = " & getVT(CInt(0.49))) +Call ok(CInt(0.5) = 0, "CInt(0.5) = " & CInt(0.5)) +Call ok(getVT(CInt(0.5)) = "VT_I2", "getVT(CInt(0.5)) = " & getVT(CInt(0.5))) +Call ok(CInt(0.51) = 1, "CInt(0.51) = " & CInt(0.51)) +Call ok(getVT(CInt(0.51)) = "VT_I2", "getVT(CInt(0.51)) = " & getVT(CInt(0.51))) +Call ok(CInt(1.49) = 1, "CInt(0.49) = " & CInt(0.49)) +Call ok(getVT(CInt(0.49)) = "VT_I2", "getVT(CInt(0.49)) = " & getVT(CInt(0.49))) +Call ok(CInt(1.5) = 2, "CInt(1.5) = " & CInt(1.5)) +Call ok(getVT(CInt(1.5)) = "VT_I2", "getVT(CInt(1.5)) = " & getVT(CInt(1.5))) +Call ok(CInt(1.51) = 2, "CInt(1.51) = " & CInt(1.51)) +Call ok(getVT(CInt(1.51)) = "VT_I2", "getVT(CInt(1.51)) = " & getVT(CInt(1.51))) +Call ok(CInt("-1") = -1, "CInt(""-1"") = " & CInt("-1")) +Call ok(getVT(CInt("-1")) = "VT_I2", "getVT(CInt(""-1"")) = " & getVT(CInt("-1"))) +If isEnglishLang Then + Call ok(CInt("-0.5") = 0, "CInt(""-0.5"") = " & CInt("-0.5")) + Call ok(getVT(CInt("-0.5")) = "VT_I2", "getVT(CInt(""-0.5"")) = " & getVT(CInt("-0.5"))) +End If +Call testCIntError("", 13, 13) +Call testCIntError("-1", 0, 458) +Call testCIntError("TRUE", 13, 13) +Call testCIntError("FALSE", 13, 13) +Call testCIntError("#TRue#", 13, 13) +Call testCIntError("#fAlSE#", 13, 13) +Call testCIntError(1, 0, 458) +Call testCIntError(32767.49, 0, 458) +Call testCIntError(32767.5, 6, 6) +Call testCIntError(-32768.5, 0, 458) +Call testCIntError(-32768.51, 6, 6) +Call ok(CInt(True) = -1, "CInt(True) = " & CInt(True)) +Call ok(getVT(CInt(True)) = "VT_I2", "getVT(CInt(True)) = " & getVT(CInt(True))) +Call ok(CInt(False) = 0, "CInt(False) = " & CInt(False)) +Call ok(getVT(CInt(False)) = "VT_I2", "getVT(CInt(False)) = " & getVT(CInt(False))) +MyObject.myval = 2.5 +Call ok(CInt(MyObject) = 2, "CInt(MyObject) = " & CInt(MyObject)) +Call ok(getVT(CInt(MyObject)) = "VT_I2", "getVT(CInt(MyObject)) = " & getVT(CInt(MyObject))) +MyObject.myval = 1.5 +Call ok(CInt(MyObject) = 2, "CInt(MyObject) = " & CInt(MyObject)) +Call ok(getVT(CInt(MyObject)) = "VT_I2", "getVT(CInt(MyObject)) = " & getVT(CInt(MyObject))) + +Sub testCSngError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CSng(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CSng(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CSng(Empty) = 0, "CSng(Empty) = " & CSng(Empty)) +Call ok(getVT(CSng(Empty)) = "VT_R4", "getVT(CSng(Empty)) = " & getVT(CSng(Empty))) +Call ok(CSng(CByte(0)) = 0, "CSng(CByte(0)) = " & CSng(CByte(0))) +Call ok(getVT(CSng(CCur(0))) = "VT_R4", "getVT(CSng(CCur(0))) = " & getVT(CSng(CCur(0)))) +Call ok(CSng(CCur(0)) = 0, "CSng(CCur(0)) = " & CSng(CCur(0))) +Call ok(getVT(CSng(CCur(0))) = "VT_R4", "getVT(CSng(CCur(0))) = " & getVT(CSng(CCur(0)))) +Call ok(CSng(0) = 0, "CSng(0) = " & CSng(0)) +Call ok(getVT(CSng(0)) = "VT_R4", "getVT(CSng(0)) = " & getVT(CSng(0))) +Call ok(CSng(32768) = 32768, "CSng(32768) = " & CSng(32768)) +Call ok(getVT(CSng(32768)) = "VT_R4", "getVT(CSng(32768)) = " & getVT(CSng(32768))) +Call ok(CSng(0.001 * 0.001) = 0.000001, "CSng(0.001 * 0.001) = " & CSng(0.001 * 0.001)) +Call ok(getVT(CSng(0.001 * 0.001)) = "VT_R4", "getVT(CSng(0.001 * 0.001)) = " & getVT(CSng(0.001 * 0.001))) +Call ok(CSng("-1") = -1, "CSng(""-1"") = " & CSng("-1")) +Call ok(getVT(CSng("-1")) = "VT_R4", "getVT(CSng(""-1"")) = " & getVT(CSng("-1"))) +If isEnglishLang Then + Call ok(CSng("-0.5") = -0.5, "CSng(""-0.5"") = " & CSng("-0.5")) + Call ok(getVT(CSng("-0.5")) = "VT_R4", "getVT(CSng(""-0.5"")) = " & getVT(CSng("-0.5"))) +End If +Call testCSngError("", 13, 13) +Call testCSngError("TRUE", 13, 13) +Call testCSngError("FALSE", 13, 13) +Call testCSngError("#TRue#", 13, 13) +Call testCSngError("#fAlSE#", 13, 13) +Call testCSngError(1, 0, 458) +Call ok(CSng(True) = -1, "CSng(True) = " & CSng(True)) +Call ok(getVT(CSng(True)) = "VT_R4", "getVT(CSng(True)) = " & getVT(CSng(True))) +Call ok(CSng(False) = 0, "CSng(False) = " & CSng(False)) +Call ok(getVT(CSng(False)) = "VT_R4", "getVT(CSng(False)) = " & getVT(CSng(False))) +MyObject.myval = 0.1 +Call ok(CSng(MyObject) = 0.1, "CSng(MyObject) = " & CSng(MyObject)) +Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) +MyObject.myval = 0 +Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) +Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) + +Call ok(TypeName(Empty) = "Empty", "TypeName(MyEmpty) = " & TypeName(Empty)) +Call ok(getVT(TypeName(Empty)) = "VT_BSTR", "getVT(TypeName(Empty)) = " & getVT(TypeName(Empty))) +Call ok(TypeName(Null) = "Null", "TypeName(Null) = " & TypeName(Null)) +Call ok(getVT(TypeName(Null)) = "VT_BSTR", "getVT(TypeName(Null)) = " & getVT(TypeName(Null))) +Call ok(TypeName(CByte(255)) = "Byte", "TypeName(CByte(255)) = " & TypeName(CByte(255))) +Call ok(getVT(TypeName(CByte(255))) = "VT_BSTR", "getVT(TypeName(CByte(255))) = " & getVT(TypeName(CByte(255)))) +Call ok(TypeName(255) = "Integer", "TypeName(255) = " & TypeName(255)) +Call ok(getVT(TypeName(255)) = "VT_BSTR", "getVT(TypeName(255)) = " & getVT(TypeName(255))) +Call ok(TypeName(32768) = "Long", "TypeName(32768) = " & TypeName(32768)) +Call ok(getVT(TypeName(32768)) = "VT_BSTR", "getVT(TypeName(32768)) = " & getVT(TypeName(32768))) +Call ok(TypeName(CSng(0.5)) = "Single", "TypeName(CSng(0.5)) = " & TypeName(CSng(0.5))) +Call ok(getVT(TypeName(CSng(0.5))) = "VT_BSTR", "getVT(TypeName(CSng(0.5))) = " & getVT(TypeName(CSng(0.5)))) +Call ok(TypeName(-0.5) = "Double", "TypeName(-0.5) = " & TypeName(-0.5)) +Call ok(getVT(TypeName(-0.5)) = "VT_BSTR", "getVT(TypeName(-0.5)) = " & getVT(TypeName(-0.5))) +Call ok(TypeName(CCur(0.5)) = "Currency", "TypeName(CCur(0.5)) = " & TypeName(CCur(0.5))) +Call ok(getVT(TypeName(CCur(0.5))) = "VT_BSTR", "getVT(TypeName(CCur(0.5))) = " & getVT(TypeName(CCur(0.5)))) +Call ok(TypeName(CStr(0.5)) = "String", "TypeName(CStr(0.5)) = " & TypeName(CStr(0.5))) +Call ok(getVT(TypeName(CStr(0.5))) = "VT_BSTR", "getVT(TypeName(CStr(0.5))) = " & getVT(TypeName(CStr(0.5)))) +Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True)) +Call ok(getVT(TypeName(True)) = "VT_BSTR", "getVT(TypeName(True)) = " & getVT(TypeName(True))) + +Call ok(VarType(Empty) = vbEmpty, "VarType(Empty) = " & VarType(Empty)) +Call ok(getVT(VarType(Empty)) = "VT_I2", "getVT(VarType(Empty)) = " & getVT(VarType(Empty))) +Call ok(VarType(Null) = vbNull, "VarType(Null) = " & VarType(Null)) +Call ok(getVT(VarType(Null)) = "VT_I2", "getVT(VarType(Null)) = " & getVT(VarType(Null))) +Call ok(VarType(255) = vbInteger, "VarType(255) = " & VarType(255)) +Call ok(getVT(VarType(255)) = "VT_I2", "getVT(VarType(255)) = " & getVT(VarType(255))) +Call ok(VarType(32768) = vbLong, "VarType(32768) = " & VarType(32768)) +Call ok(getVT(VarType(32768)) = "VT_I2", "getVT(VarType(32768)) = " & getVT(VarType(32768))) +Call ok(VarType(CSng(0.5)) = vbSingle, "VarType(CSng(0.5)) = " & VarType(CSng(0.5))) +Call ok(getVT(VarType(CSng(0.5))) = "VT_I2", "getVT(VarType(CSng(0.5))) = " & getVT(VarType(CSng(0.5)))) +Call ok(VarType(-0.5) = vbDouble, "VarType(-0.5) = " & VarType(-0.5)) +Call ok(getVT(VarType(-0.5)) = "VT_I2", "getVT(VarType(-0.5)) = " & getVT(VarType(-0.5))) +Call ok(VarType(CCur(0.5)) = vbCurrency, "VarType(CCur(0.5)) = " & VarType(CCur(0.5))) +Call ok(getVT(VarType(CCur(0.5))) = "VT_I2", "getVT(VarType(CCur(0.5))) = " & getVT(VarType(CCur(0.5)))) +Call ok(VarType(CStr(0.5)) = vbString, "VarType(CStr(0.5)) = " & VarType(CStr(0.5))) +Call ok(getVT(VarType(CStr(0.5))) = "VT_I2", "getVT(VarType(CStr(0.5))) = " & getVT(VarType(CStr(0.5)))) +Call ok(VarType(CBool(0.5)) = vbBoolean, "VarType(CBool(0.5)) = " & VarType(CBool(0.5))) +Call ok(getVT(VarType(CBool(0.5))) = "VT_I2", "getVT(VarType(CBool(0.5))) = " & getVT(VarType(CBool(0.5)))) +Call ok(VarType(CByte(255)) = vbByte, "VarType(CByte(255)) = " & VarType(CByte(255))) +Call ok(getVT(VarType(CByte(255))) = "VT_I2", "getVT(VarType(CByte(255))) = " & getVT(VarType(CByte(255)))) + +Call ok(Sgn(Empty) = 0, "Sgn(MyEmpty) = " & Sgn(Empty)) +Call ok(getVT(Sgn(Empty)) = "VT_I2", "getVT(Sgn(MyEmpty)) = " & getVT(Sgn(Empty))) +Call ok(Sgn(0) = 0, "Sgn(0) = " & Sgn(0)) +Call ok(getVT(Sgn(0)) = "VT_I2", "getVT(Sgn(0)) = " & getVT(Sgn(0))) +Call ok(Sgn(-32769) = -1, "Sgn(-32769) = " & Sgn(-32769)) +Call ok(getVT(Sgn(-32769)) = "VT_I2", "getVT(Sgn(-32769)) = " & getVT(Sgn(-32769))) +Call ok(Sgn(CSng(-0.5)) = -1, "Sgn(CSng(-0.5)) = " & Sgn(CSng(-0.5))) +Call ok(getVT(Sgn(CSng(-0.5))) = "VT_I2", "getVT(Sgn(CSng(-0.5))) = " & getVT(Sgn(CSng(-0.5)))) +Call ok(Sgn(0.5) = 1, "Sgn(0.5) = " & Sgn(0.5)) +Call ok(getVT(Sgn(0.5)) = "VT_I2", "getVT(Sgn(0.5)) = " & getVT(Sgn(0.5))) +Call ok(Sgn(CCur(-1)) = -1, "Sgn(CCur(-1)) = " & Sgn(CCur(-1))) +Call ok(getVT(Sgn(CCur(-1))) = "VT_I2", "getVT(Sgn(CCur(-1))) = " & getVT(Sgn(CCur(-1)))) +Call ok(Sgn(CStr(-1)) = -1, "Sgn(CStr(-1)) = " & Sgn(CStr(-1))) +Call ok(getVT(Sgn(CStr(-1))) = "VT_I2", "getVT(Sgn(CStr(-1))) = " & getVT(Sgn(CStr(-1)))) +Call ok(Sgn(False) = 0, "Sgn(False) = " & Sgn(False)) +Call ok(getVT(Sgn(False)) = "VT_I2", "getVT(Sgn(False)) = " & getVT(Sgn(False))) +Call ok(Sgn(True) = -1, "Sgn(True) = " & Sgn(True)) +Call ok(getVT(Sgn(True)) = "VT_I2", "getVT(Sgn(True)) = " & getVT(Sgn(True))) +Call ok(Sgn(CByte(1)) = 1, "Sgn(CByte(1)) = " & Sgn(CByte(1))) +Call ok(getVT(Sgn(CByte(1))) ="VT_I2", "getVT(Sgn(CByte(1))) = " & getVT(Sgn(CByte(1)))) + +Sub testSgnError(strings, error_num) + on error resume next + + Call Err.clear() + Call Sgn(strings) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +Call testSgnError(Null, 94) + +Call ok(Abs(Empty) = 0, "Abs(Empty) = " & Abs(Empty)) +Call ok(getVT(Abs(Empty)) = "VT_I2", "getVT(Abs(Empty)) = " & getVT(Abs(Empty))) +Call ok(IsNull(Abs(Null)), "Is Abs(Null) not Null?") +Call ok(getVT(Abs(Null)) = "VT_NULL", "getVT(Abs(Null)) = " & getVT(Abs(Null))) +Call ok(Abs(0) = 0, "Abs(0) = " & Abs(0)) +Call ok(getVT(Abs(0)) = "VT_I2", "getVT(Abs(0)) = " & getVT(Abs(0))) +Call ok(Abs(-32769) = 32769, "Abs(-32769) = " & Abs(-32769)) +Call ok(getVT(Abs(-32769)) = "VT_I4", "getVT(Abs(-32769)) = " & getVT(Abs(-32769))) +Call ok(Abs(CSng(-0.5)) = 0.5, "Abs(CSng(-0.5)) = " & Abs(CSng(-0.5))) +Call ok(getVT(Abs(CSng(-0.5))) = "VT_R4", "getVT(Abs(CSng(-0.5))) = " & getVT(Abs(CSng(-0.5)))) +Call ok(Abs(0.5) = 0.5, "Abs(0.5) = " & Abs(0.5)) +Call ok(getVT(Abs(0.5)) = "VT_R8", "getVT(Abs(0.5)) = " & getVT(Abs(0.5))) +Call ok(Abs(CCur(-1)) = 1, "Abs(CCur(-1)) = " & Abs(CCur(-1))) +Call ok(getVT(Abs(CCur(-1))) = "VT_CY", "getVT(Abs(CCur(-1))) = " & getVT(Abs(CCur(-1)))) +Call ok(Abs("-1") = 1, "Abs(""-1"") = " & Abs("-1")) +Call ok(getVT(Abs("-1")) = "VT_R8", "getVT(Abs(""-1"")) = " & getVT(Abs("-1"))) +Call ok(Abs(False) = 0, "Abs(False) = " & Abs(False)) +Call ok(getVT(Abs(False)) = "VT_I2", "getVT(Abs(False)) = " & getVT(Abs(False))) +Call ok(Abs(True) = 1, "Abs(True) = " & Abs(True)) +Call ok(getVT(Abs(True)) = "VT_I2", "getVT(Abs(True)) = " & getVT(Abs(True))) +Call ok(Abs(CByte(1)) = 1, "Abs(CByte(1)) = " & Abs(CByte(1))) +Call ok(getVT(Abs(CByte(1))) = "VT_UI1", "getVT(Abs(CByte(1))) = " & getVT(Abs(CByte(1)))) + +Sub testAbsError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = Abs(strings) + Call ok(Err.number = error_num1, "Err.number1 = " & Err.number) + + Call Err.clear() + Call Abs(strings) + Call ok(Err.number = error_num2, "Err.number2 = " & Err.number) +End Sub + +Call testAbsError("strings", 13, 13) +Call testAbsError(-4, 0, 0) + +Call ok(ScriptEngine = "VBScript", "Is scriptengine not VBScript?") +Call ok(getVT(ScriptEngine) = "VT_BSTR", "getVT(ScriptEngine) = " & getVT(ScriptEngine)) + +Call ok(getVT(ScriptEngineBuildVersion) = "VT_I4", "getVT(ScriptEngineBuildVersion) = " & getVT(ScriptEngineBuildVersion)) + +Call ok(getVT(ScriptEngineMajorVersion) = "VT_I4", "getVT(ScriptEngineMajorVersion) = " & getVT(ScriptEngineMajorVersion)) + +Call ok(getVT(ScriptEngineMinorVersion) = "VT_I4", "getVT(ScriptEngineMinorVersion) = " & getVT(ScriptEngineMinorVersion)) + +Call ok(Fix(Empty) = 0, "Fix(Empty) = " & Fix(Empty)) +Call ok(getVT(Fix(Empty)) = "VT_I2", "getVT(Fix(Empty)) = " & getVT(Fix(Empty))) +Call ok(Fix(CCur(-0.99)) = 0, "Fix(CCur(-0.99)) = " & Fix(CCur(-0.99))) +Call ok(getVT(Fix(CCur(-0.99))) = "VT_CY", "getVT(Fix(CCur(-0.99))) = " & getVT(Fix(CCur(-0.99)))) +Call ok(Fix(1.99) = 1, "Fix(1.99) = " & Fix(1.99)) +Call ok(getVT(Fix(1.99)) = "VT_R8", "getVT(Fix(1.99)) = " & getVT(Fix(1.99))) +Call ok(Fix(-1.99) = -1, "Fix(-1.99) = " & Fix(-1.99)) +Call ok(getVT(Fix(-1.99)) = "VT_R8", "getVT(Fix(-1.99)) = " & getVT(Fix(-1.99))) +If isEnglishLang Then + Call ok(Fix("1.99") = 1, "Fix(""1.99"") = " & Fix("1.99")) + Call ok(getVT(Fix("1.99")) = "VT_R8", "getVT(Fix(""1.99"")) = " & getVT(Fix("1.99"))) + Call ok(Fix("-1.99") = -1, "Fix(""-1.99"") = " & Fix("-1.99")) + Call ok(getVT(Fix("-1.99")) = "VT_R8", "getVT(Fix(""-1.99"")) = " & getVT(Fix("-1.99"))) +End If +Call ok(Fix(True) = -1, "Fix(True) = " & Fix(True)) +Call ok(getVT(Fix(True)) = "VT_I2", "getVT(Fix(True)) = " & getVT(Fix(True))) +Call ok(Fix(False) = 0, "Fix(False) = " & Fix(False)) +Call ok(getVT(Fix(False)) = "VT_I2", "getVT(Fix(False)) = " & getVT(Fix(False))) +MyObject.myval = 2.5 +Call ok(Fix(MyObject) = 2, "Fix(MyObject) = " & Fix(MyObject)) +Call ok(getVT(Fix(MyObject)) = "VT_R8", "getVT(Fix(MyObject)) = " & getVT(Fix(MyObject))) +MyObject.myval = -2.5 +Call ok(Fix(MyObject) = -2, "Fix(MyObject) = " & Fix(MyObject)) +Call ok(getVT(Fix(MyObject)) = "VT_R8", "getVT(Fix(MyObject)) = " & getVT(Fix(MyObject))) + +Call ok(Int(Empty) = 0, "Int(Empty) = " & Int(Empty)) +Call ok(getVT(Int(Empty)) = "VT_I2", "getVT(Int(Empty)) = " & getVT(Int(Empty))) +Call ok(Int(CCur(-0.99)) = -1, "Int(CCur(-0.99)) = " & Int(CCur(-0.99))) +Call ok(getVT(Int(CCur(-0.99))) = "VT_CY", "getVT(Int(CCur(-0.99))) = " & getVT(Int(CCur(-0.99)))) +Call ok(Int(1.99) = 1, "Int(1.99) = " & Int(1.99)) +Call ok(getVT(Int(1.99)) = "VT_R8", "getVT(Int(1.99)) = " & getVT(Int(1.99))) +Call ok(Int(-1.99) = -2, "Int(-1.99) = " & Int(-1.99)) +Call ok(getVT(Int(-1.99)) = "VT_R8", "getVT(Int(-1.99)) = " & getVT(Int(-1.99))) +If isEnglishLang Then + Call ok(Int("1.99") = 1, "Int(""1.99"") = " & Int("1.99")) + Call ok(getVT(Int("1.99")) = "VT_R8", "getVT(Int(""1.99"")) = " & getVT(Int("1.99"))) + Call ok(Int("-1.99") = -2, "Int(""-1.99"") = " & Int("-1.99")) + Call ok(getVT(Int("-1.99")) = "VT_R8", "getVT(Int(""-1.99"")) = " & getVT(Int("-1.99"))) +End If +Call ok(Int(True) = -1, "Int(True) = " & Int(True)) +Call ok(getVT(Int(True)) = "VT_I2", "getVT(Int(True)) = " & getVT(Int(True))) +Call ok(Int(False) = 0, "Int(False) = " & Int(False)) +Call ok(getVT(Int(False)) = "VT_I2", "getVT(Int(False)) = " & getVT(Int(False))) +MyObject.myval = 2.5 +Call ok(Int(MyObject) = 2, "Int(MyObject) = " & Int(MyObject)) +Call ok(getVT(Int(MyObject)) = "VT_R8", "getVT(Int(MyObject)) = " & getVT(Int(MyObject))) +MyObject.myval = -2.5 +Call ok(Int(MyObject) = -3, "Int(MyObject) = " & Int(MyObject)) +Call ok(getVT(Int(MyObject)) = "VT_R8", "getVT(Int(MyObject)) = " & getVT(Int(MyObject))) + +Sub testSqrError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = Sqr(strings) + Call ok(Err.number = error_num1, "Err.number1 = " & Err.number) + + Call Err.clear() + Call Sqr(strings) + Call ok(Err.number = error_num2, "Err.number2 = " & Err.number) +End Sub + +Call testSqrError(-2, 5, 5) +Call testSqrError(True, 5, 5) + +Call ok(Sqr(Empty) = 0, "Sqr(Empty) = " & Sqr(Empty)) +Call ok(getVT(Sqr(Empty)) = "VT_R8", "getVT(Sqr(Empty)) = " & getVT(Sqr(Empty))) +Call ok(Sqr(0) = 0, "Sqr(0) = " & Sqr(0)) +Call ok(getVT(Sqr(0)) = "VT_R8", "getVT(Sqr(0)) = " & getVT(Sqr(0))) +Call ok(Sqr(1) = 1, "Sqr(1) = " & Sqr(1)) +Call ok(getVT(Sqr(1)) = "VT_R8", "getVT(Sqr(1)) = " & getVT(Sqr(1))) +Call ok(Sqr(CSng(121)) = 11, "Sqr(CSng(121)) = " & Sqr(CSng(121))) +Call ok(getVT(Sqr(CSng(121))) = "VT_R8", "getVT(Sqr(CSng(121))) = " & getVT(Sqr(CSng(121)))) +Call ok(Sqr(36100) = 190, "Sqr(36100) = " & Sqr(36100)) +Call ok(getVT(Sqr(36100)) = "VT_R8", "getVT(Sqr(36100)) = " & getVT(Sqr(36100))) +Call ok(Sqr(CCur(0.0625)) = 0.25, "Sqr(CCur(0.0625)) = " & Sqr(CCur(0.0625))) +Call ok(getVT(Sqr(CCur(0.0625))) = "VT_R8", "getVT(Sqr(CCur(0.0625))) = " & getVT(Sqr(CCur(0.0625)))) +Call ok(Sqr("100000000") = 10000, "Sqr(""100000000"") = " & Sqr("100000000")) +Call ok(getVT(Sqr("100000000")) = "VT_R8", "getVT(Sqr(""100000000"")) = " & getVT(Sqr("100000000"))) +Call ok(Sqr(False) = 0, "Sqr(False) = " & Sqr(False)) +Call ok(getVT(Sqr(False)) = "VT_R8", "getVT(Sqr(False)) = " & getVT(Sqr(False))) +Call ok(Sqr(CByte(225)) = 15, "Sqr(CByte(225)) = " & Sqr(CByte(225))) +Call ok(getVT(Sqr(CByte(225))) = "VT_R8", "getVT(Sqr(CByte(225))) = " & getVT(Sqr(CByte(225)))) + +Function Approch(func, res) + If Abs(func - res) < 0.001 Then + Approch = True + Else + Approch = False + End If +End Function + +Const PI = 3.1415926 + +Call ok(Approch(Cos(Empty), 1), "Cos(Empty) = " & Cos(Empty)) +Call ok(getVT(Cos(Empty)) = "VT_R8", "getVT(Cos(Empty)) = " & getVT(Cos(Empty))) +Call ok(Approch(Cos(PI / 6), Sqr(3) / 2), "Cos(PI / 6) = " & Cos(PI / 6)) +Call ok(getVT(Cos(PI / 6)) = "VT_R8", "getVT(Cos(PI / 6)) = " & getVT(Cos(PI / 6))) +Call ok(Approch(Cos(CCur(PI / 4)), Sqr(2) / 2), "Cos(CCur(PI / 4)) = " & Cos(CCur(PI / 4))) +Call ok(getVT(Cos(CCur(PI / 4))) = "VT_R8", "getVT(Cos(CCur(PI / 4))) = " & getVT(Cos(CCur(PI / 4)))) +Call ok(Approch(Cos(CSng(PI / 3)), 1 / 2), "Cos(CSng(PI / 3)) = " & Cos(CSng(PI / 3))) +Call ok(getVT(Cos(CSng(PI / 3))) = "VT_R8", "getVT(Cos(CSng(PI))) = " & getVT(Cos(CSng(PI)))) +Call ok(Approch(Cos(PI / 2), 0), "Cos(0) = " & Cos(PI / 2)) +Call ok(getVT(Cos(PI / 2)) = "VT_R8", "getVT(Cos(PI / 2)) = " & getVT(Cos(PI / 2))) +Call ok(Approch(Cos(PI), -1), "Cos(PI) = " & Cos(PI)) +Call ok(getVT(Cos(PI)) = "VT_R8", "getVT(Cos(PI)) = " & getVT(Cos(PI))) +Call ok(Approch(Cos(5 * PI / 4), -Sqr(2) / 2), "Cos(5 * PI / 4) = " & Cos(5 * PI / 4)) +Call ok(getVT(Cos(5 * PI / 4)) = "VT_R8", "getVT(Cos(5 * PI / 4)) = " & getVT(Cos(5 * PI / 4))) +Call ok(Approch(Cos(3 * PI / 2), 0), "Cos(3 * PI / 2) = " & Cos(3 * PI / 2)) +Call ok(getVT(Cos(3 * PI / 2)) = "VT_R8", "getVT(Cos(3 * PI / 2)) = " & getVT(Cos(3 * PI / 2))) +Call ok(Approch(Cos(2 * PI), 1), "Cos(2 * PI) = " & Cos(2 * PI)) +Call ok(getVT(Cos(2 * PI)) = "VT_R8", "getVT(Cos(2 * PI)) = " & getVT(Cos(2 * PI))) +Call ok(Approch(Cos("-32768"), 0.3729), "Cos(""-32768"") = " & Cos("-32768")) +Call ok(getVT(Cos("-32768")) = "VT_R8", "getVT(Cos(""-32768"")) = " & getVT(Cos("-32768"))) +Call ok(Approch(Cos(False), 1), "Cos(False) = " & Cos(False)) +Call ok(getVT(Cos(False)) = "VT_R8", "getVT(Cos(False)) = " & getVT(Cos(False))) +Call ok(Approch(Cos(True), 0.5403), "Cos(True) = " & Cos(True)) +Call ok(getVT(Cos(True)) = "VT_R8", "getVT(Cos(True)) = " & getVT(Cos(True))) +Call ok(Approch(Cos(CByte(255)), -0.8623), "Cos(CByte(255)) = " & Cos(CByte(255))) +Call ok(getVT(Cos(CByte(255))) = "VT_R8", "getVT(Cos(CByte(255))) = " & getVT(Cos(CByte(255)))) + +Call ok(Approch(Sin(Empty), 0), "Sin(Empty) = " & Sin(Empty)) +Call ok(getVT(Sin(Empty)) = "VT_R8", "getVT(Sin(Empty)) = " & getVT(Sin(Empty))) +Call ok(Approch(Sin(PI / 6), 1 / 2), "Sin(PI / 6) = " & Sin(PI / 6)) +Call ok(getVT(Sin(PI / 6)) = "VT_R8", "getVT(Sin(PI / 6)) = " & getVT(Sin(PI / 6))) +Call ok(Approch(Sin(CCur(PI / 4)), Sqr(2) / 2), "Sin(CCur(PI / 4)) = " & Sin(CCur(PI / 4))) +Call ok(getVT(Sin(CCur(PI / 4))) = "VT_R8", "getVT(Sin(CCur(PI / 4))) = " & getVT(Sin(CCur(PI / 4)))) +Call ok(Approch(Sin(CSng(PI / 3)), Sqr(3) / 2), "Sin(CSng(PI / 3)) = " & Sin(CSng(PI / 3))) +Call ok(getVT(Sin(CSng(PI / 3))) = "VT_R8", "getVT(Sin(CSng(PI))) = " & getVT(Sin(CSng(PI)))) +Call ok(Approch(Sin(PI / 2), 1), "Sin(0) = " & Sin(PI / 2)) +Call ok(getVT(Sin(PI / 2)) = "VT_R8", "getVT(Sin(PI / 2)) = " & getVT(Sin(PI / 2))) +Call ok(Approch(Sin(PI), 0), "Sin(PI) = " & Sin(PI)) +Call ok(getVT(Sin(PI)) = "VT_R8", "getVT(Sin(PI)) = " & getVT(Sin(PI))) +Call ok(Approch(Sin(5 * PI / 4), -Sqr(2) / 2), "Sin(5 * PI / 4) = " & Sin(5 * PI / 4)) +Call ok(getVT(Sin(5 * PI / 4)) = "VT_R8", "getVT(Sin(5 * PI / 4)) = " & getVT(Sin(5 * PI / 4))) +Call ok(Approch(Sin(3 * PI / 2), -1), "Sin(3 * PI / 2) = " & Sin(3 * PI / 2)) +Call ok(getVT(Sin(3 * PI / 2)) = "VT_R8", "getVT(Sin(3 * PI / 2)) = " & getVT(Sin(3 * PI / 2))) +Call ok(Approch(Sin(2 * PI), 0), "Sin(2 * PI) = " & Sin(2 * PI)) +Call ok(getVT(Sin(2 * PI)) = "VT_R8", "getVT(Sin(2 * PI)) = " & getVT(Sin(2 * PI))) +Call ok(Approch(Sin("-32768"), -0.9278), "Sin(""-32768"") = " & Sin("-32768")) +Call ok(getVT(Sin("-32768")) = "VT_R8", "getVT(Sin(""-32768"")) = " & getVT(Sin("-32768"))) +Call ok(Approch(Sin(False), 0), "Sin(False) = " & Sin(False)) +Call ok(getVT(Sin(False)) = "VT_R8", "getVT(Sin(False)) = " & getVT(Sin(False))) +Call ok(Approch(Sin(True), -0.84147), "Sin(True) = " & Sin(True)) +Call ok(getVT(Sin(True)) = "VT_R8", "getVT(Sin(True)) = " & getVT(Sin(True))) +Call ok(Approch(Sin(CByte(255)), -0.5063), "Sin(CByte(255)) = " & Sin(CByte(255))) +Call ok(getVT(Sin(CByte(255))) = "VT_R8", "getVT(Sin(CByte(255))) = " & getVT(Sin(CByte(255)))) + +Call ok(Approch(Tan(Empty), 0), "Tan(Empty) = " & Tan(Empty)) +Call ok(getVT(Tan(Empty)) = "VT_R8", "getVT(Tan(Empty)) = " & getVT(Tan(Empty))) +Call ok(Approch(Tan(PI / 6), Sqr(3) / 3), "Tan(PI / 6) = " & Tan(PI / 6)) +Call ok(getVT(Tan(PI / 6)) = "VT_R8", "getVT(Tan(PI / 6)) = " & getVT(Tan(PI / 6))) +Call ok(Approch(Tan(CCur(PI / 4)), 1), "Tan(CCur(PI / 4)) = " & Tan(CCur(PI / 4))) +Call ok(getVT(Tan(CCur(PI / 4))) = "VT_R8", "getVT(Tan(CCur(PI / 4))) = " & getVT(Tan(CCur(PI / 4)))) +Call ok(Approch(Tan(CSng(PI / 3)), Sqr(3)), "Tan(CSng(PI / 3)) = " & Tan(CSng(PI / 3))) +Call ok(getVT(Tan(CSng(PI / 3))) = "VT_R8", "getVT(Tan(CSng(PI))) = " & getVT(Tan(CSng(PI)))) +Call ok(Approch(Tan(PI), 0), "Tan(PI) = " & Tan(PI)) +Call ok(getVT(Tan(PI)) = "VT_R8", "getVT(Tan(PI)) = " & getVT(Tan(PI))) +Call ok(Approch(Tan(3 * PI / 4), -1), "Tan(3 * PI / 4) = " & Tan(3 * PI / 4)) +Call ok(getVT(Tan(3 * PI / 4)) = "VT_R8", "getVT(Tan(3 * PI / 4)) = " & getVT(Tan(3 * PI / 4))) +Call ok(Approch(Tan(5 * PI / 4), 1), "Tan(5 * PI / 4) = " & Tan(5 * PI / 4)) +Call ok(getVT(Tan(5 * PI / 4)) = "VT_R8", "getVT(Tan(5 * PI / 4)) = " & getVT(Tan(5 * PI / 4))) +Call ok(Approch(Tan(2 * PI), 0), "Tan(2 * PI) = " & Tan(2 * PI)) +Call ok(getVT(Tan(2 * PI)) = "VT_R8", "getVT(Tan(2 * PI)) = " & getVT(Tan(2 * PI))) +Call ok(Approch(Tan("-32768"), -2.4879), "Tan(""-32768"") = " & Tan("-32768")) +Call ok(getVT(Tan("-32768")) = "VT_R8", "getVT(Tan(""-32768"")) = " & getVT(Tan("-32768"))) +Call ok(Approch(Tan(False), 0), "Tan(False) = " & Tan(False)) +Call ok(getVT(Tan(False)) = "VT_R8", "getVT(Tan(False)) = " & getVT(Tan(False))) +Call ok(Approch(Tan(True), -1.5574), "Tan(True) = " & Tan(True)) +Call ok(getVT(Tan(True)) = "VT_R8", "getVT(Tan(True)) = " & getVT(Tan(True))) +Call ok(Approch(Tan(CByte(255)), 0.5872), "Tan(CByte(255)) = " & Tan(CByte(255))) +Call ok(getVT(Tan(CByte(255))) = "VT_R8", "getVT(Tan(CByte(255))) = " & getVT(Tan(CByte(255)))) + +Call ok(Approch(Atn(Empty), 0), "Atn(Empty) = " & Atn(Empty)) +Call ok(getVT(Atn(Empty)) = "VT_R8", "getVT(Atn(Empty)) = " & getVT(Atn(Empty))) +Call ok(Approch(Atn(Sqr(3) / 3), PI / 6), "Atn(Sqr(3) / 3) = " & Atn(Sqr(3) / 3)) +Call ok(getVT(Atn(Sqr(3) / 3)) = "VT_R8", "getVT(Atn(Sqr(3) / 3)) = " & getVT(Atn(Sqr(3) / 3))) +Call ok(Approch(Atn(CCur(1)), PI / 4), "Atn(CCur(1)) = " & Atn(CCur(1))) +Call ok(getVT(Atn(CCur(1))) = "VT_R8", "getVT(Atn(CCur(1))) = " & getVT(Atn(CCur(1)))) +Call ok(Approch(Atn(CSng(Sqr(3))), PI / 3), "Atn(CSng(Sqr(3))) = " & Atn(CSng(Sqr(3)))) +Call ok(getVT(Atn(CSng(Sqr(3)))) = "VT_R8", "getVT(Atn(CSng(PI))) = " & getVT(Atn(CSng(PI)))) +Call ok(Approch(Atn(0), 0), "Atn(0) = " & Atn(0)) +Call ok(getVT(Atn(0)) = "VT_R8", "getVT(Atn(0)) = " & getVT(Atn(0))) +Call ok(Approch(Atn(-1), -PI / 4), "Atn(-1) = " & Atn(-1)) +Call ok(getVT(Atn(-1)) = "VT_R8", "getVT(Atn(-1)) = " & getVT(Atn(-1))) +Call ok(Approch(Atn("-32768"), -1.5707), "Atn(""-32768"") = " & Atn("-32768")) +Call ok(getVT(Atn("-32768")) = "VT_R8", "getVT(Atn(""-32768"")) = " & getVT(Atn("-32768"))) +Call ok(Approch(Atn(False), 0), "Atn(False) = " & Atn(False)) +Call ok(getVT(Atn(False)) = "VT_R8", "getVT(Atn(False)) = " & getVT(Atn(False))) +Call ok(Approch(Atn(True), -0.7853), "Atn(True) = " & Atn(True)) +Call ok(getVT(Atn(True)) = "VT_R8", "getVT(Atn(True)) = " & getVT(Atn(True))) +Call ok(Approch(Atn(CByte(255)), 1.5668), "Atn(CByte(255)) = " & Atn(CByte(255))) +Call ok(getVT(Atn(CByte(255))) = "VT_R8", "getVT(Atn(CByte(255))) = " & getVT(Atn(CByte(255)))) + +Call ok(Approch(Exp(Empty), 1), "Exp(Empty) = " & Exp(Empty)) +Call ok(getVT(Exp(Empty)) = "VT_R8", "getVT(Exp(Empty)) = " & getVT(Exp(Empty))) +Call ok(Approch(Exp(1), 2.7182), "Exp(1) = " & Exp(1)) +Call ok(getVT(Exp(1)) = "VT_R8", "getVT(Exp(1)) = " & getVT(Exp(1))) +Call ok(Approch(Exp(CCur(-1)), 0.3678), "Exp(CCur(-1)) = " & Exp(CCur(-1))) +Call ok(getVT(Exp(CCur(-1))) = "VT_R8", "getVT(Exp(CCur(-1))) = " & getVT(Exp(CCur(-1)))) +Call ok(Approch(Exp(CSng(0.5)), 1.6487), "Exp(CSng(0.5)) = " & Exp(CSng(0.5))) +Call ok(getVT(Exp(CSng(0.5))) = "VT_R8", "getVT(Exp(CSng(PI))) = " & getVT(Exp(CSng(PI)))) +Call ok(Approch(Exp(-0.5), 0.6065), "Exp(-0.5) = " & Exp(-0.5)) +Call ok(getVT(Exp(-0.5)) = "VT_R8", "getVT(Exp(-0.5)) = " & getVT(Exp(-0.5))) +Call ok(Approch(Exp("-2"), 0.1353), "Exp(""-2"") = " & Exp("-2")) +Call ok(getVT(Exp("-2")) = "VT_R8", "getVT(Exp(""-2"")) = " & getVT(Exp("-2"))) +Call ok(Approch(Exp(False), 1), "Exp(False) = " & Exp(False)) +Call ok(getVT(Exp(False)) = "VT_R8", "getVT(Exp(False)) = " & getVT(Exp(False))) +Call ok(Approch(Exp(True), 0.3678), "Exp(True) = " & Exp(True)) +Call ok(getVT(Exp(True)) = "VT_R8", "getVT(Exp(True)) = " & getVT(Exp(True))) +Call ok(Approch(Exp(CByte(2)), 7.389), "Exp(CByte(2)) = " & Exp(CByte(2))) +Call ok(getVT(Exp(CByte(2))) = "VT_R8", "getVT(Exp(CByte(2))) = " & getVT(Exp(CByte(2)))) + +Sub testLogError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = Log(strings) + Call ok(Err.number = error_num1, "Err.number1 = " & Err.number) + + Call Err.clear() + Call Log(strings) + Call ok(Err.number = error_num2, "Err.number2 = " & Err.number) +End Sub + +Call testLogError(0, 5, 5) +Call testLogError(-2, 5, 5) +Call testLogError(False, 5, 5) +Call testLogError(True, 5, 5) +Call ok(Approch(Log(1), 0), "Log(1) = " & Log(1)) +Call ok(getVT(Log(1)) = "VT_R8", "getVT(Log(1)) = " & getVT(Log(1))) +Call ok(Approch(Log(CCur(0.5)), -0.6931), "Log(CCur(0.5)) = " & Log(CCur(0.5))) +Call ok(getVT(Log(CCur(0.5))) = "VT_R8", "getVT(Log(CCur(0.5))) = " & getVT(Log(CCur(0.5)))) +Call ok(Approch(Log(CSng(2.7182)), 1), "Log(CSng(2.7182)) = " & Log(CSng(2.7182))) +Call ok(getVT(Log(CSng(2.7182))) = "VT_R8", "getVT(Log(CSng(PI))) = " & getVT(Log(CSng(PI)))) +Call ok(Approch(Log(32768), 10.3972), "Log(32768) = " & Log(32768)) +Call ok(getVT(Log(32768)) = "VT_R8", "getVT(Log(32768)) = " & getVT(Log(32768))) +Call ok(Approch(Log("10"), 2.3025), "Log(""10"") = " & Log("10")) +Call ok(getVT(Log("10")) = "VT_R8", "getVT(Log(""10"")) = " & getVT(Log("10"))) +Call ok(Approch(Log(CByte(2)), 0.6931), "Log(CByte(2)) = " & Log(CByte(2))) +Call ok(getVT(Log(CByte(2))) = "VT_R8", "getVT(Log(CByte(2))) = " & getVT(Log(CByte(2)))) + +Call ok(getVT(Date) = "VT_DATE", "getVT(Date) = " & getVT(Date)) +Call ok(getVT(Time) = "VT_DATE", "getVT(Time) = " & getVT(Time)) + Call reportSuccess() Modified: trunk/rostests/winetests/vbscript/error.vbs URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/error.… ============================================================================== --- trunk/rostests/winetests/vbscript/error.vbs [iso-8859-1] (original) +++ trunk/rostests/winetests/vbscript/error.vbs [iso-8859-1] Wed Oct 8 19:03:40 2014 @@ -284,6 +284,20 @@ call callTestOnError(false) call ok(x = 1, "x = " & x) +sub testOnErrorClear() + on error resume next + call ok(Err.Number = 0, "Err.Number = " & Err.Number) + throwInt(E_TESTERROR) + call ok(Err.Number = E_TESTERROR, "Err.Number = " & Err.Number) + + on error goto 0 + call ok(Err.Number = 0, "Err.Number = " & Err.Number) + x = "ok" +end sub + +call testOnErrorClear() +call ok(x = "ok", "testOnErrorClear failed") + sub testForEachError() on error resume next Modified: trunk/rostests/winetests/vbscript/lang.vbs URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/lang.v… ============================================================================== --- trunk/rostests/winetests/vbscript/lang.vbs [iso-8859-1] (original) +++ trunk/rostests/winetests/vbscript/lang.vbs [iso-8859-1] Wed Oct 8 19:03:40 2014 @@ -40,6 +40,12 @@ Call ok(10. = 10, "10. <> 10") Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") +Call ok(34e5 = 3400000, "34e5 <> 3400000") +Call ok(56.789e5 = 5678900, "56.789e5 = 5678900") +Call ok(56.789e-2 = 0.56789, "56.789e-2 <> 0.56789") +Call ok(1e-94938484 = 0, "1e-... <> 0") +Call ok(34e0 = 34, "34e0 <> 34") +Call ok(34E1 = 340, "34E0 <> 340") Call ok(--1 = 1, "--1 = " & --1) Call ok(-empty = 0, "-empty = " & (-empty)) Call ok(true = -1, "! true = -1") @@ -78,6 +84,9 @@ Call ok(getVT(&h10000&) = "VT_I4", "getVT(&h10000&) is not VT_I4") Call ok(getVT(&H10000&) = "VT_I4", "getVT(&H10000&) is not VT_I4") Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") +Call ok(getVT(1e2) = "VT_R8", "getVT(1e2) is not VT_R8") +Call ok(getVT(1e0) = "VT_R8", "getVT(1e0) is not VT_R8") +Call ok(getVT(0.1e2) = "VT_R8", "getVT(0.1e2) is not VT_R8") Call ok(getVT(1 & 100000) = "VT_BSTR", "getVT(1 & 100000) is not VT_BSTR") Call ok(getVT(-empty) = "VT_I2", "getVT(-empty) = " & getVT(-empty)) Call ok(getVT(-null) = "VT_NULL", "getVT(-null) = " & getVT(-null)) @@ -187,6 +196,7 @@ Call ok(3/2 = 1.5, "3/2 = " & (3/2)) Call ok(5\4/2 = 2, "5\4/2 = " & (5\2/1)) Call ok(12/3\2 = 2, "12/3\2 = " & (12/3\2)) +Call ok(5/1000000 = 0.000005, "5/1000000 = " & (5/1000000)) Call ok(2^3 = 8, "2^3 = " & (2^3)) Call ok(2^3^2 = 64, "2^3^2 = " & (2^3^2)) @@ -849,6 +859,10 @@ Call ok(getVT(publicProp2) = "VT_I2*", "getVT(publicProp2) = " & getVT(publicProp2)) Call ok(getVT(Me.publicProp2) = "VT_I2", "getVT(Me.publicProp2) = " & getVT(Me.publicProp2)) End Sub + + Property Get gsGetProp(x) + gsGetProp = x + End Property End Class Call testDisp(new testClass) @@ -916,6 +930,29 @@ Call (New testclass).publicSub() Call (New testclass).publicSub +class PropTest + property get prop0() + prop0 = 1 + end property + + property get prop1(x) + prop1 = x+1 + end property + + property get prop2(x, y) + prop2 = x+y + end property +end class + +set obj = new PropTest + +call ok(obj.prop0 = 1, "obj.prop0 = " & obj.prop0) +call ok(obj.prop1(3) = 4, "obj.prop1(3) = " & obj.prop1(3)) +call ok(obj.prop2(3,4) = 7, "obj.prop2(3,4) = " & obj.prop2(3,4)) +call obj.prop0() +call obj.prop1(2) +call obj.prop2(3,4) + x = "following ':' is correct syntax" : x = "following ':' is correct syntax" :: : :: x = "also correct syntax" Modified: trunk/rostests/winetests/vbscript/run.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/run.c?… ============================================================================== --- trunk/rostests/winetests/vbscript/run.c [iso-8859-1] (original) +++ trunk/rostests/winetests/vbscript/run.c [iso-8859-1] Wed Oct 8 19:03:40 2014 @@ -94,6 +94,7 @@ DEFINE_EXPECT(testobj_propget_i); DEFINE_EXPECT(testobj_propput_d); DEFINE_EXPECT(testobj_propput_i); +DEFINE_EXPECT(testobj_value_i); DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_propargput1_d); @@ -174,8 +175,12 @@ return "VT_I2"; case VT_I4: return "VT_I4"; + case VT_R4: + return "VT_R4"; case VT_R8: return "VT_R8"; + case VT_CY: + return "VT_CY"; case VT_DATE: return "VT_DATE"; case VT_BSTR: @@ -188,6 +193,8 @@ return "VT_ARRAY|VT_VARIANT"; case VT_ARRAY|VT_BYREF|VT_VARIANT: return "VT_ARRAY|VT_BYREF|VT_VARIANT"; + case VT_UI1: + return "VT_UI1"; default: ok(0, "unknown vt %d\n", V_VT(v)); return NULL; @@ -251,7 +258,7 @@ static void test_disp(IDispatch *disp) { - DISPID id, public_prop_id, public_prop2_id, public_func_id, public_sub_id, defvalget_id; + DISPID id, public_prop_id, public_prop2_id, public_func_id, public_sub_id, defvalget_id, gs_getter_id; DISPID named_args[5] = {DISPID_PROPERTYPUT}; VARIANT v, args[5]; DISPPARAMS dp = {args, named_args}; @@ -315,6 +322,12 @@ ok(V_BOOL(&v), "V_BOOL(v) = %x\n", V_BOOL(&v)); dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_Invoke(dispex, public_prop_id, &IID_NULL, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BOOL(&v), "V_BOOL(v) = %x\n", V_BOOL(&v)); + + dp.cArgs = dp.cNamedArgs = 0; hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); @@ -390,6 +403,12 @@ dp.cArgs = dp.cNamedArgs = 0; hres = IDispatchEx_InvokeEx(dispex, public_func_id, 0, DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I2, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I2(&v) == 4, "V_I2(v) = %d\n", V_I2(&v)); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_Invoke(dispex, public_func_id, &IID_NULL, 0, DISPATCH_METHOD, &dp, &v, &ei, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); ok(V_VT(&v) == VT_I2, "V_VT(v) = %d\n", V_VT(&v)); ok(V_I2(&v) == 4, "V_I2(v) = %d\n", V_I2(&v)); @@ -437,6 +456,40 @@ SysFreeString(str); ok(hres == S_OK, "GetDispID(publicProp) failed: %08x\n", hres); ok(id == public_prop_id, "id = %d, expected %d\n", id, public_prop_id); + + str = a2bstr("gsGetProp"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseInsensitive, &gs_getter_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID(publicFunction) failed: %08x\n", hres); + ok(gs_getter_id != -1, "gs_getter_id = -1\n"); + + V_VT(args) = VT_BOOL; + V_BOOL(args) = VARIANT_TRUE; + dp.cNamedArgs = 0; + dp.cArgs = 1; + V_VT(&v) = VT_I8; + hres = IDispatchEx_InvokeEx(dispex, gs_getter_id, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL && V_BOOL(&v), "V_VT(v) = %d\n", V_VT(&v)); + + hres = IDispatchEx_InvokeEx(dispex, gs_getter_id, 0, DISPATCH_PROPERTYGET, &dp, NULL, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + V_VT(args) = VT_BOOL; + V_BOOL(args) = VARIANT_FALSE; + dp.cArgs = 1; + V_VT(&v) = VT_I8; + hres = IDispatchEx_InvokeEx(dispex, gs_getter_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL && !V_BOOL(&v), "V_VT(v) = %d\n", V_VT(&v)); + + V_VT(args) = VT_BOOL; + V_BOOL(args) = VARIANT_TRUE; + V_VT(&v) = VT_I8; + dp.cArgs = 1; + hres = IDispatchEx_InvokeEx(dispex, gs_getter_id, 0, DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL && V_BOOL(&v), "V_VT(v) = %d\n", V_VT(&v)); IDispatchEx_Release(dispex); } @@ -673,6 +726,29 @@ VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { switch(id) { + case DISPID_VALUE: { + VARIANT *arg; + int i; + + CHECK_EXPECT(testobj_value_i); + + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + for(i=0; i<pdp->cArgs; i++) { + arg = pdp->rgvarg+pdp->cArgs-i-1; + ok(V_VT(arg) == VT_I2, "V_VT(arg) = %d\n", V_VT(arg)); + ok(V_I2(arg) == i+1, "V_I2(arg) = %d\n", V_I2(arg)); + } + + V_VT(pvarRes) = VT_I2; + V_I2(pvarRes) = pdp->cArgs; + return S_OK; + } case DISPID_TESTOBJ_PROPGET: CHECK_EXPECT(testobj_propget_i); @@ -2008,6 +2084,14 @@ strict_dispid_check = FALSE; + SET_EXPECT(testobj_value_i); + parse_script_a("dim n,o\n set o = testObj\n n = o(1,2)\n call ok(n=2, \"n = \" & n)\n"); + CHECK_CALLED(testobj_value_i); + + SET_EXPECT(testobj_value_i); + parse_script_a("dim n,o\n set o = testObj\n n = o\n call ok(n=0, \"n = \" & n)\n"); + CHECK_CALLED(testobj_value_i); + parse_script_a("Sub testsub\n" "x = 1\n" "Call ok(x = 1, \"x = \" & x)\n"

1 0

[akhaldi] 64608: [VBSCRIPT] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: akhaldi Date: Wed Oct 8 19:03:07 2014 New Revision: 64608 URL: http://svn.reactos.org/svn/reactos?rev=64608&view=rev Log: [VBSCRIPT] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/vbscript/compile.c trunk/reactos/dll/win32/vbscript/global.c trunk/reactos/dll/win32/vbscript/interp.c trunk/reactos/dll/win32/vbscript/lex.c trunk/reactos/dll/win32/vbscript/parser.tab.c trunk/reactos/dll/win32/vbscript/parser.tab.h trunk/reactos/dll/win32/vbscript/parser.y trunk/reactos/dll/win32/vbscript/vbdisp.c trunk/reactos/dll/win32/vbscript/vbscript.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/vbscript/compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/compile… Modified: trunk/reactos/dll/win32/vbscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/global.… Modified: trunk/reactos/dll/win32/vbscript/interp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/interp.… Modified: trunk/reactos/dll/win32/vbscript/lex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/lex.c?r… Modified: trunk/reactos/dll/win32/vbscript/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/parser.… Modified: trunk/reactos/dll/win32/vbscript/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/parser.… Modified: trunk/reactos/dll/win32/vbscript/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/parser.… Modified: trunk/reactos/dll/win32/vbscript/vbdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbdisp.… Modified: trunk/reactos/dll/win32/vbscript/vbscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 64607: [USP10_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: akhaldi Date: Wed Oct 8 18:56:31 2014 New Revision: 64607 URL: http://svn.reactos.org/svn/reactos?rev=64607&view=rev Log: [USP10_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/usp10/usp10.c Modified: trunk/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r… ============================================================================== --- trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] Wed Oct 8 18:56:31 2014 @@ -81,7 +81,7 @@ else hr = ScriptItemize(string, cchString, 15, Control, State, outpItems, &outnItems); - winetest_ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + winetest_ok(hr == S_OK, "ScriptItemize should return S_OK not %08x\n", hr); if (nItemsBroken && (broken(nItemsBroken[0] == outnItems) || broken(nItemsBroken[1] == outnItems))) { winetest_win_skip("This test broken on this platform\n"); @@ -246,12 +246,12 @@ /* Hebrew */ static const WCHAR test6[] = {0x05e9, 0x05dc, 0x05d5, 0x05dd, '.',0}; - static const itemTest t61[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},4,0,0,0,0,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; + static const itemTest t61[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,TRUE,{-1,0,0,0,-1}},{{0,0,0,0,0},4,0,0,0,0,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; static const itemTest t62[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},4,1,1,1,0,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; static const itemTest t63[2] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; static const int b63[2] = {2,2}; static const WCHAR test7[] = {'p','a','r','t',' ','o','n','e',' ',0x05d7, 0x05dc, 0x05e7, ' ', 0x05e9, 0x05ea, 0x05d9, 0x05d9, 0x05dd, ' ','p','a','r','t',' ','t','h','r','e','e', 0}; - static const itemTest t71[4] = {{{0,0,0,0,0},0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},9,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},19,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; + static const itemTest t71[4] = {{{0,0,0,0,0},0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},9,1,1,1,hebr_tag,TRUE,{-1,0,0,0,-1}},{{0,0,0,0,0},19,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; static const itemTest t72[4] = {{{0,0,0,0,0},0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},9,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},18,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; static const itemTest t73[4] = {{{0,0,0,0,0},0,0,0,2,latn_tag,FALSE},{{0,0,0,0,0},8,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},19,0,0,2,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; static const WCHAR test8[] = {0x0633, 0x0644, 0x0627, 0x0645,0}; @@ -731,10 +731,9 @@ return; } if (valid > 0) - winetest_ok(!hr, "ScriptItemizeOpenType should return S_OK not %08x\n", hr); - else if (hr) + winetest_ok(hr == S_OK, "ScriptItemizeOpenType should return S_OK not %08x\n", hr); + else if (hr != S_OK) winetest_trace("ScriptItemizeOpenType should return S_OK not %08x\n", hr); - if (outnItems <= item) { @@ -1168,7 +1167,7 @@ memset(&State, 0 , sizeof(State)); hr = pScriptItemizeOpenType(test1, 4, 2, &Control, &State, items, tags, &outnItems); - ok(!hr, "ScriptItemizeOpenType should return S_OK not %08x\n", hr); + ok(hr == S_OK, "ScriptItemizeOpenType should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); hr = pScriptShapeOpenType(hdc, &sc, &items[0].a, tags[0], 0x00000000, NULL, NULL, 0, test1, 4, 4, NULL, NULL, glyphs, NULL, &nb); @@ -1340,7 +1339,7 @@ int nb; hr = ScriptItemize(test1, 4, 2, NULL, NULL, items, NULL); - ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + ok(hr == S_OK, "ScriptItemize should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, NULL, &nb); @@ -1360,7 +1359,7 @@ ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, logclust, attrs, &nb); - ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + ok(hr == S_OK, "ScriptShape should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); @@ -1368,7 +1367,7 @@ memset(logclust,-1,sizeof(logclust)); memset(attrs,-1,sizeof(attrs)); hr = ScriptShape(NULL, &sc, test1, 4, 4, &items[0].a, glyphs, logclust, attrs, &nb); - ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + ok(hr == S_OK, "ScriptShape should return S_OK not %08x\n", hr); ok(nb == 4, "Wrong number of items\n"); ok(logclust[0] == 0, "clusters out of order\n"); ok(logclust[1] == 1, "clusters out of order\n"); @@ -1429,7 +1428,7 @@ memset(logclust,-1,sizeof(logclust)); memset(attrs,-1,sizeof(attrs)); hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs2, logclust, attrs, &nb); - ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + ok(hr == S_OK, "ScriptShape should return S_OK not %08x\n", hr); ok(nb == 4, "Wrong number of items\n"); ok(glyphs2[0] == glyphs[3], "Glyphs not reordered properly\n"); ok(glyphs2[1] == glyphs[2], "Glyphs not reordered properly\n"); @@ -1473,11 +1472,11 @@ ABC abc[4]; hr = ScriptItemize(test1, 4, 2, NULL, NULL, items, NULL); - ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + ok(hr == S_OK, "ScriptItemize should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, logclust, attrs, &nb); - ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + ok(hr == S_OK, "ScriptShape should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); hr = ScriptPlace(hdc, &sc, glyphs, 4, NULL, &items[0].a, widths, NULL, NULL); @@ -1499,7 +1498,7 @@ "ScriptPlace should return E_FAIL or E_INVALIDARG, not %08x\n", hr); hr = ScriptPlace(hdc, &sc, glyphs, 4, attrs, &items[0].a, widths, offset, NULL); - ok(!hr, "ScriptPlace should return S_OK not %08x\n", hr); + ok(hr == S_OK, "ScriptPlace should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); ret = ExtTextOutW(hdc, 1, 1, 0, NULL, glyphs, 4, widths); @@ -1553,7 +1552,7 @@ cInChars = 5; cMaxItems = 255; hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); - ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); + ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * * returned. */ ok (pcItems > 0, "The number of SCRIPT_ITEMS should be greater than 0\n"); @@ -1565,7 +1564,7 @@ /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue * ie. ScriptItemize has succeeded and that pItem has been set */ cInChars = 5; - if (hr == 0) { + if (hr == S_OK) { psc = NULL; /* must be null on first call */ cChars = cInChars; cMaxGlyphs = cInChars; @@ -1584,16 +1583,16 @@ hr = ScriptShape(hdc, &psc, TestItem1, cChars, cMaxGlyphs, &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); - ok (hr == 0, "ScriptShape should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "ScriptShape should return S_OK not (%08x)\n", hr); ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); if (hr ==0) { hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, pGoffset, pABC); - ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "ScriptPlace should return S_OK not (%08x)\n", hr); hr = ScriptPlace(NULL, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, pGoffset, pABC); - ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "ScriptPlace should return S_OK not (%08x)\n", hr); for (cnt=0; cnt < pcGlyphs; cnt++) pwOutGlyphs[cnt] = pwOutGlyphs1[cnt]; /* Send to next function */ } @@ -1604,14 +1603,14 @@ cInChars = 5; cMaxItems = 255; hr = ScriptItemize(TestItem2, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); - ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); + ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * * returned. */ ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == cInChars, "Start pos not = 0 (%d) or end pos not = %d (%d)\n", pItem[0].iCharPos, cInChars, pItem[1].iCharPos); /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue */ - if (hr == 0) { + if (hr == S_OK) { cChars = cInChars; cMaxGlyphs = 256; pItem[0].a.fNoGlyphIndex = 1; /* say no translate */ @@ -1619,16 +1618,16 @@ cMaxGlyphs, &pItem[0].a, pwOutGlyphs2, pwLogClust, psva, &pcGlyphs); ok (hr != E_PENDING, "If psc should not be NULL (%08x) and the E_PENDING should be returned\n", hr); - ok (hr == 0, "ScriptShape should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "ScriptShape should return S_OK not (%08x)\n", hr); ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); for (cnt=0; cnt < cChars && TestItem2[cnt] == pwOutGlyphs2[cnt]; cnt++) {} ok (cnt == cChars, "Translation to place when told not to. WCHAR %d - %04x != %04x\n", cnt, TestItem2[cnt], pwOutGlyphs2[cnt]); - if (hr ==0) { + if (hr == S_OK) { hr = ScriptPlace(hdc, &psc, pwOutGlyphs2, pcGlyphs, psva, &pItem[0].a, piAdvance, pGoffset, pABC); - ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "ScriptPlace should return S_OK not (%08x)\n", hr); } } ScriptFreeCache( &psc); @@ -1640,8 +1639,8 @@ cInChars = (sizeof(TestItem3)/2)-1; cMaxItems = 255; hr = ScriptItemize(TestItem3, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); - ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); - if (hr == 0) + ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); + if (hr == S_OK) { ok (pcItems == 3, "The number of SCRIPT_ITEMS should be 3 not %d\n", pcItems); if (pcItems > 2) @@ -1662,8 +1661,8 @@ cInChars = (sizeof(TestItem4)/2)-1; cMaxItems = 255; hr = ScriptItemize(TestItem4, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); - ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); - if (hr == 0) + ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); + if (hr == S_OK) { ok (pcItems == 5, "The number of SCRIPT_ITEMS should be 5 not %d\n", pcItems); if (pcItems > 4) @@ -1699,7 +1698,7 @@ */ cInChars = (sizeof(TestItem5)-1)/sizeof(WCHAR); hr = ScriptItemize(TestItem5, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); - ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); + ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); ok (pcItems == 4, "There should have been 4 items, found %d\n", pcItems); ok (pItem[0].a.s.uBidiLevel == 1, "The first character should have been bidi=1 not %d\n", pItem[0].a.s.uBidiLevel); @@ -1765,7 +1764,7 @@ ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); /* Check to see if the results are the same as those returned by ScriptShape */ hr = ScriptGetCMap(hdc, &psc, TestItem1, cInChars, dwFlags, pwOutGlyphs3); - ok (hr == 0, "ScriptGetCMap should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "ScriptGetCMap should return S_OK not (%08x)\n", hr); ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); for (cnt=0; cnt < cChars && pwOutGlyphs[cnt] == pwOutGlyphs3[cnt]; cnt++) {} ok (cnt == cInChars, "Translation not correct. WCHAR %d - %04x != %04x\n", @@ -2057,7 +2056,7 @@ cInChars = 5; cMaxItems = 255; hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); - ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); + ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * * returned. */ ok (pcItems > 0, "The number of SCRIPT_ITEMS should be greater than 0\n"); @@ -2069,21 +2068,21 @@ /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue * ie. ScriptItemize has succeeded and that pItem has been set */ cInChars = 5; - if (hr == 0) { + if (hr == S_OK) { psc = NULL; /* must be null on first call */ cChars = cInChars; cMaxGlyphs = 256; hr = ScriptShape(hdc, &psc, TestItem1, cChars, cMaxGlyphs, &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); - ok (hr == 0, "ScriptShape should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "ScriptShape should return S_OK not (%08x)\n", hr); ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); - if (hr ==0) { + if (hr == S_OK) { /* Note hdc is needed as glyph info is not yet in psc */ hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, pGoffset, pABC); - ok (hr == 0, "Should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "Should return S_OK not (%08x)\n", hr); ScriptFreeCache(&psc); /* Get rid of psc for next test set */ ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); @@ -2113,7 +2112,7 @@ /* Set that it returns 0 status */ hr = ScriptTextOut(hdc, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); - ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); /* Test Rect Rgn is acceptable */ rect.top = 10; @@ -2122,7 +2121,7 @@ rect.right = 40; hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); - ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); iCP = 1; hr = ScriptCPtoX(iCP, fTrailing, cChars, pcGlyphs, (const WORD *) &pwLogClust, @@ -2175,7 +2174,7 @@ cInChars = 5; cMaxItems = 255; hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); - ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); + ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * * returned. */ ok (pcItems > 0, "The number of SCRIPT_ITEMS should be greater than 0\n"); @@ -2187,21 +2186,21 @@ /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue * ie. ScriptItemize has succeeded and that pItem has been set */ cInChars = 5; - if (hr == 0) { + if (hr == S_OK) { psc = NULL; /* must be null on first call */ cChars = cInChars; cMaxGlyphs = 256; hr = ScriptShape(hdc2, &psc, TestItem1, cChars, cMaxGlyphs, &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); - ok (hr == 0, "ScriptShape should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "ScriptShape should return S_OK not (%08x)\n", hr); ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); if (hr ==0) { /* Note hdc is needed as glyph info is not yet in psc */ hr = ScriptPlace(hdc2, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, pGoffset, pABC); - ok (hr == 0, "Should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "Should return S_OK not (%08x)\n", hr); /* key part!!! cached dc is being deleted */ hr = DeleteDC(hdc2); @@ -2213,7 +2212,7 @@ */ hr = ScriptTextOut(hdc1, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); - ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); DeleteDC(hdc1); @@ -2251,7 +2250,7 @@ cInChars = 2; cMaxItems = 255; hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); - ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); + ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * * returned. */ ok (pcItems > 0, "The number of SCRIPT_ITEMS should be greater than 0\n"); @@ -2263,21 +2262,21 @@ /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue * ie. ScriptItemize has succeeded and that pItem has been set */ cInChars = 2; - if (hr == 0) { + if (hr == S_OK) { psc = NULL; /* must be null on first call */ cChars = cInChars; cMaxGlyphs = 256; hr = ScriptShape(hdc, &psc, TestItem1, cChars, cMaxGlyphs, &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); - ok (hr == 0, "ScriptShape should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "ScriptShape should return S_OK not (%08x)\n", hr); ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); if (hr ==0) { /* Note hdc is needed as glyph info is not yet in psc */ hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, pGoffset, pABC); - ok (hr == 0, "Should return 0 not (%08x)\n", hr); + ok (hr == S_OK, "Should return S_OK not (%08x)\n", hr); /* Test Rect Rgn is acceptable */ rect.top = 10; @@ -2286,8 +2285,7 @@ rect.right = 40; hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); - ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", hr); - + ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); } /* Clean up and go */ ScriptFreeCache(&psc); @@ -2969,7 +2967,7 @@ HRESULT hr; hr = ScriptItemize(test, 3, 4, NULL, NULL, items, NULL); - ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + ok(hr == S_OK, "ScriptItemize should return S_OK not %08x\n", hr); /* * This Test crashes pre Vista. @@ -2986,7 +2984,7 @@ memset(&la, 0, sizeof(la)); hr = ScriptBreak(test, 1, &items[0].a, &la); - ok(!hr, "ScriptBreak should return S_OK not %08x\n", hr); + ok(hr == S_OK, "ScriptBreak should return S_OK not %08x\n", hr); ok(!la.fSoftBreak, "fSoftBreak set\n"); ok(la.fWhiteSpace, "fWhiteSpace not set\n"); @@ -2997,7 +2995,7 @@ memset(&la, 0, sizeof(la)); hr = ScriptBreak(test + 1, 1, &items[1].a, &la); - ok(!hr, "ScriptBreak should return S_OK not %08x\n", hr); + ok(hr == S_OK, "ScriptBreak should return S_OK not %08x\n", hr); ok(!la.fSoftBreak, "fSoftBreak set\n"); ok(!la.fWhiteSpace, "fWhiteSpace set\n"); @@ -3008,7 +3006,7 @@ memset(&la, 0, sizeof(la)); hr = ScriptBreak(test + 2, 1, &items[2].a, &la); - ok(!hr, "ScriptBreak should return S_OK not %08x\n", hr); + ok(hr == S_OK, "ScriptBreak should return S_OK not %08x\n", hr); ok(!la.fSoftBreak, "fSoftBreak set\n"); ok(!la.fWhiteSpace, "fWhiteSpace set\n");

1 0

[akhaldi] 64606: [USP10] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: akhaldi Date: Wed Oct 8 18:56:19 2014 New Revision: 64606 URL: http://svn.reactos.org/svn/reactos?rev=64606&view=rev Log: [USP10] * Sync with Wine 1.7.27. CORE-8540 Added: trunk/reactos/dll/win32/usp10/bracket.c (with props) Modified: trunk/reactos/dll/win32/usp10/CMakeLists.txt trunk/reactos/dll/win32/usp10/bidi.c trunk/reactos/dll/win32/usp10/breaking.c trunk/reactos/dll/win32/usp10/indicsyllable.c trunk/reactos/dll/win32/usp10/linebreak.c trunk/reactos/dll/win32/usp10/mirror.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/shaping.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/CMakeLists… Modified: trunk/reactos/dll/win32/usp10/bidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bidi.c?rev… Added: trunk/reactos/dll/win32/usp10/bracket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bracket.c?… Modified: trunk/reactos/dll/win32/usp10/breaking.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/breaking.c… Modified: trunk/reactos/dll/win32/usp10/indicsyllable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/indicsylla… Modified: trunk/reactos/dll/win32/usp10/linebreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/linebreak.… Modified: trunk/reactos/dll/win32/usp10/mirror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/mirror.c?r… Modified: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re… Modified: trunk/reactos/dll/win32/usp10/shaping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shaping.c?… Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 64605: [STI_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: akhaldi Date: Wed Oct 8 18:47:38 2014 New Revision: 64605 URL: http://svn.reactos.org/svn/reactos?rev=64605&view=rev Log: [STI_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/sti/sti.c Modified: trunk/rostests/winetests/sti/sti.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/sti/sti.c?rev=6… ============================================================================== --- trunk/rostests/winetests/sti/sti.c [iso-8859-1] (original) +++ trunk/rostests/winetests/sti/sti.c [iso-8859-1] Wed Oct 8 18:47:38 2014 @@ -63,7 +63,7 @@ static BOOL init_function_pointers(void) { - sti_dll = LoadLibrary("sti.dll"); + sti_dll = LoadLibraryA("sti.dll"); if (sti_dll) { pStiCreateInstance = (void*) @@ -86,7 +86,7 @@ if (pStiCreateInstance) { PSTIW pStiW; - hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, NULL); + hr = pStiCreateInstance(GetModuleHandleA(NULL), STI_VERSION_REAL, &pStiW, NULL); if (SUCCEEDED(hr)) { IUnknown *pUnknown; @@ -100,7 +100,7 @@ } else ok(0, "could not create StillImageA, hr = 0x%X\n", hr); - hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); + hr = pStiCreateInstance(GetModuleHandleA(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); if (SUCCEEDED(hr)) { IUnknown *pUnknown; @@ -121,7 +121,7 @@ if (pStiCreateInstanceA) { PSTIA pStiA; - hr = pStiCreateInstanceA(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiA, NULL); + hr = pStiCreateInstanceA(GetModuleHandleA(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiA, NULL); if (SUCCEEDED(hr)) { IUnknown *pUnknown; @@ -142,7 +142,7 @@ if (pStiCreateInstanceW) { PSTIW pStiW; - hr = pStiCreateInstanceW(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, NULL); + hr = pStiCreateInstanceW(GetModuleHandleA(NULL), STI_VERSION_REAL, &pStiW, NULL); if (SUCCEEDED(hr)) { IUnknown *pUnknown; @@ -175,7 +175,7 @@ But StiCreateInstance* only take PSTI. So how does the non-delegating IUnknown come back to the outer object calling this function? */ - hr = pStiCreateInstanceW(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, &aggregator); + hr = pStiCreateInstanceW(GetModuleHandleA(NULL), STI_VERSION_REAL, &pStiW, &aggregator); if (SUCCEEDED(hr)) { IStillImageW *pStiW2 = NULL; @@ -240,7 +240,7 @@ return; } - hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); + hr = pStiCreateInstance(GetModuleHandleA(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); if (SUCCEEDED(hr)) { hr = IStillImage_RegisterLaunchApplication(pStiW, appName, appName);

1 0

[akhaldi] 64604: [SHDOCVW_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: akhaldi Date: Wed Oct 8 18:42:31 2014 New Revision: 64604 URL: http://svn.reactos.org/svn/reactos?rev=64604&view=rev Log: [SHDOCVW_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/shdocvw/shdocvw.c trunk/rostests/winetests/shdocvw/shortcut.c Modified: trunk/rostests/winetests/shdocvw/shdocvw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/shdocvw… ============================================================================== --- trunk/rostests/winetests/shdocvw/shdocvw.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shdocvw/shdocvw.c [iso-8859-1] Wed Oct 8 18:42:31 2014 @@ -36,13 +36,13 @@ static DWORD (WINAPI *pParseURLFromOutsideSourceA)(LPCSTR, LPSTR, LPDWORD, LPDWORD); static DWORD (WINAPI *pParseURLFromOutsideSourceW)(LPCWSTR, LPWSTR, LPDWORD, LPDWORD); -static CHAR appdata[] = "AppData"; -static CHAR common_appdata[] = "Common AppData"; -static CHAR default_page_url[] = "Default_Page_URL"; -static CHAR does_not_exist[] = "does_not_exist"; -static CHAR regpath_iemain[] = "Software\\Microsoft\\Internet Explorer\\Main"; -static CHAR regpath_shellfolders[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; -static CHAR start_page[] = "Start Page"; +static const char appdata[] = "AppData"; +static const char common_appdata[] = "Common AppData"; +static const char default_page_url[] = "Default_Page_URL"; +static const char does_not_exist[] = "does_not_exist"; +static const char regpath_iemain[] = "Software\\Microsoft\\Internet Explorer\\Main"; +static const char regpath_shellfolders[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; +static const char start_page[] = "Start Page"; /* ################ */ Modified: trunk/rostests/winetests/shdocvw/shortcut.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/shortcu… ============================================================================== --- trunk/rostests/winetests/shdocvw/shortcut.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shdocvw/shortcut.c [iso-8859-1] Wed Oct 8 18:42:31 2014 @@ -210,7 +210,7 @@ IShellFolder_Release(pWineTestFolder); if (FAILED(hr)) goto cleanup; - /* The resulting folder object has the FolderShortcut CLSID, instead of it's own. */ + /* The resulting folder object has the FolderShortcut CLSID, instead of its own. */ hr = IPersistFolder3_GetClassID(pWineTestPersistFolder, &clsid); ok (SUCCEEDED(hr), "IPersist::GetClassID failed! hr = %08x\n", hr); ok (IsEqualCLSID(&CLSID_FolderShortcut, &clsid), "GetClassId returned wrong CLSID!\n");

1 0

[akhaldi] 64603: [SHDOCVW] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: akhaldi Date: Wed Oct 8 18:42:09 2014 New Revision: 64603 URL: http://svn.reactos.org/svn/reactos?rev=64603&view=rev Log: [SHDOCVW] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.spec trunk/reactos/dll/win32/shdocvw/shdocvw_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.spec [iso-8859-1] Wed Oct 8 18:42:09 2014 @@ -46,7 +46,7 @@ 161 stub shdocvw_161 # CSearchAssistantOC::OnDraw 162 stub -noname CDDEAuto_Navigate 163 stub SHAddSubscribeFavorite -164 stub -noname ResetProfileSharing +164 stdcall -noname ResetProfileSharing(long) 165 stub -noname URLSubstitution 167 stub -noname IsIEDefaultBrowser 169 stdcall -noname ParseURLFromOutsideSourceA(str ptr ptr ptr) @@ -121,7 +121,7 @@ @ stub IEAboutBox @ stub IEWriteErrorLog @ stdcall ImportPrivacySettings(wstr ptr ptr) -@ stub InstallReg_RunDLL +@ stdcall InstallReg_RunDLL(long long str long) @ stdcall OpenURL(long long str long) ieframe.OpenURL @ stub SHGetIDispatchForFolder @ stdcall SetQueryNetSessionCount(long) Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] Wed Oct 8 18:42:09 2014 @@ -519,3 +519,20 @@ return TRUE; } + +/****************************************************************** + * ResetProfileSharing (SHDOCVW.164) + */ +HRESULT WINAPI ResetProfileSharing(HWND hwnd) +{ + FIXME("(%p) stub\n", hwnd); + return E_NOTIMPL; +} + +/****************************************************************** + * InstallReg_RunDLL (SHDOCVW.@) + */ +void WINAPI InstallReg_RunDLL(HWND hwnd, HINSTANCE handle, LPCSTR cmdline, INT show) +{ + FIXME("(%p %p %s %x)\n", hwnd, handle, debugstr_a(cmdline), show); +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Oct 8 18:42:09 2014 @@ -182,7 +182,7 @@ reactos/dll/win32/sensapi # Synced to Wine-1.7.17 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to Wine-1.7.17 -reactos/dll/win32/shdocvw # Synced to Wine-1.7.17 +reactos/dll/win32/shdocvw # Synced to Wine-1.7.27 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to Wine-1.7.17 reactos/dll/win32/shlwapi # Synced to Wine-1.7.27

1 0

[akhaldi] 64602: [SCRRUN_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: akhaldi Date: Wed Oct 8 18:04:21 2014 New Revision: 64602 URL: http://svn.reactos.org/svn/reactos?rev=64602&view=rev Log: [SCRRUN_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/scrrun/filesystem.c Modified: trunk/rostests/winetests/scrrun/filesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/scrrun/filesyst… ============================================================================== --- trunk/rostests/winetests/scrrun/filesystem.c [iso-8859-1] (original) +++ trunk/rostests/winetests/scrrun/filesystem.c [iso-8859-1] Wed Oct 8 18:04:21 2014 @@ -41,9 +41,19 @@ } static const WCHAR crlfW[] = {'\r','\n',0}; +static const char utf16bom[] = {0xff,0xfe,0}; #define GET_REFCOUNT(iface) \ get_refcount((IUnknown*)iface) + +static inline void get_temp_path(const WCHAR *prefix, WCHAR *path) +{ + WCHAR buffW[MAX_PATH]; + + GetTempPathW(MAX_PATH, buffW); + GetTempFileNameW(buffW, prefix, 0, path); + DeleteFileW(path); +} static void test_interfaces(void) { @@ -129,15 +139,13 @@ static void test_createfolder(void) { - WCHAR pathW[MAX_PATH], buffW[MAX_PATH]; + WCHAR buffW[MAX_PATH]; HRESULT hr; BSTR path; IFolder *folder; BOOL ret; - GetTempPathW(MAX_PATH, pathW); - GetTempFileNameW(pathW, NULL, 0, buffW); - DeleteFileW(buffW); + get_temp_path(NULL, buffW); ret = CreateDirectoryW(buffW, NULL); ok(ret, "got %d, %d\n", ret, GetLastError()); @@ -528,33 +536,31 @@ static void test_GetFile(void) { - static const WCHAR get_file[] = {'g','e','t','_','f','i','l','e','.','t','s','t',0}; - - BSTR path = SysAllocString(get_file); + static const WCHAR slW[] = {'\\',0}; + BSTR path; + WCHAR pathW[MAX_PATH]; FileAttribute fa; VARIANT size; DWORD gfa; IFile *file; HRESULT hr; HANDLE hf; - + BOOL ret; + + get_temp_path(NULL, pathW); + + path = SysAllocString(pathW); hr = IFileSystem3_GetFile(fs3, path, NULL); ok(hr == E_POINTER, "GetFile returned %x, expected E_POINTER\n", hr); hr = IFileSystem3_GetFile(fs3, NULL, &file); ok(hr == E_INVALIDARG, "GetFile returned %x, expected E_INVALIDARG\n", hr); - if(GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES) { - skip("File already exists, skipping GetFile tests\n"); - SysFreeString(path); - return; - } - file = (IFile*)0xdeadbeef; hr = IFileSystem3_GetFile(fs3, path, &file); ok(!file, "file != NULL\n"); ok(hr == CTL_E_FILENOTFOUND, "GetFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); - hf = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); + hf = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); if(hf == INVALID_HANDLE_VALUE) { skip("Can't create temporary file\n"); SysFreeString(path); @@ -566,7 +572,7 @@ ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); hr = IFile_get_Attributes(file, &fa); - gfa = GetFileAttributesW(get_file) & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | + gfa = GetFileAttributesW(pathW) & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ARCHIVE | FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_COMPRESSED); ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); @@ -589,6 +595,18 @@ ok(hr == CTL_E_FILENOTFOUND, "DeleteFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); SysFreeString(path); + + /* try with directory */ + lstrcatW(pathW, slW); + ret = CreateDirectoryW(pathW, NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + + path = SysAllocString(pathW); + hr = IFileSystem3_GetFile(fs3, path, &file); + ok(hr == CTL_E_FILENOTFOUND, "GetFile returned %x, expected S_OK\n", hr); + SysFreeString(path); + + RemoveDirectoryW(pathW); } static inline BOOL create_file(const WCHAR *name) @@ -858,9 +876,7 @@ BSTR str; int found_a = 0, found_b = 0, found_c = 0; - GetTempPathW(MAX_PATH, pathW); - GetTempFileNameW(pathW, fooW, 0, buffW); - DeleteFileW(buffW); + get_temp_path(fooW, buffW); CreateDirectoryW(buffW, NULL); str = SysAllocString(buffW); @@ -1042,9 +1058,7 @@ HANDLE file_a, file_b, file_c; int found_a = 0, found_b = 0, found_c = 0; - GetTempPathW(MAX_PATH, pathW); - GetTempFileNameW(pathW, fooW, 0, buffW); - DeleteFileW(buffW); + get_temp_path(fooW, buffW); CreateDirectoryW(buffW, NULL); str = SysAllocString(buffW); @@ -1070,9 +1084,7 @@ count = 0; hr = IFileCollection_get_Count(files, &count); -todo_wine - ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 2, "got %d\n", count); lstrcpyW(pathW, buffW); @@ -1083,9 +1095,7 @@ /* every time property is requested it scans directory */ count = 0; hr = IFileCollection_get_Count(files, &count); -todo_wine - ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 3, "got %d\n", count); hr = IFileCollection_get__NewEnum(files, NULL); @@ -1278,20 +1288,29 @@ V_VT(&size) = VT_EMPTY; hr = IDrive_get_TotalSize(drive, &size); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); + if (V_VT(&size) == VT_R8) + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + else + ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); V_VT(&size) = VT_EMPTY; hr = IDrive_get_AvailableSpace(drive, &size); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); + if (V_VT(&size) == VT_R8) + ok(V_R8(&size) > (double)INT_MAX, "got %f\n", V_R8(&size)); + else + ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); V_VT(&size) = VT_EMPTY; hr = IDrive_get_FreeSpace(drive, &size); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); + if (V_VT(&size) == VT_R8) + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + else + ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); } VariantClear(&var); } @@ -1304,8 +1323,7 @@ { static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; - static const WCHAR bomAW[] = {0xff,0xfe,0}; - WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; + WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; ITextStream *stream; BSTR nameW, str; HANDLE file; @@ -1352,11 +1370,16 @@ ok(hr == S_OK, "got 0x%08x\n", hr); ITextStream_Release(stream); + /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode + treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, bomAW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); SysFreeString(str); ITextStream_Release(stream); @@ -1493,7 +1516,9 @@ str = NULL; hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - ok(str[0] == 0x00ff && str[1] == 0x00fe, "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1640,7 +1665,11 @@ str = NULL; hr = ITextStream_Read(stream, 2, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(str[0] == 0x00ff && str[1] == 0x00fe, "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); + + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); ok(SysStringLen(str) == 2, "got %d\n", SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1716,6 +1745,121 @@ DeleteFileW(nameW); RemoveDirectoryW(dirW); SysFreeString(nameW); +} + +struct getdrivename_test { + const WCHAR path[10]; + const WCHAR drive[5]; +}; + +static const struct getdrivename_test getdrivenametestdata[] = { + { {'C',':','\\','1','.','t','s','t',0}, {'C',':',0} }, + { {'O',':','\\','1','.','t','s','t',0}, {'O',':',0} }, + { {'O',':',0}, {'O',':',0} }, + { {'o',':',0}, {'o',':',0} }, + { {'O','O',':',0} }, + { {':',0} }, + { {'O',0} }, + { { 0 } } +}; + +static void test_GetDriveName(void) +{ + const struct getdrivename_test *ptr = getdrivenametestdata; + HRESULT hr; + BSTR name; + + hr = IFileSystem3_GetDriveName(fs3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + name = (void*)0xdeadbeef; + hr = IFileSystem3_GetDriveName(fs3, NULL, &name); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(name == NULL, "got %p\n", name); + + while (*ptr->path) { + BSTR path = SysAllocString(ptr->path); + name = (void*)0xdeadbeef; + hr = IFileSystem3_GetDriveName(fs3, path, &name); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (name) + ok(!lstrcmpW(ptr->drive, name), "got %s, expected %s\n", wine_dbgstr_w(name), wine_dbgstr_w(ptr->drive)); + else + ok(!*ptr->drive, "got %s, expected %s\n", wine_dbgstr_w(name), wine_dbgstr_w(ptr->drive)); + SysFreeString(path); + SysFreeString(name); + ptr++; + } +} + +static void test_SerialNumber(void) +{ + IDriveCollection *drives; + IEnumVARIANT *iter; + IDrive *drive; + LONG serial; + HRESULT hr; + BSTR name; + + hr = IFileSystem3_get_Drives(fs3, &drives); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&iter); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDriveCollection_Release(drives); + + while (1) { + DriveTypeConst type; + VARIANT var; + + hr = IEnumVARIANT_Next(iter, 1, &var, NULL); + if (hr == S_FALSE) { + skip("No fixed drive found, skipping test.\n"); + IEnumVARIANT_Release(iter); + return; + } + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&var); + + hr = IDrive_get_DriveType(drive, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (type == Fixed) + break; + + IDrive_Release(drive); + } + + hr = IDrive_get_SerialNumber(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + serial = 0xdeadbeef; + hr = IDrive_get_SerialNumber(drive, &serial); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(serial != 0xdeadbeef, "got %x\n", serial); + + hr = IDrive_get_FileSystem(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + name = NULL; + hr = IDrive_get_FileSystem(drive, &name); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(name != NULL, "got %p\n", name); + SysFreeString(name); + + hr = IDrive_get_VolumeName(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + name = NULL; + hr = IDrive_get_VolumeName(drive, &name); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(name != NULL, "got %p\n", name); + SysFreeString(name); + + IDrive_Release(drive); + IEnumVARIANT_Release(iter); } START_TEST(filesystem) @@ -1750,6 +1894,8 @@ test_WriteLine(); test_ReadAll(); test_Read(); + test_GetDriveName(); + test_SerialNumber(); IFileSystem3_Release(fs3);

1 0

[akhaldi] 64601: [SCRRUN] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: akhaldi Date: Wed Oct 8 18:03:53 2014 New Revision: 64601 URL: http://svn.reactos.org/svn/reactos?rev=64601&view=rev Log: [SCRRUN] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/scrrun/filesystem.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/scrrun/filesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/filesyste… ============================================================================== --- trunk/reactos/dll/win32/scrrun/filesystem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/filesystem.c [iso-8859-1] Wed Oct 8 18:03:53 2014 @@ -875,6 +875,24 @@ return E_NOTIMPL; } +static HRESULT variant_from_largeint(const ULARGE_INTEGER *src, VARIANT *v) +{ + HRESULT hr = S_OK; + + if (src->u.HighPart || src->u.LowPart > INT_MAX) + { + V_VT(v) = VT_R8; + hr = VarR8FromUI8(src->QuadPart, &V_R8(v)); + } + else + { + V_VT(v) = VT_I4; + V_I4(v) = src->u.LowPart; + } + + return hr; +} + static HRESULT WINAPI drive_get_AvailableSpace(IDrive *iface, VARIANT *v) { struct drive *This = impl_from_IDrive(iface); @@ -888,8 +906,7 @@ if (!GetDiskFreeSpaceExW(This->root, &avail, NULL, NULL)) return E_FAIL; - V_VT(v) = VT_R8; - return VarR8FromUI8(avail.QuadPart, &V_R8(v)); + return variant_from_largeint(&avail, v); } static HRESULT WINAPI drive_get_FreeSpace(IDrive *iface, VARIANT *v) @@ -905,8 +922,7 @@ if (!GetDiskFreeSpaceExW(This->root, &freespace, NULL, NULL)) return E_FAIL; - V_VT(v) = VT_R8; - return VarR8FromUI8(freespace.QuadPart, &V_R8(v)); + return variant_from_largeint(&freespace, v); } static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v) @@ -922,15 +938,25 @@ if (!GetDiskFreeSpaceExW(This->root, NULL, &total, NULL)) return E_FAIL; - V_VT(v) = VT_R8; - return VarR8FromUI8(total.QuadPart, &V_R8(v)); + return variant_from_largeint(&total, v); } static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, name); - return E_NOTIMPL; + WCHAR nameW[MAX_PATH+1]; + BOOL ret; + + TRACE("(%p)->(%p)\n", This, name); + + if (!name) + return E_POINTER; + + *name = NULL; + ret = GetVolumeInformationW(This->root, nameW, sizeof(nameW)/sizeof(WCHAR), NULL, NULL, NULL, NULL, 0); + if (ret) + *name = SysAllocString(nameW); + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI drive_put_VolumeName(IDrive *iface, BSTR name) @@ -943,15 +969,33 @@ static HRESULT WINAPI drive_get_FileSystem(IDrive *iface, BSTR *fs) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, fs); - return E_NOTIMPL; + WCHAR nameW[MAX_PATH+1]; + BOOL ret; + + TRACE("(%p)->(%p)\n", This, fs); + + if (!fs) + return E_POINTER; + + *fs = NULL; + ret = GetVolumeInformationW(This->root, NULL, 0, NULL, NULL, NULL, nameW, sizeof(nameW)/sizeof(WCHAR)); + if (ret) + *fs = SysAllocString(nameW); + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI drive_get_SerialNumber(IDrive *iface, LONG *serial) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, serial); - return E_NOTIMPL; + BOOL ret; + + TRACE("(%p)->(%p)\n", This, serial); + + if (!serial) + return E_POINTER; + + ret = GetVolumeInformationW(This->root, NULL, 0, (DWORD*)serial, NULL, NULL, NULL, 0); + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI drive_get_IsReady(IDrive *iface, VARIANT_BOOL *ready) @@ -1073,7 +1117,7 @@ strcpyW(pathW, path); len = strlenW(pathW); - if (pathW[len-1] != '\\') + if (len && pathW[len-1] != '\\') strcatW(pathW, bsW); strcatW(pathW, allW); handle = FindFirstFileW(pathW, data); @@ -1818,8 +1862,32 @@ static HRESULT WINAPI filecoll_get_Count(IFileCollection *iface, LONG *count) { struct filecollection *This = impl_from_IFileCollection(iface); - FIXME("(%p)->(%p)\n", This, count); - return E_NOTIMPL; + static const WCHAR allW[] = {'\\','*',0}; + WIN32_FIND_DATAW data; + WCHAR pathW[MAX_PATH]; + HANDLE handle; + + TRACE("(%p)->(%p)\n", This, count); + + if(!count) + return E_POINTER; + + *count = 0; + + strcpyW(pathW, This->path); + strcatW(pathW, allW); + handle = FindFirstFileW(pathW, &data); + if (handle == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + do + { + if (is_file_data(&data)) + *count += 1; + } while (FindNextFileW(handle, &data)); + FindClose(handle); + + return S_OK; } static const IFileCollectionVtbl filecollectionvtbl = { @@ -2583,6 +2651,7 @@ static HRESULT WINAPI file_get_Size(IFile *iface, VARIANT *pvarSize) { struct file *This = impl_from_IFile(iface); + ULARGE_INTEGER size; WIN32_FIND_DATAW fd; HANDLE f; @@ -2596,14 +2665,10 @@ return create_error(GetLastError()); FindClose(f); - if(fd.nFileSizeHigh || fd.nFileSizeLow>INT_MAX) { - V_VT(pvarSize) = VT_R8; - V_R8(pvarSize) = ((ULONGLONG)fd.nFileSizeHigh<<32) + fd.nFileSizeLow; - }else { - V_VT(pvarSize) = VT_I4; - V_I4(pvarSize) = fd.nFileSizeLow; - } - return S_OK; + size.u.LowPart = fd.nFileSizeLow; + size.u.HighPart = fd.nFileSizeHigh; + + return variant_from_largeint(&size, pvarSize); } static HRESULT WINAPI file_get_Type(IFile *iface, BSTR *pbstrType) @@ -2707,9 +2772,6 @@ heap_free(f); return E_FAIL; } - - if(path[len-1]=='/' || path[len-1]=='\\') - path[len-1] = 0; attrs = GetFileAttributesW(f->path); if(attrs==INVALID_FILE_ATTRIBUTES || @@ -2891,12 +2953,19 @@ return S_OK; } -static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR Path, - BSTR *pbstrResult) -{ - FIXME("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); - - return E_NOTIMPL; +static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR path, BSTR *drive) +{ + TRACE("(%p)->(%s %p)\n", iface, debugstr_w(path), drive); + + if (!drive) + return E_POINTER; + + *drive = NULL; + + if (path && strlenW(path) > 1 && path[1] == ':') + *drive = SysAllocStringLen(path, 2); + + return S_OK; } static inline DWORD get_parent_folder_name(const WCHAR *path, DWORD len) @@ -3644,11 +3713,15 @@ } ret = VerQueryValueW(ptr, rootW, (void**)&info, &len); + if (!ret) + { + heap_free(ptr); + return HRESULT_FROM_WIN32(GetLastError()); + } + + get_versionstring(info, ver); heap_free(ptr); - if (!ret) - return HRESULT_FROM_WIN32(GetLastError()); - - get_versionstring(info, ver); + *version = SysAllocString(ver); TRACE("version=%s\n", debugstr_w(ver)); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Oct 8 18:03:53 2014 @@ -176,7 +176,7 @@ reactos/dll/win32/rsaenh # Synced to Wine-1.7.27 reactos/dll/win32/sccbase # Synced to Wine-1.7.17 reactos/dll/win32/schannel # Synced to Wine-1.7.27 -reactos/dll/win32/scrrun # Synced to Wine-1.7.17 +reactos/dll/win32/scrrun # Synced to Wine-1.7.27 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to Wine-1.7.17

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014