Ros-diffs

ros-diffs@reactos.org

81390 discussions

[bfreisen] 68821: Some fixes to the scf file registry entry; added some missing entries (patch by gonzoMD)
by bfreisen＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: bfreisen Date: Tue Aug 25 14:24:41 2015 New Revision: 68821 URL: http://svn.reactos.org/svn/reactos?rev=68821&view=rev Log: Some fixes to the scf file registry entry; added some missing entries (patch by gonzoMD) Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Tue Aug 25 14:24:41 2015 @@ -272,11 +272,16 @@ ; shell command files (e.g. "Show Desktop" in quicklaunch bar) HKCR,".scf","",0x00000000,"SHCmdFile" +HKCR,"SHCmdFile","",0x00000000,"ReactOS Explorer Command" HKCR,"SHCmdFile","NeverShowExt",0x00000000,"" -HKCR,"SHCmdFile","IsShortcut",0x00000000,"yes" -HKCR,"SHCmdFile\shell\open\command","",0x00000000,"explorer.exe ""%1""" +HKCR,"SHCmdFile","InfoTip",0x00000000,"prop:DocComments" +HKCR,"SHCmdFile\shell\open\command","",0x00000000,"%systemroot%\explorer.exe" +HKCR,"SHCmdFile\shell\open\ddeexec","",0x00000000,"[ShellFile(\"%1\",\"%1\",%S)]" +HKCR,"SHCmdFile\shell\open\ddeexec\Application","",0x00000000,"Folders" +HKCR,"SHCmdFile\shell\open\ddeexec\Topic","",0x00000000,"AppProperties" HKCR,"SHCmdFile\CLSID","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" HKCR,"SHCmdFile\shellex\IconHandler","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" +HKCR,"SHCmdFile\shellex\DropHandler","",0x00000000,"{86C86720-42A0-1069-A2E8-08002B30309D}" ; System-Files HKCR,".sys","",0x00000000,"sysfile"

1 0

[bfreisen] 68820: [PSDK] Add methods to Gdiplus::Color
by bfreisen＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: bfreisen Date: Tue Aug 25 14:13:19 2015 New Revision: 68820 URL: http://svn.reactos.org/svn/reactos?rev=68820&view=rev Log: [PSDK] Add methods to Gdiplus::Color Modified: trunk/reactos/include/psdk/gdipluscolor.h trunk/reactos/include/psdk/gdiplusheaders.h trunk/reactos/include/psdk/gdiplusmatrix.h Modified: trunk/reactos/include/psdk/gdipluscolor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdipluscolor.… ============================================================================== --- trunk/reactos/include/psdk/gdipluscolor.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdipluscolor.h [iso-8859-1] Tue Aug 25 14:13:19 2015 @@ -1,5 +1,6 @@ /* - * Copyright (C) 2808 Google (Lei Zhang) + * Copyright (C) 2008 Google (Lei Zhang) + * 2015 Benedikt Freisen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,9 +31,94 @@ #ifdef __cplusplus -/* FIXME: missing the methods. */ class Color { +public: + Color(VOID) + { + Argb = 0xff000000; + } + + Color(ARGB argb) + { + Argb = argb; + } + + Color(BYTE r, BYTE g, BYTE b) + { + Argb = 0xff << 24 | r << 16 | g << 8 | b; + } + + Color(BYTE a, BYTE r, BYTE g, BYTE b) + { + Argb = a << 24 | r << 16 | g << 8 | b; + } + + BYTE GetA(VOID) + { + return (Argb >> 24) & 0xff; + } + + BYTE GetAlpha(VOID) + { + return (Argb >> 24) & 0xff; + } + + BYTE GetB(VOID) + { + return Argb & 0xff; + } + + BYTE GetBlue(VOID) + { + return Argb & 0xff; + } + + BYTE GetG(VOID) + { + return (Argb >> 8) & 0xff; + } + + BYTE GetGreen(VOID) + { + return (Argb >> 8) & 0xff; + } + + BYTE GetR(VOID) + { + return (Argb >> 16) & 0xff; + } + + BYTE GetRed(VOID) + { + return (Argb >> 16) & 0xff; + } + + ARGB GetValue(VOID) + { + return Argb; + } + + static ARGB MakeARGB(BYTE a, BYTE r, BYTE g, BYTE b) + { + return a << 24 | r << 16 | g << 8 | b; + } + + VOID SetFromCOLORREF(COLORREF rgb) + { + Argb = 0xff000000 | rgb & 0x000000ff << 16 | rgb & 0x0000ff00 | rgb & 0x00ff0000 >> 16; + } + + VOID SetValue(ARGB argb) + { + Argb = argb; + } + + COLORREF ToCOLORREF(VOID) + { + return Argb & 0x000000ff << 16 | Argb & 0x0000ff00 | Argb & 0x00ff0000 >> 16; + } + protected: ARGB Argb; }; Modified: trunk/reactos/include/psdk/gdiplusheaders.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusheader… ============================================================================== --- trunk/reactos/include/psdk/gdiplusheaders.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusheaders.h [iso-8859-1] Tue Aug 25 14:13:19 2015 @@ -24,202 +24,252 @@ public: friend class Graphics; - Image(IStream *stream, BOOL useEmbeddedColorManagement) - { - } - - Image(const WCHAR *filename, BOOL useEmbeddedColorManagement) - { + Image(IStream *stream, BOOL useEmbeddedColorManagement = FALSE) + { + if (useEmbeddedColorManagement) + status = DllExports::GdipLoadImageFromStreamICM(stream, &image); + else + status = DllExports::GdipLoadImageFromStream(stream, &image); + } + + Image(const WCHAR *filename, BOOL useEmbeddedColorManagement = FALSE) + { + if (useEmbeddedColorManagement) + status = DllExports::GdipLoadImageFromFileICM(filename, &image); + else + status = DllExports::GdipLoadImageFromFile(filename, &image); } Image *Clone(VOID) { - return NULL; - } - - static Image *FromFile(const WCHAR *filename, BOOL useEmbeddedColorManagement) - { - return NULL; - } - - static Image *FromStream(IStream *stream, BOOL useEmbeddedColorManagement) - { - return NULL; + Image *newImage = new Image(); + SetStatus(DllExports::GdipCloneImage(image, &(newImage->image))); + return newImage; + } + + static Image *FromFile(const WCHAR *filename, BOOL useEmbeddedColorManagement = FALSE) + { + return new Image(filename, useEmbeddedColorManagement); + } + + static Image *FromStream(IStream *stream, BOOL useEmbeddedColorManagement = FALSE) + { + return new Image(stream, useEmbeddedColorManagement); } Status GetAllPropertyItems(UINT totalBufferSize, UINT numProperties, PropertyItem *allItems) { - return NotImplemented; + return SetStatus(DllExports::GdipGetAllPropertyItems(image, totalBufferSize, numProperties, allItems)); } Status GetBounds(RectF *srcRect, Unit *srcUnit) { - return NotImplemented; + return SetStatus(DllExports::GdipGetImageBounds(image, srcRect, srcUnit)); } Status GetEncoderParameterList(const CLSID *clsidEncoder, UINT size, EncoderParameters *buffer) { - return NotImplemented; + return SetStatus(DllExports::GdipGetEncoderParameterList(image, clsidEncoder, size, buffer)); } UINT GetEncoderParameterListSize(const CLSID *clsidEncoder) { - return 0; + UINT size; + SetStatus(DllExports::GdipGetEncoderParameterListSize(image, clsidEncoder, &size)); + return size; } UINT GetFlags(VOID) { - return 0; + UINT flags; + SetStatus(DllExports::GdipGetImageFlags(image, &flags)); + return flags; } UINT GetFrameCount(const GUID *dimensionID) { - return 0; + UINT count; + SetStatus(DllExports::GdipImageGetFrameCount(image, dimensionID, &count)); + return count; } UINT GetFrameDimensionsCount(VOID) { - return 0; + UINT count; + SetStatus(DllExports::GdipImageGetFrameDimensionsCount(image, &count)); + return count; } Status GetFrameDimensionsList(GUID *dimensionIDs, UINT count) { - return NotImplemented; + return SetStatus(DllExports::GdipImageGetFrameDimensionsList(image, dimensionIDs, count)); } UINT GetHeight(VOID) { - return 0; + UINT height; + SetStatus(DllExports::GdipGetImageHeight(image, &height)); + return height; } REAL GetHorizontalResolution(VOID) { - return 0; + REAL resolution; + SetStatus(DllExports::GdipGetImageHorizontalResolution(image, &resolution)); + return resolution; } Status GetLastStatus(VOID) { - return NotImplemented; + return status; } Status GetPalette(ColorPalette *palette, INT size) { - return NotImplemented; + return SetStatus(DllExports::GdipGetImagePalette(image, palette, size)); } INT GetPaletteSize(VOID) { - return 0; + INT size; + SetStatus(DllExports::GdipGetImagePaletteSize(image, &size)); + return size; } Status GetPhysicalDimension(SizeF *size) { - return NotImplemented; + return SetStatus(DllExports::GdipGetImagePhysicalDimension(image, &(size->Width), &(size->Height))); } PixelFormat GetPixelFormat(VOID) { - return PixelFormatUndefined; + PixelFormat format; + SetStatus(DllExports::GdipGetImagePixelFormat(image, &format)); + return format; } UINT GetPropertyCount(VOID) { - return 0; + UINT numOfProperty; + SetStatus(DllExports::GdipGetPropertyCount(image, &numOfProperty)); + return numOfProperty; } Status GetPropertyIdList(UINT numOfProperty, PROPID *list) { - return NotImplemented; + return SetStatus(DllExports::GdipGetPropertyIdList(image, numOfProperty, list)); } Status GetPropertyItem(PROPID propId, UINT propSize, PropertyItem *buffer) { - return NotImplemented; + return SetStatus(DllExports::GdipGetPropertyItem(image, propId, propSize, buffer)); } UINT GetPropertyItemSize(PROPID propId) { - return 0; + UINT size; + SetStatus(DllExports::GdipGetPropertyItemSize(image, propId, &size)); + return size; } Status GetPropertySize(UINT *totalBufferSize, UINT *numProperties) { - return NotImplemented; + return SetStatus(DllExports::GdipGetPropertySize(image, totalBufferSize, numProperties)); } Status GetRawFormat(GUID *format) { - return NotImplemented; + return SetStatus(DllExports::GdipGetRawFormat(image, format)); } Image *GetThumbnailImage(UINT thumbWidth, UINT thumbHeight, GetThumbnailImageAbort callback, VOID *callbackData) { - return NULL; + Image *thumbImage = new Image(); + SetStatus(DllExports::GdipGetImageThumbnail(image, thumbWidth, thumbHeight, &(thumbImage->image), callback, callbackData)); + return thumbImage; } ImageType GetType(VOID) { - return ImageTypeUnknown; + ImageType type; + SetStatus(DllExports::GdipGetImageType(image, &type)); + return type; } REAL GetVerticalResolution(VOID) { - return 0; + REAL resolution; + SetStatus(DllExports::GdipGetImageVerticalResolution(image, &resolution)); + return resolution; } UINT GetWidth(VOID) { - return 0; + UINT width; + SetStatus(DllExports::GdipGetImageWidth(image, &width)); + return width; } Status RemovePropertyItem(PROPID propId) { - return NotImplemented; + return SetStatus(DllExports::GdipRemovePropertyItem(image, propId)); } Status RotateFlip(RotateFlipType rotateFlipType) { - return NotImplemented; + return SetStatus(DllExports::GdipImageRotateFlip(image, rotateFlipType)); } Status Save(IStream *stream, const CLSID *clsidEncoder, const EncoderParameters *encoderParams) { - return NotImplemented; + return SetStatus(DllExports::GdipSaveImageToStream(image, stream, clsidEncoder, encoderParams)); } Status Save(const WCHAR *filename, const CLSID *clsidEncoder, const EncoderParameters *encoderParams) { - return NotImplemented; + return SetStatus(DllExports::GdipSaveImageToFile(image, filename, clsidEncoder, encoderParams)); } Status SaveAdd(const EncoderParameters* encoderParams) { - return NotImplemented; + return SetStatus(DllExports::GdipSaveAdd(image, encoderParams)); } Status SaveAdd(Image *newImage, const EncoderParameters *encoderParams) { - return NotImplemented; + return SetStatus(DllExports::GdipSaveAddImage(image, newImage->image, encoderParams)); } Status SelectActiveFrame(const GUID *dimensionID, UINT frameIndex) { - return NotImplemented; + return SetStatus(DllExports::GdipImageSelectActiveFrame(image, dimensionID, frameIndex)); } Status SetPalette(const ColorPalette* palette) { - return NotImplemented; + return SetStatus(DllExports::GdipSetImagePalette(image, palette)); } Status SetPropertyItem(const PropertyItem* item) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPropertyItem(image, item)); } protected: Image() { + } + +private: + mutable Status status; + GpImage *image; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; } }; @@ -229,14 +279,17 @@ public: Bitmap(IDirectDrawSurface7 *surface) { + status = DllExports::GdipCreateBitmapFromDirectDrawSurface(surface, &bitmap); } Bitmap(INT width, INT height, Graphics *target) { + status = DllExports::GdipCreateBitmapFromGraphics(width, height, target->graphics, &bitmap); } Bitmap(const BITMAPINFO *gdiBitmapInfo, VOID *gdiBitmapData) { + status = DllExports::GdipCreateBitmapFromGdiDib(gdiBitmapInfo, gdiBitmapData, &bitmap); } Bitmap(INT width, INT height, PixelFormat format) @@ -245,116 +298,157 @@ Bitmap(HBITMAP hbm, HPALETTE hpal) { + status = DllExports::GdipCreateBitmapFromHBITMAP(hbm, hpal, &bitmap); } Bitmap(INT width, INT height, INT stride, PixelFormat format, BYTE *scan0) { + status = DllExports::GdipCreateBitmapFromScan0(width, height, stride, format, scan0, &bitmap); } Bitmap(const WCHAR *filename, BOOL useIcm) { + if (useIcm) + status = DllExports::GdipCreateBitmapFromFileICM(filename, &bitmap); + else + status = DllExports::GdipCreateBitmapFromFile(filename, &bitmap); } Bitmap(HINSTANCE hInstance, const WCHAR *bitmapName) { + status = DllExports::GdipCreateBitmapFromResource(hInstance, bitmapName, &bitmap); } Bitmap(HICON hicon) { + status = DllExports::GdipCreateBitmapFromHICON(hicon, &bitmap); } Bitmap(IStream *stream, BOOL useIcm) { + if (useIcm) + status = DllExports::GdipCreateBitmapFromStreamICM(stream, &bitmap); + else + status = DllExports::GdipCreateBitmapFromStream(stream, &bitmap); } Bitmap *Clone(const Rect &rect, PixelFormat format) { - return NULL; + Bitmap *dstBitmap = new Bitmap(); + SetStatus(DllExports::GdipCloneBitmapAreaI(rect.X, rect.Y, rect.Width, rect.Height, format, bitmap, &(dstBitmap->bitmap))); + return dstBitmap; } Bitmap *Clone(const RectF &rect, PixelFormat format) { - return NULL; + Bitmap *dstBitmap = new Bitmap(); + SetStatus(DllExports::GdipCloneBitmapArea(rect.X, rect.Y, rect.Width, rect.Height, format, bitmap, &(dstBitmap->bitmap))); + return dstBitmap; } Bitmap *Clone(REAL x, REAL y, REAL width, REAL height, PixelFormat format) { - return NULL; + Bitmap *dstBitmap = new Bitmap(); + SetStatus(DllExports::GdipCloneBitmapArea(x, y, width, height, format, bitmap, &(dstBitmap->bitmap))); + return dstBitmap; } Bitmap *Clone(INT x, INT y, INT width, INT height, PixelFormat format) { - return NULL; + Bitmap *dstBitmap = new Bitmap(); + SetStatus(DllExports::GdipCloneBitmapAreaI(x, y, width, height, format, bitmap, &(dstBitmap->bitmap))); + return dstBitmap; } static Bitmap *FromBITMAPINFO(const BITMAPINFO *gdiBitmapInfo, VOID *gdiBitmapData) { - return NULL; + return new Bitmap(gdiBitmapInfo, gdiBitmapData); } static Bitmap *FromDirectDrawSurface7(IDirectDrawSurface7 *surface) { - return NULL; + return new Bitmap(surface); } static Bitmap *FromFile(const WCHAR *filename, BOOL useEmbeddedColorManagement) { - return NULL; + return new Bitmap(filename, useEmbeddedColorManagement); } static Bitmap *FromHBITMAP(HBITMAP hbm, HPALETTE hpal) { - return NULL; + return new Bitmap(hbm, hpal); } static Bitmap *FromHICON(HICON hicon) { - return NULL; + return new Bitmap(hicon); } static Bitmap *FromResource(HINSTANCE hInstance, const WCHAR *bitmapName) { - return NULL; + return new Bitmap(hInstance, bitmapName); } static Bitmap *FromStream(IStream *stream, BOOL useEmbeddedColorManagement) { - return NULL; + return new Bitmap(stream, useEmbeddedColorManagement); } Status GetHBITMAP(const Color &colorBackground, HBITMAP *hbmReturn) { - return NotImplemented; + return SetStatus(DllExports::GdipCreateHBITMAPFromBitmap(bitmap, hbmReturn, colorBackground.GetValue())); } Status GetHICON(HICON *hicon) { - return NotImplemented; + return SetStatus(DllExports::GdipCreateHICONFromBitmap(bitmap, hbmReturn)); } Status GetPixel(INT x, INT y, Color *color) { - return NotImplemented; + ARGB argb; + Status s = SetStatus(DllExports::GdipBitmapGetPixel(bitmap, x, y, &argb)); + if (color != NULL) + color->SetValue(argb); + return s; } Status LockBits(const Rect *rect, UINT flags, PixelFormat format, BitmapData *lockedBitmapData) { - return NotImplemented; + return SetStatus(DllExports::GdipBitmapLockBits(bitmap, rect, flags, format, lockedBitmapData)); } Status SetPixel(INT x, INT y, const Color &color) { - return NotImplemented; + return SetStatus(DllExports::GdipBitmapSetPixel(bitmap, x, y, color.GetValue())); } Status SetResolution(REAL xdpi, REAL ydpi) { - return NotImplemented; + return SetStatus(DllExports::GdipBitmapSetResolution(bitmap, xdpi, ydpi)); } Status UnlockBits(BitmapData *lockedBitmapData) { - return NotImplemented; + return SetStatus(DllExports::GdipBitmapUnlockBits(bitmap, lockedBitmapData)); + } + +protected: + Bitmap() + { + } + +private: + mutable Status status; + GpBitmap *bitmap; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; } }; @@ -364,12 +458,17 @@ public: CachedBitmap(Bitmap *bitmap, Graphics *graphics) { + status = DllExports::GdipCreateCachedBitmap(bitmap, graphics, &cachedBitmap); } Status GetLastStatus(VOID) { - return NotImplemented; - } + return status; + } + +private: + mutable Status status; + GpCachedBitmap *cachedBitmap; }; @@ -378,9 +477,11 @@ public: friend class FontFamily; friend class FontCollection; + friend class Graphics; Font(const FontFamily *family, REAL emSize, INT style, Unit unit) { + status = DllExports::GdipCreateFont(family->fontFamily, emSize, style. unit, &font); } Font(HDC hdc, const HFONT hfont) @@ -389,10 +490,12 @@ Font(HDC hdc, const LOGFONTA *logfont) { + status = DllExports::GdipCreateFontFromLogfontA(hdc, logfont, &font); } Font(HDC hdc, const LOGFONTW *logfont) { + status = DllExports::GdipCreateFontFromLogfontW(hdc, logfont, &font); } Font(const WCHAR *familyName, REAL emSize, INT style, Unit unit, const FontCollection *fontCollection) @@ -401,61 +504,86 @@ Font(HDC hdc) { + status = DllExports::GdipCreateFontFromDC(hdc, &font); } Font *Clone(VOID) const { - return NULL; + Font *cloneFont = new Font(); + cloneFont->status = DllExports::GdipCloneFont(font, &(cloneFont->font)); + return cloneFont; } Status GetFamily(FontFamily* family) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetFamily(font, &(family->fontFamily))); } REAL GetHeight(const Graphics* graphics) const { - return 0; + REAL height; + SetStatus(DllExports::GdipGetFontHeight(font, graphics->graphics, &height)); + return height; } REAL GetHeight(REAL dpi) const { - return 0; + REAL height; + SetStatus(DllExports::GdipGetFontHeightGivenDPI(font, dpi, &height)); + return height; } Status GetLastStatus(VOID) const { - return NotImplemented; + return status; } Status GetLogFontA(const Graphics *g, LOGFONTA *logfontA) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetLogFontA(font, g->graphics, logfontA)); } Status GetLogFontW(const Graphics *g, LOGFONTW *logfontW) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetLogFontW(font, g->graphics, logfontW)); } REAL GetSize(VOID) const { - return 0; + REAL size; + SetStatus(DllExports::GdipGetFontSize(font, &size)); + return size; } INT GetStyle(VOID) const { - return 0; + INT style; + SetStatus(DllExports::GdipGetFontStyle(font, &style)); + return style; } Unit GetUnit(VOID) const { - return UnitWorld; + Unit unit; + SetStatus(DllExports::GdipGetFontUnit(font, &unit); + return unit; } BOOL IsAvailable(VOID) const { return FALSE; + } + +private: + mutable Status status; + GpFont *font; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; } }; @@ -493,6 +621,7 @@ FontFamily(const WCHAR *name, const FontCollection *fontCollection) { + status = DllExports::GdipCreateFontFamilyFromName(name, fontCollection, &fontFamily); } FontFamily *Clone(VOID) @@ -502,47 +631,61 @@ static const FontFamily *GenericMonospace(VOID) { - return NULL; + FontFamily *genericMonospace = new FontFamily(); + genericMonospace->status = DllExports::GdipGetGenericFontFamilyMonospace(&(genericMonospace->fontFamily)); + return genericMonospace; } static const FontFamily *GenericSansSerif(VOID) { - return NULL; + FontFamily *genericSansSerif = new FontFamily(); + genericSansSerif->status = DllExports::GdipGetGenericFontFamilySansSerif(&(genericSansSerif->fontFamily)); + return genericSansSerif; } static const FontFamily *GenericSerif(VOID) { - return NULL; + FontFamily *genericSerif = new FontFamily(); + genericSerif->status = DllExports::GdipGetGenericFontFamilyMonospace(&(genericSerif->fontFamily)); + return genericSerif; } UINT16 GetCellAscent(INT style) const { - return 0; + UINT16 CellAscent; + SetStatus(DllExports::GdipGetCellAscent(fontFamily, style, &CellAscent)); + return CellAscent; } UINT16 GetCellDescent(INT style) const { - return 0; + UINT16 CellDescent; + SetStatus(DllExports::GdipGetCellDescent(fontFamily, style, &CellDescent)); + return CellDescent; } UINT16 GetEmHeight(INT style) { - return 0; + UINT16 EmHeight; + SetStatus(DllExports::GdipGetEmHeight(fontFamily, style, &EmHeight)); + return EmHeight; } Status GetFamilyName(WCHAR name[LF_FACESIZE], WCHAR language) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetFamilyName(fontFamily, name, language)); } Status GetLastStatus(VOID) const { - return NotImplemented; + return status; } UINT16 GetLineSpacing(INT style) const { - return 0; + UINT16 LineSpacing; + SetStatus(DllExports::GdipGetLineSpacing(fontFamily, style, &LineSpacing)); + return LineSpacing; } BOOL IsAvailable(VOID) const @@ -552,7 +695,21 @@ BOOL IsStyleAvailable(INT style) const { - return FALSE; + BOOL StyleAvailable; + SetStatus(DllExports::GdipIsStyleAvailable(fontFamily, style, &StyleAvailable)); + return StyleAvailable; + } + +private: + mutable Status status; + GpFontFamily *fontFamily; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; } }; @@ -588,266 +745,315 @@ class Region : public GdiplusBase { public: + friend class Graphics; friend class GraphicsPath; friend class Matrix; Region(const Rect &rect) { + status = DllExports::GdipCreateRegionRectI(&rect, &region); } Region(VOID) { + status = DllExports::GdipCreateRegion(&region); } Region(const BYTE *regionData, INT size) { + status = DllExports::GdipCreateRegionRgnData(regionData, size, &region); } Region(const GraphicsPath *path) { + status = DllExports::GdipCreateRegionPath(path->path, &region); } Region(HRGN hRgn) { + status = DllExports::GdipCreateRegionHrgn(hRgn, &region); } Region(const RectF &rect) { + status = DllExports::GdipCreateRegionRectF(&rect, &region); } Region *Clone(VOID) { - return NULL; + region *cloneRegion = new Region(); + cloneRegion->status = DllExports::GdipCloneRegion(region, &cloneRegion); + return cloneRegion; } Status Complement(const GraphicsPath *path) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeComplement)); } Status Complement(const Region *region) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeComplement)); } Status Complement(const Rect &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRectI(region, &rect, CombineModeComplement)); } Status Complement(const RectF &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRect(region, &rect, CombineModeComplement)); } BOOL Equals(const Region *region, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsEqualRegion(this->region, region->region, g->graphics, &result)); + return result; } Status Exclude(const GraphicsPath *path) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeExclude)); } Status Exclude(const RectF &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRect(region, &rect, CombineModeExclude)); } Status Exclude(const Rect &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRectI(region, &rect, CombineModeExclude)); } Status Exclude(const Region *region) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeExclude)); } static Region *FromHRGN(HRGN hRgn) { - return NULL; + return new Region(hRgn); } Status GetBounds(Rect *rect, const Graphics *g) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetRegionBoundsI(region, g->graphics, rect)); } Status GetBounds(RectF *rect, const Graphics *g) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetRegionBounds(region, g->graphics, rect)); } Status GetData(BYTE *buffer, UINT bufferSize, UINT *sizeFilled) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetRegionData(region, budder, bufferSize, sizeFilled)); } UINT GetDataSize(VOID) const { - return 0; + UINT bufferSize; + SetStatus(DllExports::GdipGetRegionDataSize(region, &bufferSize)); + return bufferSize; } HRGN GetHRGN(const Graphics *g) const { - return NULL; + HRGN hRgn; + SetStatus(DllExports::GdipGetRegionHRgn(region, g->graphics, &hRgn)); + return hRgn; } Status GetLastStatus(VOID) { - return NotImplemented; + return status; } Status GetRegionScans(const Matrix *matrix, Rect *rects, INT *count) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetRegionScansI(region, rects, count, matrix->matrix)); } Status GetRegionScans(const Matrix *matrix, RectF *rects, INT *count) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetRegionScans(region, rects, count, matrix->matrix)); } UINT GetRegionScansCount(const Matrix *matrix) const { - return 0; + UINT count; + SetStatus(DllExports::GdipGetRegionScansCount(region, &count, matrix->matrix)); + return count; } Status Intersect(const Rect &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRectI(region, &rect, CombineModeIntersect)); } Status Intersect(const GraphicsPath *path) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeIntersect)); } Status Intersect(const RectF &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRect(region, &rect, CombineModeIntersect)); } Status Intersect(const Region *region) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeIntersect)); } BOOL IsEmpty(const Graphics *g) const { - return NotImplemented; + BOOL result; + SetStatus(DllExports::GdipIsEmptyRegion(region, g->graphics, &result)); + return result; } BOOL IsInfinite(const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsInfiniteRegion(region, g->graphics, &result)); + return result; } BOOL IsVisible(const PointF &point, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionPoint(region, point.x, point.y, g->graphics, &result)); + return result; } BOOL IsVisible(const RectF &rect, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionRect(region, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, g->graphics, &result)); + return result; } BOOL IsVisible(const Rect &rect, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionRectI(region, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, g->graphics, &result)); + return result; } BOOL IsVisible(INT x, INT y, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionPointI(region, x, y, g->graphics, &result)); + return result; } BOOL IsVisible(REAL x, REAL y, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionPoint(region, x, y, g->graphics, &result)); + return result; } BOOL IsVisible(INT x, INT y, INT width, INT height, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionRectI(region, x, y, width, height, g->graphics, &result)); + return result; } BOOL IsVisible(const Point &point, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionPointI(region, point.x, point.y, g->graphics, &result)); + return result; } BOOL IsVisible(REAL x, REAL y, REAL width, REAL height, const Graphics *g) const { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsVisibleRegionRect(region, x, y, width, height, g->graphics, &result)); + return result; } Status MakeEmpty(VOID) { - return NotImplemented; + return SetStatus(DllExports::GdipSetEmpty(region)); } Status MakeInfinite(VOID) { - return NotImplemented; + return SetStatus(DllExports::GdipSetInfinite(region)); } Status Transform(const Matrix *matrix) { - return NotImplemented; + return SetStatus(DllExports::GdipTransformRegion(region, matrix->matrix)); } Status Translate(REAL dx, REAL dy) { - return NotImplemented; + return SetStatus(DllExports::GdipTranslateRegion(region, dx, dy)); } Status Translate(INT dx, INT dy) { - return NotImplemented; + return SetStatus(DllExports::GdipTranslateRegionI(region, dx, dy)); } Status Union(const Rect &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRectI(region, &rect, CombineModeUnion)); } Status Union(const Region *region) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeUnion)); } Status Union(const RectF &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRect(region, &rect, CombineModeUnion)); } Status Union(const GraphicsPath *path) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeUnion)); } Status Xor(const GraphicsPath *path) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionPath(region, path->path, CombineModeXor)); } Status Xor(const RectF &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRect(region, &rect, CombineModeXor)); } Status Xor(const Rect &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRectI(region, &rect, CombineModeXor)); } Status Xor(const Region *region) { - return NotImplemented; + return SetStatus(DllExports::GdipCombineRegionRegion(this->region, region->region, CombineModeXor)); + } + +private: + mutable Status status; + GpRegion *region; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; } }; Modified: trunk/reactos/include/psdk/gdiplusmatrix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusmatrix… ============================================================================== --- trunk/reactos/include/psdk/gdiplusmatrix.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusmatrix.h [iso-8859-1] Tue Aug 25 14:13:19 2015 @@ -24,58 +24,75 @@ public: Matrix(const RectF &rect, const PointF *dstplg) { + status = DllExports::GdipCreateMatrix3(&rect, dstplg, &matrix); } Matrix(const Rect &rect, const Point *dstplg) { + status = DllExports::GdipCreateMatrix3I(&rect, dstplg, &matrix); } Matrix(VOID) { + status = DllExports::GdipCreateMatrix(&matrix); } Matrix(REAL m11, REAL m12, REAL m21, REAL m22, REAL dx, REAL dy) { + status = DllExports::GdipCreateMatrix2(m11, m12, m21, m22, dx, dy, &matrix); } Matrix *Clone(VOID) { - return NULL; + Matrix *cloneMatrix = new Matrix(); // FIXME: Matrix::matrix already initialized --> potential memory leak + cloneMatrix->status = DllExports::GdipCloneMatrix(matrix, &cloneMatrix); + return cloneMatrix; } - static BOOL Equals(const Matrix* matrix) + ~Matrix(VOID) { - return FALSE; + DllExports::GdipDeleteMatrix(matrix); + } + + BOOL Equals(const Matrix* matrix) + { + BOOL result; + SetStatus(DllExports::GdipIsMatrixEqual(this->matrix, matrix->matrix, &result)); + return result; } Status GetElements(REAL *m) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetMatrixElements(matrix, m)); } Status GetLastStatus(VOID) { - return NotImplemented; + return status; } Status Invert(VOID) { - return NotImplemented; + return SetStatus(DllExports::GdipInvertMatrix(matrix)); } BOOL IsIdentity(VOID) { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsMatrixIdentity(matrix, &result)); + return result; } BOOL IsInvertible(VOID) { - return FALSE; + BOOL result; + SetStatus(DllExports::GdipIsMatrixInvertible(matrix, &result)); + return result; } Status Multiply(const Matrix *matrix, MatrixOrder order) { - return NotImplemented; + return SetStatus(DllExports::GdipMultiplyMatrix(this->matrix, matrix->matrix, order)); } REAL OffsetX(VOID) @@ -95,7 +112,7 @@ Status Rotate(REAL angle, MatrixOrder order) { - return NotImplemented; + return SetStatus(DllExports::GdipRotateMatrix(matrix, angle, order)); } Status RotateAt(REAL angle, const PointF &center, MatrixOrder order) @@ -105,42 +122,54 @@ Status Scale(REAL scaleX, REAL scaleY, MatrixOrder order) { - return NotImplemented; + return SetStatus(DllExports::GdipScaleMatrix(matrix, scaleX, scaleY, order)); } Status SetElements(REAL m11, REAL m12, REAL m21, REAL m22, REAL dx, REAL dy) { - return NotImplemented; + return SetStatus(DllExports::GdipSetMatrixElements(matrix, m11, m12, m21, m22, dx, dy)); } Status Shear(REAL shearX, REAL shearY, REAL order) { - return NotImplemented; + return SetStatus(DllExports::GdipShearMatrix(matrix, shearX, shearY, order)); } Status TransformPoints(Point *pts, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipTransformMatrixPointsI(matrix, pts, count)); } Status TransformPoints(PointF *pts, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipTransformMatrixPoints(matrix, pts, count)); } Status TransformVectors(Point *pts, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipVectorTransformMatrixPointsI(matrix, pts, count)); } Status TransformVectors(PointF *pts, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipVectorTransformMatrixPoints(matrix, pts, count)); } Status Translate(REAL offsetX, REAL offsetY, REAL order) { - return NotImplemented; + return SetStatus(DllExports::GdipTranslateMatrix(matrix, offsetX, offsetY, order)); + } + +private: + mutable Status status; + GpMatrix *matrix; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; } };

1 0

[hbelusca] 68819: [NTVDM]: Initialize the correct buffer! (aka. fix confusion between ConsoleFramebuffer and Graphics Framebuffer; fixes text -> graphic transitions). Addendum for r68812
by hbelusca＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: hbelusca Date: Tue Aug 25 12:46:40 2015 New Revision: 68819 URL: http://svn.reactos.org/svn/reactos?rev=68819&view=rev Log: [NTVDM]: Initialize the correct buffer! (aka. fix confusion between ConsoleFramebuffer and Graphics Framebuffer; fixes text -> graphic transitions). Addendum for r68812 Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Tue Aug 25 12:46:40 2015 @@ -1014,7 +1014,7 @@ ConsoleMutex = GraphicsBufferInfo.hMutex; /* Clear the framebuffer */ - RtlZeroMemory(ConsoleFramebuffer, BitmapInfo->bmiHeader.biSizeImage); + RtlZeroMemory(GraphicsFramebuffer, BitmapInfo->bmiHeader.biSizeImage); /* Set the active buffer */ VgaSetActiveScreenBuffer(GraphicsConsoleBuffer);

1 0

[hbelusca] 68818: [SHELL32]: Add the trailing '...' after the "Run as" command in order to indicate more information is needed before performing the action. CORE-10039 #comment '...' added in r68818.
by hbelusca＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: hbelusca Date: Tue Aug 25 12:18:32 2015 New Revision: 68818 URL: http://svn.reactos.org/svn/reactos?rev=68818&view=rev Log: [SHELL32]: Add the trailing '...' after the "Run as" command in order to indicate more information is needed before performing the action. CORE-10039 #comment '...' added in r68818. Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "ÐÑÐ²Ð°ÑÑÐ½Ðµ" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "ÐÐ·Ð¿ÑÐ»Ð½ÑÐ²Ð°Ð½Ðµ ÐºÐ°ÑÐ¾ " + IDS_RUNAS_VERB "ÐÐ·Ð¿ÑÐ»Ð½ÑÐ²Ð°Ð½Ðµ ÐºÐ°ÑÐ¾..." IDS_EDIT_VERB "ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ°" IDS_FIND_VERB "Ð¢ÑÑÑÐµÐ½Ðµ" IDS_PRINT_VERB "Ð Ð°Ð·Ð¿ÐµÑÐ°ÑÐ²Ð°Ð½Ðµ" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -800,7 +800,7 @@ IDS_OPEN_VERB "OtevÅÃt" IDS_EXPLORE_VERB "Prozkoumat" - IDS_RUNAS_VERB "Spustit jako " + IDS_RUNAS_VERB "Spustit jako..." IDS_EDIT_VERB "Upravit" IDS_FIND_VERB "NajÃt" IDS_PRINT_VERB "Tisknout" Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -800,7 +800,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -795,7 +795,7 @@ IDS_OPEN_VERB "Ãffnen" IDS_EXPLORE_VERB "Durchsuchen" - IDS_RUNAS_VERB "AusfÃ¼hren als " + IDS_RUNAS_VERB "AusfÃ¼hren als..." IDS_EDIT_VERB "Bearbeiten" IDS_FIND_VERB "Finden" IDS_PRINT_VERB "Drucken" Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -795,7 +795,7 @@ IDS_OPEN_VERB "Abrir" IDS_EXPLORE_VERB "Explorar" - IDS_RUNAS_VERB "Ejecutar como ..." + IDS_RUNAS_VERB "Ejecutar como..." IDS_EDIT_VERB "Editar" IDS_FIND_VERB "Buscar" IDS_PRINT_VERB "Imprimir" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -351,7 +351,7 @@ IDD_RUN_AS DIALOGEX 0, 0, 240, 190 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Lancer en tant que" +CAPTION "ExÃ©cuter en tant que" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Quel compte d'utilisateur dÃ©sirez-vous utiliser pour lancer ce programme?", -1, 10, 20, 220, 20 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Ouvrir" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Lancer en tant que " + IDS_RUNAS_VERB "ExÃ©cuter en tant que..." IDS_EDIT_VERB "Ãditer" IDS_FIND_VERB "Chercher" IDS_PRINT_VERB "Imprimer" Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Apri" IDS_EXPLORE_VERB "Esplora" - IDS_RUNAS_VERB "Esegui come " + IDS_RUNAS_VERB "Esegui come..." IDS_EDIT_VERB "Modifica" IDS_FIND_VERB "Cerca" IDS_PRINT_VERB "Stampa" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "éã" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "å¥ã®ã¦ã¼ã¶ã¼ã¨ãã¦å®è¡ " + IDS_RUNAS_VERB "å¥ã®ã¦ã¼ã¶ã¼ã¨ãã¦å®è¡..." IDS_EDIT_VERB "ç·¨é" IDS_FIND_VERB "æ¤ç´¢" IDS_PRINT_VERB "å°å·" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Ãpne" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "KjÃ¸r som" + IDS_RUNAS_VERB "KjÃ¸r som..." IDS_EDIT_VERB "Rediger" IDS_FIND_VERB "Finn" IDS_PRINT_VERB "Skriv ut" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -798,7 +798,7 @@ IDS_OPEN_VERB "OtwÃ³rz" IDS_EXPLORE_VERB "Eksploruj" - IDS_RUNAS_VERB "Uruchom jako " + IDS_RUNAS_VERB "Uruchom jako..." IDS_EDIT_VERB "Edytuj" IDS_FIND_VERB "Wyszukaj" IDS_PRINT_VERB "Drukuj" Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Abrir" IDS_EXPLORE_VERB "Explorar" - IDS_RUNAS_VERB "Executar como " + IDS_RUNAS_VERB "Executar como..." IDS_EDIT_VERB "Editar" IDS_FIND_VERB "Procurar" IDS_PRINT_VERB "Imprimir" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -351,7 +351,7 @@ IDD_RUN_AS DIALOGEX 0, 0, 240, 190 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Executar Como..." +CAPTION "Executar Como" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Que conta de utilizador quer utilizar para executar este programa?", -1, 10, 20, 220, 20 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Abrir" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Executar como " + IDS_RUNAS_VERB "Executar como..." IDS_EDIT_VERB "Editar" IDS_FIND_VERB "Procurar" IDS_PRINT_VERB "Imprimir" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -796,7 +796,7 @@ IDS_OPEN_VERB "ÐÑÐºÑÑÑÑ" IDS_EXPLORE_VERB "ÐÑÐºÑÑÑÑ Ð² Ð´ÐµÑÐµÐ²Ðµ" - IDS_RUNAS_VERB "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÐºÐ°Ðº " + IDS_RUNAS_VERB "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÐºÐ°Ðº..." IDS_EDIT_VERB "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ" IDS_FIND_VERB "ÐÐ¾Ð¸ÑÐº" IDS_PRINT_VERB "ÐÐµÑÐ°ÑÑ" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "OtvoriÅ¥" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "SpustiÅ¥ ako " + IDS_RUNAS_VERB "SpustiÅ¥ ako..." IDS_EDIT_VERB "UpraviÅ¥" IDS_FIND_VERB "Find" IDS_PRINT_VERB "TlaÄiÅ¥" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -798,7 +798,7 @@ IDS_OPEN_VERB "Hap" IDS_EXPLORE_VERB "Eksplorer" - IDS_RUNAS_VERB "Ekzekuto Si " + IDS_RUNAS_VERB "Ekzekuto Si..." IDS_EDIT_VERB "Modifiko" IDS_FIND_VERB "Gjej" IDS_PRINT_VERB "Printo" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "AÃ§" IDS_EXPLORE_VERB "AraÅtÄ±r" - IDS_RUNAS_VERB "Birlikte aÃ§ " + IDS_RUNAS_VERB "Birlikte aÃ§..." IDS_EDIT_VERB "DÃ¼zenle" IDS_FIND_VERB "Bul" IDS_PRINT_VERB "YazdÄ±r" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -794,7 +794,7 @@ IDS_OPEN_VERB "ÐÑÐ´ÐºÑÐ¸ÑÐ¸" IDS_EXPLORE_VERB "ÐÑÐ´ÐºÑÐ¸ÑÐ¸ Ð² Ð´ÐµÑÐµÐ²Ñ" - IDS_RUNAS_VERB "ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ ÑÐº " + IDS_RUNAS_VERB "ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ ÑÐº..." IDS_EDIT_VERB "ÐÐ¼ÑÐ½Ð¸ÑÐ¸" IDS_FIND_VERB "ÐÐ¾ÑÑÐº" IDS_PRINT_VERB "ÐÑÑÐº" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -801,7 +801,7 @@ IDS_OPEN_VERB "æå¼" IDS_EXPLORE_VERB "æµè§" - IDS_RUNAS_VERB "è¿è¡ä½ä¸º " + IDS_RUNAS_VERB "è¿è¡ä½ä¸º..." IDS_EDIT_VERB "ç¼è¾" IDS_FIND_VERB "æ¥æ¾" IDS_PRINT_VERB "æå°" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Tue Aug 25 12:18:32 2015 @@ -802,7 +802,7 @@ IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as " + IDS_RUNAS_VERB "Run as..." IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print"

