Ros-diffs August 2012

ros-diffs@reactos.org

14 participants
198 discussions

[tkreuzer] 57078: [WIN32K/GDI32] - Many changes and bugfixes to the new DIB code It's in a usable state now, also working with the new diblib. Still lots of bugs and failures need to be fixed.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Aug 14 22:27:00 2012 New Revision: 57078 URL: http://svn.reactos.org/svn/reactos?rev=57078&view=rev Log: [WIN32K/GDI32] - Many changes and bugfixes to the new DIB code It's in a usable state now, also working with the new diblib. Still lots of bugs and failures need to be fixed. Added: branches/dib_rewrite/win32ss/gdi/gdi32/objects/dibitmap.c (with props) Modified: branches/dib_rewrite/win32ss/CMakeLists.txt branches/dib_rewrite/win32ss/gdi/eng/bitblt_new.c branches/dib_rewrite/win32ss/gdi/gdi32/objects/bitmap.c branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.h branches/dib_rewrite/win32ss/gdi/ntgdi/dibobj.c branches/dib_rewrite/win32ss/user/ntuser/clipboard.c Modified: branches/dib_rewrite/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/CMakeLists.… ============================================================================== --- branches/dib_rewrite/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/CMakeLists.txt [iso-8859-1] Tue Aug 14 22:27:00 2012 @@ -1,5 +1,5 @@ -set(USE_DIBLIB FALSE) +set(USE_DIBLIB TRUE) # Give WIN32 subsystem its own project. PROJECT(WIN32SS) @@ -150,6 +150,7 @@ gdi/ntgdi/dcstate.c gdi/ntgdi/dcutil.c gdi/ntgdi/device.c + gdi/ntgdi/dibobj.c gdi/ntgdi/dibitmap.c gdi/ntgdi/drawing.c gdi/ntgdi/fillshap.c Modified: branches/dib_rewrite/win32ss/gdi/eng/bitblt_new.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/bit… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/eng/bitblt_new.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/eng/bitblt_new.c [iso-8859-1] Tue Aug 14 22:27:00 2012 @@ -5,12 +5,14 @@ #define SURFOBJ_flags(pso) (CONTAINING_RECORD(pso, SURFACE, SurfObj)->flags) +#if 0 // FIXME this needs to be updated, once we use the new structure XCLIPOBJ gxcoTrivial = { {0, {LONG_MIN, LONG_MIN, LONG_MAX, LONG_MAX}, DC_TRIVIAL, FC_RECT, TC_RECTANGLES, 0}, 0, 0, 0 }; +#endif static Modified: branches/dib_rewrite/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/gdi32/o… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Tue Aug 14 22:27:00 2012 @@ -382,125 +382,6 @@ } -INT -WINAPI -GetDIBits( - HDC hDC, - HBITMAP hbmp, - UINT uStartScan, - UINT cScanLines, - LPVOID lpvBits, - LPBITMAPINFO lpbmi, - UINT uUsage) -{ - UINT cjBmpScanSize; - UINT cjInfoSize; - - if (!hDC || !GdiIsHandleValid((HGDIOBJ)hDC) || !lpbmi) - { - GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - cjBmpScanSize = DIB_BitmapMaxBitsSize(lpbmi, cScanLines); - cjInfoSize = DIB_BitmapInfoSize(lpbmi, uUsage); - - if ( lpvBits ) - { - if ( lpbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) - { - if ( lpbmi->bmiHeader.biCompression == BI_JPEG || - lpbmi->bmiHeader.biCompression == BI_PNG ) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - } - } - - return NtGdiGetDIBitsInternal(hDC, - hbmp, - uStartScan, - cScanLines, - lpvBits, - lpbmi, - uUsage, - cjBmpScanSize, - cjInfoSize); -} - -/* - * @implemented - */ -HBITMAP -WINAPI -CreateDIBitmap( HDC hDC, - const BITMAPINFOHEADER *Header, - DWORD Init, - LPCVOID Bits, - const BITMAPINFO *Data, - UINT ColorUse) -{ - LONG width, height, compr, dibsize; - WORD planes, bpp; -// PDC_ATTR pDc_Attr; - UINT InfoSize = 0; - UINT cjBmpScanSize = 0; - HBITMAP hBmp; - NTSTATUS Status = STATUS_SUCCESS; - - if (!Header) return 0; - - if (DIB_GetBitmapInfo(Header, &width, &height, &planes, &bpp, &compr, &dibsize) == -1) - { - GdiSetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - -// For Icm support. -// GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) - - if(Data) - { - _SEH2_TRY - { - cjBmpScanSize = GdiGetBitmapBitsSize((BITMAPINFO *)Data); - CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize); - InfoSize += Data->bmiHeader.biSize; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - } - - if(!NT_SUCCESS(Status)) - { - GdiSetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", Data,bpp,dibsize,InfoSize,cjBmpScanSize); - - if ( !width || !height ) - hBmp = GetStockObject(DEFAULT_BITMAP); - else - { - hBmp = NtGdiCreateDIBitmapInternal(hDC, - width, - height, - Init, - (LPBYTE)Bits, - (LPBITMAPINFO)Data, - ColorUse, - InfoSize, - cjBmpScanSize, - 0, - 0); - } - return hBmp; -} /* * @implemented @@ -608,9 +489,9 @@ DWORD Height, int XSrc, int YSrc, - UINT StartScan, - UINT ScanLines, - CONST VOID *Bits, + UINT uStartScan, + UINT cScanLines, + CONST VOID *pvBits, CONST BITMAPINFO *lpbmi, UINT ColorUse) { @@ -620,9 +501,9 @@ INT LinesCopied = 0; UINT cjBmpScanSize = 0; BOOL Hit = FALSE; - PVOID pvSafeBits = (PVOID)Bits; - - if ( !ScanLines || !lpbmi || !Bits ) + PVOID pvAlignedBits = (PVOID)pvBits; + + if ( !cScanLines || !lpbmi || !pvBits ) return 0; if ( ColorUse && ColorUse != DIB_PAL_COLORS && ColorUse != DIB_PAL_COLORS+1 ) @@ -645,9 +526,9 @@ Height, XSrc, YSrc, - StartScan, - ScanLines, - Bits, + uStartScan, + cScanLines, + pvBits, lpbmi, ColorUse); else @@ -667,9 +548,9 @@ Height, XSrc, YSrc, - StartScan, - ScanLines, - Bits, + uStartScan, + cScanLines, + pvBits, lpbmi, ColorUse); } @@ -677,35 +558,38 @@ } } #endif - cjBmpScanSize = DIB_BitmapMaxBitsSize((LPBITMAPINFO)lpbmi, ScanLines); - - pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); - if (pvSafeBits) - { - _SEH2_TRY - { - RtlCopyMemory( pvSafeBits, Bits, cjBmpScanSize); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Hit = TRUE; - } - _SEH2_END - - if (Hit) - { - // We don't die, we continue on with a allocated safe pointer to kernel - // space..... - DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %x or Bits: %x & Size: %d\n",pConvertedInfo,Bits,cjBmpScanSize); - } - DPRINT("SetDIBitsToDevice Allocate Bits %d!!!\n", cjBmpScanSize); - } + cjBmpScanSize = DIB_BitmapMaxBitsSize((LPBITMAPINFO)lpbmi, cScanLines); + + /* Check if the bits buffer is not DWORD aligned */ + if ((ULONG_PTR)pvBits & (sizeof(DWORD) - 1)) + { + /* The given buffer is unaligned, allocate an aligned buffer */ + pvAlignedBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); + if (!pvAlignedBits) + { + DPRINT1("Failed to allocate aligned buffer.\n"); + goto cleanup; + } + + /* Use SEH to copy the bitmap data */ + _SEH2_TRY + { + RtlCopyMemory(pvAlignedBits, pvBits, cjBmpScanSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Failed to copy the bitmap to the aligned buffer.\n"); + _SEH2_YIELD(goto cleanup;) + } + _SEH2_END + } if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) { SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } + goto cleanup; + } + /* if ( !pDc_Attr || // DC is Public ColorUse == DIB_PAL_COLORS || @@ -713,16 +597,16 @@ (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/ { - LinesCopied = NtGdiSetDIBitsToDeviceInternal( hdc, + LinesCopied = NtGdiSetDIBitsToDeviceInternal(hdc, XDest, YDest, Width, Height, XSrc, YSrc, - StartScan, - ScanLines, - (LPBYTE)pvSafeBits, + uStartScan, + cScanLines, + pvAlignedBits, (LPBITMAPINFO)pConvertedInfo, ColorUse, cjBmpScanSize, @@ -730,9 +614,12 @@ TRUE, NULL); } - if ( Bits != pvSafeBits) - RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); - if (lpbmi != pConvertedInfo) + +cleanup: + /* Cleanup */ + if (pvAlignedBits != pvBits) + RtlFreeHeap(RtlGetProcessHeap(), 0, pvAlignedBits); + if (pConvertedInfo != lpbmi) RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); return LinesCopied; @@ -885,3 +772,4 @@ return LinesCopied; } +#include "dibitmap.c" Added: branches/dib_rewrite/win32ss/gdi/gdi32/objects/dibitmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/gdi32/o… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/gdi32/objects/dibitmap.c (added) +++ branches/dib_rewrite/win32ss/gdi/gdi32/objects/dibitmap.c [iso-8859-1] Tue Aug 14 22:27:00 2012 @@ -1,0 +1,349 @@ + + +#define WIDTH_BYTES_ALIGN32(cx, bpp) ((((cx) * (bpp) + 31) & ~31) >> 3) + +ULONG +NTAPI +DibGetBitmapInfoSize( + _In_ const BITMAPINFO *pbmi, + _In_ ULONG iUsage) +{ + ULONG cjHeaderSize, cBitsPixel, cColors, cMaxColors; + + cjHeaderSize = pbmi->bmiHeader.biSize; + + if ((cjHeaderSize < sizeof(BITMAPCOREHEADER)) || + ((LONG)cjHeaderSize < 0)) + { + return 0; + } + + /* Check for BITMAPCOREINFO */ + if (cjHeaderSize < sizeof(BITMAPINFOHEADER)) + { + PBITMAPCOREHEADER pbch = (PBITMAPCOREHEADER)pbmi; + + cBitsPixel = pbch->bcBitCount; + cColors = (cBitsPixel <= 8) ? (1 << cBitsPixel) : 0; + return sizeof(BITMAPCOREHEADER) + cColors * + ((iUsage == DIB_RGB_COLORS) ? sizeof(RGBTRIPLE) : sizeof(WORD)); + } + else /* Use BITMAPINFOHEADER */ + { + /* Check if the DIB uses bitfields */ + if (pbmi->bmiHeader.biCompression == BI_BITFIELDS) + { + /* Check for V4/v5 info */ + if (cjHeaderSize >= sizeof(BITMAPV4HEADER)) + { + /* There are no colors or masks */ + return cjHeaderSize; + } + else + { + /* The color table is 3 masks */ + return cjHeaderSize + 3 * sizeof(RGBQUAD); + } + } + + cBitsPixel = pbmi->bmiHeader.biBitCount; + if (cBitsPixel > 8) + return cjHeaderSize; + + cMaxColors = (1 << cBitsPixel); + cColors = pbmi->bmiHeader.biClrUsed; + if ((cColors == 0) || (cColors > cMaxColors)) cColors = cMaxColors; + + if (iUsage == DIB_RGB_COLORS) + return cjHeaderSize + cColors * sizeof(RGBQUAD); + else + return cjHeaderSize + cColors * sizeof(WORD); + } +} + + +static +PBITMAPINFO +ConvertBitmapCoreInfo( + _In_ const BITMAPINFO *pbmiCore, + _In_ UINT iUsage) +{ + const BITMAPCOREINFO *pbci = (const BITMAPCOREINFO *)pbmiCore; + BITMAPINFO *pbmi; + ULONG i, cColors, cjColorTable; + + /* Get the number of colors in bmciColors */ + if (pbci->bmciHeader.bcBitCount == 1) cColors = 2; + else if (pbci->bmciHeader.bcBitCount == 4) cColors = 16; + else if (pbci->bmciHeader.bcBitCount == 8) cColors = 256; + else cColors = 0; + + /* Calculate the size of the output color table */ + if (iUsage == DIB_RGB_COLORS) + cjColorTable = + cColors * sizeof(RGBTRIPLE); + else + cjColorTable = cColors * sizeof(WORD); + + /* Allocate the BITMAPINFO */ + pbmi = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFOHEADER) + cjColorTable); + if (!pbmi) return NULL; + + /* Fill the BITMAPINFOHEADER */ + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biWidth = pbci->bmciHeader.bcWidth; + pbmi->bmiHeader.biHeight = pbci->bmciHeader.bcHeight; + pbmi->bmiHeader.biPlanes = pbci->bmciHeader.bcPlanes; + pbmi->bmiHeader.biBitCount = pbci->bmciHeader.bcBitCount; + pbmi->bmiHeader.biCompression = BI_RGB; + pbmi->bmiHeader.biSizeImage = 0; + pbmi->bmiHeader.biXPelsPerMeter = 0; + pbmi->bmiHeader.biYPelsPerMeter = 0; + pbmi->bmiHeader.biClrUsed = cColors; + pbmi->bmiHeader.biClrImportant = cColors; + + /* Check what type of color table we have */ + if (iUsage == DIB_RGB_COLORS) + { + /* The colors are an array of RGBTRIPLE / RGBQUAD */ + RGBTRIPLE *prgbIn = (RGBTRIPLE*)pbci->bmciColors; + RGBQUAD *prgbOut = (RGBQUAD*)pbmi->bmiColors; + + for (i = 0; i < cColors; i++) + { + prgbOut[i].rgbRed = prgbIn[i].rgbtRed; + prgbOut[i].rgbGreen = prgbIn[i].rgbtGreen; + prgbOut[i].rgbBlue = prgbIn[i].rgbtBlue; + prgbOut[i].rgbReserved = 0; + } + } + else + { + /* The colors are an array of WORD indices */ + PWORD pwColorsIn = (PWORD)pbci->bmciColors; + PWORD pwColorsOut = (PWORD)pbmi->bmiColors; + + for (i = 0; i < cColors; i++) + pwColorsOut[i] = pwColorsIn[i]; + + } + + return pbmi; +} + +VOID +WINAPI +ConvertBackToCoreInfo( + _In_ BITMAPCOREINFO *pbci, + _In_ const BITMAPINFO *pbmi, + _In_ UINT iUsage) +{ + ULONG i, cColors; + + pbci->bmciHeader.bcWidth = (WORD)pbmi->bmiHeader.biWidth; + pbci->bmciHeader.bcHeight = (WORD)pbmi->bmiHeader.biHeight; + pbci->bmciHeader.bcPlanes = (WORD)pbmi->bmiHeader.biPlanes; + pbci->bmciHeader.bcBitCount = (WORD)pbmi->bmiHeader.biBitCount; + if (pbci->bmciHeader.bcBitCount > 16) pbci->bmciHeader.bcBitCount = 24; + + /* Get the number of colors in bmciColors */ + if (pbci->bmciHeader.bcBitCount == 1) cColors = 2; + else if (pbci->bmciHeader.bcBitCount == 4) cColors = 16; + else if (pbci->bmciHeader.bcBitCount == 8) cColors = 256; + else cColors = 0; + + /* Check what type of color table we have */ + if (iUsage == DIB_RGB_COLORS) + { + /* The colors are an array of RGBTRIPLE / RGBQUAD */ + RGBTRIPLE *prgbOut = (RGBTRIPLE*)pbci->bmciColors; + RGBQUAD *prgbIn = (RGBQUAD*)pbmi->bmiColors; + + for (i = 0; i < cColors; i++) + { + prgbOut[i].rgbtRed = prgbIn[i].rgbRed; + prgbOut[i].rgbtGreen = prgbIn[i].rgbGreen; + prgbOut[i].rgbtBlue = prgbIn[i].rgbBlue; + } + } + else + { + /* The colors are an array of WORD indices */ + PWORD pwColorsOut = (PWORD)pbci->bmciColors; + PWORD pwColorsIn = (PWORD)pbmi->bmiColors; + + for (i = 0; i < cColors; i++) + pwColorsOut[i] = pwColorsIn[i]; + + } + +} + +HBITMAP +WINAPI +CreateDIBitmap( + _In_ HDC hdc, + _In_ const BITMAPINFOHEADER *pbmih, + _In_ DWORD fdwInit, + _In_ const VOID *pbInit, + _In_ const BITMAPINFO *pbmi, + _In_ UINT iUsage) +{ + LONG cx, cy; + BOOL bConvertedInfo = FALSE; + HBITMAP hbmp = NULL; + ULONG cjInfo, cjImageSize; + + if (pbmi) + { + if (pbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + pbmi = ConvertBitmapCoreInfo(pbmi, iUsage); + bConvertedInfo = TRUE; + } + + /* Get the size of the BITMAPINFO */ + cjInfo = DibGetBitmapInfoSize(pbmi, iUsage); + + /* Check if we have bits */ + if (pbInit) + { + /* Get the size of the image */ + cjImageSize = pbmi->bmiHeader.biSizeImage; + + /* Check if we need to calculate the size */ + if ((cjImageSize == 0) && + ((pbmi->bmiHeader.biCompression == BI_RGB) || + (pbmi->bmiHeader.biCompression == BI_BITFIELDS))) + { + /* Calculate the image size */ + cjImageSize = abs(pbmi->bmiHeader.biHeight) * + WIDTH_BYTES_ALIGN32(pbmi->bmiHeader.biWidth, + pbmi->bmiHeader.biBitCount); + } + } + } + else + { + cjInfo = 0; + } + + if (fdwInit & CBM_CREATDIB) + { + if (!pbmi) return NULL; + + //__debugbreak(); + return 0; + } + else + { + if (!pbmih) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + + if (pbmih->biSize == sizeof(BITMAPCOREHEADER)) + { + PBITMAPCOREHEADER pbch = (PBITMAPCOREHEADER)pbmih; + cx = pbch->bcWidth; + cy = abs(pbch->bcHeight); + } + else if (pbmih->biSize >= sizeof(BITMAPINFOHEADER)) + { + cx = pbmih->biWidth; + cy = abs(pbmih->biHeight); + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + + if ((cx == 0) || (cy == 0)) + { + return GetStockObject(DEFAULT_BITMAP); + } + } + + + hbmp = NtGdiCreateDIBitmapInternal(hdc, + cx, + cy, + fdwInit, + (PVOID)pbInit, + (PVOID)pbmi, + iUsage, + cjInfo, + cjImageSize, + 0, + 0); + +cleanup: + if (bConvertedInfo && pbmi) HeapFree(GetProcessHeap(), 0, (PVOID)pbmi); + + return hbmp; +} + +INT +WINAPI +GetDIBits( + HDC hdc, + HBITMAP hbmp, + UINT uStartScan, + UINT cScanLines, + LPVOID pvBits, + LPBITMAPINFO pbmi, + UINT iUsage) +{ + UINT cjBmpScanSize; + UINT cjInfoSize; + INT iResult; + BITMAPCOREINFO *pbci = NULL; + + if (!hdc || !GdiIsHandleValid((HGDIOBJ)hdc) || !pbmi) + { + GdiSetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (pbmi && (pbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER))) + { + pbci = (BITMAPCOREINFO *)pbmi; + pbmi = ConvertBitmapCoreInfo(pbmi, iUsage); + if (!pbmi) + return 0; + } + + cjBmpScanSize = DIB_BitmapMaxBitsSize(pbmi, cScanLines); + cjInfoSize = DIB_BitmapInfoSize(pbmi, iUsage); + + if (pvBits ) + { + /* Check for compressed formats */ + if ((pbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && + (pbmi->bmiHeader.biCompression >= BI_JPEG)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + } + + iResult = NtGdiGetDIBitsInternal(hdc, + hbmp, + uStartScan, + cScanLines, + pvBits, + pbmi, + iUsage, + cjBmpScanSize, + cjInfoSize); + + if (pbci) + { + ConvertBackToCoreInfo(pbci, pbmi, iUsage); + HeapFree(GetProcessHeap(), 0, (PVOID)pbmi); + } + + return iResult; +} + Propchange: branches/dib_rewrite/win32ss/gdi/gdi32/objects/dibitmap.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/b… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Tue Aug 14 22:27:00 2012 @@ -446,7 +446,7 @@ _SEH2_END; /* Calculate the size of the bitmap info */ - cjInfoSize = GreGetBitmapInfoSize(pvSaveDIB, iUsage); + cjInfoSize = DibGetBitmapInfoSize(pvSaveDIB, iUsage); /* Check sanity of the sizes */ if ((cjInfoSize < sizeof(BITMAPCOREHEADER)) || // info? Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] Tue Aug 14 22:27:00 2012 @@ -26,6 +26,7 @@ pbmf->sizel.cy = pbch->bcHeight; pbmf->cBitsPixel = pbch->bcBitCount * pbch->bcPlanes; pbmf->iCompression = BI_RGB; + pbmf->cjImageSize = 0; } else { @@ -33,6 +34,7 @@ pbmf->sizel.cy = pbmi->bmiHeader.biHeight; pbmf->cBitsPixel = pbmi->bmiHeader.biBitCount * pbmi->bmiHeader.biPlanes; pbmf->iCompression = pbmi->bmiHeader.biCompression; + pbmf->cjImageSize = pbmi->bmiHeader.biSizeImage; } /* Get the bitmap format */ @@ -43,6 +45,18 @@ { DPRINT1("Invalid format\n"); return FALSE; + } + + /* Check if this is an uncompressed format */ + if (pbmf->iFormat <= BMF_32BPP) + { + /* Calculate the image size */ + pbmf->cjWidthBytes = WIDTH_BYTES_ALIGN32(pbmf->sizel.cx, pbmf->cBitsPixel); + pbmf->cjImageSize = abs(pbmf->sizel.cy) * pbmf->cjWidthBytes; + } + else + { + pbmf->cjWidthBytes = 0; } /* Check compressed format and top-down */ @@ -155,7 +169,7 @@ /* Normalize the size to the maximum possible */ cjInfo = min(cjInfo, sizeof(BITMAPV5HEADER) + 256 * sizeof(RGBQUAD)); - /* Check if the size is at least big enough for a core info */ + /* Check if the size is at least big enough for a core header */ if (cjInfo < sizeof(BITMAPCOREHEADER)) { return NULL; @@ -181,8 +195,9 @@ } _SEH2_END; - /* Check if we have at least as much as the actual header size */ - if (cjInfo >= pbmi->bmiHeader.biSize) + /* Check if the header size is in the valid range */ + if ((pbmi->bmiHeader.biSize >= sizeof(BITMAPCOREHEADER)) && + (pbmi->bmiHeader.biSize <= cjInfo)) { /* Calculate the real size of the bitmap info */ cjInfo = DibGetBitmapInfoSize(pbmi, iUsage); @@ -414,6 +429,17 @@ return NULL; } + /* Check if we have bitmap bits */ + if (pvBits) + { + /* Check if the image size is too large */ + if (bitmapformat.cjImageSize > cjMaxBits) + { + __debugbreak(); + return NULL; + } + } + /* Handle top-down bitmaps */ if (bitmapformat.sizel.cy < 0) fjBitmap |= BMF_TOPDOWN; @@ -439,9 +465,8 @@ return NULL; } - /* Dereference the old palette and set the new */ - PALETTE_ShareUnlockPalette(psurf->ppal); - psurf->ppal = ppal; + /* Set new palette for the surface */ + SURFACE_vSetPalette(psurf, ppal); /* Return the surface */ return psurf; @@ -454,7 +479,7 @@ APIENTRY NtGdiCreateDIBSection( _In_ HDC hdc, - _In_ OPTIONAL HANDLE hSectionApp, + _In_opt_ HANDLE hSectionApp, _In_ DWORD dwOffset, _In_ LPBITMAPINFO pbmiUser, _In_ DWORD iUsage, @@ -571,10 +596,10 @@ _In_ HANDLE hcmXform) { PDC pdc; - PSURFACE psurfDIB, psurfDC, psurfBmp; + PSURFACE psurfDIB = NULL, psurfDC, psurfBmp; ULONG iFormat; - PPALETTE ppalBmp; - HBITMAP hbmp; + PPALETTE ppalBmp = NULL; + HBITMAP hbmp = NULL; /* Check if we got a DC */ if (hdc) @@ -592,22 +617,28 @@ { /* No DC */ pdc = NULL; + psurfDC = NULL; } if (pjInit) { + if (!pbmi) goto cleanup; + + /* Create a surface from the DIB */ psurfDIB = DibCreateDIBSurface(pbmi, pdc, iUsage, 0, pjInit, cjMaxBits); - } - + + if (!psurfDIB) goto cleanup; + } if (fInit & CBM_CREATDIB) { if (iUsage == 2) goto cleanup; + if (!psurfDIB) goto cleanup; /* Need a DC for DIB_PAL_COLORS */ if ((iUsage == DIB_PAL_COLORS) && !pdc) goto cleanup; @@ -634,7 +665,9 @@ } else { - __debugbreak(); + // FIXME: use default PDEV surface? + iFormat = BMF_32BPP; + ppalBmp = &gpalRGB; } GDIOBJ_vReferenceObjectByPointer(&ppalBmp->BaseObject); @@ -646,6 +679,7 @@ { /* Set new palette for the bitmap */ SURFACE_vSetPalette(psurfBmp, ppalBmp); + ppalBmp = NULL; if (pjInit) { @@ -678,10 +712,11 @@ cleanup: - + if (psurfDIB) GDIOBJ_vDeleteObject(&psurfDIB->BaseObject); if (ppalBmp) PALETTE_ShareUnlockPalette(ppalBmp); - - return 0; + if (pdc) DC_UnlockDc(pdc); + + return hbmp; } HBITMAP @@ -705,6 +740,12 @@ //__debugbreak(); + if (iUsage >= 2) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + if (fInit & CBM_INIT) { if (pjInit) @@ -712,6 +753,10 @@ hSecure = EngSecureMem(pjInit, cjMaxBits); if (!hSecure) return NULL; + } + else + { + fInit &= ~CBM_INIT; } } else @@ -1216,6 +1261,7 @@ NULL, pdc->rosdc.CombinedClip, &exlo.xlo, + &pdc->dclevel.ca, &rcDst, &rcSrc, NULL, @@ -1232,6 +1278,14 @@ return bResult ? cySrc : 0; } +/*! + * \brief + * \param [in] iStartScan - Specifies the number of the starting scanline for + * the part of the dib that is contained in the buffer that pjBits points + * to. A value of 0 refers to the pixel row in the dib with the highest + * y coordinate. + * + */ INT APIENTRY NtGdiSetDIBitsToDeviceInternal( @@ -1244,7 +1298,7 @@ _In_ INT ySrc, _In_ DWORD iStartScan, _In_ DWORD cNumScan, - _In_ LPBYTE pjInitBits, + _In_ LPBYTE pjBits, _In_ LPBITMAPINFO pbmiUser, _In_ DWORD iUsage, _In_ UINT cjMaxBits, @@ -1254,7 +1308,20 @@ { PBITMAPINFO pbmi; HANDLE hSecure; - INT iResult = 0; + ULONG cyDIB; + INT yTop, iResult; +__debugbreak(); + /* Check if parameters are valid */ + if ((cNumScan == 0) || (cx >= INT_MAX) || (cy >= INT_MAX)) + { + return 0; + } + + /* Check if the bitmap buffer is not NULL and DWORD aligned */ + if (!pjBits || ((ULONG_PTR)pjBits & (sizeof(DWORD) - 1))) + { + return 0; + } /* Capture a safe copy of the bitmap info */ pbmi = DibProbeAndCaptureBitmapInfo(pbmiUser, iUsage, &cjMaxInfo); @@ -1265,32 +1332,79 @@ } /* Secure the user mode buffer for the bits */ - hSecure = EngSecureMemForRead(pjInitBits, cjMaxBits); - if (hSecure) - { - /* Call the internal function with the secure pointers */ - iResult = GreStretchDIBitsInternal(hdcDest, - xDst, - yDst, - cx, - cy, - xSrc, - ySrc, - cx, - cy, - pjInitBits, - pbmi, - iUsage, - MAKEROP4(SRCCOPY, SRCCOPY), - cjMaxInfo, - cjMaxBits, - bTransformCoordinates, - hcmXform); - - /* Unsecure the memory */ - EngUnsecureMem(hSecure); - } - + hSecure = EngSecureMemForRead(pjBits, cjMaxBits); + if (!hSecure) + { + iResult = 0; + goto leave; + } + + /* Even when nothing is copied, the function returns the scanlines */ + iResult = cNumScan; + + /* Get the absolute height of the DIB */ + cyDIB = abs(pbmi->bmiHeader.biHeight); + + /* Bail out if the scanlines are outside of the DIB */ + if (iStartScan >= cyDIB) goto leave; + + /* Limit the number of scanlines to the DIB size */ + cNumScan = min(cNumScan, cyDIB - iStartScan); + + /* Calculate the y-origin of the given DIB data */ + yTop = cyDIB - (iStartScan + cNumScan); + + /* Bail out if the intersecion between scanlines and copy area is empty */ + if ((ySrc > yTop + cNumScan) || (ySrc + (INT)cy < yTop)) goto leave; + + /* Check if the copy area starts below or at the topmost scanline */ + if (ySrc >= yTop) + { + /* Compensate the source y-origin for the scanline offset */ + ySrc -= yTop; + } + else + { + /* Start at the top-most scanline in the buffer, adjust the destination + coordinates and crop the size accordingly. */ + yDst += (yTop - ySrc); + cy -= (yTop - ySrc); + ySrc = 0; + } + + /* Check if the DIB is top-down */ + if (pbmi->bmiHeader.biHeight < 0) + { + pbmi->bmiHeader.biHeight = -(LONG)cNumScan; + } + else + { + pbmi->bmiHeader.biHeight = cNumScan; + } + + /* Call the internal function with the secure pointers */ + iResult = GreStretchDIBitsInternal(hdcDest, + xDst, + yDst, + cx, + cy, + xSrc, + ySrc, + cx, + cy, + pjBits, + pbmi, + iUsage, + MAKEROP4(SRCCOPY, SRCCOPY), + cjMaxInfo, + cjMaxBits, + bTransformCoordinates, + hcmXform); + + /* Unsecure the memory */ + EngUnsecureMem(hSecure); + +leave: /* Free the bitmap info */ DibFreeBitmapInfo(pbmi); @@ -1317,7 +1431,7 @@ _In_ DWORD dwRop, // ms ntgdi.h says dwRop4(?) _In_ UINT cjMaxInfo, _In_ UINT cjMaxBits, - _In_ HANDLE hcmXform) + _In_opt_ HANDLE hcmXform) { PBITMAPINFO pbmi; HANDLE hSecure; Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.h [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.h [iso-8859-1] Tue Aug 14 22:27:00 2012 @@ -10,6 +10,8 @@ ULONG cBitsPixel; ULONG iCompression; ULONG iFormat; + ULONG cjWidthBytes; + ULONG cjImageSize; } BITMAPFORMAT, *PBITMAPFORMAT; ULONG @@ -19,8 +21,16 @@ _In_ ULONG iUsage); INT -NTAPI -GreGetDIBitsInternal( +APIENTRY +GreGetDIBitmapInfo( + _In_ HBITMAP hbm, + _Inout_ LPBITMAPINFO pbmi, + _In_ UINT iUsage, + _In_ UINT cjMaxInfo); + +INT +APIENTRY +GreGetDIBits( _In_ HDC hdc, _In_ HBITMAP hbm, _In_ UINT iStartScan, @@ -83,4 +93,87 @@ UINT Entries, RGBQUAD *Colors); -#define DIB_BitmapInfoSize +W32KAPI +INT +APIENTRY +OldNtGdiSetDIBitsToDeviceInternal( + IN HDC hDC, + IN INT XDest, + IN INT YDest, + IN DWORD Width, + IN DWORD Height, + IN INT XSrc, + IN INT YSrc, + IN DWORD StartScan, + IN DWORD ScanLines, + IN LPBYTE Bits, + IN LPBITMAPINFO bmi, + IN DWORD ColorUse, + IN UINT cjMaxBits, + IN UINT cjMaxInfo, + IN BOOL bTransformCoordinates, + IN OPTIONAL HANDLE hcmXform); + +INT +APIENTRY +OldNtGdiGetDIBitsInternal( + HDC hDC, + HBITMAP hBitmap, + UINT StartScan, + UINT ScanLines, + LPBYTE Bits, + LPBITMAPINFO Info, + UINT Usage, + UINT MaxBits, + UINT MaxInfo); + +W32KAPI +INT +APIENTRY +OldNtGdiStretchDIBitsInternal( + IN HDC hdc, + IN INT xDst, + IN INT yDst, + IN INT cxDst, + IN INT cyDst, + IN INT xSrc, + IN INT ySrc, + IN INT cxSrc, + IN INT cySrc, + IN OPTIONAL LPBYTE pjInit, + IN LPBITMAPINFO pbmi, + IN DWORD dwUsage, + IN DWORD dwRop, // MS ntgdi.h says dwRop4(?) + IN UINT cjMaxInfo, + IN UINT cjMaxBits, + IN HANDLE hcmXform); + +HBITMAP +APIENTRY +OldNtGdiCreateDIBitmapInternal( + IN HDC hDc, + IN INT cx, + IN INT cy, + IN DWORD fInit, + IN OPTIONAL LPBYTE pjInit, + IN OPTIONAL LPBITMAPINFO pbmi, + IN DWORD iUsage, + IN UINT cjMaxInitInfo, + IN UINT cjMaxBits, + IN FLONG fl, + IN HANDLE hcmXform); + +HBITMAP +APIENTRY +OldNtGdiCreateDIBSection( + IN HDC hDC, + IN OPTIONAL HANDLE hSection, + IN DWORD dwOffset, + IN BITMAPINFO* bmi, + IN DWORD Usage, + IN UINT cjHeader, + IN FLONG fl, + IN ULONG_PTR dwColorSpace, + OUT PVOID *Bits); + + Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Tue Aug 14 22:27:00 2012 @@ -10,6 +10,45 @@ #define NDEBUG #include <debug.h> + +#if 0 + +int +FASTCALL +DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, + LONG *height, WORD *planes, WORD *bpp, DWORD *compr, DWORD *size ); + +HBITMAP +APIENTRY +DIB_CreateDIBSection( + PDC dc, + CONST BITMAPINFO *bmi, + UINT usage, + LPVOID *bits, + HANDLE section, + DWORD offset, + DWORD ovr_pitch); + +HBITMAP +NTAPI +OldGreCreateDIBitmapInternal( + IN HDC hDc, + IN INT cx, + IN INT cy, + IN DWORD fInit, + IN OPTIONAL LPBYTE pjInit, + IN OPTIONAL PBITMAPINFO pbmi, + IN DWORD iUsage, + IN FLONG fl, + IN UINT cjMaxBits, + IN HANDLE hcmXform); + +PPALETTE +NTAPI +CreateDIBPalette( + _In_ const BITMAPINFO *pbmi, + _In_ PDC pdc, + _In_ ULONG iUsage); static const RGBQUAD EGAColorsQuads[16] = { @@ -105,7 +144,7 @@ PPALETTE NTAPI -CreateDIBPalette( +OldCreateDIBPalette( _In_ const BITMAPINFO *pbmi, _In_ PDC pdc, _In_ ULONG iUsage) @@ -378,7 +417,7 @@ W32KAPI INT APIENTRY -NtGdiSetDIBitsToDeviceInternal( +OldNtGdiSetDIBitsToDeviceInternal( IN HDC hDC, IN INT XDest, IN INT YDest, @@ -560,7 +599,7 @@ /* Converts a device-dependent bitmap to a DIB */ INT APIENTRY -NtGdiGetDIBitsInternal( +OldNtGdiGetDIBitsInternal( HDC hDC, HBITMAP hBitmap, UINT StartScan, @@ -1026,7 +1065,7 @@ W32KAPI INT APIENTRY -NtGdiStretchDIBitsInternal( +OldNtGdiStretchDIBitsInternal( IN HDC hdc, IN INT xDst, IN INT yDst, @@ -1269,7 +1308,7 @@ // The DDB that is created will be whatever bit depth your reference DC is HBITMAP APIENTRY -NtGdiCreateDIBitmapInternal( +OldNtGdiCreateDIBitmapInternal( IN HDC hDc, IN INT cx, IN INT cy, @@ -1318,7 +1357,7 @@ goto cleanup; } - hbmResult = GreCreateDIBitmapInternal(hDc, + hbmResult = OldGreCreateDIBitmapInternal(hDc, cx, cy, fInit, @@ -1336,7 +1375,7 @@ HBITMAP NTAPI -GreCreateDIBitmapInternal( +OldGreCreateDIBitmapInternal( IN HDC hDc, IN INT cx, IN INT cy, @@ -1392,7 +1431,7 @@ HBITMAP APIENTRY -NtGdiCreateDIBSection( +OldNtGdiCreateDIBSection( IN HDC hDC, IN OPTIONAL HANDLE hSection, IN DWORD dwOffset, @@ -1695,7 +1734,7 @@ * 11/16/1999 (RJJ) lifted from wine */ -INT APIENTRY DIB_GetDIBImageBytes(INT width, INT height, INT depth) +INT APIENTRY OldDIB_GetDIBImageBytes(INT width, INT height, INT depth) { return WIDTH_BYTES_ALIGN32(width, depth) * (height < 0 ? -height : height); } @@ -1845,4 +1884,5 @@ ExFreePoolWithTag(converted, TAG_DIB); } +#endif /* EOF */ Modified: branches/dib_rewrite/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… ============================================================================== --- branches/dib_rewrite/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/user/ntuser/clipboard.c [iso-8859-1] Tue Aug 14 22:27:00 2012 @@ -135,49 +135,68 @@ } VOID static NTAPI -IntSynthesizeDib(PWINSTATION_OBJECT pWinStaObj, HBITMAP hBm) +IntSynthesizeDib( + PWINSTATION_OBJECT pWinStaObj, + HBITMAP hbm) { HDC hdc; - BITMAP bm; - BITMAPINFO bi; - SURFACE *psurf; - PCLIPBOARDDATA pMemObj; + BITMAPINFO bmi; + ULONG cjInfoSize, cjDataSize; + PCLIPBOARDDATA pClipboardData; HANDLE hMem; - + INT iResult; + + /* Get the display DC */ hdc = UserGetDCEx(NULL, NULL, DCX_USESTYLE); if (!hdc) + { return; - - // FIXME: use a less cheesy way to calculate the size of the bitmap! - - psurf = SURFACE_ShareLockSurface(hBm); - if (!psurf) - goto cleanup; - BITMAP_GetObject(psurf, sizeof(BITMAP), (PVOID)&bm); - SURFACE_ShareUnlockSurface(psurf); - - bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi.bmiHeader.biWidth = bm.bmWidth; - bi.bmiHeader.biHeight = bm.bmHeight; - bi.bmiHeader.biPlanes = bm.bmPlanes; - bi.bmiHeader.biBitCount = bm.bmBitsPixel; - bi.bmiHeader.biCompression = BI_RGB; - bi.bmiHeader.biSizeImage = 0; - bi.bmiHeader.biXPelsPerMeter = 0; - bi.bmiHeader.biYPelsPerMeter = 0; - bi.bmiHeader.biClrUsed = 0; - - GreGetDIBitsInternal(hdc, hBm, 0, bm.bmHeight, NULL, &bi, DIB_RGB_COLORS, 0, 0); - - pMemObj = (PCLIPBOARDDATA)UserCreateObject(gHandleTable, NULL, &hMem, otClipBoardData, - sizeof(BITMAPINFOHEADER) + bi.bmiHeader.biSizeImage); - if(pMemObj) - { - pMemObj->cbData = sizeof(BITMAPINFOHEADER) + bi.bmiHeader.biSizeImage; - memcpy(pMemObj->Data, &bi, sizeof(BITMAPINFOHEADER)); - GreGetDIBitsInternal(hdc, hBm, 0, bm.bmHeight, (LPBYTE)pMemObj->Data + sizeof(BITMAPINFOHEADER), &bi, DIB_RGB_COLORS, 0, 0); - IntAddFormatedData(pWinStaObj, CF_DIB, hMem, TRUE, TRUE); - } + } + + /* Get information about the bitmap format */ + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + iResult = GreGetDIBitmapInfo(hbm, &bmi, DIB_RGB_COLORS, sizeof(bmi)); + if (iResult == 0) + { + goto cleanup; + } + + /* Get the size for a full BITMAPINFO */ + cjInfoSize = DibGetBitmapInfoSize(&bmi, DIB_RGB_COLORS); + + /* Calculate the size of the clipboard data, which is a packed DIB */ + cjDataSize = cjInfoSize + bmi.bmiHeader.biSizeImage; + + /* Create the clipboard data */ + pClipboardData = (PCLIPBOARDDATA)UserCreateObject(gHandleTable, + NULL, + &hMem, + otClipBoardData, + cjDataSize); + if (!pClipboardData) + { + goto cleanup; + } + + /* Set the data size */ + pClipboardData->cbData = cjDataSize; + + /* Copy the BITMAPINFOHEADER */ + memcpy(pClipboardData->Data, &bmi, sizeof(BITMAPINFOHEADER)); + + /* Get the bitmap bits and the color table */ + iResult = GreGetDIBits(hdc, + hbm, + 0, + abs(bmi.bmiHeader.biHeight), + (LPBYTE)pClipboardData->Data + cjInfoSize, + (LPBITMAPINFO)pClipboardData->Data, + DIB_RGB_COLORS, + bmi.bmiHeader.biSizeImage, + cjInfoSize); + + /* Add the clipboard data */ + IntAddFormatedData(pWinStaObj, CF_DIB, hMem, TRUE, TRUE); cleanup: UserReleaseDC(NULL, hdc, FALSE); @@ -187,7 +206,7 @@ IntSynthesizeBitmap(PWINSTATION_OBJECT pWinStaObj, PCLIP pBmEl) { HDC hdc = NULL; - PBITMAPINFO pBmi, pConvertedBmi = NULL; + PBITMAPINFO pBmi; HBITMAP hBm = NULL; PCLIPBOARDDATA pMemObj; PCLIP pDibEl; @@ -204,27 +223,23 @@ if (!pMemObj) return; - pBmi = (BITMAPINFO*)pMemObj->Data; + pBmi = (BITMAPINFO*)pMemObj->Data; if (pMemObj->cbData < sizeof(DWORD) && pMemObj->cbData < pBmi->bmiHeader.biSize) goto cleanup; - pConvertedBmi = DIB_ConvertBitmapInfo(pBmi, DIB_RGB_COLORS); - if (!pConvertedBmi) - goto cleanup; - - Offset = DIB_BitmapInfoSize(pBmi, DIB_RGB_COLORS); + Offset = DibGetBitmapInfoSize(pBmi, DIB_RGB_COLORS); hdc = UserGetDCEx(NULL, NULL, DCX_USESTYLE); if (!hdc) goto cleanup; hBm = GreCreateDIBitmapInternal(hdc, - pConvertedBmi->bmiHeader.biWidth, - pConvertedBmi->bmiHeader.biHeight, + pBmi->bmiHeader.biWidth, + pBmi->bmiHeader.biHeight, CBM_INIT, pMemObj->Data + Offset, - pConvertedBmi, + pBmi, DIB_RGB_COLORS, 0, pMemObj->cbData - Offset, @@ -240,9 +255,6 @@ cleanup: if (hdc) UserReleaseDC(NULL, hdc, FALSE); - - if (pConvertedBmi) - DIB_FreeConvertedBitmapInfo(pConvertedBmi, pBmi); } VOID static NTAPI

12 years, 2 months

[cfinck] 57077: [ROSAUTOTEST] Use FILE_FLAG_NO_BUFFERING and FILE_FLAG_WRITE_THROUGH in the hope that they prevent journal changes from getting lost.

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Aug 14 20:33:54 2012 New Revision: 57077 URL: http://svn.reactos.org/svn/reactos?rev=57077&view=rev Log: [ROSAUTOTEST] Use FILE_FLAG_NO_BUFFERING and FILE_FLAG_WRITE_THROUGH in the hope that they prevent journal changes from getting lost. Modified: trunk/rostests/rosautotest/CJournaledTestList.cpp Modified: trunk/rostests/rosautotest/CJournaledTestList.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CJournaledTes… ============================================================================== --- trunk/rostests/rosautotest/CJournaledTestList.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CJournaledTestList.cpp [iso-8859-1] Tue Aug 14 20:33:54 2012 @@ -64,7 +64,15 @@ void CJournaledTestList::OpenJournal(DWORD DesiredAccess, bool CreateNew) { - m_hJournal = CreateFileW(m_JournalFile.c_str(), DesiredAccess, 0, NULL, (CreateNew ? CREATE_ALWAYS : OPEN_EXISTING), FILE_ATTRIBUTE_NORMAL, NULL); + m_hJournal = CreateFileW( + m_JournalFile.c_str(), + DesiredAccess, + 0, + NULL, + (CreateNew ? CREATE_ALWAYS : OPEN_EXISTING), + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING | FILE_FLAG_WRITE_THROUGH, + NULL + ); if(m_hJournal == INVALID_HANDLE_VALUE) FATAL("CreateFileW failed\n");

12 years, 2 months

[cfinck] 57076: [ROSAUTOTEST] Use "advanced C++ features" like default parameters to reduce the complexity of StringOut calls and fix a warning in the MSVC build :-)

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Aug 14 20:25:58 2012 New Revision: 57076 URL: http://svn.reactos.org/svn/reactos?rev=57076&view=rev Log: [ROSAUTOTEST] Use "advanced C++ features" like default parameters to reduce the complexity of StringOut calls and fix a warning in the MSVC build :-) Modified: trunk/rostests/rosautotest/CJournaledTestList.cpp trunk/rostests/rosautotest/CWebService.cpp trunk/rostests/rosautotest/CWineTest.cpp trunk/rostests/rosautotest/main.cpp trunk/rostests/rosautotest/precomp.h trunk/rostests/rosautotest/shutdown.cpp trunk/rostests/rosautotest/tools.cpp Modified: trunk/rostests/rosautotest/CJournaledTestList.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CJournaledTes… ============================================================================== --- trunk/rostests/rosautotest/CJournaledTestList.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CJournaledTestList.cpp [iso-8859-1] Tue Aug 14 20:25:58 2012 @@ -146,7 +146,7 @@ CTestInfo* TestInfo; DWORD BytesWritten; - StringOut("Writing initial journal file...\n\n", TRUE); + StringOut("Writing initial journal file...\n\n"); m_ListIterator = 0; @@ -192,7 +192,7 @@ DWORD BytesRead; DWORD RemainingSize; - StringOut("Loading journal file...\n\n", TRUE); + StringOut("Loading journal file...\n\n"); OpenJournal(GENERIC_READ); RemainingSize = GetFileSize(m_hJournal, NULL); Modified: trunk/rostests/rosautotest/CWebService.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWebService.c… ============================================================================== --- trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] Tue Aug 14 20:25:58 2012 @@ -207,7 +207,7 @@ Response.reset(DoRequest(Data)); ss << "The server responded:" << endl << Response << endl; - StringOut(ss.str(), TRUE); + StringOut(ss.str()); if(strcmp(Response, "OK")) EXCEPTION("Aborted!\n"); Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Tue Aug 14 20:25:58 2012 @@ -269,7 +269,7 @@ string tailString; ss << "Running Wine Test, Module: " << TestInfo->Module << ", Test: " << TestInfo->Test << endl; - StringOut(ss.str(), TRUE); + StringOut(ss.str()); StartTime = GetTickCount(); @@ -302,7 +302,7 @@ /* Output text through StringOut, even while the test is still running */ Buffer[BytesAvailable] = 0; - tailString = StringOut(tailString.append(string(Buffer)), FALSE); + tailString = StringOut(tailString.append(string(Buffer)), false); if(Configuration.DoSubmit()) TestInfo->Log += Buffer; @@ -313,12 +313,12 @@ /* Print what's left */ if(!tailString.empty()) - StringOut(tailString, TRUE); + StringOut(tailString); TotalTime = ((float)GetTickCount() - StartTime)/1000; ssFinish << "Test " << TestInfo->Test << " completed in "; ssFinish << setprecision(2) << fixed << TotalTime << " seconds." << endl; - StringOut(ssFinish.str(), TRUE); + StringOut(ssFinish.str()); } /** @@ -375,6 +375,6 @@ if(Configuration.DoSubmit() && !TestInfo->Log.empty()) WebService->Submit("wine", TestInfo); - StringOut("\n\n", TRUE); - } -} + StringOut("\n\n"); + } +} Modified: trunk/rostests/rosautotest/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/main.cpp?rev=… ============================================================================== --- trunk/rostests/rosautotest/main.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/main.cpp [iso-8859-1] Tue Aug 14 20:25:58 2012 @@ -60,7 +60,7 @@ ss << "\n\nSystem uptime " << setprecision(2) << fixed ; ss << ((float)GetTickCount()/1000) << " seconds\n"; - StringOut(ss.str(), TRUE); + StringOut(ss.str()); /* Run the tests */ WineTest.Run(); @@ -76,7 +76,7 @@ } catch(CSimpleException& e) { - StringOut(e.GetMessage(), TRUE); + StringOut(e.GetMessage()); } catch(CFatalException& e) { @@ -87,7 +87,7 @@ << "File: " << e.GetFile() << endl << "Line: " << e.GetLine() << endl << "Last Win32 Error: " << GetLastError() << endl; - StringOut(ss.str(), TRUE); + StringOut(ss.str()); } /* For sysreg2 to notice if rosautotest itself failed */ Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Tue Aug 14 20:25:58 2012 @@ -51,7 +51,7 @@ string EscapeString(const string& Input); string GetINIValue(PCWCH AppName, PCWCH KeyName, PCWCH FileName); bool IsNumber(const char* Input); -string StringOut(const string& String, const BOOL forcePrint); +string StringOut(const string& String, bool forcePrint = true); string UnicodeToAscii(PCWSTR UnicodeString); string UnicodeToAscii(const wstring& UnicodeString); Modified: trunk/rostests/rosautotest/shutdown.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/shutdown.cpp?… ============================================================================== --- trunk/rostests/rosautotest/shutdown.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/shutdown.cpp [iso-8859-1] Tue Aug 14 20:25:58 2012 @@ -20,14 +20,14 @@ if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) { - StringOut("OpenProcessToken failed\n", TRUE); + StringOut("OpenProcessToken failed\n"); return false; } /* Get the LUID for the Shutdown privilege */ if (!LookupPrivilegeValueW(NULL, SE_SHUTDOWN_NAME, &Privileges.Privileges[0].Luid)) { - StringOut("LookupPrivilegeValue failed\n", TRUE); + StringOut("LookupPrivilegeValue failed\n"); return false; } @@ -37,14 +37,14 @@ if (!AdjustTokenPrivileges(hToken, FALSE, &Privileges, 0, NULL, NULL)) { - StringOut("AdjustTokenPrivileges failed\n", TRUE); + StringOut("AdjustTokenPrivileges failed\n"); return false; } /* Finally shut down the system */ if(!ExitWindowsEx(EWX_POWEROFF, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED)) { - StringOut("ExitWindowsEx failed\n", TRUE); + StringOut("ExitWindowsEx failed\n"); return false; } Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Tue Aug 14 20:25:58 2012 @@ -93,7 +93,7 @@ * The std::string to output */ string -StringOut(const string& String, const BOOL forcePrint) +StringOut(const string& String, bool forcePrint) { char DbgString[DBGPRINT_BUFSIZE + 1]; size_t i, start = 0, last_newline = 0, size = 0, curr_pos = 0;

12 years, 2 months

[akhaldi] 57075: [README.WINE] * Remove some unused modules. * Update some modules that didn't change between syncs.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 13 23:52:28 2012 New Revision: 57075 URL: http://svn.reactos.org/svn/reactos?rev=57075&view=rev Log: [README.WINE] * Remove some unused modules. * Update some modules that didn't change between syncs. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Aug 13 23:52:28 2012 @@ -21,12 +21,9 @@ The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-1.3.37 +reactos/tools/unicode # Synced to Wine-1.5.4 reactos/tools/widl # Synced to Wine-1.3.26 -reactos/tools/winebuild # Synced to Wine-1_1_13 -reactos/tools/wmc # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wpp # Synced to Wine-1.3.26 -reactos/tools/wrc # Synced to Wine-1.3.26 The following libraries are shared with Wine. @@ -53,12 +50,12 @@ reactos/dll/win32/comctl32 # Synced to Wine 1.3.37 reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37 reactos/dll/win32/compstui # Synced to Wine-1.5.4 -reactos/dll/win32/credui # Synced to Wine-1.3.37 +reactos/dll/win32/credui # Synced to Wine-1.5.4 reactos/dll/win32/crypt32 # Synced to Wine-1.3.37 -reactos/dll/win32/cryptdlg # Synced to Wine-1.3.37 -reactos/dll/win32/cryptdll # Synced to Wine-1.3.37 +reactos/dll/win32/cryptdlg # Synced to Wine-1.5.4 +reactos/dll/win32/cryptdll # Synced to Wine-1.5.4 reactos/dll/win32/cryptnet # Synced to Wine-1.3.37 -reactos/dll/win32/cryptui # Synced to Wine-1.3.37 +reactos/dll/win32/cryptui # Synced to Wine-1.5.4 reactos/dll/win32/dbghelp # Synced to Wine-1.3.37 reactos/dll/win32/dciman32 # Synced to Wine-1.5.4 reactos/dll/win32/dwmapi # Synced to Wine-1.5.4

12 years, 2 months

[gadamopoulos] 57074: [user32_apitest] - Add support for logging messages in different threads - Add several tests for AttachThreadInput

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Aug 13 18:04:04 2012 New Revision: 57074 URL: http://svn.reactos.org/svn/reactos?rev=57074&view=rev Log: [user32_apitest] - Add support for logging messages in different threads - Add several tests for AttachThreadInput Added: trunk/rostests/apitests/user32/AttachThreadInput.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/DeferWindowPos.c trunk/rostests/apitests/user32/SetActiveWindow.c trunk/rostests/apitests/user32/SystemParametersInfo.c trunk/rostests/apitests/user32/TrackMouseEvent.c trunk/rostests/apitests/user32/helper.c trunk/rostests/apitests/user32/helper.h trunk/rostests/apitests/user32/testlist.c Added: trunk/rostests/apitests/user32/AttachThreadInput.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/AttachThr… ============================================================================== --- trunk/rostests/apitests/user32/AttachThreadInput.c (added) +++ trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] Mon Aug 13 18:04:04 2012 @@ -1,0 +1,614 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for AttachThreadInput + * PROGRAMMERS: Giannis Adamopoulos + */ + +#include <windows.h> +#include <stdio.h> +#include <wine/test.h> +#include "helper.h" +#include <undocuser.h> + +#define DESKTOP_ALL_ACCESS 0x01ff + +typedef struct { + DWORD tid; + HANDLE hThread; + HWND hWnd; + WCHAR* Desktop; + HANDLE StartEvent; + HANDLE QueueStatusEvent; + DWORD LastQueueStatus; + + MSG_CACHE cache; +} THREAD_DATA; + +DWORD tidMouseMove; +THREAD_DATA data[5]; +HHOOK hMouseHookLL = NULL; +HHOOK hKbdHookLL = NULL; + + +#define EXPECT_FOREGROUND(expected) ok(GetForegroundWindow() == expected, \ + "Expected hwnd%d at the foreground, got hwnd%d\n", \ + get_iwnd(expected), get_iwnd(GetForegroundWindow())); + +#define EXPECT_ACTIVE(expected) ok(GetActiveWindow() == expected, \ + "Expected hwnd%d to be active, got hwnd%d\n", \ + get_iwnd(expected), get_iwnd(GetActiveWindow())); + +/* + * Helper functions + */ + +static int get_iwnd(HWND hWnd) +{ + if(hWnd == data[0].hWnd) return 0; + else if(hWnd == data[1].hWnd) return 1; + else if(hWnd == data[2].hWnd) return 2; + else if(hWnd == data[3].hWnd) return 3; + else if(hWnd == data[4].hWnd) return 4; + else return -1; +} + +LRESULT CALLBACK TestProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + int iwnd = get_iwnd(hWnd); + + if(iwnd >= 0 && message > 0 && message < WM_APP && message != WM_TIMER) + record_message(&data[iwnd].cache, iwnd, message, SENT, wParam,0); + + return DefWindowProc(hWnd, message, wParam, lParam); +} + +static void FlushMessages() +{ + MSG msg; + + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + int iwnd = get_iwnd(msg.hwnd); + if( iwnd >= 0 && msg.message > 0 && msg.message < WM_APP && msg.message != WM_TIMER) + record_message(&data[0].cache, iwnd, msg.message, POST, msg.wParam,0); + DispatchMessageA( &msg ); + } + + /* Use SendMessage to sync with the other queues */ + SendMessage(data[1].hWnd, WM_APP, 0,0); + SendMessage(data[2].hWnd, WM_APP, 0,0); + SendMessage(data[3].hWnd, WM_APP, 0,0); + SendMessage(data[4].hWnd, WM_APP, 0,0); +} + +static DWORD WINAPI thread_proc(void *param) +{ + THREAD_DATA* current_data = (THREAD_DATA*)param; + MSG msg; + HDESK hdesk = NULL; + int iwnd; + + if(current_data->Desktop) + { + hdesk = CreateDesktopW(current_data->Desktop, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); + SetThreadDesktop(hdesk); + ok(GetThreadDesktop(current_data->tid) == hdesk, "Thread in wrong desktop. Following results may be bogus!\n"); + } + + /* create test window */ + current_data->hWnd = CreateWindowW(L"TestClass", L"test", WS_OVERLAPPEDWINDOW, + 100, 100, 500, 500, NULL, NULL, 0, NULL); + SetEvent( current_data->StartEvent ); + + iwnd = get_iwnd(current_data->hWnd); + + /* Use MsgWaitForMultipleObjects to let the thread process apcs */ + while( GetMessage(&msg, 0,0,0) ) + { + if(msg.message > 0 && msg.message < WM_APP && msg.message != WM_TIMER ) + record_message(&data[iwnd].cache, iwnd, msg.message, POST, msg.wParam,0); + DispatchMessage(&msg); + } + + if(hdesk) + CloseDesktop(hdesk); + + return 0; +} + +BOOL CreateTestThread(int i, WCHAR* Desktop) +{ + DWORD ret; + + data[i].StartEvent = CreateEventW(NULL, 0, 0, NULL); + data[i].Desktop = Desktop; + data[i].hThread = CreateThread(NULL, 0, thread_proc, &data[i], 0, &data[i].tid); + if(!data[i].hThread) goto fail; + ret = WaitForSingleObject(data[i].StartEvent, 1000); + CloseHandle(data[i].StartEvent); + if(ret == WAIT_TIMEOUT) + { +fail: + win_skip("child thread failed to initialize\n"); + return FALSE; + } + return TRUE; +} + +static LRESULT CALLBACK MouseLLHookProc(int nCode, WPARAM wParam, LPARAM lParam) +{ + LRESULT ret; + MSLLHOOKSTRUCT* params = (MSLLHOOKSTRUCT*) lParam; + + ret = CallNextHookEx(hMouseHookLL, nCode, wParam, lParam); + + if((params->flags & LLKHF_INJECTED) == 0) + return TRUE; + + return ret; +} + +LRESULT CALLBACK KbdLLHookProc(int nCode, WPARAM wParam, LPARAM lParam) +{ + LRESULT ret; + KBDLLHOOKSTRUCT* params = (KBDLLHOOKSTRUCT*) lParam; + + ret = CallNextHookEx(hMouseHookLL, nCode, wParam, lParam); + + if((params->flags & LLKHF_INJECTED) == 0) + return TRUE; + + return ret; +} + +BOOLEAN InitThreads() +{ + /* Create a LL hook that drops any physical keyboard and mouse action + and prevent the user from interfering with the test results */ + if(!IsDebuggerPresent()) + { + hMouseHookLL = SetWindowsHookExW(WH_MOUSE_LL, MouseLLHookProc, GetModuleHandleW( NULL ), 0); + ok(hMouseHookLL!=NULL,"failed to set hook\n"); + hKbdHookLL = SetWindowsHookExW(WH_KEYBOARD_LL, KbdLLHookProc, GetModuleHandleW( NULL ), 0); + ok(hKbdHookLL!=NULL,"failed to set hook\n"); + } + + /* create test clases */ + RegisterSimpleClass(TestProc, L"TestClass"); + + memset(&data[0], 0, sizeof(data[0])); + + data[0].tid = GetCurrentThreadId(); + + /* create test window */ + data[0].hWnd = CreateWindowW(L"TestClass", L"test", WS_OVERLAPPEDWINDOW, + 100, 100, 500, 500, NULL, NULL, 0, NULL); + if(!data[0].hWnd) + { + win_skip("CreateWindowW failed\n"); + return FALSE; + } + + /* create thread1(same desktop) */ + if(!CreateTestThread(1, NULL)) return FALSE; + + /* create thread2(same desktop) */ + if(!CreateTestThread(2, NULL)) return FALSE; + + /* create thread3(different desktop) */ + if(!CreateTestThread(3, L"ThreadTestDesktop")) return FALSE; + + /* create thread4(different desktop) */ + if(!CreateTestThread(4, L"ThreadTestDesktop")) return FALSE; + + return TRUE; +} + + + + +/* + * The actual tests + */ + +void Test_SimpleParameters() +{ + BOOL ret; + /* FIXME: acording to msdn xp doesn't set last error but vista+ does*/ + + /* test wrong thread */ + ret = AttachThreadInput( 0, 1, TRUE); + ok(ret==0, "expected AttachThreadInput to fail\n"); + + /* test same thread */ + ret = AttachThreadInput( data[1].tid, data[1].tid, TRUE); + ok(ret==0, "expected AttachThreadInput to fail\n"); + + /* try to attach to a thread on another desktop*/ + ret = AttachThreadInput( data[2].tid,data[3].tid, TRUE); + ok(ret==0, "expected AttachThreadInput to fail\n"); + + /* test other desktop to this */ + ret = AttachThreadInput( data[3].tid,data[2].tid, TRUE); + ok(ret==0, "expected AttachThreadInput to fail\n"); + + /* attach two threads that are both in ThreadTestDesktop */ + { + /* Attach thread 3 and 4 */ + ret = AttachThreadInput( data[3].tid,data[4].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + + /* cleanup previous attachment */ + ret = AttachThreadInput( data[3].tid,data[4].tid, FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + } + + { + /* Attach thread 1 and 2 */ + ret = AttachThreadInput( data[1].tid,data[2].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + + /* attach already attached*/ + ret = AttachThreadInput( data[1].tid,data[2].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + + /* Now try to detach 0 from 1 */ + ret = AttachThreadInput( data[0].tid,data[1].tid, FALSE); + ok(ret==0, "expected AttachThreadInput to fail\n"); + + /* also try to detach 3 from 2 */ + ret = AttachThreadInput( data[2].tid,data[1].tid, FALSE); + ok(ret==0, "expected AttachThreadInput to fail\n"); + + /* cleanup previous attachment */ + ret = AttachThreadInput( data[1].tid,data[2].tid, FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + } + + /*too bad this causes a crash in win32k */ +#if 0 + /* test triple attach */ + { + ret = AttachThreadInput( data[0].tid, data[1].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + ret = AttachThreadInput( data[1].tid, data[2].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + + /* try to detach 2 and 0 */ + ret = AttachThreadInput( data[0].tid, data[2].tid, FALSE); + ok(ret==0, "expected AttachThreadInput to fail\n"); + ret = AttachThreadInput( data[2].tid, data[0].tid, FALSE); + ok(ret==0, "expected AttachThreadInput to fail\n"); + + /* try to to attach 0 to 2. it works! */ + ret = AttachThreadInput( data[0].tid, data[2].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + + ret = AttachThreadInput( data[0].tid, data[2].tid, FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + + /* detach in inverse order */ + ret = AttachThreadInput( data[0].tid, data[1].tid, FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + ret = AttachThreadInput( data[1].tid, data[2].tid, FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + } +#endif +} + +void Test_Focus() //Focus Active Capture Foreground Capture +{ + BOOL ret; + + /* Window 1 is in the foreground */ + SetForegroundWindow(data[1].hWnd); + SetActiveWindow(data[0].hWnd); + FlushMessages(); + + EXPECT_FOREGROUND(data[1].hWnd); + EXPECT_ACTIVE(data[0].hWnd); + + /* attach thread 0 to 1 */ + { + ret = AttachThreadInput( data[0].tid, data[1].tid , TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + FlushMessages(); + + EXPECT_FOREGROUND(data[1].hWnd); + EXPECT_ACTIVE(data[1].hWnd); + + ret = AttachThreadInput( data[0].tid, data[1].tid , FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + } + + EXPECT_FOREGROUND(data[1].hWnd); + EXPECT_ACTIVE(0); + + SetForegroundWindow(data[1].hWnd); + SetActiveWindow(data[0].hWnd); + FlushMessages(); + + EXPECT_FOREGROUND(data[1].hWnd); + EXPECT_ACTIVE(data[0].hWnd); + + /* attach thread 1 to 0 */ + { + ret = AttachThreadInput( data[1].tid, data[0].tid , TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + FlushMessages(); + + EXPECT_FOREGROUND(data[1].hWnd); + EXPECT_ACTIVE(data[1].hWnd); + + ret = AttachThreadInput( data[1].tid, data[0].tid , FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + } + + /* Window 0 is in the foreground */ + SetForegroundWindow(data[0].hWnd); + SetActiveWindow(data[1].hWnd); + FlushMessages(); + + EXPECT_FOREGROUND(data[0].hWnd); + EXPECT_ACTIVE(data[0].hWnd); + + /* attach thread 0 to 1 */ + { + ret = AttachThreadInput( data[0].tid, data[1].tid , TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + FlushMessages(); + + EXPECT_FOREGROUND(data[0].hWnd); + EXPECT_ACTIVE(data[0].hWnd); + + SetForegroundWindow(data[0].hWnd); + SetActiveWindow(data[1].hWnd); + FlushMessages(); + + EXPECT_FOREGROUND(data[1].hWnd); + EXPECT_ACTIVE(data[1].hWnd); + + ret = AttachThreadInput( data[0].tid, data[1].tid , FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + } + + EXPECT_FOREGROUND(data[1].hWnd); + EXPECT_ACTIVE(0); + + SetForegroundWindow(data[0].hWnd); + SetActiveWindow(data[1].hWnd); + FlushMessages(); + + EXPECT_FOREGROUND(data[0].hWnd); + EXPECT_ACTIVE(data[0].hWnd); + + /* attach thread 1 to 0 */ + { + ret = AttachThreadInput( data[1].tid, data[0].tid , TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + FlushMessages(); + + EXPECT_FOREGROUND(data[0].hWnd); + EXPECT_ACTIVE(data[0].hWnd); + + SetForegroundWindow(data[0].hWnd); + SetActiveWindow(data[1].hWnd); + FlushMessages(); + + EXPECT_FOREGROUND(data[1].hWnd); + EXPECT_ACTIVE(data[1].hWnd); + + ret = AttachThreadInput( data[1].tid, data[0].tid , FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + } +} + +/* test some functions like PostMessage and SendMessage that shouldn't be affected */ +void Test_UnaffectedMessages() +{ + BOOL ret; + + EMPTY_CACHE_(&data[0].cache); + EMPTY_CACHE_(&data[1].cache); + + /* test that messages posted before and after attachment are unaffected + and that we don't receive a meassage from a window we shouldn't */ + PostMessage(data[0].hWnd, WM_USER, 0,0); + PostMessage(data[1].hWnd, WM_USER, 1,0); + + { + MSG_ENTRY Thread0_chain[]={ + {0,WM_USER, POST, 0, 0}, + {0,WM_USER, POST, 2, 0}, + {0,0}}; + MSG_ENTRY Thread1_chain[]={ + {1,WM_USER, POST, 1, 0}, + {1,WM_USER, POST, 3, 0}, + {0,0}}; + + ret = AttachThreadInput( data[1].tid, data[0].tid , TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + + PostMessage(data[0].hWnd, WM_USER, 2,0); + PostMessage(data[1].hWnd, WM_USER, 3,0); + + FlushMessages(); + Sleep(100); + + COMPARE_CACHE_(&data[0].cache, Thread0_chain); + COMPARE_CACHE_(&data[1].cache, Thread1_chain); + + ret = AttachThreadInput( data[1].tid, data[0].tid , FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + } + + /* test messages send to the wrong thread */ + SendMessage(data[0].hWnd, WM_USER, 0,0); + SendMessage(data[1].hWnd, WM_USER, 1,0); + + { + MSG_ENTRY Thread0_chain[]={ + {0,WM_USER, SENT, 0, 0}, + {0,WM_USER, SENT, 2, 0}, + {0,0}}; + MSG_ENTRY Thread1_chain[]={ + {1,WM_USER, SENT, 1, 0}, + {1,WM_USER, SENT, 3, 0}, + {1,WM_MOUSEMOVE, SENT, 0, 0}, + {0,0}}; + + ret = AttachThreadInput( data[2].tid, data[1].tid , TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + + SendMessage(data[0].hWnd, WM_USER, 2,0); + SendMessage(data[1].hWnd, WM_USER, 3,0); + + /* Try to send a fake input message */ + SendMessage(data[1].hWnd, WM_MOUSEMOVE, 0,0); + + COMPARE_CACHE_(&data[0].cache, Thread0_chain); + COMPARE_CACHE_(&data[1].cache, Thread1_chain); + + ret = AttachThreadInput( data[2].tid, data[1].tid , FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + } + + /* todo: test keyboard layout that shouldn't be affected */ +} + +void Test_SendInput() +{ + MSG_ENTRY Thread1_chain[]={ + {1,WM_KEYDOWN, POST, VK_SHIFT, 0}, + {1,WM_KEYUP, POST, VK_SHIFT, 0}, + {0,0}}; + MSG_ENTRY Thread0_chain[]={ + {0,WM_KEYDOWN, POST, VK_SHIFT, 0}, + {0,WM_KEYUP, POST, VK_SHIFT, 0}, + {0,0}}; + + BOOL ret; + + /* First try sending input without attaching. It will go to the foreground */ + { + SetForegroundWindow(data[1].hWnd); + SetActiveWindow(data[0].hWnd); + + ok(GetForegroundWindow() == data[1].hWnd, "wrong foreground\n"); + ok(GetActiveWindow() == data[0].hWnd, "wrong active\n"); + + FlushMessages(); + EMPTY_CACHE_(&data[0].cache); + EMPTY_CACHE_(&data[1].cache); + + keybd_event(VK_SHIFT, 0,0,0); + keybd_event(VK_SHIFT, 0,KEYEVENTF_KEYUP,0); + Sleep(100); + FlushMessages(); + + COMPARE_CACHE_(&data[0].cache, empty_chain); + COMPARE_CACHE_(&data[1].cache, Thread1_chain); + } + + /* Next attach and send input. It will go to the same thread as before */ + { + ret = AttachThreadInput( data[1].tid, data[0].tid , TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + + FlushMessages(); + EMPTY_CACHE_(&data[0].cache); + EMPTY_CACHE_(&data[1].cache); + + keybd_event(VK_SHIFT, 0,0,0); + keybd_event(VK_SHIFT, 0,KEYEVENTF_KEYUP,0); + Sleep(100); + FlushMessages(); + + COMPARE_CACHE_(&data[0].cache, empty_chain); + COMPARE_CACHE_(&data[1].cache, Thread1_chain); + } + + /* Now set foregroung and active again. Input will go to thread 0 */ + { + SetForegroundWindow(data[1].hWnd); + SetActiveWindow(data[0].hWnd); + + FlushMessages(); + EMPTY_CACHE_(&data[0].cache); + EMPTY_CACHE_(&data[1].cache); + + keybd_event(VK_SHIFT, 0,0,0); + keybd_event(VK_SHIFT, 0,KEYEVENTF_KEYUP,0); + Sleep(100); + FlushMessages(); + + COMPARE_CACHE_(&data[0].cache, Thread0_chain); + COMPARE_CACHE_(&data[1].cache, empty_chain); + + ret = AttachThreadInput( data[1].tid, data[0].tid , FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + } + + /* Attach in the opposite order and send input */ + { + ret = AttachThreadInput( data[0].tid, data[1].tid , TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + + FlushMessages(); + EMPTY_CACHE_(&data[0].cache); + EMPTY_CACHE_(&data[1].cache); + + keybd_event(VK_SHIFT, 0,0,0); + keybd_event(VK_SHIFT, 0,KEYEVENTF_KEYUP,0); + Sleep(100); + FlushMessages(); + + COMPARE_CACHE_(&data[0].cache, Thread0_chain); + COMPARE_CACHE_(&data[1].cache, empty_chain); + } + + /* Now set foregroung and active again. Input will go to thread 0 */ + { + SetForegroundWindow(data[1].hWnd); + SetActiveWindow(data[0].hWnd); + + FlushMessages(); + EMPTY_CACHE_(&data[0].cache); + EMPTY_CACHE_(&data[1].cache); + + keybd_event(VK_SHIFT, 0,0,0); + keybd_event(VK_SHIFT, 0,KEYEVENTF_KEYUP,0); + Sleep(100); + FlushMessages(); + + COMPARE_CACHE_(&data[0].cache, Thread0_chain); + COMPARE_CACHE_(&data[1].cache, empty_chain); + + ret = AttachThreadInput( data[0].tid, data[1].tid , FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + } +} + +START_TEST(AttachThreadInput) +{ + if(!InitThreads()) + return; + + Test_SimpleParameters(); + Test_Focus(); + Test_UnaffectedMessages(); + Test_SendInput(); + + if(hMouseHookLL) + UnhookWindowsHookEx(hMouseHookLL); + if(hKbdHookLL) + UnhookWindowsHookEx(hKbdHookLL); + + /* Stop all threads and exit gratefully */ + PostThreadMessage(data[1].tid, WM_QUIT,0,0); + PostThreadMessage(data[2].tid, WM_QUIT,0,0); + PostThreadMessage(data[3].tid, WM_QUIT,0,0); + PostThreadMessage(data[4].tid, WM_QUIT,0,0); +} + Propchange: trunk/rostests/apitests/user32/AttachThreadInput.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Mon Aug 13 18:04:04 2012 @@ -1,5 +1,6 @@ list(APPEND SOURCE + AttachThreadInput.c helper.c DeferWindowPos.c desktop.c Modified: trunk/rostests/apitests/user32/DeferWindowPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DeferWind… ============================================================================== --- trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] Mon Aug 13 18:04:04 2012 @@ -42,11 +42,11 @@ { WINDOWPOS* pwp = (WINDOWPOS*)lParam; ok(wParam==0,"expected wParam=0\n"); - record_message(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); + RECOND_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); break; } default: - record_message(iwnd, message, SENT, 0,0); + RECOND_MESSAGE(iwnd, message, SENT, 0,0); } return DefWindowProc(hWnd, message, wParam, lParam); } @@ -59,7 +59,7 @@ { int iwnd = get_iwnd(msg.hwnd); if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - record_message(iwnd, msg.message, POST,0,0); + RECOND_MESSAGE(iwnd, msg.message, POST,0,0); DispatchMessageA( &msg ); } } @@ -105,7 +105,7 @@ SetWindowPos(hWnd4, 0, 250,250,200,200, SWP_NOOWNERZORDER|SWP_SHOWWINDOW|SWP_NOACTIVATE); SetActiveWindow(hWnd4); FlushMessages(); - empty_message_cache(); + EMPTY_CACHE(); } static void Test_DWP_Error(HWND hWnd, HWND hWnd2) @@ -248,7 +248,7 @@ ok_windowpos(hWnd2, 70, 80, 250, 260, "Window 2"); FlushMessages(); - empty_message_cache(); + EMPTY_CACHE(); } MSG_ENTRY move1_chain[]={ @@ -299,7 +299,7 @@ SetWindowPos(hWnd1, 0, 10,20,100,100,0); SetWindowPos(hWnd2, 0, 10,20,100,100,0); FlushMessages(); - empty_message_cache(); + EMPTY_CACHE(); /* move hWnd1 */ hdwp = BeginDeferWindowPos(1); Modified: trunk/rostests/apitests/user32/SetActiveWindow.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetActive… ============================================================================== --- trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] Mon Aug 13 18:04:04 2012 @@ -48,11 +48,11 @@ { WINDOWPOS* pwp = (WINDOWPOS*)lParam; ok(wParam==0,"expected wParam=0\n"); - record_message(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); + RECOND_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); break; } default: - record_message(iwnd, message, SENT, 0,0); + RECOND_MESSAGE(iwnd, message, SENT, 0,0); } return DefWindowProc(hWnd, message, wParam, lParam); } @@ -65,7 +65,7 @@ { int iwnd = get_iwnd(msg.hwnd); if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - record_message(iwnd, msg.message, POST,0,0); + RECOND_MESSAGE(iwnd, msg.message, POST,0,0); DispatchMessageA( &msg ); } } @@ -86,7 +86,7 @@ SetWindowPos(hWnd2, 0, 0,0,0,0, SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); FlushMessages(); - empty_message_cache(); + EMPTY_CACHE(); } static void destroy_test_window() Modified: trunk/rostests/apitests/user32/SystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SystemPar… ============================================================================== --- trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] Mon Aug 13 18:04:04 2012 @@ -38,11 +38,11 @@ { WINDOWPOS* pwp = (WINDOWPOS*)lParam; ok(wParam==0,"expected wParam=0\n"); - record_message(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); + RECOND_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); break; } default: - record_message(iwnd, message, SENT, 0,0); + RECOND_MESSAGE(iwnd, message, SENT, 0,0); } return DefWindowProc(hWnd, message, wParam, lParam); } @@ -55,7 +55,7 @@ { int iwnd = get_iwnd(msg.hwnd); if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - record_message(iwnd, msg.message, POST,0,0); + RECOND_MESSAGE(iwnd, msg.message, POST,0,0); DispatchMessageA( &msg ); } } Modified: trunk/rostests/apitests/user32/TrackMouseEvent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/TrackMous… ============================================================================== --- trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] Mon Aug 13 18:04:04 2012 @@ -49,7 +49,7 @@ ok(0, "Got unexpected WM_SYSTIMER in the winproc. wParam=%d\n", wParam); break; default: - record_message(iwnd, message, SENT, 0,0); + RECOND_MESSAGE(iwnd, message, SENT, 0,0); } return DefWindowProc(hWnd, message, wParam, lParam); } @@ -57,7 +57,7 @@ static LRESULT CALLBACK MouseLLHookProc(int nCode, WPARAM wParam, LPARAM lParam) { LRESULT ret; - record_message(0, WH_MOUSE_LL, HOOK, wParam, 0); + RECOND_MESSAGE(0, WH_MOUSE_LL, HOOK, wParam, 0); ret = CallNextHookEx(hMouseHookLL, nCode, wParam, lParam); if(ignore_mousell) return TRUE; @@ -68,7 +68,7 @@ { MOUSEHOOKSTRUCT *hs = (MOUSEHOOKSTRUCT*) lParam; LRESULT ret; - record_message(get_iwnd(hs->hwnd), WH_MOUSE, HOOK, wParam, hs->wHitTestCode); + RECOND_MESSAGE(get_iwnd(hs->hwnd), WH_MOUSE, HOOK, wParam, hs->wHitTestCode); ret = CallNextHookEx(hMouseHook, nCode, wParam, lParam); if(ignore_mouse) return TRUE; @@ -86,12 +86,12 @@ { if(msg.message == WM_SYSTIMER) { - record_message(iwnd, msg.message, POST,msg.wParam,0); + RECOND_MESSAGE(iwnd, msg.message, POST,msg.wParam,0); if(ignore_timer) continue; } else if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - record_message(iwnd, msg.message, POST,0,0); + RECOND_MESSAGE(iwnd, msg.message, POST,0,0); } DispatchMessageA( &msg ); } @@ -265,7 +265,7 @@ MOVE_CURSOR(0,0); create_test_windows(); FlushMessages(); - empty_message_cache(); + EMPTY_CACHE(); /* the mouse moves over hwnd2 */ MOVE_CURSOR(220,220); Modified: trunk/rostests/apitests/user32/helper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.c?… ============================================================================== --- trunk/rostests/apitests/user32/helper.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.c [iso-8859-1] Mon Aug 13 18:04:04 2012 @@ -11,10 +11,11 @@ #include "helper.h" #include <undocuser.h> -MSG_ENTRY last_post_message; -MSG_ENTRY message_cache[100]; -static int message_cache_size = 0; - +MSG_CACHE default_cache = { +#ifdef _MSC_VER + 0 +#endif +}; MSG_ENTRY empty_chain[]= {{0,0}}; static char* get_msg_name(UINT msg) @@ -48,6 +49,8 @@ case WM_SETTINGCHANGE: return "WM_SETTINGCHANGE"; case WM_GETICON: return "WM_GETICON"; case WM_SETICON: return "WM_SETICON"; + case WM_KEYDOWN: return "WM_KEYDOWN"; + case WM_KEYUP: return "WM_KEYUP"; default: return NULL; } } @@ -64,11 +67,9 @@ } } -void empty_message_cache() -{ - memset(&last_post_message, 0, sizeof(last_post_message)); - memset(message_cache, 0, sizeof(message_cache)); - message_cache_size = 0; +void empty_message_cache(MSG_CACHE* cache) +{ + memset(cache, 0, sizeof(MSG_CACHE)); } void sprintf_msg_entry(char* buffer, MSG_ENTRY* msg) @@ -111,20 +112,20 @@ } } -void trace_cache(const char* file, int line) +void trace_cache(MSG_CACHE* cache, const char* file, int line) { int i; char buff[100]; - for (i=0; i < message_cache_size; i++) - { - sprintf_msg_entry(buff, &message_cache[i]); + for (i=0; i < cache->count; i++) + { + sprintf_msg_entry(buff, &cache->message_cache[i]); trace_(file,line)("%d: %s\n", i, buff); } trace_(file,line)("\n"); } -void compare_cache(const char* file, int line, MSG_ENTRY *msg_chain) +void compare_cache(MSG_CACHE* cache, const char* file, int line, MSG_ENTRY *msg_chain) { int i = 0; char buffGot[100], buffExp[100]; @@ -132,9 +133,9 @@ while(1) { - BOOL same = !memcmp(&message_cache[i],msg_chain, sizeof(MSG_ENTRY)); - - sprintf_msg_entry(buffGot, &message_cache[i]); + BOOL same = !memcmp(&cache->message_cache[i],msg_chain, sizeof(MSG_ENTRY)); + + sprintf_msg_entry(buffGot, &cache->message_cache[i]); sprintf_msg_entry(buffExp, msg_chain); ok_(file,line)(same,"%d: got %s, expected %s\n",i, buffGot, buffExp); @@ -145,7 +146,7 @@ msg_chain++; else { - if(i>message_cache_size) + if(i > cache->count) break; } i++; @@ -154,46 +155,46 @@ if(got_error ) { trace_(file,line)("The complete list of messages got is:\n"); - trace_cache(file,line); - } - - empty_message_cache(); -} - -void record_message(int iwnd, UINT message, MSG_TYPE type, int param1,int param2) -{ - if(message_cache_size>=100) + trace_cache(cache, file,line); + } + + empty_message_cache(cache); +} + +void record_message(MSG_CACHE* cache, int iwnd, UINT message, MSG_TYPE type, int param1,int param2) +{ + if(cache->count >= 100) { return; } /* do not report a post message a second time */ if(type == SENT && - last_post_message.iwnd == iwnd && - last_post_message.msg == message && - last_post_message.param1 == param1 && - last_post_message.param2 == param2) - { - memset(&last_post_message, 0, sizeof(last_post_message)); + cache->last_post_message.iwnd == iwnd && + cache->last_post_message.msg == message && + cache->last_post_message.param1 == param1 && + cache->last_post_message.param2 == param2) + { + memset(&cache->last_post_message, 0, sizeof(MSG_ENTRY)); return; } - message_cache[message_cache_size].iwnd = iwnd; - message_cache[message_cache_size].msg = message; - message_cache[message_cache_size].type = type; - message_cache[message_cache_size].param1 = param1; - message_cache[message_cache_size].param2 = param2; - - if(message_cache[message_cache_size].type == POST) - { - last_post_message = message_cache[message_cache_size]; + cache->message_cache[cache->count].iwnd = iwnd; + cache->message_cache[cache->count].msg = message; + cache->message_cache[cache->count].type = type; + cache->message_cache[cache->count].param1 = param1; + cache->message_cache[cache->count].param2 = param2; + + if(cache->message_cache[cache->count].type == POST) + { + cache->last_post_message = cache->message_cache[cache->count]; } else { - memset(&last_post_message, 0, sizeof(last_post_message)); - } - - message_cache_size++; + memset(&cache->last_post_message, 0, sizeof(MSG_ENTRY)); + } + + cache->count++; } ATOM RegisterSimpleClass(WNDPROC lpfnWndProc, LPCWSTR lpszClassName) Modified: trunk/rostests/apitests/user32/helper.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.h?… ============================================================================== --- trunk/rostests/apitests/user32/helper.h [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.h [iso-8859-1] Mon Aug 13 18:04:04 2012 @@ -16,13 +16,21 @@ int param2; } MSG_ENTRY; +typedef struct _MSG_CACHE +{ + MSG_ENTRY last_post_message; + MSG_ENTRY message_cache[100]; + int count; +} MSG_CACHE; extern MSG_ENTRY empty_chain[]; +extern MSG_CACHE default_cache; -void record_message(int iwnd, UINT message, MSG_TYPE type, int param1,int param2); -void compare_cache(const char* file, int line, MSG_ENTRY *msg_chain); -void trace_cache(const char* file, int line); -void empty_message_cache(); +void record_message(MSG_CACHE* cache, int iwnd, UINT message, MSG_TYPE type, int param1,int param2); +void compare_cache(MSG_CACHE* cache, const char* file, int line, MSG_ENTRY *msg_chain); +void trace_cache(MSG_CACHE* cache, const char* file, int line); +void empty_message_cache(MSG_CACHE* cache); + ATOM RegisterSimpleClass(WNDPROC lpfnWndProc, LPCWSTR lpszClassName); /* filter messages that are affected by dwm */ @@ -44,10 +52,14 @@ return (msg == WM_KEYUP || msg == WM_KEYDOWN); } -#define COMPARE_CACHE(...) compare_cache(__FILE__, __LINE__, ##__VA_ARGS__) -#define TRACE_CACHE() trace_cache(__FILE__, __LINE__) +#define COMPARE_CACHE(msg_chain) compare_cache(&default_cache, __FILE__, __LINE__, msg_chain) +#define TRACE_CACHE() trace_cache(&default_cache, __FILE__, __LINE__) +#define EMPTY_CACHE() empty_message_cache(&default_cache); +#define RECOND_MESSAGE(...) record_message(&default_cache, ##__VA_ARGS__); -#define EXPECT_ACTIVE(hwnd) ok(GetActiveWindow() == hwnd, "Expected %p to be the active window, not %p\n",hwnd,GetActiveWindow()) +#define COMPARE_CACHE_(cache, msg_chain) compare_cache(cache, __FILE__, __LINE__, msg_chain) +#define TRACE_CACHE_(cache) trace_cache(cache, __FILE__, __LINE__) +#define EMPTY_CACHE_(cache) empty_message_cache(cache); #define EXPECT_QUEUE_STATUS(expected, notexpected) \ { \ Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Mon Aug 13 18:04:04 2012 @@ -5,6 +5,7 @@ #define STANDALONE #include "wine/test.h" +extern void func_AttachThreadInput(void); extern void func_DeferWindowPos(void); extern void func_desktop(void); extern void func_GetIconInfo(void); @@ -24,6 +25,7 @@ const struct test winetest_testlist[] = { + { "AttachThreadInput", func_AttachThreadInput }, { "desktop", func_desktop }, { "DeferWindowPos", func_DeferWindowPos }, { "GetIconInfo", func_GetIconInfo },

12 years, 2 months

[akhaldi] 57073: [MOUNTMGR] * Add a missing break.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 13 17:45:08 2012 New Revision: 57073 URL: http://svn.reactos.org/svn/reactos?rev=57073&view=rev Log: [MOUNTMGR] * Add a missing break. Modified: trunk/reactos/drivers/filters/mountmgr/device.c Modified: trunk/reactos/drivers/filters/mountmgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] Mon Aug 13 17:45:08 2012 @@ -1496,6 +1496,7 @@ case IOCTL_MOUNTMGR_DELETE_POINTS: Status = MountMgrDeletePoints(DeviceExtension, Irp); + break; case IOCTL_MOUNTMGR_QUERY_POINTS: Status = MountMgrQueryPoints(DeviceExtension, Irp);

12 years, 2 months

[akhaldi] 57072: [UNIATA] [ATACTL] * Sync to 0.43a1. See issue #7237 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 13 16:25:08 2012 New Revision: 57072 URL: http://svn.reactos.org/svn/reactos?rev=57072&view=rev Log: [UNIATA] [ATACTL] * Sync to 0.43a1. See issue #7237 for more details. Modified: trunk/reactos/base/applications/atactl/atactl.cpp trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h Modified: trunk/reactos/base/applications/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/a… ============================================================================== --- trunk/reactos/base/applications/atactl/atactl.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/atactl/atactl.cpp [iso-8859-1] Mon Aug 13 16:25:08 2012 @@ -37,6 +37,7 @@ int g_adapter_info = 0; char* g_bb_list = NULL; int gRadix = 16; +PADAPTERINFO g_AdapterInfo = NULL; void print_help() { printf("Usage:\n" @@ -262,6 +263,14 @@ AtaCtl->addr.Length = sizeof(AtaCtl->addr); } + if(outBufferLength) { + if(addr) { + memset(&AtaCtl->RawData, 0, outBufferLength); + } else { + memset(&AtaCtl->addr, 0, outBufferLength); + } + } + if(inBuffer && inBufferLength) { if(addr) { memcpy(&AtaCtl->RawData, inBuffer, inBufferLength); @@ -298,80 +307,17 @@ IO_SCSI_CAPABILITIES g_capabilities; UCHAR g_inquiry_buffer[2048]; -int -ata_is_sata( - PIDENTIFY_DATA ident - ) -{ - return (ident->SataEnable && ident->SataEnable != 0xffff); -} - -int -ata_cur_mode_from_ident( - PIDENTIFY_DATA ident - ) -{ - if(ata_is_sata(ident)) { - return ATA_SA150-1; - } - - if (ident->UdmaModesValid) { - if (ident->UltraDMAActive & 0x40) - return ATA_UDMA0+6; - if (ident->UltraDMAActive & 0x20) - return ATA_UDMA0+5; - if (ident->UltraDMAActive & 0x10) - return ATA_UDMA0+4; - if (ident->UltraDMAActive & 0x08) - return ATA_UDMA0+3; - if (ident->UltraDMAActive & 0x04) - return ATA_UDMA0+2; - if (ident->UltraDMAActive & 0x02) - return ATA_UDMA0+1; - if (ident->UltraDMAActive & 0x01) - return ATA_UDMA0+0; - } - - if (ident->MultiWordDMAActive & 0x04) - return ATA_WDMA0+2; - if (ident->MultiWordDMAActive & 0x02) - return ATA_WDMA0+1; - if (ident->MultiWordDMAActive & 0x01) - return ATA_WDMA0+0; - - if (ident->SingleWordDMAActive & 0x04) - return ATA_SDMA0+2; - if (ident->SingleWordDMAActive & 0x02) - return ATA_SDMA0+1; - if (ident->SingleWordDMAActive & 0x01) - return ATA_SDMA0+0; - - if (ident->PioTimingsValid) { - if (ident->AdvancedPIOModes & AdvancedPIOModes_5) - return ATA_PIO0+5; - if (ident->AdvancedPIOModes & AdvancedPIOModes_4) - return ATA_PIO0+4; - if (ident->AdvancedPIOModes & AdvancedPIOModes_3) - return ATA_PIO0+3; - } - if (ident->PioCycleTimingMode == 2) - return ATA_PIO0+2; - if (ident->PioCycleTimingMode == 1) - return ATA_PIO0+1; - if (ident->PioCycleTimingMode == 0) - return ATA_PIO0+0; - - return ATA_PIO; -} // end ata_cur_mode_from_ident() - void ata_mode_to_str( char* str, int mode ) { - if(mode == ATA_SA150-1) { - sprintf(str, "SATA"); + if(mode > ATA_SA600) { + sprintf(str, "SATA-600+"); + } else + if(mode >= ATA_SA600) { + sprintf(str, "SATA-600"); } else if(mode >= ATA_SA300) { sprintf(str, "SATA-300"); @@ -413,6 +359,12 @@ int mode; int len; + if(!_stricmp(str, "SATA600")) + return ATA_SA600; + if(!_stricmp(str, "SATA300")) + return ATA_SA300; + if(!_stricmp(str, "SATA150")) + return ATA_SA150; if(!_stricmp(str, "SATA")) return ATA_SA150; @@ -620,10 +572,34 @@ return FALSE; } + // Note: adapterInfo->NumberOfBuses is 1 greater than g_AdapterInfo->NumberChannels + // because of virtual communication port adapterInfo = (PSCSI_ADAPTER_BUS_INFO)g_inquiry_buffer; - for (i = 0; i < adapterInfo->NumberOfBuses; i++) { + for (i = 0; i+1 < adapterInfo->NumberOfBuses; i++) { inquiryData = (PSCSI_INQUIRY_DATA) (g_inquiry_buffer + adapterInfo->BusData[i].InquiryDataOffset); + + if(g_extended && g_AdapterInfo && g_AdapterInfo->ChanHeaderLengthValid && + g_AdapterInfo->NumberChannels < i) { + PCHANINFO ChanInfo; + + ChanInfo = (PCHANINFO) + (((PCHAR)g_AdapterInfo)+ + sizeof(ADAPTERINFO)+ + g_AdapterInfo->ChanHeaderLength*i); + + io_mode = ChanInfo->MaxTransferMode; + if(io_mode != -1) { + ata_mode_to_str(mode_str, io_mode); + } else { + mode_str[0] = 0; + } + printf(" b%u [%s]\n", + i, + mode_str + ); + } + while (adapterInfo->BusData[i].InquiryDataOffset) { /* if(dev_id/adapterInfo->BusData[i].NumberOfLogicalUnits == @@ -641,7 +617,7 @@ if(l_dev_id == dev_id || dev_id == -1) { - if(!memcmp(&inquiryData->InquiryData[8], UNIATA_COMM_PORT_VENDOR_STR, 24)) { + if(!memcmp(&(inquiryData->InquiryData[8]), UNIATA_COMM_PORT_VENDOR_STR, 24)) { // skip communication port goto next_dev; } @@ -651,7 +627,7 @@ if(inquiryData->Lun) { sprintf(lun_str, ":l%d", inquiryData->Lun); } else { - sprintf(lun_str, " ", inquiryData->Lun); + sprintf(lun_str, " "); } @@ -665,14 +641,17 @@ addr.PathId = inquiryData->PathId; addr.TargetId = inquiryData->TargetId; addr.Lun = inquiryData->Lun; - status = ata_send_ioctl(h, &addr, "-UNIATA-", + status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", IOCTL_SCSI_MINIPORT_UNIATA_GET_MODE, NULL, 0, &IoMode, sizeof(IoMode), &returned); if(status) { //io_mode = min(IoMode.CurrentMode, IoMode.MaxMode); - io_mode = min(max(IoMode.CurrentMode,IoMode.OrigMode),IoMode.MaxMode); + io_mode = IoMode.PhyMode; + if(!io_mode) { + io_mode = min(max(IoMode.CurrentMode,IoMode.OrigMode),IoMode.MaxMode); + } } else { io_mode = -1; } @@ -684,7 +663,7 @@ // probably, we shall change this in future to support SATA splitters pin.bDriveNumber = inquiryData->PathId*2+inquiryData->TargetId; - status = ata_send_ioctl(h, NULL, "SCSIDISK", + status = ata_send_ioctl(h, NULL, (PCHAR)"SCSIDISK", IOCTL_SCSI_MINIPORT_IDENTIFY, &pin, sizeof(pin), buff, sizeof(buff), @@ -698,7 +677,7 @@ // probably, we shall change this in future to support SATA splitters pin.bDriveNumber = inquiryData->PathId*2+inquiryData->TargetId; - status = ata_send_ioctl(h, NULL, "SCSIDISK", + status = ata_send_ioctl(h, NULL, (PCHAR)"SCSIDISK", IOCTL_SCSI_MINIPORT_IDENTIFY, &pin, sizeof(pin), buff, sizeof(buff), @@ -708,7 +687,7 @@ if(status) { if(!g_extended) { - printf(" b%d:d%d%s %24.24s %4.4s ", + printf(" b%u:d%d%s %24.24s %4.4s ", i, inquiryData->TargetId, lun_str, @@ -717,7 +696,7 @@ (g_extended ? (PUCHAR)"" : &inquiryData->InquiryData[8+24]) ); } else { - printf(" b%d:d%d%s ", + printf(" b%u:d%d%s ", i, inquiryData->TargetId, lun_str @@ -806,27 +785,27 @@ if(BlockMode_valid) { if(ident->MaximumBlockTransfer) { - printf(" Multi-block mode: %d block%s\n", ident->MaximumBlockTransfer, ident->MaximumBlockTransfer == 1 ? "" : "s"); + printf(" Multi-block mode: %u block%s\n", ident->MaximumBlockTransfer, ident->MaximumBlockTransfer == 1 ? "" : "s"); } else { printf(" Multi-block mode: N/A\n"); } } if(print_geom) { - printf(" C/H/S: %d/%d/%d \n", chs[0], chs[1], chs[2]); - printf(" LBA: %d \n", max_lba); + printf(" C/H/S: %u/%u/%u \n", chs[0], chs[1], chs[2]); + printf(" LBA: %I64u \n", max_lba); if(max_lba < 2) { - printf(" Size: %d kb\n", max_lba/2); + printf(" Size: %u kb\n", max_lba/2); } else if(max_lba < 2*1024*1024) { - printf(" Size: %d Mb\n", max_lba/2048); + printf(" Size: %u Mb\n", max_lba/2048); } else if(max_lba < (ULONG)2*1024*1024*1024) { - printf(" Size: %d.%d (%d) Gb\n", (ULONG)(max_lba/2048/1024), + printf(" Size: %u.%u (%u) Gb\n", (ULONG)(max_lba/2048/1024), (ULONG)(((max_lba/2048)%1024)/10), (ULONG)(max_lba*512/1000/1000/1000) ); } else { - printf(" Size: %d.%d (%d) Tb\n", (ULONG)(max_lba/2048/1024/1024), + printf(" Size: %u.%u (%u) Tb\n", (ULONG)(max_lba/2048/1024/1024), (ULONG)((max_lba/2048/1024)%1024)/10, (ULONG)(max_lba*512/1000/1000/1000) ); @@ -868,11 +847,13 @@ { char dev_name[64]; HANDLE h; - ADAPTERINFO AdapterInfo; + PADAPTERINFO AdapterInfo; ULONG status; ULONG returned; SCSI_ADDRESS addr; PCI_SLOT_NUMBER slotData; + char mode_str[12]; + ULONG len; sprintf(dev_name, "\\\\.\\Scsi%d:", bus_id); h = ata_open_dev(dev_name); @@ -880,35 +861,52 @@ return FALSE; addr.PortNumber = bus_id; - memset(&AdapterInfo, 0, sizeof(AdapterInfo)); - - status = ata_send_ioctl(h, &addr, "-UNIATA-", + len = sizeof(ADAPTERINFO)+sizeof(CHANINFO)*AHCI_MAX_PORT; + if(!g_AdapterInfo) { + AdapterInfo = (PADAPTERINFO)GlobalAlloc(GMEM_FIXED, len); + if(!AdapterInfo) { + return FALSE; + } + } else { + AdapterInfo = g_AdapterInfo; + } + memset(AdapterInfo, 0, len); + + status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", IOCTL_SCSI_MINIPORT_UNIATA_ADAPTER_INFO, - &AdapterInfo, sizeof(AdapterInfo), - &AdapterInfo, sizeof(AdapterInfo), + AdapterInfo, len, + AdapterInfo, len, &returned); - printf("Scsi%d: %s\n", bus_id, status ? "[UniATA]" : ""); + if(status) { + ata_mode_to_str(mode_str, AdapterInfo->MaxTransferMode); + } + printf("Scsi%d: %s %s\n", bus_id, status ? "[UniATA]" : "", status ? mode_str : ""); if(print_info) { if(!status) { printf("Can't get adapter info\n"); } else { - if(AdapterInfo.AdapterInterfaceType == PCIBus) { - slotData.u.AsULONG = AdapterInfo.slotNumber; - printf(" PCI Bus/Dev/Func: %d/%d/%d%s\n", - AdapterInfo.SystemIoBusNumber, slotData.u.bits.DeviceNumber, slotData.u.bits.FunctionNumber, - AdapterInfo.AdapterInterfaceType == AdapterInfo.OrigAdapterInterfaceType ? "" : " (ISA-Bridged)"); - printf(" VendorId/DevId/Rev: %#04x/%#04x/%#02x\n", AdapterInfo.DevID >> 16, AdapterInfo.DevID & 0xffff, AdapterInfo.RevID); - if(AdapterInfo.DeviceName[0]) { - printf(" Name: %s\n", AdapterInfo.DeviceName); + if(AdapterInfo->AdapterInterfaceType == PCIBus) { + slotData.u.AsULONG = AdapterInfo->slotNumber; + printf(" PCI Bus/Dev/Func: %u/%u/%u%s\n", + AdapterInfo->SystemIoBusNumber, slotData.u.bits.DeviceNumber, slotData.u.bits.FunctionNumber, + AdapterInfo->AdapterInterfaceType == AdapterInfo->OrigAdapterInterfaceType ? "" : " (ISA-Bridged)"); + printf(" VendorId/DevId/Rev: %#04x/%#04x/%#02x\n", + (USHORT)(AdapterInfo->DevID >> 16), + (USHORT)(AdapterInfo->DevID & 0xffff), + (UCHAR)(AdapterInfo->RevID)); + if(AdapterInfo->DeviceName[0]) { + printf(" Name: %s\n", AdapterInfo->DeviceName); } } else - if(AdapterInfo.AdapterInterfaceType == Isa) { + if(AdapterInfo->AdapterInterfaceType == Isa) { printf(" ISA Bus\n"); } - printf(" IRQ: %d\n", AdapterInfo.BusInterruptLevel); + printf(" IRQ: %d\n", AdapterInfo->BusInterruptLevel); } } ata_close_dev(h); + //GlobalFree(AdapterInfo); + g_AdapterInfo = AdapterInfo; return status ? TRUE : FALSE; } // end ata_adapter_info() @@ -996,7 +994,7 @@ // IoMode.ApplyImmediately = TRUE; IoMode.OrigMode = mode; - status = ata_send_ioctl(h, &addr, "-UNIATA-", + status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", IOCTL_SCSI_MINIPORT_UNIATA_SET_MAX_MODE, &IoMode, sizeof(IoMode), NULL, 0, @@ -1094,7 +1092,7 @@ if(lock) { printf("ATTENTION: you have %d seconds to disconnect cable\n", lock); } - status = ata_send_ioctl(h, &addr, "-UNIATA-", + status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", IOCTL_SCSI_MINIPORT_UNIATA_DELETE_DEVICE, &to, sizeof(to), NULL, 0, @@ -1144,7 +1142,7 @@ if(lock) { printf("You have %d seconds to connect device.\n", lock); } - status = ata_send_ioctl(h, &addr, "-UNIATA-", + status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", IOCTL_SCSI_MINIPORT_UNIATA_FIND_DEVICES, &to, sizeof(to), NULL, 0, @@ -1233,12 +1231,12 @@ print_help(); return FALSE; } - if((dev_id >> 16) & 0xff == 0xff) { + if(((dev_id >> 16) & 0xff) == 0xff) { printf("\nERROR: Target device bus number (channel) must be specified with b:<bus id>\n\n"); print_help(); return FALSE; } - if((dev_id >> 8) & 0xff == 0xff) { + if(((dev_id >> 8) & 0xff) == 0xff) { printf("\nERROR: Target device ID must be specified with d:<device id>\n\n"); print_help(); return FALSE; @@ -1289,7 +1287,7 @@ addr.TargetId = (UCHAR)(dev_id >> 8); addr.Lun = (UCHAR)(dev_id); - status = ata_send_ioctl(h, &addr, "-UNIATA-", + status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", IOCTL_SCSI_MINIPORT_UNIATA_RESETBB, NULL, 0, NULL, 0, @@ -1355,7 +1353,7 @@ } k = k0; if(radix == 10) { - b = sscanf(BB_Msg+k, "%I64d\t%I64d", &tmp_bb_lba, &tmp_bb_len); + b = sscanf(BB_Msg+k, "%I64u\t%I64u", &tmp_bb_lba, &tmp_bb_len); } else { b = sscanf(BB_Msg+k, "%I64x\t%I64x", &tmp_bb_lba, &tmp_bb_len); } @@ -1464,7 +1462,7 @@ while(len >= sizeof(LONGLONG)*2) { tmp_bb_lba = ((LONGLONG*)bblist)[i*2+0]; tmp_bb_len = ((LONGLONG*)bblist)[i*2+1] - tmp_bb_lba; - b = sprintf(BB_Msg, "%I64x\t%I64x\n", tmp_bb_lba, tmp_bb_len); + b = sprintf(BB_Msg, "%I64u\t%I64u\n", tmp_bb_lba, tmp_bb_len); WriteFile(hf, BB_Msg, b, &returned, NULL); i++; len -= sizeof(LONGLONG)*2; @@ -1511,7 +1509,7 @@ int persistent_hide=0; printf("Console ATA control utility for Windows NT3.51/NT4/2000/XP/2003\n" - "Version 0." UNIATA_VER_STR ", Copyright (c) Alexander A. Telyatnikov, 2003-2008\n" + "Version 0." UNIATA_VER_STR ", Copyright (c) Alexander A. Telyatnikov, 2003-2012\n" "Home site: http://alter.org.ua\n"); for(i=1; i<argc; i++) { @@ -1633,7 +1631,7 @@ j = strlen(argv[i])-1; break; case 'd' : - if(cmd && cmd != CMD_ATA_FIND && cmd != CMD_ATA_HIDE) { + if(cmd && (cmd != CMD_ATA_FIND) && (cmd != CMD_ATA_HIDE)) { print_help(); } i++; @@ -1680,12 +1678,12 @@ d_dev = 127; l_dev = 127; } else - if(d_dev == -1 && b_dev != -1) { + if((d_dev == -1) && (b_dev != -1)) { d_dev = 127; l_dev = 127; } - if(d_dev != -1 && b_dev != -1) { + if((d_dev != -1) && (b_dev != -1)) { dev_id = (b_dev << 16) | (d_dev << 8) | l_dev; } if(cmd == CMD_ATA_LIST) { Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Mon Aug 13 16:25:08 2012 @@ -295,6 +295,44 @@ UCHAR MediumType; UCHAR Reserved[5]; }MODE_PARAMETER_HEADER_10, *PMODE_PARAMETER_HEADER_10; + +// +// values for TransferMode +// +#define ATA_PIO 0x00 +#define ATA_PIO_NRDY 0x01 + +#define ATA_PIO0 0x08 +#define ATA_PIO1 0x09 +#define ATA_PIO2 0x0a +#define ATA_PIO3 0x0b +#define ATA_PIO4 0x0c +#define ATA_PIO5 0x0d + +#define ATA_DMA 0x10 +#define ATA_SDMA 0x10 +#define ATA_SDMA0 0x10 +#define ATA_SDMA1 0x11 +#define ATA_SDMA2 0x12 + +#define ATA_WDMA 0x20 +#define ATA_WDMA0 0x20 +#define ATA_WDMA1 0x21 +#define ATA_WDMA2 0x22 + +#define ATA_UDMA 0x40 +#define ATA_UDMA0 0x40 // ATA-16 +#define ATA_UDMA1 0x41 // ATA-25 +#define ATA_UDMA2 0x42 // ATA-33 +#define ATA_UDMA3 0x43 // ATA-44 +#define ATA_UDMA4 0x44 // ATA-66 +#define ATA_UDMA5 0x45 // ATA-100 +#define ATA_UDMA6 0x46 // ATA-133 +//#define ATA_UDMA7 0x47 // ATA-166 + +#define ATA_SA150 0x47 /*0x80*/ +#define ATA_SA300 0x48 /*0x81*/ +#define ATA_SA600 0x49 /*0x82*/ // // IDE command definitions @@ -767,6 +805,8 @@ USHORT HwResCableId : 1; USHORT HwResValid : 2; +#define IDENTIFY_CABLE_ID_VALID 0x01 + USHORT CurrentAcoustic : 8; // 94 USHORT VendorAcoustic : 8; @@ -1489,6 +1529,83 @@ #endif //USER_MODE +__inline +BOOLEAN +ata_is_sata( + PIDENTIFY_DATA ident + ) +{ + return (ident->SataCapabilities && ident->SataCapabilities != 0xffff); +} // end ata_is_sata() + +__inline +LONG +ata_cur_mode_from_ident( + PIDENTIFY_DATA ident + ) +{ + if(ata_is_sata(ident)) { + if(ident->SataCapabilities & ATA_SATA_GEN3) { + return ATA_SA600; + } else + if(ident->SataCapabilities & ATA_SATA_GEN2) { + return ATA_SA300; + } else + if(ident->SataCapabilities & ATA_SATA_GEN1) { + return ATA_SA150; + } + return ATA_SA150; + } + + if (ident->UdmaModesValid) { + if (ident->UltraDMAActive & 0x40) + return ATA_UDMA0+6; + if (ident->UltraDMAActive & 0x20) + return ATA_UDMA0+5; + if (ident->UltraDMAActive & 0x10) + return ATA_UDMA0+4; + if (ident->UltraDMAActive & 0x08) + return ATA_UDMA0+3; + if (ident->UltraDMAActive & 0x04) + return ATA_UDMA0+2; + if (ident->UltraDMAActive & 0x02) + return ATA_UDMA0+1; + if (ident->UltraDMAActive & 0x01) + return ATA_UDMA0+0; + } + + if (ident->MultiWordDMAActive & 0x04) + return ATA_WDMA0+2; + if (ident->MultiWordDMAActive & 0x02) + return ATA_WDMA0+1; + if (ident->MultiWordDMAActive & 0x01) + return ATA_WDMA0+0; + + if (ident->SingleWordDMAActive & 0x04) + return ATA_SDMA0+2; + if (ident->SingleWordDMAActive & 0x02) + return ATA_SDMA0+1; + if (ident->SingleWordDMAActive & 0x01) + return ATA_SDMA0+0; + + if (ident->PioTimingsValid) { + if (ident->AdvancedPIOModes & AdvancedPIOModes_5) + return ATA_PIO0+5; + if (ident->AdvancedPIOModes & AdvancedPIOModes_4) + return ATA_PIO0+4; + if (ident->AdvancedPIOModes & AdvancedPIOModes_3) + return ATA_PIO0+3; + } + if (ident->PioCycleTimingMode == 2) + return ATA_PIO0+2; + if (ident->PioCycleTimingMode == 1) + return ATA_PIO0+1; + if (ident->PioCycleTimingMode == 0) + return ATA_PIO0+0; + + return ATA_PIO; +} // end ata_cur_mode_from_ident() + #pragma pack(pop) #endif // __GLOBAL_H__ Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] Mon Aug 13 16:25:08 2012 @@ -40,44 +40,6 @@ #define IDE_MAX_LUN (AHCI_MAX_PORT*IDE_MAX_LUN_PER_CHAN) #define MAX_QUEUE_STAT 8 - -// -// values for TransferMode -// -#define ATA_PIO 0x00 -#define ATA_PIO_NRDY 0x01 - -#define ATA_PIO0 0x08 -#define ATA_PIO1 0x09 -#define ATA_PIO2 0x0a -#define ATA_PIO3 0x0b -#define ATA_PIO4 0x0c -#define ATA_PIO5 0x0d - -#define ATA_DMA 0x10 -#define ATA_SDMA 0x10 -#define ATA_SDMA0 0x10 -#define ATA_SDMA1 0x11 -#define ATA_SDMA2 0x12 - -#define ATA_WDMA 0x20 -#define ATA_WDMA0 0x20 -#define ATA_WDMA1 0x21 -#define ATA_WDMA2 0x22 - -#define ATA_UDMA 0x40 -#define ATA_UDMA0 0x40 // ATA-16 -#define ATA_UDMA1 0x41 // ATA-25 -#define ATA_UDMA2 0x42 // ATA-33 -#define ATA_UDMA3 0x43 // ATA-44 -#define ATA_UDMA4 0x44 // ATA-66 -#define ATA_UDMA5 0x45 // ATA-100 -#define ATA_UDMA6 0x46 // ATA-133 -//#define ATA_UDMA7 0x47 // ATA-166 - -#define ATA_SA150 0x47 /*0x80*/ -#define ATA_SA300 0x48 /*0x81*/ -#define ATA_SA600 0x49 /*0x82*/ // define PIO timings in nanoseconds #define PIO0_TIMING 600 Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] Mon Aug 13 16:25:08 2012 @@ -1085,13 +1085,14 @@ ULONG DiscsPresent; // Indicates number of platters on changer-ish devices. BOOLEAN DWordIO; // Indicates use of 32-bit PIO UCHAR ReturningMediaStatus; + UCHAR MaximumBlockXfer; + UCHAR Padding0[1]; // padding UCHAR TransferMode; // current transfer mode UCHAR LimitedTransferMode; // user-defined or IDE cable limitation UCHAR OrigTransferMode; // transfer mode, returned by device IDENTIFY (can be changed via IOCTL) - - UCHAR MaximumBlockXfer; - UCHAR Padding0[2]; // padding + UCHAR PhyTransferMode; // phy transfer mode (actual bus transfer mode for PATA DMA and SATA) + ULONG ErrorCount; // Count of errors. Used to turn off features. // ATA_QUEUE cmd_queue; LONGLONG ReadCmdCost; Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Mon Aug 13 16:25:08 2012 @@ -717,6 +717,14 @@ } else { AtapiStallExecution(500); AtapiWritePort1(chan, IDX_IO1_o_Command, IDE_COMMAND_ATAPI_RESET); + AtapiStallExecution(30); + + // Wait for BUSY assertion, in some cases delay may occure + while (!(AtapiReadPort1(chan, IDX_IO1_i_Status) & IDE_STATUS_BUSY) && + i--) + { + AtapiStallExecution(30); + } // ReactOS modification: Already stop looping when we know that the drive has finished resetting. // Not all controllers clear the IDE_STATUS_BUSY flag (e.g. not the VMware one), so ensure that @@ -1066,6 +1074,24 @@ return IOMODE_NOT_SPECIFIED; } // end AtaUmode() +LONG +NTAPI +AtaSAmode(PIDENTIFY_DATA2 ident) { + if(!ident->SataCapabilities || + ident->SataCapabilities == 0xffff) { + return IOMODE_NOT_SPECIFIED; + } + if(ident->SataCapabilities & ATA_SATA_GEN3) { + return ATA_SA600; + } else + if(ident->SataCapabilities & ATA_SATA_GEN2) { + return ATA_SA300; + } else + if(ident->SataCapabilities & ATA_SATA_GEN1) { + return ATA_SA150; + } + return IOMODE_NOT_SPECIFIED; +} // end AtaSAmode() #ifndef UNIATA_CORE @@ -1580,6 +1606,12 @@ KdPrint2((PRINT_PREFIX "SATA support: %x, CAPs %#x\n", deviceExtension->FullIdentifyData.SataSupport, deviceExtension->FullIdentifyData.SataCapabilities)); + + LunExt->LimitedTransferMode = + LunExt->OrigTransferMode = + (UCHAR)ata_cur_mode_from_ident(&(deviceExtension->FullIdentifyData)); + + KdPrint2((PRINT_PREFIX "OrigTransferMode: %x\n", LunExt->OrigTransferMode)); // Check out a few capabilities / limitations of the device. if (deviceExtension->FullIdentifyData.RemovableStatus & 1) { @@ -3001,7 +3033,7 @@ } PreferedMode = LunExt->opt_MaxTransferMode; - if(PreferedMode == 0xffffffff) { + if((PreferedMode == 0xffffffff) || (PreferedMode > chan->MaxTransferMode)) { KdPrint2((PRINT_PREFIX "MaxTransferMode (overriden): %#x\n", chan->MaxTransferMode)); PreferedMode = chan->MaxTransferMode; } @@ -3012,14 +3044,12 @@ } KdPrint2((PRINT_PREFIX " try mode %#x\n", PreferedMode)); - LunExt->OrigTransferMode = LunExt->LimitedTransferMode = LunExt->TransferMode = (CHAR)PreferedMode; AtapiDmaInit__(deviceExtension, LunExt); - LunExt->OrigTransferMode = LunExt->LimitedTransferMode = LunExt->TransferMode; KdPrint2((PRINT_PREFIX "Using %#x mode\n", LunExt->TransferMode)); @@ -5033,11 +5063,10 @@ } else { AtaReq->WordsLeft -= AtaReq->WordsTransfered; } - if(AtaReq->WordsLeft) { + if(AtaReq->WordsLeft && (status == SRB_STATUS_SUCCESS)) { status = SRB_STATUS_DATA_OVERRUN; - } else { - status = SRB_STATUS_SUCCESS; - } + } + status = SRB_STATUS_SUCCESS; chan->ChannelCtrlFlags &= ~CTRFLAGS_DMA_OPERATION; goto CompleteRequest; } else @@ -5106,11 +5135,13 @@ "IdeIntr: DMA tmp INTR %#x vs %#x\n", AtaReq->WordsLeft, wordCount)); if(AtaReq->WordsLeft > wordCount) { AtaReq->WordsLeft -= wordCount; + AtaReq->WordsTransfered += wordCount; AtaReq->ReqState = REQ_STATE_ATAPI_EXPECTING_DATA_INTR; goto ReturnEnableIntr; } dma_status = AtapiDmaDone(HwDeviceExtension, DEVNUM_NOT_SPECIFIED, lChannel, NULL/*srb*/); } + AtaReq->WordsTransfered = AtaReq->WordsLeft; AtaReq->WordsLeft = 0; status = SRB_STATUS_SUCCESS; chan->ChannelCtrlFlags &= ~CTRFLAGS_DMA_OPERATION; @@ -5152,6 +5183,7 @@ // Advance data buffer pointer and bytes left. AtaReq->DataBuffer += wordCount; AtaReq->WordsLeft -= wordCount; + AtaReq->WordsTransfered += wordCount; if (atapiDev) { AtaReq->ReqState = REQ_STATE_ATAPI_EXPECTING_DATA_INTR; @@ -5205,12 +5237,14 @@ "IdeIntr: DMA tmp INTR %#x vs %#x\n", AtaReq->WordsLeft, wordCount)); if(AtaReq->WordsLeft > wordCount) { AtaReq->WordsLeft -= wordCount; + AtaReq->WordsTransfered += wordCount; AtaReq->ReqState = REQ_STATE_ATAPI_EXPECTING_DATA_INTR; goto ReturnEnableIntr; } dma_status = AtapiDmaDone(HwDeviceExtension, DEVNUM_NOT_SPECIFIED, lChannel, NULL/*srb*/); } //ASSERT(AtaReq->WordsLeft == wordCount); + AtaReq->WordsTransfered = AtaReq->WordsLeft; AtaReq->WordsLeft = 0; status = SRB_STATUS_SUCCESS; chan->ChannelCtrlFlags &= ~CTRFLAGS_DMA_OPERATION; @@ -5281,6 +5315,7 @@ // Advance data buffer pointer and bytes left. AtaReq->DataBuffer += wordCount; AtaReq->WordsLeft -= wordCount; + AtaReq->WordsTransfered += wordCount; // Check for read command complete. if (AtaReq->WordsLeft == 0) { @@ -5358,13 +5393,14 @@ // Command complete. if(DmaTransfer) { KdPrint2((PRINT_PREFIX "AtapiInterrupt: CompleteRequest, was DmaTransfer\n")); + AtaReq->WordsTransfered = AtaReq->WordsLeft; AtaReq->WordsLeft = 0; } - if (AtaReq->WordsLeft) { - status = SRB_STATUS_DATA_OVERRUN; - } else { + //if (AtaReq->WordsLeft) { + // status = SRB_STATUS_DATA_OVERRUN; + //} else { status = SRB_STATUS_SUCCESS; - } + //} #ifdef UNIATA_DUMP_ATAPI if(srb && @@ -5419,6 +5455,12 @@ KdPrint2((PRINT_PREFIX "AtapiInterrupt: CompleteRequest, srbstatus %x\n", status)); // Check and see if we are processing our secret (mechanism status/request sense) srb + + if(AtaReq->WordsLeft && (status == SRB_STATUS_SUCCESS)) { + KdPrint2((PRINT_PREFIX "WordsLeft %#x -> SRB_STATUS_SUCCESS\n", AtaReq->WordsLeft)); + status = SRB_STATUS_DATA_OVERRUN; + } + if (AtaReq->OriginalSrb) { ULONG srbStatus; @@ -5691,10 +5733,10 @@ } } if(status == SRB_STATUS_SUCCESS) { - if(!(deviceExtension->HwFlags & UNIATA_AHCI)) { - // This should be set in UniataAhciEndTransaction() for AHCI - AtaReq->WordsTransfered += AtaReq->bcount * DEV_BSIZE/2; - } + //if(!(deviceExtension->HwFlags & UNIATA_AHCI) && !atapiDev) { + // // This should be set in UniataAhciEndTransaction() for AHCI + // AtaReq->WordsTransfered += AtaReq->bcount * DEV_BSIZE/2; + //} if(!atapiDev && AtaReq->WordsTransfered*2 < AtaReq->TransferLength) { KdPrint2((PRINT_PREFIX "AtapiInterrupt: more I/O required (%x of %x bytes) -> reenqueue\n", @@ -6788,7 +6830,6 @@ // check if DMA read/write if(deviceExtension->HwFlags & UNIATA_SATA) { - // DEBUG !!!! for TEST ONLY KdPrint2((PRINT_PREFIX "AtapiSendCommand: force use dma (ahci)\n")); use_dma = TRUE; goto setup_dma; @@ -8809,8 +8850,16 @@ //ULONG ldev = GET_LDEV2(AtaCtl->addr.PathId, AtaCtl->addr.TargetId, 0); ULONG DeviceNumber = AtaCtl->addr.TargetId; BOOLEAN bad_ldev; - ULONG i; + ULONG i, pos; + + pos = FIELD_OFFSET(UNIATA_CTL, RawData); //chan = &(deviceExtension->chan[lChannel]); + if(len < pos) { + KdPrint2((PRINT_PREFIX "AtapiStartIo: AtaCtl Buffer too small: %#x < %#x\n", len, + FIELD_OFFSET(UNIATA_CTL, RawData) )); + status = SRB_STATUS_DATA_OVERRUN; + break; + } if(AtaCtl->addr.Lun || AtaCtl->addr.TargetId >= deviceExtension->NumberLuns || @@ -8875,6 +8924,12 @@ } goto uata_ctl_queue; case IOCTL_SCSI_MINIPORT_UNIATA_SET_MAX_MODE: + if(len < pos+sizeof(AtaCtl->SetMode)) { + KdPrint2((PRINT_PREFIX "AtapiStartIo: AtaCtl Buffer too small: %#x < %#x\n", len, + pos+sizeof(AtaCtl->SetMode) )); + status = SRB_STATUS_DATA_OVERRUN; + goto complete_req; + } if(!AtaCtl->SetMode.ApplyImmediately) { break; } @@ -8905,6 +8960,12 @@ KdPrint2((PRINT_PREFIX "AtapiStartIo: rescan bus\n")); + if(len < pos+sizeof(AtaCtl->FindDelDev)) { + KdPrint2((PRINT_PREFIX "AtapiStartIo: AtaCtl Buffer too small: %#x < %#x\n", len, + pos+sizeof(AtaCtl->FindDelDev) )); + status = SRB_STATUS_DATA_OVERRUN; + goto complete_req; + } if(AtaCtl->FindDelDev.Flags & UNIATA_ADD_FLAGS_UNHIDE) { KdPrint2((PRINT_PREFIX "AtapiStartIo: unhide from further detection\n")); if(AtaCtl->addr.TargetId != 0xff) { @@ -8929,10 +8990,17 @@ KdPrint2((PRINT_PREFIX "AtapiStartIo: remove %#x:%#x\n", AtaCtl->addr.PathId, AtaCtl->addr.TargetId)); + if(len < pos+sizeof(AtaCtl->FindDelDev)) { + KdPrint2((PRINT_PREFIX "AtapiStartIo: AtaCtl Buffer too small: %#x < %#x\n", len, + pos+sizeof(AtaCtl->FindDelDev) )); + status = SRB_STATUS_DATA_OVERRUN; + goto complete_req; + } LunExt->DeviceFlags = 0; if(AtaCtl->FindDelDev.Flags & UNIATA_REMOVE_FLAGS_HIDE) { KdPrint2((PRINT_PREFIX "AtapiStartIo: hide from further detection\n")); - LunExt->DeviceFlags |= DFLAGS_HIDDEN; + //LunExt->DeviceFlags |= DFLAGS_HIDDEN; + UniataForgetDevice(LunExt); } for(i=0; i<AtaCtl->FindDelDev.WaitForPhysicalLink && i<30; i++) { @@ -8946,6 +9014,12 @@ KdPrint2((PRINT_PREFIX "AtapiStartIo: Set transfer mode\n")); + if(len < pos+sizeof(AtaCtl->SetMode)) { + KdPrint2((PRINT_PREFIX "AtapiStartIo: AtaCtl Buffer too small: %#x < %#x\n", len, + pos+sizeof(AtaCtl->SetMode) )); + status = SRB_STATUS_DATA_OVERRUN; + goto complete_req; + } if(AtaCtl->SetMode.OrigMode != IOMODE_NOT_SPECIFIED) { LunExt->OrigTransferMode = (UCHAR)(AtaCtl->SetMode.OrigMode); } @@ -8973,9 +9047,16 @@ KdPrint2((PRINT_PREFIX "AtapiStartIo: Get transfer mode\n")); + if(len < pos+sizeof(AtaCtl->GetMode)) { + KdPrint2((PRINT_PREFIX "AtapiStartIo: AtaCtl Buffer too small: %#x < %#x\n", len, + pos+sizeof(AtaCtl->GetMode) )); + status = SRB_STATUS_DATA_OVERRUN; + goto complete_req; + } AtaCtl->GetMode.OrigMode = LunExt->OrigTransferMode; AtaCtl->GetMode.MaxMode = LunExt->LimitedTransferMode; AtaCtl->GetMode.CurrentMode = LunExt->TransferMode; + AtaCtl->GetMode.PhyMode = LunExt->PhyTransferMode; status = SRB_STATUS_SUCCESS; break; @@ -8984,6 +9065,12 @@ KdPrint2((PRINT_PREFIX "AtapiStartIo: Get version\n")); + if(len < pos+sizeof(AtaCtl->Version)) { + KdPrint2((PRINT_PREFIX "AtapiStartIo: AtaCtl Buffer too small: %#x < %#x\n", len, + pos+sizeof(AtaCtl->Version) )); + status = SRB_STATUS_DATA_OVERRUN; + goto complete_req; + } AtaCtl->Version.Length = sizeof(GETDRVVERSION); AtaCtl->Version.VersionMj = UNIATA_VER_MJ; AtaCtl->Version.VersionMn = UNIATA_VER_MN; @@ -8997,14 +9084,13 @@ KdPrint2((PRINT_PREFIX "AtapiStartIo: Get adapter info\n")); - AtaCtl->AdapterInfo.HeaderLength = FIELD_OFFSET(ADAPTERINFO, Chan); - - if(len < AtaCtl->AdapterInfo.HeaderLength + sizeof(AtaCtl->AdapterInfo.Chan)) { - KdPrint2((PRINT_PREFIX "AtapiStartIo: Buffer too small: %#x < %#x\n", len, - AtaCtl->AdapterInfo.HeaderLength + sizeof(AtaCtl->AdapterInfo.Chan))); + if(len < pos+sizeof(AtaCtl->AdapterInfo)) { + KdPrint2((PRINT_PREFIX "AtapiStartIo: AtaCtl Buffer too small: %#x < %#x\n", len, + pos+sizeof(AtaCtl->AdapterInfo) )); status = SRB_STATUS_DATA_OVERRUN; - break; + goto complete_req; } + AtaCtl->AdapterInfo.HeaderLength = sizeof(ADAPTERINFO); AtaCtl->AdapterInfo.DevID = deviceExtension->DevID; AtaCtl->AdapterInfo.RevID = deviceExtension->RevID; @@ -9031,8 +9117,35 @@ } AtaCtl->AdapterInfo.ChanInfoValid = FALSE; AtaCtl->AdapterInfo.LunInfoValid = FALSE; - - RtlZeroMemory(&AtaCtl->AdapterInfo.Chan, sizeof(AtaCtl->AdapterInfo.Chan)); + AtaCtl->AdapterInfo.ChanHeaderLengthValid = TRUE; + + pos += AtaCtl->AdapterInfo.HeaderLength; + + // zero tail + RtlZeroMemory(((PCHAR)AtaCtl)+pos, + len-pos); + + if(len >= pos+AtaCtl->AdapterInfo.NumberChannels*sizeof(CHANINFO)) { + PCHANINFO ChanInfo = (PCHANINFO)( ((PCHAR)AtaCtl)+pos ); + PHW_CHANNEL cur_chan; + KdPrint2((PRINT_PREFIX "AtapiStartIo: Fill channel info\n")); + for(i=0;i<AtaCtl->AdapterInfo.NumberChannels;i++) { + KdPrint2((PRINT_PREFIX "chan[%d] %x\n", i, cur_chan)); + cur_chan = &(deviceExtension->chan[i]); + ChanInfo->MaxTransferMode = cur_chan->MaxTransferMode; + ChanInfo->ChannelCtrlFlags = cur_chan->ChannelCtrlFlags; + RtlCopyMemory(&(ChanInfo->QueueStat), &(cur_chan->QueueStat), sizeof(ChanInfo->QueueStat)); + ChanInfo->ReorderCount = cur_chan->ReorderCount; + ChanInfo->IntersectCount = cur_chan->IntersectCount; + ChanInfo->TryReorderCount = cur_chan->TryReorderCount; + ChanInfo->TryReorderHeadCount = cur_chan->TryReorderHeadCount; + ChanInfo->TryReorderTailCount = cur_chan->TryReorderTailCount; + //ChanInfo->opt_MaxTransferMode = cur_chan->opt_MaxTransferMode; + ChanInfo++; + } + AtaCtl->AdapterInfo.ChanInfoValid = TRUE; + AtaCtl->AdapterInfo.ChanHeaderLength = sizeof(*ChanInfo); + } status = SRB_STATUS_SUCCESS; break; Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Mon Aug 13 16:25:08 2012 @@ -879,9 +879,23 @@ KdPrint3((PRINT_PREFIX " assume that drive doesn't support mode swithing using PIO%d\n", apiomode)); mode = ATA_PIO0 + apiomode; } - //if(mode <= ATA_UDMA6) { - LunExt->TransferMode = (UCHAR)mode; - //} + // SATA sets actual transfer rate in LunExt on init. + // There is no run-time SATA rate adjustment yet. + // On the other hand, we may turn SATA device in PIO mode + LunExt->TransferMode = (UCHAR)mode; + if(deviceExtension->HwFlags & UNIATA_SATA) { + if(mode < ATA_SA150) { + LunExt->PhyTransferMode = max(LunExt->PhyTransferMode, LunExt->TransferMode); + } else { + LunExt->PhyTransferMode = LunExt->TransferMode; + } + } else { + if(LunExt->DeviceFlags & DFLAGS_ATAPI_DEVICE) { + LunExt->PhyTransferMode = max(LunExt->LimitedTransferMode, LunExt->TransferMode); + } else { + LunExt->PhyTransferMode = LunExt->TransferMode; + } + } return TRUE; } // end AtaSetTransferMode() @@ -999,8 +1013,7 @@ if((udmamode >= 5) || (ChipFlags & UNIATA_AHCI) || chan->MaxTransferMode >= ATA_SA150) { /* some drives report UDMA6, some UDMA5 */ /* ATAPI may not have SataCapabilities set in IDENTIFY DATA */ - if(LunExt->IdentifyData.SataCapabilities != 0x0000 && - LunExt->IdentifyData.SataCapabilities != 0xffff) { + if(ata_is_sata(&(LunExt->IdentifyData))) { //udmamode = min(udmamode, 6); KdPrint2((PRINT_PREFIX "LunExt->LimitedTransferMode %x, LunExt->OrigTransferMode %x\n", LunExt->LimitedTransferMode, LunExt->OrigTransferMode)); @@ -1011,7 +1024,7 @@ } else { KdPrint2((PRINT_PREFIX "SATA -> PATA adapter ?\n")); - if (udmamode > 2 && !LunExt->IdentifyData.HwResCableId) { + if (udmamode > 2 && (!LunExt->IdentifyData.HwResCableId || (LunExt->IdentifyData.HwResValid != IDENTIFY_CABLE_ID_VALID) )) { KdPrint2((PRINT_PREFIX "AtapiDmaInit: DMA limited to UDMA33, non-ATA66 compliant cable\n")); udmamode = 2; apiomode = min( apiomode, (CHAR)(LunExt->LimitedTransferMode - ATA_PIO0)); @@ -1041,9 +1054,8 @@ goto try_generic_dma; } - if(udmamode > 2 && !LunExt->IdentifyData.HwResCableId) { - if(LunExt->IdentifyData.SataCapabilities != 0x0000 && - LunExt->IdentifyData.SataCapabilities != 0xffff) { + if(udmamode > 2 && (!LunExt->IdentifyData.HwResCableId || (LunExt->IdentifyData.HwResValid != IDENTIFY_CABLE_ID_VALID)) ) { + if(ata_is_sata(&(LunExt->IdentifyData))) { KdPrint2((PRINT_PREFIX "AtapiDmaInit: SATA beyond adapter or Controller compat mode\n")); } else { KdPrint2((PRINT_PREFIX "AtapiDmaInit: DMA limited to UDMA33, non-ATA66 compliant cable\n")); Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Mon Aug 13 16:25:08 2012 @@ -1350,10 +1350,11 @@ GetPciConfig1(0x5a, res); res = res & (channel ? 0x01 : 0x02); SetPciConfig1(reg, val); + KdPrint2((PRINT_PREFIX "hpt_cable80(%d) = %d\n", channel, !res)); return !res; } // end hpt_cable80() - +/* ULONG NTAPI via_cable80( @@ -1398,9 +1399,11 @@ res |= TRUE; //(1 << (1 - (i >> 4))); } } + KdPrint2((PRINT_PREFIX "via_cable80(%d) = %d\n", channel, res)); return res; } // end via_cable80() +*/ BOOLEAN NTAPI @@ -1426,9 +1429,11 @@ GetPciConfig1(pci_reg, tmp8); if(!(tmp8 & (1 << (channel << bit_offs)))) { chan->MaxTransferMode = min(deviceExtension->MaxTransferMode, ATA_UDMA2); + KdPrint2((PRINT_PREFIX "generic_cable80(%d, %#x, %d) = 0\n", channel, pci_reg, bit_offs)); return FALSE; } + KdPrint2((PRINT_PREFIX "generic_cable80(%d, %#x, %d) = 1\n", channel, pci_reg, bit_offs)); return TRUE; } // end generic_cable80() @@ -1599,7 +1604,7 @@ AtapiChipInit( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, - IN ULONG channel // physical channel + IN ULONG channel // logical channel ) { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; @@ -1628,10 +1633,12 @@ c = CHAN_NOT_SPECIFIED; break; default: - c = channel - deviceExtension->Channel; // logical channel (for Compatible Mode controllers) - } - - KdPrint2((PRINT_PREFIX "AtapiChipInit: dev %#x, ph chan %d\n", DeviceNumber, channel )); + //c = channel - deviceExtension->Channel; // logical channel (for Compatible Mode controllers) + c = channel; + channel += deviceExtension->Channel; + } + + KdPrint2((PRINT_PREFIX "AtapiChipInit: dev %#x, ph chan %d, c %d\n", DeviceNumber, channel, c)); KdPrint2((PRINT_PREFIX "HwFlags: %#x\n", deviceExtension->HwFlags)); KdPrint2((PRINT_PREFIX "VendorID/DeviceID/Rev %#x/%#x/%#x\n", VendorID, DeviceID, RevID)); @@ -2236,11 +2243,12 @@ UniataSataWritePort4(chan, IDX_SATA_SError, 0xffffffff, 0); break; } - +/* // check 80-pin cable if(!via_cable80(deviceExtension, channel)) { chan->MaxTransferMode = min(deviceExtension->MaxTransferMode, ATA_UDMA2); } +*/ } break; Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Mon Aug 13 16:25:08 2012 @@ -68,7 +68,14 @@ if(SStatus.SPD == SStatus_SPD_Gen1 || SStatus.SPD == SStatus_SPD_Gen2 || SStatus.SPD == SStatus_SPD_Gen3) { + // SATA sets actual transfer rate in LunExt on init. + // There is no run-time SATA rate adjustment yet. + // On the other hand, we may turn SATA device in PIO mode + // TODO: make separate states for interface speed and transfer mode (DMA vs PIO) + chan->lun[0]->LimitedTransferMode = + chan->lun[0]->PhyTransferMode = chan->lun[0]->TransferMode = ATA_SA150 + (UCHAR)(SStatus.SPD - 1); + KdPrint2((PRINT_PREFIX "SATA TransferMode %#x\n", chan->lun[0]->TransferMode)); if(chan->MaxTransferMode < chan->lun[0]->TransferMode) { KdPrint2((PRINT_PREFIX "SATA upd chan TransferMode\n")); Modified: trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h [iso-8859-1] Mon Aug 13 16:25:08 2012 @@ -85,7 +85,7 @@ ULONG MaxMode; ULONG OrigMode; ULONG CurrentMode; - ULONG Reserved; + ULONG PhyMode; // since v0.42i6 } GETTRANSFERMODE, *PGETTRANSFERMODE; typedef struct _GETDRVVERSION { @@ -100,14 +100,13 @@ typedef struct _CHANINFO { ULONG MaxTransferMode; // may differ from Controller's value due to 40-pin cable ULONG ChannelCtrlFlags; -//#ifdef QUEUE_STATISTICS LONGLONG QueueStat[MAX_QUEUE_STAT]; LONGLONG ReorderCount; LONGLONG IntersectCount; LONGLONG TryReorderCount; LONGLONG TryReorderHeadCount; LONGLONG TryReorderTailCount; /* in-order requests */ -//#endif //QUEUE_STATISTICS +// ULONG opt_MaxTransferMode; // user-specified } CHANINFO, *PCHANINFO; typedef struct _ADAPTERINFO { @@ -143,13 +142,15 @@ ULONG NumberChannels; BOOLEAN ChanInfoValid; - UCHAR NumberLuns; + UCHAR NumberLuns; // per channel BOOLEAN LunInfoValid; - CHAR Reserved; + BOOLEAN ChanHeaderLengthValid; // since v0.42i8 ULONG AdapterInterfaceType; - - CHANINFO Chan[AHCI_MAX_PORT]; + ULONG ChanHeaderLength; + ULONG LunHeaderLength; + + //CHANINFO Chan[0]; } ADAPTERINFO, *PADAPTERINFO; @@ -216,7 +217,9 @@ #endif //ATA_FLAGS_DRDY_REQUIRED -#pragma pack(1) +#pragma pack(pop) + +#pragma pack(push, 1) typedef struct _IDEREGS_EX { UCHAR bFeaturesReg; // Used for specifying SMART "commands". UCHAR bSectorCountReg; // IDE sector count register @@ -263,11 +266,15 @@ ULONG ItemCount; UNIATA_REG_IO r[1]; } UNIATA_REG_IO_HDR, *PUNIATA_REG_IO_HDR; -#pragma pack() + +#pragma pack(pop) + +#pragma pack(push, 1) typedef struct _UNIATA_CTL { SRB_IO_CONTROL hdr; SCSI_ADDRESS addr; + ULONG Reserved; union { UCHAR RawData[1]; ADDREMOVEDEV FindDelDev;

12 years, 2 months

[akhaldi] 57071: [MSI_WINETEST] * Sync to Wine 1.5.10.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 13 16:18:14 2012 New Revision: 57071 URL: http://svn.reactos.org/svn/reactos?rev=57071&view=rev Log: [MSI_WINETEST] * Sync to Wine 1.5.10. Modified: trunk/rostests/winetests/msi/CMakeLists.txt trunk/rostests/winetests/msi/action.c trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/package.c trunk/rostests/winetests/msi/patch.c trunk/rostests/winetests/msi/suminfo.c Modified: trunk/rostests/winetests/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/CMakeLists.txt [iso-8859-1] Mon Aug 13 16:18:14 2012 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE action.c Modified: trunk/rostests/winetests/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/action.c?re… ============================================================================== --- trunk/rostests/winetests/msi/action.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/action.c [iso-8859-1] Mon Aug 13 16:18:14 2012 @@ -41,7 +41,6 @@ (LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR *); -static BOOL (WINAPI *pGetTokenInformation)(HANDLE, TOKEN_INFORMATION_CLASS, LPVOID, DWORD, PDWORD); static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -487,7 +486,11 @@ "Registry\tRoot\tKey\tName\tValue\tComponent_\n" "s72\ti2\tl255\tL255\tL0\ts72\n" "Registry\tRegistry\n" - "regdata\t2\tSOFTWARE\\Wine\\msitest\tValue\t[~]one[~]two[~]three\taugustus"; + "regdata\t2\tSOFTWARE\\Wine\\msitest\tValue\t[~]one[~]two[~]three\taugustus\n" + "regdata1\t2\tSOFTWARE\\Wine\\msitest\t*\t\taugustus\n" + "regdata2\t2\tSOFTWARE\\Wine\\msitest\t*\t#%\taugustus\n" + "regdata3\t2\tSOFTWARE\\Wine\\msitest\t*\t#x\taugustus\n" + "regdata4\t2\tSOFTWARE\\Wine\\msitest\\VisualStudio\\10.0\\AD7Metrics\\Exception\\{049EC4CC-30D2-4032-9256-EE18EB41B62B}\\Common Language Runtime Exceptions\\System.Workflow.ComponentModel.Serialization\\System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationException\tlong\tkey\taugustus\n"; static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -1458,6 +1461,76 @@ "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rep_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "rep.txt\trep\trep.txt\t1000\t\t\t8192\t1\n"; + +static const char rep_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "rep\t\t\trep feature\t1\t2\tMSITESTDIR\t0\n"; + +static const char rep_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "rep\trep\n"; + +static const char rep_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "rep\t{A24FAF2A-3B2E-41EF-AA78-331542E1A29D}\tMSITESTDIR\t0\t\trep.txt\n"; + +static const char rep_upgrade_dat[] = + "UpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\tRemove\tActionProperty\n" + "s38\tS20\tS20\tS255\ti4\tS255\ts72\n" + "Upgrade\tUpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\n" + "{2967C1CC-34D4-42EE-8D96-CD6836F192BF}\t\t\t\t256\t\tPRODUCT\n"; + +static const char rep_property_dat[] = + "Property\tValue\n" + "s72\tl0\n" + "Property\tProperty\n" + "HASUIRUN\t0\n" + "INSTALLLEVEL\t3\n" + "InstallMode\tTypical\n" + "Manufacturer\tWine\n" + "PIDTemplate\t###-#######\n" + "ProductCode\t{1699F0BB-0B61-4A89-AFE4-CFD60DFD76F3}\n" + "ProductLanguage\t1033\n" + "ProductName\tMSITEST\n" + "ProductVersion\t1.1.1\n" + "UpgradeCode\t{2967C1CC-34D4-42EE-8D96-CD6836F192BF}\n" + "PRODUCT\t2F41860D-7B4C-4DA7-BED9-B64F26594C56\n" + "MSIFASTINSTALL\t1\n"; + +static const char rep_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "FindRelatedProducts\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "RemoveExistingProducts\t\t1499\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "UnregisterExtensionInfo\t\t3000\n" + "UnregisterMIMEInfo\t\t3500\n" + "RegisterExtensionInfo\t\t4000\n" + "RegisterMIMEInfo\t\t4500\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const char *filename; @@ -1815,6 +1888,88 @@ ADD_TABLE(property) }; +static const msi_table rep_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(rep_component), + ADD_TABLE(rep_feature), + ADD_TABLE(rep_feature_comp), + ADD_TABLE(rep_file), + ADD_TABLE(rep_upgrade), + ADD_TABLE(rep_property), + ADD_TABLE(rep_install_exec_seq), + ADD_TABLE(media) +}; + +/* based on RegDeleteTreeW from dlls/advapi32/registry.c */ +static LSTATUS action_RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey, REGSAM access) +{ + LONG ret; + DWORD dwMaxSubkeyLen, dwMaxValueLen; + DWORD dwMaxLen, dwSize; + char szNameBuf[MAX_PATH], *lpszName = szNameBuf; + HKEY hSubKey = hKey; + + if(lpszSubKey) + { + ret = RegOpenKeyExA(hKey, lpszSubKey, 0, access, &hSubKey); + if (ret) return ret; + } + + ret = RegQueryInfoKeyA(hSubKey, NULL, NULL, NULL, NULL, + &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); + if (ret) goto cleanup; + + dwMaxSubkeyLen++; + dwMaxValueLen++; + dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); + if (dwMaxLen > sizeof(szNameBuf)) + { + /* Name too big: alloc a buffer for it */ + if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen))) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + } + + /* Recursively delete all the subkeys */ + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumKeyExA(hSubKey, 0, lpszName, &dwSize, NULL, + NULL, NULL, NULL)) break; + + ret = action_RegDeleteTreeA(hSubKey, lpszName, access); + if (ret) goto cleanup; + } + + if (lpszSubKey) + { + if (pRegDeleteKeyExA) + ret = pRegDeleteKeyExA(hKey, lpszSubKey, access, 0); + else + ret = RegDeleteKeyA(hKey, lpszSubKey); + } + else + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumValueA(hKey, 0, lpszName, &dwSize, + NULL, NULL, NULL, NULL)) break; + + ret = RegDeleteValueA(hKey, lpszName); + if (ret) goto cleanup; + } + +cleanup: + if (lpszName != szNameBuf) + HeapFree(GetProcessHeap(), 0, lpszName); + if(lpszSubKey) + RegCloseKey(hSubKey); + return ret; +} + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -1941,7 +2096,6 @@ GET_PROC(hmsi, MsiGetComponentPathExA); GET_PROC(hadvapi32, ConvertSidToStringSidA); - GET_PROC(hadvapi32, GetTokenInformation); GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) @@ -1957,7 +2111,7 @@ { HANDLE token; - if (!pOpenProcessToken || !pGetTokenInformation) return FALSE; + if (!pOpenProcessToken) return FALSE; if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) { @@ -1965,7 +2119,7 @@ TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; DWORD size; - ret = pGetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); CloseHandle(token); return (ret && type == TokenElevationTypeLimited); } @@ -2245,7 +2399,7 @@ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiSummaryInfoSetPropertyA(summary, PID_REVNUMBER, VT_LPSTR, 0, NULL, - "{004757CA-5092-49c2-AD20-28E1CE0DF5F2}"); + "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiSummaryInfoSetPropertyA(summary, PID_PAGECOUNT, VT_I4, version, NULL, NULL); @@ -2874,7 +3028,7 @@ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); - CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F"); + CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052C94DA02821EECD05F2F"); CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); if (!old_installer) @@ -2955,7 +3109,7 @@ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); - CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F"); + CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052C94DA02821EECD05F2F"); CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); if (!old_installer) @@ -4572,7 +4726,7 @@ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); size = MAX_PATH; - type = REG_MULTI_SZ; + type = 0xdeadbeef; memset(path, 'a', MAX_PATH); res = RegQueryValueExA(hkey, "Value", NULL, &type, (LPBYTE)path, &size); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4580,9 +4734,15 @@ ok(size == 15, "Expected 15, got %d\n", size); ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + res = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + + res = action_RegDeleteTreeA(hkey, "VisualStudio", KEY_ALL_ACCESS); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + RegDeleteValueA(hkey, "Value"); RegCloseKey(hkey); - RegDeleteKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest"); + RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); error: DeleteFile(msifile); @@ -6048,6 +6208,42 @@ DeleteFile(msifile); } +static void test_remove_existing_products(void) +{ + UINT r; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + create_test_files(); + create_file("msitest\\rep.txt", 1000); + create_database(msifile, rep_tables, sizeof(rep_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\rep.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + +error: + DeleteFileA("msitest\\rep.txt"); + delete_test_files(); + DeleteFile(msifile); +} + START_TEST(action) { DWORD len; @@ -6125,6 +6321,7 @@ test_register_extension_info(); test_register_mime_info(); test_publish_assemblies(); + test_remove_existing_products(); DeleteFileA(log_file); Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… ============================================================================== --- trunk/rostests/winetests/msi/automation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/automation.c [iso-8859-1] Mon Aug 13 16:18:14 2012 @@ -199,7 +199,7 @@ static const msi_summary_info summary_info[] = { ADD_INFO_LPSTR(PID_TEMPLATE, ";1033"), - ADD_INFO_LPSTR(PID_REVNUMBER, "{004757CA-5092-49c2-AD20-28E1CE0DF5F2}"), + ADD_INFO_LPSTR(PID_REVNUMBER, "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"), ADD_INFO_I4(PID_PAGECOUNT, 100), ADD_INFO_I4(PID_WORDCOUNT, 0), ADD_INFO_FILETIME(PID_CREATE_DTM, &systemtime), Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=57… ============================================================================== --- trunk/rostests/winetests/msi/db.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/db.c [iso-8859-1] Mon Aug 13 16:18:14 2012 @@ -453,11 +453,9 @@ ok(r == TRUE, "file didn't exist after commit\n"); } -typedef UINT (WINAPI *fnMsiDecomposeDescriptorA)(LPCSTR, LPCSTR, LPSTR, LPSTR, DWORD *); -static fnMsiDecomposeDescriptorA pMsiDecomposeDescriptorA; - static void test_msidecomposedesc(void) { + UINT (WINAPI *pMsiDecomposeDescriptorA)(LPCSTR, LPCSTR, LPSTR, LPSTR, DWORD *); char prod[MAX_FEATURE_CHARS+1], comp[MAX_FEATURE_CHARS+1], feature[MAX_FEATURE_CHARS+1]; const char *desc; UINT r; @@ -465,8 +463,7 @@ HMODULE hmod; hmod = GetModuleHandle("msi.dll"); - pMsiDecomposeDescriptorA = (fnMsiDecomposeDescriptorA) - GetProcAddress(hmod, "MsiDecomposeDescriptorA"); + pMsiDecomposeDescriptorA = (void*)GetProcAddress(hmod, "MsiDecomposeDescriptorA"); if (!pMsiDecomposeDescriptorA) return; @@ -1490,7 +1487,7 @@ HeapFree(GetProcessHeap(), 0, str); - MsiDatabaseCommit(hdb); + r = MsiDatabaseCommit(hdb); ok(r == ERROR_SUCCESS, "MsiDatabaseCommit failed\n"); MsiCloseHandle(hdb); @@ -9345,7 +9342,7 @@ size = sizeof(buffer); res = MsiRecordGetString(hrec, 1, buffer, &size ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - todo_wine ok(!strcmp(buffer,"b"), "b != %s\n", buffer); + ok(!strcmp(buffer,"b"), "b != %s\n", buffer); res = MsiCloseHandle( hrec ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… ============================================================================== --- trunk/rostests/winetests/msi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/install.c [iso-8859-1] Mon Aug 13 16:18:14 2012 @@ -46,7 +46,6 @@ (LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); -static BOOL (WINAPI *pGetTokenInformation)( HANDLE, TOKEN_INFORMATION_CLASS, LPVOID, DWORD, PDWORD ); static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -1237,6 +1236,53 @@ "PublishProduct\t\t1200\n" "InstallFinalize\t\t1300\n"; +static const char mixed_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "feature1\t\t\t\t1\t2\tMSITESTDIR\t0\n" + "feature2\t\t\t\t1\t2\tMSITESTDIR\t0\n"; + +static const char mixed_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature1\tcomp1\n" + "feature2\tcomp2\n"; + +static const char mixed_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "comp1\t{DE9F0EF4-0ED3-495A-8105-060C0EA457B8}\tTARGETDIR\t4\t\tregdata1\n" + "comp2\t{4912DBE7-FC3A-4F91-BB5C-88F5C15C19A5}\tTARGETDIR\t260\t\tregdata2\n"; + +static const char mixed_registry_dat[] = + "Registry\tRoot\tKey\tName\tValue\tComponent_\n" + "s72\ti2\tl255\tL255\tL0\ts72\n" + "Registry\tRegistry\n" + "regdata1\t2\tSOFTWARE\\Wine\\msitest\ttest1\t\tcomp1\n" + "regdata2\t2\tSOFTWARE\\Wine\\msitest\ttest2\t\tcomp2\n"; + +static const char mixed_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t200\n" + "FileCost\t\t300\n" + "CostFinalize\t\t400\n" + "InstallValidate\t\t500\n" + "InstallInitialize\t\t600\n" + "ProcessComponents\t\t700\n" + "UnpublishFeatures\t\t800\n" + "RemoveRegistryValues\t\t900\n" + "WriteRegistryValues\t\t1000\n" + "RegisterProduct\t\t1100\n" + "PublishFeatures\t\t1200\n" + "PublishProduct\t\t1300\n" + "InstallFinalize\t\t1400\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1928,6 +1974,18 @@ ADD_TABLE(uc_property) }; +static const msi_table mixed_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(mixed_component), + ADD_TABLE(mixed_feature), + ADD_TABLE(mixed_feature_comp), + ADD_TABLE(mixed_install_exec_seq), + ADD_TABLE(mixed_registry), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -2056,7 +2114,6 @@ GET_PROC(hmsi, MsiGetComponentPathExA); GET_PROC(hadvapi32, ConvertSidToStringSidA); - GET_PROC(hadvapi32, GetTokenInformation); GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) @@ -2072,7 +2129,7 @@ { HANDLE token; - if (!pOpenProcessToken || !pGetTokenInformation) return FALSE; + if (!pOpenProcessToken) return FALSE; if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) { @@ -2080,7 +2137,7 @@ TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; DWORD size; - ret = pGetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); CloseHandle(token); return (ret && type == TokenElevationTypeLimited); } @@ -2403,7 +2460,7 @@ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiSummaryInfoSetPropertyA(summary, PID_REVNUMBER, VT_LPSTR, 0, NULL, - "{004757CA-5092-49c2-AD20-28E1CE0DF5F2}"); + "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiSummaryInfoSetPropertyA(summary, PID_PAGECOUNT, VT_I4, version, NULL, NULL); @@ -6618,6 +6675,86 @@ DeleteFileA( msifile ); } +static void test_mixed_package(void) +{ + UINT r; + LONG res; + HKEY hkey; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + if (!is_wow64 && !is_64bit) + { + skip("this test must be run on 64-bit\n"); + return; + } + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + create_database_template(msifile, mixed_tables, sizeof(mixed_tables)/sizeof(msi_table), 200, "x64;1033"); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + ok(!res, "can't open 32-bit component key\n"); + res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); + ok(!res, "value test1 not found\n"); + RegCloseKey(hkey); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(!res, "can't open 64-bit component key\n"); + res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); + ok(!res, "value test2 not found\n"); + RegCloseKey(hkey); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND || broken(!res), "32-bit component key not removed\n"); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "64-bit component key not removed\n"); + + DeleteFileA( msifile ); + create_database_template(msifile, mixed_tables, sizeof(mixed_tables)/sizeof(msi_table), 200, "Intel;1033"); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + ok(!res, "can't open 32-bit component key\n"); + res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); + ok(!res, "value test1 not found\n"); + RegCloseKey(hkey); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(!res, "can't open 64-bit component key\n"); + res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); + ok(!res, "value test2 not found\n"); + RegCloseKey(hkey); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND || broken(!res), "32-bit component key not removed\n"); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "64-bit component key not removed\n"); + +error: + DeleteFileA( msifile ); + return; +} + START_TEST(install) { DWORD len; @@ -6709,6 +6846,7 @@ test_upgrade_code(); test_MsiGetFeatureInfo(); test_MsiSetFeatureAttributes(); + test_mixed_package(); DeleteFileA(log_file); Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… ============================================================================== --- trunk/rostests/winetests/msi/package.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/package.c [iso-8859-1] Mon Aug 13 16:18:14 2012 @@ -40,7 +40,6 @@ static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); -static BOOL (WINAPI *pGetTokenInformation)( HANDLE, TOKEN_INFORMATION_CLASS, LPVOID, DWORD, PDWORD ); static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI *pRegDeleteKeyExW)(HKEY, LPCWSTR, REGSAM, DWORD); @@ -68,7 +67,6 @@ GET_PROC(hshell32, SHGetFolderPathA); GET_PROC(hadvapi32, ConvertSidToStringSidA); - GET_PROC(hadvapi32, GetTokenInformation); GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hadvapi32, RegDeleteKeyExW) @@ -87,7 +85,7 @@ { HANDLE token; - if (!pOpenProcessToken || !pGetTokenInformation) return FALSE; + if (!pOpenProcessToken) return FALSE; if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) { @@ -95,7 +93,7 @@ TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; DWORD size; - ret = pGetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); CloseHandle(token); return (ret && type == TokenElevationTypeLimited); } @@ -2445,7 +2443,7 @@ ok(r == ERROR_INSTALL_PACKAGE_INVALID, "Expected ERROR_INSTALL_PACKAGE_INVALID, got %d\n", r); - set_summary_str(hdb, PID_REVNUMBER, "{004757CD-5092-49c2-AD20-28E1CE0DF5F2}"); + set_summary_str(hdb, PID_REVNUMBER, "{004757CD-5092-49C2-AD20-28E1CE0DF5F2}"); r = MsiOpenPackage(name, &hpack); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); Modified: trunk/rostests/winetests/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/patch.c?rev… ============================================================================== --- trunk/rostests/winetests/msi/patch.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/patch.c [iso-8859-1] Mon Aug 13 16:18:14 2012 @@ -35,7 +35,6 @@ LPCSTR, LPSTR, DWORD * ); static UINT (WINAPI *pMsiEnumPatchesExA)( LPCSTR, LPCSTR, DWORD, DWORD, DWORD, LPSTR, LPSTR, MSIINSTALLCONTEXT *, LPSTR, LPDWORD ); -static BOOL (WINAPI *pGetTokenInformation)( HANDLE, TOKEN_INFORMATION_CLASS, LPVOID, DWORD, PDWORD ); static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static const char *msifile = "winetest-patch.msi"; @@ -152,7 +151,6 @@ GET_PROC( hmsi, MsiGetPatchInfoExA ); GET_PROC( hmsi, MsiEnumPatchesExA ); - GET_PROC( hadvapi32, GetTokenInformation ); GET_PROC( hadvapi32, OpenProcessToken ); #undef GET_PROC } @@ -161,7 +159,7 @@ { HANDLE token; - if (!pOpenProcessToken || !pGetTokenInformation) return FALSE; + if (!pOpenProcessToken) return FALSE; if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) { @@ -169,7 +167,7 @@ TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; DWORD size; - ret = pGetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); CloseHandle(token); return (ret && type == TokenElevationTypeLimited); } Modified: trunk/rostests/winetests/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/suminfo.c?r… ============================================================================== --- trunk/rostests/winetests/msi/suminfo.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/suminfo.c [iso-8859-1] Mon Aug 13 16:18:14 2012 @@ -254,7 +254,7 @@ ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); /* filename, non-zero update count */ - MsiGetSummaryInformation(0, msifile, 1, &hsuminfo); + r = MsiGetSummaryInformation(0, msifile, 1, &hsuminfo); ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed\n"); r = MsiSummaryInfoSetProperty(hsuminfo, PID_AUTHOR, VT_LPSTR, 1, &ft, "Mike"); @@ -267,7 +267,7 @@ ok(r == ERROR_SUCCESS, "MsiCloseHandle failed %u\n", r); /* filename, zero update count */ - MsiGetSummaryInformation(0, msifile, 0, &hsuminfo); + r = MsiGetSummaryInformation(0, msifile, 0, &hsuminfo); ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed %u\n", r); r = MsiSummaryInfoSetProperty(hsuminfo, PID_AUTHOR, VT_LPSTR, 1, &ft, "Mike");

12 years, 2 months

[akhaldi] 57070: [MSI] * Sync to Wine 1.5.10

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 13 16:17:18 2012 New Revision: 57070 URL: http://svn.reactos.org/svn/reactos?rev=57070&view=rev Log: [MSI] * Sync to Wine 1.5.10 Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/assembly.c trunk/reactos/dll/win32/msi/automation.c trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.spec trunk/reactos/dll/win32/msi/msi_main.c trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/script.c trunk/reactos/dll/win32/msi/string.c trunk/reactos/dll/win32/msi/tokenize.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -1017,7 +1017,6 @@ r = MSI_IterateRecords(view, NULL, load_component, package); msiobj_release(&view->hdr); - msi_destroy_assembly_caches( package ); return r; } @@ -2390,13 +2389,17 @@ return MSI_SetFeatureStates(package); } -/* OK this value is "interpreted" and then formatted based on the - first few characters */ -static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type, - DWORD *size) +static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type, DWORD *size) { LPSTR data = NULL; + if (!value) + { + data = (LPSTR)strdupW(szEmpty); + *size = sizeof(szEmpty); + *type = REG_SZ; + return data; + } if (value[0]=='#' && value[1]!='#' && value[1]!='%') { if (value[1]=='x') @@ -2554,12 +2557,13 @@ return ret; } -static WCHAR *get_keypath( MSIPACKAGE *package, HKEY root, const WCHAR *path ) +static WCHAR *get_keypath( MSICOMPONENT *comp, HKEY root, const WCHAR *path ) { static const WCHAR prefixW[] = {'S','O','F','T','W','A','R','E','\\'}; static const UINT len = sizeof(prefixW) / sizeof(prefixW[0]); - if (is_64bit && package->platform == PLATFORM_INTEL && + if ((is_64bit || is_wow64) && + !(comp->Attributes & msidbComponentAttributes64bit) && root == HKEY_LOCAL_MACHINE && !strncmpiW( path, prefixW, len )) { UINT size; @@ -2574,18 +2578,54 @@ strcatW( path_32node, path + len ); return path_32node; } - return strdupW( path ); } +static HKEY open_key( HKEY root, const WCHAR *path, BOOL create ) +{ + REGSAM access = KEY_ALL_ACCESS; + WCHAR *subkey, *p, *q; + HKEY hkey, ret = NULL; + LONG res; + + if (is_wow64) access |= KEY_WOW64_64KEY; + + if (!(subkey = strdupW( path ))) return NULL; + p = subkey; + if ((q = strchrW( p, '\\' ))) *q = 0; + if (create) + res = RegCreateKeyExW( root, subkey, 0, NULL, 0, access, NULL, &hkey, NULL ); + else + res = RegOpenKeyExW( root, subkey, 0, access, &hkey ); + if (res) + { + TRACE("failed to open key %s (%d)\n", debugstr_w(subkey), res); + msi_free( subkey ); + return NULL; + } + if (q && q[1]) + { + ret = open_key( hkey, q + 1, create ); + RegCloseKey( hkey ); + } + else ret = hkey; + msi_free( subkey ); + return ret; +} + +static BOOL is_special_entry( const WCHAR *name ) +{ + return (name && (name[0] == '*' || name[0] == '+') && !name[1]); +} + static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; - LPSTR value_data = NULL; + LPSTR value; HKEY root_key, hkey; DWORD type,size; LPWSTR deformated, uikey, keypath; - LPCWSTR szRoot, component, name, key, value; + LPCWSTR szRoot, component, name, key; MSICOMPONENT *comp; MSIRECORD * uirow; INT root; @@ -2612,10 +2652,8 @@ /* null values can have special meanings */ if (name[0]=='-' && name[1] == 0) return ERROR_SUCCESS; - else if ((name[0]=='+' && name[1] == 0) || - (name[0] == '*' && name[1] == 0)) - name = NULL; - check_first = TRUE; + if ((name[0] == '+' || name[0] == '*') && !name[1]) + check_first = TRUE; } root = MSI_RecordGetInteger(row,2); @@ -2631,49 +2669,42 @@ strcpyW(uikey,szRoot); strcatW(uikey,deformated); - keypath = get_keypath( package, root_key, deformated ); + keypath = get_keypath( comp, root_key, deformated ); msi_free( deformated ); - if (RegCreateKeyW( root_key, keypath, &hkey )) + if (!(hkey = open_key( root_key, keypath, TRUE ))) { ERR("Could not create key %s\n", debugstr_w(keypath)); msi_free(uikey); msi_free(keypath); - return ERROR_SUCCESS; - } - - value = MSI_RecordGetString(row,5); - if (value) - value_data = parse_value(package, value, &type, &size); - else - { - value_data = (LPSTR)strdupW(szEmpty); - size = sizeof(szEmpty); - type = REG_SZ; - } - + return ERROR_FUNCTION_FAILED; + } + value = parse_value(package, MSI_RecordGetString(row, 5), &type, &size); deformat_string(package, name, &deformated); - if (!check_first) - { - TRACE("Setting value %s of %s\n",debugstr_w(deformated), - debugstr_w(uikey)); - RegSetValueExW(hkey, deformated, 0, type, (LPBYTE)value_data, size); - } - else - { - DWORD sz = 0; - rc = RegQueryValueExW(hkey, deformated, NULL, NULL, NULL, &sz); - if (rc == ERROR_SUCCESS || rc == ERROR_MORE_DATA) - { - TRACE("value %s of %s checked already exists\n", - debugstr_w(deformated), debugstr_w(uikey)); + if (!is_special_entry( name )) + { + if (!check_first) + { + TRACE("Setting value %s of %s\n", debugstr_w(deformated), + debugstr_w(uikey)); + RegSetValueExW(hkey, deformated, 0, type, (LPBYTE)value, size); } else { - TRACE("Checked and setting value %s of %s\n", - debugstr_w(deformated), debugstr_w(uikey)); - if (deformated || size) - RegSetValueExW(hkey, deformated, 0, type, (LPBYTE) value_data, size); + DWORD sz = 0; + rc = RegQueryValueExW(hkey, deformated, NULL, NULL, NULL, &sz); + if (rc == ERROR_SUCCESS || rc == ERROR_MORE_DATA) + { + TRACE("value %s of %s checked already exists\n", debugstr_w(deformated), + debugstr_w(uikey)); + } + else + { + TRACE("Checked and setting value %s of %s\n", debugstr_w(deformated), + debugstr_w(uikey)); + if (deformated || size) + RegSetValueExW(hkey, deformated, 0, type, (LPBYTE)value, size); + } } } RegCloseKey(hkey); @@ -2682,11 +2713,11 @@ MSI_RecordSetStringW(uirow,2,deformated); MSI_RecordSetStringW(uirow,1,uikey); if (type == REG_SZ || type == REG_EXPAND_SZ) - MSI_RecordSetStringW(uirow,3,(LPWSTR)value_data); + MSI_RecordSetStringW(uirow, 3, (LPWSTR)value); msi_ui_actiondata( package, szWriteRegistryValues, uirow ); msiobj_release( &uirow->hdr ); - msi_free(value_data); + msi_free(value); msi_free(deformated); msi_free(uikey); msi_free(keypath); @@ -2711,35 +2742,68 @@ return rc; } -static void delete_reg_value( HKEY root, const WCHAR *keypath, const WCHAR *value ) +static void delete_key( HKEY root, const WCHAR *path ) +{ + REGSAM access = 0; + WCHAR *subkey, *p; + HKEY hkey; + LONG res; + + if (is_wow64) access |= KEY_WOW64_64KEY; + + if (!(subkey = strdupW( path ))) return; + for (;;) + { + if ((p = strrchrW( subkey, '\\' ))) *p = 0; + hkey = open_key( root, subkey, FALSE ); + if (!hkey) break; + if (p && p[1]) + res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); + else + res = RegDeleteKeyExW( root, subkey, access, 0 ); + if (res) + { + TRACE("failed to delete key %s (%d)\n", debugstr_w(subkey), res); + break; + } + if (p && p[1]) RegCloseKey( hkey ); + else break; + } + msi_free( subkey ); +} + +static void delete_value( HKEY root, const WCHAR *path, const WCHAR *value ) { LONG res; HKEY hkey; DWORD num_subkeys, num_values; - if (!(res = RegOpenKeyW( root, keypath, &hkey ))) + if ((hkey = open_key( root, path, FALSE ))) { if ((res = RegDeleteValueW( hkey, value ))) - { TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); - } + res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, &num_subkeys, NULL, NULL, &num_values, NULL, NULL, NULL, NULL ); RegCloseKey( hkey ); if (!res && !num_subkeys && !num_values) { - TRACE("removing empty key %s\n", debugstr_w(keypath)); - RegDeleteKeyW( root, keypath ); - } - return; - } - TRACE("failed to open key %s (%d)\n", debugstr_w(keypath), res); -} - -static void delete_reg_key( HKEY root, const WCHAR *keypath ) -{ - LONG res = RegDeleteTreeW( root, keypath ); - if (res) TRACE("failed to delete key %s (%d)\n", debugstr_w(keypath), res); + TRACE("removing empty key %s\n", debugstr_w(path)); + delete_key( root, path ); + } + } +} + +static void delete_tree( HKEY root, const WCHAR *path ) +{ + LONG res; + HKEY hkey; + + if (!(hkey = open_key( root, path, FALSE ))) return; + res = RegDeleteTreeW( hkey, NULL ); + if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(path), res); + delete_key( root, path ); + RegCloseKey( hkey ); } static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID param ) @@ -2773,7 +2837,7 @@ { if (name[0] == '+' && !name[1]) return ERROR_SUCCESS; - else if ((name[0] == '-' && !name[1]) || (name[0] == '*' && !name[1])) + if ((name[0] == '-' || name[0] == '*') && !name[1]) { delete_key = TRUE; name = NULL; @@ -2795,10 +2859,10 @@ deformat_string( package, name, &deformated_name ); - keypath = get_keypath( package, hkey_root, deformated_key ); + keypath = get_keypath( comp, hkey_root, deformated_key ); msi_free( deformated_key ); - if (delete_key) delete_reg_key( hkey_root, keypath ); - else delete_reg_value( hkey_root, keypath, deformated_name ); + if (delete_key) delete_tree( hkey_root, keypath ); + else delete_value( hkey_root, keypath, deformated_name ); msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); @@ -2860,10 +2924,10 @@ deformat_string( package, name, &deformated_name ); - keypath = get_keypath( package, hkey_root, deformated_key ); + keypath = get_keypath( comp, hkey_root, deformated_key ); msi_free( deformated_key ); - if (delete_key) delete_reg_key( hkey_root, keypath ); - else delete_reg_value( hkey_root, keypath, deformated_name ); + if (delete_key) delete_tree( hkey_root, keypath ); + else delete_value( hkey_root, keypath, deformated_name ); msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); @@ -6981,23 +7045,51 @@ static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) { + static const WCHAR fmtW[] = + {'m','s','i','e','x','e','c',' ','/','i',' ','%','s',' ','R','E','M','O','V','E','=','%','s',0}; MSIPACKAGE *package = param; - const WCHAR *property = MSI_RecordGetString( rec, 1 ); - WCHAR *value; - - if ((value = msi_dup_property( package->db, property ))) - { - FIXME("remove %s\n", debugstr_w(value)); - msi_free( value ); - } + const WCHAR *property = MSI_RecordGetString( rec, 7 ); + UINT len = sizeof(fmtW)/sizeof(fmtW[0]); + WCHAR *product, *features, *cmd; + STARTUPINFOW si; + PROCESS_INFORMATION info; + BOOL ret; + + if (!(product = msi_dup_property( package->db, property ))) return ERROR_SUCCESS; + + deformat_string( package, MSI_RecordGetString( rec, 6 ), &features ); + + len += strlenW( product ); + if (features) + len += strlenW( features ); + else + len += sizeof(szAll) / sizeof(szAll[0]); + + if (!(cmd = msi_alloc( len * sizeof(WCHAR) ))) + { + msi_free( product ); + msi_free( features ); + return ERROR_OUTOFMEMORY; + } + sprintfW( cmd, fmtW, product, features ? features : szAll ); + msi_free( product ); + msi_free( features ); + + memset( &si, 0, sizeof(STARTUPINFOW) ); + ret = CreateProcessW( NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info ); + msi_free( cmd ); + if (!ret) return GetLastError(); + CloseHandle( info.hThread ); + + WaitForSingleObject( info.hProcess, INFINITE ); + CloseHandle( info.hProcess ); return ERROR_SUCCESS; } static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) { static const WCHAR query[] = { - 'S','E','L','E','C','T',' ','A','c','t','i','o','n','P','r','o','p','e','r','t','y',' ', - 'F','R','O','M',' ','U','p','g','r','a','d','e',0}; + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','U','p','g','r','a','d','e',0}; MSIQUERY *view; UINT r; @@ -7340,6 +7432,7 @@ TRACE("Performing action (%s)\n", debugstr_w(action)); + package->action_progress_increment = 0; handled = ACTION_HandleStandardAction(package, action, &rc); if (!handled) Modified: trunk/reactos/dll/win32/msi/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/assembly.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/assembly.c [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -34,25 +34,41 @@ static HRESULT (WINAPI *pCreateAssemblyCacheNet10)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet11)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet20)( IAssemblyCache **, DWORD ); +static HRESULT (WINAPI *pCreateAssemblyCacheNet40)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheSxs)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); -static HMODULE hfusion10, hfusion11, hfusion20, hmscoree, hsxs; +static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree, hsxs; static BOOL init_function_pointers( void ) { - static const WCHAR szFusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; + static const WCHAR szFusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; + static const WCHAR szMscoree[] = {'\\','m','s','c','o','r','e','e','.','d','l','l',0}; + static const WCHAR szSxs[] = {'s','x','s','.','d','l','l',0}; static const WCHAR szVersion10[] = {'v','1','.','0','.','3','7','0','5',0}; static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; - - if (pCreateAssemblyCacheNet10 || pCreateAssemblyCacheNet11 || pCreateAssemblyCacheNet20) return TRUE; - - if (!(hmscoree = LoadLibraryA( "mscoree.dll" ))) return FALSE; + static const WCHAR szVersion40[] = {'v','4','.','0','.','3','0','3','1','9',0}; + WCHAR path[MAX_PATH]; + DWORD len = GetSystemDirectoryW( path, MAX_PATH ); + + if (!hsxs && !(hsxs = LoadLibraryW( szSxs ))) return FALSE; + if (!(pCreateAssemblyCacheSxs = (void *)GetProcAddress( hsxs, "CreateAssemblyCache" ))) + { + FreeLibrary( hsxs ); + hsxs = NULL; + return FALSE; + } + strcpyW( path + len, szMscoree ); + if (hmscoree || !(hmscoree = LoadLibraryW( path ))) return TRUE; pGetFileVersion = (void *)GetProcAddress( hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ - if (!(pLoadLibraryShim = (void *)GetProcAddress( hmscoree, "LoadLibraryShim" ))) goto error; - + if (!(pLoadLibraryShim = (void *)GetProcAddress( hmscoree, "LoadLibraryShim" ))) + { + FreeLibrary( hmscoree ); + hmscoree = NULL; + return TRUE; + } if (!pLoadLibraryShim( szFusion, szVersion10, NULL, &hfusion10 )) pCreateAssemblyCacheNet10 = (void *)GetProcAddress( hfusion10, "CreateAssemblyCache" ); @@ -62,86 +78,56 @@ if (!pLoadLibraryShim( szFusion, szVersion20, NULL, &hfusion20 )) pCreateAssemblyCacheNet20 = (void *)GetProcAddress( hfusion20, "CreateAssemblyCache" ); - if (!pCreateAssemblyCacheNet10 && !pCreateAssemblyCacheNet11 && !pCreateAssemblyCacheNet20) goto error; - - if (!(hsxs = LoadLibraryA( "sxs.dll" ))) goto error; - if (!(pCreateAssemblyCacheSxs = (void *)GetProcAddress( hsxs, "CreateAssemblyCache" ))) goto error; + if (!pLoadLibraryShim( szFusion, szVersion40, NULL, &hfusion40 )) + pCreateAssemblyCacheNet40 = (void *)GetProcAddress( hfusion40, "CreateAssemblyCache" ); + return TRUE; - -error: +} + +BOOL msi_init_assembly_caches( MSIPACKAGE *package ) +{ + if (!init_function_pointers()) return FALSE; + if (pCreateAssemblyCacheSxs( &package->cache_sxs, 0 ) != S_OK) return FALSE; + if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet10( &package->cache_net[CLR_VERSION_V10], 0 ); + if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); + if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); + if (pCreateAssemblyCacheNet40) pCreateAssemblyCacheNet40( &package->cache_net[CLR_VERSION_V40], 0 ); + return TRUE; +} + +void msi_destroy_assembly_caches( MSIPACKAGE *package ) +{ + UINT i; + + if (package->cache_sxs) + { + IAssemblyCache_Release( package->cache_sxs ); + package->cache_sxs = NULL; + } + for (i = 0; i < CLR_VERSION_MAX; i++) + { + if (package->cache_net[i]) + { + IAssemblyCache_Release( package->cache_net[i] ); + package->cache_net[i] = NULL; + } + } pCreateAssemblyCacheNet10 = NULL; pCreateAssemblyCacheNet11 = NULL; pCreateAssemblyCacheNet20 = NULL; + pCreateAssemblyCacheNet40 = NULL; FreeLibrary( hfusion10 ); FreeLibrary( hfusion11 ); FreeLibrary( hfusion20 ); - FreeLibrary( hmscoree ); - return FALSE; -} - -BOOL msi_init_assembly_caches( MSIPACKAGE *package ) -{ - if (!init_function_pointers()) return FALSE; - if (package->cache_net[CLR_VERSION_V10] || - package->cache_net[CLR_VERSION_V11] || - package->cache_net[CLR_VERSION_V20]) return TRUE; - if (pCreateAssemblyCacheSxs( &package->cache_sxs, 0 ) != S_OK) return FALSE; - - if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V10], 0 ); - if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); - if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); - - if (package->cache_net[CLR_VERSION_V10] || - package->cache_net[CLR_VERSION_V11] || - package->cache_net[CLR_VERSION_V20]) - { - return TRUE; - } - if (package->cache_net[CLR_VERSION_V10]) - { - IAssemblyCache_Release( package->cache_net[CLR_VERSION_V10] ); - package->cache_net[CLR_VERSION_V10] = NULL; - } - if (package->cache_net[CLR_VERSION_V11]) - { - IAssemblyCache_Release( package->cache_net[CLR_VERSION_V11] ); - package->cache_net[CLR_VERSION_V11] = NULL; - } - if (package->cache_net[CLR_VERSION_V20]) - { - IAssemblyCache_Release( package->cache_net[CLR_VERSION_V20] ); - package->cache_net[CLR_VERSION_V20] = NULL; - } - IAssemblyCache_Release( package->cache_sxs ); - package->cache_sxs = NULL; - return FALSE; -} - -void msi_destroy_assembly_caches( MSIPACKAGE *package ) -{ - UINT i; - - for (i = 0; i < CLR_VERSION_MAX; i++) - { - if (package->cache_net[i]) - { - IAssemblyCache_Release( package->cache_net[i] ); - package->cache_net[i] = NULL; - } - } - if (package->cache_sxs) - { - IAssemblyCache_Release( package->cache_sxs ); - package->cache_sxs = NULL; - } - pCreateAssemblyCacheNet10 = NULL; - pCreateAssemblyCacheNet11 = NULL; - pCreateAssemblyCacheNet20 = NULL; - FreeLibrary( hfusion10 ); - FreeLibrary( hfusion11 ); - FreeLibrary( hfusion20 ); + FreeLibrary( hfusion40 ); FreeLibrary( hmscoree ); FreeLibrary( hsxs ); + hfusion10 = NULL; + hfusion11 = NULL; + hfusion20 = NULL; + hfusion40 = NULL; + hmscoree = NULL; + hsxs = NULL; } static MSIRECORD *get_assembly_record( MSIPACKAGE *package, const WCHAR *comp ) @@ -260,6 +246,8 @@ HRESULT hr; ASSEMBLY_INFO info; + if (!cache) return FALSE; + memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, display_name, &info ); @@ -274,13 +262,15 @@ static const WCHAR clr_version_v10[] = {'v','1','.','0','.','3','7','0','5',0}; static const WCHAR clr_version_v11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR clr_version_v20[] = {'v','2','.','0','.','5','0','7','2','7',0}; +static const WCHAR clr_version_v40[] = {'v','4','.','0','.','3','0','3','1','9',0}; static const WCHAR clr_version_unknown[] = {'u','n','k','n','o','w','n',0}; static const WCHAR *clr_version[] = { clr_version_v10, clr_version_v11, - clr_version_v20 + clr_version_v20, + clr_version_v40 }; static const WCHAR *get_clr_version_str( enum clr_version version ) @@ -347,6 +337,7 @@ { TRACE("runtime version %s\n", debugstr_w(get_clr_version_str( i ))); a->installed = TRUE; + break; } } } @@ -411,6 +402,7 @@ { manifest = msi_get_loaded_file( package, comp->KeyPath )->TargetPath; cache = package->cache_net[get_clr_version( manifest )]; + if (!cache) return ERROR_SUCCESS; } TRACE("installing assembly %s\n", debugstr_w(manifest)); @@ -455,8 +447,11 @@ { if (!assembly->clr_version[i]) continue; cache = package->cache_net[i]; - hr = IAssemblyCache_UninstallAssembly( cache, 0, assembly->display_name, NULL, NULL ); - if (FAILED( hr )) WARN("failed to uninstall assembly 0x%08x\n", hr); + if (cache) + { + hr = IAssemblyCache_UninstallAssembly( cache, 0, assembly->display_name, NULL, NULL ); + if (FAILED( hr )) WARN("failed to uninstall assembly 0x%08x\n", hr); + } } } if (feature) feature->Action = INSTALLSTATE_ABSENT; Modified: trunk/reactos/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c… ============================================================================== --- trunk/reactos/dll/win32/msi/automation.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/automation.c [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -609,8 +609,7 @@ hr = create_list_enumerator(This->list, (LPVOID *)ppEnum); if (FAILED(hr)) { - if (*ppEnum) - IUnknown_Release(*ppEnum); + if (*ppEnum) IEnumVARIANT_Release(*ppEnum); return hr; } Modified: trunk/reactos/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/custom.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/custom.c [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -935,13 +935,15 @@ static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { - const WCHAR *workingdir; + const WCHAR *workingdir = NULL; HANDLE handle; WCHAR *cmd; - workingdir = msi_get_target_folder( package, source ); - if (!workingdir) return ERROR_FUNCTION_FAILED; - + if (source) + { + workingdir = msi_get_target_folder( package, source ); + if (!workingdir) return ERROR_FUNCTION_FAILED; + } deformat_string( package, target, &cmd ); if (!cmd) return ERROR_FUNCTION_FAILED; @@ -957,7 +959,7 @@ { msi_custom_action_info *info; MSIHANDLE hPackage; - UINT r; + UINT r = ERROR_FUNCTION_FAILED; info = find_action_by_guid( guid ); if (!info) @@ -979,13 +981,13 @@ ERR("failed to create handle for %p\n", info->package ); release_custom_action_data( info ); - return S_OK; + return r; } static DWORD WINAPI ScriptThread( LPVOID arg ) { LPGUID guid = arg; - DWORD rc = 0; + DWORD rc; TRACE("custom action (%x) started\n", GetCurrentThreadId() ); @@ -1437,7 +1439,7 @@ if( IsEqualCLSID( riid, &IID_IUnknown ) || IsEqualCLSID( riid, &IID_IWineMsiRemoteCustomAction ) ) { - IUnknown_AddRef( iface ); + IWineMsiRemoteCustomAction_AddRef( iface ); *ppobj = iface; return S_OK; } Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/database.c [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -164,7 +164,7 @@ if (!(stream = msi_alloc( sizeof(MSISTREAM) ))) return ERROR_NOT_ENOUGH_MEMORY; stream->stg = stg; - IStream_AddRef( stg ); + IStorage_AddRef( stg ); stream->stm = *stm; IStream_AddRef( *stm ); list_add_tail( &db->streams, &stream->entry ); @@ -207,7 +207,7 @@ list_remove( &stream->entry ); IStream_Release( stream->stm ); - IStream_Release( stream->stg ); + IStorage_Release( stream->stg ); IStorage_DestroyElement( stream->stg, stname ); msi_free( stream ); CoTaskMemFree( stat.pwcsName ); @@ -224,7 +224,7 @@ MSISTREAM *s = LIST_ENTRY(list_head( &db->streams ), MSISTREAM, entry); list_remove( &s->entry ); IStream_Release( s->stm ); - IStream_Release( s->stg ); + IStorage_Release( s->stg ); msi_free( s ); } } @@ -2082,7 +2082,7 @@ if( IsEqualCLSID( riid, &IID_IUnknown ) || IsEqualCLSID( riid, &IID_IWineMsiRemoteDatabase ) ) { - IUnknown_AddRef( iface ); + IWineMsiRemoteDatabase_AddRef( iface ); *ppobj = iface; return S_OK; } Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -644,11 +644,11 @@ TRACE("progress: func %u val1 %u val2 %u\n", func, val1, val2); + units = val1 / 512; switch (func) { case 0: /* init */ SendMessageW( ctrl->hwnd, PBM_SETRANGE, 0, MAKELPARAM(0,100) ); - units = val1 / 512; if (val2) { ctrl->progress_max = units ? units : 100; @@ -664,10 +664,11 @@ SendMessageW( ctrl->hwnd, PBM_SETPOS, 0, 0 ); } break; - case 1: /* FIXME: not sure what this is supposed to do */ + case 1: /* action data increment */ + if (val2) dialog->package->action_progress_increment = val1; + else dialog->package->action_progress_increment = 0; break; case 2: /* move */ - units = val1 / 512; if (ctrl->progress_backwards) { if (units >= ctrl->progress_current) ctrl->progress_current -= units; @@ -679,6 +680,9 @@ else ctrl->progress_current = ctrl->progress_max; } SendMessageW( ctrl->hwnd, PBM_SETPOS, MulDiv(100, ctrl->progress_current, ctrl->progress_max), 0 ); + break; + case 3: /* add */ + ctrl->progress_max += units; break; default: FIXME("Unknown progress message %u\n", func); Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/files.c [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -399,7 +399,6 @@ goto done; } } - msi_init_assembly_caches( package ); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { comp->Action = msi_get_component_action( package, comp ); @@ -414,7 +413,6 @@ } } } - msi_destroy_assembly_caches( package ); done: msi_free_media_info(mi); @@ -1309,7 +1307,6 @@ msiobj_release( &uirow->hdr ); } - msi_init_assembly_caches( package ); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { comp->Action = msi_get_component_action( package, comp ); @@ -1328,6 +1325,5 @@ remove_folder( folder ); } } - msi_destroy_assembly_caches( package ); return ERROR_SUCCESS; } Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=57… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -4207,3 +4207,9 @@ FIXME("%u\n", state); return ERROR_SUCCESS; } + +UINT WINAPI Migrate10CachedPackagesW(void* a, void* b, void* c, DWORD d) +{ + FIXME("%p,%p,%p,%08x\n", a, b, c, d); + return ERROR_SUCCESS; +} Modified: trunk/reactos/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -229,7 +229,7 @@ 233 stub MsiDeleteUserDataA 234 stub MsiDeleteUserDataW 235 stub Migrate10CachedPackagesA -236 stub Migrate10CachedPackagesW +236 stdcall Migrate10CachedPackagesW(ptr ptr ptr long) 237 stub MsiRemovePatchesA 238 stub MsiRemovePatchesW 239 stdcall MsiApplyMultiplePatchesA(str str str) Modified: trunk/reactos/dll/win32/msi/msi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/msi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi_main.c [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -73,6 +73,7 @@ case DLL_PROCESS_ATTACH: msi_hInstance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); + IsWow64Process( GetCurrentProcess(), &is_wow64 ); break; case DLL_PROCESS_DETACH: msi_dialog_unregister_class(); Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… ============================================================================== --- trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -39,6 +39,7 @@ #include "wine/debug.h" static const BOOL is_64bit = sizeof(void *) > sizeof(int); +BOOL is_wow64; #define MSI_DATASIZEMASK 0x00ff #define MSITYPE_VALID 0x0100 @@ -347,6 +348,7 @@ CLR_VERSION_V10, CLR_VERSION_V11, CLR_VERSION_V20, + CLR_VERSION_V40, CLR_VERSION_MAX }; @@ -369,6 +371,7 @@ struct list cabinet_streams; LPWSTR ActionFormat; LPWSTR LastAction; + UINT action_progress_increment; HANDLE log_file; IAssemblyCache *cache_net[CLR_VERSION_MAX]; IAssemblyCache *cache_sxs; Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/package.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/package.c [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -344,8 +344,9 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg) { - UINT i; MSIPACKAGE *package = (MSIPACKAGE *)arg; + + msi_destroy_assembly_caches( package ); if( package->dialog ) msi_dialog_destroy( package->dialog ); @@ -353,10 +354,6 @@ msiobj_release( &package->db->hdr ); free_package_structures(package); CloseHandle( package->log_file ); - - for (i = 0; i < CLR_VERSION_MAX; i++) - if (package->cache_net[i]) IAssemblyCache_Release( package->cache_net[i] ); - if (package->cache_sxs) IAssemblyCache_Release( package->cache_sxs ); if (package->delete_on_close) DeleteFileW( package->localfile ); msi_free( package->localfile ); @@ -669,12 +666,11 @@ static VOID set_installer_properties(MSIPACKAGE *package) { - WCHAR pth[MAX_PATH]; WCHAR *ptr; OSVERSIONINFOEXW OSVersion; MEMORYSTATUSEX msex; DWORD verval, len; - WCHAR verstr[10], bufstr[20]; + WCHAR pth[MAX_PATH], verstr[11], bufstr[22]; HDC dc; HKEY hkey; LPWSTR username, companyname; @@ -704,14 +700,13 @@ static const WCHAR szVersion9x[] = {'V','e','r','s','i','o','n','9','X',0}; static const WCHAR szVersionNT[] = {'V','e','r','s','i','o','n','N','T',0}; static const WCHAR szMsiNTProductType[] = {'M','s','i','N','T','P','r','o','d','u','c','t','T','y','p','e',0}; - static const WCHAR szFormat[] = {'%','l','i',0}; + static const WCHAR szFormat[] = {'%','u',0}; + static const WCHAR szFormat2[] = {'%','u','.','%','u',0}; static const WCHAR szWindowsBuild[] = {'W','i','n','d','o','w','s','B','u','i','l','d',0}; static const WCHAR szServicePackLevel[] = {'S','e','r','v','i','c','e','P','a','c','k','L','e','v','e','l',0}; - static const WCHAR szSix[] = {'6',0 }; static const WCHAR szVersionMsi[] = { 'V','e','r','s','i','o','n','M','s','i',0 }; static const WCHAR szVersionDatabase[] = { 'V','e','r','s','i','o','n','D','a','t','a','b','a','s','e',0 }; static const WCHAR szPhysicalMemory[] = { 'P','h','y','s','i','c','a','l','M','e','m','o','r','y',0 }; - static const WCHAR szFormat2[] = {'%','l','i','.','%','l','i',0}; static const WCHAR szScreenX[] = {'S','c','r','e','e','n','X',0}; static const WCHAR szScreenY[] = {'S','c','r','e','e','n','Y',0}; static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; @@ -874,8 +869,8 @@ } sprintfW(verstr, szFormat, OSVersion.dwBuildNumber); msi_set_property(package->db, szWindowsBuild, verstr); - /* just fudge this */ - msi_set_property(package->db, szServicePackLevel, szSix); + sprintfW(verstr, szFormat, OSVersion.wServicePackMajor); + msi_set_property(package->db, szServicePackLevel, verstr); sprintfW( bufstr, szFormat2, MSI_MAJORVERSION, MSI_MINORVERSION); msi_set_property( package->db, szVersionMsi, bufstr ); @@ -1339,7 +1334,6 @@ static UINT validate_package( MSIPACKAGE *package ) { - BOOL is_wow64; UINT i; if (package->platform == PLATFORM_INTEL64) @@ -1348,7 +1342,6 @@ if (package->platform == PLATFORM_ARM) return ERROR_INSTALL_PLATFORM_UNSUPPORTED; #endif - IsWow64Process( GetCurrentProcess(), &is_wow64 ); if (package->platform == PLATFORM_X64) { if (!is_64bit && !is_wow64) @@ -1905,8 +1898,16 @@ msi_free(deformated); ControlEvent_FireSubscribedEvent(package, szActionData, uirow); - msiobj_release(&uirow->hdr); + + if (package->action_progress_increment) + { + uirow = MSI_CreateRecord(2); + MSI_RecordSetInteger(uirow, 1, 2); + MSI_RecordSetInteger(uirow, 2, package->action_progress_increment); + ControlEvent_FireSubscribedEvent(package, szSetProgress, uirow); + msiobj_release(&uirow->hdr); + } break; case INSTALLMESSAGE_ACTIONSTART: @@ -2360,7 +2361,7 @@ if( IsEqualCLSID( riid, &IID_IUnknown ) || IsEqualCLSID( riid, &IID_IWineMsiRemotePackage ) ) { - IUnknown_AddRef( iface ); + IWineMsiRemotePackage_AddRef( iface ); *ppobj = iface; return S_OK; } Modified: trunk/reactos/dll/win32/msi/script.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/script.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/script.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/script.c [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -81,7 +81,8 @@ { HRESULT hr; IActiveScript *pActiveScript = NULL; - IActiveScriptParse *pActiveScriptParse = NULL; + IActiveScriptParse32 *pActiveScriptParse32 = NULL; + IActiveScriptParse64 *pActiveScriptParse64 = NULL; MsiActiveScriptSite *pActiveScriptSite = NULL; IDispatch *pDispatch = NULL; DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0}; @@ -123,27 +124,41 @@ goto done; } - /* Get the IActiveScriptParse engine interface */ - hr = IActiveScript_QueryInterface(pActiveScript, &IID_IActiveScriptParse, (void **)&pActiveScriptParse); - if (FAILED(hr)) goto done; - - /* Give our host to the engine */ - hr = IActiveScript_SetScriptSite(pActiveScript, (IActiveScriptSite *)pActiveScriptSite); - if (FAILED(hr)) goto done; - - /* Initialize the script engine */ - hr = IActiveScriptParse64_InitNew(pActiveScriptParse); - if (FAILED(hr)) goto done; - - /* Add the session object */ - hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_GLOBALMEMBERS); - if (FAILED(hr)) goto done; - - /* Pass the script to the engine */ - hr = IActiveScriptParse64_ParseScriptText(pActiveScriptParse, script, NULL, NULL, NULL, 0, 0, 0L, NULL, NULL); - if (FAILED(hr)) goto done; - - /* Start processing the script */ + if (type & msidbCustomActionType64BitScript) + { + hr = IActiveScript_QueryInterface(pActiveScript, &IID_IActiveScriptParse64, (void **)&pActiveScriptParse64); + if (FAILED(hr)) goto done; + + hr = IActiveScript_SetScriptSite(pActiveScript, (IActiveScriptSite *)pActiveScriptSite); + if (FAILED(hr)) goto done; + + hr = IActiveScriptParse64_InitNew(pActiveScriptParse64); + if (FAILED(hr)) goto done; + + hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_GLOBALMEMBERS); + if (FAILED(hr)) goto done; + + hr = IActiveScriptParse64_ParseScriptText(pActiveScriptParse64, script, NULL, NULL, NULL, 0, 0, 0L, NULL, NULL); + if (FAILED(hr)) goto done; + } + else + { + hr = IActiveScript_QueryInterface(pActiveScript, &IID_IActiveScriptParse32, (void **)&pActiveScriptParse32); + if (FAILED(hr)) goto done; + + hr = IActiveScript_SetScriptSite(pActiveScript, (IActiveScriptSite *)pActiveScriptSite); + if (FAILED(hr)) goto done; + + hr = IActiveScriptParse32_InitNew(pActiveScriptParse32); + if (FAILED(hr)) goto done; + + hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_GLOBALMEMBERS); + if (FAILED(hr)) goto done; + + hr = IActiveScriptParse32_ParseScriptText(pActiveScriptParse32, script, NULL, NULL, NULL, 0, 0, 0L, NULL, NULL); + if (FAILED(hr)) goto done; + } + hr = IActiveScript_SetScriptState(pActiveScript, SCRIPTSTATE_CONNECTED); if (FAILED(hr)) goto done; @@ -176,17 +191,17 @@ done: - /* Free everything that needs to be freed */ if (pDispatch) IDispatch_Release(pDispatch); - if (pActiveScript) IActiveScriptSite_Release(pActiveScript); - if (pActiveScriptSite && - pActiveScriptSite->pSession) IUnknown_Release((IUnknown *)pActiveScriptSite->pSession); - if (pActiveScriptSite && - pActiveScriptSite->pInstaller) IUnknown_Release((IUnknown *)pActiveScriptSite->pInstaller); - if (pActiveScriptSite) IUnknown_Release((IUnknown *)pActiveScriptSite); - + if (pActiveScript) IActiveScript_Release(pActiveScript); + if (pActiveScriptParse32) IActiveScriptParse32_Release(pActiveScriptParse32); + if (pActiveScriptParse64) IActiveScriptParse64_Release(pActiveScriptParse64); + if (pActiveScriptSite) + { + if (pActiveScriptSite->pSession) IDispatch_Release(pActiveScriptSite->pSession); + if (pActiveScriptSite->pInstaller) IDispatch_Release(pActiveScriptSite->pInstaller); + IActiveScriptSite_Release((IActiveScriptSite *)pActiveScriptSite); + } CoUninitialize(); /* must call even if CoInitialize failed */ - return ret; } @@ -204,7 +219,7 @@ if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IActiveScriptSite)) { - IClassFactory_AddRef(iface); + IActiveScriptSite_AddRef(iface); *ppvObject = This; return S_OK; } Modified: trunk/reactos/dll/win32/msi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/string.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/string.c [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -357,14 +357,12 @@ * [in/out] sz - number of bytes available in the buffer on input * number of bytes used on output * - * The size includes the terminating nul character. Short buffers - * will be filled, but not nul terminated. + * Returned string is not nul terminated. */ static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT *sz ) { - UINT len; + UINT len, lenW; const WCHAR *str; - int n; TRACE("Finding string %d of %d\n", id, st->maxcount); @@ -372,26 +370,14 @@ if( !str ) return ERROR_FUNCTION_FAILED; - len = WideCharToMultiByte( st->codepage, 0, str, -1, NULL, 0, NULL, NULL ); - - if( !buffer ) + lenW = strlenW( str ); + len = WideCharToMultiByte( st->codepage, 0, str, lenW, NULL, 0, NULL, NULL ); + if( *sz < len ) { *sz = len; - return ERROR_SUCCESS; - } - - if( len > *sz ) - { - n = strlenW( str ) + 1; - while( n && (len > *sz) ) - len = WideCharToMultiByte( st->codepage, 0, - str, --n, NULL, 0, NULL, NULL ); - } - else - n = -1; - - *sz = WideCharToMultiByte( st->codepage, 0, str, n, buffer, len, NULL, NULL ); - + return ERROR_MORE_DATA; + } + *sz = WideCharToMultiByte( st->codepage, 0, str, lenW, buffer, *sz, NULL, NULL ); return ERROR_SUCCESS; } @@ -588,7 +574,7 @@ data = msi_alloc( datasize ); if( ! data ) { - WARN("Failed to alloc data %d bytes\n", poolsize ); + WARN("Failed to alloc data %d bytes\n", datasize ); goto err; } @@ -622,8 +608,6 @@ ERR("failed to fetch string\n"); sz = 0; } - if( sz && (sz < (datasize - used ) ) ) - sz--; if (sz) pool[ n*2 + 1 ] = st->strings[i].persistent_refcount; Modified: trunk/reactos/dll/win32/msi/tokenize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/tokenize.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/tokenize.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/tokenize.c [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -266,7 +266,7 @@ *tokenType = TK_DOT; return 1; } - /* Fall thru into the next case */ + /* Fall through */ case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': *tokenType = TK_INTEGER; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Aug 13 16:17:18 2012 @@ -106,7 +106,7 @@ reactos/dll/win32/msgsm32.acm # Synced to Wine-1.5.4 reactos/dll/win32/mshtml # Autosync reactos/dll/win32/mshtml.tlb # Autosync -reactos/dll/win32/msi # Synced to Wine-1.5.4 +reactos/dll/win32/msi # Synced to Wine-1.5.10 reactos/dll/win32/msimg32 # Synced to Wine-1.5.4 reactos/dll/win32/msimtf # Synced to Wine-1.5.4 reactos/dll/win32/msisip # Synced to Wine-1.5.4

12 years, 2 months

[akhaldi] 57069: [ADVAPI32] * Implement and export RegDeleteKeyEx{A, W} (Thanks Alex).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 13 16:15:13 2012 New Revision: 57069 URL: http://svn.reactos.org/svn/reactos?rev=57069&view=rev Log: [ADVAPI32] * Implement and export RegDeleteKeyEx{A,W} (Thanks Alex). Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Mon Aug 13 16:15:13 2012 @@ -479,8 +479,8 @@ @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) @ stdcall RegCreateKeyW(long wstr ptr) @ stdcall RegDeleteKeyA(long str) -;@ stdcall RegDeleteKeyExA(long str long long) -;@ stdcall RegDeleteKeyExW(long wstr long long) +@ stdcall RegDeleteKeyExA(long str long long) +@ stdcall RegDeleteKeyExW(long wstr long long) @ stdcall RegDeleteKeyW(long wstr) @ stdcall RegDeleteKeyValueA(ptr str str) @ stdcall RegDeleteKeyValueW(ptr wstr wstr) Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Mon Aug 13 16:15:13 2012 @@ -1317,7 +1317,7 @@ /************************************************************************ * RegDeleteKeyExA * - * @unimplemented + * @implemented */ LONG WINAPI @@ -1326,15 +1326,68 @@ REGSAM samDesired, DWORD Reserved) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return ERROR_CALL_NOT_IMPLEMENTED; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING SubKeyName; + HANDLE ParentKey; + HANDLE TargetKey; + NTSTATUS Status; + + /* Make sure we got a subkey */ + if (!lpSubKey) + { + /* Fail */ + return ERROR_INVALID_PARAMETER; + } + + Status = MapDefaultKey(&ParentKey, + hKey); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + if (samDesired & KEY_WOW64_32KEY) + ERR("Wow64 not yet supported!\n"); + + if (samDesired & KEY_WOW64_64KEY) + ERR("Wow64 not yet supported!\n"); + + RtlCreateUnicodeStringFromAsciiz(&SubKeyName, + (LPSTR)lpSubKey); + InitializeObjectAttributes(&ObjectAttributes, + &SubKeyName, + OBJ_CASE_INSENSITIVE, + ParentKey, + NULL); + + Status = NtOpenKey(&TargetKey, + DELETE, + &ObjectAttributes); + RtlFreeUnicodeString(&SubKeyName); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + Status = NtDeleteKey(TargetKey); + NtClose (TargetKey); + +Cleanup: + ClosePredefKey(ParentKey); + + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + return ERROR_SUCCESS; } /************************************************************************ * RegDeleteKeyExW * - * @unimplemented + * @implemented */ LONG WINAPI @@ -1343,8 +1396,60 @@ REGSAM samDesired, DWORD Reserved) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return ERROR_CALL_NOT_IMPLEMENTED; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING SubKeyName; + HANDLE ParentKey; + HANDLE TargetKey; + NTSTATUS Status; + + /* Make sure we got a subkey */ + if (!lpSubKey) + { + /* Fail */ + return ERROR_INVALID_PARAMETER; + } + + Status = MapDefaultKey(&ParentKey, + hKey); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + if (samDesired & KEY_WOW64_32KEY) + ERR("Wow64 not yet supported!\n"); + + if (samDesired & KEY_WOW64_64KEY) + ERR("Wow64 not yet supported!\n"); + + + RtlInitUnicodeString(&SubKeyName, + (LPWSTR)lpSubKey); + InitializeObjectAttributes(&ObjectAttributes, + &SubKeyName, + OBJ_CASE_INSENSITIVE, + ParentKey, + NULL); + Status = NtOpenKey(&TargetKey, + DELETE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + Status = NtDeleteKey(TargetKey); + NtClose(TargetKey); + +Cleanup: + ClosePredefKey(ParentKey); + + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + return ERROR_SUCCESS; }

12 years, 2 months

← Newer
1
...
11
12
13
14
15
16
17
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2012