#8374 closed patch
removing ZLIB_WINAPI from scummsys.h
| Reported by: | SF/h00ligan | Owned by: | SF/h00ligan |
|---|---|---|---|
| Priority: | normal | Component: | --Other-- |
| Version: | Keywords: | ||
| Cc: | Game: |
Description
official zlib1.dll uses CDECL as calling convetion. %zlibdir%\win32\Makefile.* makes libs(static or shared) with exactly this calling rules.
ZLIB_WINAPI macro needs only than you want to build VisualBasic compatible ZLIBWAPI.DLL with WINAPI(STDCALL) calling convetion.
(all this you can read from DLL_FAQ.txt of zlib source distrs)
Ticket imported from: #1082774. Ticket imported from: patches/479.
Attachments (1)
Change History (18)
by , 20 years ago
| Attachment: | Scummsys.patch added |
|---|
comment:1 by , 20 years ago
Kirben, can you take a look at this and determine whether it's valid (and check it in if it is) ?
comment:2 by , 20 years ago
| Owner: | set to |
|---|
comment:3 by , 20 years ago
The patch alters the Microsoft Visual C++ section of common/scummsys.h. But I don't use Microsoft Visual C++, maybe aquadran can help.
comment:4 by , 20 years ago
| Owner: | changed from to |
|---|
comment:5 by , 20 years ago
| Resolution: | → wontfix |
|---|
comment:7 by , 20 years ago
| Status: | new → closed |
|---|
comment:8 by , 20 years ago
ZLIBWAPI.DLL is not a official ZLIB library (read dll_faq.txt from zlib sources) - it only needs for VB - ordinary languages should't use it. The official library is zlib1.dll and ZLIB_WINAPI is crutch for Visual Basic users - why should we use it? May ZLIB_WINAPI definintion be moved to project preprocessor definintions(such USE_ZLIB) ?
comment:9 by , 20 years ago
feel free to maintanance msvc support. do what you wish to do with that, i don't really care anymore.
comment:10 by , 20 years ago
| Owner: | changed from to |
|---|---|
| Resolution: | wontfix |
| Status: | closed → new |
comment:11 by , 20 years ago
I'm reopening it. It really was added by mistake. We should link against libz.lib, not zlibwapi.dll.
So proper fix would be to both remove ZLIB_WINAPI define and switch to libz.lib
comment:13 by , 20 years ago
if you mean libz.dll, then I myself tried it under msvc 8. That was that version which you sent me.
comment:14 by , 20 years ago
libz.dll is dynamic and i don't know what version i sent you, it was 3 versions in mean time. try use current binary package of zlib.
comment:16 by , 20 years ago
| Status: | new → closed |
|---|
comment:17 by , 6 years ago
| Component: | → --Other-- |
|---|
Scummsys.patch