Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [GDI32_APITEST] Add more StretchBlt Regression Tests (#3455)
by Doug Lyons 20 Feb '21

20 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89843bec564368a7e1b8b… commit 89843bec564368a7e1b8b26bf47d09da3a1ad9dc Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Feb 20 17:21:51 2021 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 21 08:21:51 2021 +0900 [GDI32_APITEST] Add more StretchBlt Regression Tests (#3455) Added tests for many more StretchBlt options. Created StretchBlt regression tests for verifying most flip options. This is preparation for my Pull Request #3458 which will implement the flip functionality for StretchBlt. CORE-16642 --- modules/rostests/apitests/gdi32/StretchBlt.c | 833 +++++++++++++++++++++++++-- 1 file changed, 797 insertions(+), 36 deletions(-) diff --git a/modules/rostests/apitests/gdi32/StretchBlt.c b/modules/rostests/apitests/gdi32/StretchBlt.c index c72f9e220f1..5db1713beb6 100644 --- a/modules/rostests/apitests/gdi32/StretchBlt.c +++ b/modules/rostests/apitests/gdi32/StretchBlt.c @@ -2,8 +2,8 @@ * PROJECT: ReactOS API tests * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Tests for the StretchBlt API - * COPYRIGHT: Copyright 2020 Doug Lyons (douglyons at douglyons dot com) - * Most Code copied and modified from Wine gdi32:bitmap test. + * COPYRIGHT: Copyright 2020, 2021 Doug Lyons (douglyons at douglyons dot com) + * Some Code copied and modified from Wine gdi32:bitmap test. */ #include <stdarg.h> @@ -18,91 +18,852 @@ #include "wingdi.h" #include "winuser.h" #include "wine/test.h" +#include <debug.h> + +/* Notes on using the StretchBlt function's general flip ability. + * + * The critical values for flipping are the signs of the values for DestWidth, DestHeight, SourceWidth and SourceHeight. + * If we assign a '0' to values having a negative sign and a '1' to values having a positive sign these can be CaseWXYZ's. + * Where the W, X, Y, and Z are replaced with the '0's and '1's representing the signs of the values in sequential order. + * + * If we take the normal StretchBlt function's copy/scaling with no flips, the generalized code can be represented as follows: + * + * StretchBlt(DestDC, DestX, DestY, (DestWidth), (DestHeight), + * SourceDC, SourceX, SourceY, (SourceWidth), (SourceHeight), SRCCOPY); // Case1111 (15) (all positive signs) + * + * For Horizontal flipping then the generalized form on the Destination side can be represented as follows: + * + * StretchBlt(DestDC, DestX + DestWidth - 1, DestY, -DestWidth, DestHeight, + * SourceDC, SourceX, SourceY, SourceWidth, SourceHeight, SRCCOPY); // Case 0111 (7) + * + * and for Horizontal flipping the generalized form on the Source side can be represented as follows: + * + * StretchBlt(DestDC, DestX, DestY, DestWidth, DestHeight, + * SourceDC, SourceX + SourceWidth - 1, SourceY, -SourceWidth, SourceHeight, SRCCOPY); // Case 1101 (13) + * + * I believe that the "- 1" is used because we are moving from the rightmost position back to the 0th position. + * + * But there are three "special" cases where no flip is done (there is a copy/scale only) and the "-1" is not used. + * These are as follows: + * 1) + * StretchBlt(DestDC, DestX + DestWidth, DestY, -DestWidth, DestHeight, // Both Widths negative + * SourceDC, SourceX + SourceWidth, SourceY, -SourceWidth, SourceHeight, SRCCOPY); // Case0101 (5) + * 2) + * StretchBlt(DestDC, DestX, DestY + DestHeight, DestWidth, -DestHeight, // Both heights negative + * SourceDC, SourceX, SourceY + SourceHeight, SourceWidth, -SourceHeight, SRCCOPY); // Case1010 (10) + * 3) + * StretchBlt(DestDC, DestX + DestWidth, DestY + DestHeight, -DestWidth, -DestHeight, // widths AND heights neg + * SourceDC, SourceX + SourceWidth, SourceY + SourceHeight, -SourceWidth, -SourceHeight, SRCCOPY); // Case0000 (0) + * + * I suspect that these are like this because of legacy reasons when StretchBlt did not support so many flip options. + * + * For Vertical flipping the generalized form on the Destination side can be represented as follows: + * + * StretchBlt(DestDC, DestX, DestY + DestHeight - 1, DestWidth, -DestHeight, + * SourceDC, SourceX, SourceY, SourceWidth, SourceHeight, SRCCOPY); // Case1011 (11) + * + * and for Vertical on the Source Side as folows: + * + * StretchBlt(DestDC, DestX, DestY, DestWidth, -DestHeight, + * SourceDC, SourceX, SourceY + SourceHeight - 1, SourceWidth, -SourceHeight, SRCCOPY); // Case 1010 (10) + */ + +static inline int get_dib_stride( int width, int bpp ) +{ + return ((width * bpp + 31) >> 3) & ~3; +} + +static inline int get_dib_image_size( const BITMAPINFO *info ) +{ + return get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ) + * abs( info->bmiHeader.biHeight ); +} + +static void check_StretchBlt_stretch(HDC hdcDst, HDC hdcSrc, BITMAPINFO *dst_info, UINT32 *dstBuffer, UINT32 *srcBuffer, + int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, + int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, + UINT32 *expected, int line) +{ + int dst_size = get_dib_image_size( dst_info ); + + memset(dstBuffer, 0, dst_size); + StretchBlt(hdcDst, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, + hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, SRCCOPY); + ok(memcmp(dstBuffer, expected, dst_size) == 0, + "StretchBlt \nexp { %08X, %08X, %08X, %08X } \ngot { %08X, %08X, %08X, %08X } \n" + "destination { %d, %d, %d, %d } source { %d, %d, %d, %d } from line %d\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3], + nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, + nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, line); +} + +static void test_StretchBlt_stretch(HDC hdcDst, HDC hdcSrc, BITMAPINFO *dst_info, UINT32 *dstBuffer, UINT32 *srcBuffer, + int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, + int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, + UINT32 *expected, int line, BOOL SrcTopDown, BOOL DstTopDown ) +{ + int dst_size = get_dib_image_size( dst_info ); + + memset(dstBuffer, 0, dst_size); + StretchBlt(hdcDst, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, + hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, SRCCOPY); + ok(memcmp(dstBuffer, expected, dst_size) == 0, + "Case%c%c%c%c %s - %s \nexp { %08X, %08X, %08X, %08X } \ngot { %08X, %08X, %08X, %08X }\n" + "destination { %d, %d, %d, %d } source { %d, %d, %d, %d } from line %d\n", + (nWidthDest < 0) ? '0' : '1', (nHeightDest < 0) ? '0' : '1', + (nWidthSrc < 0) ? '0' : '1', (nHeightSrc < 0) ? '0' : '1', + SrcTopDown ? "SrcTopDown" : "SrcBottomUp", DstTopDown ? "DstTopDown" : "DstBottomUp", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3], + nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, + nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, line); +} static void test_StretchBlt(void) { HBITMAP bmpDst, bmpSrc; - HDC hdcDst, hdcSrc; + HBITMAP oldDst, oldSrc; + HDC hdcScreen, hdcDst, hdcSrc; UINT32 *dstBuffer, *srcBuffer; BITMAPINFO biDst, biSrc; UINT32 expected[256]; + RGBQUAD colors[2]; memset(&biDst, 0, sizeof(BITMAPINFO)); - biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - biDst.bmiHeader.biWidth = 2; - biDst.bmiHeader.biHeight = 2; // Set our Height to positive so we are bottom-up + biDst.bmiHeader.biWidth = 16; + biDst.bmiHeader.biHeight = -16; biDst.bmiHeader.biPlanes = 1; - biDst.bmiHeader.biBitCount = 32; // Set our BitCount to 32 which is Full Color + biDst.bmiHeader.biBitCount = 32; biDst.bmiHeader.biCompression = BI_RGB; + memcpy(&biSrc, &biDst, sizeof(BITMAPINFO)); + + hdcScreen = CreateCompatibleDC(NULL); + hdcDst = CreateCompatibleDC(hdcScreen); + hdcSrc = CreateCompatibleDC(hdcDst); + + bmpDst = CreateDIBSection(hdcScreen, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + oldDst = SelectObject(hdcDst, bmpDst); + + bmpSrc = CreateDIBSection(hdcScreen, &biSrc, DIB_RGB_COLORS, (void**)&srcBuffer, NULL, 0); + oldSrc = SelectObject(hdcSrc, bmpSrc); + + /* Top-down to top-down tests */ + srcBuffer[0] = 0xCAFED00D, srcBuffer[1] = 0xFEEDFACE; + srcBuffer[16] = 0xFEDCBA98, srcBuffer[17] = 0x76543210; + + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[0] = 0xCAFED00D, expected[1] = 0xFEEDFACE; + expected[16] = 0xFEDCBA98, expected[17] = 0x76543210; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); + + expected[0] = 0xCAFED00D, expected[1] = 0x00000000; + expected[16] = 0x00000000, expected[17] = 0x00000000; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 1, 1, expected, __LINE__); + + expected[0] = 0xCAFED00D, expected[1] = 0xCAFED00D; + expected[16] = 0xCAFED00D, expected[17] = 0xCAFED00D; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__); + + /* This is an example of the dst width (height) == 1 exception, explored below */ + expected[0] = 0xCAFED00D, expected[1] = 0x00000000; + expected[16] = 0x00000000, expected[17] = 0x00000000; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 2, 2, expected, __LINE__); + + expected[0] = 0xCAFED00D, expected[1] = 0x00000000; + expected[16] = 0x00000000, expected[17] = 0x00000000; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 1, 1, -2, -2, 1, 1, -2, -2, expected, __LINE__); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[16] = 0x00000000, expected[17] = 0xCAFED00D, expected[18] = 0xFEEDFACE; + expected[32] = 0x00000000, expected[33] = 0xFEDCBA98, expected[34] = 0x76543210; + + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__); + + /* when dst width is 1 merge src width - 1 pixels */ + memset( srcBuffer, 0, get_dib_image_size( &biSrc ) ); + srcBuffer[0] = 0x0000ff00, srcBuffer[1] = 0x0000f0f0, srcBuffer[2] = 0x0000cccc, srcBuffer[3] = 0x0000aaaa; + srcBuffer[16] = 0xFEDCBA98, srcBuffer[17] = 0x76543210; + + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[0] = srcBuffer[0]; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 2, 1, expected, __LINE__); + + /* similarly in the vertical direction */ + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[0] = srcBuffer[0]; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 1, 2, expected, __LINE__); + + /* check that it's the dst size in device units that needs to be 1 */ + SetMapMode( hdcDst, MM_ISOTROPIC ); + SetWindowExtEx( hdcDst, 200, 200, NULL ); + SetViewportExtEx( hdcDst, 100, 100, NULL ); + + SetMapMode( hdcDst, MM_TEXT ); + + SelectObject(hdcDst, oldDst); + DeleteObject(bmpDst); + + /* Top-down to bottom-up tests */ + memset( srcBuffer, 0, get_dib_image_size( &biSrc ) ); + srcBuffer[0] = 0xCAFED00D, srcBuffer[1] = 0xFEEDFACE; + srcBuffer[16] = 0xFEDCBA98, srcBuffer[17] = 0x76543210; + + biDst.bmiHeader.biHeight = 16; + bmpDst = CreateDIBSection(hdcScreen, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + oldDst = SelectObject(hdcDst, bmpDst); + + memset( expected, 0, get_dib_image_size( &biDst ) ); + + expected[224] = 0xFEDCBA98, expected[225] = 0x76543210; + expected[240] = 0xCAFED00D, expected[241] = 0xFEEDFACE; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); + + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + + /* Bottom-up to bottom-up tests */ + biSrc.bmiHeader.biHeight = 16; + bmpSrc = CreateDIBSection(hdcScreen, &biSrc, DIB_RGB_COLORS, (void**)&srcBuffer, NULL, 0); + srcBuffer[224] = 0xCAFED00D, srcBuffer[225] = 0xFEEDFACE; + srcBuffer[240] = 0xFEDCBA98, srcBuffer[241] = 0x76543210; + oldSrc = SelectObject(hdcSrc, bmpSrc); + + memset( expected, 0, get_dib_image_size( &biDst ) ); + + expected[224] = 0xCAFED00D, expected[225] = 0xFEEDFACE; + expected[240] = 0xFEDCBA98, expected[241] = 0x76543210; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); + + SelectObject(hdcDst, oldDst); + DeleteObject(bmpDst); + + /* Bottom-up to top-down tests */ + biDst.bmiHeader.biHeight = -16; + bmpDst = CreateDIBSection(hdcScreen, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + oldDst = SelectObject(hdcDst, bmpDst); - memcpy(&biSrc, &biDst, sizeof(BITMAPINFO)); // Put same Destination params into the Source + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[0] = 0xFEDCBA98, expected[1] = 0x76543210; + expected[16] = 0xCAFED00D, expected[17] = 0xFEEDFACE; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); - hdcDst = CreateCompatibleDC(0); - hdcSrc = CreateCompatibleDC(0); + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + + biSrc.bmiHeader.biHeight = -2; + biSrc.bmiHeader.biBitCount = 24; + bmpSrc = CreateDIBSection(hdcScreen, &biSrc, DIB_RGB_COLORS, (void**)&srcBuffer, NULL, 0); + oldSrc = SelectObject(hdcSrc, bmpSrc); + + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[0] = 0xFEEDFACE, expected[1] = 0xCAFED00D; + expected[2] = 0x76543210, expected[3] = 0xFEDCBA98; + memcpy(dstBuffer, expected, 4 * sizeof(*dstBuffer)); + StretchBlt(hdcSrc, 0, 0, 4, 1, hdcDst, 0, 0, 4, 1, SRCCOPY ); + memset(dstBuffer, 0x55, 4 * sizeof(*dstBuffer)); + StretchBlt(hdcDst, 0, 0, 4, 1, hdcSrc, 0, 0, 4, 1, SRCCOPY ); + expected[0] = 0x00EDFACE, expected[1] = 0x00FED00D; + expected[2] = 0x00543210, expected[3] = 0x00DCBA98; + ok(!memcmp(dstBuffer, expected, 16), + "StretchBlt expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X }\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3] ); + + expected[0] = 0xFEEDFACE, expected[1] = 0xCAFED00D; + expected[2] = 0x76543210, expected[3] = 0xFEDCBA98; + memcpy(srcBuffer, expected, 4 * sizeof(*dstBuffer)); + memset(dstBuffer, 0x55, 4 * sizeof(*dstBuffer)); + StretchBlt(hdcDst, 0, 0, 4, 1, hdcSrc, 0, 0, 4, 1, SRCCOPY ); + expected[0] = 0x00EDFACE, expected[1] = 0x00D00DFE; + expected[2] = 0x0010CAFE, expected[3] = 0x00765432; + ok(!memcmp(dstBuffer, expected, 16), + "StretchBlt expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X }\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3] ); + + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + + biSrc.bmiHeader.biBitCount = 1; + bmpSrc = CreateDIBSection(hdcScreen, &biSrc, DIB_RGB_COLORS, (void**)&srcBuffer, NULL, 0); + oldSrc = SelectObject(hdcSrc, bmpSrc); + *((DWORD *)colors + 0) = 0x123456; + *((DWORD *)colors + 1) = 0x335577; + SetDIBColorTable( hdcSrc, 0, 2, colors ); + srcBuffer[0] = 0x55555555; + memset(dstBuffer, 0xcc, 4 * sizeof(*dstBuffer)); + SetTextColor( hdcDst, 0 ); + SetBkColor( hdcDst, 0 ); + StretchBlt(hdcDst, 0, 0, 4, 1, hdcSrc, 0, 0, 4, 1, SRCCOPY ); + expected[0] = expected[2] = 0x00123456; + expected[1] = expected[3] = 0x00335577; + ok(!memcmp(dstBuffer, expected, 16), + "StretchBlt expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X }\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3] ); + + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + + bmpSrc = CreateBitmap( 16, 16, 1, 1, 0 ); + oldSrc = SelectObject(hdcSrc, bmpSrc); + SetPixel( hdcSrc, 0, 0, 0 ); + SetPixel( hdcSrc, 1, 0, 0xffffff ); + SetPixel( hdcSrc, 2, 0, 0xffffff ); + SetPixel( hdcSrc, 3, 0, 0 ); + memset(dstBuffer, 0xcc, 4 * sizeof(*dstBuffer)); + SetTextColor(hdcDst, RGB(0x22, 0x44, 0x66)); + SetBkColor(hdcDst, RGB(0x65, 0x43, 0x21)); + StretchBlt(hdcDst, 0, 0, 4, 1, hdcSrc, 0, 0, 4, 1, SRCCOPY ); + expected[0] = expected[3] = 0x00224466; + expected[1] = expected[2] = 0x00654321; + ok(!memcmp(dstBuffer, expected, 16), + "StretchBlt expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X }\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3] ); + + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + SelectObject(hdcDst, oldDst); + DeleteObject(bmpDst); + + memset(&biDst, 0, sizeof(BITMAPINFO)); // Clear our Bitmap to to all zeroes + + biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); // Set our Size to the header size + biDst.bmiHeader.biWidth = 2; // Set our Width to 2 (left-to-right) + biDst.bmiHeader.biHeight = -2; // Set our Height to -2 that's negative for top-down + biDst.bmiHeader.biPlanes = 1; // Set out planes to 1 (1 required by Windows) + biDst.bmiHeader.biBitCount = 32; // Set out BitCount to 32 (Full Color) + biDst.bmiHeader.biCompression = BI_RGB; // Set our Compression to BI_RBG (uncompressed) + + memcpy(&biSrc, &biDst, sizeof(BITMAPINFO)); // Put same Destination params into the Source bmpSrc = CreateDIBSection(hdcSrc, &biSrc, DIB_RGB_COLORS, (void**)&srcBuffer, NULL, 0); - SelectObject(hdcSrc, bmpSrc); + oldSrc = SelectObject(hdcSrc, bmpSrc); bmpDst = CreateDIBSection(hdcDst, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); - SelectObject(hdcDst, bmpDst); + oldDst = SelectObject(hdcDst, bmpDst); + + srcBuffer[0] = 0x000000FF; // BLUE + srcBuffer[1] = 0x0000FF00; // GREEN + srcBuffer[2] = 0x00FF0000; // RED + srcBuffer[3] = 0xFF000000; // ALPHA (Opacity) + + expected[0] = 0x000000FF; + expected[1] = 0x0000FF00; + expected[2] = 0x00FF0000; + expected[3] = 0xFF000000; - srcBuffer[0] = 0x000000FF; // BLUE - stored beginning bottom left - srcBuffer[1] = 0x0000FF00; // GREEN - srcBuffer[2] = 0x00FF0000; // RED - srcBuffer[3] = 0xFF000000; // BLACK - 0xFF for alpha channel is easy to recognize when printed in hex format + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); // Case 1111 (15) - No flip. Just copy. + + expected[0] = 0x00FF0000; + expected[1] = 0xFF000000; + expected[2] = 0x000000FF; + expected[3] = 0x0000FF00; + + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 1, 2, -2, expected, __LINE__); // Case 1110 (14) - Vertical flip. - /* Flip Left to Right on Source */ - StretchBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 1, 0, -2, 2, SRCCOPY); expected[0] = 0x0000FF00; expected[1] = 0x000000FF; expected[2] = 0xFF000000; expected[3] = 0x00FF0000; - ok(expected[1] == dstBuffer[1], "StretchBlt expected { %08X } got { %08X }\n", - expected[1], dstBuffer[1]); + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 1, 0, -2, 2, expected, __LINE__); // Case 1101 (13) - Horizontal flip. + + expected[0] = 0xFF000000; + expected[1] = 0x00FF0000; + expected[2] = 0x0000FF00; + expected[3] = 0x000000FF; - ok(expected[3] == dstBuffer[3], "StretchBlt expected { %08X } got { %08X }\n", - expected[3], dstBuffer[3]); + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); // Case 1100 (12) - Both flip. - /* Flip Top to Bottom on Source */ - StretchBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 0, 1, 2, -2, SRCCOPY); expected[0] = 0x00FF0000; expected[1] = 0xFF000000; expected[2] = 0x000000FF; expected[3] = 0x0000FF00; - ok(expected[0] == dstBuffer[0], "StretchBlt expected { %08X } got { %08X }\n", - expected[0], dstBuffer[0]); + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 1, 2, -2, 0, 0, 2, 2, expected, __LINE__); // Case 1011 (11) - Vertical Flip. + + expected[0] = 0x000000FF; + expected[1] = 0x0000FF00; + expected[2] = 0x00FF0000; + expected[3] = 0xFF000000; - ok(expected[1] == dstBuffer[1], "StretchBlt expected { %08X } got { %08X }\n", - expected[1], dstBuffer[1]); + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 2, 2, -2, 0, 2, 2, -2, expected, __LINE__); // Case 1010 (10) - No Flip. Special Case. - /* Flip Left to Right and Top to Bottom on Source */ - StretchBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 1, 1, -2, -2, SRCCOPY); expected[0] = 0xFF000000; expected[1] = 0x00FF0000; expected[2] = 0x0000FF00; expected[3] = 0x000000FF; - ok(expected[1] == dstBuffer[1], "StretchBlt expected { %08X } got { %08X }\n", - expected[1], dstBuffer[1]); + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 1, 2, -2, 1, 0, -2, 2, expected, __LINE__); // Case 1001 (9) - Both Flip. + + expected[0] = 0x0000FF00; + expected[1] = 0x000000FF; + expected[2] = 0xFF000000; + expected[3] = 0x00FF0000; + + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 1, 2, -2, 1, 1, -2, -2, expected, __LINE__); // Case 1000 (8) - Horizontal Flip. + + expected[0] = 0x0000FF00; + expected[1] = 0x000000FF; + expected[2] = 0xFF000000; + expected[3] = 0x00FF0000; + + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 1, 0, -2, 2, 0, 0, 2, 2, expected, __LINE__); // Case 0111 (7) - Horizontal Flip. - /* Flip Left to Right and Top to Bottom on both Source and Destination */ - StretchBlt(hdcDst, 1, 1, -2, -2, hdcSrc, 1, 1, -2, -2, SRCCOPY); expected[0] = 0xFF000000; expected[1] = 0x00FF0000; + expected[2] = 0x0000FF00; + expected[3] = 0x000000FF; + + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 1, 0, -2, 2, 0, 1, 2, -2, expected, __LINE__); // Case 0110 (6) - Both Flip. + + expected[0] = 0x000000FF; + expected[1] = 0x0000FF00; expected[2] = 0x00FF0000; + expected[3] = 0xFF000000; + + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 2, 0, -2, 2, 2, 0, -2, 2, expected, __LINE__); // Case 0101 (5) - No Flip. Special Case. + + expected[0] = 0x00FF0000; + expected[1] = 0xFF000000; + expected[2] = 0x000000FF; + expected[3] = 0x0000FF00; + + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 1, 0, -2, 2, 1, 1, -2, -2, expected, __LINE__); // Case 0100 (4) - Vertical Flip. + + expected[0] = 0xFF000000; + expected[1] = 0x00FF0000; + expected[2] = 0x0000FF00; expected[3] = 0x000000FF; - ok(expected[1] == dstBuffer[1], "StretchBlt expected { %08X } got { %08X }\n", - expected[1], dstBuffer[1]); + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 1, 1, -2, -2, 0, 0, 2, 2, expected, __LINE__); // Case 0011 (3) - Both Flip. + + expected[0] = 0x0000FF00; + expected[1] = 0x000000FF; + expected[2] = 0xFF000000; + expected[3] = 0x00FF0000; + + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 1, 1, -2, -2, 0, 1, 2, -2, expected, __LINE__); // Case 0010 (2) - Horizontal Flip. + + expected[0] = 0x00FF0000; + expected[1] = 0xFF000000; + expected[2] = 0x000000FF; + expected[3] = 0x0000FF00; + + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 1, 1, -2, -2, 1, 0, -2, 2, expected, __LINE__); // Case 0001 (1) - Vertical Flip. + + expected[0] = 0x000000FF; + expected[1] = 0x0000FF00; + expected[2] = 0x00FF0000; + expected[3] = 0xFF000000; + + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 2, 2, -2, -2, 2, 2, -2, -2, expected, __LINE__); // Case 0000 (0) - No Flip. Special Case. DeleteDC(hdcSrc); + + SelectObject(hdcDst, oldDst); + DeleteObject(bmpDst); DeleteDC(hdcDst); + + DeleteDC(hdcScreen); } +static void test_StretchBlt_TopDownOptions(BOOL SrcTopDown, BOOL DstTopDown) +{ + HBITMAP bmpDst, bmpSrc; + HBITMAP oldDst, oldSrc; + HDC hdcScreen, hdcDst, hdcSrc; + UINT32 *dstBuffer, *srcBuffer; + BITMAPINFO biDst, biSrc; + UINT32 expected[256]; + + memset(&biDst, 0, sizeof(BITMAPINFO)); + + biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + biDst.bmiHeader.biWidth = 2; + biDst.bmiHeader.biHeight = 2; + biDst.bmiHeader.biPlanes = 1; + biDst.bmiHeader.biBitCount = 32; + biDst.bmiHeader.biCompression = BI_RGB; + memcpy(&biSrc, &biDst, sizeof(BITMAPINFO)); + + if (!SrcTopDown && !DstTopDown) + { + biSrc.bmiHeader.biHeight = -2; // Converts Source bitmap to top down + biDst.bmiHeader.biHeight = -2; // Converts Destination bitmap to top down + } + + if (SrcTopDown) + { + biSrc.bmiHeader.biHeight = -2; // Converts Source bitmap to top down + } + + if (DstTopDown) + { + biDst.bmiHeader.biHeight = -2; // Converts Destination bitmap to top down + } + + hdcScreen = CreateCompatibleDC(NULL); + hdcDst = CreateCompatibleDC(hdcScreen); + hdcSrc = CreateCompatibleDC(hdcDst); + + bmpSrc = CreateDIBSection(hdcScreen, &biSrc, DIB_RGB_COLORS, (void**)&srcBuffer, NULL, 0); + oldSrc = SelectObject(hdcSrc, bmpSrc); + bmpDst = CreateDIBSection(hdcScreen, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + oldDst = SelectObject(hdcDst, bmpDst); + + srcBuffer[0] = 0x000000FF; // BLUE + srcBuffer[1] = 0x0000FF00; // GREEN + srcBuffer[2] = 0x00FF0000; // RED + srcBuffer[3] = 0xFF000000; // ALPHA (Opacity) + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0x00FF0000; + expected[1] = 0xFF000000; + expected[2] = 0x000000FF; + expected[3] = 0x0000FF00; + } + else + { + expected[0] = 0x000000FF; + expected[1] = 0x0000FF00; + expected[2] = 0x00FF0000; + expected[3] = 0xFF000000; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 1111 (15) - No flip. Just copy. + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0x000000FF; + expected[1] = 0x0000FF00; + expected[2] = 0x00FF0000; + expected[3] = 0xFF000000; + } + else + { + expected[0] = 0x00FF0000; + expected[1] = 0xFF000000; + expected[2] = 0x000000FF; + expected[3] = 0x0000FF00; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 1, 2, -2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 1110 (14) - Vertical flip. + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0xFF000000; + expected[1] = 0x00FF0000; + expected[2] = 0x0000FF00; + expected[3] = 0x000000FF; + } + else + { + expected[0] = 0x0000FF00; + expected[1] = 0x000000FF; + expected[2] = 0xFF000000; + expected[3] = 0x00FF0000; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 1, 0, -2, 2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 1101 (13) - Horizontal flip. + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0x0000FF00; + expected[1] = 0x000000FF; + expected[2] = 0xFF000000; + expected[3] = 0x00FF0000; + } + else + { + expected[0] = 0xFF000000; + expected[1] = 0x00FF0000; + expected[2] = 0x0000FF00; + expected[3] = 0x000000FF; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 1100 (12) - Both flip. + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0x000000FF; + expected[1] = 0x0000FF00; + expected[2] = 0x00FF0000; + expected[3] = 0xFF000000; + } + else + { + expected[0] = 0x00FF0000; + expected[1] = 0xFF000000; + expected[2] = 0x000000FF; + expected[3] = 0x0000FF00; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 1, 2, -2, 0, 0, 2, 2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 1011 (11) - Vertical Flip. + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0x00FF0000; + expected[1] = 0xFF000000; + expected[2] = 0x000000FF; + expected[3] = 0x0000FF00; + } + else + { + expected[0] = 0x000000FF; + expected[1] = 0x0000FF00; + expected[2] = 0x00FF0000; + expected[3] = 0xFF000000; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 2, 2, -2, 0, 2, 2, -2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 1010 (10) - No Flip. Special Case. + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0x0000FF00; + expected[1] = 0x000000FF; + expected[2] = 0xFF000000; + expected[3] = 0x00FF0000; + } + else + { + expected[0] = 0xFF000000; + expected[1] = 0x00FF0000; + expected[2] = 0x0000FF00; + expected[3] = 0x000000FF; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 1, 2, -2, 1, 0, -2, 2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 1001 (9) - Both Flip. + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0xFF000000; + expected[1] = 0x00FF0000; + expected[2] = 0x0000FF00; + expected[3] = 0x000000FF; + } + else + { + expected[0] = 0x0000FF00; + expected[1] = 0x000000FF; + expected[2] = 0xFF000000; + expected[3] = 0x00FF0000; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 1, 2, -2, 1, 1, -2, -2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 1000 (8) - Horizontal Flip + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0xFF000000; + expected[1] = 0x00FF0000; + expected[2] = 0x0000FF00; + expected[3] = 0x000000FF; + } + else + { + expected[0] = 0x0000FF00; + expected[1] = 0x000000FF; + expected[2] = 0xFF000000; + expected[3] = 0x00FF0000; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 1, 0, -2, 2, 0, 0, 2, 2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 0111 (7) - Horizontal Flip + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0x0000FF00; + expected[1] = 0x000000FF; + expected[2] = 0xFF000000; + expected[3] = 0x00FF0000; + } + else + { + expected[0] = 0xFF000000; + expected[1] = 0x00FF0000; + expected[2] = 0x0000FF00; + expected[3] = 0x000000FF; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 1, 0, -2, 2, 0, 1, 2, -2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 0110 (6) - Both Flip. + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0x00FF0000; + expected[1] = 0xFF000000; + expected[2] = 0x000000FF; + expected[3] = 0x0000FF00; + } + else + { + expected[0] = 0x000000FF; + expected[1] = 0x0000FF00; + expected[2] = 0x00FF0000; + expected[3] = 0xFF000000; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 2, 0, -2, 2, 2, 0, -2, 2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 0101 (5) - No Flip. Special Case. + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0x000000FF; + expected[1] = 0x0000FF00; + expected[2] = 0x00FF0000; + expected[3] = 0xFF000000; + } + else + { + expected[0] = 0x00FF0000; + expected[1] = 0xFF000000; + expected[2] = 0x000000FF; + expected[3] = 0x0000FF00; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 1, 0, -2, 2, 1, 1, -2, -2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 0100 (4) - Vertical Flip. + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0x0000FF00; + expected[1] = 0x000000FF; + expected[2] = 0xFF000000; + expected[3] = 0x00FF0000; + } + else + { + expected[0] = 0xFF000000; + expected[1] = 0x00FF0000; + expected[2] = 0x0000FF00; + expected[3] = 0x000000FF; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 1, 1, -2, -2, 0, 0, 2, 2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 0011 (3) - Both Flip. + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0xFF000000; + expected[1] = 0x00FF0000; + expected[2] = 0x0000FF00; + expected[3] = 0x000000FF; + } + else + { + expected[0] = 0x0000FF00; + expected[1] = 0x000000FF; + expected[2] = 0xFF000000; + expected[3] = 0x00FF0000; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 1, 1, -2, -2, 0, 1, 2, -2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 0010 (2) - Horizontal Flip. + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0x000000FF; + expected[1] = 0x0000FF00; + expected[2] = 0x00FF0000; + expected[3] = 0xFF000000; + } + else + { + expected[0] = 0x00FF0000; + expected[1] = 0xFF000000; + expected[2] = 0x000000FF; + expected[3] = 0x0000FF00; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 1, 1, -2, -2, 1, 0, -2, 2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 0001 (1) - Vertical Flip. + + if ((SrcTopDown || DstTopDown) && !(SrcTopDown && DstTopDown)) + { + expected[0] = 0x00FF0000; + expected[1] = 0xFF000000; + expected[2] = 0x000000FF; + expected[3] = 0x0000FF00; + + } + else + { + expected[0] = 0x000000FF; + expected[1] = 0x0000FF00; + expected[2] = 0x00FF0000; + expected[3] = 0xFF000000; + } + + test_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 2, 2, -2, -2, 2, 2, -2, -2, expected, __LINE__, SrcTopDown, DstTopDown); // Case 0000 (0) - No Flip. Special Case. + + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + DeleteDC(hdcSrc); + + SelectObject(hdcDst, oldDst); + DeleteObject(bmpDst); + DeleteDC(hdcDst); + + DeleteDC(hdcScreen); +} START_TEST(StretchBlt) { + trace("\n\n## Start of generalized StretchBlt tests.\n\n"); test_StretchBlt(); + + trace("\n\n## Start of source top-down and destination top-down tests.\n\n"); + test_StretchBlt_TopDownOptions(TRUE, TRUE); + + trace("\n\n## Start of source top-down and destination bottom-up tests.\n\n"); + test_StretchBlt_TopDownOptions(TRUE, FALSE); + + trace("\n\n## Start of source bottom-up and destination top-down tests.\n\n"); + test_StretchBlt_TopDownOptions(FALSE, TRUE); + + trace("\n\n## Start of source bottom-up and destination bottom-up tests.\n\n"); + test_StretchBlt_TopDownOptions(FALSE, FALSE); }

1 0

[reactos] 01/01: [KERNEL32] Align the PROCESS_PRIORITY_CLASS variable in GetPriorityClass on a 4-byte boundary.
by Colin Finck 20 Feb '21

20 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd8080b0942e88502ca17… commit fd8080b0942e88502ca1735a0590f31e6d072e32 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Sat Feb 20 17:13:38 2021 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Sat Feb 20 17:13:38 2021 +0100 [KERNEL32] Align the PROCESS_PRIORITY_CLASS variable in GetPriorityClass on a 4-byte boundary. Fixes CORE-16757. This is required for NtQueryInformationProcess as proven by my test application in the bug report. --- dll/win32/kernel32/client/proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index e107c19b029..3b7d6f05ec5 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -1658,7 +1658,7 @@ WINAPI GetPriorityClass(IN HANDLE hProcess) { NTSTATUS Status; - PROCESS_PRIORITY_CLASS PriorityClass; + PROCESS_PRIORITY_CLASS DECLSPEC_ALIGN(4) PriorityClass; /* Query the kernel */ Status = NtQueryInformationProcess(hProcess,

1 0

[reactos] 01/01: [LSASRV] Add start code for the netlogon service
by Eric Kohl 19 Feb '21

19 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea26bef01de20d5c140a4… commit ea26bef01de20d5c140a426397627089892356a0 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Feb 19 21:53:00 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Feb 19 21:53:00 2021 +0100 [LSASRV] Add start code for the netlogon service --- boot/bootdata/hivesys.inf | 12 ++++++------ dll/win32/lsasrv/service.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 586b4746633..7dc2c1141fd 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1677,12 +1677,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Type",0x00010001,0x00000001 ; NetLogon -;HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","DisplayName",0x00000000,%NETLOGON_SERVICE% -;HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Description",0x00000000,%NETLOGON_SERVICE_DESCRIPTION% -;HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","ErrorControl",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","ImagePath",0x00020000,"%SystemRoot%\system32\lsass.exe" -;HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003 -;HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","Type",0x00010001,0x00000020 +HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","DisplayName",0x00000000,%NETLOGON_SERVICE% +HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Description",0x00000000,%NETLOGON_SERVICE_DESCRIPTION% +HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","ImagePath",0x00020000,"%SystemRoot%\system32\lsass.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","Type",0x00010001,0x00000020 ; NTFS filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000000 diff --git a/dll/win32/lsasrv/service.c b/dll/win32/lsasrv/service.c index 9c207811135..95fe262c7b2 100644 --- a/dll/win32/lsasrv/service.c +++ b/dll/win32/lsasrv/service.c @@ -11,12 +11,16 @@ #include "lsasrv.h" #include <winsvc.h> +typedef VOID (WINAPI *PNETLOGONMAIN)(INT ArgCount, PWSTR *ArgVector); + VOID WINAPI I_ScIsSecurityProcess(VOID); +static VOID WINAPI NetlogonServiceMain(DWORD dwArgc, PWSTR *pszArgv); static VOID WINAPI SamSsServiceMain(DWORD dwArgc, PWSTR *pszArgv); SERVICE_TABLE_ENTRYW ServiceTable[] = { + {L"NETLOGON", NetlogonServiceMain}, {L"SAMSS", SamSsServiceMain}, {NULL, NULL} }; @@ -24,6 +28,39 @@ SERVICE_TABLE_ENTRYW ServiceTable[] = /* FUNCTIONS ***************************************************************/ +static +VOID +WINAPI +NetlogonServiceMain( + _In_ DWORD dwArgc, + _In_ PWSTR *pszArgv) +{ + HINSTANCE hNetlogon = NULL; + PNETLOGONMAIN pNetlogonMain = NULL; + + TRACE("NetlogonServiceMain(%lu %p)\n", dwArgc, pszArgv); + + hNetlogon = LoadLibraryW(L"Netlogon.dll"); + if (hNetlogon == NULL) + { + ERR("LoadLibrary() failed!\n"); + return; + } + + pNetlogonMain = (PNETLOGONMAIN)GetProcAddress(hNetlogon, "NlNetlogonMain"); + if (pNetlogonMain == NULL) + { + ERR("GetProcAddress(NlNetlogonMain) failed!\n"); + FreeLibrary(hNetlogon); + return; + } + + TRACE("NlNetlogonMain %p\n", pNetlogonMain); + + pNetlogonMain(dwArgc, pszArgv); +} + + static VOID WINAPI

1 0

[reactos] 01/01: [NTOS:CC] Keep a reference on the shared cache map of the file when we are in lazy write
by Jérôme Gardou 19 Feb '21

19 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a962eaf8c514a7b7a12b… commit 2a962eaf8c514a7b7a12bb121457c5bcbbd404fd Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Feb 19 15:47:05 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Feb 19 15:48:31 2021 +0100 [NTOS:CC] Keep a reference on the shared cache map of the file when we are in lazy write This should fix "Leaking VACB" debug prints --- ntoskrnl/cc/view.c | 226 ++++++++++++++++++++++++++--------------------------- 1 file changed, 111 insertions(+), 115 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index c9a13047447..6481c340fe0 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -200,6 +200,107 @@ quit: return Status; } +static +NTSTATUS +CcRosDeleteFileCache ( + PFILE_OBJECT FileObject, + PROS_SHARED_CACHE_MAP SharedCacheMap, + PKIRQL OldIrql) +/* + * FUNCTION: Releases the shared cache map associated with a file object + */ +{ + PLIST_ENTRY current_entry; + + ASSERT(SharedCacheMap); + ASSERT(SharedCacheMap == FileObject->SectionObjectPointer->SharedCacheMap); + ASSERT(SharedCacheMap->OpenCount == 0); + + /* Remove all VACBs from the global lists */ + KeAcquireSpinLockAtDpcLevel(&SharedCacheMap->CacheMapLock); + current_entry = SharedCacheMap->CacheMapVacbListHead.Flink; + while (current_entry != &SharedCacheMap->CacheMapVacbListHead) + { + PROS_VACB Vacb = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); + + RemoveEntryList(&Vacb->VacbLruListEntry); + InitializeListHead(&Vacb->VacbLruListEntry); + + if (Vacb->Dirty) + { + CcRosUnmarkDirtyVacb(Vacb, FALSE); + /* Mark it as dirty again so we know that we have to flush before freeing it */ + Vacb->Dirty = TRUE; + } + + current_entry = current_entry->Flink; + } + + /* Make sure there is no trace anymore of this map */ + FileObject->SectionObjectPointer->SharedCacheMap = NULL; + RemoveEntryList(&SharedCacheMap->SharedCacheMapLinks); + + KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, *OldIrql); + + /* Now that we're out of the locks, free everything for real */ + while (!IsListEmpty(&SharedCacheMap->CacheMapVacbListHead)) + { + PROS_VACB Vacb = CONTAINING_RECORD(RemoveHeadList(&SharedCacheMap->CacheMapVacbListHead), ROS_VACB, CacheMapVacbListEntry); + ULONG RefCount; + + InitializeListHead(&Vacb->CacheMapVacbListEntry); + + /* Flush to disk, if needed */ + if (Vacb->Dirty) + { + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + + Status = MmFlushSegment(FileObject->SectionObjectPointer, &Vacb->FileOffset, VACB_MAPPING_GRANULARITY, &Iosb); + if (!NT_SUCCESS(Status)) + { + /* Complain. There's not much we can do */ + DPRINT1("Failed to flush VACB to disk while deleting the cache entry. Status: 0x%08x\n", Status); + } + Vacb->Dirty = FALSE; + } + + RefCount = CcRosVacbDecRefCount(Vacb); +#if DBG // CORE-14578 + if (RefCount != 0) + { + DPRINT1("Leaking VACB %p attached to %p (%I64d)\n", Vacb, FileObject, Vacb->FileOffset.QuadPart); + DPRINT1("There are: %d references left\n", RefCount); + DPRINT1("Map: %d\n", Vacb->MappedCount); + DPRINT1("Dirty: %d\n", Vacb->Dirty); + if (FileObject->FileName.Length != 0) + { + DPRINT1("File was: %wZ\n", &FileObject->FileName); + } + else + { + DPRINT1("No name for the file\n"); + } + } +#else + (void)RefCount; +#endif + } + + /* Release the references we own */ + if(SharedCacheMap->Section) + ObDereferenceObject(SharedCacheMap->Section); + ObDereferenceObject(SharedCacheMap->FileObject); + + ExFreeToNPagedLookasideList(&SharedCacheMapLookasideList, SharedCacheMap); + + /* Acquire the lock again for our caller */ + *OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + + return STATUS_SUCCESS; +} + NTSTATUS CcRosFlushDirtyPages ( ULONG Target, @@ -273,6 +374,9 @@ CcRosFlushDirtyPages ( SharedCacheMap->Flags |= SHARED_CACHE_MAP_IN_LAZYWRITE; + /* Keep a ref on the shared cache map */ + SharedCacheMap->OpenCount++; + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); Locked = SharedCacheMap->Callbacks->AcquireForLazyWrite(SharedCacheMap->LazyWriteContext, Wait); @@ -283,6 +387,10 @@ CcRosFlushDirtyPages ( CcRosVacbDecRefCount(current); OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); SharedCacheMap->Flags &= ~SHARED_CACHE_MAP_IN_LAZYWRITE; + + if (--SharedCacheMap->OpenCount == 0) + CcRosDeleteFileCache(SharedCacheMap->FileObject, SharedCacheMap, &OldIrql); + continue; } @@ -300,6 +408,9 @@ CcRosFlushDirtyPages ( SharedCacheMap->Flags &= ~SHARED_CACHE_MAP_IN_LAZYWRITE; + if (--SharedCacheMap->OpenCount == 0) + CcRosDeleteFileCache(SharedCacheMap->FileObject, SharedCacheMap, &OldIrql); + if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE) && (Status != STATUS_MEDIA_WRITE_PROTECTED)) { @@ -1014,121 +1125,6 @@ quit: } } -NTSTATUS -CcRosDeleteFileCache ( - PFILE_OBJECT FileObject, - PROS_SHARED_CACHE_MAP SharedCacheMap, - PKIRQL OldIrql) -/* - * FUNCTION: Releases the shared cache map associated with a file object - */ -{ - PLIST_ENTRY current_entry; - - ASSERT(SharedCacheMap); - ASSERT(SharedCacheMap == FileObject->SectionObjectPointer->SharedCacheMap); - ASSERT(SharedCacheMap->OpenCount == 0); - - /* Remove all VACBs from the global lists */ - KeAcquireSpinLockAtDpcLevel(&SharedCacheMap->CacheMapLock); - current_entry = SharedCacheMap->CacheMapVacbListHead.Flink; - while (current_entry != &SharedCacheMap->CacheMapVacbListHead) - { - PROS_VACB Vacb = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); - - RemoveEntryList(&Vacb->VacbLruListEntry); - InitializeListHead(&Vacb->VacbLruListEntry); - - if (Vacb->Dirty) - { - CcRosUnmarkDirtyVacb(Vacb, FALSE); - /* Mark it as dirty again so we know that we have to flush before freeing it */ - Vacb->Dirty = TRUE; - } - - current_entry = current_entry->Flink; - } - - /* Make sure there is no trace anymore of this map */ - FileObject->SectionObjectPointer->SharedCacheMap = NULL; - RemoveEntryList(&SharedCacheMap->SharedCacheMapLinks); - - KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); - KeReleaseQueuedSpinLock(LockQueueMasterLock, *OldIrql); - - /* Now that we're out of the locks, free everything for real */ - while (!IsListEmpty(&SharedCacheMap->CacheMapVacbListHead)) - { - PROS_VACB Vacb = CONTAINING_RECORD(RemoveHeadList(&SharedCacheMap->CacheMapVacbListHead), ROS_VACB, CacheMapVacbListEntry); - ULONG RefCount; - - InitializeListHead(&Vacb->CacheMapVacbListEntry); - - /* Flush to disk, if needed */ - if (Vacb->Dirty) - { - IO_STATUS_BLOCK Iosb; - NTSTATUS Status; - - Status = MmFlushSegment(FileObject->SectionObjectPointer, &Vacb->FileOffset, VACB_MAPPING_GRANULARITY, &Iosb); - if (!NT_SUCCESS(Status)) - { - /* Complain. There's not much we can do */ - DPRINT1("Failed to flush VACB to disk while deleting the cache entry. Status: 0x%08x\n", Status); - } - Vacb->Dirty = FALSE; - } - - RefCount = CcRosVacbDecRefCount(Vacb); -#if DBG // CORE-14578 - if (RefCount != 0) - { - DPRINT1("Leaking VACB %p attached to %p (%I64d)\n", Vacb, FileObject, Vacb->FileOffset.QuadPart); - DPRINT1("There are: %d references left\n", RefCount); - DPRINT1("Map: %d\n", Vacb->MappedCount); - DPRINT1("Dirty: %d\n", Vacb->Dirty); - if (FileObject->FileName.Length != 0) - { - DPRINT1("File was: %wZ\n", &FileObject->FileName); - } - else - { - DPRINT1("No name for the file\n"); - } - } -#else - (void)RefCount; -#endif - } - - /* Release the references we own */ - if(SharedCacheMap->Section) - ObDereferenceObject(SharedCacheMap->Section); - ObDereferenceObject(SharedCacheMap->FileObject); - - ExFreeToNPagedLookasideList(&SharedCacheMapLookasideList, SharedCacheMap); - - /* Acquire the lock again for our caller */ - *OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); - - return STATUS_SUCCESS; -} - -VOID -CcRosReferenceCache ( - PFILE_OBJECT FileObject) -{ - PROS_SHARED_CACHE_MAP SharedCacheMap; - KIRQL OldIrql; - - OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); - SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; - ASSERT(SharedCacheMap); - ASSERT(SharedCacheMap->OpenCount != 0); - SharedCacheMap->OpenCount++; - KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); -} - NTSTATUS CcRosReleaseFileCache ( PFILE_OBJECT FileObject)

1 0

[reactos] 01/01: [NTOS:WMI] Be consistent about potential NULL pointer use
by Jérôme Gardou 18 Feb '21

18 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d18634c026eeba286699b… commit d18634c026eeba286699b35a1e10d58c0b0ba4bf Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Feb 18 10:24:53 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 18 10:24:53 2021 +0100 [NTOS:WMI] Be consistent about potential NULL pointer use --- ntoskrnl/wmi/wmi.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/wmi/wmi.c b/ntoskrnl/wmi/wmi.c index 7d6d2bb21a8..1b6a70e923f 100644 --- a/ntoskrnl/wmi/wmi.c +++ b/ntoskrnl/wmi/wmi.c @@ -108,21 +108,26 @@ NTSTATUS NTAPI IoWMIWriteEvent(_Inout_ PVOID WnodeEventItem) { - DPRINT1("IoWMIWriteEvent() called for WnodeEventItem %p (Flags = 0x%08lx), returning success\n", - WnodeEventItem, ((PWNODE_HEADER)WnodeEventItem)->Flags); + PWNODE_HEADER Header = WnodeEventItem; - if (((PWNODE_HEADER)WnodeEventItem)->Flags & WNODE_FLAG_TRACED_GUID) + if(!Header) { - DPRINT("IoWMIWriteEvent(): Flags has WNODE_FLAG_TRACED_GUID\n"); + DPRINT1("Got NULL Item!\n"); + return STATUS_INVALID_PARAMETER; + } - // Never free WnodeEventItem in this case. + DPRINT1("IoWMIWriteEvent() called for WnodeEventItem %p (Flags = 0x%08lx), returning success\n", + WnodeEventItem, Header->Flags); + if (Header->Flags & WNODE_FLAG_TRACED_GUID) + { + // Never free WnodeEventItem in this case. + DPRINT("IoWMIWriteEvent(): Flags has WNODE_FLAG_TRACED_GUID\n"); return STATUS_SUCCESS; } /* Free the buffer if we are returning success */ - if (WnodeEventItem != NULL) - ExFreePool(WnodeEventItem); + ExFreePool(WnodeEventItem); return STATUS_SUCCESS; } @@ -402,7 +407,7 @@ WmiStartTrace(IN OUT PWMI_LOGGER_INFORMATION LoggerInfo) UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } - + NTSTATUS NTAPI WmiStopTrace(IN PWMI_LOGGER_INFORMATION LoggerInfo)

1 0

[reactos] 02/02: [NTOS:WMI] IoWMIWriteEvent(): Add WNODE_FLAG_TRACED_GUID case
by Serge Gautherie 17 Feb '21

17 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17a9041da14ca47494ff0… commit 17a9041da14ca47494ff02d0fe49fe315a8e6a5d Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Sep 9 03:46:56 2020 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 17 18:59:09 2021 +0100 [NTOS:WMI] IoWMIWriteEvent(): Add WNODE_FLAG_TRACED_GUID case Addendum to d5f8964 (r23040). CORE-17384 --- ntoskrnl/wmi/wmi.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ntoskrnl/wmi/wmi.c b/ntoskrnl/wmi/wmi.c index b27e134f811..7d6d2bb21a8 100644 --- a/ntoskrnl/wmi/wmi.c +++ b/ntoskrnl/wmi/wmi.c @@ -111,6 +111,15 @@ IoWMIWriteEvent(_Inout_ PVOID WnodeEventItem) DPRINT1("IoWMIWriteEvent() called for WnodeEventItem %p (Flags = 0x%08lx), returning success\n", WnodeEventItem, ((PWNODE_HEADER)WnodeEventItem)->Flags); + if (((PWNODE_HEADER)WnodeEventItem)->Flags & WNODE_FLAG_TRACED_GUID) + { + DPRINT("IoWMIWriteEvent(): Flags has WNODE_FLAG_TRACED_GUID\n"); + + // Never free WnodeEventItem in this case. + + return STATUS_SUCCESS; + } + /* Free the buffer if we are returning success */ if (WnodeEventItem != NULL) ExFreePool(WnodeEventItem);

1 0

[reactos] 01/02: [NTOS:WMI] IoWMIWriteEvent(): Fix annotation, Extend DPRINT1()
by Serge Gautherie 17 Feb '21

17 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=495e22e0d5b38ee0bcd16… commit 495e22e0d5b38ee0bcd16b3556c272604795dd09 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Sep 9 03:46:56 2020 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 17 18:59:09 2021 +0100 [NTOS:WMI] IoWMIWriteEvent(): Fix annotation, Extend DPRINT1() CORE-17384 --- ntoskrnl/wmi/wmi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/wmi/wmi.c b/ntoskrnl/wmi/wmi.c index 58547b6d419..b27e134f811 100644 --- a/ntoskrnl/wmi/wmi.c +++ b/ntoskrnl/wmi/wmi.c @@ -106,10 +106,10 @@ IoWMISuggestInstanceName(IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, */ NTSTATUS NTAPI -IoWMIWriteEvent(IN PVOID WnodeEventItem) +IoWMIWriteEvent(_Inout_ PVOID WnodeEventItem) { - DPRINT1("IoWMIWriteEvent() called for WnodeEventItem %p, returning success\n", - WnodeEventItem); + DPRINT1("IoWMIWriteEvent() called for WnodeEventItem %p (Flags = 0x%08lx), returning success\n", + WnodeEventItem, ((PWNODE_HEADER)WnodeEventItem)->Flags); /* Free the buffer if we are returning success */ if (WnodeEventItem != NULL)

1 0

[reactos] 01/01: [NTOS:MM] Handle demand zero PTEs with MM_EXECUTE_READWRITE and MM_READWRITE
by Timo Kreuzer 16 Feb '21

16 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b4bff0642fd06fde2945… commit 4b4bff0642fd06fde2945e711e70b366abbaa4a2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Nov 1 15:13:36 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Feb 16 18:02:57 2021 +0100 [NTOS:MM] Handle demand zero PTEs with MM_EXECUTE_READWRITE and MM_READWRITE --- ntoskrnl/mm/ARM3/pagfault.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index eefee2b340b..6d60645debd 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -2262,12 +2262,13 @@ UserFault: } /* Quick check for demand-zero */ - if (TempPte.u.Long == (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)) + if ((TempPte.u.Long == (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)) || + (TempPte.u.Long == (MM_EXECUTE_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS))) { /* Resolve the fault */ MiResolveDemandZeroFault(Address, PointerPte, - MM_READWRITE, + TempPte.u.Soft.Protection, CurrentProcess, MM_NOIRQL);

1 0

[reactos] 01/01: [PSDK] winbase.h: Update LoadLibraryEx() dwFlags value defines (#3456)
by Serge Gautherie 16 Feb '21

16 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ca16bf6969b1281095ad… commit 7ca16bf6969b1281095adcc919ae7fe9d679055f Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Feb 16 16:37:48 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 17 00:37:48 2021 +0900 [PSDK] winbase.h: Update LoadLibraryEx() dwFlags value defines (#3456) Add another Vista check. Addendum to 986cc5e. --- sdk/include/psdk/winbase.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 445c255b0ea..b6bda981368 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -354,7 +354,9 @@ extern "C" { #define LOAD_LIBRARY_SAFE_CURRENT_DIRS 0x00002000 #define LOAD_LIBRARY_SEARCH_SYSTEM32_NO_FORWARDER 0x00004000 #else // NTDDI_WIN10_RS1 +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) #define LOAD_LIBRARY_SEARCH_SYSTEM32_NO_FORWARDER LOAD_LIBRARY_SEARCH_SYSTEM32 +#endif // _WIN32_WINNT_VISTA #endif // NTDDI_WIN10_RS1 #if (NTDDI_VERSION >= NTDDI_WIN10_RS2) #define LOAD_LIBRARY_OS_INTEGRITY_CONTINUITY 0x00008000

1 0

[reactos] 01/01: [SHIMGVW] Update Czech (cs-CZ) translation
by Václav Zouzalík 16 Feb '21

16 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f8224e98522518922893… commit 0f8224e985225189228936b7560ea7d7ea6ae9cc Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Mon Feb 15 22:07:41 2021 +0100 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Tue Feb 16 15:11:50 2021 +0100 [SHIMGVW] Update Czech (cs-CZ) translation --- dll/win32/shimgvw/lang/cs-CZ.rc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/win32/shimgvw/lang/cs-CZ.rc b/dll/win32/shimgvw/lang/cs-CZ.rc index 21c61dd7690..4a4c67ab0e7 100644 --- a/dll/win32/shimgvw/lang/cs-CZ.rc +++ b/dll/win32/shimgvw/lang/cs-CZ.rc @@ -1,6 +1,6 @@ /* Translators: * 2008-06-24, Radek Liska aka Black_Fox (radekliska at gmail dot com) - * 2020-12-30, Václav Zouzalík aka Venca24 (vaclav.zouzalik at seznam dot cz) + * 2021-02-15, Václav Zouzalík aka Venca24 (vaclav.zouzalik at seznam dot cz) */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -14,18 +14,18 @@ BEGIN /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Další obrázek" IDS_TOOLTIP_PREV_PIC "Předchozí obrázek" - IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl+B)" - IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl+A)" - IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_BEST_FIT "Přizpůsobit velikosti okna (Ctrl+B)" + IDS_TOOLTIP_REAL_SIZE "Původní velikost (Ctrl+A)" + IDS_TOOLTIP_SLIDE_SHOW "Spustit prezentaci (F11)" IDS_TOOLTIP_ZOOM_IN "Přiblížit (+)" IDS_TOOLTIP_ZOOM_OUT "Oddálit (-)" IDS_TOOLTIP_ROT_CLOCKW "Otočit po směru hodinových ručiček (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Otočit proti směru hodinových ručiček (Ctrl+L)" - IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_DELETE "Odstranit (DEL)" IDS_TOOLTIP_PRINT "Tisk (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Uložit jako... (Ctrl+S)" - IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" - IDS_TOOLTIP_HELP_TOC "Help topics (F1)" + IDS_TOOLTIP_MODIFY "Upravit (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Nápověda (F1)" END STRINGTABLE

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs