Author: hbelusca Date: Fri Jul 14 01:39:47 2017 New Revision: 75338
URL: http://svn.reactos.org/svn/reactos?rev=75338&view=rev Log: And sync my branch too, to trunk r75337. Now compilation works again.
Modified: branches/setup_improvements/ (props changed) branches/setup_improvements/win32ss/gdi/eng/pathobj.c
Propchange: branches/setup_improvements/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 14 01:39:47 2017 @@ -23,4 +23,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:74526-75335 +/trunk/reactos:74526-75337
Modified: branches/setup_improvements/win32ss/gdi/eng/pathobj.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/e... ============================================================================== --- branches/setup_improvements/win32ss/gdi/eng/pathobj.c [iso-8859-1] (original) +++ branches/setup_improvements/win32ss/gdi/eng/pathobj.c [iso-8859-1] Fri Jul 14 01:39:47 2017 @@ -264,7 +264,7 @@ } else { - /* concatnate ppdLast->pd.pptfx and pptfx */ + /* concatenate ppdLast->pd.pptfx and pptfx */ size = (ppdLast->pd.count + cptfx) * sizeof(POINTFIX); pptfxNew = ExAllocatePoolWithTag(PagedPool, size, GDITAG_PATHOBJ); if (pptfxNew == NULL) @@ -276,7 +276,7 @@ RtlCopyMemory(&pptfxNew[ppdLast->pd.count], pptfx, size);
pptfxOld = ppdLast->pd.pptfx; - ppd->pd.pptfx = pptfxNew; + ppdLast->pd.pptfx = pptfxNew; ExFreePoolWithTag(pptfxOld, GDITAG_PATHOBJ); }
@@ -293,8 +293,8 @@ IN POINTFIX *pptfx, IN ULONG cptfx) { + PEXTPATHOBJ pPathObj; PEXTPATHDATA ppd, ppdLast; - PEXTPATHOBJ pPathObj; PPOINTFIX pptfxNew, pptfxOld; ULONG size;
@@ -360,7 +360,7 @@ } else { - /* concatnate ppdLast->pd.pptfx and pptfx */ + /* concatenate ppdLast->pd.pptfx and pptfx */ size = (ppdLast->pd.count + cptfx) * sizeof(POINTFIX); pptfxNew = ExAllocatePoolWithTag(PagedPool, size, GDITAG_PATHOBJ); if (pptfxNew == NULL) @@ -372,7 +372,7 @@ RtlCopyMemory(&pptfxNew[ppdLast->pd.count], pptfx, size);
pptfxOld = ppdLast->pd.pptfx; - ppd->pd.pptfx = pptfxNew; + ppdLast->pd.pptfx = pptfxNew; ExFreePoolWithTag(pptfxOld, GDITAG_PATHOBJ); }