1 0

[hbelusca] 68817: [FREELDR]: Fix typo in comment, spotted by "middings". CORE-10040 #resolve
by hbelusca＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: hbelusca Date: Tue Aug 25 11:55:36 2015 New Revision: 68817 URL: http://svn.reactos.org/svn/reactos?rev=68817&view=rev Log: [FREELDR]: Fix typo in comment, spotted by "middings". CORE-10040 #resolve Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] Tue Aug 25 11:55:36 2015 @@ -344,7 +344,7 @@ /* Disable Interrupts */ _disable(); - /* Re-initalize EFLAGS */ + /* Re-initialize EFLAGS */ __writeeflags(0); /* Set the new PML4 */

1 0

[hbelusca] 68816: [NTVDM]: Correctly set last (and returned) errors when we fail at reallocating a memory block (in case this is the last block), or if the block is invalid. Do the same stuff also ...
by hbelusca＠svn.reactos.org 25 Aug '15

25 Aug '15

Author: hbelusca Date: Tue Aug 25 01:48:17 2015 New Revision: 68816 URL: http://svn.reactos.org/svn/reactos?rev=68816&view=rev Log: [NTVDM]: Correctly set last (and returned) errors when we fail at reallocating a memory block (in case this is the last block), or if the block is invalid. Do the same stuff also for few other memory functions. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Tue Aug 25 01:48:17 2015 @@ -1314,7 +1314,7 @@ else { Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; - setAX(ERROR_ARENA_TRASHED); + setAX(Sda->LastErrorCode); } break; Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Tue Aug 25 01:48:17 2015 @@ -109,7 +109,7 @@ if (!ValidateMcb(NextMcb)) { DPRINT1("The DOS memory arena is corrupted!\n"); - // Sda->LastErrorCode = ERROR_ARENA_TRASHED; + Sda->LastErrorCode = ERROR_ARENA_TRASHED; return; } @@ -297,8 +297,8 @@ /* Make sure this is a valid and allocated block */ if (BlockData == 0 || !ValidateMcb(Mcb) || Mcb->OwnerPsp == 0) { + Sda->LastErrorCode = ERROR_INVALID_BLOCK; Success = FALSE; - Sda->LastErrorCode = ERROR_INVALID_HANDLE; goto Done; } @@ -310,6 +310,8 @@ /* We can't expand the last block */ if (Mcb->BlockType == 'Z') { + DPRINT("Cannot expand memory block 0x%04X: this is the last block (size 0x%04X)!\n", Segment, Mcb->Size); + Sda->LastErrorCode = ERROR_NOT_ENOUGH_MEMORY; Success = FALSE; goto Done; } @@ -416,7 +418,11 @@ PDOS_MCB Mcb = SEGMENT_TO_MCB(BlockData - 1); DPRINT("DosFreeMemory: BlockData 0x%04X\n", BlockData); - if (BlockData == 0) return FALSE; + if (BlockData == 0) + { + Sda->LastErrorCode = ERROR_INVALID_BLOCK; + return FALSE; + } DosMemValidate(); @@ -424,6 +430,7 @@ if (!ValidateMcb(Mcb)) { DPRINT("MCB block type '%c' not valid!\n", Mcb->BlockType); + Sda->LastErrorCode = ERROR_INVALID_BLOCK; return FALSE; }

1 0

[aandrejevic] 68815: [FAST486] If FAST486_PREFIX_SEG is set, we're supposed to use the override segment instead of DS, and not the other way around.
by aandrejevic＠svn.reactos.org 24 Aug '15

24 Aug '15

Author: aandrejevic Date: Mon Aug 24 20:55:09 2015 New Revision: 68815 URL: http://svn.reactos.org/svn/reactos?rev=68815&view=rev Log: [FAST486] If FAST486_PREFIX_SEG is set, we're supposed to use the override segment instead of DS, and not the other way around. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6881… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Mon Aug 24 20:55:09 2015 @@ -1982,7 +1982,7 @@ { Fast486FpuLoadEnvironment(State, (State->PrefixFlags & FAST486_PREFIX_SEG) - ? FAST486_REG_DS : State->SegmentOverride, + ? State->SegmentOverride : FAST486_REG_DS, ModRegRm.MemoryAddress, OperandSize); break; @@ -2000,7 +2000,7 @@ { Fast486FpuSaveEnvironment(State, (State->PrefixFlags & FAST486_PREFIX_SEG) - ? FAST486_REG_DS : State->SegmentOverride, + ? State->SegmentOverride : FAST486_REG_DS, ModRegRm.MemoryAddress, OperandSize); break; @@ -3249,7 +3249,7 @@ /* Save the environment */ if (!Fast486FpuLoadEnvironment(State, (State->PrefixFlags & FAST486_PREFIX_SEG) - ? FAST486_REG_DS : State->SegmentOverride, + ? State->SegmentOverride : FAST486_REG_DS, ModRegRm.MemoryAddress, OperandSize)) { @@ -3260,7 +3260,7 @@ /* Load the registers */ if (!Fast486ReadMemory(State, (State->PrefixFlags & FAST486_PREFIX_SEG) - ? FAST486_REG_DS : State->SegmentOverride, + ? State->SegmentOverride : FAST486_REG_DS, ModRegRm.MemoryAddress + (OperandSize + 1) * 14, FALSE, AllRegs, @@ -3297,7 +3297,7 @@ /* Save the environment */ if (!Fast486FpuSaveEnvironment(State, (State->PrefixFlags & FAST486_PREFIX_SEG) - ? FAST486_REG_DS : State->SegmentOverride, + ? State->SegmentOverride : FAST486_REG_DS, ModRegRm.MemoryAddress, OperandSize)) { @@ -3319,7 +3319,7 @@ Fast486WriteMemory(State, (State->PrefixFlags & FAST486_PREFIX_SEG) - ? FAST486_REG_DS : State->SegmentOverride, + ? State->SegmentOverride : FAST486_REG_DS, ModRegRm.MemoryAddress + (OperandSize + 1) * 14, AllRegs, sizeof(AllRegs));

1 0

[pschweitzer] 68814: [NTFS] Remove leftover code
by pschweitzer＠svn.reactos.org 24 Aug '15

24 Aug '15

Author: pschweitzer Date: Mon Aug 24 20:40:54 2015 New Revision: 68814 URL: http://svn.reactos.org/svn/reactos?rev=68814&view=rev Log: [NTFS] Remove leftover code Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Mon Aug 24 20:40:54 2015 @@ -370,44 +370,6 @@ } -#if 0 -static VOID -NtfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt, - PDIR_RECORD Record, - PWSTR Name) -/* - * FUNCTION: Retrieves the file name, be it in short or long file name format - */ -{ - if (Record->FileIdLength == 1 && Record->FileId[0] == 0) - { - wcscpy(Name, L"."); - } - else if (Record->FileIdLength == 1 && Record->FileId[0] == 1) - { - wcscpy(Name, L".."); - } - else - { - if (DeviceExt->CdInfo.JolietLevel == 0) - { - ULONG i; - - for (i = 0; i < Record->FileIdLength && Record->FileId[i] != ';'; i++) - Name[i] = (WCHAR)Record->FileId[i]; - Name[i] = 0; - } - else - { - NtfsSwapString(Name, Record->FileId, Record->FileIdLength); - } - } - - DPRINT("Name '%S'\n", Name); -} -#endif - - NTSTATUS NtfsMakeFCBFromDirEntry(PNTFS_VCB Vcb, PNTFS_FCB DirectoryFCB,

1 0

[hbelusca] 68813: Replace LPVOID by PVOID everywhere!
by hbelusca＠svn.reactos.org 24 Aug '15

24 Aug '15

Author: hbelusca Date: Mon Aug 24 19:02:07 2015 New Revision: 68813 URL: http://svn.reactos.org/svn/reactos?rev=68813&view=rev Log: Replace LPVOID by PVOID everywhere! Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Mon Aug 24 19:02:07 2015 @@ -232,7 +232,7 @@ static HANDLE ScreenBufferHandle = NULL; -static LPVOID OldConsoleFramebuffer = NULL; +static PVOID OldConsoleFramebuffer = NULL; /*

1 0

[hbelusca] 68812: [NTVDM] - Correctly sync ConsoleFramebuffer when we attach/detach VGA from the console (fix memory corruptions introduced by r68720). - Fix few comments in the process.
by hbelusca＠svn.reactos.org 24 Aug '15

24 Aug '15

Author: hbelusca Date: Mon Aug 24 19:00:27 2015 New Revision: 68812 URL: http://svn.reactos.org/svn/reactos?rev=68812&view=rev Log: [NTVDM] - Correctly sync ConsoleFramebuffer when we attach/detach VGA from the console (fix memory corruptions introduced by r68720). - Fix few comments in the process. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Mon Aug 24 19:00:27 2015 @@ -217,9 +217,9 @@ } CHAR_CELL, *PCHAR_CELL; C_ASSERT(sizeof(CHAR_CELL) == 2); -static LPVOID ConsoleFramebuffer = NULL; // Active framebuffer, points to - // either TextFramebuffer or a - // valid graphics framebuffer. +static PVOID ConsoleFramebuffer = NULL; // Active framebuffer, points to + // either TextFramebuffer or a + // valid graphics framebuffer. static HPALETTE TextPaletteHandle = NULL; static HPALETTE PaletteHandle = NULL; @@ -232,27 +232,31 @@ static HANDLE ScreenBufferHandle = NULL; +static LPVOID OldConsoleFramebuffer = NULL; /* * Text mode -- we always keep a valid text mode framebuffer * even if we are in graphics mode. This is needed in order - * to keep a consistent VGA state. + * to keep a consistent VGA state. However, each time the VGA + * detaches from the console (and reattaches to it later on), + * this text mode framebuffer is recreated. */ +static HANDLE TextConsoleBuffer = NULL; static CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; static COORD TextResolution = {0}; static PCHAR_CELL TextFramebuffer = NULL; -static HANDLE TextConsoleBuffer = NULL; - -/* Graphics mode */ + +/* + * Graphics mode + */ static HANDLE GraphicsConsoleBuffer = NULL; +static PVOID GraphicsFramebuffer = NULL; static HANDLE ConsoleMutex = NULL; /* DoubleVision support */ static BOOLEAN DoubleWidth = FALSE; static BOOLEAN DoubleHeight = FALSE; -static PHARDWARE_TIMER VSyncTimer; -static PHARDWARE_TIMER HSyncTimer; /* * VGA Hardware @@ -288,8 +292,10 @@ // static VGA_REGISTERS VgaRegisters; -static ULONGLONG VerticalRetraceCycle = 0ULL; +static ULONGLONG VerticalRetraceCycle = 0ULL; static ULONGLONG HorizontalRetraceCycle = 0ULL; +static PHARDWARE_TIMER VSyncTimer; +static PHARDWARE_TIMER HSyncTimer; static BOOLEAN NeedsUpdate = FALSE; static BOOLEAN ModeChanged = FALSE; @@ -950,6 +956,8 @@ static VOID VgaSetActiveScreenBuffer(HANDLE ScreenBuffer) { + ASSERT(ScreenBuffer); + /* Set the active buffer */ SetConsoleActiveScreenBuffer(ScreenBuffer); @@ -1002,7 +1010,7 @@ if (GraphicsConsoleBuffer == INVALID_HANDLE_VALUE) return FALSE; /* Save the framebuffer address and mutex */ - ConsoleFramebuffer = GraphicsBufferInfo.lpBitMap; + GraphicsFramebuffer = GraphicsBufferInfo.lpBitMap; ConsoleMutex = GraphicsBufferInfo.hMutex; /* Clear the framebuffer */ @@ -1010,6 +1018,9 @@ /* Set the active buffer */ VgaSetActiveScreenBuffer(GraphicsConsoleBuffer); + + /* The active framebuffer is now the graphics framebuffer */ + ConsoleFramebuffer = GraphicsFramebuffer; /* Set the graphics mode palette */ SetConsolePalette(GraphicsConsoleBuffer, @@ -1033,9 +1044,12 @@ /* Cleanup the video data */ CloseHandle(ConsoleMutex); ConsoleMutex = NULL; - ConsoleFramebuffer = NULL; + GraphicsFramebuffer = NULL; CloseHandle(GraphicsConsoleBuffer); GraphicsConsoleBuffer = NULL; + + /* Reset the active framebuffer */ + ConsoleFramebuffer = NULL; DoubleWidth = FALSE; DoubleHeight = FALSE; @@ -1171,8 +1185,8 @@ + ((VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] >> 5) & 3); /* - * If console framebuffer is NULL, that means something went wrong - * earlier and this is the final display refresh. + * If the console framebuffer is NULL, that means something + * went wrong earlier and this is the final display refresh. */ if (ConsoleFramebuffer == NULL) return; @@ -2311,11 +2325,22 @@ return FALSE; } - /* Restore the screen state */ /* Restore the original screen buffer */ - ASSERT(ScreenBufferHandle); VgaSetActiveScreenBuffer(ScreenBufferHandle); ScreenBufferHandle = NULL; + + /* Restore the screen state */ + if (ScreenMode == TEXT_MODE) + { + /* The text mode framebuffer was recreated */ + ConsoleFramebuffer = TextFramebuffer; + } + else + { + /* The graphics mode framebuffer is unchanged */ + ConsoleFramebuffer = OldConsoleFramebuffer; + } + OldConsoleFramebuffer = NULL; return TRUE; } @@ -2331,6 +2356,10 @@ ScreenBufferHandle = TextConsoleBuffer; else ScreenBufferHandle = GraphicsConsoleBuffer; + + /* Reset the active framebuffer */ + OldConsoleFramebuffer = ConsoleFramebuffer; + ConsoleFramebuffer = NULL; /* Restore the old text-mode screen buffer */ VgaSetActiveScreenBuffer(TextConsoleBuffer);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs