mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-04 01:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #580 from TsudaKageyu/negative-seek

Browse Source 
Fix inconsistent negative seek behavior between Linux and Windows.
This commit is contained in:
Tsuda Kageyu 2015-08-07 01:32:26 +09:00
commit 173c58cf49
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
taglib/toolkit/tfilestream.cpp
View File

@ -365,13 +365,10 @@ void FileStream::seek(long offset, Position p)
SetLastError(NO_ERROR);
SetFilePointer(d->file, offset, NULL, whence);
if(GetLastError() == ERROR_NEGATIVE_SEEK) {
SetLastError(NO_ERROR);
SetFilePointer(d->file, 0, NULL, FILE_BEGIN);
}
if(GetLastError() != NO_ERROR) {
const int lastError = GetLastError();
if(lastError != NO_ERROR && lastError != ERROR_NEGATIVE_SEEK)
debug("FileStream::seek() -- Failed to set the file pointer.");
}
#else
@ -442,7 +439,7 @@ long FileStream::length()
SetLastError(NO_ERROR);
const DWORD fileSize = GetFileSize(d->file, NULL);
if(GetLastError() == NO_ERROR) {
return static_cast<ulong>(fileSize);
return static_cast<long>(fileSize);
}
else {
debug("FileStream::length() -- Failed to get the file size.");

25
tests/test_file.cpp
View File

@ -40,6 +40,7 @@ class TestFile : public CppUnit::TestFixture
CPPUNIT_TEST_SUITE(TestFile);
CPPUNIT_TEST(testFindInSmallFile);
CPPUNIT_TEST(testRFindInSmallFile);
CPPUNIT_TEST(testSeek);
CPPUNIT_TEST_SUITE_END();
public:
@ -100,6 +101,30 @@ public:
}
}
void testSeek()
{
ScopedFileCopy copy("empty", ".ogg");
std::string name = copy.fileName();
PlainFile f(name.c_str());
CPPUNIT_ASSERT_EQUAL((long)0, f.tell());
CPPUNIT_ASSERT_EQUAL((long)4328, f.length());
f.seek(100, File::Beginning);
CPPUNIT_ASSERT_EQUAL((long)100, f.tell());
f.seek(100, File::Current);
CPPUNIT_ASSERT_EQUAL((long)200, f.tell());
f.seek(-300, File::Current);
CPPUNIT_ASSERT_EQUAL((long)200, f.tell());
f.seek(-100, File::End);
CPPUNIT_ASSERT_EQUAL((long)4228, f.tell());
f.seek(-100, File::Current);
CPPUNIT_ASSERT_EQUAL((long)4128, f.tell());
f.seek(300, File::Current);
CPPUNIT_ASSERT_EQUAL((long)4428, f.tell());
}
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestFile);