Merge pull request #393 from ladislav-zezula/LZ_BlizzardCompatibleNames

* Replaced GetLastError with SErrGetLastError
* Members of TMPQHash have now the same names like in Blizzard sources
* Fixed bug in SFileRenameFile that falsely reported an existing file if it had different locale.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/SFileGetFileInfo.cpp b/src/SFileGetFileInfo.cpp
index 1746fa0..3c05e13 100644
--- a/src/SFileGetFileInfo.cpp
+++ b/src/SFileGetFileInfo.cpp
@@ -44,7 +44,7 @@ static DWORD GetMpqFileCount(TMPQArchive * ha)
 

 static bool GetInfo_ReturnError(DWORD dwErrCode)

 {

-    SetLastError(dwErrCode);

+    SErrSetLastError(dwErrCode);

     return false;

 }

 

@@ -411,12 +411,12 @@ bool WINAPI SFileGetFileInfo(
         case SFileInfoNameHash1:

             if(hf->pHashEntry == NULL)

                 return GetInfo_ReturnError(ERROR_INVALID_PARAMETER);

-            return GetInfo(pvFileInfo, cbFileInfo, &hf->pHashEntry->dwName1, sizeof(DWORD), pcbLengthNeeded);

+            return GetInfo(pvFileInfo, cbFileInfo, &hf->pHashEntry->dwHashCheck1, sizeof(DWORD), pcbLengthNeeded);

 

         case SFileInfoNameHash2:

             if(hf->pHashEntry == NULL)

                 return GetInfo_ReturnError(ERROR_INVALID_PARAMETER);

-            return GetInfo(pvFileInfo, cbFileInfo, &hf->pHashEntry->dwName2, sizeof(DWORD), pcbLengthNeeded);

+            return GetInfo(pvFileInfo, cbFileInfo, &hf->pHashEntry->dwHashCheck2, sizeof(DWORD), pcbLengthNeeded);

 

         case SFileInfoNameHash3:

             return GetInfo(pvFileInfo, cbFileInfo, &pFileEntry->FileNameHash, sizeof(ULONGLONG), pcbLengthNeeded);

@@ -483,7 +483,7 @@ bool WINAPI SFileFreeFileInfo(void * pvFileInfo, SFileInfoClass InfoClass)
             break;

     }

 

-    SetLastError(ERROR_INVALID_PARAMETER);

+    SErrSetLastError(ERROR_INVALID_PARAMETER);

     return false;

 }

 

@@ -621,7 +621,7 @@ bool WINAPI SFileGetFileName(HANDLE hFile, char * szFileName)
     }

 

     if(dwErrCode != ERROR_SUCCESS)

-        SetLastError(dwErrCode);

+        SErrSetLastError(dwErrCode);

     return (dwErrCode == ERROR_SUCCESS);

 }