From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MtQmH-0003wX-Bl for qemu-devel@nongnu.org; Thu, 01 Oct 2009 14:53:21 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MtQmC-0003qX-Lx for qemu-devel@nongnu.org; Thu, 01 Oct 2009 14:53:20 -0400 Received: from [199.232.76.173] (port=40713 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtQmC-0003qD-Et for qemu-devel@nongnu.org; Thu, 01 Oct 2009 14:53:16 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:63950) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MtQmB-0003rK-PF for qemu-devel@nongnu.org; Thu, 01 Oct 2009 14:53:16 -0400 From: Stefan Weil Date: Thu, 1 Oct 2009 20:53:12 +0200 Message-Id: <1254423192-3064-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH] Win32: Fix vnc support. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Without this patch, qemu on windows crashes as soon as a vnc client connects. Signed-off-by: Stefan Weil --- vnc.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/vnc.c b/vnc.c index 42c92ed..01e8e93 100644 --- a/vnc.c +++ b/vnc.c @@ -538,6 +538,25 @@ static void send_framebuffer_update_hextile(VncState *vs, int x, int y, int w, i } +#define ZALLOC_ALIGNMENT 16 + +static void *zalloc(void *x, unsigned items, unsigned size) +{ + void *p; + + size *= items; + size = (size + ZALLOC_ALIGNMENT - 1) & ~(ZALLOC_ALIGNMENT - 1); + + p = qemu_mallocz(size); + + return (p); +} + +static void zfree(void *x, void *addr) +{ + qemu_free(addr); +} + static void vnc_zlib_init(VncState *vs) { int i; @@ -572,8 +591,8 @@ static int vnc_zlib_stop(VncState *vs, int stream_id) VNC_DEBUG("VNC: initializing zlib stream %d\n", stream_id); VNC_DEBUG("VNC: opaque = %p | vs = %p\n", zstream->opaque, vs); - zstream->zalloc = Z_NULL; - zstream->zfree = Z_NULL; + zstream->zalloc = zalloc; + zstream->zfree = zfree; err = deflateInit2(zstream, vs->tight_compression, Z_DEFLATED, MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY); -- 1.5.6.5