Deleted: trunk/reactos/lib/cabinet/Makefile.in
Deleted: trunk/reactos/lib/cabinet/Makefile.ros-template
Modified: trunk/reactos/lib/cabinet/cabextract.c
Modified: trunk/reactos/lib/cabinet/cabinet_main.c
--- trunk/reactos/lib/cabinet/Makefile.in 2005-05-28 23:26:37 UTC (rev 15645)
+++ trunk/reactos/lib/cabinet/Makefile.in 2005-05-28 23:34:24 UTC (rev 15646)
@@ -1,19 +0,0 @@
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = cabinet.dll
-IMPORTLIB = libcabinet.$(IMPLIBEXT)
-IMPORTS = kernel32
-
-C_SRCS = \
- cabextract.c \
- cabinet_main.c \
- fci.c \
- fdi.c
-
-RC_SRCS = cabinet.rc
-
-@MAKE_DLL_RULES@
-
-### Dependencies:
--- trunk/reactos/lib/cabinet/Makefile.ros-template 2005-05-28 23:26:37 UTC (rev 15645)
+++ trunk/reactos/lib/cabinet/Makefile.ros-template 2005-05-28 23:34:24 UTC (rev 15646)
@@ -1,21 +0,0 @@
-# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $
-
-TARGET_NAME = cabinet
-
-TARGET_OBJECTS = @C_SRCS@
-
-TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
-
-TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a
-
-TARGET_BASE = $(TARGET_BASE_LIB_CABINET)
-
-TARGET_RC_SRCS = @RC_SRCS@
-TARGET_RC_BINSRC = @RC_BINSRC@
-TARGET_RC_BINARIES = @RC_BINARIES@
-
-default: all
-
-DEP_OBJECTS = $(TARGET_OBJECTS)
-
-include $(TOOLS_PATH)/depend.mk
--- trunk/reactos/lib/cabinet/cabextract.c 2005-05-28 23:26:37 UTC (rev 15645)
+++ trunk/reactos/lib/cabinet/cabextract.c 2005-05-28 23:34:24 UTC (rev 15646)
@@ -2523,9 +2523,13 @@
* print_fileinfo (internal)
*/
void print_fileinfo(struct cab_file *fi) {
- int d = fi->date, t = fi->time;
+ int d;
+ int t;
char *fname = NULL;
+ d = fi->date;
+ t = fi->time;
+
if (fi->attribs & cffile_A_NAME_IS_UTF) {
fname = malloc(strlen(fi->filename) + 1);
if (fname) {
--- trunk/reactos/lib/cabinet/cabinet_main.c 2005-05-28 23:26:37 UTC (rev 15645)
+++ trunk/reactos/lib/cabinet/cabinet_main.c 2005-05-28 23:34:24 UTC (rev 15646)
@@ -94,9 +94,10 @@
#define DUMPH(idx) idx >= sizeof(EXTRACTdest) ? 0x55 : ptr[idx]
LPSTR dir;
- unsigned char *ptr = (unsigned char*) dest;
+ unsigned char *ptr;
unsigned int i;
+ ptr = ((unsigned char*) dest);
TRACE("(dest == %0lx, what == %s)\n", (long) dest, debugstr_a(what));
if (!dest) {