From 2c993ec294893af31deed27e5d79610ce71642e1 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 20 Aug 2011 12:10:05 +0200 Subject: [PATCH] w32: Fix qemu_ftruncate64 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 Signed-off-by: Anthony Liguori --- block/raw-win32.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/block/raw-win32.c b/block/raw-win32.c index e47cfe0f4a..b7dd357c6d 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 */