Skip to content

Commit fe50da3

Browse files
ladislav-zezulaladislav-zezula
committed
Dlls updated
1 parent 49ac452 commit fe50da3

12 files changed

Lines changed: 64 additions & 9 deletions

‎src/DllMain.def‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@ EXPORTS
3333
SFileOpenPatchArchive
3434
SFileIsPatchedArchive
3535

36+
SFileOpenFileArchive
3637
SFileOpenFileEx
37-
SFileGetFileSize
38+
SFileGetFileArchive
3839
SFileSetFilePointer
40+
SFileGetFileSize
3941
SFileReadFile
4042
SFileCloseFile
4143

storm_dll/storm.cpp renamed to storm.dll/storm.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,31 @@ BOOL WINAPI SFILE(OpenFile)(LPCSTR lpFileName, HANDLE *hFile)
3838
return FALSE;
3939
}
4040

41-
BOOL WINAPI SFILE(OpenFileEx)(HANDLE hMPQ, LPCSTR lpFileName, DWORD dwSearchScope, HANDLE *hFile)
41+
BOOL WINAPI SFILE(OpenFileArchive)(HANDLE hParentMPQ, char * szFileName, DWORD dwPriority, DWORD dwFlags, HANDLE * hMPQ)
4242
{
4343
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
4444
return FALSE;
4545
}
4646

47-
BOOL WINAPI SFILE(CloseFile)(HANDLE hFile)
47+
BOOL WINAPI SFILE(OpenFileEx)(HANDLE hMPQ, LPCSTR lpFileName, DWORD dwSearchScope, HANDLE *hFile)
4848
{
4949
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
5050
return FALSE;
5151
}
5252

53-
BOOL WINAPI SFILE(GetFileArchive)(HANDLE hFile, HANDLE * hMPQ)
53+
BOOL WINAPI SFILE(CloseFile)(HANDLE hFile)
5454
{
5555
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
5656
return FALSE;
5757
}
5858

59-
DWORD WINAPI SFILE(GetFileSize)(HANDLE hFile, LPDWORD lpFileSizeHigh)
59+
BOOL WINAPI SFILE(GetFileArchive)(HANDLE hFile, HANDLE * hMPQ)
6060
{
6161
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
6262
return FALSE;
6363
}
6464

65-
BOOL WINAPI SFILE(GetFileArchive)(HANDLE hFile, HANDLE *hMPQ)
65+
DWORD WINAPI SFILE(GetFileSize)(HANDLE hFile, LPDWORD lpFileSizeHigh)
6666
{
6767
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
6868
return FALSE;
@@ -110,6 +110,12 @@ BOOL WINAPI SFILE(Destroy)()
110110
return FALSE;
111111
}
112112

