Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjansen] 72332: [ATL][ATL_APITEST] Add CImage initial implementation + tests, by Katayama Hirofumi MZ. CORE-10029 #comment Thanks, first iteration committed! - Tests focus mainly on loading + savi...
by mjansen＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: mjansen Date: Thu Aug 18 19:27:49 2016 New Revision: 72332 URL: http://svn.reactos.org/svn/reactos?rev=72332&view=rev Log: [ATL][ATL_APITEST] Add CImage initial implementation + tests, by Katayama Hirofumi MZ. CORE-10029 #comment Thanks, first iteration committed! - Tests focus mainly on loading + saving images. - The implementation is not perfect yet, see CImage_WIP.txt for test results. - The GDI+ functions should be fixed before this test can pass fully, MS' ATL fails in ReactOS, but passes on Windows. Added: trunk/reactos/sdk/lib/atl/atlimage.h (with props) trunk/rostests/apitests/atl/CImage.cpp (with props) trunk/rostests/apitests/atl/CImage_WIP.txt (with props) trunk/rostests/apitests/atl/ant.bmp (with props) trunk/rostests/apitests/atl/cross.bmp (with props) trunk/rostests/apitests/atl/devenv/ trunk/rostests/apitests/atl/devenv/CImage.sln (with props) trunk/rostests/apitests/atl/devenv/CImage.vcxproj (with props) Modified: trunk/reactos/sdk/lib/atl/atlcom.h trunk/rostests/apitests/atl/CMakeLists.txt trunk/rostests/apitests/atl/atl_apitest.rc trunk/rostests/apitests/atl/resource.h trunk/rostests/apitests/atl/testlist.c Modified: trunk/reactos/sdk/lib/atl/atlcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlcom.h?rev=7… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlcom.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/atlcom.h [iso-8859-1] Thu Aug 18 19:27:49 2016 @@ -21,6 +21,8 @@ #pragma once +#include <cguid.h> // for GUID_NULL + namespace ATL { Added: trunk/reactos/sdk/lib/atl/atlimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlimage.h?rev… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlimage.h (added) +++ trunk/reactos/sdk/lib/atl/atlimage.h [iso-8859-1] Thu Aug 18 19:27:49 2016 @@ -0,0 +1,1142 @@ +// PROJECT: ReactOS ATL CImage +// LICENSE: Public Domain +// PURPOSE: Provides compatibility to Microsoft ATL +// PROGRAMMERS: Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + +#ifndef __ATLIMAGE_H__ +#define __ATLIMAGE_H__ + +// !!!! +// TODO: The backend (gdi+) that this class relies on is not yet complete! +// Before that is finished, this class will not be a perfect replacement. +// See rostest/apitests/atl/CImage_WIP.txt for test results. +// !!!! + +// TODO: GetImporterFilterString, GetExporterFilterString, Load, Save +// TODO: make CImage thread-safe + +#pragma once + +#include <atlcore.h> + +#include <wingdi.h> +#include <cguid.h> // for GUID_NULL +#include <gdiplus.h> // GDI+ + +namespace ATL +{ + +class CImage +{ +public: + // flags for CImage::Create/CreateEx + enum + { + createAlphaChannel = 1 // enable alpha + }; + + // orientation of DIB + enum DIBOrientation + { + DIBOR_DEFAULT, // default + DIBOR_BOTTOMUP, // bottom-up DIB + DIBOR_TOPDOWN // top-down DIB + }; + + CImage() throw() + { + m_hbm = NULL; + m_hbmOld = NULL; + m_hDC = NULL; + + m_eOrientation = DIBOR_DEFAULT; + m_bHasAlphaCh = false; + m_bIsDIBSec = false; + m_rgbTransColor = CLR_INVALID; + ZeroMemory(&m_ds, sizeof(m_ds)); + + if (GetCommon().AddRef() == 1) + { + GetCommon().LoadLib(); + } + } + + ~CImage() + { + Destroy(); + ReleaseGDIPlus(); + } + + operator HBITMAP() + { + return m_hbm; + } + +public: + void Attach(HBITMAP hBitmap, DIBOrientation eOrientation = DIBOR_DEFAULT) + { + AttachInternal(hBitmap, eOrientation, -1); + } + + HBITMAP Detach() throw() + { + m_eOrientation = DIBOR_DEFAULT; + m_bHasAlphaCh = false; + m_rgbTransColor = CLR_INVALID; + ZeroMemory(&m_ds, sizeof(m_ds)); + + HBITMAP hBitmap = m_hbm; + m_hbm = NULL; + return hBitmap; + } + + HDC GetDC() const throw() + { + if (m_hDC) + return m_hDC; + + m_hDC = ::CreateCompatibleDC(NULL); + m_hbmOld = ::SelectObject(m_hDC, m_hbm); + return m_hDC; + } + + void ReleaseDC() const throw() + { + ATLASSERT(m_hDC); + + if (m_hDC == NULL) + return; + + if (m_hbmOld) + { + ::SelectObject(m_hDC, m_hbmOld); + m_hbmOld = NULL; + } + ::DeleteDC(m_hDC); + m_hDC = NULL; + } + +public: + BOOL AlphaBlend(HDC hDestDC, + int xDest, int yDest, int nDestWidth, int nDestHeight, + int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, + BYTE bSrcAlpha = 0xFF, BYTE bBlendOp = AC_SRC_OVER) const + { + ATLASSERT(IsTransparencySupported()); + + BLENDFUNCTION bf; + bf.BlendOp = bBlendOp; + bf.BlendFlags = 0; + bf.SourceConstantAlpha = bSrcAlpha; + bf.AlphaFormat = AC_SRC_ALPHA; + + GetDC(); + BOOL ret = ::AlphaBlend(hDestDC, xDest, yDest, nDestWidth, nDestHeight, + m_hDC, xSrc, ySrc, nSrcWidth, nSrcHeight, bf); + ReleaseDC(); + return ret; + } + BOOL AlphaBlend(HDC hDestDC, int xDest, int yDest, + BYTE bSrcAlpha = 0xFF, BYTE bBlendOp = AC_SRC_OVER) const + { + int width = GetWidth(); + int height = GetHeight(); + return AlphaBlend(hDestDC, xDest, yDest, width, height, 0, 0, + width, height, bSrcAlpha, bBlendOp); + } + BOOL AlphaBlend(HDC hDestDC, const POINT& pointDest, + BYTE bSrcAlpha = 0xFF, BYTE bBlendOp = AC_SRC_OVER) const + { + return AlphaBlend(hDestDC, pointDest.x, pointDest.y, bSrcAlpha, bBlendOp); + } + BOOL AlphaBlend(HDC hDestDC, const RECT& rectDest, const RECT& rectSrc, + BYTE bSrcAlpha = 0xFF, BYTE bBlendOp = AC_SRC_OVER) const + { + return AlphaBlend(hDestDC, rectDest.left, rectDest.top, + rectDest.right - rectDest.left, + rectDest.bottom - rectDest.top, + rectSrc.left, rectSrc.top, + rectSrc.right - rectSrc.left, + rectSrc.bottom - rectSrc.top, + bSrcAlpha, bBlendOp); + } + + BOOL BitBlt(HDC hDestDC, int xDest, int yDest, + int nDestWidth, int nDestHeight, + int xSrc, int ySrc, DWORD dwROP = SRCCOPY) const throw() + { + GetDC(); + BOOL ret = ::BitBlt(hDestDC, xDest, yDest, nDestWidth, nDestHeight, + m_hDC, xSrc, ySrc, dwROP); + ReleaseDC(); + return ret; + } + BOOL BitBlt(HDC hDestDC, int xDest, int yDest, + DWORD dwROP = SRCCOPY) const throw() + { + return BitBlt(hDestDC, xDest, yDest, + GetWidth(), GetHeight(), 0, 0, dwROP); + } + BOOL BitBlt(HDC hDestDC, const POINT& pointDest, + DWORD dwROP = SRCCOPY) const throw() + { + return BitBlt(hDestDC, pointDest.x, pointDest.y, dwROP); + } + BOOL BitBlt(HDC hDestDC, const RECT& rectDest, const POINT& pointSrc, + DWORD dwROP = SRCCOPY) const throw() + { + return BitBlt(hDestDC, rectDest.left, rectDest.top, + rectDest.right - rectDest.left, + rectDest.bottom - rectDest.top, + pointSrc.x, pointSrc.y, dwROP); + } + + BOOL Create(int nWidth, int nHeight, int nBPP, DWORD dwFlags = 0) throw() + { + return CreateEx(nWidth, nHeight, nBPP, BI_RGB, NULL, dwFlags); + } + + BOOL CreateEx(int nWidth, int nHeight, int nBPP, DWORD eCompression, + const DWORD* pdwBitmasks = NULL, DWORD dwFlags = 0) throw() + { + return CreateInternal(nWidth, nHeight, nBPP, eCompression, pdwBitmasks, dwFlags); + } + + void Destroy() throw() + { + if (m_hbm) + { + ::DeleteObject(Detach()); + } + } + + BOOL Draw(HDC hDestDC, int xDest, int yDest, int nDestWidth, int nDestHeight, + int xSrc, int ySrc, int nSrcWidth, int nSrcHeight) const throw() + { + ATLASSERT(IsTransparencySupported()); + if (m_bHasAlphaCh) + { + return AlphaBlend(hDestDC, xDest, yDest, nDestWidth, nDestHeight, + xSrc, ySrc, nSrcWidth, nSrcHeight); + } + else if (m_rgbTransColor != CLR_INVALID) + { + COLORREF rgb; + if ((m_rgbTransColor & 0xFF000000) == 0x01000000) + rgb = RGBFromPaletteIndex(m_rgbTransColor & 0xFF); + else + rgb = m_rgbTransColor; + return TransparentBlt(hDestDC, xDest, yDest, nDestWidth, nDestHeight, + xSrc, ySrc, nSrcWidth, nSrcHeight, rgb); + } + else + { + return StretchBlt(hDestDC, xDest, yDest, nDestWidth, nDestHeight, + xSrc, ySrc, nSrcWidth, nSrcHeight); + } + } + BOOL Draw(HDC hDestDC, const RECT& rectDest, const RECT& rectSrc) const throw() + { + return Draw(hDestDC, rectDest.left, rectDest.top, + rectDest.right - rectDest.left, + rectDest.bottom - rectDest.top, + rectSrc.left, rectSrc.top, + rectSrc.right - rectSrc.left, + rectSrc.bottom - rectSrc.top); + } + BOOL Draw(HDC hDestDC, int xDest, int yDest) const throw() + { + return Draw(hDestDC, xDest, yDest, GetWidth(), GetHeight()); + } + BOOL Draw(HDC hDestDC, const POINT& pointDest) const throw() + { + return Draw(hDestDC, pointDest.x, pointDest.y); + } + BOOL Draw(HDC hDestDC, int xDest, int yDest, + int nDestWidth, int nDestHeight) const throw() + { + return Draw(hDestDC, xDest, yDest, nDestWidth, nDestHeight, + 0, 0, GetWidth(), GetHeight()); + } + BOOL Draw(HDC hDestDC, const RECT& rectDest) const throw() + { + return Draw(hDestDC, rectDest.left, rectDest.top, + rectDest.right - rectDest.left, + rectDest.bottom - rectDest.top); + } + + void *GetBits() throw() + { + ATLASSERT(IsDIBSection()); + BYTE *pb = (BYTE *)m_bm.bmBits; + if (m_eOrientation == DIBOR_BOTTOMUP) + { + pb += m_bm.bmWidthBytes * (m_bm.bmHeight - 1); + } + return pb; + } + + int GetBPP() const throw() + { + ATLASSERT(m_hbm); + return m_bm.bmBitsPixel; + } + + void GetColorTable(UINT iFirstColor, UINT nColors, + RGBQUAD* prgbColors) const throw() + { + ATLASSERT(IsDIBSection()); + GetDC(); + ::GetDIBColorTable(m_hDC, iFirstColor, nColors, prgbColors); + ReleaseDC(); + } + + int GetHeight() const throw() + { + ATLASSERT(m_hbm); + return m_bm.bmHeight; + } + + int GetMaxColorTableEntries() const throw() + { + ATLASSERT(IsDIBSection()); + if (m_ds.dsBmih.biClrUsed && m_ds.dsBmih.biBitCount < 16) + return m_ds.dsBmih.biClrUsed; + switch (m_bm.bmBitsPixel) + { + case 1: return 2; + case 4: return 16; + case 8: return 256; + case 16: case 32: + if (m_ds.dsBmih.biCompression == BI_BITFIELDS) + return 3; + return 0; + case 24: + default: + return 0; + } + } + + int GetPitch() const throw() + { + ATLASSERT(IsDIBSection()); + if (m_eOrientation == DIBOR_BOTTOMUP) + return -m_bm.bmWidthBytes; + else + return m_bm.bmWidthBytes; + } + + COLORREF GetPixel(int x, int y) const throw() + { + GetDC(); + COLORREF ret = ::GetPixel(m_hDC, x, y); + ReleaseDC(); + return ret; + } + + void* GetPixelAddress(int x, int y) throw() + { + ATLASSERT(IsDIBSection()); + BYTE *pb = (BYTE *)GetBits(); + pb += GetPitch() * y; + pb += (GetBPP() * x) / 8; + return pb; + } + + COLORREF GetTransparentColor() const throw() + { + return m_rgbTransColor; + } + + int GetWidth() const throw() + { + ATLASSERT(m_hbm); + return m_bm.bmWidth; + } + + bool IsDIBSection() const throw() + { + ATLASSERT(m_hbm); + return m_bIsDIBSec; + } + + bool IsIndexed() const throw() + { + ATLASSERT(IsDIBSection()); + return GetBPP() <= 8; + } + + bool IsNull() const throw() + { + return m_hbm == NULL; + } + + HRESULT Load(LPCTSTR pszFileName) throw() + { + // convert the file name string into Unicode + // TODO: use a string class +#ifdef UNICODE + LPCWSTR pszNameW = pszFileName; +#else + WCHAR szPath[MAX_PATH]; + ::MultiByteToWideChar(CP_ACP, 0, pszFileName, -1, szPath, MAX_PATH); + LPCWSTR pszNameW = szPath; +#endif + + // create a GpBitmap object from file + using namespace Gdiplus; + GpBitmap *pBitmap = NULL; + GetCommon().CreateBitmapFromFile(pszNameW, &pBitmap); + ATLASSERT(pBitmap); + + // TODO & FIXME: get parameters (m_rgbTransColor etc.) + + // get bitmap handle + HBITMAP hbm = NULL; + Color color(0xFF, 0xFF, 0xFF); + Gdiplus::Status status; + status = GetCommon().CreateHBITMAPFromBitmap( + pBitmap, &hbm, color.GetValue()); + + // delete GpBitmap + GetCommon().DisposeImage(pBitmap); + + // attach it + if (status == Ok) + Attach(hbm); + return (status == Ok ? S_OK : E_FAIL); + } + HRESULT Load(IStream* pStream) throw() + { + // create GpBitmap from stream + using namespace Gdiplus; + GpBitmap *pBitmap = NULL; + GetCommon().CreateBitmapFromStream(pStream, &pBitmap); + ATLASSERT(pBitmap); + + // TODO & FIXME: get parameters (m_rgbTransColor etc.) + + // get bitmap handle + HBITMAP hbm = NULL; + Color color(0xFF, 0xFF, 0xFF); + Gdiplus::Status status; + status = GetCommon().CreateHBITMAPFromBitmap( + pBitmap, &hbm, color.GetValue()); + + // delete Bitmap + GetCommon().DisposeImage(pBitmap); + + // attach it + if (status == Ok) + Attach(hbm); + return (status == Ok ? S_OK : E_FAIL); + } + + // NOTE: LoadFromResource loads BITMAP resource only + void LoadFromResource(HINSTANCE hInstance, LPCTSTR pszResourceName) throw() + { + HANDLE hHandle = ::LoadImage(hInstance, pszResourceName, + IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); + Attach(reinterpret_cast<HBITMAP>(hHandle)); + } + void LoadFromResource(HINSTANCE hInstance, UINT nIDResource) throw() + { + LoadFromResource(hInstance, MAKEINTRESOURCE(nIDResource)); + } + + BOOL MaskBlt(HDC hDestDC, int xDest, int yDest, + int nDestWidth, int nDestHeight, int xSrc, int ySrc, + HBITMAP hbmMask, int xMask, int yMask, + DWORD dwROP = SRCCOPY) const throw() + { + ATLASSERT(IsTransparencySupported()); + GetDC(); + BOOL ret = ::MaskBlt(hDestDC, xDest, yDest, nDestWidth, nDestHeight, + m_hDC, xSrc, ySrc, + hbmMask, xMask, yMask, dwROP); + ReleaseDC(); + return ret; + } + BOOL MaskBlt(HDC hDestDC, const RECT& rectDest, const POINT& pointSrc, + HBITMAP hbmMask, const POINT& pointMask, + DWORD dwROP = SRCCOPY) const throw() + { + return MaskBlt(hDestDC, rectDest.left, rectDest.top, + rectDest.right - rectDest.left, rectDest.bottom - rectDest.top, + pointSrc.x, pointSrc.y, hbmMask, pointMask.x, pointMask.y, dwROP); + } + BOOL MaskBlt(HDC hDestDC, int xDest, int yDest, + HBITMAP hbmMask, DWORD dwROP = SRCCOPY) const throw() + { + return MaskBlt(hDestDC, xDest, yDest, GetWidth(), GetHeight(), + 0, 0, hbmMask, 0, 0, dwROP); + } + BOOL MaskBlt(HDC hDestDC, const POINT& pointDest, + HBITMAP hbmMask, DWORD dwROP = SRCCOPY) const throw() + { + return MaskBlt(hDestDC, pointDest.x, pointDest.y, hbmMask, dwROP); + } + + BOOL PlgBlt(HDC hDestDC, const POINT* pPoints, + int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, + HBITMAP hbmMask = NULL, + int xMask = 0, int yMask = 0) const throw() + { + ATLASSERT(IsTransparencySupported()); + GetDC(); + BOOL ret = ::PlgBlt(hDestDC, pPoints, m_hDC, + xSrc, ySrc, nSrcWidth, nSrcHeight, + hbmMask, xMask, yMask); + ReleaseDC(); + return ret; + } + BOOL PlgBlt(HDC hDestDC, const POINT* pPoints, + HBITMAP hbmMask = NULL) const throw() + { + return PlgBlt(hDestDC, pPoints, 0, 0, GetWidth(), GetHeight(), + hbmMask); + } + BOOL PlgBlt(HDC hDestDC, const POINT* pPoints, const RECT& rectSrc, + HBITMAP hbmMask, const POINT& pointMask) const throw() + { + return PlgBlt(hDestDC, pPoints, rectSrc.left, rectSrc.top, + rectSrc.right - rectSrc.left, rectSrc.bottom - rectSrc.top, + hbmMask, pointMask.x, pointMask.y); + } + BOOL PlgBlt(HDC hDestDC, const POINT* pPoints, const RECT& rectSrc, + HBITMAP hbmMask = NULL) const throw() + { + POINT pointMask = {0, 0}; + return PlgBlt(hDestDC, pPoints, rectSrc, hbmMask, pointMask); + } + + void ReleaseGDIPlus() throw() + { + COMMON*& pCommon = GetCommonPtr(); + if (pCommon && pCommon->Release() == 0) + { + delete pCommon; + pCommon = NULL; + } + } + + HRESULT Save(IStream* pStream, GUID *guidFileType) const throw() + { + using namespace Gdiplus; + ATLASSERT(m_hbm); + + // TODO & FIXME: set parameters (m_rgbTransColor etc.) + CLSID clsid; + if (!GetClsidFromFileType(&clsid, guidFileType)) + return E_FAIL; + + // create a GpBitmap from HBITMAP + GpBitmap *pBitmap = NULL; + GetCommon().CreateBitmapFromHBITMAP(m_hbm, NULL, &pBitmap); + + // save to stream + Status status; + status = GetCommon().SaveImageToStream(pBitmap, pStream, &clsid, NULL); + + // destroy GpBitmap + GetCommon().DisposeImage(pBitmap); + + return (status == Ok ? S_OK : E_FAIL); + } + HRESULT Save(LPCTSTR pszFileName, + REFGUID guidFileType = GUID_NULL) const throw() + { + using namespace Gdiplus; + ATLASSERT(m_hbm); + + // TODO & FIXME: set parameters (m_rgbTransColor etc.) + + // convert the file name string into Unicode + // TODO: use a string class +#ifdef UNICODE + LPCWSTR pszNameW = pszFileName; +#else + WCHAR szPath[MAX_PATH]; + ::MultiByteToWideChar(CP_ACP, 0, pszFileName, -1, szPath, MAX_PATH); + LPCWSTR pszNameW = szPath; +#endif + + // if the file type is null, get the file type from extension + const GUID *FileType = &guidFileType; + if (IsGuidEqual(guidFileType, GUID_NULL)) + { + LPCWSTR pszExt = GetFileExtension(pszNameW); + FileType = FileTypeFromExtension(pszExt); + } + + // get CLSID from file type + CLSID clsid; + if (!GetClsidFromFileType(&clsid, FileType)) + return E_FAIL; + + // create a GpBitmap from HBITMAP + GpBitmap *pBitmap = NULL; + GetCommon().CreateBitmapFromHBITMAP(m_hbm, NULL, &pBitmap); + + // save to file + Status status; + status = GetCommon().SaveImageToFile(pBitmap, pszNameW, &clsid, NULL); + + // destroy GpBitmap + GetCommon().DisposeImage(pBitmap); + + return (status == Ok ? S_OK : E_FAIL); + } + + void SetColorTable(UINT iFirstColor, UINT nColors, + const RGBQUAD* prgbColors) throw() + { + ATLASSERT(IsDIBSection()); + GetDC(); + ::SetDIBColorTable(m_hDC, iFirstColor, nColors, prgbColors); + ReleaseDC(); + } + + void SetPixel(int x, int y, COLORREF color) throw() + { + GetDC(); + ::SetPixelV(m_hDC, x, y, color); + ReleaseDC(); + } + + void SetPixelIndexed(int x, int y, int iIndex) throw() + { + ATLASSERT(IsIndexed()); + GetDC(); + ::SetPixelV(m_hDC, x, y, PALETTEINDEX(iIndex)); + ReleaseDC(); + } + + void SetPixelRGB(int x, int y, BYTE r, BYTE g, BYTE b) throw() + { + SetPixel(x, y, RGB(r, g, b)); + } + + COLORREF SetTransparentColor(COLORREF rgbTransparent) throw() + { + ATLASSERT(m_hbm); + COLORREF rgbOldColor = m_rgbTransColor; + m_rgbTransColor = rgbTransparent; + return rgbOldColor; + } + + BOOL StretchBlt(HDC hDestDC, int xDest, int yDest, + int nDestWidth, int nDestHeight, + int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, + DWORD dwROP = SRCCOPY) const throw() + { + GetDC(); + BOOL ret = ::StretchBlt(hDestDC, xDest, yDest, nDestWidth, nDestHeight, + m_hDC, xSrc, ySrc, nSrcWidth, nSrcHeight, dwROP); + ReleaseDC(); + return ret; + } + BOOL StretchBlt(HDC hDestDC, int xDest, int yDest, + int nDestWidth, int nDestHeight, + DWORD dwROP = SRCCOPY) const throw() + { + return StretchBlt(hDestDC, xDest, yDest, nDestWidth, nDestHeight, + 0, 0, GetWidth(), GetHeight(), dwROP); + } + BOOL StretchBlt(HDC hDestDC, const RECT& rectDest, + DWORD dwROP = SRCCOPY) const throw() + { + return StretchBlt(hDestDC, rectDest.left, rectDest.top, + rectDest.right - rectDest.left, + rectDest.bottom - rectDest.top, dwROP); + } + BOOL StretchBlt(HDC hDestDC, const RECT& rectDest, + const RECT& rectSrc, DWORD dwROP = SRCCOPY) const throw() + { + return StretchBlt(hDestDC, rectDest.left, rectDest.top, + rectDest.right - rectDest.left, + rectDest.bottom - rectDest.top, + rectSrc.left, rectSrc.top, + rectSrc.right - rectSrc.left, + rectSrc.bottom - rectSrc.top, dwROP); + } + + BOOL TransparentBlt(HDC hDestDC, int xDest, int yDest, + int nDestWidth, int nDestHeight, + int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, + UINT crTransparent = CLR_INVALID) const throw() + { + ATLASSERT(IsTransparencySupported()); + GetDC(); + BOOL ret = ::TransparentBlt(hDestDC, xDest, yDest, + nDestWidth, nDestHeight, + m_hDC, xSrc, ySrc, + nSrcWidth, nSrcHeight, crTransparent); + ReleaseDC(); + return ret; + } + BOOL TransparentBlt(HDC hDestDC, int xDest, int yDest, + int nDestWidth, int nDestHeight, + UINT crTransparent = CLR_INVALID) const throw() + { + return TransparentBlt(hDestDC, xDest, yDest, nDestWidth, nDestHeight, + 0, 0, GetWidth(), GetHeight(), crTransparent); + } + BOOL TransparentBlt(HDC hDestDC, const RECT& rectDest, + UINT crTransparent = CLR_INVALID) const throw() + { + return TransparentBlt(hDestDC, rectDest.left, rectDest.top, + rectDest.right - rectDest.left, + rectDest.bottom - rectDest.top, crTransparent); + } + BOOL TransparentBlt( + HDC hDestDC, const RECT& rectDest, + const RECT& rectSrc, UINT crTransparent = CLR_INVALID) const throw() + { + return TransparentBlt(hDestDC, rectDest.left, rectDest.top, + rectDest.right - rectDest.left, rectDest.bottom - rectDest.left, + rectSrc.left, rectSrc.top, rectSrc.right - rectSrc.left, + rectSrc.bottom - rectSrc.top, crTransparent); + } + +public: + static BOOL IsTransparencySupported() throw() + { + return TRUE; + } + +#if 0 + // TODO: implement this + static HRESULT GetImporterFilterString( + CSimpleString& strImporters, + CSimpleArray<GUID>& aguidFileTypes, + LPCTSTR pszAllFilesDescription = NULL, + DWORD dwExclude = excludeDefaultLoad, + TCHAR chSeparator = _T('|')) + { + ATLASSERT(0); + return -1; + } + + // TODO: implement this + static HRESULT GetExporterFilterString( + CSimpleString& strExporters, + CSimpleArray<GUID>& aguidFileTypes, + LPCTSTR pszAllFilesDescription = NULL, + DWORD dwExclude = excludeDefaultSave, + TCHAR chSeparator = _T('|')) + { + ATLASSERT(0); + return -1; + } +#endif // 0 + +protected: + // an extension of BITMAPINFO + struct MYBITMAPINFOEX + { + BITMAPINFOHEADER bmiHeader; + RGBQUAD bmiColors[256]; + BITMAPINFO *get() + { + return reinterpret_cast<BITMAPINFO *>(this); + } + const BITMAPINFO *get() const + { + return reinterpret_cast<const BITMAPINFO *>(this); + } + }; + + // The common data of atlimage + struct COMMON + { + // abbreviations of GDI+ basic types + typedef Gdiplus::GpStatus St; + typedef Gdiplus::ImageCodecInfo ICI; + typedef Gdiplus::GpBitmap Bm; + typedef Gdiplus::EncoderParameters EncParams; + typedef Gdiplus::GpImage Im; + typedef Gdiplus::ARGB ARGB; + typedef HBITMAP HBM; + typedef Gdiplus::GdiplusStartupInput GSI; + typedef Gdiplus::GdiplusStartupOutput GSO; + + // GDI+ function types +#undef API +#undef CST +#define API WINGDIPAPI +#define CST GDIPCONST + typedef St (WINAPI *STARTUP)(ULONG_PTR *, const GSI *, GSO *); + typedef void (WINAPI *SHUTDOWN)(ULONG_PTR); + typedef St (API *GETIMAGEENCODERSSIZE)(UINT *, UINT *); + typedef St (API *GETIMAGEENCODERS)(UINT, UINT, ICI *); + typedef St (API *CREATEBITMAPFROMFILE)(CST WCHAR*, Bm **); + typedef St (API *CREATEHBITMAPFROMBITMAP)(Bm *, HBM *, ARGB); + typedef St (API *CREATEBITMAPFROMSTREAM)(IStream *, Bm **); + typedef St (API *CREATEBITMAPFROMHBITMAP)(HBM, HPALETTE, Bm **); + typedef St (API *SAVEIMAGETOSTREAM)(Im *, IStream *, CST CLSID *, + CST EncParams *); + typedef St (API *SAVEIMAGETOFILE)(Im *, CST WCHAR *, CST CLSID *, + CST EncParams *); + typedef St (API *DISPOSEIMAGE)(Im*); +#undef API +#undef CST + + // members + int count; + HINSTANCE hinstGdiPlus; + ULONG_PTR gdiplusToken; + + // GDI+ functions + STARTUP Startup; + SHUTDOWN Shutdown; + GETIMAGEENCODERSSIZE GetImageEncodersSize; + GETIMAGEENCODERS GetImageEncoders; + CREATEBITMAPFROMFILE CreateBitmapFromFile; + CREATEHBITMAPFROMBITMAP CreateHBITMAPFromBitmap; + CREATEBITMAPFROMSTREAM CreateBitmapFromStream; + CREATEBITMAPFROMHBITMAP CreateBitmapFromHBITMAP; + SAVEIMAGETOSTREAM SaveImageToStream; + SAVEIMAGETOFILE SaveImageToFile; + DISPOSEIMAGE DisposeImage; + + COMMON() + { + count = 0; + hinstGdiPlus = NULL; + Startup = NULL; + Shutdown = NULL; + GetImageEncodersSize = NULL; + GetImageEncoders = NULL; + CreateBitmapFromFile = NULL; + CreateHBITMAPFromBitmap = NULL; + CreateBitmapFromStream = NULL; + CreateBitmapFromHBITMAP = NULL; + SaveImageToStream = NULL; + SaveImageToFile = NULL; + DisposeImage = NULL; + } + ~COMMON() + { + FreeLib(); + } + + ULONG AddRef() + { + return ++count; + } + ULONG Release() + { + return --count; + } + + // get procedure address of the DLL + template <typename TYPE> + TYPE AddrOf(const char *name) + { + FARPROC proc = ::GetProcAddress(hinstGdiPlus, name); + return reinterpret_cast<TYPE>(proc); + } + + HINSTANCE LoadLib() + { + if (hinstGdiPlus) + return hinstGdiPlus; + + hinstGdiPlus = ::LoadLibraryA("gdiplus.dll"); + + // get procedure addresses from the DLL + Startup = AddrOf<STARTUP>("GdiplusStartup"); + Shutdown = AddrOf<SHUTDOWN>("GdiplusShutdown"); + GetImageEncodersSize = + AddrOf<GETIMAGEENCODERSSIZE>("GdipGetImageEncodersSize"); + GetImageEncoders = AddrOf<GETIMAGEENCODERS>("GdipGetImageEncoders"); + CreateBitmapFromFile = + AddrOf<CREATEBITMAPFROMFILE>("GdipCreateBitmapFromFile"); + CreateHBITMAPFromBitmap = + AddrOf<CREATEHBITMAPFROMBITMAP>("GdipCreateHBITMAPFromBitmap"); + CreateBitmapFromStream = + AddrOf<CREATEBITMAPFROMSTREAM>("GdipCreateBitmapFromStream"); + CreateBitmapFromHBITMAP = + AddrOf<CREATEBITMAPFROMHBITMAP>("GdipCreateBitmapFromHBITMAP"); + SaveImageToStream = + AddrOf<SAVEIMAGETOSTREAM>("GdipSaveImageToStream"); + SaveImageToFile = AddrOf<SAVEIMAGETOFILE>("GdipSaveImageToFile"); + DisposeImage = AddrOf<DISPOSEIMAGE>("GdipDisposeImage"); + + if (hinstGdiPlus && Startup) + { + Gdiplus::GdiplusStartupInput gdiplusStartupInput; + Startup(&gdiplusToken, &gdiplusStartupInput, NULL); + } + + return hinstGdiPlus; + } + void FreeLib() + { + if (hinstGdiPlus) + { + Shutdown(gdiplusToken); + + Startup = NULL; + Shutdown = NULL; + GetImageEncodersSize = NULL; + GetImageEncoders = NULL; + CreateBitmapFromFile = NULL; + CreateHBITMAPFromBitmap = NULL; + CreateBitmapFromStream = NULL; + CreateBitmapFromHBITMAP = NULL; + SaveImageToStream = NULL; + SaveImageToFile = NULL; + DisposeImage = NULL; + ::FreeLibrary(hinstGdiPlus); + hinstGdiPlus = NULL; + } + } + }; // struct COMMON + + static COMMON*& GetCommonPtr() + { + static COMMON *s_pCommon = NULL; + return s_pCommon; + } + + static COMMON& GetCommon() + { + COMMON*& pCommon = GetCommonPtr(); + if (pCommon == NULL) + pCommon = new COMMON; + return *pCommon; + } + +protected: + HBITMAP m_hbm; + mutable HGDIOBJ m_hbmOld; + mutable HDC m_hDC; + DIBOrientation m_eOrientation; + bool m_bHasAlphaCh; + bool m_bIsDIBSec; + COLORREF m_rgbTransColor; + union + { + BITMAP m_bm; + DIBSECTION m_ds; + }; + + LPCWSTR GetFileExtension(LPCWSTR pszFileName) const + { + LPCWSTR pch = wcsrchr(pszFileName, L'\\'); + if (pch == NULL) + pch = wcsrchr(pszFileName, L'/'); + pch = (pch ? wcsrchr(pch, L'.') : wcsrchr(pszFileName, L'.')); + return (pch ? pch : (pszFileName + ::lstrlenW(pszFileName))); + } + + COLORREF RGBFromPaletteIndex(int iIndex) const + { + RGBQUAD table[256]; + GetColorTable(0, 256, table); + RGBQUAD& quad = table[iIndex]; + return RGB(quad.rgbRed, quad.rgbGreen, quad.rgbBlue); + } + + struct EXTENSION_ENTRY + { + LPCWSTR pszExt; + GUID guid; + }; + + const GUID *FileTypeFromExtension(LPCWSTR pszExt) const + { + static const EXTENSION_ENTRY table[] = + { + {L".jpg", Gdiplus::ImageFormatJPEG}, + {L".png", Gdiplus::ImageFormatPNG}, + {L".bmp", Gdiplus::ImageFormatBMP}, + {L".gif", Gdiplus::ImageFormatGIF}, + {L".tif", Gdiplus::ImageFormatTIFF}, + {L".jpeg", Gdiplus::ImageFormatJPEG}, + {L".jpe", Gdiplus::ImageFormatJPEG}, + {L".jfif", Gdiplus::ImageFormatJPEG}, + {L".dib", Gdiplus::ImageFormatBMP}, + {L".rle", Gdiplus::ImageFormatBMP}, + {L".tiff", Gdiplus::ImageFormatTIFF} + }; + const size_t count = _countof(table); + for (size_t i = 0; i < count; ++i) + { + if (::lstrcmpiW(table[i].pszExt, pszExt) == 0) + return &table[i].guid; + } + return NULL; + } + + struct FORMAT_ENTRY + { + GUID guid; + LPCWSTR mime; + }; + + bool GetClsidFromFileType(CLSID *clsid, const GUID *guid) const + { + static const FORMAT_ENTRY table[] = + { + {Gdiplus::ImageFormatJPEG, L"image/jpeg"}, + {Gdiplus::ImageFormatPNG, L"image/png"}, + {Gdiplus::ImageFormatBMP, L"image/bmp"}, + {Gdiplus::ImageFormatGIF, L"image/gif"}, + {Gdiplus::ImageFormatTIFF, L"image/tiff"} + }; + const size_t count = _countof(table); + for (size_t i = 0; i < count; ++i) + { + if (IsGuidEqual(table[i].guid, *guid)) + { + int num = GetEncoderClsid(table[i].mime, clsid); + if (num >= 0) + { + return true; + } + } + } + return false; + } + + int GetEncoderClsid(LPCWSTR mime, CLSID *clsid) const + { + UINT count = 0, total_size = 0; + GetCommon().GetImageEncodersSize(&count, &total_size); + if (total_size == 0) + return -1; // failure + + Gdiplus::ImageCodecInfo *pInfo; + BYTE *pb = new BYTE[total_size]; + ATLASSERT(pb); + pInfo = reinterpret_cast<Gdiplus::ImageCodecInfo *>(pb); + if (pInfo == NULL) + return -1; // failure + + GetCommon().GetImageEncoders(count, total_size, pInfo); + + for (UINT iInfo = 0; iInfo < count; ++iInfo) + { + if (::lstrcmpiW(pInfo[iInfo].MimeType, mime) == 0) + { + *clsid = pInfo[iInfo].Clsid; + delete[] pb; + return iInfo; // success + } + } + + delete[] pb; + return -1; // failure + } + + bool IsGuidEqual(const GUID& guid1, const GUID& guid2) const + { + RPC_STATUS status; + if (::UuidEqual(const_cast<GUID *>(&guid1), + const_cast<GUID *>(&guid2), &status)) + { + if (status == RPC_S_OK) + return true; + } + return false; + } + + void AttachInternal(HBITMAP hBitmap, DIBOrientation eOrientation, + LONG iTransColor) + { + Destroy(); + + const int size = sizeof(DIBSECTION); + m_bIsDIBSec = (::GetObject(hBitmap, size, &m_ds) == size); + + bool bOK = (::GetObject(hBitmap, sizeof(BITMAP), &m_bm) != 0); + + if (bOK) + { + m_hbm = hBitmap; + m_eOrientation = eOrientation; + m_bHasAlphaCh = (m_bm.bmBitsPixel == 32); + m_rgbTransColor = CLR_INVALID; + } + } + + BOOL CreateInternal(int nWidth, int nHeight, int nBPP, + DWORD eCompression, const DWORD* pdwBitmasks = NULL, + DWORD dwFlags = 0) throw() + { + ATLASSERT(nWidth != 0); + ATLASSERT(nHeight != 0); + + // initialize BITMAPINFO extension + MYBITMAPINFOEX bi; + ZeroMemory(&bi, sizeof(bi)); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bi.bmiHeader.biWidth = nWidth; + bi.bmiHeader.biHeight = nHeight; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = nBPP; + bi.bmiHeader.biCompression = eCompression; + + // is there alpha channel? + bool bHasAlphaCh; + bHasAlphaCh = (nBPP == 32 && (dwFlags & createAlphaChannel)); + + // get orientation + DIBOrientation eOrientation; + eOrientation = ((nHeight > 0) ? DIBOR_BOTTOMUP : DIBOR_TOPDOWN); + + // does it have bit fields? + if (eCompression == BI_BITFIELDS) + { + if (nBPP == 16 || nBPP == 32) + { + // store the mask data + LPDWORD pdwMask = reinterpret_cast<LPDWORD>(bi.bmiColors); + pdwMask[0] = pdwBitmasks[0]; + pdwMask[1] = pdwBitmasks[1]; + pdwMask[2] = pdwBitmasks[2]; + } + else + { + return FALSE; + } + } + else + { + ATLASSERT(pdwBitmasks == NULL); + if (pdwBitmasks) + return FALSE; + } + + // create a DIB section + HDC hDC = ::CreateCompatibleDC(NULL); + ATLASSERT(hDC); + LPVOID pvBits; + HBITMAP hbm = ::CreateDIBSection(hDC, bi.get(), DIB_RGB_COLORS, + &pvBits, NULL, 0); + ATLASSERT(hbm); + ::DeleteDC(hDC); + + // attach it + AttachInternal(hbm, eOrientation, -1); + m_bHasAlphaCh = bHasAlphaCh; + + return hbm != NULL; + } + +private: + // NOTE: CImage is not copyable + CImage(const CImage&); + CImage& operator=(const CImage&); +}; + +} + +#endif + +#ifndef _ATL_NO_AUTOMATIC_NAMESPACE +using namespace ATL; +#endif //!_ATL_NO_AUTOMATIC_NAMESPACE Propchange: trunk/reactos/sdk/lib/atl/atlimage.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/atl/CImage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CImage.cpp?r… ============================================================================== --- trunk/rostests/apitests/atl/CImage.cpp (added) +++ trunk/rostests/apitests/atl/CImage.cpp [iso-8859-1] Thu Aug 18 19:27:49 2016 @@ -0,0 +1,278 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for CImage + * PROGRAMMER: Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include <atlimage.h> +#include "resource.h" + +#ifdef __REACTOS__ + #include <apitest.h> +#else + #include <stdlib.h> + #include <stdio.h> + #include <stdarg.h> + const char *g_file = NULL; + int g_line = 0; + int g_tests_executed = 0; + int g_tests_failed = 0; + void ok_func(BOOL value, const char *fmt, ...) + { + va_list va; + va_start(va, fmt); + if (!value) + { + printf("%s (%d): ", g_file, g_line); + vprintf(fmt, va); + g_tests_failed++; + } + g_tests_executed++; + va_end(va); + } + #undef ok + #define ok g_file = __FILE__; g_line = __LINE__; ok_func + #define START_TEST(x) int main(void) +#endif + + +const TCHAR* szFiles[] = { + TEXT("ant.png"), + TEXT("ant.tif"), + TEXT("ant.gif"), + TEXT("ant.jpg"), + TEXT("ant.bmp"), +}; + +static TCHAR szTempPath[MAX_PATH]; +TCHAR* file_name(const TCHAR* file) +{ + static TCHAR buffer[MAX_PATH]; + lstrcpy(buffer, szTempPath); + lstrcat(buffer, TEXT("\\")); + lstrcat(buffer, file); + return buffer; +} + +static void write_bitmap(HINSTANCE hInst, int id, TCHAR* file) +{ + HRSRC rsrc; + + rsrc = FindResource(hInst, MAKEINTRESOURCE(id), MAKEINTRESOURCE(RT_BITMAP)); + ok(rsrc != NULL, "Expected to find an image resource\n"); + if (rsrc) + { + void *rsrc_data; + HANDLE hfile; + BOOL ret; + HGLOBAL glob = LoadResource(hInst, rsrc); + DWORD rsrc_size = SizeofResource(hInst, rsrc); + + rsrc_data = LockResource(glob); + + hfile = CreateFile(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + ok(hfile != INVALID_HANDLE_VALUE, "Unable to open temp file: %lu\n", GetLastError()); + if (hfile != INVALID_HANDLE_VALUE) + { + BITMAPFILEHEADER bfh = { 0 }; + DWORD dwWritten; + + bfh.bfType = 'MB'; + bfh.bfSize = rsrc_size + sizeof(BITMAPFILEHEADER); + bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER); + bfh.bfReserved1 = bfh.bfReserved2 = 0; + ret = WriteFile(hfile, &bfh, sizeof(bfh), &dwWritten, NULL); + ok(ret, "Unable to write temp file: %lu\n", GetLastError()); + ret = WriteFile(hfile, rsrc_data, rsrc_size, &dwWritten, NULL); + ok(ret, "Unable to write temp file: %lu\n", GetLastError()); + CloseHandle(hfile); + } + UnlockResource(rsrc_data); + } +} + +typedef Gdiplus::GpStatus (WINAPI *STARTUP)(ULONG_PTR *, const Gdiplus::GdiplusStartupInput *, Gdiplus::GdiplusStartupOutput *); +typedef void (WINAPI *SHUTDOWN)(ULONG_PTR); +typedef Gdiplus::GpStatus (WINGDIPAPI *CREATEBITMAPFROMFILE)(GDIPCONST WCHAR*, Gdiplus::GpBitmap **); +typedef Gdiplus::GpStatus (WINGDIPAPI *GETPIXELFORMAT)(Gdiplus::GpImage *image, Gdiplus::PixelFormat *format); +typedef Gdiplus::GpStatus (WINGDIPAPI *DISPOSEIMAGE)(Gdiplus::GpImage *); + +static HINSTANCE hinstGdiPlus; +static ULONG_PTR gdiplusToken; + +static STARTUP Startup; +static SHUTDOWN Shutdown; +static CREATEBITMAPFROMFILE CreateBitmapFromFile; +static GETPIXELFORMAT GetImagePixelFormat; +static DISPOSEIMAGE DisposeImage; + +template <typename TYPE> +TYPE AddrOf(const char *name) +{ + FARPROC proc = ::GetProcAddress(hinstGdiPlus, name); + return reinterpret_cast<TYPE>(proc); +} + +static void init_gdip() +{ + hinstGdiPlus = ::LoadLibraryA("gdiplus.dll"); + Startup = AddrOf<STARTUP>("GdiplusStartup"); + Shutdown = AddrOf<SHUTDOWN>("GdiplusShutdown"); + CreateBitmapFromFile = AddrOf<CREATEBITMAPFROMFILE>("GdipCreateBitmapFromFile"); + GetImagePixelFormat = AddrOf<GETPIXELFORMAT>("GdipGetImagePixelFormat"); + DisposeImage = AddrOf<DISPOSEIMAGE>("GdipDisposeImage"); +} + + +static void determine_file_bpp(TCHAR* tfile, Gdiplus::PixelFormat expect_pf) +{ + using namespace Gdiplus; + GpBitmap *pBitmap = NULL; + +#ifdef UNICODE + WCHAR* file = tfile; +#else + WCHAR file[MAX_PATH]; + ::MultiByteToWideChar(CP_ACP, 0, tfile, -1, file, MAX_PATH); +#endif + + if (Startup == NULL) + init_gdip(); + + Gdiplus::GdiplusStartupInput gdiplusStartupInput; + Startup(&gdiplusToken, &gdiplusStartupInput, NULL); + + + Gdiplus::GpStatus status = CreateBitmapFromFile(file, &pBitmap); + ok(status == Gdiplus::Ok, "Expected status to be %i, was: %i\n", (int)Gdiplus::Ok, (int)status); + ok(pBitmap != NULL, "Expected a valid bitmap\n"); + if (pBitmap) + { + PixelFormat pf; + GetImagePixelFormat(pBitmap, &pf); + ok(pf == expect_pf, "Expected PixelFormat to be 0x%x, was: 0x%x\n", (int)expect_pf, (int)pf); + + DisposeImage(pBitmap); + } + Shutdown(gdiplusToken); +} + + +START_TEST(CImage) +{ + HRESULT hr; + TCHAR* file; + BOOL bOK; + int width, height, bpp; + size_t n; + CImage image1, image2; + COLORREF color; + HDC hDC; + +#if 0 + width = image1.GetWidth(); + height = image1.GetHeight(); + bpp = image1.GetBPP(); +#endif + + HINSTANCE hInst = GetModuleHandle(NULL); + GetTempPath(MAX_PATH, szTempPath); + + image1.LoadFromResource(hInst, IDB_ANT); + ok(!image1.IsNull(), "Expected image1 is not null\n"); + + width = image1.GetWidth(); + ok(width == 48, "Expected width to be 48, was: %d\n", width); + height = image1.GetHeight(); + ok(height == 48, "Expected height to be 48, was: %d\n", height); + bpp = image1.GetBPP(); + ok(bpp == 8, "Expected bpp to be 8, was: %d\n", bpp); + + + image2.LoadFromResource(hInst, IDB_CROSS); + ok(!image2.IsNull(), "Expected image2 is not null\n"); + image2.SetTransparentColor(RGB(255, 255, 255)); + + width = image2.GetWidth(); + ok(width == 32, "Expected width to be 32, was: %d\n", width); + height = image2.GetHeight(); + ok(height == 32, "Expected height to be 32, was: %d\n", height); + bpp = image2.GetBPP(); + ok(bpp == 8, "Expected bpp to be 8, was: %d\n", bpp); + + color = image1.GetPixel(5, 5); + ok(color == RGB(166, 202, 240), "Expected color to be 166, 202, 240; was: %i, %i, %i\n", GetRValue(color), GetGValue(color), GetBValue(color)); + + hDC = image1.GetDC(); + bOK = image2.Draw(hDC, 0, 0); + image1.ReleaseDC(); + ok(bOK != FALSE, "Expected bDraw to be TRUE, was: %d\n", bOK); + image2.Destroy(); + + color = image1.GetPixel(5, 5); + ok(color == RGB(255, 0,0), "Expected color to be 255, 0, 0; was: %i, %i, %i\n", GetRValue(color), GetGValue(color), GetBValue(color)); + + file = file_name(TEXT("ant.bmp")); + write_bitmap(hInst, IDB_ANT, file); + + init_gdip(); + + determine_file_bpp(file, PixelFormat8bppIndexed); + + hr = image2.Load(file); + ok(hr == S_OK, "Expected hr to be S_OK, was: %08lx\n", hr); + ok(!image2.IsNull(), "Expected image1 is not null\n"); + bOK = DeleteFile(file); + ok(bOK, "Expected bOK to be TRUE, was: %d\n", bOK); + + width = image2.GetWidth(); + ok(width == 48, "Expected width to be 48, was: %d\n", width); + height = image2.GetHeight(); + ok(height == 48, "Expected height to be 48, was: %d\n", height); + bpp = image2.GetBPP(); + ok(bpp == 8, "Expected bpp to be 8, was: %d\n", bpp); + + for (n = 0; n < _countof(szFiles); ++n) + { + file = file_name(szFiles[n]); + image2.Destroy(); + + if (n == 0) + hr = image1.Save(file, Gdiplus::ImageFormatPNG); + else + hr = image1.Save(file); + ok(hr == S_OK, "Expected hr to be S_OK, was: %08lx (for %i)\n", hr, n); + + bOK = (GetFileAttributes(file) != 0xFFFFFFFF); + ok(bOK, "Expected bOK to be TRUE, was: %d (for %i)\n", bOK, n); + + hr = image2.Load(file); + ok(hr == S_OK, "Expected hr to be S_OK, was: %08lx (for %i)\n", hr, n); + + width = image2.GetWidth(); + ok(width == 48, "Expected width to be 48, was: %d (for %i)\n", width, n); + height = image2.GetHeight(); + ok(height == 48, "Expected height to be 48, was: %d (for %i)\n", height, n); + bpp = image2.GetBPP(); + if (n == 3) + { + ok(bpp == 24, "Expected bpp to be 24, was: %d (for %i)\n", bpp, n); + determine_file_bpp(file, PixelFormat24bppRGB); + } + else + { + ok(bpp == 8, "Expected bpp to be 8, was: %d (for %i)\n", bpp, n); + determine_file_bpp(file, PixelFormat8bppIndexed); + } + color = image1.GetPixel(5, 5); + ok(color == RGB(255, 0,0), "Expected color to be 255, 0, 0; was: %i, %i, %i (for %i)\n", GetRValue(color), GetGValue(color), GetBValue(color), n); + + bOK = DeleteFile(file); + ok(bOK, "Expected bOK to be TRUE, was: %d (for %i)\n", bOK, n); + } + +#ifndef __REACTOS__ + printf("CImage: %i tests executed (0 marked as todo, %i failures), 0 skipped.\n", g_tests_executed, g_tests_failed); +#endif +} Propchange: trunk/rostests/apitests/atl/CImage.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/atl/CImage_WIP.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CImage_WIP.t… ============================================================================== --- trunk/rostests/apitests/atl/CImage_WIP.txt (added) +++ trunk/rostests/apitests/atl/CImage_WIP.txt [iso-8859-1] Thu Aug 18 19:27:49 2016 @@ -0,0 +1,86 @@ +Test files: + +atl_apitest: CImage class from reactos +CImage.exe : CImage class from microsoft + +================================================================================================================ +Windows Server 2003 SP2: +================================================================================================================ +>atl_apitest.exe CImage +R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(234): Test failed: Expected bpp to be 8, was: 32 +R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 0) +R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 1) +R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 2) +R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(260): Test failed: Expected bpp to be 24, was: 32 (for 3) +R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 4) + +CImage: 79 tests executed (0 marked as todo, 6 failures), 0 skipped. +================================================================================================================ +>CImage.exe +CImage: 79 tests executed (0 marked as todo, 0 failures), 0 skipped. +================================================================================================================ +================================================================================================================ +Windows 10: +================================================================================================================ +>atl_apitest.exe CImage +R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(234): Test failed: Expected bpp to be 8, was: 32 +R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 0) +R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 1) +R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 2) +R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(260): Test failed: Expected bpp to be 24, was: 32 (for 3) +R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 4) + +CImage: 79 tests executed (0 marked as todo, 6 failures), 0 skipped. +================================================================================================================ +>CImage.exe +CImage: 79 tests executed (0 marked as todo, 0 failures), 0 skipped. +================================================================================================================ +================================================================================================================ +ReactOS: +================================================================================================================ +>atl_apitest.exe CImage +CImage.cpp:234: Test failed: Expected bpp to be 8, was: 32 +CImage.cpp:265: Test failed: Expected bpp to be 8, was: 32 (for 0) +CImage.cpp:245: Test failed: Expected hr to be S_OK, was: 80004005 (for 1) +CImage.cpp:251: Test failed: Expected hr to be S_OK, was: 80004005 (for 1) +CImage.cpp:254: Test failed: Expected width to be 48, was: 0 (for 1) +CImage.cpp:256: Test failed: Expected height to be 48, was: 0 (for 1) +CImage.cpp:265: Test failed: Expected bpp to be 8, was: 0 (for 1) +CImage.cpp:148: Test failed: Expected status to be 0, was: 1 +CImage.cpp:149: Test failed: Expected a valid bitmap +CImage.cpp:245: Test failed: Expected hr to be S_OK, was: 80004005 (for 2) +CImage.cpp:251: Test failed: Expected hr to be S_OK, was: 80004005 (for 2) +CImage.cpp:254: Test failed: Expected width to be 48, was: 0 (for 2) +CImage.cpp:256: Test failed: Expected height to be 48, was: 0 (for 2) +CImage.cpp:265: Test failed: Expected bpp to be 8, was: 0 (for 2) +CImage.cpp:148: Test failed: Expected status to be 0, was: 1 +CImage.cpp:149: Test failed: Expected a valid bitmap +CImage.cpp:260: Test failed: Expected bpp to be 24, was: 32 (for 3) +CImage.cpp:154: Test failed: Expected PixelFormat to be 0x21808, was: 0x30803 +CImage.cpp:265: Test failed: Expected bpp to be 8, was: 32 (for 4) +CImage.cpp:154: Test failed: Expected PixelFormat to be 0x30803, was: 0x21808 + +CImage: 77 tests executed (0 marked as todo, 20 failures), 0 skipped. +================================================================================================================ +>CImage.exe +../CImage.cpp (245): Expected hr to be S_OK, was: 80004005 (for 1) +../CImage.cpp (251): Expected hr to be S_OK, was: 80004005 (for 1) +../CImage.cpp (254): Expected width to be 48, was: 0 (for 1) +../CImage.cpp (256): Expected height to be 48, was: 0 (for 1) +../CImage.cpp (265): Expected bpp to be 8, was: 0 (for 1) +../CImage.cpp (148): Expected status to be 0, was: 1 +../CImage.cpp (149): Expected a valid bitmap +../CImage.cpp (245): Expected hr to be S_OK, was: 80004005 (for 2) +../CImage.cpp (251): Expected hr to be S_OK, was: 80004005 (for 2) +../CImage.cpp (254): Expected width to be 48, was: 0 (for 2) +../CImage.cpp (256): Expected height to be 48, was: 0 (for 2) +../CImage.cpp (265): Expected bpp to be 8, was: 0 (for 2) +../CImage.cpp (148): Expected status to be 0, was: 1 +../CImage.cpp (149): Expected a valid bitmap +../CImage.cpp (260): Expected bpp to be 24, was: 8 (for 3) +../CImage.cpp (154): Expected PixelFormat to be 0x21808, was: 0x30803 +../CImage.cpp (265): Expected bpp to be 8, was: 24 (for 4) +../CImage.cpp (154): Expected PixelFormat to be 0x30803, was: 0x21808 +CImage: 77 tests executed (0 marked as todo, 18 failures), 0 skipped. +================================================================================================================ + Propchange: trunk/rostests/apitests/atl/CImage_WIP.txt ------------------------------------------------------------------------------ svn:eol-style = CRLF Modified: trunk/rostests/apitests/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CMakeLists.t… ============================================================================== --- trunk/rostests/apitests/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/CMakeLists.txt [iso-8859-1] Thu Aug 18 19:27:49 2016 @@ -1,4 +1,5 @@ +add_definitions(-DINITGUID) set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) @@ -7,6 +8,7 @@ atltypes.cpp CComBSTR.cpp CComHeapPtr.cpp + CImage.cpp CRegKey.cpp CString.cpp testlist.c @@ -14,5 +16,5 @@ target_link_libraries(atl_apitest wine uuid) set_module_type(atl_apitest win32cui) -add_importlibs(atl_apitest ole32 oleaut32 advapi32 user32 msvcrt kernel32) +add_importlibs(atl_apitest rpcrt4 ole32 oleaut32 msimg32 gdi32 advapi32 user32 msvcrt kernel32) add_cd_file(TARGET atl_apitest DESTINATION reactos/bin FOR all) Added: trunk/rostests/apitests/atl/ant.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/ant.bmp?rev=… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/atl/ant.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rostests/apitests/atl/atl_apitest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/atl_apitest.… ============================================================================== --- trunk/rostests/apitests/atl/atl_apitest.rc [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/atl_apitest.rc [iso-8859-1] Thu Aug 18 19:27:49 2016 @@ -9,3 +9,5 @@ IDS_TEST2 "I am a happy BSTR" END +IDB_ANT BITMAP "ant.bmp" +IDB_CROSS BITMAP "cross.bmp" Added: trunk/rostests/apitests/atl/cross.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/cross.bmp?re… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/atl/cross.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/apitests/atl/devenv/CImage.sln URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/devenv/CImag… ============================================================================== --- trunk/rostests/apitests/atl/devenv/CImage.sln (added) +++ trunk/rostests/apitests/atl/devenv/CImage.sln [iso-8859-1] Thu Aug 18 19:27:49 2016 @@ -0,0 +1,28 @@ +ï»¿ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CImage", "CImage.vcxproj", "{AE520E17-2DAE-40FF-B082-F32A7A935FB2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {AE520E17-2DAE-40FF-B082-F32A7A935FB2}.Debug|x64.ActiveCfg = Debug|x64 + {AE520E17-2DAE-40FF-B082-F32A7A935FB2}.Debug|x64.Build.0 = Debug|x64 + {AE520E17-2DAE-40FF-B082-F32A7A935FB2}.Debug|x86.ActiveCfg = Debug|Win32 + {AE520E17-2DAE-40FF-B082-F32A7A935FB2}.Debug|x86.Build.0 = Debug|Win32 + {AE520E17-2DAE-40FF-B082-F32A7A935FB2}.Release|x64.ActiveCfg = Release|x64 + {AE520E17-2DAE-40FF-B082-F32A7A935FB2}.Release|x64.Build.0 = Release|x64 + {AE520E17-2DAE-40FF-B082-F32A7A935FB2}.Release|x86.ActiveCfg = Release|Win32 + {AE520E17-2DAE-40FF-B082-F32A7A935FB2}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Propchange: trunk/rostests/apitests/atl/devenv/CImage.sln ------------------------------------------------------------------------------ svn:eol-style = CRLF Added: trunk/rostests/apitests/atl/devenv/CImage.vcxproj URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/devenv/CImag… ============================================================================== --- trunk/rostests/apitests/atl/devenv/CImage.vcxproj (added) +++ trunk/rostests/apitests/atl/devenv/CImage.vcxproj [iso-8859-1] Thu Aug 18 19:27:49 2016 @@ -0,0 +1,183 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{AE520E17-2DAE-40FF-B082-F32A7A935FB2}</ProjectGuid> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <Keyword>AtlProj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v120_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RegisterOutput>true</RegisterOutput> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RegisterOutput>true</RegisterOutput> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <RegisterOutput>true</RegisterOutput> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <RegisterOutput>true</RegisterOutput> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="../CImage.cpp"> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MultiThreaded</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MultiThreaded</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MultiThreadedDebug</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MultiThreadedDebug</RuntimeLibrary> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="../atl_apitest.rc" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> Propchange: trunk/rostests/apitests/atl/devenv/CImage.vcxproj ------------------------------------------------------------------------------ svn:eol-style = CRLF Modified: trunk/rostests/apitests/atl/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/resource.h?r… ============================================================================== --- trunk/rostests/apitests/atl/resource.h [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/resource.h [iso-8859-1] Thu Aug 18 19:27:49 2016 @@ -1,3 +1,6 @@ #define IDS_TEST1 2000 #define IDS_TEST2 2001 + +#define IDB_ANT 1 +#define IDB_CROSS 2 Modified: trunk/rostests/apitests/atl/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/atl/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/testlist.c [iso-8859-1] Thu Aug 18 19:27:49 2016 @@ -4,6 +4,7 @@ extern void func_atltypes(void); extern void func_CComBSTR(void); extern void func_CComHeapPtr(void); +extern void func_CImage(void); extern void func_CRegKey(void); extern void func_CString(void); @@ -12,6 +13,7 @@ { "atltypes", func_atltypes }, { "CComBSTR", func_CComBSTR }, { "CComHeapPtr", func_CComHeapPtr }, + { "CImage", func_CImage }, { "CRegKey", func_CRegKey }, { "CString", func_CString }, { 0, 0 }

1 0

[akhaldi] 72331: [KERNEL32_WINETEST] Come on Jérôme! commit the awesomeness so we can remove this skip ;)
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 19:12:59 2016 New Revision: 72331 URL: http://svn.reactos.org/svn/reactos?rev=72331&view=rev Log: [KERNEL32_WINETEST] Come on Jérôme! commit the awesomeness so we can remove this skip ;) Modified: trunk/rostests/winetests/kernel32/virtual.c Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua… ============================================================================== --- trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] Thu Aug 18 19:12:59 2016 @@ -4109,7 +4109,14 @@ } if (!strcmp(argv[2], "sharedmemro")) { - test_shared_memory_ro(TRUE, strtol(argv[3], NULL, 16)); + if(!winetest_interactive) + { + skip("CORE-8541: Skipping test_shared_memory_ro(TRUE, strtol(argv[3], NULL, 16))\n"); + } + else + { + test_shared_memory_ro(TRUE, strtol(argv[3], NULL, 16)); + } return; } while (1)

1 0

[apriyadarshi] 72330: Minor changes for ATAPI Srb Functions
by apriyadarshi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: apriyadarshi Date: Thu Aug 18 18:03:26 2016 New Revision: 72330 URL: http://svn.reactos.org/svn/reactos?rev=72330&view=rev Log: Minor changes for ATAPI Srb Functions Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Thu Aug 18 18:03:26 2016 @@ -401,7 +401,6 @@ AhciDebugPrint("\tDET == %x Unsupported\n", ssts.DET); return FALSE; } - }// -- AhciStartPort(); /** @@ -1242,12 +1241,34 @@ __in PAHCI_SRB_EXTENSION SrbExtension ) { + PAHCI_COMMAND_TABLE cmdTable; UNREFERENCED_PARAMETER(PortExtension); - UNREFERENCED_PARAMETER(SrbExtension); AhciDebugPrint("AhciATAPI_CFIS()\n"); - return 2; + cmdTable = (PAHCI_COMMAND_TABLE)SrbExtension; + + NT_ASSERT(SrbExtension->CommandReg == IDE_COMMAND_ATAPI_PACKET); + + AhciZeroMemory((PCHAR)cmdTable->CFIS, sizeof(cmdTable->CFIS)); + + cmdTable->CFIS[AHCI_ATA_CFIS_FisType] = FIS_TYPE_REG_H2D; // FIS Type + cmdTable->CFIS[AHCI_ATA_CFIS_PMPort_C] = (1 << 7); // PM Port & C + cmdTable->CFIS[AHCI_ATA_CFIS_CommandReg] = SrbExtension->CommandReg; + + cmdTable->CFIS[AHCI_ATA_CFIS_FeaturesLow] = SrbExtension->FeaturesLow; + cmdTable->CFIS[AHCI_ATA_CFIS_LBA0] = SrbExtension->LBA0; + cmdTable->CFIS[AHCI_ATA_CFIS_LBA1] = SrbExtension->LBA1; + cmdTable->CFIS[AHCI_ATA_CFIS_LBA2] = SrbExtension->LBA2; + cmdTable->CFIS[AHCI_ATA_CFIS_Device] = SrbExtension->Device; + cmdTable->CFIS[AHCI_ATA_CFIS_LBA3] = SrbExtension->LBA3; + cmdTable->CFIS[AHCI_ATA_CFIS_LBA4] = SrbExtension->LBA4; + cmdTable->CFIS[AHCI_ATA_CFIS_LBA5] = SrbExtension->LBA5; + cmdTable->CFIS[AHCI_ATA_CFIS_FeaturesHigh] = SrbExtension->FeaturesHigh; + cmdTable->CFIS[AHCI_ATA_CFIS_SectorCountLow] = SrbExtension->SectorCountLow; + cmdTable->CFIS[AHCI_ATA_CFIS_SectorCountHigh] = SrbExtension->SectorCountHigh; + + return 5; }// -- AhciATAPI_CFIS(); /** @@ -1566,8 +1587,46 @@ }// -- AhciProcessIO(); /** + * @name AtapiInquiryCompletion + * @implemented + * + * AtapiInquiryCompletion routine should be called after device signals + * for device inquiry request is completed (through interrupt) -- ATAPI Device only + * + * @param PortExtension + * @param Srb + * + */ +VOID +AtapiInquiryCompletion ( + __in PAHCI_PORT_EXTENSION PortExtension, + __in PSCSI_REQUEST_BLOCK Srb + ) +{ + BOOLEAN status; + PAHCI_ADAPTER_EXTENSION AdapterExtension; + + AhciDebugPrint("AtapiInquiryCompletion()\n"); + + NT_ASSERT(Srb != NULL); + NT_ASSERT(PortExtension != NULL); + + AdapterExtension = PortExtension->AdapterExtension; + + // send queue depth + status = StorPortSetDeviceQueueDepth(PortExtension->AdapterExtension, + Srb->PathId, + Srb->TargetId, + Srb->Lun, + AHCI_Global_Port_CAP_NCS(AdapterExtension->CAP)); + + NT_ASSERT(status == TRUE); + return; +}// -- AtapiInquiryCompletion(); + +/** * @name InquiryCompletion - * @not_implemented + * @implemented * * InquiryCompletion routine should be called after device signals * for device inquiry request is completed (through interrupt) @@ -1719,33 +1778,130 @@ return; }// -- InquiryCompletion(); -/** - * @name DeviceRequestSense - * @implemented - * - * Handle SCSIOP_MODE_SENSE OperationCode + /** + * @name AhciATAPICommand + * @implemented + * + * Handles ATAPI Requests commands * * @param AdapterExtension * @param Srb * @param Cdb * * @return - * return STOR status for DeviceRequestSense - */ -UCHAR DeviceRequestSense ( + * return STOR status for AhciATAPICommand + */ +UCHAR +AhciATAPICommand ( __in PAHCI_ADAPTER_EXTENSION AdapterExtension, __in PSCSI_REQUEST_BLOCK Srb, __in PCDB Cdb ) { + ULONG SrbFlags, DataBufferLength; + PAHCI_SRB_EXTENSION SrbExtension; + PAHCI_PORT_EXTENSION PortExtension; + + AhciDebugPrint("AhciATAPICommand()\n"); + + SrbFlags = Srb->SrbFlags; + SrbExtension = GetSrbExtension(Srb); + DataBufferLength = Srb->DataTransferLength; + PortExtension = &AdapterExtension->PortExtension[Srb->PathId]; + + NT_ASSERT(PortExtension->DeviceParams.DeviceType == AHCI_DEVICE_TYPE_ATAPI); + + NT_ASSERT(SrbExtension != NULL); + + SrbExtension->AtaFunction = ATA_FUNCTION_ATAPI_COMMAND; + SrbExtension->Flags = 0; + + if (SrbFlags & SRB_FLAGS_DATA_IN) + { + SrbExtension->Flags |= ATA_FLAGS_DATA_IN; + } + + if (SrbFlags & SRB_FLAGS_DATA_OUT) + { + SrbExtension->Flags |= ATA_FLAGS_DATA_OUT; + } + + SrbExtension->FeaturesLow = 0; + + SrbExtension->CompletionRoutine = NULL; + + NT_ASSERT(Cdb != NULL); + switch(Cdb->CDB10.OperationCode) + { + case SCSIOP_INQUIRY: + SrbExtension->Flags |= ATA_FLAGS_DATA_IN; + SrbExtension->CompletionRoutine = AtapiInquiryCompletion; + break; + case SCSIOP_READ: + SrbExtension->Flags |= ATA_FLAGS_USE_DMA; + SrbExtension->FeaturesLow = 0x5; + break; + case SCSIOP_WRITE: + SrbExtension->Flags |= ATA_FLAGS_USE_DMA; + SrbExtension->FeaturesLow = 0x1; + break; + } + + SrbExtension->CommandReg = IDE_COMMAND_ATAPI_PACKET; + + SrbExtension->LBA0 = 0; + SrbExtension->LBA1 = (UCHAR)(DataBufferLength >> 0); + SrbExtension->LBA2 = (UCHAR)(DataBufferLength >> 8); + SrbExtension->Device = 0; + SrbExtension->LBA3 = 0; + SrbExtension->LBA4 = 0; + SrbExtension->LBA5 = 0; + SrbExtension->FeaturesHigh = 0; + SrbExtension->SectorCountLow = 0; + SrbExtension->SectorCountHigh = 0; + + if ((SrbExtension->Flags & ATA_FLAGS_DATA_IN) || (SrbExtension->Flags & ATA_FLAGS_DATA_OUT)) + { + SrbExtension->pSgl = (PLOCAL_SCATTER_GATHER_LIST)StorPortGetScatterGatherList(AdapterExtension, Srb); + } + + return SRB_STATUS_PENDING; +}// -- AhciATAPICommand(); + +/** + * @name DeviceRequestSense + * @implemented + * + * Handle SCSIOP_MODE_SENSE OperationCode + * + * @param AdapterExtension + * @param Srb + * @param Cdb + * + * @return + * return STOR status for DeviceRequestSense + */ +UCHAR +DeviceRequestSense ( + __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in PSCSI_REQUEST_BLOCK Srb, + __in PCDB Cdb + ) +{ PMODE_PARAMETER_HEADER ModeHeader; + PAHCI_PORT_EXTENSION PortExtension; AhciDebugPrint("DeviceRequestSense()\n"); - - UNREFERENCED_PARAMETER(AdapterExtension); NT_ASSERT(IsPortValid(AdapterExtension, Srb->PathId)); NT_ASSERT(Cdb->CDB10.OperationCode == SCSIOP_MODE_SENSE); + + PortExtension = &AdapterExtension->PortExtension[Srb->PathId]; + + if (PortExtension->DeviceParams.DeviceType == AHCI_DEVICE_TYPE_ATAPI) + { + return AhciATAPICommand(AdapterExtension, Srb, Cdb); + } ModeHeader = (PMODE_PARAMETER_HEADER)Srb->DataBuffer; @@ -1778,9 +1934,10 @@ * @param Cdb * * @return - * return STOR status for DeviceReportLuns - */ -UCHAR DeviceRequestReadWrite ( + * return STOR status for DeviceRequestReadWrite + */ +UCHAR +DeviceRequestReadWrite ( __in PAHCI_ADAPTER_EXTENSION AdapterExtension, __in PSCSI_REQUEST_BLOCK Srb, __in PCDB Cdb @@ -1799,6 +1956,11 @@ SrbExtension = GetSrbExtension(Srb); PortExtension = &AdapterExtension->PortExtension[Srb->PathId]; + + if (PortExtension->DeviceParams.DeviceType == AHCI_DEVICE_TYPE_ATAPI) + { + return AhciATAPICommand(AdapterExtension, Srb, Cdb); + } DataTransferLength = Srb->DataTransferLength; BytesPerSector = PortExtension->DeviceParams.BytesPerLogicalSector; @@ -1882,9 +2044,10 @@ * @param Cdb * * @return - * return STOR status for DeviceReportLuns - */ -UCHAR DeviceRequestCapacity ( + * return STOR status for DeviceRequestCapacity + */ +UCHAR +DeviceRequestCapacity ( __in PAHCI_ADAPTER_EXTENSION AdapterExtension, __in PSCSI_REQUEST_BLOCK Srb, __in PCDB Cdb @@ -1902,7 +2065,13 @@ NT_ASSERT(Srb->DataBuffer != NULL); NT_ASSERT(IsPortValid(AdapterExtension, Srb->PathId)); + PortExtension = &AdapterExtension->PortExtension[Srb->PathId]; + + if (PortExtension->DeviceParams.DeviceType == AHCI_DEVICE_TYPE_ATAPI) + { + return AhciATAPICommand(AdapterExtension, Srb, Cdb); + } if (Cdb->CDB10.OperationCode == SCSIOP_READ_CAPACITY) { @@ -1945,7 +2114,8 @@ * @return * return STOR status for DeviceRequestComplete */ -UCHAR DeviceRequestComplete ( +UCHAR +DeviceRequestComplete ( __in PAHCI_ADAPTER_EXTENSION AdapterExtension, __in PSCSI_REQUEST_BLOCK Srb, __in PCDB Cdb @@ -1974,21 +2144,29 @@ * @return * return STOR status for DeviceReportLuns */ -UCHAR DeviceReportLuns ( +UCHAR +DeviceReportLuns ( __in PAHCI_ADAPTER_EXTENSION AdapterExtension, __in PSCSI_REQUEST_BLOCK Srb, __in PCDB Cdb ) { PLUN_LIST LunList; + PAHCI_PORT_EXTENSION PortExtension; AhciDebugPrint("DeviceReportLuns()\n"); - UNREFERENCED_PARAMETER(AdapterExtension); UNREFERENCED_PARAMETER(Cdb); + + PortExtension = &AdapterExtension->PortExtension[Srb->PathId]; NT_ASSERT(Srb->DataTransferLength >= sizeof(LUN_LIST)); NT_ASSERT(Cdb->CDB10.OperationCode == SCSIOP_REPORT_LUNS); + + if (PortExtension->DeviceParams.DeviceType == AHCI_DEVICE_TYPE_ATAPI) + { + return AhciATAPICommand(AdapterExtension, Srb, Cdb); + } LunList = (PLUN_LIST)Srb->DataBuffer; @@ -2040,6 +2218,11 @@ SrbExtension = GetSrbExtension(Srb); PortExtension = &AdapterExtension->PortExtension[Srb->PathId]; + + if (PortExtension->DeviceParams.DeviceType == AHCI_DEVICE_TYPE_ATAPI) + { + return AhciATAPICommand(AdapterExtension, Srb, Cdb); + } if (Srb->Lun != 0) {

1 0

[dchapyshev] 72329: [KERNEL32] - Update Russian translation
by dchapyshev＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: dchapyshev Date: Thu Aug 18 17:23:11 2016 New Revision: 72329 URL: http://svn.reactos.org/svn/reactos?rev=72329&view=rev Log: [KERNEL32] - Update Russian translation Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc [iso-8859-1] Thu Aug 18 17:23:11 2016 @@ -226,156 +226,156 @@ 84+NLSRC_OFFSET "Ð¤ÑÐ°Ð½ÑÐ¸Ñ" 86+NLSRC_OFFSET "ÐÐ°Ð¼Ð±Ð¸Ñ" 87+NLSRC_OFFSET "ÐÐ°Ð±Ð¾Ð½" - 88+NLSRC_OFFSET "Georgia" - 89+NLSRC_OFFSET "Ghana" - 90+NLSRC_OFFSET "Gibraltar" - 91+NLSRC_OFFSET "Grenada" - 93+NLSRC_OFFSET "Greenland" - 94+NLSRC_OFFSET "Germany" - 98+NLSRC_OFFSET "Greece" - 99+NLSRC_OFFSET "Guatemala" - 100+NLSRC_OFFSET "Guinea" - 101+NLSRC_OFFSET "Guyana" - 103+NLSRC_OFFSET "Haiti" - 104+NLSRC_OFFSET "Hong Kong S.A.R." - 106+NLSRC_OFFSET "Honduras" - 108+NLSRC_OFFSET "Croatia" - 109+NLSRC_OFFSET "Hungary" - 110+NLSRC_OFFSET "Iceland" - 111+NLSRC_OFFSET "Indonesia" - 113+NLSRC_OFFSET "India" - 114+NLSRC_OFFSET "British Indian Ocean Territory" - 116+NLSRC_OFFSET "Iran" - 117+NLSRC_OFFSET "Israel" - 118+NLSRC_OFFSET "Italy" - 119+NLSRC_OFFSET "CÃ´te d'Ivoire" - 121+NLSRC_OFFSET "Iraq" - 122+NLSRC_OFFSET "Japan" - 124+NLSRC_OFFSET "Jamaica" - 125+NLSRC_OFFSET "Jan Mayen" - 126+NLSRC_OFFSET "Jordan" - 127+NLSRC_OFFSET "Johnston Atoll" - 129+NLSRC_OFFSET "Kenya" - 130+NLSRC_OFFSET "Kyrgyzstan" - 131+NLSRC_OFFSET "North Korea" - 133+NLSRC_OFFSET "Kiribati" + 88+NLSRC_OFFSET "ÐÐ¶Ð¾ÑÐ´Ð¶Ð¸Ñ" + 89+NLSRC_OFFSET "ÐÐ°Ð½Ð°" + 90+NLSRC_OFFSET "ÐÐ¸Ð±ÑÐ°Ð»ÑÐ°Ñ" + 91+NLSRC_OFFSET "ÐÑÐµÐ½Ð°Ð´Ð°" + 93+NLSRC_OFFSET "ÐÑÐµÐ½Ð»Ð°Ð½Ð´Ð¸Ñ" + 94+NLSRC_OFFSET "ÐÐµÑÐ¼Ð°Ð½Ð¸Ñ" + 98+NLSRC_OFFSET "ÐÑÐµÑÐ¸Ñ" + 99+NLSRC_OFFSET "ÐÐ²Ð°ÑÐµÐ¼Ð°Ð»Ð°" + 100+NLSRC_OFFSET "ÐÐ²Ð¸Ð½ÐµÑ" + 101+NLSRC_OFFSET "ÐÐ°Ð¹Ð°Ð½Ð°" + 103+NLSRC_OFFSET "ÐÐ°Ð¸ÑÐ¸" + 104+NLSRC_OFFSET "ÐÐ¾Ð½ÐºÐ¾Ð½Ð³ S.A.R." + 106+NLSRC_OFFSET "ÐÐ¾Ð½Ð´ÑÑÐ°Ñ" + 108+NLSRC_OFFSET "Ð¥Ð¾ÑÐ²Ð°ÑÐ¸Ñ" + 109+NLSRC_OFFSET "ÐÐµÐ½Ð³ÑÐ¸Ñ" + 110+NLSRC_OFFSET "ÐÑÐ»Ð°Ð½Ð´Ð¸Ñ" + 111+NLSRC_OFFSET "ÐÐ½Ð´Ð¾Ð½ÐµÐ·Ð¸Ñ" + 113+NLSRC_OFFSET "ÐÐ½Ð´Ð¸Ñ" + 114+NLSRC_OFFSET "ÐÑÐ¸ÑÐ°Ð½ÑÐºÐ°Ñ ÑÐµÑÑÐ¸ÑÐ¾ÑÐ¸Ñ Ð² ÐÐ½Ð´Ð¸Ð¹ÑÐºÐ¾Ð¼ Ð¾ÐºÐµÐ°Ð½Ðµ" + 116+NLSRC_OFFSET "ÐÑÐ°Ð½" + 117+NLSRC_OFFSET "ÐÐ·ÑÐ°Ð¸Ð»Ñ" + 118+NLSRC_OFFSET "ÐÑÐ°Ð»Ð¸Ñ" + 119+NLSRC_OFFSET "ÐÐ¾Ñ-Ð´'ÐÐ²ÑÐ°Ñ" + 121+NLSRC_OFFSET "ÐÑÐ°Ðº" + 122+NLSRC_OFFSET "Ð¯Ð¿Ð¾Ð½Ð¸Ñ" + 124+NLSRC_OFFSET "Ð¯Ð¼Ð°Ð¹ÐºÐ°" + 125+NLSRC_OFFSET "Ð¯Ð½ ÐÐµÐ¹ÐµÐ½" + 126+NLSRC_OFFSET "ÐÐ¾ÑÐ´Ð°Ð½Ð¸Ñ" + 127+NLSRC_OFFSET "ÐÐ¶Ð¾Ð½ÑÑÐ¾Ð½ÑÐºÐ¸Ð¹ Ð°ÑÐ¾Ð»Ð»" + 129+NLSRC_OFFSET "ÐÐµÐ½Ð¸Ñ" + 130+NLSRC_OFFSET "ÐÑÑÐ³ÑÐ·ÑÑÐ°Ð½" + 131+NLSRC_OFFSET "Ð¡ÐµÐ²ÐµÑÐ½Ð°Ñ ÐÐ¾ÑÐµÑ" + 133+NLSRC_OFFSET "ÐÐ¸ÑÐ¸Ð±Ð°ÑÐ¸" 134+NLSRC_OFFSET "ÐÐ¾ÑÐµÑ" 136+NLSRC_OFFSET "ÐÑÐ²ÐµÐ¹Ñ" 137+NLSRC_OFFSET "ÐÐ°Ð·Ð°ÑÑÑÐ°Ð½" - 138+NLSRC_OFFSET "Laos" - 139+NLSRC_OFFSET "Lebanon" - 140+NLSRC_OFFSET "Latvia" - 141+NLSRC_OFFSET "Lithuania" - 142+NLSRC_OFFSET "Liberia" - 143+NLSRC_OFFSET "Slovakia" - 145+NLSRC_OFFSET "Liechtenstein" - 146+NLSRC_OFFSET "Lesotho" - 147+NLSRC_OFFSET "Luxembourg" - 148+NLSRC_OFFSET "Libya" - 149+NLSRC_OFFSET "Madagascar" - 151+NLSRC_OFFSET "Macao S.A.R." - 152+NLSRC_OFFSET "Moldova" - 154+NLSRC_OFFSET "Mongolia" - 156+NLSRC_OFFSET "Malawi" - 157+NLSRC_OFFSET "Mali" - 158+NLSRC_OFFSET "Monaco" - 159+NLSRC_OFFSET "Morocco" - 160+NLSRC_OFFSET "Mauritius" - 162+NLSRC_OFFSET "Mauritania" - 163+NLSRC_OFFSET "Malta" - 164+NLSRC_OFFSET "Oman" - 165+NLSRC_OFFSET "Maldives" - 166+NLSRC_OFFSET "Mexico" - 167+NLSRC_OFFSET "Malaysia" - 168+NLSRC_OFFSET "Mozambique" - 173+NLSRC_OFFSET "Niger" - 174+NLSRC_OFFSET "Vanuatu" - 175+NLSRC_OFFSET "Nigeria" - 176+NLSRC_OFFSET "Netherlands" - 177+NLSRC_OFFSET "Norway" - 178+NLSRC_OFFSET "Nepal" - 180+NLSRC_OFFSET "Nauru" - 181+NLSRC_OFFSET "Suriname" - 182+NLSRC_OFFSET "Nicaragua" - 183+NLSRC_OFFSET "New Zealand" - 184+NLSRC_OFFSET "Palestinian Authority" - 185+NLSRC_OFFSET "Paraguay" - 187+NLSRC_OFFSET "Peru" - 190+NLSRC_OFFSET "Pakistan" - 191+NLSRC_OFFSET "Poland" - 192+NLSRC_OFFSET "Panama" - 193+NLSRC_OFFSET "Portugal" - 194+NLSRC_OFFSET "Papua New Guinea" - 195+NLSRC_OFFSET "Palau" - 196+NLSRC_OFFSET "Guinea-Bissau" - 197+NLSRC_OFFSET "Qatar" - 198+NLSRC_OFFSET "Reunion" - 199+NLSRC_OFFSET "Marshall Islands" - 200+NLSRC_OFFSET "Romania" - 201+NLSRC_OFFSET "Philippines" - 202+NLSRC_OFFSET "Puerto Rico" + 138+NLSRC_OFFSET "ÐÐ°Ð¾Ñ" + 139+NLSRC_OFFSET "ÐÐ¸Ð²Ð°Ð½" + 140+NLSRC_OFFSET "ÐÐ°ÑÐ²Ð¸Ñ" + 141+NLSRC_OFFSET "ÐÐ¸ÑÐ²Ð°" + 142+NLSRC_OFFSET "ÐÐ¸Ð±ÐµÑÐ¸Ñ" + 143+NLSRC_OFFSET "Ð¡Ð»Ð¾Ð²Ð°ÐºÐ¸Ñ" + 145+NLSRC_OFFSET "ÐÐ¸ÑÑÐµÐ½ÑÑÐµÐ¹Ð½" + 146+NLSRC_OFFSET "ÐÐµÑÐ¾ÑÐ¾" + 147+NLSRC_OFFSET "ÐÑÐºÑÐµÐ¼Ð±ÑÑÐ³" + 148+NLSRC_OFFSET "ÐÐ¸Ð²Ð¸Ñ" + 149+NLSRC_OFFSET "ÐÐ°Ð´Ð°Ð³Ð°ÑÐºÐ°Ñ" + 151+NLSRC_OFFSET "ÐÐ°ÐºÐ°Ð¾ S.A.R." + 152+NLSRC_OFFSET "ÐÐ¾Ð»Ð´Ð¾Ð²Ð°" + 154+NLSRC_OFFSET "ÐÐ¾Ð½Ð³Ð¾Ð»Ð¸Ñ" + 156+NLSRC_OFFSET "ÐÐ°Ð»Ð°Ð²Ð¸" + 157+NLSRC_OFFSET "ÐÐ°Ð»Ð¸" + 158+NLSRC_OFFSET "ÐÐ¾Ð½Ð°ÐºÐ¾" + 159+NLSRC_OFFSET "ÐÐ°ÑÐ¾ÐºÐºÐ¾" + 160+NLSRC_OFFSET "ÐÐ°Ð²ÑÐ¸ÐºÐ¸Ð¹" + 162+NLSRC_OFFSET "ÐÐ°Ð²ÑÐ¸ÑÐ°Ð½Ð¸Ñ" + 163+NLSRC_OFFSET "ÐÐ°Ð»ÑÑÐ°" + 164+NLSRC_OFFSET "ÐÐ¼Ð°Ð½" + 165+NLSRC_OFFSET "ÐÐ°Ð»ÑÐ´Ð¸Ð²Ñ" + 166+NLSRC_OFFSET "ÐÐµÐºÑÐ¸ÐºÐ°" + 167+NLSRC_OFFSET "ÐÐ°Ð»Ð°Ð¹Ð·Ð¸Ñ" + 168+NLSRC_OFFSET "ÐÐ¾Ð·Ð°Ð¼Ð±Ð¸Ðº" + 173+NLSRC_OFFSET "ÐÐ¸Ð³ÐµÑ" + 174+NLSRC_OFFSET "ÐÐ°Ð½ÑÐ°ÑÑ" + 175+NLSRC_OFFSET "ÐÐ¸Ð³ÐµÑÐ¸Ñ" + 176+NLSRC_OFFSET "ÐÐ¸Ð´ÐµÑÐ»Ð°Ð½Ð´Ñ" + 177+NLSRC_OFFSET "ÐÐ¾ÑÐ²ÐµÐ³Ð¸Ñ" + 178+NLSRC_OFFSET "ÐÐµÐ¿Ð°Ð»" + 180+NLSRC_OFFSET "ÐÐ°ÑÑÑ" + 181+NLSRC_OFFSET "Ð¡ÑÑÐ¸Ð½Ð°Ð¼" + 182+NLSRC_OFFSET "ÐÐ¸ÐºÐ°ÑÐ°Ð³ÑÐ°" + 183+NLSRC_OFFSET "ÐÐ¾Ð²Ð°Ñ ÐÐµÐ»Ð°Ð½Ð´Ð¸Ñ" + 184+NLSRC_OFFSET "ÐÐ°Ð»ÐµÑÑÐ¸Ð½ÑÐºÐ°Ñ ÐÐ²ÑÐ¾Ð½Ð¾Ð¼Ð¸Ñ" + 185+NLSRC_OFFSET "ÐÐ°ÑÐ°Ð³Ð²Ð°Ð¹" + 187+NLSRC_OFFSET "ÐÐµÑÑ" + 190+NLSRC_OFFSET "ÐÐ°ÐºÐ¸ÑÑÐ°Ð½" + 191+NLSRC_OFFSET "ÐÐ¾Ð»ÑÑÐ°" + 192+NLSRC_OFFSET "ÐÐ°Ð½Ð°Ð¼Ð°" + 193+NLSRC_OFFSET "ÐÐ¾ÑÑÑÐ³Ð°Ð»Ð¸Ñ" + 194+NLSRC_OFFSET "ÐÐ°Ð¿ÑÐ° - ÐÐ¾Ð²Ð°Ñ ÐÐ²Ð¸Ð½ÐµÑ" + 195+NLSRC_OFFSET "ÐÐ°Ð»Ð°Ñ" + 196+NLSRC_OFFSET "ÐÐ²Ð¸Ð½ÐµÑ-ÐÐ¸ÑÐ°Ñ" + 197+NLSRC_OFFSET "ÐÐ°ÑÐ°Ñ" + 198+NLSRC_OFFSET "ÐÐ¾ÑÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ" + 199+NLSRC_OFFSET "ÐÐ°ÑÑÐ°Ð»Ð»Ð¾Ð²Ñ ÐÑÑÑÐ¾Ð²Ð°" + 200+NLSRC_OFFSET "Ð ÑÐ¼ÑÐ½Ð¸Ñ" + 201+NLSRC_OFFSET "Ð¤Ð¸Ð»Ð¸Ð¿Ð¿Ð¸Ð½Ñ" + 202+NLSRC_OFFSET "ÐÑÑÑÑÐ¾-Ð Ð¸ÐºÐ¾" 203+NLSRC_OFFSET "Ð Ð¾ÑÑÐ¸Ñ" - 204+NLSRC_OFFSET "Rwanda" - 205+NLSRC_OFFSET "Saudi Arabia" - 206+NLSRC_OFFSET "St. Pierre and Miquelon" - 207+NLSRC_OFFSET "St. Kitts and Nevis" - 208+NLSRC_OFFSET "Seychelles" - 209+NLSRC_OFFSET "South Africa" - 210+NLSRC_OFFSET "Senegal" - 212+NLSRC_OFFSET "Slovenia" - 213+NLSRC_OFFSET "Sierra Leone" - 214+NLSRC_OFFSET "San Marino" - 215+NLSRC_OFFSET "Singapore" - 216+NLSRC_OFFSET "Somalia" - 217+NLSRC_OFFSET "Spain" - 218+NLSRC_OFFSET "St. Lucia" - 219+NLSRC_OFFSET "Sudan" - 220+NLSRC_OFFSET "Svalbard" - 221+NLSRC_OFFSET "Sweden" - 222+NLSRC_OFFSET "Syria" - 223+NLSRC_OFFSET "Switzerland" - 224+NLSRC_OFFSET "United Arab Emirates" - 225+NLSRC_OFFSET "Trinidad and Tobago" - 227+NLSRC_OFFSET "Thailand" - 228+NLSRC_OFFSET "Tajikistan" - 231+NLSRC_OFFSET "Tonga" - 232+NLSRC_OFFSET "Togo" - 233+NLSRC_OFFSET "SÃ£o TomÃ© and PrÃncipe" - 234+NLSRC_OFFSET "Tunisia" - 235+NLSRC_OFFSET "Turkey" - 236+NLSRC_OFFSET "Tuvalu" - 237+NLSRC_OFFSET "Taiwan" - 238+NLSRC_OFFSET "Turkmenistan" - 239+NLSRC_OFFSET "Tanzania" - 240+NLSRC_OFFSET "Uganda" + 204+NLSRC_OFFSET "Ð ÑÐ°Ð½Ð´Ð°" + 205+NLSRC_OFFSET "Ð¡Ð°ÑÐ´Ð¾Ð²ÑÐºÐ°Ñ ÐÑÐ°Ð²Ð¸Ñ" + 206+NLSRC_OFFSET "Ð¡Ð². ÐÑÐµÑ Ð¸ ÐÐ¸ÐºÐ»Ð¾Ð½" + 207+NLSRC_OFFSET "Ð¡ÐµÐ½Ñ-ÐÐ¸ÑÑ Ð¸ ÐÐµÐ²Ð¸Ñ" + 208+NLSRC_OFFSET "Ð¡ÐµÐ¹ÑÐµÐ»ÑÑÐºÐ¸Ðµ Ð¾ÑÑÑÐ¾Ð²Ð°" + 209+NLSRC_OFFSET "Ð®Ð¶Ð½Ð°Ñ ÐÑÑÐ¸ÐºÐ°" + 210+NLSRC_OFFSET "Ð¡ÐµÐ½ÐµÐ³Ð°Ð»" + 212+NLSRC_OFFSET "Ð¡Ð»Ð¾Ð²ÐµÐ½Ð¸Ñ" + 213+NLSRC_OFFSET "Ð¡ÑÐµÑÑÐ°-ÐÐµÐ¾Ð½Ðµ" + 214+NLSRC_OFFSET "Ð¡Ð°Ð½-ÐÐ°ÑÐ¸Ð½Ð¾" + 215+NLSRC_OFFSET "Ð¡Ð¸Ð½Ð³Ð°Ð¿ÑÑ" + 216+NLSRC_OFFSET "Ð¡Ð¾Ð¼Ð°Ð»Ð¸" + 217+NLSRC_OFFSET "ÐÑÐ¿Ð°Ð½Ð¸Ñ" + 218+NLSRC_OFFSET "Ð¡ÐµÐ½Ñ-ÐÑÑÐ¸Ñ" + 219+NLSRC_OFFSET "Ð¡ÑÐ´Ð°Ð½" + 220+NLSRC_OFFSET "Ð¨Ð¿Ð¸ÑÐ±ÐµÑÐ³ÐµÐ½" + 221+NLSRC_OFFSET "Ð¨Ð²ÐµÑÐ¸Ñ" + 222+NLSRC_OFFSET "Ð¡Ð¸ÑÐ¸Ñ" + 223+NLSRC_OFFSET "Ð¨Ð²ÐµÐ¹ÑÐ°ÑÐ¸Ñ" + 224+NLSRC_OFFSET "ÐÐ±ÑÐµÐ´Ð¸Ð½ÐµÐ½Ð½ÑÐµ ÐÑÐ°Ð±ÑÐºÐ¸Ðµ ÐÐ¼Ð¸ÑÐ°ÑÑ" + 225+NLSRC_OFFSET "Ð¢ÑÐ¸Ð½Ð¸Ð´Ð°Ð´ Ð¸ Ð¢Ð¾Ð±Ð°Ð³Ð¾" + 227+NLSRC_OFFSET "Ð¢Ð°Ð¸Ð»Ð°Ð½Ð´" + 228+NLSRC_OFFSET "Ð¢Ð°Ð´Ð¶Ð¸ÐºÐ¸ÑÑÐ°Ð½" + 231+NLSRC_OFFSET "Ð¢Ð¾Ð½Ð³Ð°" + 232+NLSRC_OFFSET "Ð¢Ð¾Ð³Ð¾" + 233+NLSRC_OFFSET "Ð¡Ð°Ð½-Ð¢Ð¾Ð¼Ðµ Ð¸ ÐÑÐ¸Ð½ÑÐ¸Ð¿Ð¸" + 234+NLSRC_OFFSET "Ð¢ÑÐ½Ð¸Ñ" + 235+NLSRC_OFFSET "Ð¢ÑÑÑÐ¸Ñ" + 236+NLSRC_OFFSET "Ð¢ÑÐ²Ð°Ð»Ñ" + 237+NLSRC_OFFSET "Ð¢Ð°Ð¹Ð²Ð°Ð½Ñ" + 238+NLSRC_OFFSET "Ð¢ÑÑÐºÐ¼ÐµÐ½Ð¸ÑÑÐ°Ð½" + 239+NLSRC_OFFSET "Ð¢Ð°Ð½Ð·Ð°Ð½Ð¸Ñ" + 240+NLSRC_OFFSET "Ð£Ð³Ð°Ð½Ð´Ð°" 241+NLSRC_OFFSET "Ð£ÐºÑÐ°Ð¸Ð½Ð°" 242+NLSRC_OFFSET "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð½Ð¾Ðµ ÐÐ¾ÑÐ¾Ð»ÐµÐ²ÑÑÐ²Ð¾" 244+NLSRC_OFFSET "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð½ÑÐµ Ð¨ÑÐ°ÑÑ" - 245+NLSRC_OFFSET "Burkina Faso" - 246+NLSRC_OFFSET "Uruguay" + 245+NLSRC_OFFSET "ÐÑÑÐºÐ¸Ð½Ð°-Ð¤Ð°ÑÐ¾" + 246+NLSRC_OFFSET "Ð£ÑÑÐ³Ð²Ð°Ð¹" 247+NLSRC_OFFSET "Ð£Ð·Ð±ÐµÐºÐ¸ÑÑÐ°Ð½" - 248+NLSRC_OFFSET "St. Vincent and the Grenadines" - 249+NLSRC_OFFSET "Bolivarian Republic of Venezuela" - 251+NLSRC_OFFSET "Vietnam" - 252+NLSRC_OFFSET "Virgin Islands" - 253+NLSRC_OFFSET "Vatican City" - 254+NLSRC_OFFSET "Namibia" - 257+NLSRC_OFFSET "Western Sahara (disputed)" - 258+NLSRC_OFFSET "Wake Island" - 259+NLSRC_OFFSET "Samoa" - 260+NLSRC_OFFSET "Swaziland" - 261+NLSRC_OFFSET "Yemen" - 263+NLSRC_OFFSET "Zambia" - 264+NLSRC_OFFSET "Zimbabwe" - 269+NLSRC_OFFSET "Serbia and Montenegro (Former)" - 270+NLSRC_OFFSET "Montenegro" - 271+NLSRC_OFFSET "Serbia" - 273+NLSRC_OFFSET "CuraÃ§ao" - 276+NLSRC_OFFSET "South Sudan" - 300+NLSRC_OFFSET "Anguilla" - 301+NLSRC_OFFSET "Antarctica" - 302+NLSRC_OFFSET "Aruba" - 303+NLSRC_OFFSET "Ascension Island" + 248+NLSRC_OFFSET "Ð¡ÐµÐ½Ñ-ÐÐ¸Ð½ÑÐµÐ½Ñ Ð¸ ÐÑÐµÐ½Ð°Ð´Ð¸Ð½Ñ" + 249+NLSRC_OFFSET "ÐÐ¾Ð»Ð¸Ð²Ð°ÑÐ¸Ð°Ð½ÑÐºÐ°Ñ Ð ÐµÑÐ¿ÑÐ±Ð»Ð¸ÐºÐ° ÐÐµÐ½ÐµÑÑÑÐ»Ð°" + 251+NLSRC_OFFSET "ÐÑÐµÑÐ½Ð°Ð¼" + 252+NLSRC_OFFSET "ÐÐ¸ÑÐ³Ð¸Ð½ÑÐºÐ¸Ðµ Ð¾ÑÑÑÐ¾Ð²Ð°" + 253+NLSRC_OFFSET "ÐÐ°ÑÐ¸ÐºÐ°Ð½" + 254+NLSRC_OFFSET "ÐÐ°Ð¼Ð¸Ð±Ð¸Ñ" + 257+NLSRC_OFFSET "ÐÐ°Ð¿Ð°Ð´Ð½Ð°Ñ Ð¡Ð°ÑÐ°ÑÐ° (Ð¾ÑÐ¿Ð°ÑÐ¸Ð²Ð°ÐµÑÑÑ)" + 258+NLSRC_OFFSET "ÐÑÑÑÐ¾Ð² Ð£ÑÐ¹Ðº" + 259+NLSRC_OFFSET "Ð¡Ð°Ð¼Ð¾Ð°" + 260+NLSRC_OFFSET "Ð¡Ð²Ð°Ð·Ð¸Ð»ÐµÐ½Ð´" + 261+NLSRC_OFFSET "ÐÐµÐ¼ÐµÐ½" + 263+NLSRC_OFFSET "ÐÐ°Ð¼Ð±Ð¸Ñ" + 264+NLSRC_OFFSET "ÐÐ¸Ð¼Ð±Ð°Ð±Ð²Ðµ" + 269+NLSRC_OFFSET "Ð¡ÐµÑÐ±Ð¸Ñ Ð¸ Ð§ÐµÑÐ½Ð¾Ð³Ð¾ÑÐ¸Ñ (Ð±ÑÐ²ÑÐ°Ñ)" + 270+NLSRC_OFFSET "Ð§ÐµÑÐ½Ð¾Ð³Ð¾ÑÐ¸Ñ" + 271+NLSRC_OFFSET "Ð¡ÐµÑÐ±Ð¸Ñ" + 273+NLSRC_OFFSET "ÐÑÑÐ°ÑÐ°Ð¾" + 276+NLSRC_OFFSET "Ð®Ð¶Ð½ÑÐ¹ Ð¡ÑÐ´Ð°Ð½" + 300+NLSRC_OFFSET "ÐÐ½Ð³Ð¸Ð»ÑÑ" + 301+NLSRC_OFFSET "ÐÐ½ÑÐ°ÑÐºÑÐ¸Ð´Ð°" + 302+NLSRC_OFFSET "ÐÑÑÐ±Ð°" + 303+NLSRC_OFFSET "ÐÑÑÑÐ¾Ð² ÐÐ¾Ð·Ð½ÐµÑÐµÐ½Ð¸Ñ" 304+NLSRC_OFFSET "Ð¾-Ð²Ð° ÐÑÐ¼Ð¾Ñ Ð¸ ÐÐ°ÑÑÑÐµ" 305+NLSRC_OFFSET "Ð¾. ÐÑÐ¹ÐºÐµÑ" 306+NLSRC_OFFSET "Ð¾. ÐÑÐ²ÐµÑ" @@ -421,12 +421,12 @@ 351+NLSRC_OFFSET "ÐÑÐ¸ÑÐ°Ð½ÑÐºÐ¸Ðµ ÐÐ¸ÑÐ³Ð¸Ð½ÑÐºÐ¸Ðµ Ð¾-Ð²Ð°" 352+NLSRC_OFFSET "Ð£Ð¾Ð»Ð»Ð¸Ñ Ð¸ Ð¤ÑÑÑÐ½Ð°" 15126+NLSRC_OFFSET "Man, Isle of" - 19618+NLSRC_OFFSET "Macedonia, Former Yugoslav Republic of" - 21242+NLSRC_OFFSET "Midway Islands" - 30967+NLSRC_OFFSET "Sint Maarten (Dutch part)" - 31706+NLSRC_OFFSET "Saint Martin (French part)" - (7299303+NLSRC_OFFSET)&0xffff "Democratic Republic of Timor-Leste" - (10028789+NLSRC_OFFSET)&0xffff "Ãland Islands" - (161832015+NLSRC_OFFSET)&0xffff "Saint-BarthÃ©lemy" + 19618+NLSRC_OFFSET "ÐÐ°ÐºÐµÐ´Ð¾Ð½Ð¸Ñ, Ð±ÑÐ²ÑÐ°Ñ ÑÐ³Ð¾ÑÐ»Ð°Ð²ÑÐºÐ°Ñ ÑÐµÑÐ¿ÑÐ±Ð»Ð¸ÐºÐ°" + 21242+NLSRC_OFFSET "ÐÑÐ¾Ð»Ð» ÐÐ¸Ð´ÑÑÐ¹" + 30967+NLSRC_OFFSET "Ð¡Ð¸Ð½Ñ-ÐÐ°ÑÑÐµÐ½ (Ð³Ð¾Ð»Ð»Ð°Ð½Ð´ÑÐºÐ°Ñ ÑÐ°ÑÑÑ)" + 31706+NLSRC_OFFSET "Ð¡ÐµÐ½-ÐÐ°ÑÑÐµÐ½ (ÑÑÐ°Ð½ÑÑÐ·ÑÐºÐ°Ñ ÑÐ°ÑÑÑ)" + (7299303+NLSRC_OFFSET)&0xffff "ÐÐµÐ¼Ð¾ÐºÑÐ°ÑÐ¸ÑÐµÑÐºÐ°Ñ Ð ÐµÑÐ¿ÑÐ±Ð»Ð¸ÐºÐ° Ð¢Ð¸Ð¼Ð¾Ñ-ÐÐµÑÑÐµ" + (10028789+NLSRC_OFFSET)&0xffff "ÐÐ»Ð°Ð½Ð´ÑÐºÐ¸Ðµ Ð¾ÑÑÑÐ¾Ð²Ð°" + (161832015+NLSRC_OFFSET)&0xffff "Ð¡ÐµÐ½-ÐÐ°ÑÑÐµÐ»ÐµÐ¼Ð¸" (161832256+NLSRC_OFFSET)&0xffff "U.S. Minor Outlying Islands" END

1 0

[gadamopoulos] 72328: [SHELL32] - CDefaultContextMenu: Fix some cosmetic issues.
by gadamopoulos＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: gadamopoulos Date: Thu Aug 18 14:01:44 2016 New Revision: 72328 URL: http://svn.reactos.org/svn/reactos?rev=72328&view=rev Log: [SHELL32] - CDefaultContextMenu: Fix some cosmetic issues. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Thu Aug 18 14:01:44 2016 @@ -339,7 +339,7 @@ BOOL bRet = FALSE; CComPtr<IDataObject> pDataObj; - if(SUCCEEDED(OleGetClipboard(&pDataObj))) + if (SUCCEEDED(OleGetClipboard(&pDataObj))) { STGMEDIUM medium; FORMATETC formatetc; @@ -348,7 +348,7 @@ /* Set the FORMATETC structure*/ InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); - if(SUCCEEDED(pDataObj->GetData(&formatetc, &medium))) + if (SUCCEEDED(pDataObj->GetData(&formatetc, &medium))) { bRet = TRUE; ReleaseStgMedium(&medium); @@ -1002,7 +1002,7 @@ HRESULT hr; if (!m_site) - return E_FAIL;; + return E_FAIL; /* Get a pointer to the shell browser */ hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellView, &psv)); @@ -1020,7 +1020,7 @@ LPCMINVOKECOMMANDINFO lpcmi) { if (!m_site) - return E_FAIL;; + return E_FAIL; /* Get a pointer to the shell view */ CComPtr<IShellView> psv; @@ -1210,7 +1210,7 @@ HRESULT hr; hr = SHCreateDataObject(m_pidlFolder, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)); - if(FAILED_UNEXPECTEDLY(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (!bCopy) @@ -1321,7 +1321,7 @@ else if (_ILIsBitBucket(pidlChild)) { /* FIXME: detect the drive path of bitbucket if appropiate */ - if(!SH_ShowRecycleBinProperties(L'C')) + if (!SH_ShowRecycleBinProperties(L'C')) hr = E_FAIL; } else @@ -1564,7 +1564,7 @@ BOOL bHasPath = SHGetPathFromIDListW(pidlFull, wszPath); WCHAR wszDir[MAX_PATH]; - if(bHasPath) + if (bHasPath) { wcscpy(wszDir, wszPath); PathRemoveFileSpec(wszDir); @@ -1819,7 +1819,7 @@ { DRAWITEMSTRUCT* pDrawStruct = reinterpret_cast<DRAWITEMSTRUCT*>(lParam); PDynamicShellEntry pEntry = GetDynamicEntry(pDrawStruct->itemID); - if(pEntry) + if (pEntry) SHForwardContextMenuMsg(pEntry->pCM, uMsg, wParam, lParam, plResult, TRUE); break; } @@ -1827,7 +1827,7 @@ { MEASUREITEMSTRUCT* pMeasureStruct = reinterpret_cast<MEASUREITEMSTRUCT*>(lParam); PDynamicShellEntry pEntry = GetDynamicEntry(pMeasureStruct->itemID); - if(pEntry) + if (pEntry) SHForwardContextMenuMsg(pEntry->pCM, uMsg, wParam, lParam, plResult, TRUE); break; }

1 0

[gadamopoulos] 72327: [SHELL32] - CDefView: Set the site of the context menu to the CDefView essentialy reverting r68727 which was wrong. - CDefaultContextMenu: Implement IObjectWithSite interface....
by gadamopoulos＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: gadamopoulos Date: Thu Aug 18 13:50:56 2016 New Revision: 72327 URL: http://svn.reactos.org/svn/reactos?rev=72327&view=rev Log: [SHELL32] - CDefView: Set the site of the context menu to the CDefView essentialy reverting r68727 which was wrong. - CDefaultContextMenu: Implement IObjectWithSite interface. Don't use CWM_GETISHELLBROWSER to get a pointer to the shell browser. Do a IUnknown_QueryService to the site instead asking for either the shell browser or the shell view (and it is fine if there is none of them). - Rename IDefaultContextMenu_Constructor to CDefaultContextMenu_CreateInstance and use ShellObjectCreatorInit to simplify its code. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Thu Aug 18 13:50:56 2016 @@ -1210,6 +1210,8 @@ if (FAILED(hResult)) goto cleanup; + IUnknown_SetSite(m_pCM, (IShellView *)this); + hResult = m_pCM->QueryContextMenu(hMenu, 0, 0x20, 0x7fff, CMF_DEFAULTONLY); if (FAILED(hResult)) goto cleanup; @@ -1229,7 +1231,10 @@ DestroyMenu(hMenu); if (m_pCM) + { + IUnknown_SetSite(m_pCM, NULL); m_pCM.Release(); + } return hResult; } @@ -1262,6 +1267,8 @@ hResult = GetItemObject( m_cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM)); if (FAILED( hResult)) goto cleanup; + + IUnknown_SetSite(m_pCM, (IShellView *)this); hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED( hResult)) @@ -1280,7 +1287,10 @@ cleanup: if (m_pCM) + { + IUnknown_SetSite(m_pCM, NULL); m_pCM.Release(); + } if (hMenu) DestroyMenu(hMenu); @@ -1301,6 +1311,8 @@ if (FAILED( hResult)) goto cleanup; + IUnknown_SetSite(m_pCM, (IShellView *)this); + hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED( hResult)) goto cleanup; @@ -1309,7 +1321,10 @@ cleanup: if (m_pCM) + { + IUnknown_SetSite(m_pCM, NULL); m_pCM.Release(); + } if (hMenu) DestroyMenu(hMenu); Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Thu Aug 18 13:50:56 2016 @@ -5,12 +5,6 @@ * PURPOSE: provides default context menu implementation * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) */ - -/* -TODO: - The code in NotifyShellViewWindow to deliver commands to the view is broken. It is an excellent - example of the wrong way to do it. -*/ #include "precomp.h" @@ -61,9 +55,11 @@ class CDefaultContextMenu : public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IContextMenu3 + public IContextMenu3, + public IObjectWithSite { private: + CComPtr<IUnknown> m_site; CComPtr<IShellFolder> m_psf; UINT m_cidl; PCUITEMID_CHILD_ARRAY m_apidl; @@ -87,6 +83,7 @@ UINT BuildBackgroundContextMenu(HMENU hMenu, UINT iIdCmdFirst, UINT iIdCmdLast, UINT uFlags); UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT IndexMenu); UINT BuildShellItemContextMenu(HMENU hMenu, UINT iIdCmdFirst, UINT iIdCmdLast, UINT uFlags); + HRESULT NotifyShellViewWindow(LPCMINVOKECOMMANDINFO lpcmi, BOOL bRefresh); HRESULT DoPaste(LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink); HRESULT DoOpenOrExplore(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoCreateLink(LPCMINVOKECOMMANDINFO lpcmi); @@ -121,10 +118,15 @@ // IContextMenu3 virtual HRESULT WINAPI HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult); + // IObjectWithSite + virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); + virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, void **ppvSite); + BEGIN_COM_MAP(CDefaultContextMenu) COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) COM_INTERFACE_ENTRY_IID(IID_IContextMenu3, IContextMenu3) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) END_COM_MAP() }; @@ -992,21 +994,23 @@ return S_OK; } -static -HRESULT -NotifyShellViewWindow(LPCMINVOKECOMMANDINFO lpcmi, BOOL bRefresh) -{ - /* Note: CWM_GETISHELLBROWSER returns not referenced object */ - LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (!lpSB) - return E_FAIL; - - CComPtr<IShellView> lpSV; - if (FAILED(lpSB->QueryActiveShellView(&lpSV))) - return E_FAIL; +HRESULT +CDefaultContextMenu::NotifyShellViewWindow(LPCMINVOKECOMMANDINFO lpcmi, BOOL bRefresh) +{ + CComPtr<IShellView> psv; + + HRESULT hr; + + if (!m_site) + return E_FAIL;; + + /* Get a pointer to the shell browser */ + hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellView, &psv)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; HWND hwndSV = NULL; - if (SUCCEEDED(lpSV->GetWindow(&hwndSV))) + if (SUCCEEDED(psv->GetWindow(&hwndSV))) SendMessageW(hwndSV, WM_COMMAND, MAKEWPARAM(LOWORD(lpcmi->lpVerb), 0), 0); return S_OK; } @@ -1015,19 +1019,16 @@ CDefaultContextMenu::DoRefresh( LPCMINVOKECOMMANDINFO lpcmi) { - CComPtr<IPersistFolder2> ppf2 = NULL; - LPITEMIDLIST pidl; - HRESULT hr = m_psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); - if (SUCCEEDED(hr)) - { - hr = ppf2->GetCurFolder(&pidl); - if (SUCCEEDED(hr)) - { - SHChangeNotify(SHCNE_UPDATEDIR, SHCNF_IDLIST, pidl, NULL); - ILFree(pidl); - } - } - return hr; + if (!m_site) + return E_FAIL;; + + /* Get a pointer to the shell view */ + CComPtr<IShellView> psv; + HRESULT hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellView, &psv)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return psv->Refresh(); } HRESULT @@ -1208,69 +1209,44 @@ CComPtr<IDataObject> pDataObj; HRESULT hr; - if (SUCCEEDED(SHCreateDataObject(m_pidlFolder, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)))) - { - if (!bCopy) - { - FORMATETC formatetc; - STGMEDIUM medium; - InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECT), TYMED_HGLOBAL); - pDataObj->GetData(&formatetc, &medium); - DWORD * pdwFlag = (DWORD*)GlobalLock(medium.hGlobal); - if (pdwFlag) - *pdwFlag = DROPEFFECT_MOVE; - GlobalUnlock(medium.hGlobal); - pDataObj->SetData(&formatetc, &medium, TRUE); - } - - hr = OleSetClipboard(pDataObj); + hr = SHCreateDataObject(m_pidlFolder, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)); + if(FAILED_UNEXPECTEDLY(hr)) return hr; - } - - /* Note: CWM_GETISHELLBROWSER returns not referenced object */ - LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (!lpSB) - { - ERR("failed to get shellbrowser\n"); - return E_FAIL; - } - - CComPtr<IShellView> lpSV; - hr = lpSB->QueryActiveShellView(&lpSV); - if (FAILED(hr)) - { - ERR("failed to query the active shellview\n"); - return hr; - } - - hr = lpSV->GetItemObject(SVGIO_SELECTION, IID_PPV_ARG(IDataObject, &pDataObj)); - if (SUCCEEDED(hr)) - { - hr = OleSetClipboard(pDataObj); - if (FAILED(hr)) - ERR("OleSetClipboard failed"); - pDataObj->Release(); - } else - ERR("failed to get item object\n"); - - return hr; + + if (!bCopy) + { + FORMATETC formatetc; + STGMEDIUM medium; + InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECT), TYMED_HGLOBAL); + pDataObj->GetData(&formatetc, &medium); + DWORD * pdwFlag = (DWORD*)GlobalLock(medium.hGlobal); + if (pdwFlag) + *pdwFlag = DROPEFFECT_MOVE; + GlobalUnlock(medium.hGlobal); + pDataObj->SetData(&formatetc, &medium, TRUE); + } + + return OleSetClipboard(pDataObj); } HRESULT CDefaultContextMenu::DoRename( LPCMINVOKECOMMANDINFO lpcmi) { - /* get the active IShellView. Note: CWM_GETISHELLBROWSER returns not referenced object */ - LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (!lpSB) - { - ERR("CWM_GETISHELLBROWSER failed\n"); + CComPtr<IShellBrowser> psb; + HRESULT hr; + + if (!m_site) return E_FAIL; - } + + /* Get a pointer to the shell browser */ + hr = IUnknown_QueryService(m_site, SID_IShellBrowser, IID_PPV_ARG(IShellBrowser, &psb)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; /* is the treeview focused */ HWND hwnd; - if (SUCCEEDED(lpSB->GetControlWindow(FCW_TREE, &hwnd))) + if (SUCCEEDED(psb->GetControlWindow(FCW_TREE, &hwnd))) { HTREEITEM hItem = TreeView_GetSelection(hwnd); if (hItem) @@ -1278,12 +1254,9 @@ } CComPtr<IShellView> lpSV; - HRESULT hr = lpSB->QueryActiveShellView(&lpSV); - if (FAILED(hr)) - { - ERR("CWM_GETISHELLBROWSER failed\n"); + hr = psb->QueryActiveShellView(&lpSV); + if (FAILED_UNEXPECTEDLY(hr)) return hr; - } SVSIF selFlags = SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT; lpSV->SelectItem(m_apidl[0], selFlags); @@ -1423,24 +1396,20 @@ return E_FAIL; /* Show and select the new item in the def view */ - CComPtr<IShellBrowser> lpSB; - CComPtr<IShellView> lpSV; LPITEMIDLIST pidl; PITEMID_CHILD pidlNewItem; + CComPtr<IShellView> psv; /* Notify the view object about the new item */ SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW, (LPCVOID)wszName, NULL); - /* FIXME: I think that this can be implemented using callbacks to the shell folder */ - - /* Note: CWM_GETISHELLBROWSER returns shell browser without adding reference */ - lpSB = (LPSHELLBROWSER)SendMessageA(lpici->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (!lpSB) - return E_FAIL; - - hr = lpSB->QueryActiveShellView(&lpSV); - if (FAILED(hr)) - return hr; + if (!m_site) + return S_OK; + + /* Get a pointer to the shell view */ + hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellView, &psv)); + if (FAILED_UNEXPECTEDLY(hr)) + return S_OK; /* Attempt to get the pidl of the new item */ hr = SHILCreateFromPathW(wszName, &pidl, NULL); @@ -1449,7 +1418,7 @@ pidlNewItem = ILFindLastID(pidl); - hr = lpSV->SelectItem(pidlNewItem, SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | + hr = psv->SelectItem(pidlNewItem, SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT); SHFree(pidl); @@ -1528,7 +1497,7 @@ DWORD CDefaultContextMenu::BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticShellEntry pEntry) { - LPSHELLBROWSER lpSB; + CComPtr<IShellBrowser> psb; HWND hwndTree; LPCWSTR FlagsName; WCHAR wszKey[256]; @@ -1536,13 +1505,16 @@ DWORD wFlags; DWORD cbVerb; + if (!m_site) + return 0; + /* Get a pointer to the shell browser */ - lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (lpSB == NULL) + hr = IUnknown_QueryService(m_site, SID_IShellBrowser, IID_PPV_ARG(IShellBrowser, &psb)); + if (FAILED_UNEXPECTEDLY(hr)) return 0; /* See if we are in Explore or Browse mode. If the browser's tree is present, we are in Explore mode.*/ - if (SUCCEEDED(lpSB->GetControlWindow(FCW_TREE, &hwndTree)) && hwndTree) + if (SUCCEEDED(psb->GetControlWindow(FCW_TREE, &hwndTree)) && hwndTree) FlagsName = L"ExplorerFlags"; else FlagsName = L"BrowserFlags"; @@ -1565,15 +1537,18 @@ CDefaultContextMenu::TryToBrowse( LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, DWORD wFlags) { - LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageW(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); + CComPtr<IShellBrowser> psb; HRESULT hr; - if (lpSB == NULL) + if (!m_site) return E_FAIL; - hr = lpSB->BrowseObject(ILCombine(m_pidlFolder, pidl), wFlags); - - return hr; + /* Get a pointer to the shell browser */ + hr = IUnknown_QueryService(m_site, SID_IShellBrowser, IID_PPV_ARG(IShellBrowser, &psb)); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + + return psb->BrowseObject(ILCombine(m_pidlFolder, pidl), wFlags); } HRESULT @@ -1865,42 +1840,29 @@ return S_OK; } +HRESULT +WINAPI +CDefaultContextMenu::SetSite(IUnknown *pUnkSite) +{ + m_site = pUnkSite; + return S_OK; +} + +HRESULT +WINAPI +CDefaultContextMenu::GetSite(REFIID riid, void **ppvSite) +{ + if (!m_site) + return E_FAIL; + + return m_site->QueryInterface(riid, ppvSite); +} + static HRESULT -IDefaultContextMenu_Constructor( - const DEFCONTEXTMENU *pdcm, - REFIID riid, - void **ppv) -{ - if (ppv == NULL) - return E_POINTER; - *ppv = NULL; - - CComObject<CDefaultContextMenu> *pCM; - HRESULT hr = CComObject<CDefaultContextMenu>::CreateInstance(&pCM); - if (FAILED(hr)) - return hr; - pCM->AddRef(); // CreateInstance returns object with 0 ref count */ - - CComPtr<IUnknown> pResult; - hr = pCM->QueryInterface(riid, (void **)&pResult); - if (FAILED(hr)) - { - pCM->Release(); - return hr; - } - - hr = pCM->Initialize(pdcm); - if (FAILED(hr)) - { - pCM->Release(); - return hr; - } - - *ppv = pResult.Detach(); - pCM->Release(); - TRACE("This(%p) cidl %u\n", *ppv, pdcm->cidl); - return S_OK; +CDefaultContextMenu_CreateInstance(const DEFCONTEXTMENU *pdcm, REFIID riid, void **ppv) +{ + return ShellObjectCreatorInit<CDefaultContextMenu>(pdcm, riid, ppv); } /************************************************************************* @@ -1910,17 +1872,9 @@ HRESULT WINAPI -SHCreateDefaultContextMenu( - const DEFCONTEXTMENU *pdcm, - REFIID riid, - void **ppv) -{ - *ppv = NULL; - HRESULT hr = IDefaultContextMenu_Constructor(pdcm, riid, ppv); - if (FAILED(hr)) - ERR("IDefaultContextMenu_Constructor failed: %x\n", hr); - TRACE("pcm %p hr %x\n", pdcm, hr); - return hr; +SHCreateDefaultContextMenu(const DEFCONTEXTMENU *pdcm, REFIID riid, void **ppv) +{ + return CDefaultContextMenu_CreateInstance(pdcm, riid, ppv); } /*************************************************************************

