Ros-diffs August 2017

ros-diffs@reactos.org

22 participants
262 discussions

[tkreuzer] 75566: [WIN32K] - Refactor GreExtTextOutW to use a single exit path instead of 3 - Call MouseSafetyOnDraw* only for direct DCs

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Aug 16 13:37:15 2017 New Revision: 75566 URL: http://svn.reactos.org/svn/reactos?rev=75566&view=rev Log: [WIN32K] - Refactor GreExtTextOutW to use a single exit path instead of 3 - Call MouseSafetyOnDraw* only for direct DCs Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Wed Aug 16 13:37:15 2017 @@ -5102,6 +5102,14 @@ LOGFONTW *plf; BOOL EmuBold, EmuItalic; int thickness; + BOOL bResult; + + /* Check if String is valid */ + if ((Count > 0xFFFF) || (Count > 0 && String == NULL)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } // TODO: Write test-cases to exactly match real Windows in different // bad parameters (e.g. does Windows check the DC or the RECT first?). @@ -5112,42 +5120,30 @@ return FALSE; } - pdcattr = dc->pdcattr; - - if ((fuOptions & ETO_OPAQUE) || pdcattr->jBkMode == OPAQUE) - { - if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) - DC_vUpdateBackgroundBrush(dc); - } - - /* Check if String is valid */ - if ((Count > 0xFFFF) || (Count > 0 && String == NULL)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - goto fail; - } - - DxShift = fuOptions & ETO_PDY ? 1 : 0; - if (PATH_IsPathOpen(dc->dclevel)) { - if (!PATH_ExtTextOut( dc, + bResult = PATH_ExtTextOut(dc, XStart, YStart, fuOptions, (const RECTL *)lprc, String, Count, - (const INT *)Dx)) goto fail; - goto good; - } + (const INT *)Dx); + DC_UnlockDc(dc); + return bResult; + } + + DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); if (!dc->dclevel.pSurface) { /* Memory DC with no surface selected */ - DC_UnlockDc(dc); - return TRUE; - } + bResult = FALSE; // TRUE? + goto Cleanup; + } + + pdcattr = dc->pdcattr; if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) { @@ -5191,10 +5187,10 @@ IntUpdateBoundsRect(dc, &DestRect); } - DC_vPrepareDCsForBlit(dc, &DestRect, NULL, NULL); - if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) DC_vUpdateBackgroundBrush(dc); + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); psurf = dc->dclevel.pSurface; IntEngBitBlt( @@ -5209,8 +5205,11 @@ &dc->eboBackground.BrushObject, &BrushOrigin, ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY)); + + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawEnd(dc->ppdev); + fuOptions &= ~ETO_OPAQUE; - DC_vFinishBlit(dc, NULL); } else { @@ -5223,7 +5222,8 @@ TextObj = RealizeFontInit(pdcattr->hlfntNew); if (TextObj == NULL) { - goto fail; + bResult = FALSE; + goto Cleanup; } FontObj = TextObj->Font; @@ -5247,7 +5247,8 @@ if (!TextIntUpdateSize(dc, TextObj, FontGDI, FALSE)) { IntUnLockFreeType; - goto fail; + bResult = FALSE; + goto Cleanup; } if (dc->pdcattr->iGraphicsMode == GM_ADVANCED) @@ -5284,7 +5285,7 @@ /* * Process the horizontal alignment and modify XStart accordingly. */ - + DxShift = fuOptions & ETO_PDY ? 1 : 0; if (pdcattr->lTextAlign & (TA_RIGHT | TA_CENTER)) { ULONGLONG TextWidth = 0; @@ -5348,7 +5349,7 @@ { DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); IntUnLockFreeType; - goto fail; + goto Cleanup; } } @@ -5384,14 +5385,8 @@ } } - /* Lock blit with a dummy rect */ - DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); - psurf = dc->dclevel.pSurface; SurfObj = &psurf->SurfObj ; - - EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, psurf->ppal, 0, 0, 0); - EXLATEOBJ_vInitialize(&exloDst2RGB, psurf->ppal, &gpalRGB, 0, 0, 0); if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND)) DC_vUpdateBackgroundBrush(dc) ; @@ -5429,8 +5424,7 @@ { DPRINT1("Failed to load and render glyph! [index: %d]\n", glyph_index); IntUnLockFreeType; - DC_vFinishBlit(dc, NULL); - goto fail2; + goto Cleanup; // FIXME } glyph = face->glyph; @@ -5443,8 +5437,7 @@ { DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); IntUnLockFreeType; - DC_vFinishBlit(dc, NULL); - goto fail2; + goto Cleanup; // FIXME } /* retrieve kerning distance and move pen position */ @@ -5525,6 +5518,12 @@ } } + EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, psurf->ppal, 0, 0, 0); + EXLATEOBJ_vInitialize(&exloDst2RGB, psurf->ppal, &gpalRGB, 0, 0, 0); + + /* Assume success */ + bResult = TRUE; + /* * The main rendering loop. */ @@ -5549,9 +5548,8 @@ if (error) { DPRINT1("Failed to load and render glyph! [index: %d]\n", glyph_index); - IntUnLockFreeType; - DC_vFinishBlit(dc, NULL); - goto fail2; + bResult = FALSE; + break; } glyph = face->glyph; @@ -5575,9 +5573,8 @@ if (!realglyph) { DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); - IntUnLockFreeType; - DC_vFinishBlit(dc, NULL); - goto fail2; + bResult = FALSE; + break; } } @@ -5598,7 +5595,9 @@ DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6; DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6); DestRect.bottom = TextTop + yoff + ((32 - fixDescender) >> 6); - MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); + + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) { IntUpdateBoundsRect(dc, &DestRect); @@ -5615,7 +5614,10 @@ &dc->eboBackground.BrushObject, &BrushOrigin, ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY)); - MouseSafetyOnDrawEnd(dc->ppdev); + + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawEnd(dc->ppdev); + BackgroundLeft = DestRect.right; } @@ -5644,18 +5646,16 @@ { DPRINT1("WARNING: EngCreateBitmap() failed!\n"); // FT_Done_Glyph(realglyph); - IntUnLockFreeType; - DC_vFinishBlit(dc, NULL); - goto fail2; + bResult = FALSE; + break; } SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph); if ( !SourceGlyphSurf ) { EngDeleteSurface((HSURF)HSourceGlyph); DPRINT1("WARNING: EngLockSurface() failed!\n"); - IntUnLockFreeType; - DC_vFinishBlit(dc, NULL); - goto fail2; + bResult = FALSE; + break; } /* @@ -5676,7 +5676,10 @@ { DestRect.bottom = lprc->bottom + dc->ptlDCOrig.y; } - MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); + + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); + if (!IntEngMaskBlt( SurfObj, SourceGlyphSurf, @@ -5691,7 +5694,8 @@ DPRINT1("Failed to MaskBlt a glyph!\n"); } - MouseSafetyOnDrawEnd(dc->ppdev) ; + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawEnd(dc->ppdev) ; EngUnlockSurface(SourceGlyphSurf); EngDeleteSurface((HSURF)HSourceGlyph); @@ -5782,27 +5786,18 @@ IntUnLockFreeType; - DC_vFinishBlit(dc, NULL) ; - EXLATEOBJ_vCleanup(&exloRGB2Dst); EXLATEOBJ_vCleanup(&exloDst2RGB); + +Cleanup: + DC_vFinishBlit(dc, NULL); + if (TextObj != NULL) TEXTOBJ_UnlockText(TextObj); -good: - DC_UnlockDc( dc ); - - return TRUE; - -fail2: - EXLATEOBJ_vCleanup(&exloRGB2Dst); - EXLATEOBJ_vCleanup(&exloDst2RGB); -fail: - if (TextObj != NULL) - TEXTOBJ_UnlockText(TextObj); DC_UnlockDc(dc); - return FALSE; + return bResult; } #define STACK_TEXT_BUFFER_SIZE 100

7 years, 4 months

[ekohl] 75565: [SETUPAPI] - Implement CMP_GetBlockedDriverInfo. - Make sure that CMP_GetServerSideDeviceInstallFlags and CMP_WaitServicesAvailable can be called on local and remote machines.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Aug 16 11:45:21 2017 New Revision: 75565 URL: http://svn.reactos.org/svn/reactos?rev=75565&view=rev Log: [SETUPAPI] - Implement CMP_GetBlockedDriverInfo. - Make sure that CMP_GetServerSideDeviceInstallFlags and CMP_WaitServicesAvailable can be called on local and remote machines. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Wed Aug 16 11:45:21 2017 @@ -165,6 +165,56 @@ /*********************************************************************** + * CMP_GetBlockedDriverInfo [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CMP_GetBlockedDriverInfo( + _Out_opt_ LPWSTR pszNames, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + ULONG ulTransferLength; + CONFIGRET ret; + + TRACE("CMP_GetBlockedDriverInfo(%p %p %lx %p)\n", + pszNames, pulLength, ulFlags, hMachine); + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + ulTransferLength = *pulLength; + + RpcTryExcept + { + ret = PNP_GetBlockedDriverInfo(BindingHandle, + (PBYTE)pszNames, + &ulTransferLength, + pulLength, + ulFlags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + return ret; +} + + +/*********************************************************************** * CMP_GetServerSideDeviceInstallFlags [SETUPAPI.@] */ CONFIGRET @@ -172,7 +222,7 @@ CMP_GetServerSideDeviceInstallFlags( _Out_ PULONG pulSSDIFlags, _In_ ULONG ulFlags, - _In_ HMACHINE hMachine) + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; @@ -444,7 +494,7 @@ CONFIGRET WINAPI CMP_WaitServicesAvailable( - _In_ HMACHINE hMachine) + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret = CR_SUCCESS; @@ -452,8 +502,17 @@ TRACE("CMP_WaitServicesAvailable(%p)\n", hMachine); - if (!PnpGetLocalHandles(&BindingHandle, NULL)) - return CR_FAILURE; + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } RpcTryExcept { Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Wed Aug 16 11:45:21 2017 @@ -1,5 +1,5 @@ # Functions exported by Win2003 SP1 -@ stub CMP_GetBlockedDriverInfo +@ stdcall CMP_GetBlockedDriverInfo(wstr ptr long ptr) @ stdcall CMP_GetServerSideDeviceInstallFlags(ptr long ptr) @ stdcall CMP_Init_Detection(long) @ stdcall CMP_RegisterNotification(ptr ptr long ptr)

7 years, 4 months

[cfinck] 75564: [FREELDR] Lower MAX_DISKREADBUFFER_SIZE to let INT 13h, AH=42h only read a maximum of 127 sectors (instead of 128 previously). This fixes USB booting into the kernel on at least Del...

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Aug 16 10:44:15 2017 New Revision: 75564 URL: http://svn.reactos.org/svn/reactos?rev=75564&view=rev Log: [FREELDR] Lower MAX_DISKREADBUFFER_SIZE to let INT 13h, AH=42h only read a maximum of 127 sectors (instead of 128 previously). This fixes USB booting into the kernel on at least Dell Latitude D531 and Lenovo ThinkPad X61. Now CORE-13184 remains (in a VM and on real hardware, probably related to the CDFS driver) Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Wed Aug 16 10:44:15 2017 @@ -22,7 +22,12 @@ #define BIOSCALLBUFOFFSET HEX(0000) /* Buffer to store temporary data for any Int386() call */ #define BIOSCALLBUFSIZE PAGE_SIZE /* max is sizeof(VESA_SVGA_INFO) = 512 */ #define MAX_FREELDR_PE_SIZE (MEMORY_MARGIN - FREELDR_PE_BASE - PAGE_SIZE) -#define MAX_DISKREADBUFFER_SIZE HEX(10000) + +/* MAX_DISKREADBUFFER_SIZE is later passed to INT 13h, AH=42h. + According to https://en.wikipedia.org/wiki/INT_13H#INT_13h_AH.3D42h:_Extended_Read_Secto… + some BIOSes can only read a maximum of 127 sectors. (0xFE00 / 512 = 127) + Confirmed when booting from USB on Dell Latitude D531 and Lenovo ThinkPad X61. */ +#define MAX_DISKREADBUFFER_SIZE HEX(FE00) /* These addresses specify the realmode "BSS section" layout */ #define BSS_RealModeEntry (BSS_START + 0)

7 years, 4 months

[bfreisen] 75563: [PSDK][GDIPLUS] Forward NULL parameters to wrapped functions instead of blindly dereferencing them when trying to pass a pointee's pointer member to the wrapped function

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Wed Aug 16 09:57:56 2017 New Revision: 75563 URL: http://svn.reactos.org/svn/reactos?rev=75563&view=rev Log: [PSDK][GDIPLUS] Forward NULL parameters to wrapped functions instead of blindly dereferencing them when trying to pass a pointee's pointer member to the wrapped function Modified: trunk/reactos/sdk/include/psdk/gdiplusheaders.h trunk/reactos/sdk/include/psdk/gdiplusmatrix.h Modified: trunk/reactos/sdk/include/psdk/gdiplusheaders.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplushe… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusheaders.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusheaders.h [iso-8859-1] Wed Aug 16 09:57:56 2017 @@ -43,7 +43,7 @@ Image *Clone(VOID) { Image *newImage = new Image(); - SetStatus(DllExports::GdipCloneImage(image, &(newImage->image))); + SetStatus(DllExports::GdipCloneImage(image, newImage ? &newImage->image : NULL)); return newImage; } @@ -139,7 +139,7 @@ Status GetPhysicalDimension(SizeF *size) { - return SetStatus(DllExports::GdipGetImageDimension(image, &size->Width, &size->Height)); + return SetStatus(DllExports::GdipGetImageDimension(image, size ? &size->Width : NULL, size ? &size->Height : NULL)); } PixelFormat GetPixelFormat(VOID) @@ -186,7 +186,7 @@ Image *GetThumbnailImage(UINT thumbWidth, UINT thumbHeight, GetThumbnailImageAbort callback, VOID *callbackData) { Image *thumbImage = new Image(); - SetStatus(DllExports::GdipGetImageThumbnail(image, thumbWidth, thumbHeight, &(thumbImage->image), callback, callbackData)); + SetStatus(DllExports::GdipGetImageThumbnail(image, thumbWidth, thumbHeight, thumbImage ? &thumbImage->image : NULL, callback, callbackData)); return thumbImage; } @@ -238,7 +238,7 @@ Status SaveAdd(Image *newImage, const EncoderParameters *encoderParams) { - return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipSaveAddImage(image, newImage->image, encoderParams)); + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipSaveAddImage(image, newImage ? newImage->image : NULL, encoderParams)); } Status SelectActiveFrame(const GUID *dimensionID, UINT frameIndex) @@ -287,7 +287,7 @@ Bitmap(INT width, INT height, Graphics *target) { - status = DllExports::GdipCreateBitmapFromGraphics(width, height, target->graphics, &bitmap); + status = DllExports::GdipCreateBitmapFromGraphics(width, height, target ? target->graphics : NULL, &bitmap); } Bitmap(const BITMAPINFO *gdiBitmapInfo, VOID *gdiBitmapData) @@ -338,28 +338,28 @@ Bitmap *Clone(const Rect &rect, PixelFormat format) { Bitmap *dstBitmap = new Bitmap(); - SetStatus(DllExports::GdipCloneBitmapAreaI(rect.X, rect.Y, rect.Width, rect.Height, format, bitmap, &(dstBitmap->bitmap))); + SetStatus(DllExports::GdipCloneBitmapAreaI(rect.X, rect.Y, rect.Width, rect.Height, format, bitmap, dstBitmap ? &dstBitmap->bitmap : NULL)); return dstBitmap; } Bitmap *Clone(const RectF &rect, PixelFormat format) { Bitmap *dstBitmap = new Bitmap(); - SetStatus(DllExports::GdipCloneBitmapArea(rect.X, rect.Y, rect.Width, rect.Height, format, bitmap, &(dstBitmap->bitmap))); + SetStatus(DllExports::GdipCloneBitmapArea(rect.X, rect.Y, rect.Width, rect.Height, format, bitmap, dstBitmap ? &dstBitmap->bitmap : NULL)); return dstBitmap; } Bitmap *Clone(REAL x, REAL y, REAL width, REAL height, PixelFormat format) { Bitmap *dstBitmap = new Bitmap(); - SetStatus(DllExports::GdipCloneBitmapArea(x, y, width, height, format, bitmap, &(dstBitmap->bitmap))); + SetStatus(DllExports::GdipCloneBitmapArea(x, y, width, height, format, bitmap, dstBitmap ? &dstBitmap->bitmap : NULL)); return dstBitmap; } Bitmap *Clone(INT x, INT y, INT width, INT height, PixelFormat format) { Bitmap *dstBitmap = new Bitmap(); - SetStatus(DllExports::GdipCloneBitmapAreaI(x, y, width, height, format, bitmap, &(dstBitmap->bitmap))); + SetStatus(DllExports::GdipCloneBitmapAreaI(x, y, width, height, format, bitmap, dstBitmap ? &dstBitmap->bitmap : NULL)); return dstBitmap; } @@ -461,7 +461,7 @@ public: CachedBitmap(Bitmap *bitmap, Graphics *graphics) { - status = DllExports::GdipCreateCachedBitmap(bitmap->bitmap, graphics->graphics, &cachedBitmap); + status = DllExports::GdipCreateCachedBitmap(bitmap->bitmap, graphics ? graphics->graphics : NULL, &cachedBitmap); } Status GetLastStatus(VOID) @@ -515,7 +515,7 @@ FontFamily(const WCHAR *name, const FontCollection *fontCollection) { - status = DllExports::GdipCreateFontFamilyFromName(name, fontCollection->fontCollection, &fontFamily); + status = DllExports::GdipCreateFontFamilyFromName(name, fontCollection ? fontCollection->fontCollection : NULL, &fontFamily); } FontFamily *Clone(VOID) @@ -526,21 +526,21 @@ static const FontFamily *GenericMonospace(VOID) { FontFamily *genericMonospace = new FontFamily(); - genericMonospace->status = DllExports::GdipGetGenericFontFamilyMonospace(&(genericMonospace->fontFamily)); + genericMonospace->status = DllExports::GdipGetGenericFontFamilyMonospace(genericMonospace ? &genericMonospace->fontFamily : NULL); return genericMonospace; } static const FontFamily *GenericSansSerif(VOID) { FontFamily *genericSansSerif = new FontFamily(); - genericSansSerif->status = DllExports::GdipGetGenericFontFamilySansSerif(&(genericSansSerif->fontFamily)); + genericSansSerif->status = DllExports::GdipGetGenericFontFamilySansSerif(genericSansSerif ? &genericSansSerif->fontFamily : NULL); return genericSansSerif; } static const FontFamily *GenericSerif(VOID) { FontFamily *genericSerif = new FontFamily(); - genericSerif->status = DllExports::GdipGetGenericFontFamilyMonospace(&(genericSerif->fontFamily)); + genericSerif->status = DllExports::GdipGetGenericFontFamilyMonospace(genericSerif ? &genericSerif->fontFamily : NULL); return genericSerif; } @@ -674,19 +674,19 @@ Font *Clone(VOID) const { Font *cloneFont = new Font(); - cloneFont->status = DllExports::GdipCloneFont(font, &(cloneFont->font)); + cloneFont->status = DllExports::GdipCloneFont(font, cloneFont ? &cloneFont->font : NULL); return cloneFont; } Status GetFamily(FontFamily* family) const { - return SetStatus(DllExports::GdipGetFamily(font, &(family->fontFamily))); + return SetStatus(DllExports::GdipGetFamily(font, family ? &family->fontFamily : NULL)); } REAL GetHeight(const Graphics* graphics) const { REAL height; - SetStatus(DllExports::GdipGetFontHeight(font, graphics->graphics, &height)); + SetStatus(DllExports::GdipGetFontHeight(font, graphics ? graphics->graphics : NULL, &height)); return height; } @@ -704,12 +704,12 @@ Status GetLogFontA(const Graphics *g, LOGFONTA *logfontA) const { - return SetStatus(DllExports::GdipGetLogFontA(font, g->graphics, logfontA)); + return SetStatus(DllExports::GdipGetLogFontA(font, g ? g->graphics : NULL, logfontA)); } Status GetLogFontW(const Graphics *g, LOGFONTW *logfontW) const { - return SetStatus(DllExports::GdipGetLogFontW(font, g->graphics, logfontW)); + return SetStatus(DllExports::GdipGetLogFontW(font, g ? g->graphics : NULL, logfontW)); } REAL GetSize(VOID) const @@ -797,18 +797,18 @@ Region *Clone(VOID) { Region *cloneRegion = new Region(); - cloneRegion->status = DllExports::GdipCloneRegion(region, &cloneRegion->region); + cloneRegion->status = DllExports::GdipCloneRegion(region, cloneRegion ? &cloneRegion->region : NULL); return cloneRegion; } Status Complement(const GraphicsPath *path) { - return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeComplement)); + return SetStatus(DllExports::GdipCombineRegionPath(region, path ? path->path : NULL, CombineModeComplement)); } Status Complement(const Region *region) { - return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeComplement)); + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region ? region->region : NULL, CombineModeComplement)); } Status Complement(const Rect &rect) @@ -824,13 +824,13 @@ BOOL Equals(const Region *region, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsEqualRegion(this->region, region->region, g->graphics, &result)); + SetStatus(DllExports::GdipIsEqualRegion(this->region, region ? region->region : NULL, g ? g->graphics : NULL, &result)); return result; } Status Exclude(const GraphicsPath *path) { - return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeExclude)); + return SetStatus(DllExports::GdipCombineRegionPath(region, path ? path->path : NULL, CombineModeExclude)); } Status Exclude(const RectF &rect) @@ -845,7 +845,7 @@ Status Exclude(const Region *region) { - return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeExclude)); + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region ? region->region : NULL, CombineModeExclude)); } static Region *FromHRGN(HRGN hRgn) @@ -855,12 +855,12 @@ Status GetBounds(Rect *rect, const Graphics *g) const { - return SetStatus(DllExports::GdipGetRegionBoundsI(region, g->graphics, rect)); + return SetStatus(DllExports::GdipGetRegionBoundsI(region, g ? g->graphics : NULL, rect)); } Status GetBounds(RectF *rect, const Graphics *g) const { - return SetStatus(DllExports::GdipGetRegionBounds(region, g->graphics, rect)); + return SetStatus(DllExports::GdipGetRegionBounds(region, g ? g->graphics : NULL, rect)); } Status GetData(BYTE *buffer, UINT bufferSize, UINT *sizeFilled) const @@ -878,7 +878,7 @@ HRGN GetHRGN(const Graphics *g) const { HRGN hRgn; - SetStatus(DllExports::GdipGetRegionHRgn(region, g->graphics, &hRgn)); + SetStatus(DllExports::GdipGetRegionHRgn(region, g ? g->graphics : NULL, &hRgn)); return hRgn; } @@ -889,18 +889,18 @@ Status GetRegionScans(const Matrix *matrix, Rect *rects, INT *count) const { - return SetStatus(DllExports::GdipGetRegionScansI(region, rects, count, matrix->matrix)); + return SetStatus(DllExports::GdipGetRegionScansI(region, rects, count, matrix ? matrix->matrix : NULL)); } Status GetRegionScans(const Matrix *matrix, RectF *rects, INT *count) const { - return SetStatus(DllExports::GdipGetRegionScans(region, rects, count, matrix->matrix)); + return SetStatus(DllExports::GdipGetRegionScans(region, rects, count, matrix ? matrix->matrix : NULL)); } UINT GetRegionScansCount(const Matrix *matrix) const { UINT count; - SetStatus(DllExports::GdipGetRegionScansCount(region, &count, matrix->matrix)); + SetStatus(DllExports::GdipGetRegionScansCount(region, &count, matrix ? matrix->matrix : NULL)); return count; } @@ -911,7 +911,7 @@ Status Intersect(const GraphicsPath *path) { - return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeIntersect)); + return SetStatus(DllExports::GdipCombineRegionPath(region, path ? path->path : NULL, CombineModeIntersect)); } Status Intersect(const RectF &rect) @@ -921,76 +921,76 @@ Status Intersect(const Region *region) { - return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeIntersect)); + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region ? region->region : NULL, CombineModeIntersect)); } BOOL IsEmpty(const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsEmptyRegion(region, g->graphics, &result)); + SetStatus(DllExports::GdipIsEmptyRegion(region, g ? g->graphics : NULL, &result)); return result; } BOOL IsInfinite(const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsInfiniteRegion(region, g->graphics, &result)); + SetStatus(DllExports::GdipIsInfiniteRegion(region, g ? g->graphics : NULL, &result)); return result; } BOOL IsVisible(const PointF &point, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsVisibleRegionPoint(region, point.X, point.Y, g->graphics, &result)); + SetStatus(DllExports::GdipIsVisibleRegionPoint(region, point.X, point.Y, g ? g->graphics : NULL, &result)); return result; } BOOL IsVisible(const RectF &rect, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsVisibleRegionRect(region, rect.X, rect.Y, rect.Width, rect.Height, g->graphics, &result)); + SetStatus(DllExports::GdipIsVisibleRegionRect(region, rect.X, rect.Y, rect.Width, rect.Height, g ? g->graphics : NULL, &result)); return result; } BOOL IsVisible(const Rect &rect, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsVisibleRegionRectI(region, rect.X, rect.Y, rect.Width, rect.Height, g->graphics, &result)); + SetStatus(DllExports::GdipIsVisibleRegionRectI(region, rect.X, rect.Y, rect.Width, rect.Height, g ? g->graphics : NULL, &result)); return result; } BOOL IsVisible(INT x, INT y, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsVisibleRegionPointI(region, x, y, g->graphics, &result)); + SetStatus(DllExports::GdipIsVisibleRegionPointI(region, x, y, g ? g->graphics : NULL, &result)); return result; } BOOL IsVisible(REAL x, REAL y, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsVisibleRegionPoint(region, x, y, g->graphics, &result)); + SetStatus(DllExports::GdipIsVisibleRegionPoint(region, x, y, g ? g->graphics : NULL, &result)); return result; } BOOL IsVisible(INT x, INT y, INT width, INT height, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsVisibleRegionRectI(region, x, y, width, height, g->graphics, &result)); + SetStatus(DllExports::GdipIsVisibleRegionRectI(region, x, y, width, height, g ? g->graphics : NULL, &result)); return result; } BOOL IsVisible(const Point &point, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsVisibleRegionPointI(region, point.X, point.Y, g->graphics, &result)); + SetStatus(DllExports::GdipIsVisibleRegionPointI(region, point.X, point.Y, g ? g->graphics : NULL, &result)); return result; } BOOL IsVisible(REAL x, REAL y, REAL width, REAL height, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsVisibleRegionRect(region, x, y, width, height, g->graphics, &result)); + SetStatus(DllExports::GdipIsVisibleRegionRect(region, x, y, width, height, g ? g->graphics : NULL, &result)); return result; } @@ -1006,7 +1006,7 @@ Status Transform(const Matrix *matrix) { - return SetStatus(DllExports::GdipTransformRegion(region, matrix->matrix)); + return SetStatus(DllExports::GdipTransformRegion(region, matrix ? matrix->matrix : NULL)); } Status Translate(REAL dx, REAL dy) @@ -1026,7 +1026,7 @@ Status Union(const Region *region) { - return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeUnion)); + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region ? region->region : NULL, CombineModeUnion)); } Status Union(const RectF &rect) @@ -1036,12 +1036,12 @@ Status Union(const GraphicsPath *path) { - return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeUnion)); + return SetStatus(DllExports::GdipCombineRegionPath(region, path ? path->path : NULL, CombineModeUnion)); } Status Xor(const GraphicsPath *path) { - return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeXor)); + return SetStatus(DllExports::GdipCombineRegionPath(region, path ? path->path : NULL, CombineModeXor)); } Status Xor(const RectF &rect) @@ -1056,7 +1056,7 @@ Status Xor(const Region *region) { - return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeXor)); + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region ? region->region : NULL, CombineModeXor)); } private: Modified: trunk/reactos/sdk/include/psdk/gdiplusmatrix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusma… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusmatrix.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusmatrix.h [iso-8859-1] Wed Aug 16 09:57:56 2017 @@ -47,7 +47,7 @@ Matrix *Clone(VOID) { Matrix *cloneMatrix = new Matrix(); // FIXME: Matrix::matrix already initialized --> potential memory leak - cloneMatrix->status = DllExports::GdipCloneMatrix(matrix, &cloneMatrix->matrix); + cloneMatrix->status = DllExports::GdipCloneMatrix(matrix, cloneMatrix ? &cloneMatrix->matrix : NULL); return cloneMatrix; } @@ -59,7 +59,7 @@ BOOL Equals(const Matrix* matrix) { BOOL result; - SetStatus(DllExports::GdipIsMatrixEqual(this->matrix, matrix->matrix, &result)); + SetStatus(DllExports::GdipIsMatrixEqual(this->matrix, matrix ? matrix->matrix : NULL, &result)); return result; } @@ -94,7 +94,7 @@ Status Multiply(const Matrix *matrix, MatrixOrder order) { - return SetStatus(DllExports::GdipMultiplyMatrix(this->matrix, matrix->matrix, order)); + return SetStatus(DllExports::GdipMultiplyMatrix(this->matrix, matrix ? matrix->matrix : NULL, order)); } REAL OffsetX(VOID)

7 years, 4 months

[ekohl] 75562: [SETUPAPI] Implement CM_Create_Range_List and CM_Free_Range_List. Still WIP.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Aug 16 09:44:20 2017 New Revision: 75562 URL: http://svn.reactos.org/svn/reactos?rev=75562&view=rev Log: [SETUPAPI] Implement CM_Create_Range_List and CM_Free_Range_List. Still WIP. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Wed Aug 16 09:44:20 2017 @@ -69,6 +69,22 @@ #define NOTIFY_MAGIC 0x44556677 +typedef struct _INTERNAL_RANGE_ELEMENT +{ + struct _INTERNAL_RANGE_ELEMENT *Next; + ULONG ulDummy; +} INTERNAL_RANGE_ELEMENT, *PINTERNAL_RANGE_ELEMENT; + +typedef struct _INTERNAL_RANGE_LIST +{ + ULONG ulMagic; + PINTERNAL_RANGE_ELEMENT Current; + PINTERNAL_RANGE_ELEMENT First; +} INTERNAL_RANGE_LIST, *PINTERNAL_RANGE_LIST; + +#define RANGE_LIST_MAGIC 0x33445566 + + static BOOL GuidToString(LPGUID Guid, LPWSTR String) { LPWSTR lpString; @@ -911,6 +927,39 @@ /*********************************************************************** + * CM_Create_Range_List [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Create_Range_List( + _Out_ PRANGE_LIST prlh, + _In_ ULONG ulFlags) +{ + PINTERNAL_RANGE_LIST pRangeList = NULL; + + FIXME("CM_Create_Range_List(%p %lx)\n", prlh, ulFlags); + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (prlh == NULL) + return CR_INVALID_POINTER; + + pRangeList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(INTERNAL_RANGE_LIST)); + if (pRangeList == NULL) + return CR_OUT_OF_MEMORY; + + pRangeList->ulMagic = RANGE_LIST_MAGIC; + + // TODO: More initialization + + *prlh = (RANGE_LIST)pRangeList; + + return CR_SUCCESS; +} + + +/*********************************************************************** * CM_Delete_Class_Key [SETUPAPI.@] */ CONFIGRET WINAPI CM_Delete_Class_Key( @@ -1446,6 +1495,35 @@ return CR_INVALID_LOG_CONF; HeapFree(GetProcessHeap(), 0, pLogConfInfo); + + return CR_SUCCESS; +} + + +/*********************************************************************** + * CM_Free_Range_List [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Free_Range_List( + _In_ RANGE_LIST RangeList, + _In_ ULONG ulFlags) +{ + PINTERNAL_RANGE_LIST pRangeList; + + FIXME("CM_Free_Range_List(%p %lx)\n", RangeList, ulFlags); + + pRangeList = (PINTERNAL_RANGE_LIST)RangeList; + + if (pRangeList == NULL || pRangeList->ulMagic != RANGE_LIST_MAGIC) + return CR_INVALID_RANGE_LIST; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + // TODO: Free the list of ranges + + HeapFree(GetProcessHeap(), 0, pRangeList); return CR_SUCCESS; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Wed Aug 16 09:44:20 2017 @@ -22,7 +22,7 @@ @ stdcall CM_Create_DevNodeW(ptr wstr long long) @ stdcall CM_Create_DevNode_ExA(ptr str long long long) @ stdcall CM_Create_DevNode_ExW(ptr wstr long long long) -@ stub CM_Create_Range_List +@ stdcall CM_Create_Range_List(ptr long) @ stdcall CM_Delete_Class_Key(ptr long) @ stdcall CM_Delete_Class_Key_Ex(ptr long long) @ stdcall CM_Delete_DevNode_Key(long long long) @@ -47,7 +47,7 @@ @ stdcall CM_Free_Log_Conf(ptr long) @ stdcall CM_Free_Log_Conf_Ex(ptr long ptr) @ stdcall CM_Free_Log_Conf_Handle(ptr) -@ stub CM_Free_Range_List +@ stdcall CM_Free_Range_List(ptr long) @ stdcall CM_Free_Res_Des(ptr ptr long) @ stdcall CM_Free_Res_Des_Ex(ptr ptr long long) @ stdcall CM_Free_Res_Des_Handle(ptr)

7 years, 4 months

[gadamopoulos] 75561: [SHLWAPI] -Addendum to 75533. Pass the id offset to IContextMenu::InvokeCommand. Fixes launching applications from the start menu. CORE-13680

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Aug 15 23:02:45 2017 New Revision: 75561 URL: http://svn.reactos.org/svn/reactos?rev=75561&view=rev Log: [SHLWAPI] -Addendum to 75533. Pass the id offset to IContextMenu::InvokeCommand. Fixes launching applications from the start menu. CORE-13680 Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Tue Aug 15 23:02:45 2017 @@ -3501,7 +3501,7 @@ cmIci.cbSize = sizeof(cmIci); cmIci.fMask = CMIC_MASK_ASYNCOK; cmIci.hwnd = hWnd; - cmIci.lpVerb = MAKEINTRESOURCEA(dwCommandId); + cmIci.lpVerb = MAKEINTRESOURCEA(dwCommandId - 1); cmIci.nShow = SW_SHOWNORMAL; hRet = IContextMenu_InvokeCommand(iContext, &cmIci);

7 years, 4 months

[ashaposhnikov] 75560: [RAPPS] - Style changes, typo fixes etc.

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Tue Aug 15 22:35:45 2017 New Revision: 75560 URL: http://svn.reactos.org/svn/reactos?rev=75560&view=rev Log: [RAPPS] - Style changes, typo fixes etc. Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/defines.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/gui.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/unattended.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/winmain.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/integrity.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -91,7 +91,7 @@ // Parse parameter string ATL::CStringW m_szLocale; - int iLCID; + INT iLCID; for (INT i = 0; szBuffer[i] != UNICODE_NULL; ++i) { if (szBuffer[i] != cDelimiter && szBuffer[i] != L'\n') @@ -382,7 +382,7 @@ ATL::CSimpleArray<PAPPLICATION_INFO> CAvailableApps::FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) { ATL::CSimpleArray<PAPPLICATION_INFO> result; - for (int i = 0; i < arrAppsNames.GetSize(); ++i) + for (INT i = 0; i < arrAppsNames.GetSize(); ++i) { PAPPLICATION_INFO Info = FindInfo(arrAppsNames[i]); if (Info) @@ -393,17 +393,17 @@ return result; } -const ATL::CStringW & CAvailableApps::GetFolderPath() +const ATL::CStringW& CAvailableApps::GetFolderPath() { return m_szPath; } -const ATL::CStringW & CAvailableApps::GetAppPath() +const ATL::CStringW& CAvailableApps::GetAppPath() { return m_szAppsPath; } -const ATL::CStringW & CAvailableApps::GetCabPath() +const ATL::CStringW& CAvailableApps::GetCabPath() { return m_szCabPath; } Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -26,7 +26,7 @@ HWND hListView = NULL; INT -GetSystemColorDepth(VOID) +GetSystemColorDepth() { DEVMODEW pDevMode; INT ColorDepth; @@ -236,8 +236,7 @@ hImageList = ImageList_Create(TOOLBAR_HEIGHT,//GetSystemMetrics(SM_CXSMICON), TOOLBAR_HEIGHT,//GetSystemMetrics(SM_CYSMICON), ILC_MASK | GetSystemColorDepth(), - 1, - 1); + 1, 1); if (!hImageList) { /* TODO: Error message */ @@ -354,7 +353,7 @@ struct SortContext { CAppsListView * lvw; - int iSubItem; + INT iSubItem; }; BOOL bHasAllChecked; @@ -845,7 +844,7 @@ RECT r = {0, 0, LOWORD(lParam), HIWORD(lParam)}; HDWP hdwp = NULL; - int count = m_ClientPanel->CountSizableChildren(); + INT count = m_ClientPanel->CountSizableChildren(); hdwp = BeginDeferWindowPos(count); if (hdwp) Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -126,4 +126,4 @@ const LPCWSTR GetFolderPathString(); const LPCWSTR GetAppPathString(); const LPCWSTR GetCabPathString(); -}; +}; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -41,7 +41,7 @@ SendMessageW(EM_SETSEL, End, End + 1); } - LONG GetTextLen(VOID) + LONG GetTextLen() { GETTEXTLENGTHEX TxtLenStruct; @@ -87,15 +87,15 @@ LoadedLibrary = LoadLibraryW(L"riched20.dll"); m_hWnd = CreateWindowExW(0, - L"RichEdit20W", - NULL, - WS_CHILD | WS_VISIBLE | ES_MULTILINE | - ES_LEFT | ES_READONLY, - 205, 28, 465, 100, - hwndParent, - NULL, - _AtlBaseModule.GetModuleInstance(), - NULL); + L"RichEdit20W", + NULL, + WS_CHILD | WS_VISIBLE | ES_MULTILINE | + ES_LEFT | ES_READONLY, + 205, 28, 465, 100, + hwndParent, + NULL, + _AtlBaseModule.GetModuleInstance(), + NULL); if (m_hWnd) { Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/defines.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/defines.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/defines.h [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -31,4 +31,4 @@ #define APPLICATION_DATABASE_URL L"https://svn.reactos.org/packages/rappmgr.cab" #define MAX_STR_LEN 256 -#define ENUM_ALL_COMPONENTS 30 +#define ENUM_ALL_COMPONENTS 30 Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -17,15 +17,15 @@ public: static INT_PTR CALLBACK DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - static LRESULT CALLBACK DownloadProgressProc(HWND hWnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam, - UINT_PTR uIdSubclass, + static LRESULT CALLBACK DownloadProgressProc(HWND hWnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam, + UINT_PTR uIdSubclass, DWORD_PTR dwRefData); static DWORD WINAPI ThreadFunc(LPVOID Context); - static BOOL DownloadListOfApplications(const ATL::CSimpleArray<PAPPLICATION_INFO>& AppsList, BOOL modal = FALSE); + static BOOL DownloadListOfApplications(const ATL::CSimpleArray<PAPPLICATION_INFO>& AppsList, BOOL bIsModal = FALSE); static BOOL DownloadApplication(PAPPLICATION_INFO pAppInfo, BOOL modal = FALSE); static VOID DownloadApplicationsDB(LPCWSTR lpUrl); static VOID LaunchDownloadDialog(BOOL); @@ -35,7 +35,7 @@ VOID CreateSettingsDlg(HWND hwnd); // About dialog (aboutdlg.cpp) -VOID ShowAboutDialog(VOID); +VOID ShowAboutDialog(); // Installation dialog (installdlg.cpp) -//BOOL InstallApplication(INT Index); +//BOOL InstallApplication(INT Index); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/gui.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/gui.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/gui.h [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -17,4 +17,4 @@ VOID InsertRichEditText(const ATL::CStringW& szText, DWORD flags); CAvailableApps * GetAvailableApps(); extern HWND hListView; -extern ATL::CStringW szSearchPattern; +extern ATL::CStringW szSearchPattern; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -9,14 +9,14 @@ INT GetClientWindowHeight(HWND hwnd); VOID CopyTextToClipboard(LPCWSTR lpszText); -VOID SetWelcomeText(VOID); +VOID SetWelcomeText(); VOID ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem); BOOL StartProcess(ATL::CStringW &Path, BOOL Wait); BOOL StartProcess(LPWSTR lpPath, BOOL Wait); BOOL GetStorageDirectory(ATL::CStringW &lpDirectory); BOOL ExtractFilesFromCab(LPCWSTR lpCabName, LPCWSTR lpOutputPath); -VOID InitLogs(VOID); -VOID FreeLogs(VOID); +VOID InitLogs(); +VOID FreeLogs(); BOOL WriteLogMessage(WORD wType, DWORD dwEventID, LPCWSTR lpMsg); BOOL GetInstalledVersion(ATL::CStringW *pszVersion, const ATL::CStringW &szRegName); @@ -42,4 +42,4 @@ UINT GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString); UINT GetInt(const ATL::CStringW& KeyName); -}; +}; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -6,7 +6,7 @@ #include <atlwin.h> -template<class T, int GrowthRate = 10> +template<class T, INT GrowthRate = 10> class CPointerArray { protected: @@ -24,13 +24,13 @@ } private: - static int CALLBACK s_OnRemoveItem(void * ptr, void * context) + static INT CALLBACK s_OnRemoveItem(PVOID ptr, PVOID context) { CPointerArray * self = (CPointerArray*) context; - return (int) self->OnRemoveItem(reinterpret_cast<T*>(ptr)); - } - - static int CALLBACK s_OnCompareItems(void *p1, void *p2, LPARAM lParam) + return (INT) self->OnRemoveItem(reinterpret_cast<T*>(ptr)); + } + + static INT CALLBACK s_OnCompareItems(PVOID p1, PVOID p2, LPARAM lParam) { CPointerArray * self = (CPointerArray*) lParam; return self->OnCompareItems(reinterpret_cast<T*>(p1), reinterpret_cast<T*>(p2)); @@ -42,9 +42,9 @@ return TRUE; } - virtual int OnCompareItems(T * p1, T * p2) - { - int t = (reinterpret_cast<int>(p2) -reinterpret_cast<int>(p1)); + virtual INT OnCompareItems(T * p1, T * p2) + { + INT t = (reinterpret_cast<INT>(p2) - reinterpret_cast<INT>(p1)); if (t > 0) return 1; if (t < 0) @@ -53,45 +53,45 @@ } public: - int GetCount() const + INT GetCount() const { return DPA_GetPtrCount(m_hDpa); } - T* Get(int i) const + T* Get(INT i) const { return (T*) DPA_GetPtr(m_hDpa, i); } - BOOL Set(int i, T* ptr) + BOOL Set(INT i, T* ptr) { return DPA_SetPtr(m_hDpa, i, ptr); } - int Insert(int at, T* ptr) + INT Insert(INT at, T* ptr) { return DPA_InsertPtr(m_hDpa, at, ptr); } - int Append(T* ptr) + INT Append(T* ptr) { return DPA_InsertPtr(m_hDpa, DA_LAST, ptr); } - int IndexOf(T* ptr) const + INT IndexOf(T* ptr) const { return DPA_GetPtrIndex(m_hDpa, ptr); } BOOL Remove(T* ptr) { - int i = IndexOf(ptr); + INT i = IndexOf(ptr); if (i < 0) return FALSE; return RemoveAt(i); } - BOOL RemoveAt(int i) + BOOL RemoveAt(INT i) { T* ptr = (T*) DPA_GetPtr(m_hDpa, i); OnRemoveItem(ptr); @@ -109,7 +109,7 @@ return DPA_Sort(m_hDpa, s_OnCompareItems, (LPARAM)this); } - int Search(T* item, int iStart, UINT uFlags) + INT Search(T* item, INT iStart, UINT uFlags) { return DPA_Search(m_hDpa, s_OnCompareItems, (LPARAM)this); } @@ -124,7 +124,7 @@ left = right = top = bottom = 0; } - CUiRect(int l, int t, int r, int b) + CUiRect(INT l, INT t, INT r, INT b) { left = l; right = r; @@ -141,12 +141,12 @@ { } - CUiMargin(int all) + CUiMargin(INT all) : CUiRect(all, all, all, all) { } - CUiMargin(int horz, int vert) + CUiMargin(INT horz, INT vert) : CUiRect(horz, vert, horz, vert) { } @@ -165,7 +165,7 @@ private: MeasureType m_Type; - int m_Value; + INT m_Value; public: CUiMeasure() @@ -174,13 +174,13 @@ m_Value = 0; } - CUiMeasure(MeasureType type, int value) + CUiMeasure(MeasureType type, INT value) { m_Type = type; m_Value = value; } - int ComputeMeasure(int parent, int content) + INT ComputeMeasure(INT parent, INT content) { switch (m_Type) { @@ -208,12 +208,12 @@ return CUiMeasure(Type_FitParent, 0); } - static CUiMeasure Fixed(int pixels) + static CUiMeasure Fixed(INT pixels) { return CUiMeasure(Type_Fixed, pixels); } - static CUiMeasure Percent(int percent) + static CUiMeasure Percent(INT percent) { return CUiMeasure(Type_Percent, percent); } @@ -242,7 +242,7 @@ m_VerticalAlignment = UiAlign_LeftTop; } - virtual void ComputeRect(RECT parentRect, RECT currentRect, RECT* newRect) + virtual VOID ComputeRect(RECT parentRect, RECT currentRect, RECT* newRect) { parentRect.left += m_Margin.left; parentRect.right -= m_Margin.right; @@ -255,8 +255,8 @@ if (parentRect.bottom < parentRect.top) parentRect.bottom = parentRect.top; - SIZE szParent = { parentRect.right - parentRect.left, parentRect.bottom - parentRect.top }; - SIZE szCurrent = { currentRect.right - currentRect.left, currentRect.bottom - currentRect.top }; + SIZE szParent = {parentRect.right - parentRect.left, parentRect.bottom - parentRect.top}; + SIZE szCurrent = {currentRect.right - currentRect.left, currentRect.bottom - currentRect.top}; currentRect = parentRect; @@ -297,14 +297,14 @@ public: - virtual void ComputeMinimalSize(SIZE* size) + virtual VOID ComputeMinimalSize(SIZE* size) { // Override in subclass size->cx = max(size->cx, 0); size->cy = min(size->cy, 0); }; - virtual void ComputeContentBounds(RECT* rect) + virtual VOID ComputeContentBounds(RECT* rect) { // Override in subclass }; @@ -373,9 +373,9 @@ virtual CUiBox * AsBox() { return this; } - virtual void ComputeMinimalSize(SIZE* size) - { - for (int i = 0; i < m_Children.GetCount(); i++) + virtual VOID ComputeMinimalSize(SIZE* size) + { + for (INT i = 0; i < m_Children.GetCount(); i++) { CUiBox * box = m_Children.Get(i)->AsBox(); if (box) @@ -385,9 +385,9 @@ } }; - virtual void ComputeContentBounds(RECT* rect) - { - for (int i = 0; i < m_Children.GetCount(); i++) + virtual VOID ComputeContentBounds(RECT* rect) + { + for (INT i = 0; i < m_Children.GetCount(); i++) { CUiBox * box = m_Children.Get(i)->AsBox(); if (box) @@ -399,8 +399,8 @@ virtual DWORD_PTR CountSizableChildren() { - int count = 0; - for (int i = 0; i < m_Children.GetCount(); i++) + INT count = 0; + for (INT i = 0; i < m_Children.GetCount(); i++) { CUiBox * box = m_Children.Get(i)->AsBox(); if (box) @@ -413,20 +413,20 @@ virtual HDWP OnParentSize(RECT parentRect, HDWP hDwp) { - RECT rect = { 0 }; - - SIZE content = { 0 }; + RECT rect = {0}; + + SIZE content = {0}; ComputeMinimalSize(&content); - int preferredWidth = m_Width.ComputeMeasure(parentRect.right - parentRect.left, content.cx); - int preferredHeight = m_Height.ComputeMeasure(parentRect.bottom - parentRect.top, content.cy); + INT preferredWidth = m_Width.ComputeMeasure(parentRect.right - parentRect.left, content.cx); + INT preferredHeight = m_Height.ComputeMeasure(parentRect.bottom - parentRect.top, content.cy); rect.right = preferredWidth; rect.bottom = preferredHeight; ComputeRect(parentRect, rect, &rect); - for (int i = 0; i < m_Children.GetCount(); i++) + for (INT i = 0; i < m_Children.GetCount(); i++) { CUiBox * box = m_Children.Get(i)->AsBox(); if (box) @@ -450,13 +450,13 @@ HWND GetWindow() { return T::m_hWnd; } - virtual void ComputeMinimalSize(SIZE* size) + virtual VOID ComputeMinimalSize(SIZE* size) { // TODO: Maybe use WM_GETMINMAXINFO? return CUiBox::ComputeMinimalSize(size); }; - virtual void ComputeContentBounds(RECT* rect) + virtual VOID ComputeContentBounds(RECT* rect) { RECT r; ::GetWindowRect(T::m_hWnd, &r); @@ -495,7 +495,7 @@ T::DestroyWindow(); } - void GetWindowTextW(ATL::CStringW& szText) + VOID GetWindowTextW(ATL::CStringW& szText) { INT length = CWindow::GetWindowTextLengthW() + 1; CWindow::GetWindowTextW(szText.GetBuffer(length), length); @@ -508,7 +508,7 @@ public CUiBox, public CWindowImpl<CUiSplitPanel> { - static const int THICKNESS = 4; + static const INT THICKNESS = 4; protected: @@ -522,11 +522,11 @@ BOOL m_HasOldRect; public: - int m_Pos; + INT m_Pos; BOOL m_Horizontal; BOOL m_DynamicFirst; - int m_MinFirst; - int m_MinSecond; + INT m_MinFirst; + INT m_MinSecond; CUiMeasure m_Width; CUiMeasure m_Height; @@ -551,7 +551,7 @@ CUiCollection& First() { return m_First.Children(); } CUiCollection& Second() { return m_Second.Children(); } - virtual void ComputeMinimalSize(SIZE* size) + virtual VOID ComputeMinimalSize(SIZE* size) { if (m_Horizontal) size->cx = max(size->cx, THICKNESS); @@ -561,7 +561,7 @@ m_Second.ComputeMinimalSize(size); }; - virtual void ComputeContentBounds(RECT* rect) + virtual VOID ComputeContentBounds(RECT* rect) { RECT r; @@ -578,7 +578,7 @@ virtual DWORD_PTR CountSizableChildren() { - int count = 1; + INT count = 1; count += m_First.CountSizableChildren(); count += m_Second.CountSizableChildren(); return count; @@ -586,20 +586,20 @@ virtual HDWP OnParentSize(RECT parentRect, HDWP hDwp) { - RECT rect = { 0 }; - - SIZE content = { 0 }; + RECT rect = {0}; + + SIZE content = {0}; ComputeMinimalSize(&content); - int preferredWidth = m_Width.ComputeMeasure(parentRect.right - parentRect.left, content.cx); - int preferredHeight = m_Width.ComputeMeasure(parentRect.bottom - parentRect.top, content.cy); + INT preferredWidth = m_Width.ComputeMeasure(parentRect.right - parentRect.left, content.cx); + INT preferredHeight = m_Width.ComputeMeasure(parentRect.bottom - parentRect.top, content.cy); rect.right = preferredWidth; rect.bottom = preferredHeight; ComputeRect(parentRect, rect, &rect); - SIZE growth = { 0 }; + SIZE growth = {0}; if (m_HasOldRect) { RECT oldRect = m_LastRect; @@ -620,7 +620,7 @@ { if (growth.cy > 0) { - m_Pos += min(growth.cy, rect.bottom - (m_Pos+THICKNESS)); + m_Pos += min(growth.cy, rect.bottom - (m_Pos + THICKNESS)); } else if (growth.cy < 0) { @@ -669,25 +669,25 @@ m_LastRect = parentRect; m_HasOldRect = TRUE; - + hDwp = m_First.OnParentSize(first, hDwp); hDwp = m_Second.OnParentSize(second, hDwp); if (hDwp) { return DeferWindowPos(hDwp, NULL, - splitter.left, splitter.top, - splitter.right - splitter.left, - splitter.bottom - splitter.top, - SWP_NOACTIVATE | SWP_NOZORDER); + splitter.left, splitter.top, + splitter.right - splitter.left, + splitter.bottom - splitter.top, + SWP_NOACTIVATE | SWP_NOZORDER); } else { SetWindowPos(NULL, - splitter.left, splitter.top, - splitter.right - splitter.left, - splitter.bottom - splitter.top, - SWP_NOACTIVATE | SWP_NOZORDER); + splitter.left, splitter.top, + splitter.right - splitter.left, + splitter.bottom - splitter.top, + SWP_NOACTIVATE | SWP_NOZORDER); return NULL; } }; @@ -736,12 +736,12 @@ } public: - int GetPos(VOID) + INT GetPos() { return m_Pos; } - void SetPos(int NewPos) + VOID SetPos(INT NewPos) { RECT rcParent; @@ -772,7 +772,7 @@ m_Pos = rcParent.right; } - int count = CountSizableChildren(); + INT count = CountSizableChildren(); HDWP hdwp = NULL; hdwp = BeginDeferWindowPos(count); @@ -794,7 +794,7 @@ DWORD style = WS_CHILD | WS_VISIBLE; DWORD exStyle = WS_EX_TRANSPARENT; - RECT size = { 205, 180, 465, THICKNESS }; + RECT size = {205, 180, 465, THICKNESS}; size.right += size.left; size.bottom += size.top; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/unattended.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/unattended.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/unattended.h [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -5,4 +5,4 @@ #define CMD_KEY_SETUP L"/SETUP" // return TRUE if the SETUP key was valid -BOOL CmdParser(LPWSTR lpCmdLine); +BOOL CmdParser(LPWSTR lpCmdLine); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/winmain.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/winmain.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/winmain.h [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -32,4 +32,4 @@ VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo); // integrity.cpp -BOOL VerifyInteg(LPCWSTR lpSHA1Hash, LPCWSTR lpFileName); +BOOL VerifyInteg(LPCWSTR lpSHA1Hash, LPCWSTR lpFileName); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -18,22 +18,22 @@ { switch (Msg) { - case WM_INITDIALOG: + case WM_INITDIALOG: + { + } + break; + + case WM_COMMAND: + { + switch (LOWORD(wParam)) { + case IDOK: + case IDCANCEL: + EndDialog(hDlg, LOWORD(wParam)); + break; } - break; - - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDOK: - case IDCANCEL: - EndDialog(hDlg, LOWORD(wParam)); - break; - } - } - break; + } + break; } return FALSE; @@ -49,9 +49,9 @@ if (!AppInfo) return FALSE; DialogBoxW(hInst, - MAKEINTRESOURCEW(IDD_INSTALL_DIALOG), - hMainWnd, - InstallDlgProc); + MAKEINTRESOURCEW(IDD_INSTALL_DIALOG), + hMainWnd, + InstallDlgProc); return TRUE; } Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -158,9 +158,9 @@ if (MessageBoxW(hMainWnd, szMsgText, szMsgTitle, MB_YESNO | MB_ICONQUESTION) == IDYES) { - ATL::CStringW::CopyChars(szFullName, - MAX_PATH, - Info->szKeyName.GetString(), + ATL::CStringW::CopyChars(szFullName, + MAX_PATH, + Info->szKeyName.GetString(), MAX_PATH - wcslen(szFullName)); if (RegDeleteKeyW(Info->hRootKey, szFullName) == ERROR_SUCCESS) Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/integrity.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/integrity.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/integrity.cpp [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -53,7 +53,7 @@ WCHAR buf[(sizeof(sha) * 2) + 1]; for (UINT i = 0; i < sizeof(sha); i++) - swprintf(buf + 2 * i, L"%02x", ((unsigned char *)sha)[i]); + swprintf(buf + 2 * i, L"%02x", ((unsigned char *) sha)[i]); /* does the resulting SHA1 match with the provided one? */ if (!_wcsicmp(buf, lpSHA1Hash)) ret = TRUE; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -46,8 +46,8 @@ #include "misc.h" #ifdef USE_CERT_PINNING - #define CERT_ISSUER_INFO "BE\r\nGlobalSign nv-sa\r\nGlobalSign Domain Validation CA - SHA256 - G2" - #define CERT_SUBJECT_INFO "Domain Control Validated\r\n*.reactos.org" +#define CERT_ISSUER_INFO "BE\r\nGlobalSign nv-sa\r\nGlobalSign Domain Validation CA - SHA256 - G2" +#define CERT_SUBJECT_INFO "Domain Control Validated\r\n*.reactos.org" #endif typedef enum @@ -768,7 +768,7 @@ DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLInstalling); //TODO: issue an install operation separately so that the apps could be downloaded in the background WaitForSingleObject(shExInfo.hProcess, INFINITE); - CloseHandle(shExInfo.hProcess); + CloseHandle(shExInfo.hProcess); } else { Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -20,8 +20,8 @@ struct ERF { - int erfOper; - int erfType; + INT erfOper; + INT erfType; BOOL fError; }; @@ -160,7 +160,7 @@ } BOOL StartProcess(ATL::CStringW &Path, BOOL Wait) -{ +{ return StartProcess(const_cast<LPWSTR>(Path.GetString()), Wait);; } @@ -498,7 +498,7 @@ return FALSE; // convert it to an actual integer - int result = StrToIntW(Buffer.GetString()); + INT result = StrToIntW(Buffer.GetString()); return (UINT) (result <= 0) ? 0 : result; } Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -17,14 +17,12 @@ } // Setup key - single app expected - // TODO: add multiple apps // TODO: use DB filenames as names because they're shorter - // app setup ATL::CSimpleArray<ATL::CStringW> arrNames; if (!StrCmpW(argv[0], CMD_KEY_INSTALL)) { - for (int i = 1; i < argc; ++i) + for (INT i = 1; i < argc; ++i) { arrNames.Add(argv[i]); } @@ -32,7 +30,6 @@ else if (!StrCmpW(argv[0], CMD_KEY_SETUP)) { - //TODO: inf file loading HINF InfHandle = SetupOpenInfFileW(argv[1], NULL, INF_STYLE_WIN4, NULL); if (InfHandle == INVALID_HANDLE_VALUE) { @@ -40,24 +37,23 @@ } INFCONTEXT Context; - if (!SetupFindFirstLineW(InfHandle, L"RAPPS", L"Install", &Context)) + if (SetupFindFirstLineW(InfHandle, L"RAPPS", L"Install", &Context)) { - return FALSE; + WCHAR szName[MAX_PATH]; + do + { + if (SetupGetStringFieldW(&Context, 1, szName, MAX_PATH, NULL)) + { + arrNames.Add(szName); + } + } while (SetupFindNextLine(&Context, &Context)); } - - WCHAR szName[MAX_PATH]; - do - { - if (SetupGetStringFieldW(&Context, 1, szName, MAX_PATH, NULL)) - { - arrNames.Add(szName); - } - } - while (SetupFindNextLine(&Context, &Context)); SetupCloseInfFile(InfHandle); } else + { return FALSE; + } CAvailableApps apps; apps.EnumAvailableApplications(ENUM_ALL_AVAILABLE, NULL); @@ -70,4 +66,3 @@ return FALSE; } - Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -31,11 +31,6 @@ CRAppsModule gModule; CAtlWinModule gWinModule; -//void *operator new (size_t, void *buf) -//{ -// return buf; -//} - static VOID InitializeAtlModule(HINSTANCE hInstance, BOOL bInitialize) { if (bInitialize) @@ -51,6 +46,7 @@ VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) { ATL::CStringW szDownloadDir; + ZeroMemory(pSettingsInfo, sizeof(SETTINGS_INFO)); pSettingsInfo->bSaveWndPos = TRUE; pSettingsInfo->bUpdateAtStart = FALSE; @@ -81,10 +77,6 @@ pSettingsInfo->Top = CW_USEDEFAULT; pSettingsInfo->Width = 680; pSettingsInfo->Height = 450; - pSettingsInfo->Proxy = 0; - - pSettingsInfo->szProxyServer[0] = UNICODE_NULL; - pSettingsInfo->szNoProxyFor[0] = UNICODE_NULL; } static BOOL LoadSettings() @@ -130,7 +122,7 @@ } } -INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nShowCmd) +INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, INT nShowCmd) { LPCWSTR szWindowClass = L"ROSAPPMGR"; HANDLE hMutex;

7 years, 4 months

[ashaposhnikov] 75559: [RAPPS] - Quit CmdParser() as soon as no valid key supplied

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Tue Aug 15 21:39:21 2017 New Revision: 75559 URL: http://svn.reactos.org/svn/reactos?rev=75559&view=rev Log: [RAPPS] - Quit CmdParser() as soon as no valid key supplied Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] Tue Aug 15 21:39:21 2017 @@ -56,6 +56,8 @@ while (SetupFindNextLine(&Context, &Context)); SetupCloseInfFile(InfHandle); } + else + return FALSE; CAvailableApps apps; apps.EnumAvailableApplications(ENUM_ALL_AVAILABLE, NULL);

7 years, 4 months

[ashaposhnikov] 75558: [RAPPS] - Close the INF file after loading the info

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Tue Aug 15 20:47:10 2017 New Revision: 75558 URL: http://svn.reactos.org/svn/reactos?rev=75558&view=rev Log: [RAPPS] - Close the INF file after loading the info Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] Tue Aug 15 20:47:10 2017 @@ -54,6 +54,7 @@ } } while (SetupFindNextLine(&Context, &Context)); + SetupCloseInfFile(InfHandle); } CAvailableApps apps;

7 years, 4 months

[tthompson] 75557: [NTFS] - Allow for creating a file when the index root gets too large and needs to be moved into an index record. Add some helper functions. +AllocateIndexNode() - Allocates a ne...

