Marcus Meissner : version: LZCopy return value is LONG.
Alexandre Julliard
julliard at winehq.org
Mon Mar 24 07:55:15 CDT 2008
Module: wine
Branch: master
Commit: 0aecedf281a850b9886e7a7836dddde2e2206e5d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aecedf281a850b9886e7a7836dddde2e2206e5d
Author: Marcus Meissner <marcus at jet.franken.de>
Date: Mon Mar 24 12:37:33 2008 +0100
version: LZCopy return value is LONG.
---
dlls/version/install.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/dlls/version/install.c b/dlls/version/install.c
index 5ff25e7..d3170e3 100644
--- a/dlls/version/install.c
+++ b/dlls/version/install.c
@@ -367,7 +367,8 @@ DWORD WINAPI VerInstallFileA(
LPCSTR pdest;
char destfn[260],tmpfn[260],srcfn[260];
HFILE hfsrc,hfdst;
- DWORD attr,ret,xret,tmplast;
+ DWORD attr,xret,tmplast;
+ LONG ret;
LPBYTE buf1,buf2;
OFSTRUCT ofs;
@@ -419,30 +420,31 @@ DWORD WINAPI VerInstallFileA(
}
ret = LZCopy(hfsrc,hfdst);
_lclose(hfdst);
- if (((LONG)ret) < 0) {
+ if (ret < 0) {
/* translate LZ errors into VIF_xxx */
switch (ret) {
case LZERROR_BADINHANDLE:
case LZERROR_READ:
case LZERROR_BADVALUE:
case LZERROR_UNKNOWNALG:
- ret = VIF_CANNOTREADSRC;
+ xret = VIF_CANNOTREADSRC;
break;
case LZERROR_BADOUTHANDLE:
case LZERROR_WRITE:
- ret = VIF_OUTOFSPACE;
+ xret = VIF_OUTOFSPACE;
break;
case LZERROR_GLOBALLOC:
case LZERROR_GLOBLOCK:
- ret = VIF_OUTOFMEMORY;
+ xret = VIF_OUTOFMEMORY;
break;
default: /* unknown error, should not happen */
- ret = 0;
+ FIXME("Unknown LZCopy error %d, ignoring.\n", ret);
+ xret = 0;
break;
}
- if (ret) {
+ if (xret) {
LZClose(hfsrc);
- return ret;
+ return xret;
}
}
}
More information about the wine-cvs
mailing list