Opened 15 years ago

Closed 15 years ago

Last modified 11 months ago

#8374 closed patch

removing ZLIB_WINAPI from scummsys.h

Reported by: SF/h00ligan Owned by: SF/h00ligan
Priority: normal Component: --Other--
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)

Scummsys.patch (483 bytes ) - added by SF/h00ligan 15 years ago.
Scummsys.patch

Download all attachments as: .zip

Change History (18)

by SF/h00ligan, 15 years ago

Attachment: Scummsys.patch added

Scummsys.patch

comment:1 by fingolfin, 15 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 fingolfin, 15 years ago

Owner: set to Kirben

comment:3 by Kirben, 15 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 Kirben, 15 years ago

Owner: changed from Kirben to aquadran

comment:5 by aquadran, 15 years ago

Resolution: wontfix

comment:6 by aquadran, 15 years ago

it's needed for proper link with zlibwapi.lib.

comment:7 by aquadran, 15 years ago

Status: newclosed

comment:8 by SF/h00ligan, 15 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 aquadran, 15 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 sev-, 15 years ago

Owner: changed from aquadran to SF/h00ligan
Resolution: wontfix
Status: closednew

comment:11 by sev-, 15 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:12 by aquadran, 15 years ago

by mistake ? that static lib is not compatible with msvc 8.

comment:13 by sev-, 15 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 aquadran, 15 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:15 by fingolfin, 15 years ago

Any news on this?

comment:16 by sev-, 15 years ago

Status: newclosed

comment:17 by digitall, 11 months ago

Component: --Other--
Note: See TracTickets for help on using tickets.