by tthompson＠svn.reactos.org

Author: tthompson Date: Tue Aug 15 19:57:55 2017 New Revision: 75557 URL: http://svn.reactos.org/svn/reactos?rev=75557&view=rev Log: [NTFS] - Allow for creating a file when the index root gets too large and needs to be moved into an index record. Add some helper functions. +AllocateIndexNode() - Allocates a new index record in an index allocation. +CreateDummyKey() - Creates the final B_TREE_KEY for a B_TREE_FILENAME_NODE. Also creates the associated index entry. GetSizeOfIndexEntries() - Sums the size of each index entry in every key in a B-Tree node. +SetIndexEntryVCN() - Sets the VCN of a given IndexEntry. NtfsInsertKey() - Handle instance when the index root grows too large. If it does, add its contents to a new sub-node, and replace contents with a dummy-key whose child is the new node. UpdateIndexAllocation() - Update index entry if a key has just been assigned a child allocation. UpdateIndexNode() - Make sure the node exists on disk, and allocate an index record for it if it doesn't. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c [iso-8859-1] Tue Aug 15 19:57:55 2017 @@ -78,6 +78,237 @@ } ExFreePoolWithTag(Buffer, TAG_NTFS); +} + +/** +* @name AllocateIndexNode +* @implemented +* +* Allocates a new index record in an index allocation. +* +* @param DeviceExt +* Pointer to the target DEVICE_EXTENSION describing the volume the node will be created on. +* +* @param FileRecord +* Pointer to a copy of the file record containing the index. +* +* @param IndexBufferSize +* Size of an index record for this index, in bytes. Commonly defined as 4096. +* +* @param IndexAllocationCtx +* Pointer to an NTFS_ATTR_CONTEXT describing the index allocation attribute the node will be assigned to. +* +* @param IndexAllocationOffset +* Offset of the index allocation attribute relative to the file record. +* +* @param NewVCN +* Pointer to a ULONGLONG which will receive the VCN of the newly-assigned index record +* +* @returns +* STATUS_SUCCESS in case of success. +* STATUS_NOT_IMPLEMENTED if there's no $I30 bitmap attribute in the file record. +* +* @remarks +* AllocateIndexNode() doesn't write any data to the index record it creates. Called by UpdateIndexNode(). +* Don't call PrintAllVCNs() or NtfsDumpFileRecord() after calling AllocateIndexNode() before UpdateIndexNode() finishes. +*/ +NTSTATUS +AllocateIndexNode(PDEVICE_EXTENSION DeviceExt, + PFILE_RECORD_HEADER FileRecord, + ULONG IndexBufferSize, + PNTFS_ATTR_CONTEXT IndexAllocationCtx, + ULONG IndexAllocationOffset, + PULONGLONG NewVCN) +{ + NTSTATUS Status; + PNTFS_ATTR_CONTEXT BitmapCtx; + ULONGLONG IndexAllocationLength, BitmapLength; + ULONG BitmapOffset; + ULONGLONG NextNodeNumber; + PCHAR *BitmapMem; + ULONG *BitmapPtr; + RTL_BITMAP Bitmap; + ULONG BytesWritten; + ULONG BytesNeeded; + LARGE_INTEGER DataSize; + + DPRINT1("AllocateIndexNode(%p, %p, %lu, %p, %lu, %p) called.\n", DeviceExt, + FileRecord, + IndexBufferSize, + IndexAllocationCtx, + IndexAllocationOffset, + NewVCN); + + // Get the length of the attribute allocation + IndexAllocationLength = AttributeDataLength(IndexAllocationCtx->pRecord); + + // Find the bitmap attribute for the index + Status = FindAttribute(DeviceExt, + FileRecord, + AttributeBitmap, + L"$I30", + 4, + &BitmapCtx, + &BitmapOffset); + if (!NT_SUCCESS(Status)) + { + DPRINT1("FIXME: Need to add bitmap attribute!\n"); + return STATUS_NOT_IMPLEMENTED; + } + + // Get the length of the bitmap attribute + BitmapLength = AttributeDataLength(BitmapCtx->pRecord); + + NextNodeNumber = IndexAllocationLength / DeviceExt->NtfsInfo.BytesPerIndexRecord; + + // TODO: Find unused allocation in bitmap and use that space first + + // Add another bit to bitmap + + // See how many bytes we need to store the amount of bits we'll have + BytesNeeded = NextNodeNumber / 8; + if (NextNodeNumber % 8 != 0) + BytesNeeded++; + + // Windows seems to allocate the bitmap in 8-byte chunks to keep any bytes from being wasted on padding + ALIGN_UP(BytesNeeded, ATTR_RECORD_ALIGNMENT); + + // Do we need to enlarge the bitmap? + if (BytesNeeded > BitmapLength) + { + // TODO: handle synchronization issues that could occur from changing the directory's file record + // Change bitmap size + DataSize.QuadPart = BytesNeeded; + Status = SetResidentAttributeDataLength(DeviceExt, + BitmapCtx, + BitmapOffset, + FileRecord, + &DataSize); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to set length of bitmap attribute!\n"); + ReleaseAttributeContext(BitmapCtx); + return Status; + } + } + + // Enlarge Index Allocation attribute + DataSize.QuadPart = IndexAllocationLength + IndexBufferSize; + Status = SetNonResidentAttributeDataLength(DeviceExt, + IndexAllocationCtx, + IndexAllocationOffset, + FileRecord, + &DataSize); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to set length of index allocation!\n"); + ReleaseAttributeContext(BitmapCtx); + return Status; + } + + // Update file record on disk + Status = UpdateFileRecord(DeviceExt, IndexAllocationCtx->FileMFTIndex, FileRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to update file record!\n"); + ReleaseAttributeContext(BitmapCtx); + return Status; + } + + // Allocate memory for the bitmap. RtlInitializeBitmap() wants a pointer that's ULONG-aligned + BitmapMem = ExAllocatePoolWithTag(NonPagedPool, BytesNeeded + sizeof(ULONG) - 1, TAG_NTFS); + BitmapPtr = (PULONG)ALIGN_UP_BY((ULONG_PTR)BitmapMem, sizeof(ULONG)); + + RtlZeroMemory(BitmapPtr, BytesNeeded); + + // Read the existing bitmap data + Status = ReadAttribute(DeviceExt, BitmapCtx, 0, (PCHAR)BitmapPtr, BitmapLength); + + // Initialize bitmap + RtlInitializeBitMap(&Bitmap, BitmapPtr, BytesNeeded); + + // Set the bit for the new index record + RtlSetBits(&Bitmap, NextNodeNumber, 1); + + // Write the new bitmap attribute + Status = WriteAttribute(DeviceExt, + BitmapCtx, + 0, + (const PUCHAR)BitmapPtr, + BytesNeeded, + &BytesWritten, + FileRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Unable to write to $I30 bitmap attribute!\n"); + } + + // Calculate VCN of new node number + *NewVCN = NextNodeNumber * (IndexBufferSize / DeviceExt->NtfsInfo.BytesPerCluster); + + ExFreePoolWithTag(BitmapMem, TAG_NTFS); + ReleaseAttributeContext(BitmapCtx); + + return Status; +} + +/** +* @name CreateDummyKey +* @implemented +* +* Creates the final B_TREE_KEY for a B_TREE_FILENAME_NODE. Also creates the associated index entry. +* +* @param HasChildNode +* BOOLEAN to indicate if this key will have a LesserChild. +* +* @return +* The newly-created key. +*/ +PB_TREE_KEY +CreateDummyKey(BOOLEAN HasChildNode) +{ + PINDEX_ENTRY_ATTRIBUTE NewIndexEntry; + PB_TREE_KEY NewDummyKey; + + // Calculate max size of a dummy key + ULONG EntrySize = ALIGN_UP_BY(FIELD_OFFSET(INDEX_ENTRY_ATTRIBUTE, FileName), 8); + EntrySize += sizeof(ULONGLONG); // for VCN + + // Create the index entry for the key + NewIndexEntry = ExAllocatePoolWithTag(NonPagedPool, EntrySize, TAG_NTFS); + if (!NewIndexEntry) + { + DPRINT1("Couldn't allocate memory for dummy key index entry!\n"); + return NULL; + } + + RtlZeroMemory(NewIndexEntry, EntrySize); + + if (HasChildNode) + { + NewIndexEntry->Flags = NTFS_INDEX_ENTRY_NODE | NTFS_INDEX_ENTRY_END; + } + else + { + NewIndexEntry->Flags = NTFS_INDEX_ENTRY_END; + EntrySize -= sizeof(ULONGLONG); // no VCN + } + + NewIndexEntry->Length = EntrySize; + + // Create the key + NewDummyKey = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_KEY), TAG_NTFS); + if (!NewDummyKey) + { + DPRINT1("Unable to allocate dummy key!\n"); + ExFreePoolWithTag(NewIndexEntry, TAG_NTFS); + return NULL; + } + RtlZeroMemory(NewDummyKey, sizeof(B_TREE_KEY)); + + NewDummyKey->IndexEntry = NewIndexEntry; + + return NewDummyKey; } /** @@ -501,6 +732,42 @@ } /** +* @name GetSizeOfIndexEntries +* @implemented +* +* Sums the size of each index entry in every key in a B-Tree node. +* +* @param Node +* Pointer to a B_TREE_FILENAME_NODE. The size of this node's index entries will be returned. +* +* @returns +* The sum of the sizes of every index entry for each key in the B-Tree node. +* +* @remarks +* Gets only the size of the index entries; doesn't include the size of any headers that would be added to an index record. +*/ +ULONG +GetSizeOfIndexEntries(PB_TREE_FILENAME_NODE Node) +{ + // Start summing the total size of this node's entries + ULONG NodeSize = 0; + + // Walk through the list of Node Entries + PB_TREE_KEY CurrentKey = Node->FirstKey; + ULONG i; + for (i = 0; i < Node->KeyCount; i++) + { + ASSERT(CurrentKey->IndexEntry->Length != 0); + + // Add the length of the current node + NodeSize += CurrentKey->IndexEntry->Length; + CurrentKey = CurrentKey->NextKey; + } + + return NodeSize; +} + +/** * @name CreateIndexRootFromBTree * @implemented * @@ -686,6 +953,33 @@ return Status; } +/** +* @name SetIndexEntryVCN +* @implemented +* +* Sets the VCN of a given IndexEntry. +* +* @param IndexEntry +* Pointer to an INDEX_ENTRY_ATTRIBUTE structure that will have its VCN set. +* +* @param VCN +* VCN to store in the index entry. +* +* @remarks +* The index entry must have enough memory allocated to store the VCN, and must have the NTFS_INDEX_ENTRY_NODE flag set. +* The VCN of an index entry is stored at the very end of the structure, after the filename attribute. Since the filename +* attribute can be a variable size, this function makes setting this member easy. +*/ +VOID +SetIndexEntryVCN(PINDEX_ENTRY_ATTRIBUTE IndexEntry, ULONGLONG VCN) +{ + PULONGLONG Destination = (PULONGLONG)((ULONG_PTR)IndexEntry + IndexEntry->Length - sizeof(ULONGLONG)); + + ASSERT(IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE); + + *Destination = VCN; +} + NTSTATUS UpdateIndexAllocation(PDEVICE_EXTENSION DeviceExt, PB_TREE Tree, @@ -698,12 +992,19 @@ NTSTATUS Status; BOOLEAN HasIndexAllocation = FALSE; ULONG i; - - DPRINT1("UpdateIndexAllocations() called.\n"); - - Status = FindAttribute(DeviceExt, FileRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationContext, NULL); + ULONG IndexAllocationOffset; + + DPRINT1("UpdateIndexAllocation() called.\n"); + + Status = FindAttribute(DeviceExt, FileRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationContext, &IndexAllocationOffset); if (NT_SUCCESS(Status)) + { HasIndexAllocation = TRUE; + + PrintAllVCNs(DeviceExt, + IndexAllocationContext, + IndexBufferSize); + } // TODO: Handle bitmap BitmapContext = NULL; @@ -719,48 +1020,112 @@ DPRINT1("FIXME: Need to add index allocation\n"); return STATUS_NOT_IMPLEMENTED; } - else + + Status = UpdateIndexNode(DeviceExt, FileRecord, CurrentKey->LesserChild, IndexBufferSize, IndexAllocationContext, IndexAllocationOffset, BitmapContext); + if (!NT_SUCCESS(Status)) { - Status = UpdateIndexNode(DeviceExt, CurrentKey->LesserChild, IndexBufferSize, IndexAllocationContext, BitmapContext); - if (!NT_SUCCESS(Status)) + DPRINT1("ERROR: Failed to update index node!\n"); + ReleaseAttributeContext(IndexAllocationContext); + return Status; + } + + // Is the Index Entry large enough to store the VCN? + if (!CurrentKey->IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE) + { + // Allocate memory for the larger index entry + PINDEX_ENTRY_ATTRIBUTE NewEntry = ExAllocatePoolWithTag(NonPagedPool, + CurrentKey->IndexEntry->Length + sizeof(ULONGLONG), + TAG_NTFS); + if (!NewEntry) { - DPRINT1("ERROR: Failed to update index node!\n"); - ReleaseAttributeContext(IndexAllocationContext); - return Status; + DPRINT1("ERROR: Unable to allocate memory for new index entry!\n"); + if (HasIndexAllocation) + ReleaseAttributeContext(IndexAllocationContext); + return STATUS_INSUFFICIENT_RESOURCES; } + + // Copy the old entry to the new one + RtlCopyMemory(NewEntry, CurrentKey->IndexEntry, CurrentKey->IndexEntry->Length); + + NewEntry->Length += sizeof(ULONGLONG); + + // Free the old memory + ExFreePoolWithTag(CurrentKey->IndexEntry, TAG_NTFS); + + CurrentKey->IndexEntry = NewEntry; + CurrentKey->IndexEntry->Flags |= NTFS_INDEX_ENTRY_NODE; } + // Update the VCN stored in the index entry of CurrentKey + SetIndexEntryVCN(CurrentKey->IndexEntry, CurrentKey->LesserChild->NodeNumber); + } CurrentKey = CurrentKey->NextKey; } - if(HasIndexAllocation) + if (HasIndexAllocation) + { + PrintAllVCNs(DeviceExt, + IndexAllocationContext, + IndexBufferSize); + ReleaseAttributeContext(IndexAllocationContext); + } return STATUS_SUCCESS; } NTSTATUS UpdateIndexNode(PDEVICE_EXTENSION DeviceExt, + PFILE_RECORD_HEADER FileRecord, PB_TREE_FILENAME_NODE Node, ULONG IndexBufferSize, PNTFS_ATTR_CONTEXT IndexAllocationContext, + ULONG IndexAllocationOffset, PNTFS_ATTR_CONTEXT BitmapContext) { ULONG i; PB_TREE_KEY CurrentKey = Node->FirstKey; NTSTATUS Status; - DPRINT1("UpdateIndexNode(%p, %p, %lu, %p, %p) called for index node with VCN %I64u\n", DeviceExt, Node, IndexBufferSize, IndexAllocationContext, BitmapContext, Node->NodeNumber); + DPRINT1("UpdateIndexNode(%p, %p, %p, %lu, %p, %lu, %p) called for index node with VCN %I64u\n", + DeviceExt, + FileRecord, + Node, + IndexBufferSize, + IndexAllocationContext, + IndexAllocationOffset, + BitmapContext, + Node->NodeNumber); // Do we need to write this node to disk? if (Node->DiskNeedsUpdating) { ULONGLONG NodeOffset; ULONG LengthWritten; + PINDEX_BUFFER IndexBuffer; + + // Does the node need to be assigned a VCN? + if (!Node->ExistsOnDisk) + { + // Allocate the node + Status = AllocateIndexNode(DeviceExt, + FileRecord, + IndexBufferSize, + IndexAllocationContext, + IndexAllocationOffset, + &Node->NodeNumber); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to allocate index record in index allocation!\n"); + return Status; + } + + Node->ExistsOnDisk = TRUE; + } // Allocate memory for an index buffer - PINDEX_BUFFER IndexBuffer = ExAllocatePoolWithTag(NonPagedPool, IndexBufferSize, TAG_NTFS); + IndexBuffer = ExAllocatePoolWithTag(NonPagedPool, IndexBufferSize, TAG_NTFS); if (!IndexBuffer) { DPRINT1("ERROR: Failed to allocate %lu bytes for index buffer!\n", IndexBufferSize); @@ -780,7 +1145,7 @@ NodeOffset = GetAllocationOffsetFromVCN(DeviceExt, IndexBufferSize, Node->NodeNumber); // Write the buffer to the index allocation - Status = WriteAttribute(DeviceExt, IndexAllocationContext, NodeOffset, (const PUCHAR)IndexBuffer, IndexBufferSize, &LengthWritten, NULL); + Status = WriteAttribute(DeviceExt, IndexAllocationContext, NodeOffset, (const PUCHAR)IndexBuffer, IndexBufferSize, &LengthWritten, FileRecord); if (!NT_SUCCESS(Status) || LengthWritten != IndexBufferSize) { DPRINT1("ERROR: Failed to update index allocation!\n"); @@ -806,7 +1171,7 @@ if (CurrentKey->LesserChild) { // Update the child node on disk - Status = UpdateIndexNode(DeviceExt, CurrentKey->LesserChild, IndexBufferSize, IndexAllocationContext, BitmapContext); + Status = UpdateIndexNode(DeviceExt, FileRecord, CurrentKey->LesserChild, IndexBufferSize, IndexAllocationContext, IndexAllocationOffset, BitmapContext); if (!NT_SUCCESS(Status)) { DPRINT1("ERROR: Failed to update child node!\n"); @@ -996,6 +1361,9 @@ * * Inserts a FILENAME_ATTRIBUTE into a B-Tree node. * +* @param Tree +* Pointer to the B_TREE the key (filename attribute) is being inserted into. +* * @param FileReference * Reference number to the file being added. This will be a combination of the MFT index and update sequence number. * @@ -1008,28 +1376,36 @@ * @param CaseSensitive * Boolean indicating if the function should operate in case-sensitive mode. This will be TRUE * if an application created the file with the FILE_FLAG_POSIX_SEMANTICS flag. +* +* @param MaxIndexRootSize +* The maximum size, in bytes, of node entries that can be stored in the index root before it will grow too large for +* the file record. This number is just the size of the entries, without any headers for the attribute or index root. * * @remarks * A node is always sorted, with the least comparable filename stored first and a dummy key to mark the end. */ NTSTATUS -NtfsInsertKey(ULONGLONG FileReference, +NtfsInsertKey(PB_TREE Tree, + ULONGLONG FileReference, PFILENAME_ATTRIBUTE FileNameAttribute, PB_TREE_FILENAME_NODE Node, - BOOLEAN CaseSensitive) + BOOLEAN CaseSensitive, + ULONG MaxIndexRootSize) { PB_TREE_KEY NewKey, CurrentKey, PreviousKey; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS; ULONG NodeSize; ULONG AllocatedNodeSize; ULONG MaxNodeSizeWithoutHeader; ULONG i; - DPRINT1("NtfsInsertKey(0x%I64x, %p, %p, %s)\n", + DPRINT1("NtfsInsertKey(%p, 0x%I64x, %p, %p, %s, %lu)\n", + Tree, FileReference, FileNameAttribute, Node, - CaseSensitive ? "TRUE" : "FALSE"); + CaseSensitive ? "TRUE" : "FALSE", + MaxIndexRootSize); // Create the key for the filename attribute NewKey = CreateBTreeKeyFromFilename(FileReference, FileNameAttribute); @@ -1044,6 +1420,11 @@ // Should the New Key go before the current key? LONG Comparison = CompareTreeKeys(NewKey, CurrentKey, CaseSensitive); + if (Comparison == 0) + { + DPRINT1("\t\tComparison == 0: %.*S\n", NewKey->IndexEntry->FileName.NameLength, NewKey->IndexEntry->FileName.Name); + DPRINT1("\t\tComparison == 0: %.*S\n", CurrentKey->IndexEntry->FileName.NameLength, CurrentKey->IndexEntry->FileName.Name); + } ASSERT(Comparison != 0); // Is NewKey < CurrentKey? @@ -1054,7 +1435,14 @@ if (CurrentKey->LesserChild) { // Insert the key into the child node - Status = NtfsInsertKey(FileReference, FileNameAttribute, CurrentKey->LesserChild, CaseSensitive); + Status = NtfsInsertKey(Tree, FileReference, FileNameAttribute, CurrentKey->LesserChild, CaseSensitive, 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to insert key.\n"); + ExFreePoolWithTag(NewKey, TAG_NTFS); + return Status; + } + } else { @@ -1078,25 +1466,89 @@ CurrentKey = CurrentKey->NextKey; } - // Is the node larger than its allocated size? - NodeSize = 0; - CurrentKey = Node->FirstKey; - for (i = 0; i < Node->KeyCount; i++) - { - NodeSize += CurrentKey->IndexEntry->Length; - CurrentKey = CurrentKey->NextKey; - } - - // TEMPTEMP: TODO: MATH - AllocatedNodeSize = 0xfe8; - MaxNodeSizeWithoutHeader = AllocatedNodeSize - 0x28; - - if (NodeSize > MaxNodeSizeWithoutHeader) - { - DPRINT1("FIXME: Splitting a node is still a WIP!\n"); - //SplitBTreeNode(NULL, Node); - //DumpBTree(Tree); - return STATUS_NOT_IMPLEMENTED; + // Determine how much space the index entries will need + NodeSize = GetSizeOfIndexEntries(Node); + + // Is Node the root node? + if (Node == Tree->RootNode) + { + // Is the index root too large for the file record? + if (NodeSize > MaxIndexRootSize) + { + PB_TREE_FILENAME_NODE NewSubNode, NewIndexRoot; + PB_TREE_KEY DummyKey; + + DPRINT1("Collapsing Index Root into sub-node.\n") ; + + DumpBTree(Tree); + + // Create a new node that will hold the keys currently in index root + NewSubNode = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_FILENAME_NODE), TAG_NTFS); + if (!NewSubNode) + { + DPRINT1("ERROR: Couldn't allocate memory for new sub-node.\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlZeroMemory(NewSubNode, sizeof(B_TREE_FILENAME_NODE)); + + // Copy the applicable data from the old index root node + NewSubNode->KeyCount = Node->KeyCount; + NewSubNode->FirstKey = Node->FirstKey; + NewSubNode->DiskNeedsUpdating = TRUE; + + // Create a new dummy key, and make the new node it's child + DummyKey = CreateDummyKey(TRUE); + if (!DummyKey) + { + DPRINT1("ERROR: Couldn't allocate memory for new root node.\n"); + ExFreePoolWithTag(NewSubNode, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // Make the new node a child of the dummy key + DummyKey->LesserChild = NewSubNode; + + // Create a new index root node + NewIndexRoot = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_FILENAME_NODE), TAG_NTFS); + if (!NewIndexRoot) + { + DPRINT1("ERROR: Couldn't allocate memory for new index root.\n"); + ExFreePoolWithTag(NewSubNode, TAG_NTFS); + ExFreePoolWithTag(DummyKey, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlZeroMemory(NewIndexRoot, sizeof(B_TREE_FILENAME_NODE)); + + NewIndexRoot->DiskNeedsUpdating = TRUE; + + // Insert the dummy key into the new node + NewIndexRoot->FirstKey = DummyKey; + NewIndexRoot->KeyCount = 1; + NewIndexRoot->DiskNeedsUpdating = TRUE; + NewIndexRoot->ExistsOnDisk = TRUE; + + // Make the new node the Tree's root node + Tree->RootNode = NewIndexRoot; + + DumpBTree(Tree); + + return STATUS_SUCCESS; + } + } + else + { + // TEMPTEMP: TODO: MATH + AllocatedNodeSize = 0xfe8; + MaxNodeSizeWithoutHeader = AllocatedNodeSize - 0x28; + + // Has the node grown larger than its allocated size? + if (NodeSize > MaxNodeSizeWithoutHeader) + { + DPRINT1("FIXME: Splitting a node is still a WIP!\n"); + //SplitBTreeNode(NULL, Node); + //DumpBTree(Tree); + return STATUS_NOT_IMPLEMENTED; + } } // NewEntry and NewKey will be destroyed later by DestroyBTree() Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Tue Aug 15 19:57:55 2017 @@ -2056,9 +2056,10 @@ ULONG LengthWritten; PINDEX_ROOT_ATTRIBUTE NewIndexRoot; ULONG AttributeLength; + PNTFS_ATTR_RECORD NextAttribute; PB_TREE NewTree; ULONG BtreeIndexLength; - ULONG MaxIndexSize; + ULONG MaxIndexRootSize; // Allocate memory for the parent directory ParentFileRecord = ExAllocatePoolWithTag(NonPagedPool, @@ -2100,11 +2101,29 @@ } // Find the maximum index size given what the file record can hold - MaxIndexSize = DeviceExt->NtfsInfo.BytesPerFileRecord - - IndexRootOffset - - IndexRootContext->pRecord->Resident.ValueOffset - - FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) - - (sizeof(ULONG) * 2); + // First, find the max index size assuming index root is the last attribute + MaxIndexRootSize = DeviceExt->NtfsInfo.BytesPerFileRecord // Start with the size of a file record + - IndexRootOffset // Subtract the length of everything that comes before index root + - IndexRootContext->pRecord->Resident.ValueOffset // Subtract the length of the attribute header for index root + - FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) // Subtract the length of the index header for index root + - (sizeof(ULONG) * 2); // Subtract the length of the file record end marker and padding + + // Are there attributes after this one? + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)ParentFileRecord + IndexRootOffset + IndexRootContext->pRecord->Length); + if (NextAttribute->Type != AttributeEnd) + { + // Find the length of all attributes after this one, not counting the end marker + ULONG LengthOfAttributes = 0; + PNTFS_ATTR_RECORD CurrentAttribute = NextAttribute; + while (CurrentAttribute->Type != AttributeEnd) + { + LengthOfAttributes += CurrentAttribute->Length; + CurrentAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)CurrentAttribute + CurrentAttribute->Length); + } + + // Leave room for the existing attributes + MaxIndexRootSize -= LengthOfAttributes; + } // Allocate memory for the index root data I30IndexRootLength = AttributeDataLength(IndexRootContext->pRecord); @@ -2146,7 +2165,7 @@ DumpBTree(NewTree); // Insert the key for the file we're adding - Status = NtfsInsertKey(FileReferenceNumber, FilenameAttribute, NewTree->RootNode, CaseSensitive); + Status = NtfsInsertKey(NewTree, FileReferenceNumber, FilenameAttribute, NewTree->RootNode, CaseSensitive, MaxIndexRootSize); if (!NT_SUCCESS(Status)) { DPRINT1("ERROR: Failed to insert key into B-Tree!\n"); @@ -2172,7 +2191,7 @@ } // Create the Index Root from the B*Tree - Status = CreateIndexRootFromBTree(DeviceExt, NewTree, MaxIndexSize, &NewIndexRoot, &BtreeIndexLength); + Status = CreateIndexRootFromBTree(DeviceExt, NewTree, MaxIndexRootSize, &NewIndexRoot, &BtreeIndexLength); if (!NT_SUCCESS(Status)) { DPRINT1("ERROR: Failed to create Index root from B-Tree!\n"); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Tue Aug 15 19:57:55 2017 @@ -728,10 +728,12 @@ ULONGLONG Vcn); NTSTATUS -NtfsInsertKey(ULONGLONG FileReference, +NtfsInsertKey(PB_TREE Tree, + ULONGLONG FileReference, PFILENAME_ATTRIBUTE FileNameAttribute, PB_TREE_FILENAME_NODE Node, - BOOLEAN CaseSensitive); + BOOLEAN CaseSensitive, + ULONG MaxIndexRootSize); NTSTATUS UpdateIndexAllocation(PDEVICE_EXTENSION DeviceExt, @@ -741,9 +743,11 @@ NTSTATUS UpdateIndexNode(PDEVICE_EXTENSION DeviceExt, + PFILE_RECORD_HEADER FileRecord, PB_TREE_FILENAME_NODE Node, ULONG IndexBufferSize, PNTFS_ATTR_CONTEXT IndexAllocationContext, + ULONG IndexAllocationOffset, PNTFS_ATTR_CONTEXT BitmapContext); /* close.c */

7 years, 4 months

← Newer
1
...
14
15
16
17
18
19
20
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2017