Ros-diffs

ros-diffs@reactos.org

81390 discussions

[bfreisen] 72852: [PSDK][GDIPLUS] Make previously untested GDI+ C++ wrappers compilable. This involves: - adding the respective headers to gdiplus.h in a sensible order - adding forward-declaration...
by bfreisen＠svn.reactos.org 29 Sep '16

29 Sep '16

Author: bfreisen Date: Thu Sep 29 11:15:10 2016 New Revision: 72852 URL: http://svn.reactos.org/svn/reactos?rev=72852&view=rev Log: [PSDK][GDIPLUS] Make previously untested GDI+ C++ wrappers compilable. This involves: - adding the respective headers to gdiplus.h in a sensible order - adding forward-declarations - adding friend-declarations, so that the wrapper functions in those classes can access the private GpXXX members - const-qualifying the getters in class Color - adding the EmfToWmfBitsFlags enum - commenting out bits that use unavailable flatapi functions - commenting out bits that for some reason the compiler does not like - the typical typo/data type fixes that untested code tends to need - moving the Font class within the same header to fulfill dependencies - adding private GpXXX members to otherwise unimplemented classes - adding a data-members-only implementation of SizeF Modified: trunk/reactos/sdk/include/psdk/gdiplus.h trunk/reactos/sdk/include/psdk/gdiplusbrush.h trunk/reactos/sdk/include/psdk/gdipluscolor.h trunk/reactos/sdk/include/psdk/gdiplusenums.h trunk/reactos/sdk/include/psdk/gdiplusgraphics.h trunk/reactos/sdk/include/psdk/gdiplusheaders.h trunk/reactos/sdk/include/psdk/gdiplusmatrix.h trunk/reactos/sdk/include/psdk/gdipluspath.h trunk/reactos/sdk/include/psdk/gdipluspen.h trunk/reactos/sdk/include/psdk/gdiplustypes.h Modified: trunk/reactos/sdk/include/psdk/gdiplus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplus.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplus.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplus.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -42,6 +42,18 @@ { #include "gdiplusflat.h" }; + +#include "gdiplusbase.h" +#include "gdiplusmatrix.h" +#include "gdiplusimageattributes.h" +#include "gdiplusbrush.h" +#include "gdipluspen.h" +#include "gdiplusstringformat.h" +#include "gdipluspath.h" +#include "gdiplusgraphics.h" +#include "gdiplusheaders.h" +#include "gdiplusmetafile.h" +#include "gdipluslinecaps.h" }; #else /* end c++ includes */ Modified: trunk/reactos/sdk/include/psdk/gdiplusbrush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusbr… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusbrush.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusbrush.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -19,6 +19,8 @@ #ifndef _GDIPLUSBRUSH_H #define _GDIPLUSBRUSH_H +class Image; + class Brush : public GdiplusBase { public: Modified: trunk/reactos/sdk/include/psdk/gdipluscolor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusco… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdipluscolor.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdipluscolor.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -54,47 +54,47 @@ Argb = a << 24 | r << 16 | g << 8 | b; } - BYTE GetA(VOID) + BYTE GetA(VOID) const { return (Argb >> 24) & 0xff; } - BYTE GetAlpha(VOID) + BYTE GetAlpha(VOID) const { return (Argb >> 24) & 0xff; } - BYTE GetB(VOID) + BYTE GetB(VOID) const { return Argb & 0xff; } - BYTE GetBlue(VOID) + BYTE GetBlue(VOID) const { return Argb & 0xff; } - BYTE GetG(VOID) + BYTE GetG(VOID) const { return (Argb >> 8) & 0xff; } - BYTE GetGreen(VOID) + BYTE GetGreen(VOID) const { return (Argb >> 8) & 0xff; } - BYTE GetR(VOID) + BYTE GetR(VOID) const { return (Argb >> 16) & 0xff; } - BYTE GetRed(VOID) + BYTE GetRed(VOID) const { return (Argb >> 16) & 0xff; } - ARGB GetValue(VOID) + ARGB GetValue(VOID) const { return Argb; } @@ -114,7 +114,7 @@ Argb = argb; } - COLORREF ToCOLORREF(VOID) + COLORREF ToCOLORREF(VOID) const { return (Argb & 0x000000ff) << 16 | (Argb & 0x0000ff00) | (Argb & 0x00ff0000) >> 16; } Modified: trunk/reactos/sdk/include/psdk/gdiplusenums.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusen… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusenums.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusenums.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -226,6 +226,14 @@ EmfTypeEmfOnly = MetafileTypeEmf, EmfTypeEmfPlusOnly = MetafileTypeEmfPlusOnly, EmfTypeEmfPlusDual = MetafileTypeEmfPlusDual +}; + +enum EmfToWmfBitsFlags +{ + EmfToWmfBitsFlagsDefault = 0, + EmfToWmfBitsFlagsEmbedEmf = 1, + EmfToWmfBitsFlagsIncludePlaceable = 2, + EmfToWmfBitsFlagsNoXORClip = 4 }; enum CompositingMode Modified: trunk/reactos/sdk/include/psdk/gdiplusgraphics.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusgr… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusgraphics.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusgraphics.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -19,8 +19,21 @@ #ifndef _GDIPLUSGRAPHICS_H #define _GDIPLUSGRAPHICS_H +class Image; +class ImageAttributes; +class CachedBitmap; +class Region; +class Font; +class GraphicsPath; +class Metafile; + class Graphics : public GdiplusBase { + friend class Region; + friend class Font; + friend class Bitmap; + friend class CachedBitmap; + public: Graphics(Image *image) { 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] Thu Sep 29 11:15:10 2016 @@ -69,14 +69,15 @@ Status GetEncoderParameterList(const CLSID *clsidEncoder, UINT size, EncoderParameters *buffer) { - return SetStatus(DllExports::GdipGetEncoderParameterList(image, clsidEncoder, size, buffer)); + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipGetEncoderParameterList(image, clsidEncoder, size, buffer)); } UINT GetEncoderParameterListSize(const CLSID *clsidEncoder) { - UINT size; - SetStatus(DllExports::GdipGetEncoderParameterListSize(image, clsidEncoder, &size)); - return size; + return 0; // FIXME: not available: +// UINT size; +// SetStatus(DllExports::GdipGetEncoderParameterListSize(image, clsidEncoder, &size)); +// return size; } UINT GetFlags(VOID) @@ -138,7 +139,7 @@ Status GetPhysicalDimension(SizeF *size) { - return SetStatus(DllExports::GdipGetImagePhysicalDimension(image, &(size->Width), &(size->Height))); + return SetStatus(DllExports::GdipGetImageDimension(image, &size->Width, &size->Height)); } PixelFormat GetPixelFormat(VOID) @@ -179,7 +180,7 @@ Status GetRawFormat(GUID *format) { - return SetStatus(DllExports::GdipGetRawFormat(image, format)); + return SetStatus(DllExports::GdipGetImageRawFormat(image, format)); } Image *GetThumbnailImage(UINT thumbWidth, UINT thumbHeight, GetThumbnailImageAbort callback, VOID *callbackData) @@ -232,12 +233,12 @@ Status SaveAdd(const EncoderParameters* encoderParams) { - return SetStatus(DllExports::GdipSaveAdd(image, encoderParams)); + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipSaveAdd(image, encoderParams)); } Status SaveAdd(Image *newImage, const EncoderParameters *encoderParams) { - return SetStatus(DllExports::GdipSaveAddImage(image, newImage->image, encoderParams)); + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipSaveAddImage(image, newImage->image, encoderParams)); } Status SelectActiveFrame(const GUID *dimensionID, UINT frameIndex) @@ -276,11 +277,13 @@ class Bitmap : public Image { + friend class CachedBitmap; + public: - Bitmap(IDirectDrawSurface7 *surface) - { - status = DllExports::GdipCreateBitmapFromDirectDrawSurface(surface, &bitmap); - } +// Bitmap(IDirectDrawSurface7 *surface) // <-- FIXME: compiler does not like this +// { +// status = DllExports::GdipCreateBitmapFromDirectDrawSurface(surface, &bitmap); +// } Bitmap(INT width, INT height, Graphics *target) { @@ -365,10 +368,10 @@ return new Bitmap(gdiBitmapInfo, gdiBitmapData); } - static Bitmap *FromDirectDrawSurface7(IDirectDrawSurface7 *surface) - { - return new Bitmap(surface); - } +// static Bitmap *FromDirectDrawSurface7(IDirectDrawSurface7 *surface) // <-- FIXME: compiler does not like this +// { +// return new Bitmap(surface); +// } static Bitmap *FromFile(const WCHAR *filename, BOOL useEmbeddedColorManagement) { @@ -402,7 +405,7 @@ Status GetHICON(HICON *hicon) { - return SetStatus(DllExports::GdipCreateHICONFromBitmap(bitmap, hbmReturn)); + return SetStatus(DllExports::GdipCreateHICONFromBitmap(bitmap, hicon)); } Status GetPixel(INT x, INT y, Color *color) @@ -458,7 +461,7 @@ public: CachedBitmap(Bitmap *bitmap, Graphics *graphics) { - status = DllExports::GdipCreateCachedBitmap(bitmap, graphics, &cachedBitmap); + status = DllExports::GdipCreateCachedBitmap(bitmap->bitmap, graphics->graphics, &cachedBitmap); } Status GetLastStatus(VOID) @@ -469,6 +472,167 @@ private: mutable Status status; GpCachedBitmap *cachedBitmap; +}; + + +class FontCollection : public GdiplusBase +{ + friend class FontFamily; + +public: + FontCollection(VOID) + { + } + + Status GetFamilies(INT numSought, FontFamily *gpfamilies, INT *numFound) const + { + return NotImplemented; + } + + INT GetFamilyCount(VOID) const + { + return 0; + } + + Status GetLastStatus(VOID) + { + return NotImplemented; + } + +private: + GpFontCollection *fontCollection; +}; + + +class FontFamily : public GdiplusBase +{ + friend class Font; + +public: + FontFamily(VOID) + { + } + + FontFamily(const WCHAR *name, const FontCollection *fontCollection) + { + status = DllExports::GdipCreateFontFamilyFromName(name, fontCollection->fontCollection, &fontFamily); + } + + FontFamily *Clone(VOID) + { + return NULL; + } + + static const FontFamily *GenericMonospace(VOID) + { + FontFamily *genericMonospace = new FontFamily(); + genericMonospace->status = DllExports::GdipGetGenericFontFamilyMonospace(&(genericMonospace->fontFamily)); + return genericMonospace; + } + + static const FontFamily *GenericSansSerif(VOID) + { + FontFamily *genericSansSerif = new FontFamily(); + genericSansSerif->status = DllExports::GdipGetGenericFontFamilySansSerif(&(genericSansSerif->fontFamily)); + return genericSansSerif; + } + + static const FontFamily *GenericSerif(VOID) + { + FontFamily *genericSerif = new FontFamily(); + genericSerif->status = DllExports::GdipGetGenericFontFamilyMonospace(&(genericSerif->fontFamily)); + return genericSerif; + } + + UINT16 GetCellAscent(INT style) const + { + UINT16 CellAscent; + SetStatus(DllExports::GdipGetCellAscent(fontFamily, style, &CellAscent)); + return CellAscent; + } + + UINT16 GetCellDescent(INT style) const + { + UINT16 CellDescent; + SetStatus(DllExports::GdipGetCellDescent(fontFamily, style, &CellDescent)); + return CellDescent; + } + + UINT16 GetEmHeight(INT style) + { + UINT16 EmHeight; + SetStatus(DllExports::GdipGetEmHeight(fontFamily, style, &EmHeight)); + return EmHeight; + } + + Status GetFamilyName(WCHAR name[LF_FACESIZE], WCHAR language) const + { + return SetStatus(DllExports::GdipGetFamilyName(fontFamily, name, language)); + } + + Status GetLastStatus(VOID) const + { + return status; + } + + UINT16 GetLineSpacing(INT style) const + { + UINT16 LineSpacing; + SetStatus(DllExports::GdipGetLineSpacing(fontFamily, style, &LineSpacing)); + return LineSpacing; + } + + BOOL IsAvailable(VOID) const + { + return FALSE; + } + + BOOL IsStyleAvailable(INT style) const + { + 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; + } +}; + + +class InstalledFontFamily : public FontFamily +{ +public: + InstalledFontFamily(VOID) + { + } +}; + + +class PrivateFontCollection : public FontCollection +{ +public: + PrivateFontCollection(VOID) + { + } + + Status AddFontFile(const WCHAR* filename) + { + return NotImplemented; + } + + Status AddMemoryFont(const VOID *memory, INT length) + { + return NotImplemented; + } }; @@ -481,7 +645,7 @@ Font(const FontFamily *family, REAL emSize, INT style, Unit unit) { - status = DllExports::GdipCreateFont(family->fontFamily, emSize, style. unit, &font); + status = DllExports::GdipCreateFont(family->fontFamily, emSize, style, unit, &font); } Font(HDC hdc, const HFONT hfont) @@ -565,13 +729,18 @@ Unit GetUnit(VOID) const { Unit unit; - SetStatus(DllExports::GdipGetFontUnit(font, &unit); + SetStatus(DllExports::GdipGetFontUnit(font, &unit)); return unit; } BOOL IsAvailable(VOID) const { return FALSE; + } + +protected: + Font() + { } private: @@ -584,160 +753,6 @@ return status; this->status = status; return status; - } -}; - - -class FontCollection : public GdiplusBase -{ -public: - FontCollection(VOID) - { - } - - Status GetFamilies(INT numSought, FontFamily *gpfamilies, INT *numFound) const - { - return NotImplemented; - } - - INT GetFamilyCount(VOID) const - { - return 0; - } - - Status GetLastStatus(VOID) - { - return NotImplemented; - } -}; - - -class FontFamily : public GdiplusBase -{ -public: - FontFamily(VOID) - { - } - - FontFamily(const WCHAR *name, const FontCollection *fontCollection) - { - status = DllExports::GdipCreateFontFamilyFromName(name, fontCollection, &fontFamily); - } - - FontFamily *Clone(VOID) - { - return NULL; - } - - static const FontFamily *GenericMonospace(VOID) - { - FontFamily *genericMonospace = new FontFamily(); - genericMonospace->status = DllExports::GdipGetGenericFontFamilyMonospace(&(genericMonospace->fontFamily)); - return genericMonospace; - } - - static const FontFamily *GenericSansSerif(VOID) - { - FontFamily *genericSansSerif = new FontFamily(); - genericSansSerif->status = DllExports::GdipGetGenericFontFamilySansSerif(&(genericSansSerif->fontFamily)); - return genericSansSerif; - } - - static const FontFamily *GenericSerif(VOID) - { - FontFamily *genericSerif = new FontFamily(); - genericSerif->status = DllExports::GdipGetGenericFontFamilyMonospace(&(genericSerif->fontFamily)); - return genericSerif; - } - - UINT16 GetCellAscent(INT style) const - { - UINT16 CellAscent; - SetStatus(DllExports::GdipGetCellAscent(fontFamily, style, &CellAscent)); - return CellAscent; - } - - UINT16 GetCellDescent(INT style) const - { - UINT16 CellDescent; - SetStatus(DllExports::GdipGetCellDescent(fontFamily, style, &CellDescent)); - return CellDescent; - } - - UINT16 GetEmHeight(INT style) - { - UINT16 EmHeight; - SetStatus(DllExports::GdipGetEmHeight(fontFamily, style, &EmHeight)); - return EmHeight; - } - - Status GetFamilyName(WCHAR name[LF_FACESIZE], WCHAR language) const - { - return SetStatus(DllExports::GdipGetFamilyName(fontFamily, name, language)); - } - - Status GetLastStatus(VOID) const - { - return status; - } - - UINT16 GetLineSpacing(INT style) const - { - UINT16 LineSpacing; - SetStatus(DllExports::GdipGetLineSpacing(fontFamily, style, &LineSpacing)); - return LineSpacing; - } - - BOOL IsAvailable(VOID) const - { - return FALSE; - } - - BOOL IsStyleAvailable(INT style) const - { - 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; - } -}; - - -class InstalledFontFamily : public FontFamily -{ -public: - InstalledFontFamily(VOID) - { - } -}; - - -class PrivateFontCollection : public FontCollection -{ -public: - PrivateFontCollection(VOID) - { - } - - Status AddFontFile(const WCHAR* filename) - { - return NotImplemented; - } - - Status AddMemoryFont(const VOID *memory, INT length) - { - return NotImplemented; } }; @@ -776,13 +791,13 @@ Region(const RectF &rect) { - status = DllExports::GdipCreateRegionRectF(&rect, &region); + status = DllExports::GdipCreateRegionRect(&rect, &region); } Region *Clone(VOID) { - region *cloneRegion = new Region(); - cloneRegion->status = DllExports::GdipCloneRegion(region, &cloneRegion); + Region *cloneRegion = new Region(); + cloneRegion->status = DllExports::GdipCloneRegion(region, &cloneRegion->region); return cloneRegion; } @@ -850,7 +865,7 @@ Status GetData(BYTE *buffer, UINT bufferSize, UINT *sizeFilled) const { - return SetStatus(DllExports::GdipGetRegionData(region, budder, bufferSize, sizeFilled)); + return SetStatus(DllExports::GdipGetRegionData(region, buffer, bufferSize, sizeFilled)); } UINT GetDataSize(VOID) const @@ -926,21 +941,21 @@ 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->graphics, &result)); return result; } BOOL IsVisible(const RectF &rect, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsVisibleRegionRect(region, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, g->graphics, &result)); + SetStatus(DllExports::GdipIsVisibleRegionRect(region, rect.X, rect.Y, rect.Width, rect.Height, g->graphics, &result)); return result; } BOOL IsVisible(const Rect &rect, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsVisibleRegionRectI(region, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, g->graphics, &result)); + SetStatus(DllExports::GdipIsVisibleRegionRectI(region, rect.X, rect.Y, rect.Width, rect.Height, g->graphics, &result)); return result; } @@ -968,7 +983,7 @@ 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->graphics, &result)); return result; } 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] Thu Sep 29 11:15:10 2016 @@ -21,6 +21,8 @@ class Matrix : public GdiplusBase { + friend class Region; + public: Matrix(const RectF &rect, const PointF *dstplg) { @@ -45,7 +47,7 @@ Matrix *Clone(VOID) { Matrix *cloneMatrix = new Matrix(); // FIXME: Matrix::matrix already initialized --> potential memory leak - cloneMatrix->status = DllExports::GdipCloneMatrix(matrix, &cloneMatrix); + cloneMatrix->status = DllExports::GdipCloneMatrix(matrix, &cloneMatrix->matrix); return cloneMatrix; } @@ -130,7 +132,7 @@ return SetStatus(DllExports::GdipSetMatrixElements(matrix, m11, m12, m21, m22, dx, dy)); } - Status Shear(REAL shearX, REAL shearY, REAL order) + Status Shear(REAL shearX, REAL shearY, MatrixOrder order) { return SetStatus(DllExports::GdipShearMatrix(matrix, shearX, shearY, order)); } @@ -155,7 +157,7 @@ return SetStatus(DllExports::GdipVectorTransformMatrixPoints(matrix, pts, count)); } - Status Translate(REAL offsetX, REAL offsetY, REAL order) + Status Translate(REAL offsetX, REAL offsetY, MatrixOrder order) { return SetStatus(DllExports::GdipTranslateMatrix(matrix, offsetX, offsetY, order)); } Modified: trunk/reactos/sdk/include/psdk/gdipluspath.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdipluspa… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdipluspath.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdipluspath.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -19,8 +19,13 @@ #ifndef _GDIPLUSPATH_H #define _GDIPLUSPATH_H +class FontFamily; +class Graphics; + class GraphicsPath : public GdiplusBase { + friend class Region; + public: GraphicsPath(const Point *points, const BYTE *types, INT count, FillMode fillMode) { @@ -418,6 +423,9 @@ { return NotImplemented; } + +private: + GpPath *path; }; Modified: trunk/reactos/sdk/include/psdk/gdipluspen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdipluspe… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdipluspen.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdipluspen.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -18,6 +18,8 @@ #ifndef _GDIPLUSPEN_H #define _GDIPLUSPEN_H + +class CustomLineCap; class Pen : public GdiplusBase { Modified: trunk/reactos/sdk/include/psdk/gdiplustypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusty… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplustypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplustypes.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -227,6 +227,14 @@ INT Length; }; +/* FIXME: missing the methods. */ +class SizeF +{ +public: + REAL Width; + REAL Height; +}; + #else /* end of c++ typedefs */ typedef struct Point

1 0

[akhaldi] 72851: [IPHLPAPI][KERNEL32] Revert r72722 and apply a proper fix based on tests. By Peter Hater. CORE-10440 ROSTESTS-243
by akhaldi＠svn.reactos.org 29 Sep '16

29 Sep '16

Author: akhaldi Date: Thu Sep 29 10:49:30 2016 New Revision: 72851 URL: http://svn.reactos.org/svn/reactos?rev=72851&view=rev Log: [IPHLPAPI][KERNEL32] Revert r72722 and apply a proper fix based on tests. By Peter Hater. CORE-10440 ROSTESTS-243 Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/dll/win32/kernel32/client/compname.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Thu Sep 29 10:49:30 2016 @@ -1404,7 +1404,7 @@ */ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) { - DWORD ret, size; + DWORD ret, size, type; LONG regReturn; HKEY hKey; PIPHLP_RES_INFO resInfo; @@ -1426,10 +1426,59 @@ } memset(pFixedInfo, 0, size); - size = sizeof(pFixedInfo->HostName); - GetComputerNameExA(ComputerNameDnsHostname, pFixedInfo->HostName, &size); - size = sizeof(pFixedInfo->DomainName); - GetComputerNameExA(ComputerNameDnsDomain, pFixedInfo->DomainName, &size); + /* Check for DhcpHostname and DhcpDomain first */ + regReturn = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, + KEY_READ, + &hKey); + if (regReturn == ERROR_SUCCESS) { + /* Windows doesn't honor DHCP option 12 even if RFC requires it if it is returned by DHCP server! */ +#if 0 + type = REG_SZ; + size = sizeof(pFixedInfo->HostName); + regReturn = RegQueryValueExA(hKey, + "DhcpHostname", + NULL, + &type, + (LPBYTE)pFixedInfo->HostName, + &size); + if (regReturn == ERROR_FILE_NOT_FOUND || (regReturn == ERROR_SUCCESS && size < 1)) + { +#endif + type = REG_SZ; + size = sizeof(pFixedInfo->HostName); + regReturn = RegQueryValueExA(hKey, + "Hostname", + NULL, + &type, + (LPBYTE)pFixedInfo->HostName, + &size); +#if 0 + } +#endif + + type = REG_SZ; + size = sizeof(pFixedInfo->DomainName); + regReturn = RegQueryValueExA(hKey, + "DhcpDomain", + NULL, + &type, + (LPBYTE)pFixedInfo->DomainName, + &size); + if (regReturn == ERROR_FILE_NOT_FOUND || (regReturn == ERROR_SUCCESS && size < 1)) + { + type = REG_SZ; + size = sizeof(pFixedInfo->DomainName); + regReturn = RegQueryValueExA(hKey, + "Domain", + NULL, + &type, + (LPBYTE)pFixedInfo->DomainName, + &size); + } + RegCloseKey(hKey); + } TRACE("GetComputerNameExA: %s\n", pFixedInfo->DomainName); Modified: trunk/reactos/dll/win32/kernel32/client/compname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/compname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/compname.c [iso-8859-1] Thu Sep 29 10:49:30 2016 @@ -137,7 +137,6 @@ NTSTATUS Status; BOOL ret = TRUE; DWORD HostSize; - DWORD nBufferSize; if ((nSize == NULL) || (lpBuffer == NULL && *nSize > 0)) @@ -156,27 +155,11 @@ nSize); case ComputerNameDnsDomain: - /* Save original buffer size for the second call if neccessery */ - nBufferSize = *nSize; - if (!GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" - L"\\Services\\Tcpip\\Parameters", - L"DhcpDomain", - lpBuffer, - nSize)) - { - /* The value is there, just the buffer is insufficient in length */ - if (GetLastError() == ERROR_MORE_DATA) - return FALSE; - /* Restore original buffer size for the second call */ - *nSize = nBufferSize; - return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" - L"\\Services\\Tcpip\\Parameters", - L"Domain", - lpBuffer, - nSize); - } - else - return TRUE; + return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Services\\Tcpip\\Parameters", + L"Domain", + lpBuffer, + nSize); case ComputerNameDnsFullyQualified: ResultString.Length = 0; @@ -212,7 +195,7 @@ RtlFreeUnicodeString(&DomainPart); RtlInitUnicodeString(&DomainPart, NULL); - QueryTable[0].Name = L"DhcpDomain"; + QueryTable[0].Name = L"Domain"; QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[0].EntryContext = &DomainPart; @@ -224,9 +207,7 @@ NULL, NULL); - if ((NT_SUCCESS(Status)) && - (DomainPart.Buffer != NULL) && - (wcslen(DomainPart.Buffer) > 0)) + if (NT_SUCCESS(Status)) { Status = RtlAppendUnicodeStringToString(&ResultString, &DomainPart); if ((!NT_SUCCESS(Status)) || (!ret)) @@ -240,36 +221,6 @@ *nSize = ResultString.Length / sizeof(WCHAR) - 1; return TRUE; } - else - { - RtlInitUnicodeString(&DomainPart, NULL); - QueryTable[0].Name = L"Domain"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[0].EntryContext = &DomainPart; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - L"\\Registry\\Machine\\System" - L"\\CurrentControlSet\\Services\\Tcpip" - L"\\Parameters", - QueryTable, - NULL, - NULL); - - if (NT_SUCCESS(Status)) - { - Status = RtlAppendUnicodeStringToString(&ResultString, &DomainPart); - if ((!NT_SUCCESS(Status)) || (!ret)) - { - *nSize = HostSize + DomainPart.Length; - SetLastError(ERROR_MORE_DATA); - RtlFreeUnicodeString(&DomainPart); - return FALSE; - } - RtlFreeUnicodeString(&DomainPart); - *nSize = ResultString.Length / sizeof(WCHAR) - 1; - return TRUE; - } - } } return FALSE; @@ -281,9 +232,11 @@ nSize); case ComputerNamePhysicalDnsDomain: - return GetComputerNameExW(ComputerNameDnsDomain, - lpBuffer, - nSize); + return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Services\\Tcpip\\Parameters", + L"Domain", + lpBuffer, + nSize); /* XXX Redo these */ case ComputerNamePhysicalDnsFullyQualified:

1 0

[akhaldi] 72850: [RTL] Demote this print as we'll be notified when failure occurs.
by akhaldi＠svn.reactos.org 29 Sep '16

29 Sep '16

Author: akhaldi Date: Thu Sep 29 10:00:07 2016 New Revision: 72850 URL: http://svn.reactos.org/svn/reactos?rev=72850&view=rev Log: [RTL] Demote this print as we'll be notified when failure occurs. Modified: trunk/reactos/sdk/lib/rtl/heappage.c Modified: trunk/reactos/sdk/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/heappage.c?rev… ============================================================================== --- trunk/reactos/sdk/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/heappage.c [iso-8859-1] Thu Sep 29 10:00:07 2016 @@ -358,7 +358,7 @@ /* Free the memory */ Status = RtlpSecMemFreeVirtualMemory(NtCurrentProcess(), &Base, &Size, Type); - DPRINT1("Page heap: FreeVm (%p, %Ix, %x) status %x \n", Base, Size, Type, Status); + DPRINT("Page heap: FreeVm (%p, %Ix, %x) status %x \n", Base, Size, Type, Status); /* Log/report failures */ if (!NT_SUCCESS(Status)) {

1 0

[akhaldi] 72849: [KERNEL32_APITEST] Add tests that reveal how the GetComputerNameEx fix in r72722 was not proper. By Peter Hater. ROSTESTS-243
by akhaldi＠svn.reactos.org 29 Sep '16

29 Sep '16

Author: akhaldi Date: Thu Sep 29 09:44:57 2016 New Revision: 72849 URL: http://svn.reactos.org/svn/reactos?rev=72849&view=rev Log: [KERNEL32_APITEST] Add tests that reveal how the GetComputerNameEx fix in r72722 was not proper. By Peter Hater. ROSTESTS-243 Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt trunk/rostests/apitests/kernel32/GetComputerNameEx.c Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] Thu Sep 29 09:44:57 2016 @@ -21,5 +21,5 @@ add_executable(kernel32_apitest ${SOURCE}) target_link_libraries(kernel32_apitest wine ${PSEH_LIB}) set_module_type(kernel32_apitest win32cui) -add_importlibs(kernel32_apitest gdi32 user32 shlwapi msvcrt kernel32 ntdll) +add_importlibs(kernel32_apitest advapi32 gdi32 user32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET kernel32_apitest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/apitests/kernel32/GetComputerNameEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetComp… ============================================================================== --- trunk/rostests/apitests/kernel32/GetComputerNameEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/GetComputerNameEx.c [iso-8859-1] Thu Sep 29 09:44:57 2016 @@ -10,6 +10,7 @@ #define WIN32_NO_STATUS #include <stdio.h> #include <ndk/rtltypes.h> +#include <winreg.h> static VOID @@ -179,6 +180,339 @@ } } +static +LSTATUS +ReadRegistryValue(PCHAR ValueName, PCHAR Value) +{ + INT ErrorCode; + HKEY ParametersKey; + DWORD RegType; + DWORD RegSize = 0; + + /* Open the database path key */ + ErrorCode = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "System\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, + KEY_READ, + &ParametersKey); + if (ErrorCode == NO_ERROR) + { + /* Read the actual path */ + ErrorCode = RegQueryValueExA(ParametersKey, + ValueName, + NULL, + &RegType, + NULL, + &RegSize); + if (RegSize) + { + /* Read the actual path */ + ErrorCode = RegQueryValueExA(ParametersKey, + ValueName, + NULL, + &RegType, + (LPBYTE)Value, + &RegSize); + } + + /* Close the key */ + RegCloseKey(ParametersKey); + } + return ErrorCode; +} + +static +LSTATUS +ReadRegistryComputerNameValue(PCHAR ValueName, PCHAR Value) +{ + INT ErrorCode; + HKEY ParametersKey; + DWORD RegType; + DWORD RegSize = 0; + + /* Open the database path key */ + ErrorCode = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "System\\CurrentControlSet\\Control\\ComputerName\\ActiveComputerName", + 0, + KEY_READ, + &ParametersKey); + if (ErrorCode == NO_ERROR) + { + /* Read the actual path */ + ErrorCode = RegQueryValueExA(ParametersKey, + ValueName, + NULL, + &RegType, + NULL, + &RegSize); + if (RegSize) + { + /* Read the actual path */ + ErrorCode = RegQueryValueExA(ParametersKey, + ValueName, + NULL, + &RegType, + (LPBYTE)Value, + &RegSize); + } + + /* Close the key */ + RegCloseKey(ParametersKey); + } + return ErrorCode; +} + +static +LSTATUS +WriteRegistryValue(PCHAR ValueName, PCHAR Value) +{ + INT ErrorCode; + HKEY ParametersKey; + + /* Open the database path key */ + ErrorCode = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "System\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, + KEY_WRITE, + &ParametersKey); + if (ErrorCode == NO_ERROR) + { + /* Read the actual path */ + ErrorCode = RegSetValueExA(ParametersKey, + ValueName, + 0, + REG_SZ, + (LPBYTE)Value, + strlen(Value) + 1); + + /* Close the key */ + RegCloseKey(ParametersKey); + } + return ErrorCode; +} + +static +LSTATUS +DeleteRegistryValue(PCHAR ValueName) +{ + INT ErrorCode; + HKEY ParametersKey; + + /* Open the database path key */ + ErrorCode = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "System\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, + KEY_WRITE, + &ParametersKey); + if (ErrorCode == NO_ERROR) + { + /* Read the actual path */ + ErrorCode = RegDeleteValueA(ParametersKey, ValueName); + + /* Close the key */ + RegCloseKey(ParametersKey); + } + return ErrorCode; +} + +/* If this test crashes it might end up with wrong host and/or domain name in registry! */ +static +VOID +TestReturnValues() +{ + CHAR OrigNetBIOS[128]; + CHAR OrigHostname[128]; + CHAR OrigDomainName[128]; + CHAR OrigDhcpHostname[128]; + CHAR OrigDhcpDomainName[128]; + BOOL OrigNetBIOSExists; + BOOL OrigHostnameExists; + BOOL OrigDomainNameExists; + BOOL OrigDhcpHostnameExists; + BOOL OrigDhcpDomainNameExists; + CHAR ComputerName[128]; + DWORD ComputerNameSize = 0; + INT ErrorCode; + + memset(OrigNetBIOS, 0, sizeof(OrigNetBIOS)); + memset(OrigHostname, 0, sizeof(OrigHostname)); + memset(OrigDomainName, 0, sizeof(OrigDomainName)); + memset(OrigDhcpHostname, 0, sizeof(OrigDhcpHostname)); + memset(OrigDhcpDomainName, 0, sizeof(OrigDhcpDomainName)); + /* read current registry values */ + ErrorCode = ReadRegistryComputerNameValue("ComputerName", OrigNetBIOS); + ok(ErrorCode == ERROR_SUCCESS, "Failed to read registry key ComputerName %d\n", ErrorCode); + OrigNetBIOSExists = ErrorCode == STATUS_SUCCESS; + ErrorCode = ReadRegistryValue("Hostname", OrigHostname); + ok(ErrorCode == ERROR_SUCCESS, "Failed to read registry key Hostname %d\n", ErrorCode); + OrigHostnameExists = ErrorCode == STATUS_SUCCESS; + ErrorCode = ReadRegistryValue("Domain", OrigDomainName); + ok(ErrorCode == ERROR_SUCCESS || ErrorCode == ERROR_FILE_NOT_FOUND, "Failed to read registry key DomainName %d\n", ErrorCode); + OrigDomainNameExists = ErrorCode == STATUS_SUCCESS; + ErrorCode = ReadRegistryValue("DhcpHostname", OrigDhcpHostname); + ok(ErrorCode == ERROR_SUCCESS || ErrorCode == ERROR_FILE_NOT_FOUND, "Failed to read registry key DhcpHostname %d\n", ErrorCode); + OrigDhcpHostnameExists = ErrorCode == STATUS_SUCCESS; + ErrorCode = ReadRegistryValue("DhcpDomain", OrigDhcpDomainName); + ok(ErrorCode == ERROR_SUCCESS || ErrorCode == ERROR_FILE_NOT_FOUND, "Failed to read registry key DhcpDomainName %d\n", ErrorCode); + OrigDhcpDomainNameExists = ErrorCode == STATUS_SUCCESS; + + trace("Starting values:\n"); + trace("NetBIOS: %s, exists %s\n", OrigNetBIOS, OrigNetBIOSExists ? "yes" : "no"); + trace("Hostname: %s, exists %s\n", OrigHostname, OrigHostnameExists ? "yes" : "no"); + trace("Domain: %s, exists %s\n", OrigDomainName, OrigDomainNameExists ? "yes" : "no"); + trace("DhcpHostname: %s, exists %s\n", OrigDhcpHostnameExists ? OrigDhcpHostname : "", OrigDhcpHostnameExists ? "yes" : "no"); + trace("DhcpDomain: %s, exists %s\n", OrigDhcpDomainNameExists ? OrigDhcpDomainName : "", OrigDhcpDomainNameExists ? "yes" : "no"); + + /* ComputerNamePhysicalNetBIOS */ + ComputerNameSize = 0; + StartSeh() + GetComputerNameExA(ComputerNamePhysicalNetBIOS, ComputerName, &ComputerNameSize); + if (ComputerNameSize) + ok(GetComputerNameExA(ComputerNamePhysicalNetBIOS, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNamePhysicalNetBIOS) failed with %ld\n", GetLastError()); + else + memset(ComputerName, 0, sizeof(ComputerName)); + ok(strcmp(ComputerName, OrigNetBIOS) == 0, "ComputerNamePhysicalNetBIOS doesn't match registry value '%s' != '%s'\n", ComputerName, OrigNetBIOS); + EndSeh(STATUS_SUCCESS); + + /* ComputerNamePhysicalDnsHostname */ + ComputerNameSize = 0; + StartSeh() + GetComputerNameExA(ComputerNamePhysicalDnsHostname, ComputerName, &ComputerNameSize); + if (ComputerNameSize) + ok(GetComputerNameExA(ComputerNamePhysicalDnsHostname, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNamePhysicalDnsHostname) failed with %ld\n", GetLastError()); + else + memset(ComputerName, 0, sizeof(ComputerName)); + ok(strcmp(ComputerName, OrigHostname) == 0, "ComputerNamePhysicalDnsHostname doesn't match registry value '%s' != '%s'\n", ComputerName, OrigHostname); + EndSeh(STATUS_SUCCESS); + + /* ComputerNamePhysicalDnsDomain */ + ComputerNameSize = 0; + StartSeh() + GetComputerNameExA(ComputerNamePhysicalDnsDomain, ComputerName, &ComputerNameSize); + if (ComputerNameSize) + ok(GetComputerNameExA(ComputerNamePhysicalDnsDomain, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNamePhysicalDnsDomain) failed with %ld\n", GetLastError()); + else + memset(ComputerName, 0, sizeof(ComputerName)); + ok(strcmp(ComputerName, OrigDomainName) == 0, "ComputerNamePhysicalDnsDomain doesn't match registry value '%s' != '%s'\n", ComputerName, OrigDomainName); + EndSeh(STATUS_SUCCESS); + ComputerNameSize = 0; + + /* ComputerNameNetBIOS */ + StartSeh() + GetComputerNameExA(ComputerNameNetBIOS, ComputerName, &ComputerNameSize); + if (ComputerNameSize) + ok(GetComputerNameExA(ComputerNameNetBIOS, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNameNetBIOS) failed with %ld\n", GetLastError()); + else + memset(ComputerName, 0, sizeof(ComputerName)); + ok(strcmp(ComputerName, OrigNetBIOS) == 0, "ComputerNameNetBIOS doesn't match registry value '%s' != '%s'\n", ComputerName, OrigNetBIOS); + EndSeh(STATUS_SUCCESS); + + /* ComputerNameDnsHostname */ + ComputerNameSize = 0; + StartSeh() + GetComputerNameExA(ComputerNameDnsHostname, ComputerName, &ComputerNameSize); + if (ComputerNameSize) + ok(GetComputerNameExA(ComputerNameDnsHostname, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNameDnsHostname) failed with %ld\n", GetLastError()); + else + memset(ComputerName, 0, sizeof(ComputerName)); + ok(strcmp(ComputerName, OrigHostname) == 0, "ComputerNameDnsHostname doesn't match registry value '%s' != '%s'\n", ComputerName, OrigHostname); + EndSeh(STATUS_SUCCESS); + + /* ComputerNameDnsDomain */ + ComputerNameSize = 0; + StartSeh() + GetComputerNameExA(ComputerNameDnsDomain, ComputerName, &ComputerNameSize); + if (ComputerNameSize) + ok(GetComputerNameExA(ComputerNameDnsDomain, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNameDnsDomain) failed with %ld\n", GetLastError()); + else + memset(ComputerName, 0, sizeof(ComputerName)); + ok(strcmp(ComputerName, OrigDomainName) == 0, "ComputerNameDnsDomain doesn't match registry value '%s' != '%s'\n", ComputerName, OrigDomainName); + EndSeh(STATUS_SUCCESS); + + ErrorCode = WriteRegistryValue("DhcpHostname", "testdhcproshost"); + ok(ErrorCode == ERROR_SUCCESS, "Failed to write registry key DhcpHostname %d\n", ErrorCode); + ErrorCode = WriteRegistryValue("DhcpDomain", "testrosdomain"); + ok(ErrorCode == ERROR_SUCCESS, "Failed to write registry key DhcpDomainName %d\n", ErrorCode); + + /* ComputerNamePhysicalNetBIOS */ + ComputerNameSize = 0; + StartSeh() + GetComputerNameExA(ComputerNamePhysicalNetBIOS, ComputerName, &ComputerNameSize); + if (ComputerNameSize) + ok(GetComputerNameExA(ComputerNamePhysicalNetBIOS, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNamePhysicalNetBIOS) failed with %ld\n", GetLastError()); + else + memset(ComputerName, 0, sizeof(ComputerName)); + ok(strcmp(ComputerName, OrigNetBIOS) == 0, "ComputerNamePhysicalNetBIOS doesn't match registry value '%s' != '%s'\n", ComputerName, OrigNetBIOS); + EndSeh(STATUS_SUCCESS); + + /* ComputerNamePhysicalDnsHostname */ + ComputerNameSize = 0; + StartSeh() + GetComputerNameExA(ComputerNamePhysicalDnsHostname, ComputerName, &ComputerNameSize); + if (ComputerNameSize) + ok(GetComputerNameExA(ComputerNamePhysicalDnsHostname, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNamePhysicalDnsHostname) failed with %ld\n", GetLastError()); + else + memset(ComputerName, 0, sizeof(ComputerName)); + ok(strcmp(ComputerName, OrigHostname) == 0, "ComputerNamePhysicalDnsHostname doesn't match registry value '%s' != '%s'\n", ComputerName, OrigHostname); + EndSeh(STATUS_SUCCESS); + + /* ComputerNamePhysicalDnsDomain */ + ComputerNameSize = 0; + StartSeh() + GetComputerNameExA(ComputerNamePhysicalDnsDomain, ComputerName, &ComputerNameSize); + if (ComputerNameSize) + ok(GetComputerNameExA(ComputerNamePhysicalDnsDomain, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNamePhysicalDnsDomain) failed with %ld\n", GetLastError()); + else + memset(ComputerName, 0, sizeof(ComputerName)); + ok(strcmp(ComputerName, OrigDomainName) == 0, "ComputerNamePhysicalDnsDomain doesn't match registry value '%s' != '%s'\n", ComputerName, OrigDomainName); + EndSeh(STATUS_SUCCESS); + ComputerNameSize = 0; + + /* ComputerNameNetBIOS */ + StartSeh() + GetComputerNameExA(ComputerNameNetBIOS, ComputerName, &ComputerNameSize); + if (ComputerNameSize) + ok(GetComputerNameExA(ComputerNameNetBIOS, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNameNetBIOS) failed with %ld\n", GetLastError()); + else + memset(ComputerName, 0, sizeof(ComputerName)); + ok(strcmp(ComputerName, OrigNetBIOS) == 0, "ComputerNameNetBIOS doesn't match registry value '%s' != '%s'\n", ComputerName, OrigNetBIOS); + EndSeh(STATUS_SUCCESS); + + /* ComputerNameDnsHostname */ + ComputerNameSize = 0; + StartSeh() + GetComputerNameExA(ComputerNameDnsHostname, ComputerName, &ComputerNameSize); + if (ComputerNameSize) + ok(GetComputerNameExA(ComputerNameDnsHostname, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNameDnsHostname) failed with %ld\n", GetLastError()); + else + memset(ComputerName, 0, sizeof(ComputerName)); + ok(strcmp(ComputerName, OrigHostname) == 0, "ComputerNameDnsHostname doesn't match registry value '%s' != '%s'\n", ComputerName, OrigHostname); + EndSeh(STATUS_SUCCESS); + + /* ComputerNameDnsDomain */ + ComputerNameSize = 0; + StartSeh() + GetComputerNameExA(ComputerNameDnsDomain, ComputerName, &ComputerNameSize); + if (ComputerNameSize) + ok(GetComputerNameExA(ComputerNameDnsDomain, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNameDnsDomain) failed with %ld\n", GetLastError()); + else + memset(ComputerName, 0, sizeof(ComputerName)); + ok(strcmp(ComputerName, OrigDomainName) == 0, "ComputerNameDnsDomain doesn't match registry value '%s' != '%s'\n", ComputerName, OrigDomainName); + EndSeh(STATUS_SUCCESS); + + /* restore registry values */ + if (OrigDhcpHostnameExists) + ErrorCode = WriteRegistryValue("DhcpHostname", OrigDhcpHostname); + else + ErrorCode = DeleteRegistryValue("DhcpHostname"); + ok(ErrorCode == ERROR_SUCCESS, "Failed to restore registry key DhcpHostname %d\n", ErrorCode); + if (OrigDhcpDomainNameExists) + ErrorCode = WriteRegistryValue("DhcpDomain", OrigDhcpDomainName); + else + ErrorCode = DeleteRegistryValue("DhcpDomain"); + ok(ErrorCode == ERROR_SUCCESS, "Failed to restore registry key DhcpDomainName %d\n", ErrorCode); +} + START_TEST(GetComputerNameEx) { TestGetComputerNameEx(ComputerNameNetBIOS); @@ -189,4 +523,5 @@ TestGetComputerNameEx(ComputerNamePhysicalDnsHostname); TestGetComputerNameEx(ComputerNamePhysicalDnsDomain); //TestGetComputerNameEx(ComputerNamePhysicalDnsFullyQualified); -} + TestReturnValues(); +}

