Ros-diffs

ros-diffs@reactos.org

81390 discussions

Start a nNew thread

Integrated change by chorns in revision 12444
by chorns＠svn.reactos.com 31 Dec '04

31 Dec '04

Remove no-windres-workaround branch. Deleted: branches/no-windres-workaround/

1 0

Integrated change by chorns in revision 12443
by chorns＠svn.reactos.com 31 Dec '04

31 Dec '04

Remove mpw branch. Deleted: branches/mpw/

1 0

Integrated change by chorns in revision 12442
by chorns＠svn.reactos.com 31 Dec '04

31 Dec '04

Remove mingw32 branch. Deleted: branches/mingw32/

1 0

Integrated change by chorns in revision 12441
by chorns＠svn.reactos.com 31 Dec '04

31 Dec '04

Remove keyboard_heavy_lifting branch. Deleted: branches/keyboard_heavy_lifting/

1 0

Integrated change by gvg in revision 12440
by gvg＠svn.reactos.com 31 Dec '04

31 Dec '04

Add back missing files Added: trunk/reactos/lib/cabinet/Makefile Added: trunk/reactos/lib/cabinet/Makefile.ros-template _____ Added: trunk/reactos/lib/cabinet/Makefile --- trunk/reactos/lib/cabinet/Makefile 2004-12-31 14:03:16 UTC (rev 12439) +++ trunk/reactos/lib/cabinet/Makefile 2004-12-31 14:03:51 UTC (rev 12440) @@ -0,0 +1,9 @@ +# $Id: Makefile 7618 2004-01-14 01:47:46Z sedwards $ + +PATH_TO_TOP = ../.. + +TARGET_TYPE = winedll + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk _____ Added: trunk/reactos/lib/cabinet/Makefile.ros-template --- trunk/reactos/lib/cabinet/Makefile.ros-template 2004-12-31 14:03:16 UTC (rev 12439) +++ trunk/reactos/lib/cabinet/Makefile.ros-template 2004-12-31 14:03:51 UTC (rev 12440) @@ -0,0 +1,21 @@ +# $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

1 0

Integrated change by chorns in revision 12439
by chorns＠svn.reactos.com 31 Dec '04

31 Dec '04

Remove iphlpapi_wine_20040209 branch. Deleted: branches/iphlpapi_wine_20040209/

1 0

Integrated change by chorns in revision 12438
by chorns＠svn.reactos.com 31 Dec '04

31 Dec '04

Remove joliet_20040527 branch. Deleted: branches/joliet_20040527/

1 0

Integrated change by chorns in revision 12437
by chorns＠svn.reactos.com 31 Dec '04

31 Dec '04

Remove arty_afd_20040709 branch. Deleted: branches/arty_afd_20040709/

1 0

Integrated change by gvg in revision 12436
by gvg＠svn.reactos.com 31 Dec '04

31 Dec '04

Merge Wine-20041201 Added: trunk/reactos/lib/cabinet/ Modified: trunk/reactos/lib/cabinet/cabextract.c Modified: trunk/reactos/lib/cabinet/fdi.c _____ Copied: trunk/reactos/lib/cabinet (from rev 12433, vendor/wine/dlls/cabinet/current) _____ Modified: trunk/reactos/lib/cabinet/cabextract.c --- vendor/wine/dlls/cabinet/current/cabextract.c 2004-12-31 13:58:48 UTC (rev 12433) +++ trunk/reactos/lib/cabinet/cabextract.c 2004-12-31 14:01:01 UTC (rev 12436) @@ -2515,7 +2515,7 @@ cabname = (fi->folder->cab[0]->filename); } - ERR(errmsg, cabname); + ERR((char *)errmsg, cabname); } } _____ Modified: trunk/reactos/lib/cabinet/fdi.c --- vendor/wine/dlls/cabinet/current/fdi.c 2004-12-31 13:58:48 UTC (rev 12433) +++ trunk/reactos/lib/cabinet/fdi.c 2004-12-31 14:01:01 UTC (rev 12436) @@ -2696,14 +2696,20 @@ } /* free decompression temps */ - if (LZX(window)) { - PFDI_FREE(hfdi, LZX(window)); - LZX(window) = NULL; + switch (fol->comp_type & cffoldCOMPTYPE_MASK) { + case cffoldCOMPTYPE_LZX: + if (LZX(window)) { + PFDI_FREE(hfdi, LZX(window)); + LZX(window) = NULL; + } + break; + case cffoldCOMPTYPE_QUANTUM: + if (QTM(window)) { + PFDI_FREE(hfdi, QTM(window)); + QTM(window) = NULL; + } + break; } - if (QTM(window)) { - PFDI_FREE(hfdi, QTM(window)); - QTM(window) = NULL; - } while (decomp_state) { fdi_decomp_state *prev_fds; @@ -2738,14 +2744,20 @@ bail_and_fail: /* here we free ram before error returns */ /* free decompression temps */ - if (LZX(window)) { - PFDI_FREE(hfdi, LZX(window)); - LZX(window) = NULL; + switch (fol->comp_type & cffoldCOMPTYPE_MASK) { + case cffoldCOMPTYPE_LZX: + if (LZX(window)) { + PFDI_FREE(hfdi, LZX(window)); + LZX(window) = NULL; + } + break; + case cffoldCOMPTYPE_QUANTUM: + if (QTM(window)) { + PFDI_FREE(hfdi, QTM(window)); + QTM(window) = NULL; + } + break; } - if (QTM(window)) { - PFDI_FREE(hfdi, QTM(window)); - QTM(window) = NULL; - } while (decomp_state) { fdi_decomp_state *prev_fds;

1 0

Integrated change by chorns in revision 12435
by chorns＠svn.reactos.com 31 Dec '04

31 Dec '04

Remove arty_20040329 branch. Deleted: branches/arty_20040329/

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs