diff options
| author | Shauren <shauren.trinity@gmail.com> | 2012-07-05 14:16:44 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2012-07-05 14:16:44 +0200 |
| commit | 32ba32c4ebe56ba931c8638460c24cd57ae29a75 (patch) | |
| tree | 2f757648b85ec8989a7dfc573b954b9b4d718650 /dep/StormLib/src/SFilePatchArchives.cpp | |
| parent | c95905ddbb22e2b5b5362b790aa851ef10d4e27e (diff) | |
| parent | ed6f3e2deff55f913f9646db5f540b7704088478 (diff) | |
Merge branch '4.x' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'dep/StormLib/src/SFilePatchArchives.cpp')
| -rw-r--r-- | dep/StormLib/src/SFilePatchArchives.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dep/StormLib/src/SFilePatchArchives.cpp b/dep/StormLib/src/SFilePatchArchives.cpp index 02f149be968..24ae2c52c37 100644 --- a/dep/StormLib/src/SFilePatchArchives.cpp +++ b/dep/StormLib/src/SFilePatchArchives.cpp @@ -400,7 +400,7 @@ static int ApplyMpqPatch( //----------------------------------------------------------------------------- // Public functions (StormLib internals) -bool IsPatchData(const void * pvData, DWORD cbData, LPDWORD pdwPatchedFileSize) +bool IsIncrementalPatchFile(const void * pvData, DWORD cbData, LPDWORD pdwPatchedFileSize) { TPatchHeader * pPatchHeader = (TPatchHeader *)pvData; BLIZZARD_BSDIFF40_FILE DiffFile; @@ -520,7 +520,7 @@ bool WINAPI SFileOpenPatchArchive( if(nError == ERROR_SUCCESS) { - if((ha->pStream->StreamFlags & STREAM_FLAG_READ_ONLY) == 0) + if(!FileStream_IsReadOnly(ha->pStream)) nError = ERROR_ACCESS_DENIED; } @@ -539,7 +539,7 @@ bool WINAPI SFileOpenPatchArchive( { if(!SFileHasFile(hPatchMpq, PATCH_METADATA_NAME)) { - GetDefaultPatchPrefix(ha->pStream->szFileName, szPatchPrefixBuff); + GetDefaultPatchPrefix(FileStream_GetFileName(ha->pStream), szPatchPrefixBuff); szPatchPathPrefix = szPatchPrefixBuff; } } |