From patchwork Sat Aug 20 10:10:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 110762 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ABDE0B6F64 for ; Sat, 20 Aug 2011 20:10:30 +1000 (EST) Received: from localhost ([::1]:44971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QuiVQ-0004qs-8H for incoming@patchwork.ozlabs.org; Sat, 20 Aug 2011 06:10:20 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36631) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QuiVK-0004qi-M9 for qemu-devel@nongnu.org; Sat, 20 Aug 2011 06:10:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QuiVJ-0003VZ-IW for qemu-devel@nongnu.org; Sat, 20 Aug 2011 06:10:14 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:38522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QuiVJ-0003VH-Cq for qemu-devel@nongnu.org; Sat, 20 Aug 2011 06:10:13 -0400 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by v220110690675601.yourvserver.net (Postfix) with ESMTP id 3323F7283017; Sat, 20 Aug 2011 12:10:11 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from v220110690675601.yourvserver.net ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Fh9J7Moduq5F; Sat, 20 Aug 2011 12:10:10 +0200 (CEST) Received: by v220110690675601.yourvserver.net (Postfix, from userid 1000) id AFD5F7283018; Sat, 20 Aug 2011 12:10:10 +0200 (CEST) From: Stefan Weil To: qemu-devel@nongnu.org Date: Sat, 20 Aug 2011 12:10:05 +0200 Message-Id: <1313835005-32480-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <4E4F756C.3060907@mail.berlios.de> References: <4E4F756C.3060907@mail.berlios.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 78.47.199.172 Subject: [Qemu-devel] [PATCH] w32: Fix qemu_ftruncate64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org SetFilePointer returns INVALID_SET_FILE_POINTER when it fails. In addition, GetLastError must be checked. The first call of SetFilePointer did not use INVALID_SET_FILE_POINTER, the second call used wrong error handling. Signed-off-by: Stefan Weil --- block/raw-win32.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/block/raw-win32.c b/block/raw-win32.c index e47cfe0..b7dd357 100644 --- a/block/raw-win32.c +++ b/block/raw-win32.c @@ -41,6 +41,7 @@ typedef struct BDRVRawState { int qemu_ftruncate64(int fd, int64_t length) { LARGE_INTEGER li; + DWORD dw; LONG high; HANDLE h; BOOL res; @@ -53,12 +54,15 @@ int qemu_ftruncate64(int fd, int64_t length) /* get current position, ftruncate do not change position */ li.HighPart = 0; li.LowPart = SetFilePointer (h, 0, &li.HighPart, FILE_CURRENT); - if (li.LowPart == 0xffffffffUL && GetLastError() != NO_ERROR) + if (li.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) { return -1; + } high = length >> 32; - if (!SetFilePointer(h, (DWORD) length, &high, FILE_BEGIN)) + dw = SetFilePointer(h, (DWORD) length, &high, FILE_BEGIN); + if (dw == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) { return -1; + } res = SetEndOfFile(h); /* back to old position */