1 0

[tfaber] 72848: [RAPPS] - Avoid an unintended fall-through and document and intended one in DownloadProgressProc. CID 1341273 (rapps), 1363531 (rapps_new)
by tfaber＠svn.reactos.org 29 Sep '16

29 Sep '16

Author: tfaber Date: Thu Sep 29 09:36:33 2016 New Revision: 72848 URL: http://svn.reactos.org/svn/reactos?rev=72848&view=rev Log: [RAPPS] - Avoid an unintended fall-through and document and intended one in DownloadProgressProc. CID 1341273 (rapps), 1363531 (rapps_new) Modified: trunk/reactos/base/applications/rapps/loaddlg.c trunk/reactos/base/applications/rapps_new/loaddlg.cpp Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Thu Sep 29 09:36:33 2016 @@ -556,6 +556,7 @@ sizeof(szProgressText), (PCWSTR)lParam); } + return TRUE; } case WM_ERASEBKGND: @@ -611,7 +612,7 @@ ZeroMemory(szProgressText, sizeof(szProgressText)); RemoveWindowSubclass(hWnd, DownloadProgressProc, uIdSubclass); } - + /* Fall-through */ default: return DefSubclassProc(hWnd, uMsg, wParam, lParam); } Modified: trunk/reactos/base/applications/rapps_new/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/loaddlg.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/loaddlg.cpp [iso-8859-1] Thu Sep 29 09:36:33 2016 @@ -508,6 +508,7 @@ sizeof(szProgressText), (PCWSTR)lParam); } + return TRUE; } case WM_ERASEBKGND: @@ -563,7 +564,7 @@ ZeroMemory(szProgressText, sizeof(szProgressText)); RemoveWindowSubclass(hWnd, DownloadProgressProc, uIdSubclass); } - + /* Fall-through */ default: return DefSubclassProc(hWnd, uMsg, wParam, lParam); }

1 0

[tfaber] 72847: [WIN32K:NTUSER] - Add missing break in DefWndStartSizeMove. CID 513489 CORE-12064 #resolve
by tfaber＠svn.reactos.org 29 Sep '16

29 Sep '16

Author: tfaber Date: Thu Sep 29 08:23:26 2016 New Revision: 72847 URL: http://svn.reactos.org/svn/reactos?rev=72847&view=rev Log: [WIN32K:NTUSER] - Add missing break in DefWndStartSizeMove. CID 513489 CORE-12064 #resolve Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Thu Sep 29 08:23:26 2016 @@ -214,6 +214,7 @@ case VK_ESCAPE: return 0; } + break; default: IntTranslateKbdMessage( &msg, 0 ); pti->TIF_flags |= TIF_MOVESIZETRACKING;

1 0

[hbelusca] 72846: [REACTOS]: Do not gather all the generated message resource files in the same directory (sdk/include/reactos/), so that to avoid potential file collisions, but instead place them ...
by hbelusca＠svn.reactos.org 28 Sep '16

28 Sep '16

Author: hbelusca Date: Wed Sep 28 23:20:20 2016 New Revision: 72846 URL: http://svn.reactos.org/svn/reactos?rev=72846&view=rev Log: [REACTOS]: Do not gather all the generated message resource files in the same directory (sdk/include/reactos/), so that to avoid potential file collisions, but instead place them into their respective per-target directories. CORE-12062 #resolve [RAPPS_NEW]: Fix rapps_new message header & resource files inclusion. [ROSTESTS]: Adjust the CMakeLists files in accordance. Added: trunk/reactos/dll/win32/netevent/netevent.rc - copied unchanged from r72845, trunk/reactos/dll/win32/netevent/netevt.rc Removed: trunk/reactos/dll/win32/netevent/netevt.rc Modified: trunk/reactos/CMakeLists.txt trunk/reactos/base/applications/rapps_new/rapps.h trunk/reactos/base/applications/rapps_new/rapps.rc trunk/reactos/dll/win32/iologmsg/CMakeLists.txt trunk/reactos/dll/win32/netevent/CMakeLists.txt trunk/reactos/sdk/cmake/CMakeMacros.cmake trunk/reactos/sdk/cmake/gcc.cmake trunk/reactos/sdk/cmake/msvc.cmake trunk/rostests/rosautotest/CMakeLists.txt trunk/rostests/win32/advapi32/eventlog/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=72846&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -235,6 +235,7 @@ ${REACTOS_BINARY_DIR}/sdk/include/dxsdk ${REACTOS_BINARY_DIR}/sdk/include/ddk ${REACTOS_BINARY_DIR}/sdk/include/reactos + ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc sdk/include/crt sdk/include/ddk sdk/include/ndk Modified: trunk/reactos/base/applications/rapps_new/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/rapps.h [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -24,7 +24,7 @@ #include <strsafe.h> #include <ndk/rtlfuncs.h> -#include <rappsmsg.h> +#include <rappsmsg_new.h> #include "resource.h" Modified: trunk/reactos/base/applications/rapps_new/rapps.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/rapps.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/rapps.rc [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -52,7 +52,7 @@ #include <reactos/manifest_exe.rc> -#include <rappsmsg.rc> +#include <rappsmsg_new.rc> /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/iologmsg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iologmsg/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/iologmsg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iologmsg/CMakeLists.txt [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -1,5 +1,4 @@ -include_directories(${REACTOS_BINARY_DIR}/sdk/include/reactos) add_library(iologmsg SHARED iologmsg.rc) set_module_type(iologmsg module UNICODE) add_dependencies(iologmsg ntiologc) Modified: trunk/reactos/dll/win32/netevent/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netevent/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netevent/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netevent/CMakeLists.txt [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -1,6 +1,5 @@ -include_directories(${REACTOS_BINARY_DIR}/sdk/include/reactos) -add_library(netevent SHARED netevt.rc) +add_library(netevent SHARED netevent.rc) set_module_type(netevent module UNICODE) add_dependencies(netevent neteventmsg) add_cd_file(TARGET netevent DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/win32/netevent/netevt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netevent/netevt.… ============================================================================== --- trunk/reactos/dll/win32/netevent/netevt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netevent/netevt.rc (removed) @@ -1,7 +0,0 @@ -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Network Event Handler" -#define REACTOS_STR_INTERNAL_NAME "netevent" -#define REACTOS_STR_ORIGINAL_FILENAME "netevent.dll" -#include <reactos/version.rc> - -#include <neteventmsg.rc> Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -113,23 +113,23 @@ else() set(_flag "-A") endif() - foreach(_in_FILE ${ARGN}) - get_filename_component(FILE ${_in_FILE} NAME_WE) - set(_converted_item ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc/${FILE}.mc) - set(_source_item ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) + foreach(_file ${ARGN}) + get_filename_component(_file_name ${_file} NAME_WE) + set(_converted_file ${CMAKE_CURRENT_BINARY_DIR}/${_file}) ## ${_file_name}.mc + set(_source_file ${CMAKE_CURRENT_SOURCE_DIR}/${_file}) ## ${_file_name}.mc add_custom_command( - OUTPUT "${_converted_item}" - COMMAND native-utf16le "${_source_item}" "${_converted_item}" "nobom" - DEPENDS native-utf16le "${_source_item}") - macro_mc(${_flag} ${FILE}) + OUTPUT "${_converted_file}" + COMMAND native-utf16le "${_source_file}" "${_converted_file}" nobom + DEPENDS native-utf16le "${_source_file}") + macro_mc(${_flag} ${_converted_file}) add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.rc ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.h - COMMAND ${COMMAND_MC} ${MC_FLAGS} - DEPENDS "${_converted_item}") + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file_name}.h ${CMAKE_CURRENT_BINARY_DIR}/${_file_name}.rc + COMMAND ${COMMAND_MC} + DEPENDS "${_converted_file}") set_source_files_properties( - ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.rc + ${CMAKE_CURRENT_BINARY_DIR}/${_file_name}.h ${CMAKE_CURRENT_BINARY_DIR}/${_file_name}.rc PROPERTIES GENERATED TRUE) - add_custom_target(${FILE} ALL DEPENDS ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.rc) + add_custom_target(${_file_name} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file_name}.h ${CMAKE_CURRENT_BINARY_DIR}/${_file_name}.rc) endforeach() endfunction() Modified: trunk/reactos/sdk/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/gcc.cmake?rev=72… ============================================================================== --- trunk/reactos/sdk/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/gcc.cmake [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -379,7 +379,7 @@ endfunction() macro(macro_mc FLAG FILE) - set(COMMAND_MC ${CMAKE_MC_COMPILER} -u ${FLAG} -b ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc/${FILE}.mc -r ${REACTOS_BINARY_DIR}/sdk/include/reactos -h ${REACTOS_BINARY_DIR}/sdk/include/reactos) + set(COMMAND_MC ${CMAKE_MC_COMPILER} -u ${FLAG} -b -h ${CMAKE_CURRENT_BINARY_DIR}/ -r ${CMAKE_CURRENT_BINARY_DIR}/ ${FILE}) endmacro() # PSEH lib, needed with mingw Modified: trunk/reactos/sdk/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/msvc.cmake?rev=7… ============================================================================== --- trunk/reactos/sdk/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/msvc.cmake [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -374,7 +374,7 @@ endfunction() macro(macro_mc FLAG FILE) - set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/sdk/include/reactos -h ${REACTOS_BINARY_DIR}/sdk/include/reactos) + set(COMMAND_MC ${CMAKE_MC_COMPILER} -u ${FLAG} -b -h ${CMAKE_CURRENT_BINARY_DIR}/ -r ${CMAKE_CURRENT_BINARY_DIR}/ ${FILE}) endmacro() # PSEH workaround Modified: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.tx… ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -22,7 +22,7 @@ tools.cpp precomp.h) -add_executable(rosautotest ${SOURCE} ${REACTOS_BINARY_DIR}/sdk/include/reactos/rosautotestmsg.rc) +add_executable(rosautotest ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/rosautotestmsg.rc) set_module_type(rosautotest win32cui UNICODE) add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll) add_pch(rosautotest precomp.h SOURCE) Modified: trunk/rostests/win32/advapi32/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/advapi32/eventlog/C… ============================================================================== --- trunk/rostests/win32/advapi32/eventlog/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/win32/advapi32/eventlog/CMakeLists.txt [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -3,19 +3,15 @@ ## rc /fo $(IntDir)MyEventProvider.res MyEventProvider.rc ## link /dll /noentry /SUBSYSTEM:CONSOLE",5.0" /out:$(SolutionDir)$(Configuration)\MyEventProvider.dll $(IntDir)MyEventProvider.res -## add_message_headers(UNICODE MyEventProvider.mc) - -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvider.rc ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvider.h - COMMAND ${CMAKE_MC_COMPILER} -U ${CMAKE_CURRENT_SOURCE_DIR}/MyEventProvider.mc -r ${CMAKE_CURRENT_BINARY_DIR}/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/MyEventProvider.mc) - -add_library(MyEventProvider SHARED ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvider.rc) -set_module_type(MyEventProvider module UNICODE) -add_cd_file(TARGET MyEventProvider DESTINATION reactos/bin FOR all) +add_message_headers(UNICODE MyEventProvider.mc) +add_library(MyEventProvider_dll SHARED ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvider.rc) +add_dependencies(MyEventProvider_dll MyEventProvider) +set_module_type(MyEventProvider_dll module UNICODE) +set_target_properties(MyEventProvider_dll PROPERTIES OUTPUT_NAME "MyEventProvider") +add_cd_file(TARGET MyEventProvider_dll DESTINATION reactos/bin FOR all) add_executable(evtlogtest EvtLogTest.c) -add_dependencies(evtlogtest MyEventProvider) set_module_type(evtlogtest win32cui UNICODE) +add_dependencies(evtlogtest MyEventProvider MyEventProvider_dll) add_importlibs(evtlogtest advapi32 msvcrt kernel32) add_cd_file(TARGET evtlogtest DESTINATION reactos/bin FOR all)

1 0

[dchapyshev] 72845: [SHLWAPI] Try to fix regression
by dchapyshev＠svn.reactos.org 28 Sep '16

28 Sep '16

Author: dchapyshev Date: Wed Sep 28 21:44:01 2016 New Revision: 72845 URL: http://svn.reactos.org/svn/reactos?rev=72845&view=rev Log: [SHLWAPI] Try to fix regression Modified: trunk/reactos/dll/win32/shlwapi/url.c Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] Wed Sep 28 21:44:01 2016 @@ -1190,13 +1190,23 @@ if ((cur >= 0xd800 && cur <= 0xdfff) && (src[1] >= 0xdc00 && src[1] <= 0xdfff)) { +#ifdef __REACTOS__ + len = WideCharToMultiByte( CP_UTF8, 0, src, 2, + utf, sizeof(utf), NULL, NULL ); +#else len = WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, src, 2, utf, sizeof(utf), NULL, NULL ); +#endif src++; } else +#ifdef __REACTOS__ + len = WideCharToMultiByte( CP_UTF8, 0, &cur, 1, + utf, sizeof(utf), NULL, NULL ); +#else len = WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, &cur, 1, utf, sizeof(utf), NULL, NULL ); +#endif if (!len) { utf[0] = 0xef;

1 0

[mjansen] 72844: [DEGMGR] Revert r65406, this is not a leak. CORE-9716 #comment Please retest!
by mjansen＠svn.reactos.org 28 Sep '16

28 Sep '16

Author: mjansen Date: Wed Sep 28 21:05:39 2016 New Revision: 72844 URL: http://svn.reactos.org/svn/reactos?rev=72844&view=rev Log: [DEGMGR] Revert r65406, this is not a leak. CORE-9716 #comment Please retest! Modified: trunk/reactos/dll/win32/devmgr/properties/hwpage.cpp Modified: trunk/reactos/dll/win32/devmgr/properties/hwpage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/propertie… ============================================================================== --- trunk/reactos/dll/win32/devmgr/properties/hwpage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/properties/hwpage.cpp [iso-8859-1] Wed Sep 28 21:05:39 2016 @@ -1067,7 +1067,6 @@ (LPARAM)hpd); if (hWnd != NULL) { - HeapFree(GetProcessHeap(), 0, hpd); return hWnd; } else

1 0

[janderwald] 72843: [USBAUDIO] - implement USBAudioSelectAudioStreamingInterface
by janderwald＠svn.reactos.org 28 Sep '16

28 Sep '16

Author: janderwald Date: Wed Sep 28 20:31:32 2016 New Revision: 72843 URL: http://svn.reactos.org/svn/reactos?rev=72843&view=rev Log: [USBAUDIO] - implement USBAudioSelectAudioStreamingInterface Modified: trunk/reactos/drivers/usb/usbaudio/filter.c trunk/reactos/drivers/usb/usbaudio/pin.c trunk/reactos/drivers/usb/usbaudio/usbaudio.c Modified: trunk/reactos/drivers/usb/usbaudio/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/filte… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/filter.c [iso-8859-1] Wed Sep 28 20:31:32 2016 @@ -136,6 +136,7 @@ FilterContext->LowerDevice = Device->NextDeviceObject; Filter->Context = FilterContext; + DPRINT("USBAudioFilterCreate FilterContext %p LowerDevice %p DeviceExtension %p\n", FilterContext, FilterContext->LowerDevice, FilterContext->DeviceExtension); KsAddItemToObjectBag(Filter->Bag, FilterContext, ExFreePool); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/usb/usbaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/pin.c… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] Wed Sep 28 20:31:32 2016 @@ -10,80 +10,8 @@ #include "usbaudio.h" NTSTATUS -NTAPI -USBAudioPinCreate( - _In_ PKSPIN Pin, - _In_ PIRP Irp) -{ - PKSFILTER Filter; - PFILTER_CONTEXT FilterContext; - PPIN_CONTEXT PinContext; - - Filter = KsPinGetParentFilter(Pin); - if (Filter == NULL) - { - /* invalid parameter */ - return STATUS_INVALID_PARAMETER; - } - - /* get filter context */ - FilterContext = Filter->Context; - - /* allocate pin context */ - PinContext = AllocFunction(sizeof(PIN_CONTEXT)); - if (!PinContext) - { - /* no memory*/ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* init pin context */ - PinContext->DeviceExtension = FilterContext->DeviceExtension; - PinContext->LowerDevice = FilterContext->LowerDevice; - - /* store pin context*/ - Pin->Context = PinContext; - - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -USBAudioPinClose( - _In_ PKSPIN Pin, - _In_ PIRP Irp) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - - -NTSTATUS -NTAPI -USBAudioPinProcess( - _In_ PKSPIN Pin) -{ - UNIMPLEMENTED - return STATUS_SUCCESS; -} - - -VOID -NTAPI -USBAudioPinReset( - _In_ PKSPIN Pin) -{ - UNIMPLEMENTED -} - -NTSTATUS -NTAPI -USBAudioPinSetDataFormat( - _In_ PKSPIN Pin, - _In_opt_ PKSDATAFORMAT OldFormat, - _In_opt_ PKSMULTIPLE_ITEM OldAttributeList, - _In_ const KSDATARANGE* DataRange, - _In_opt_ const KSATTRIBUTE_LIST* AttributeRange) +UsbAudioSetFormat( + IN PKSPIN Pin) { PURB Urb; PUCHAR SampleRateBuffer; @@ -99,14 +27,16 @@ return STATUS_INSUFFICIENT_RESOURCES; } - if (IsEqualGUIDAligned(&Pin->ConnectionFormat->MajorFormat, &KSDATAFORMAT_TYPE_AUDIO) && - IsEqualGUIDAligned(&Pin->ConnectionFormat->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM) && + if (IsEqualGUIDAligned(&Pin->ConnectionFormat->MajorFormat, &KSDATAFORMAT_TYPE_AUDIO) && + IsEqualGUIDAligned(&Pin->ConnectionFormat->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM) && IsEqualGUIDAligned(&Pin->ConnectionFormat->Specifier, &KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)) { WaveFormatEx = (PKSDATAFORMAT_WAVEFORMATEX)Pin->ConnectionFormat; SampleRateBuffer[0] = (WaveFormatEx->WaveFormatEx.nSamplesPerSec >> 16) & 0xFF; SampleRateBuffer[1] = (WaveFormatEx->WaveFormatEx.nSamplesPerSec >> 8) & 0xFF; SampleRateBuffer[2] = (WaveFormatEx->WaveFormatEx.nSamplesPerSec >> 0) & 0xFF; + + /* TODO: verify connection format */ } else { @@ -127,17 +57,17 @@ /* format urb */ UsbBuildVendorRequest(Urb, - URB_FUNCTION_CLASS_ENDPOINT, - sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), - USBD_TRANSFER_DIRECTION_OUT, - 0, - 0x01, - 0x100, - 0x81, //bEndpointAddress - SampleRateBuffer, - NULL, - 3, - NULL); + URB_FUNCTION_CLASS_ENDPOINT, + sizeof(URB), + USBD_TRANSFER_DIRECTION_OUT, + 0, + 0x01, + 0x100, + 0x81, //FIXME bEndpointAddress + SampleRateBuffer, + NULL, + 3, + NULL); /* get pin context */ PinContext = Pin->Context; @@ -152,6 +82,200 @@ } NTSTATUS +USBAudioSelectAudioStreamingInterface( + IN PDEVICE_EXTENSION DeviceExtension, + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) +{ + PURB Urb; + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + NTSTATUS Status; + + /* grab interface descriptor */ + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, ConfigurationDescriptor, -1, -1, USB_DEVICE_CLASS_AUDIO, -1, -1); + if (!InterfaceDescriptor) + { + /* no such interface */ + return STATUS_INVALID_PARAMETER; + } + + /* select the first interface with audio streaming and non zero num of endpoints */ + while (InterfaceDescriptor != NULL) + { + if (InterfaceDescriptor->bInterfaceSubClass == 0x02 /* AUDIO_STREAMING */ && InterfaceDescriptor->bNumEndpoints > 0) + { + break; + } + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, (PVOID)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength), -1, -1, USB_DEVICE_CLASS_AUDIO, -1, -1); + } + + if (!InterfaceDescriptor) + { + /* no such interface */ + return STATUS_INVALID_PARAMETER; + } + + Urb = AllocFunction(GET_SELECT_INTERFACE_REQUEST_SIZE(InterfaceDescriptor->bNumEndpoints)); + if (!Urb) + { + /* no memory */ + return USBD_STATUS_INSUFFICIENT_RESOURCES; + } + + /* now prepare interface urb */ + UsbBuildSelectInterfaceRequest(Urb, GET_SELECT_INTERFACE_REQUEST_SIZE(InterfaceDescriptor->bNumEndpoints), DeviceExtension->ConfigurationHandle, InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting); + + /* copy interface information */ + RtlCopyMemory(&Urb->UrbSelectInterface.Interface, DeviceExtension->InterfaceInfo, DeviceExtension->InterfaceInfo->Length); + + /* set configuration handle */ + Urb->UrbSelectInterface.ConfigurationHandle = DeviceExtension->ConfigurationHandle; + + /* now select the interface */ + Status = SubmitUrbSync(DeviceExtension->LowerDevice, Urb); + + DPRINT1("USBAudioSelectAudioStreamingInterface Status %x UrbStatus %x\n", Status, Urb->UrbSelectInterface.Hdr.Status); + + /* did it succeeed */ + if (NT_SUCCESS(Status)) + { + /* update configuration info */ + ASSERT(Urb->UrbSelectInterface.Interface.Length == DeviceExtension->InterfaceInfo->Length); + RtlCopyMemory(DeviceExtension->InterfaceInfo, &Urb->UrbSelectInterface.Interface, Urb->UrbSelectInterface.Interface.Length); + } + + /* free urb */ + FreeFunction(Urb); + return Status; +} + +NTSTATUS +InitCapturePin( + IN PKSPIN Pin) +{ + NTSTATUS Status; + + /* set sample rate */ + Status = UsbAudioSetFormat(Pin); + + /* TODO: init pin */ + return Status; +} + +NTSTATUS +InitStreamPin( + IN PKSPIN Pin) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +NTAPI +USBAudioPinCreate( + _In_ PKSPIN Pin, + _In_ PIRP Irp) +{ + PKSFILTER Filter; + PFILTER_CONTEXT FilterContext; + PPIN_CONTEXT PinContext; + NTSTATUS Status; + + Filter = KsPinGetParentFilter(Pin); + if (Filter == NULL) + { + /* invalid parameter */ + return STATUS_INVALID_PARAMETER; + } + + /* get filter context */ + FilterContext = Filter->Context; + + /* allocate pin context */ + PinContext = AllocFunction(sizeof(PIN_CONTEXT)); + if (!PinContext) + { + /* no memory*/ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* init pin context */ + PinContext->DeviceExtension = FilterContext->DeviceExtension; + PinContext->LowerDevice = FilterContext->LowerDevice; + + /* store pin context*/ + Pin->Context = PinContext; + + /* select streaming interface */ + Status = USBAudioSelectAudioStreamingInterface(PinContext->DeviceExtension, PinContext->DeviceExtension->ConfigurationDescriptor); + if (!NT_SUCCESS(Status)) + { + /* failed */ + return Status; + } + + if (Pin->DataFlow == KSPIN_DATAFLOW_OUT) + { + /* init capture pin */ + Status = InitCapturePin(Pin); + } + else + { + /* audio streaming pin*/ + Status = InitStreamPin(Pin); + } + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +USBAudioPinClose( + _In_ PKSPIN Pin, + _In_ PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +NTAPI +USBAudioPinProcess( + _In_ PKSPIN Pin) +{ + return STATUS_SUCCESS; +} + + +VOID +NTAPI +USBAudioPinReset( + _In_ PKSPIN Pin) +{ + UNIMPLEMENTED +} + +NTSTATUS +NTAPI +USBAudioPinSetDataFormat( + _In_ PKSPIN Pin, + _In_opt_ PKSDATAFORMAT OldFormat, + _In_opt_ PKSMULTIPLE_ITEM OldAttributeList, + _In_ const KSDATARANGE* DataRange, + _In_opt_ const KSATTRIBUTE_LIST* AttributeRange) +{ + if (OldFormat == NULL) + { + /* TODO: verify connection format */ + UNIMPLEMENTED + return STATUS_SUCCESS; + } + + return UsbAudioSetFormat(Pin); +} + +NTSTATUS NTAPI USBAudioPinSetDeviceState( _In_ PKSPIN Pin, Modified: trunk/reactos/drivers/usb/usbaudio/usbaudio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/usbau… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/usbaudio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/usbaudio.c [iso-8859-1] Wed Sep 28 20:31:32 2016 @@ -79,14 +79,6 @@ if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - } - - // complete request - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - if (Status == STATUS_PENDING) - { - // get final status Status = IoStatus.Status; }

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