1 0

[gadamopoulos] 72326: [BROWSEUI] - CInternetToolbar: Fix resizing the top rebar. Works in windows (but not in ros).
by gadamopoulos＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: gadamopoulos Date: Thu Aug 18 13:24:16 2016 New Revision: 72326 URL: http://svn.reactos.org/svn/reactos?rev=72326&view=rev Log: [BROWSEUI] - CInternetToolbar: Fix resizing the top rebar. Works in windows (but not in ros). Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Thu Aug 18 13:24:16 2016 @@ -646,9 +646,9 @@ if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - if (availableBorderSpace.top > maxHeight) - { - availableBorderSpace.top = maxHeight; + if (maxHeight && availableBorderSpace.bottom - availableBorderSpace.top > maxHeight) + { + availableBorderSpace.bottom = availableBorderSpace.top + maxHeight; } return ResizeBorderDW(&availableBorderSpace, fSite, FALSE); @@ -742,7 +742,7 @@ SendMessage(fMainReBar, RB_SETBANDINFOW, x, (LPARAM)&rebarBandInfo); } } - hResult = ReserveBorderSpace(); + hResult = ReserveBorderSpace(0); // TODO: refresh view menu? }

1 0

[gadamopoulos] 72325: [BROWSEUI] - Use OleFlushClipboard while the browser window is being destroyed in order to make make any IDataObject that is in clipboard to render so as make is data availabl...
by gadamopoulos＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: gadamopoulos Date: Thu Aug 18 13:16:05 2016 New Revision: 72325 URL: http://svn.reactos.org/svn/reactos?rev=72325&view=rev Log: [BROWSEUI] - Use OleFlushClipboard while the browser window is being destroyed in order to make make any IDataObject that is in clipboard to render so as make is data available after the browser thread exits. CORE-11565 Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Thu Aug 18 13:16:05 2016 @@ -3350,6 +3350,10 @@ LRESULT CShellBrowser::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { HRESULT hr; + + /* The current thread is about to go down so render any IDataObject that may be left in the clipboard */ + OleFlushClipboard(); + // TODO: rip down everything { fCurrentShellView->DestroyViewWindow();

1 0

[dreimer] 72324: [BOOTDATA] Update CA root scripts adding "ISRG Root X1"
by dreimer＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: dreimer Date: Thu Aug 18 12:07:59 2016 New Revision: 72324 URL: http://svn.reactos.org/svn/reactos?rev=72324&view=rev Log: [BOOTDATA] Update CA root scripts adding "ISRG Root X1" Modified: trunk/reactos/boot/bootdata/caroots.inf Modified: trunk/reactos/boot/bootdata/caroots.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/caroots.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/caroots.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/caroots.inf [iso-8859-1] Thu Aug 18 12:07:59 2016 @@ -1,13 +1,106 @@ ; Automatically-generated list of fresh Root CA certificates ; with the data coming from Mozilla's NSS library. ; -- -; Created on 2016-07-05T20:52:12Z UTC with swyter's script. +; Created on 2016-08-18T12:04:05Z UTC with swyter's script. ; Data licensed under MPL 2.0 <https://mozilla.org/MPL/2.0/> [Version] Signature = "$ReactOS$" [AddReg] +; "ISRG Root X1" (1391 bytes) +HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\CABD2A79A1076A31F21D253635CB039D4329A5E8","Blob",0x00000001,\ + 0x20,0x00,0x00,0x00,\ + 0x01,0x00,0x00,0x00,\ + 0x6F,0x05,0x00,0x00,\ + 0x30,0x82,0x05,0x6B,0x30,0x82,0x03,0x53,0xA0,0x03,0x02,0x01,0x02,0x02,0x11,0x00,\ + 0x82,0x10,0xCF,0xB0,0xD2,0x40,0xE3,0x59,0x44,0x63,0xE0,0xBB,0x63,0x82,0x8B,0x00,\ + 0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,0x05,0x00,0x30,\ + 0x4F,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x29,\ + 0x30,0x27,0x06,0x03,0x55,0x04,0x0A,0x13,0x20,0x49,0x6E,0x74,0x65,0x72,0x6E,0x65,\ + 0x74,0x20,0x53,0x65,0x63,0x75,0x72,0x69,0x74,0x79,0x20,0x52,0x65,0x73,0x65,0x61,\ + 0x72,0x63,0x68,0x20,0x47,0x72,0x6F,0x75,0x70,0x31,0x15,0x30,0x13,0x06,0x03,0x55,\ + 0x04,0x03,0x13,0x0C,0x49,0x53,0x52,0x47,0x20,0x52,0x6F,0x6F,0x74,0x20,0x58,0x31,\ + 0x30,0x1E,0x17,0x0D,0x31,0x35,0x30,0x36,0x30,0x34,0x31,0x31,0x30,0x34,0x33,0x38,\ + 0x5A,0x17,0x0D,0x33,0x35,0x30,0x36,0x30,0x34,0x31,0x31,0x30,0x34,0x33,0x38,0x5A,\ + 0x30,0x4F,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,\ + 0x29,0x30,0x27,0x06,0x03,0x55,0x04,0x0A,0x13,0x20,0x49,0x6E,0x74,0x65,0x72,0x6E,\ + 0x65,0x74,0x20,0x53,0x65,0x63,0x75,0x72,0x69,0x74,0x79,0x20,0x52,0x65,0x73,0x65,\ + 0x61,0x72,0x63,0x68,0x20,0x47,0x72,0x6F,0x75,0x70,0x31,0x15,0x30,0x13,0x06,0x03,\ + 0x55,0x04,0x03,0x13,0x0C,0x49,0x53,0x52,0x47,0x20,0x52,0x6F,0x6F,0x74,0x20,0x58,\ + 0x31,0x30,0x82,0x02,0x22,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,\ + 0x01,0x01,0x05,0x00,0x03,0x82,0x02,0x0F,0x00,0x30,0x82,0x02,0x0A,0x02,0x82,0x02,\ + 0x01,0x00,0xAD,0xE8,0x24,0x73,0xF4,0x14,0x37,0xF3,0x9B,0x9E,0x2B,0x57,0x28,0x1C,\ + 0x87,0xBE,0xDC,0xB7,0xDF,0x38,0x90,0x8C,0x6E,0x3C,0xE6,0x57,0xA0,0x78,0xF7,0x75,\ + 0xC2,0xA2,0xFE,0xF5,0x6A,0x6E,0xF6,0x00,0x4F,0x28,0xDB,0xDE,0x68,0x86,0x6C,0x44,\ + 0x93,0xB6,0xB1,0x63,0xFD,0x14,0x12,0x6B,0xBF,0x1F,0xD2,0xEA,0x31,0x9B,0x21,0x7E,\ + 0xD1,0x33,0x3C,0xBA,0x48,0xF5,0xDD,0x79,0xDF,0xB3,0xB8,0xFF,0x12,0xF1,0x21,0x9A,\ + 0x4B,0xC1,0x8A,0x86,0x71,0x69,0x4A,0x66,0x66,0x6C,0x8F,0x7E,0x3C,0x70,0xBF,0xAD,\ + 0x29,0x22,0x06,0xF3,0xE4,0xC0,0xE6,0x80,0xAE,0xE2,0x4B,0x8F,0xB7,0x99,0x7E,0x94,\ + 0x03,0x9F,0xD3,0x47,0x97,0x7C,0x99,0x48,0x23,0x53,0xE8,0x38,0xAE,0x4F,0x0A,0x6F,\ + 0x83,0x2E,0xD1,0x49,0x57,0x8C,0x80,0x74,0xB6,0xDA,0x2F,0xD0,0x38,0x8D,0x7B,0x03,\ + 0x70,0x21,0x1B,0x75,0xF2,0x30,0x3C,0xFA,0x8F,0xAE,0xDD,0xDA,0x63,0xAB,0xEB,0x16,\ + 0x4F,0xC2,0x8E,0x11,0x4B,0x7E,0xCF,0x0B,0xE8,0xFF,0xB5,0x77,0x2E,0xF4,0xB2,0x7B,\ + 0x4A,0xE0,0x4C,0x12,0x25,0x0C,0x70,0x8D,0x03,0x29,0xA0,0xE1,0x53,0x24,0xEC,0x13,\ + 0xD9,0xEE,0x19,0xBF,0x10,0xB3,0x4A,0x8C,0x3F,0x89,0xA3,0x61,0x51,0xDE,0xAC,0x87,\ + 0x07,0x94,0xF4,0x63,0x71,0xEC,0x2E,0xE2,0x6F,0x5B,0x98,0x81,0xE1,0x89,0x5C,0x34,\ + 0x79,0x6C,0x76,0xEF,0x3B,0x90,0x62,0x79,0xE6,0xDB,0xA4,0x9A,0x2F,0x26,0xC5,0xD0,\ + 0x10,0xE1,0x0E,0xDE,0xD9,0x10,0x8E,0x16,0xFB,0xB7,0xF7,0xA8,0xF7,0xC7,0xE5,0x02,\ + 0x07,0x98,0x8F,0x36,0x08,0x95,0xE7,0xE2,0x37,0x96,0x0D,0x36,0x75,0x9E,0xFB,0x0E,\ + 0x72,0xB1,0x1D,0x9B,0xBC,0x03,0xF9,0x49,0x05,0xD8,0x81,0xDD,0x05,0xB4,0x2A,0xD6,\ + 0x41,0xE9,0xAC,0x01,0x76,0x95,0x0A,0x0F,0xD8,0xDF,0xD5,0xBD,0x12,0x1F,0x35,0x2F,\ + 0x28,0x17,0x6C,0xD2,0x98,0xC1,0xA8,0x09,0x64,0x77,0x6E,0x47,0x37,0xBA,0xCE,0xAC,\ + 0x59,0x5E,0x68,0x9D,0x7F,0x72,0xD6,0x89,0xC5,0x06,0x41,0x29,0x3E,0x59,0x3E,0xDD,\ + 0x26,0xF5,0x24,0xC9,0x11,0xA7,0x5A,0xA3,0x4C,0x40,0x1F,0x46,0xA1,0x99,0xB5,0xA7,\ + 0x3A,0x51,0x6E,0x86,0x3B,0x9E,0x7D,0x72,0xA7,0x12,0x05,0x78,0x59,0xED,0x3E,0x51,\ + 0x78,0x15,0x0B,0x03,0x8F,0x8D,0xD0,0x2F,0x05,0xB2,0x3E,0x7B,0x4A,0x1C,0x4B,0x73,\ + 0x05,0x12,0xFC,0xC6,0xEA,0xE0,0x50,0x13,0x7C,0x43,0x93,0x74,0xB3,0xCA,0x74,0xE7,\ + 0x8E,0x1F,0x01,0x08,0xD0,0x30,0xD4,0x5B,0x71,0x36,0xB4,0x07,0xBA,0xC1,0x30,0x30,\ + 0x5C,0x48,0xB7,0x82,0x3B,0x98,0xA6,0x7D,0x60,0x8A,0xA2,0xA3,0x29,0x82,0xCC,0xBA,\ + 0xBD,0x83,0x04,0x1B,0xA2,0x83,0x03,0x41,0xA1,0xD6,0x05,0xF1,0x1B,0xC2,0xB6,0xF0,\ + 0xA8,0x7C,0x86,0x3B,0x46,0xA8,0x48,0x2A,0x88,0xDC,0x76,0x9A,0x76,0xBF,0x1F,0x6A,\ + 0xA5,0x3D,0x19,0x8F,0xEB,0x38,0xF3,0x64,0xDE,0xC8,0x2B,0x0D,0x0A,0x28,0xFF,0xF7,\ + 0xDB,0xE2,0x15,0x42,0xD4,0x22,0xD0,0x27,0x5D,0xE1,0x79,0xFE,0x18,0xE7,0x70,0x88,\ + 0xAD,0x4E,0xE6,0xD9,0x8B,0x3A,0xC6,0xDD,0x27,0x51,0x6E,0xFF,0xBC,0x64,0xF5,0x33,\ + 0x43,0x4F,0x02,0x03,0x01,0x00,0x01,0xA3,0x42,0x30,0x40,0x30,0x0E,0x06,0x03,0x55,\ + 0x1D,0x0F,0x01,0x01,0xFF,0x04,0x04,0x03,0x02,0x01,0x06,0x30,0x0F,0x06,0x03,0x55,\ + 0x1D,0x13,0x01,0x01,0xFF,0x04,0x05,0x30,0x03,0x01,0x01,0xFF,0x30,0x1D,0x06,0x03,\ + 0x55,0x1D,0x0E,0x04,0x16,0x04,0x14,0x79,0xB4,0x59,0xE6,0x7B,0xB6,0xE5,0xE4,0x01,\ + 0x73,0x80,0x08,0x88,0xC8,0x1A,0x58,0xF6,0xE9,0x9B,0x6E,0x30,0x0D,0x06,0x09,0x2A,\ + 0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,0x05,0x00,0x03,0x82,0x02,0x01,0x00,0x55,\ + 0x1F,0x58,0xA9,0xBC,0xB2,0xA8,0x50,0xD0,0x0C,0xB1,0xD8,0x1A,0x69,0x20,0x27,0x29,\ + 0x08,0xAC,0x61,0x75,0x5C,0x8A,0x6E,0xF8,0x82,0xE5,0x69,0x2F,0xD5,0xF6,0x56,0x4B,\ + 0xB9,0xB8,0x73,0x10,0x59,0xD3,0x21,0x97,0x7E,0xE7,0x4C,0x71,0xFB,0xB2,0xD2,0x60,\ + 0xAD,0x39,0xA8,0x0B,0xEA,0x17,0x21,0x56,0x85,0xF1,0x50,0x0E,0x59,0xEB,0xCE,0xE0,\ + 0x59,0xE9,0xBA,0xC9,0x15,0xEF,0x86,0x9D,0x8F,0x84,0x80,0xF6,0xE4,0xE9,0x91,0x90,\ + 0xDC,0x17,0x9B,0x62,0x1B,0x45,0xF0,0x66,0x95,0xD2,0x7C,0x6F,0xC2,0xEA,0x3B,0xEF,\ + 0x1F,0xCF,0xCB,0xD6,0xAE,0x27,0xF1,0xA9,0xB0,0xC8,0xAE,0xFD,0x7D,0x7E,0x9A,0xFA,\ + 0x22,0x04,0xEB,0xFF,0xD9,0x7F,0xEA,0x91,0x2B,0x22,0xB1,0x17,0x0E,0x8F,0xF2,0x8A,\ + 0x34,0x5B,0x58,0xD8,0xFC,0x01,0xC9,0x54,0xB9,0xB8,0x26,0xCC,0x8A,0x88,0x33,0x89,\ + 0x4C,0x2D,0x84,0x3C,0x82,0xDF,0xEE,0x96,0x57,0x05,0xBA,0x2C,0xBB,0xF7,0xC4,0xB7,\ + 0xC7,0x4E,0x3B,0x82,0xBE,0x31,0xC8,0x22,0x73,0x73,0x92,0xD1,0xC2,0x80,0xA4,0x39,\ + 0x39,0x10,0x33,0x23,0x82,0x4C,0x3C,0x9F,0x86,0xB2,0x55,0x98,0x1D,0xBE,0x29,0x86,\ + 0x8C,0x22,0x9B,0x9E,0xE2,0x6B,0x3B,0x57,0x3A,0x82,0x70,0x4D,0xDC,0x09,0xC7,0x89,\ + 0xCB,0x0A,0x07,0x4D,0x6C,0xE8,0x5D,0x8E,0xC9,0xEF,0xCE,0xAB,0xC7,0xBB,0xB5,0x2B,\ + 0x4E,0x45,0xD6,0x4A,0xD0,0x26,0xCC,0xE5,0x72,0xCA,0x08,0x6A,0xA5,0x95,0xE3,0x15,\ + 0xA1,0xF7,0xA4,0xED,0xC9,0x2C,0x5F,0xA5,0xFB,0xFF,0xAC,0x28,0x02,0x2E,0xBE,0xD7,\ + 0x7B,0xBB,0xE3,0x71,0x7B,0x90,0x16,0xD3,0x07,0x5E,0x46,0x53,0x7C,0x37,0x07,0x42,\ + 0x8C,0xD3,0xC4,0x96,0x9C,0xD5,0x99,0xB5,0x2A,0xE0,0x95,0x1A,0x80,0x48,0xAE,0x4C,\ + 0x39,0x07,0xCE,0xCC,0x47,0xA4,0x52,0x95,0x2B,0xBA,0xB8,0xFB,0xAD,0xD2,0x33,0x53,\ + 0x7D,0xE5,0x1D,0x4D,0x6D,0xD5,0xA1,0xB1,0xC7,0x42,0x6F,0xE6,0x40,0x27,0x35,0x5C,\ + 0xA3,0x28,0xB7,0x07,0x8D,0xE7,0x8D,0x33,0x90,0xE7,0x23,0x9F,0xFB,0x50,0x9C,0x79,\ + 0x6C,0x46,0xD5,0xB4,0x15,0xB3,0x96,0x6E,0x7E,0x9B,0x0C,0x96,0x3A,0xB8,0x52,0x2D,\ + 0x3F,0xD6,0x5B,0xE1,0xFB,0x08,0xC2,0x84,0xFE,0x24,0xA8,0xA3,0x89,0xDA,0xAC,0x6A,\ + 0xE1,0x18,0x2A,0xB1,0xA8,0x43,0x61,0x5B,0xD3,0x1F,0xDC,0x3B,0x8D,0x76,0xF2,0x2D,\ + 0xE8,0x8D,0x75,0xDF,0x17,0x33,0x6C,0x3D,0x53,0xFB,0x7B,0xCB,0x41,0x5F,0xFF,0xDC,\ + 0xA2,0xD0,0x61,0x38,0xE1,0x96,0xB8,0xAC,0x5D,0x8B,0x37,0xD7,0x75,0xD5,0x33,0xC0,\ + 0x99,0x11,0xAE,0x9D,0x41,0xC1,0x72,0x75,0x84,0xBE,0x02,0x41,0x42,0x5F,0x67,0x24,\ + 0x48,0x94,0xD1,0x9B,0x27,0xBE,0x07,0x3F,0xB9,0xB8,0x4F,0x81,0x74,0x51,0xE1,0x7A,\ + 0xB7,0xED,0x9D,0x23,0xE2,0xBE,0xE0,0xD5,0x28,0x04,0x13,0x3C,0x31,0x03,0x9E,0xDD,\ + 0x7A,0x6C,0x8F,0xC6,0x07,0x18,0xC6,0x7F,0xDE,0x47,0x8E,0x3F,0x28,0x9E,0x04,0x06,\ + 0xCF,0xA5,0x54,0x34,0x77,0xBD,0xEC,0x89,0x9B,0xE9,0x17,0x43,0xDF,0x5B,0xDB,0x5F,\ + 0xFE,0x8E,0x1E,0x57,0xA2,0xCD,0x40,0x9D,0x7E,0x62,0x22,0xDA,0xDE,0x18,0x27 + ; "OpenTrust Root CA G3" (549 bytes) HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\6E2664F356BF3455BFD1933F7C01DED813DA8AA6","Blob",0x00000001,\ 0x20,0x00,0x00,0x00,\

1 0

[dreimer] 72323: [FONTS] Update DejaVu to v2.37
by dreimer＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: dreimer Date: Thu Aug 18 12:03:31 2016 New Revision: 72323 URL: http://svn.reactos.org/svn/reactos?rev=72323&view=rev Log: [FONTS] Update DejaVu to v2.37 Added: trunk/reactos/media/fonts/DejaVuMathTeXGyre.ttf (with props) Modified: trunk/reactos/media/doc/3rd Party Files.txt trunk/reactos/media/fonts/CMakeLists.txt trunk/reactos/media/fonts/DejaVuSans-Bold.ttf trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf trunk/reactos/media/fonts/DejaVuSans.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf trunk/reactos/media/fonts/DejaVuSansCondensed.ttf trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf trunk/reactos/media/fonts/DejaVuSansMono.ttf trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf trunk/reactos/media/fonts/DejaVuSerif-BoldItalic.ttf trunk/reactos/media/fonts/DejaVuSerif-Italic.ttf trunk/reactos/media/fonts/DejaVuSerif.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldItalic.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-Italic.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Thu Aug 18 12:03:31 2016 @@ -7,7 +7,7 @@ Website: https://fedorahosted.org/liberation-fonts/ Title: DejaVu Fonts -Used Version: 2.35 +Used Version: 2.37 Website: http://dejavu.sourceforge.net Title: Ubuntu Fonts Modified: trunk/reactos/media/fonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/CMakeLists.txt… ============================================================================== --- trunk/reactos/media/fonts/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/fonts/CMakeLists.txt [iso-8859-1] Thu Aug 18 12:03:31 2016 @@ -1,5 +1,6 @@ list(APPEND FONT_FILES + DejaVuMathTeXGyre.ttf DejaVuSans-Bold.ttf DejaVuSans-BoldOblique.ttf DejaVuSans-ExtraLight.ttf Added: trunk/reactos/media/fonts/DejaVuMathTeXGyre.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuMathTeXG… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/DejaVuMathTeXGyre.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/fonts/DejaVuSans-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Ext… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Obl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans.ttf… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-It… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif.tt… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… ============================================================================== Binary files - no diff available.

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