113+
BOOL WINAPI SERR(SetLastError)()
114+
{
115+
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
116+
return FALSE;
117+
}
118+
113119
BOOL WINAPI SCOMP(Compress)(char * pbOutBuffer, int * pdwOutLength, char * pbInBuffer, int dwInLength, int uCmp, int uCmpType, int nCmpLevel)
114120
{
115121
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

storm_dll/storm.def renamed to storm.dll/storm.def

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ EXPORTS
1717
StormGetBasePath @273 ; 0x111
1818
StormGetArchiveName @275 ; 0x113
1919
StormGetFileName @276 ; 0x114
20-
21-
; StormSetLastError @465 ; 0x1d1
22-
20+
StormOpenFileArchive @293 ; 0x125
21+
StormSetLastError @465 ; 0x1d1
2322
StormCompress @551 ; 0x227
2423
StormDecompress @552 ; 0x228

‎storm.dll/storm.dll‎

326 KB
Binary file not shown.

storm_dll/storm.h renamed to storm.dll/storm.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@
2222
// Sometimes is necessary to change the function names so they
2323
// will not conflict with other MPQ tools.
2424
#ifdef STORM_ALTERNATE_NAMES
25+
#define SERR(Name) Storm##Name
2526
#define SFILE(Name) Storm##Name
2627
#define SMEM(Name) Storm##Name
2728
#define SCOMP(Name) Storm##Name
2829
#else
30+
#define SERR(Name) SErr##Name
2931
#define SFILE(Name) SFile##Name
3032
#define SMEM(Name) SMem##Name
3133
#define SCOMP(Name) SComp##Name
@@ -56,6 +58,9 @@ BOOL WINAPI SFILE(SetBasePath)(LPCSTR lpNewBasePath);
5658
BOOL WINAPI SMEM(UTF8ToFileName)(LPTSTR szBuffer, size_t ccBuffer, const void * lpString, const void * lpStringEnd, DWORD dwFlags, size_t * pOutLength);
5759
BOOL WINAPI SMEM(FileNameToUTF8)(void * lpBuffer, size_t ccBuffer, const TCHAR * szString, const TCHAR * szStringEnd, DWORD dwFlags, size_t * pOutLength);
5860

61+
// SetLastError
62+
DWORD WINAPI SERR(SetLastError)(DWORD dwErrCode);
63+
5964
// Storm (de)compression functions
6065
BOOL WINAPI SCOMP(Compress) (char * pbOutBuffer, int * pdwOutLength, char * pbInBuffer, int dwInLength, int uCmp, int uCmpType, int nCmpLevel);
6166
BOOL WINAPI SCOMP(Decompress)(char * pbOutBuffer, int * pdwOutLength, char * pbInBuffer, int dwInLength);

‎storm.dll/storm.lib‎

5.68 KB
Binary file not shown.

‎storm.dll/storm.sln‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.31911.196
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "storm", "storm.vcxproj", "{BD600973-C6FA-4CE3-8821-67F6418B7F9C}"
6+
EndProject
7+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "storm_test", "storm_test.vcxproj", "{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}"
8+
ProjectSection(ProjectDependencies) = postProject
9+
{BD600973-C6FA-4CE3-8821-67F6418B7F9C} = {BD600973-C6FA-4CE3-8821-67F6418B7F9C}
10+
EndProjectSection
11+
EndProject
12+
Global
13+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
14+
Debug|Win32 = Debug|Win32
15+
Debug|x64 = Debug|x64
16+
Release|Win32 = Release|Win32
17+
Release|x64 = Release|x64
18+
EndGlobalSection
19+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20+
{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Debug|Win32.ActiveCfg = Debug|Win32
21+
{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Debug|Win32.Build.0 = Debug|Win32
22+
{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Debug|x64.ActiveCfg = Debug|x64
23+
{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Debug|x64.Build.0 = Debug|x64
24+
{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Release|Win32.ActiveCfg = Release|Win32
25+
{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Release|Win32.Build.0 = Release|Win32
26+
{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Release|x64.ActiveCfg = Release|x64
27+
{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Release|x64.Build.0 = Release|x64
28+
{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Debug|Win32.ActiveCfg = Debug|Win32
29+
{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Debug|Win32.Build.0 = Debug|Win32
30+
{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Debug|x64.ActiveCfg = Debug|x64
31+
{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Debug|x64.Build.0 = Debug|x64
32+
{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Release|Win32.ActiveCfg = Release|Win32
33+
{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Release|Win32.Build.0 = Release|Win32
34+
{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Release|x64.ActiveCfg = Release|x64
35+
{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Release|x64.Build.0 = Release|x64
36+
EndGlobalSection
37+
GlobalSection(SolutionProperties) = preSolution
38+
HideSolutionNode = FALSE
39+
EndGlobalSection
40+
GlobalSection(ExtensibilityGlobals) = postSolution
41+
SolutionGuid = {ADD59899-BF23-49D6-9CAA-479813B6604A}
42+
EndGlobalSection
43+
EndGlobal

storm_dll/storm.vcxproj renamed to storm.dll/storm.vcxproj

File renamed without changes.

storm_dll/storm.vcxproj.filters renamed to storm.dll/storm.vcxproj.filters

File renamed without changes.

storm_dll/storm_test.cpp renamed to storm.dll/storm_test.cpp

File renamed without changes.

0 commit comments

Comments
 (0)