Ros-diffs

ros-diffs@reactos.org

17 participants
81084 discussions

[reactos] 01/01: [ATL][ATL_APITEST] CImage testcase should cover all formats (#5653)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97b64c45c6dcdd2b1e56b… commit 97b64c45c6dcdd2b1e56bcb078d8be72de860ba0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 9 08:42:55 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 9 08:42:55 2023 +0900 [ATL][ATL_APITEST] CImage testcase should cover all formats (#5653) Strengthen CImage testcase and improve CImage class. ROSTESTS-387, CORE-19008 --- modules/rostests/apitests/atl/CImage.cpp | 465 ++++++++++++++++++------------- sdk/lib/atl/atlimage.h | 44 ++- 2 files changed, 303 insertions(+), 206 deletions(-) diff --git a/modules/rostests/apitests/atl/CImage.cpp b/modules/rostests/apitests/atl/CImage.cpp index 3ee98304da8..32116d0a811 100644 --- a/modules/rostests/apitests/atl/CImage.cpp +++ b/modules/rostests/apitests/atl/CImage.cpp @@ -1,11 +1,12 @@ /* * PROJECT: ReactOS api tests * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory - * PURPOSE: Test for CImage + * PURPOSE: Test for CImage and CImageDC * PROGRAMMER: Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include <atlimage.h> +#include <strsafe.h> #include "resource.h" #ifdef HAVE_APITEST @@ -14,250 +15,313 @@ #include "atltest.h" #endif -const TCHAR* szFiles[] = { - TEXT("ant.png"), - TEXT("ant.tif"), - TEXT("ant.gif"), - TEXT("ant.jpg"), - TEXT("ant.bmp"), -}; - -static TCHAR szTempPath[MAX_PATH]; -TCHAR* file_name(const TCHAR* file) +struct BITMAPINFOEX : BITMAPINFO { - static TCHAR buffer[MAX_PATH]; - lstrcpy(buffer, szTempPath); - lstrcat(buffer, TEXT("\\")); - lstrcat(buffer, file); - return buffer; -} + RGBQUAD bmiColorsExtra[256 - 1]; +}; -static void write_bitmap(HINSTANCE hInst, int id, TCHAR* file) +static void +Test_PixelAddress(INT iLine, const CImage &image1, const BITMAP &bm, INT x, INT y, BOOL bTopDown) { - HRSRC rsrc; + LPBYTE pb = (LPBYTE)bm.bmBits; - rsrc = FindResource(hInst, MAKEINTRESOURCE(id), RT_BITMAP); - ok(rsrc != NULL, "Expected to find an image resource\n"); - if (rsrc) - { - void *rsrc_data; - HANDLE hfile; - BOOL ret; - HGLOBAL glob = LoadResource(hInst, rsrc); - DWORD rsrc_size = SizeofResource(hInst, rsrc); + if (bTopDown) + pb += bm.bmWidthBytes * y; + else + pb += bm.bmWidthBytes * (bm.bmHeight - y - 1); - rsrc_data = LockResource(glob); + pb += (x * bm.bmBitsPixel) / 8; - hfile = CreateFile(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - ok(hfile != INVALID_HANDLE_VALUE, "Unable to open temp file: %lu\n", GetLastError()); - if (hfile != INVALID_HANDLE_VALUE) - { - BITMAPFILEHEADER bfh = { 0 }; - DWORD dwWritten; - - bfh.bfType = 'MB'; - bfh.bfSize = rsrc_size + sizeof(BITMAPFILEHEADER); - bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER); - bfh.bfReserved1 = bfh.bfReserved2 = 0; - ret = WriteFile(hfile, &bfh, sizeof(bfh), &dwWritten, NULL); - ok(ret, "Unable to write temp file: %lu\n", GetLastError()); - ret = WriteFile(hfile, rsrc_data, rsrc_size, &dwWritten, NULL); - ok(ret, "Unable to write temp file: %lu\n", GetLastError()); - CloseHandle(hfile); - } - UnlockResource(rsrc_data); - } + LPCVOID addr = image1.GetPixelAddress(x, y); + ok(pb == addr, "Line %d: (%d, %d): %p vs %p\n", iLine, x, y, pb, addr); } -typedef Gdiplus::GpStatus (WINAPI *STARTUP)(ULONG_PTR *, const Gdiplus::GdiplusStartupInput *, Gdiplus::GdiplusStartupOutput *); -typedef void (WINAPI *SHUTDOWN)(ULONG_PTR); -typedef Gdiplus::GpStatus (WINGDIPAPI *CREATEBITMAPFROMFILE)(GDIPCONST WCHAR*, Gdiplus::GpBitmap **); -typedef Gdiplus::GpStatus (WINGDIPAPI *GETPIXELFORMAT)(Gdiplus::GpImage *image, Gdiplus::PixelFormat *format); -typedef Gdiplus::GpStatus (WINGDIPAPI *DISPOSEIMAGE)(Gdiplus::GpImage *); +static void +Test_BitmapEntry(INT iLine, INT bpp, INT width, INT height, BOOL bTopDown) +{ + HBITMAP hBitmap = ::CreateBitmap(width, height, bpp, 1, NULL); + ok(hBitmap != NULL, "Line %d: hBitmap was NULL\n", iLine); -static HINSTANCE hinstGdiPlus; -static ULONG_PTR gdiplusToken; + CImage image1; -static STARTUP Startup; -static SHUTDOWN Shutdown; -static CREATEBITMAPFROMFILE CreateBitmapFromFile; -static GETPIXELFORMAT GetImagePixelFormat; -static DISPOSEIMAGE DisposeImage; + ok(image1.IsNull(), "Line %d: IsNull() was TRUE\n", iLine); + image1.Attach(hBitmap, (bTopDown ? CImage::DIBOR_TOPDOWN : CImage::DIBOR_BOTTOMUP)); -template <typename TYPE> -TYPE AddrOf(const char *name) -{ - FARPROC proc = ::GetProcAddress(hinstGdiPlus, name); - return reinterpret_cast<TYPE>(proc); + ok(!image1.IsNull(), "Line %d: IsNull() was FALSE\n", iLine); + ok(!image1.IsDIBSection(), "Line %d: IsDIBSection() was TRUE\n", iLine); + + ok(image1.GetWidth() == width, "Line %d: %d vs %d\n", iLine, image1.GetWidth(), width); + ok(image1.GetHeight() == height, "Line %d: %d vs %d\n", iLine, image1.GetHeight(), height); + ok(image1.GetBPP() == bpp, "Line %d: %d vs %d\n", iLine, image1.GetBPP(), 1); } -static void init_gdip() +static void Test_Bitmap(void) { - hinstGdiPlus = ::LoadLibraryA("gdiplus.dll"); - Startup = AddrOf<STARTUP>("GdiplusStartup"); - Shutdown = AddrOf<SHUTDOWN>("GdiplusShutdown"); - CreateBitmapFromFile = AddrOf<CREATEBITMAPFROMFILE>("GdipCreateBitmapFromFile"); - GetImagePixelFormat = AddrOf<GETPIXELFORMAT>("GdipGetImagePixelFormat"); - DisposeImage = AddrOf<DISPOSEIMAGE>("GdipDisposeImage"); + Test_BitmapEntry(__LINE__, 1, 20, 30, FALSE); + Test_BitmapEntry(__LINE__, 1, 30, 20, TRUE); + Test_BitmapEntry(__LINE__, 4, 20, 30, FALSE); + Test_BitmapEntry(__LINE__, 4, 30, 20, TRUE); + Test_BitmapEntry(__LINE__, 8, 20, 30, FALSE); + Test_BitmapEntry(__LINE__, 8, 30, 20, TRUE); + Test_BitmapEntry(__LINE__, 24, 20, 30, FALSE); + Test_BitmapEntry(__LINE__, 24, 30, 20, TRUE); + Test_BitmapEntry(__LINE__, 32, 20, 30, FALSE); + Test_BitmapEntry(__LINE__, 32, 30, 20, TRUE); } -static void determine_file_bpp(TCHAR* tfile, Gdiplus::PixelFormat expect_pf) +static void Test_CompatBitmapEntry(INT iLine, HDC hdc, INT width, INT height) { - using namespace Gdiplus; - GpBitmap *pBitmap = NULL; - -#ifdef UNICODE - WCHAR* file = tfile; -#else - WCHAR file[MAX_PATH]; - ::MultiByteToWideChar(CP_ACP, 0, tfile, -1, file, MAX_PATH); -#endif + HBITMAP hBitmap = ::CreateCompatibleBitmap(hdc, width, height); + ok(hBitmap != NULL, "Line %d: hBitmap was NULL\n", iLine); - if (Startup == NULL) - init_gdip(); + CImage image1; - Gdiplus::GdiplusStartupInput gdiplusStartupInput; - Startup(&gdiplusToken, &gdiplusStartupInput, NULL); + ok(image1.IsNull(), "Line %d: IsNull() was TRUE\n", iLine); + image1.Attach(hBitmap); + ok(!image1.IsNull(), "Line %d: IsNull() was FALSE\n", iLine); + ok(!image1.IsDIBSection(), "Line %d: IsDIBSection() was TRUE\n", iLine); - Gdiplus::GpStatus status = CreateBitmapFromFile(file, &pBitmap); - ok(status == Gdiplus::Ok, "Expected status to be %i, was: %i\n", (int)Gdiplus::Ok, (int)status); - ok(pBitmap != NULL, "Expected a valid bitmap\n"); - if (pBitmap) - { - PixelFormat pf; - GetImagePixelFormat(pBitmap, &pf); - ok(pf == expect_pf, "Expected PixelFormat to be 0x%x, was: 0x%x\n", (int)expect_pf, (int)pf); - - DisposeImage(pBitmap); - } - Shutdown(gdiplusToken); + ok(image1.GetWidth() == width, "Line %d: %d vs %d\n", iLine, image1.GetWidth(), width); + ok(image1.GetHeight() == height, "Line %d: %d vs %d\n", iLine, image1.GetHeight(), height); } -static void Test_LoadSaveImage(void) +static void Test_CompatBitmap(void) { - HRESULT hr; - TCHAR* file; - BOOL bOK; - int width, height, bpp; - size_t n; - CImage image1, image2; - COLORREF color; - HDC hDC; + HDC hdc = ::CreateCompatibleDC(NULL); - HINSTANCE hInst = GetModuleHandle(NULL); - GetTempPath(MAX_PATH, szTempPath); + Test_CompatBitmapEntry(__LINE__, hdc, 20, 30); + Test_CompatBitmapEntry(__LINE__, hdc, 20, 30); + Test_CompatBitmapEntry(__LINE__, hdc, 20, 30); + Test_CompatBitmapEntry(__LINE__, hdc, 20, 30); + Test_CompatBitmapEntry(__LINE__, hdc, 20, 30); - image1.LoadFromResource(hInst, IDB_ANT); - ok(!image1.IsNull(), "Expected image1 is not null\n"); + ::DeleteDC(hdc); - width = image1.GetWidth(); - ok(width == 48, "Expected width to be 48, was: %d\n", width); - height = image1.GetHeight(); - ok(height == 48, "Expected height to be 48, was: %d\n", height); - bpp = image1.GetBPP(); - ok(bpp == 8, "Expected bpp to be 8, was: %d\n", bpp); + hdc = ::GetDC(NULL); - image2.LoadFromResource(hInst, IDB_CROSS); - ok(!image2.IsNull(), "Expected image2 is not null\n"); - image2.SetTransparentColor(RGB(255, 255, 255)); + Test_CompatBitmapEntry(__LINE__, hdc, 20, 30); + Test_CompatBitmapEntry(__LINE__, hdc, 20, 30); + Test_CompatBitmapEntry(__LINE__, hdc, 20, 30); + Test_CompatBitmapEntry(__LINE__, hdc, 20, 30); + Test_CompatBitmapEntry(__LINE__, hdc, 20, 30); - width = image2.GetWidth(); - ok(width == 32, "Expected width to be 32, was: %d\n", width); - height = image2.GetHeight(); - ok(height == 32, "Expected height to be 32, was: %d\n", height); - bpp = image2.GetBPP(); - ok(bpp == 8, "Expected bpp to be 8, was: %d\n", bpp); + ::ReleaseDC(NULL, hdc); +} - color = image1.GetPixel(5, 5); - ok(color == RGB(166, 202, 240), "Expected color to be 166, 202, 240; was: %i, %i, %i\n", GetRValue(color), GetGValue(color), GetBValue(color)); +static void +Test_DIBSectionEntry(INT iLine, HDC hdc, INT bpp, INT width, INT height, BOOL bTopDown) +{ + // Initialize BITMAPINFOEX + BITMAPINFOEX bmi; + ZeroMemory(&bmi, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = width; + bmi.bmiHeader.biHeight = (bTopDown ? -height : height); + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = bpp; + switch (bpp) + { + case 1: + bmi.bmiHeader.biClrUsed = 2; + bmi.bmiColorsExtra[0].rgbBlue = 0xFF; + bmi.bmiColorsExtra[0].rgbGreen = 0xFF; + bmi.bmiColorsExtra[0].rgbRed = 0xFF; + break; + case 4: + case 8: + bmi.bmiHeader.biClrUsed = 3; + bmi.bmiColorsExtra[0].rgbBlue = 0xFF; + bmi.bmiColorsExtra[0].rgbGreen = 0xFF; + bmi.bmiColorsExtra[0].rgbRed = 0xFF; + bmi.bmiColorsExtra[1].rgbBlue = 0; + bmi.bmiColorsExtra[1].rgbGreen = 0; + bmi.bmiColorsExtra[1].rgbRed = 0xFF; + break; + default: + break; + } - hDC = image1.GetDC(); - bOK = image2.Draw(hDC, 0, 0); - image1.ReleaseDC(); - ok(bOK != FALSE, "Expected bDraw to be TRUE, was: %d\n", bOK); - image2.Destroy(); + // Create a DIB bitmap + HBITMAP hBitmap = ::CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, NULL, NULL, 0); + ok(hBitmap != NULL, "Line %d: hBitmap was NULL\n", iLine); - color = image1.GetPixel(5, 5); - ok(color == RGB(255, 0,0), "Expected color to be 255, 0, 0; was: %i, %i, %i\n", GetRValue(color), GetGValue(color), GetBValue(color)); + BITMAP bm; + ::GetObject(hBitmap, sizeof(bm), &bm); + INT pitch = (bTopDown ? bm.bmWidthBytes : -bm.bmWidthBytes); - file = file_name(TEXT("ant.bmp")); - write_bitmap(hInst, IDB_ANT, file); + CImage image1; - init_gdip(); + ok(image1.IsNull(), "Line %d: IsNull() was FALSE\n", iLine); + + image1.Attach(hBitmap, (bTopDown ? CImage::DIBOR_TOPDOWN : CImage::DIBOR_BOTTOMUP)); + + ok(!image1.IsNull(), "Line %d: IsNull() was FALSE\n", iLine); + ok(image1.IsDIBSection(), "Line %d: IsDIBSection() was FALSE\n", iLine); + if (bpp == 4 || bpp == 8) + { + ok(image1.GetTransparentColor() == 0xFFFFFFFF, "Line %d: 0x%08lX\n", iLine, + image1.GetTransparentColor()); + } + + switch (bpp) + { + case 1: + ok(image1.GetMaxColorTableEntries() == 2, + "Line %d: %d\n", iLine, image1.GetMaxColorTableEntries()); + break; + case 4: + ok(image1.GetMaxColorTableEntries() == 16, + "Line %d: %d\n", iLine, image1.GetMaxColorTableEntries()); + break; + case 8: + ok(image1.GetMaxColorTableEntries() == 256, + "Line %d: %d\n", iLine, image1.GetMaxColorTableEntries()); + break; + case 24: + case 32: + ok(image1.GetMaxColorTableEntries() == 0, + "Line %d: %d\n", iLine, image1.GetMaxColorTableEntries()); + break; + } - determine_file_bpp(file, PixelFormat8bppIndexed); + ok(image1.GetWidth() == width, "Line %d: %d vs %d\n", iLine, image1.GetWidth(), width); + ok(image1.GetHeight() == height, "Line %d: %d vs %d\n", iLine, image1.GetHeight(), height); + ok(image1.GetBPP() == bpp, "Line %d: %d vs %d\n", iLine, image1.GetBPP(), bpp); + ok(image1.GetPitch() == pitch, "Line %d: %d vs %d\n", iLine, image1.GetPitch(), pitch); - hr = image2.Load(file); - ok(hr == S_OK, "Expected hr to be S_OK, was: %08lx\n", hr); - ok(!image2.IsNull(), "Expected image1 is not null\n"); - bOK = DeleteFile(file); - ok(bOK, "Expected bOK to be TRUE, was: %d\n", bOK); + LPBYTE pbBits = (LPBYTE)bm.bmBits; + if (!bTopDown) + pbBits += bm.bmWidthBytes * (height - 1); + ok(image1.GetBits() == pbBits, "Line %d: %p vs %p\n", iLine, image1.GetBits(), pbBits); - width = image2.GetWidth(); - ok_int(width, 48); - height = image2.GetHeight(); - ok_int(height, 48); - bpp = image2.GetBPP(); - ok(bpp == 32 || bpp == 8, "bpp was %d\n", bpp); + // Test Color Table + if (bpp <= 8) + { + DWORD Colors[3]; + C_ASSERT(sizeof(DWORD) == sizeof(RGBQUAD)); + FillMemory(Colors, sizeof(Colors), 0xCC); + image1.GetColorTable(0, _countof(Colors), (RGBQUAD *)Colors); + ok(Colors[0] == 0, "Line %d: 0x%08lX\n", iLine, Colors[0]); + ok(Colors[1] == 0xFFFFFF, "Line %d: 0x%08lX\n", iLine, Colors[1]); + if (bpp >= 4) + ok(Colors[2] == 0xFF0000, "Line %d: 0x%08lX\n", iLine, Colors[2]); + } - for (n = 0; n < _countof(szFiles); ++n) + // Test SetPixel/GetPixel + COLORREF color; + image1.SetPixel(0, 0, RGB(255, 255, 255)); + color = image1.GetPixel(0, 0); + ok(color == RGB(255, 255, 255), "Line %d: color was 0x%08lX\n", iLine, color); + image1.SetPixel(0, 0, RGB(0, 0, 0)); + color = image1.GetPixel(0, 0); + ok(color == RGB(0, 0, 0), "Line %d: color was 0x%08lX\n", iLine, color); + + // Test GetDC/ReleaseDC { - file = file_name(szFiles[n]); - image2.Destroy(); - - if (n == 0) - hr = image1.Save(file, Gdiplus::ImageFormatPNG); - else - hr = image1.Save(file); - ok(hr == S_OK, "Expected hr to be S_OK, was: %08lx (for %i)\n", hr, n); - - bOK = (GetFileAttributes(file) != 0xFFFFFFFF); - ok(bOK, "Expected bOK to be TRUE, was: %d (for %i)\n", bOK, n); - - hr = image2.Load(file); - ok(hr == S_OK, "Expected hr to be S_OK, was: %08lx (for %i)\n", hr, n); - - width = image2.GetWidth(); - ok(width == 48, "Expected width to be 48, was: %d (for %i)\n", width, n); - height = image2.GetHeight(); - ok(height == 48, "Expected height to be 48, was: %d (for %i)\n", height, n); - bpp = image2.GetBPP(); - if (n == 3) + HDC hdc1 = image1.GetDC(); + ok(hdc1 != NULL, "Line %d: hdc1 was NULL\n", iLine); + ::SetPixelV(hdc1, 2, 2, RGB(255, 255, 255)); { - ok(bpp == 24 || bpp == 32, "Expected bpp to be 24 or 32, was: %d (for %i)\n", bpp, n); - determine_file_bpp(file, PixelFormat24bppRGB); - } - else - { - determine_file_bpp(file, PixelFormat8bppIndexed); + HDC hdc2 = image1.GetDC(); + ok(hdc2 != NULL, "Line %d: hdc2 was NULL\n", iLine); + color = ::GetPixel(hdc2, 2, 2); + ok(color == RGB(255, 255, 255), "Line %d: color was 0x%08lX\n", iLine, color); + image1.ReleaseDC(); } - color = image1.GetPixel(5, 5); - ok(color == RGB(255, 0,0), "Expected color to be 255, 0, 0; was: %i, %i, %i (for %i)\n", GetRValue(color), GetGValue(color), GetBValue(color), n); + image1.ReleaseDC(); + } + // Test CImageDC + { + CImageDC hdc1(image1); + ok(hdc1 != NULL, "Line %d: hdc1 was NULL\n", iLine); + ::SetPixelV(hdc1, 1, 0, RGB(255, 255, 255)); { - CImageDC dc1(image1); - ::SetPixel(dc1, 5, 5, RGB(0, 255, 0)); - { - CImageDC dc2(image1); - ::SetPixel(dc2, 5, 5, RGB(0, 0, 255)); - } + CImageDC hdc2(image1); + ok(hdc2 != NULL, "Line %d: hdc2 was NULL\n", iLine); + color = ::GetPixel(hdc2, 1, 0); + ok(color == RGB(255, 255, 255), "Line %d: color was 0x%08lX\n", iLine, color); } + } - { - HDC hdcImage = image1.GetDC(); - color = ::GetPixel(hdcImage, 5, 5); - ok_long(color, RGB(0, 0, 255)); - - ::SetPixel(hdcImage, 5, 5, RGB(255, 0, 0)); - color = ::GetPixel(hdcImage, 5, 5); - ok_long(color, RGB(255, 0, 0)); - image1.ReleaseDC(); - } + HRESULT hr; + TCHAR szFileName[MAX_PATH]; + LPCTSTR dotexts[] = + { + TEXT(".bmp"), TEXT(".jpg"), TEXT(".png"), TEXT(".gif"), TEXT(".tif") + }; - bOK = DeleteFile(file); - ok(bOK, "Expected bOK to be TRUE, was: %d (for %i)\n", bOK, n); + // Test Save/Load + for (UINT iDotExt = 0; iDotExt < _countof(dotexts); ++iDotExt) + { + ::ExpandEnvironmentStrings(TEXT("%TEMP%\\CImage"), szFileName, _countof(szFileName)); + StringCchCat(szFileName, _countof(szFileName), dotexts[iDotExt]); + hr = image1.Save(szFileName); + ok(hr == S_OK, "Line %d: %d: hr was 0x%08lX\n", iLine, iDotExt, hr); + + CImage image2; + hr = image2.Load(szFileName); + ok(hr == S_OK, "Line %d: %d: hr was 0x%08lX\n", iLine, iDotExt, hr); + ::DeleteFile(szFileName); + + CImageDC hdc2(image2); + ok(hdc2 != NULL, "Line %d: %d: hdc2 was NULL\n", iLine, iDotExt); + color = ::GetPixel(hdc2, 0, 0); + ok(color == RGB(0, 0, 0), "Line %d: %d: color was 0x%08lX\n", iLine, iDotExt, color); + color = ::GetPixel(hdc2, 1, 0); + ok(color == RGB(255, 255, 255), "Line %d: %d: color was 0x%08lX\n", iLine, iDotExt, color); } + + // Test GetPixelAddress + Test_PixelAddress(iLine, image1, bm, 0, 0, bTopDown); + Test_PixelAddress(iLine, image1, bm, 10, 0, bTopDown); + Test_PixelAddress(iLine, image1, bm, 0, 10, bTopDown); + Test_PixelAddress(iLine, image1, bm, 4, 6, bTopDown); + Test_PixelAddress(iLine, image1, bm, 6, 2, bTopDown); +} + +static void Test_DIBSection(void) +{ + HDC hdc = ::CreateCompatibleDC(NULL); + + Test_DIBSectionEntry(__LINE__, hdc, 1, 30, 20, FALSE); + Test_DIBSectionEntry(__LINE__, hdc, 1, 20, 30, TRUE); + Test_DIBSectionEntry(__LINE__, hdc, 4, 30, 20, FALSE); + Test_DIBSectionEntry(__LINE__, hdc, 4, 20, 30, TRUE); + Test_DIBSectionEntry(__LINE__, hdc, 8, 30, 20, FALSE); + Test_DIBSectionEntry(__LINE__, hdc, 8, 20, 30, TRUE); + Test_DIBSectionEntry(__LINE__, hdc, 24, 30, 20, FALSE); + Test_DIBSectionEntry(__LINE__, hdc, 24, 20, 30, TRUE); + Test_DIBSectionEntry(__LINE__, hdc, 32, 30, 20, FALSE); + Test_DIBSectionEntry(__LINE__, hdc, 32, 20, 30, TRUE); + + ::DeleteDC(hdc); +} + +static void Test_ResBitmap(void) +{ + HINSTANCE hInst = GetModuleHandle(NULL); + + CImage image1; + ok_int(image1.IsNull(), TRUE); + image1.LoadFromResource(hInst, IDB_ANT); + ok_int(image1.IsNull(), FALSE); + + ok_int(image1.GetWidth(), 48); + ok_int(image1.GetHeight(), 48); + ok_int(image1.GetBPP(), 8); + ok_int(image1.GetPitch(), -48); + + CImage image2; + ok_int(image2.IsNull(), TRUE); + image2.LoadFromResource(hInst, IDB_CROSS); + ok_int(image2.IsNull(), FALSE); + + ok_int(image2.GetWidth(), 32); + ok_int(image2.GetHeight(), 32); + ok_int(image2.GetBPP(), 8); + ok_int(image2.GetPitch(), -32); } static INT FindGUID(REFGUID rguid, const CSimpleArray<GUID>& guids) @@ -428,7 +492,10 @@ static void Test_Exporter(void) START_TEST(CImage) { - Test_LoadSaveImage(); + Test_Bitmap(); + Test_CompatBitmap(); + Test_DIBSection(); + Test_ResBitmap(); Test_Importer(); Test_Exporter(); } diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index a8546b085c0..84bfe64fc76 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -33,8 +33,8 @@ public: enum DIBOrientation { DIBOR_DEFAULT, // default - DIBOR_BOTTOMUP, // bottom-up DIB - DIBOR_TOPDOWN // top-down DIB + DIBOR_TOPDOWN, // top-down DIB + DIBOR_BOTTOMUP // bottom-up DIB }; CImage() noexcept @@ -283,6 +283,17 @@ public: return pb; } + const void *GetBits() const noexcept + { + ATLASSERT(IsDIBSection()); + const BYTE *pb = (const BYTE *)m_bm.bmBits; + if (m_eOrientation == DIBOR_BOTTOMUP) + { + pb += m_bm.bmWidthBytes * (m_bm.bmHeight - 1); + } + return pb; + } + int GetBPP() const noexcept { ATLASSERT(m_hBitmap); @@ -350,6 +361,15 @@ public: return pb; } + const void* GetPixelAddress(int x, int y) const noexcept + { + ATLASSERT(IsDIBSection()); + const BYTE *pb = (const BYTE *)GetBits(); + pb += GetPitch() * y; + pb += (GetBPP() * x) / 8; + return pb; + } + COLORREF GetTransparentColor() const noexcept { return m_clrTransparentColor; @@ -1020,6 +1040,8 @@ private: } private: + // FIXME: MS ATL CImage has m_nWidth, m_nHeight, m_nPitch, m_nBPP, and m_pBits. + // FIXME: MS ATL CImage hasn't m_eOrientation, m_bm, and m_ds. HBITMAP m_hBitmap; mutable HBITMAP m_hOldBitmap; mutable HDC m_hDC; @@ -1142,14 +1164,22 @@ private: m_bIsDIBSection = (::GetObject(hBitmap, size, &m_ds) == size); bool bOK = (::GetObject(hBitmap, sizeof(BITMAP), &m_bm) != 0); + if (!bOK) + return; + + m_hBitmap = hBitmap; - if (bOK) + if (m_bIsDIBSection && eOrientation == DIBOR_DEFAULT) { - m_hBitmap = hBitmap; - m_eOrientation = eOrientation; - m_bHasAlphaChannel = (m_bm.bmBitsPixel == 32); - m_clrTransparentColor = CLR_INVALID; + if (m_ds.dsBmih.biHeight < 0) + eOrientation = DIBOR_TOPDOWN; + else + eOrientation = DIBOR_BOTTOMUP; } + m_eOrientation = eOrientation; + + m_bHasAlphaChannel = (m_bm.bmBitsPixel == 32); + m_clrTransparentColor = CLR_INVALID; } BOOL CreateInternal(int nWidth, int nHeight, int nBPP,

1 year, 4 months

[reactos] 01/01: [PSDK] Add missing PNP_VETO_TYPE PNP_VetoInsufficientRights enumerator.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fdeb169a27d7432a0494a… commit fdeb169a27d7432a0494a58cc7eab52a6d809147 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Sep 6 14:02:17 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 7 20:28:03 2023 +0200 [PSDK] Add missing PNP_VETO_TYPE PNP_VetoInsufficientRights enumerator. --- sdk/include/psdk/cfg.h | 3 ++- sdk/include/reactos/idl/pnp.idl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/cfg.h b/sdk/include/psdk/cfg.h index 3653dec0eeb..751fa006550 100644 --- a/sdk/include/psdk/cfg.h +++ b/sdk/include/psdk/cfg.h @@ -188,7 +188,8 @@ typedef enum _PNP_VETO_TYPE { PNP_VetoIllegalDeviceRequest, PNP_VetoInsufficientPower, PNP_VetoNonDisableable, - PNP_VetoLegacyDriver + PNP_VetoLegacyDriver, + PNP_VetoInsufficientRights, } PNP_VETO_TYPE, *PPNP_VETO_TYPE; #ifdef __cplusplus diff --git a/sdk/include/reactos/idl/pnp.idl b/sdk/include/reactos/idl/pnp.idl index f56b932120e..0a75c523f05 100644 --- a/sdk/include/reactos/idl/pnp.idl +++ b/sdk/include/reactos/idl/pnp.idl @@ -53,7 +53,7 @@ typedef enum _PNP_VETO_TYPE { PNP_VetoNonDisableable = 10, PNP_VetoLegacyDriver = 11, PNP_VetoInsufficientRights = 12, -} *PPNP_VETO_TYPE; +} PNP_VETO_TYPE, *PPNP_VETO_TYPE; cpp_quote("#endif")

1 year, 4 months

[reactos] 02/02: [RTL][NTDLL] Implement and export RtlInitializeCriticalSectionEx

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f6aaa8af64ab752960f9… commit 8f6aaa8af64ab752960f9404a8b5dfeadaf57b1e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 13 14:03:48 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Sep 7 08:36:48 2023 +0300 [RTL][NTDLL] Implement and export RtlInitializeCriticalSectionEx --- dll/ntdll/def/ntdll.spec | 2 +- sdk/lib/rtl/critical.c | 174 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 124 insertions(+), 52 deletions(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index ee2598f8040..b7659f042d5 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -940,7 +940,7 @@ @ stdcall RtlInitializeContext(ptr ptr ptr ptr ptr) @ stdcall RtlInitializeCriticalSection(ptr) @ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) -@ stub -version=0x600+ RtlInitializeCriticalSectionEx +@ stdcall -version=0x600+ RtlInitializeCriticalSectionEx(ptr long long) @ stub -version=0x600+ -arch=i386 RtlInitializeExceptionChain @ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) @ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) diff --git a/sdk/lib/rtl/critical.c b/sdk/lib/rtl/critical.c index f2e88481417..0d2ca9913ad 100644 --- a/sdk/lib/rtl/critical.c +++ b/sdk/lib/rtl/critical.c @@ -28,6 +28,10 @@ extern HANDLE LdrpShutdownThreadId; /* FUNCTIONS *****************************************************************/ +#define CRITSECT_HAS_DEBUG_INFO(CriticalSection) \ + (((CriticalSection)->DebugInfo != NULL) && \ + ((CriticalSection)->DebugInfo != LongToPtr(-1))) + /*++ * RtlpCreateCriticalSectionSem * @@ -119,7 +123,7 @@ RtlpWaitForCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) CriticalSection, CriticalSection->LockSemaphore); - if (CriticalSection->DebugInfo) + if (CRITSECT_HAS_DEBUG_INFO(CriticalSection)) CriticalSection->DebugInfo->EntryCount++; /* @@ -142,7 +146,7 @@ RtlpWaitForCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) for (;;) { /* Increase the number of times we've had contention */ - if (CriticalSection->DebugInfo) + if (CRITSECT_HAS_DEBUG_INFO(CriticalSection)) CriticalSection->DebugInfo->ContentionCount++; /* Check if allocating the event failed */ @@ -404,7 +408,7 @@ RtlDeleteCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) /* Protect List */ RtlEnterCriticalSection(&RtlCriticalSectionLock); - if (CriticalSection->DebugInfo) + if (CRITSECT_HAS_DEBUG_INFO(CriticalSection)) { /* Remove it from the list */ RemoveEntryList(&CriticalSection->DebugInfo->ProcessLocksList); @@ -417,7 +421,7 @@ RtlDeleteCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) /* Unprotect */ RtlLeaveCriticalSection(&RtlCriticalSectionLock); - if (CriticalSection->DebugInfo) + if (CRITSECT_HAS_DEBUG_INFO(CriticalSection)) { /* Free it */ RtlpFreeDebugInfo(CriticalSection->DebugInfo); @@ -543,8 +547,8 @@ RtlInitializeCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) } /*++ - * RtlInitializeCriticalSectionAndSpinCount - * @implemented NT4 + * RtlInitializeCriticalSectionEx + * @implemented NT6.0 * * Initialises a new critical section. * @@ -553,6 +557,8 @@ RtlInitializeCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) * * SpinCount - Spin count for the critical section. * + * Flags - Flags for initialization. + * * Returns: * STATUS_SUCCESS. * @@ -562,10 +568,41 @@ RtlInitializeCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) *--*/ NTSTATUS NTAPI -RtlInitializeCriticalSectionAndSpinCount(PRTL_CRITICAL_SECTION CriticalSection, - ULONG SpinCount) +RtlInitializeCriticalSectionEx( + _Out_ PRTL_CRITICAL_SECTION CriticalSection, + _In_ ULONG SpinCount, + _In_ ULONG Flags) { PRTL_CRITICAL_SECTION_DEBUG CritcalSectionDebugData; + ULONG AllowedFlags; + ULONG OsVersion; + + /* Remove lower bits from flags */ + Flags &= RTL_CRITICAL_SECTION_ALL_FLAG_BITS; + + /* These flags generally allowed */ + AllowedFlags = RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO | + RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN | + RTL_CRITICAL_SECTION_FLAG_STATIC_INIT; + + /* Flags for Windows 7+ (CHECKME) */ + OsVersion = NtCurrentPeb()->OSMajorVersion << 8 | + NtCurrentPeb()->OSMinorVersion; + if (OsVersion >= _WIN32_WINNT_WIN7) + { + AllowedFlags |= RTL_CRITICAL_SECTION_FLAG_RESOURCE_TYPE | + RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO; + } + + if (Flags & ~AllowedFlags) + { + return STATUS_INVALID_PARAMETER_3; + } + + if (SpinCount & RTL_CRITICAL_SECTION_ALL_FLAG_BITS) + { + return STATUS_INVALID_PARAMETER_2; + } /* First things first, set up the Object */ DPRINT("Initializing Critical Section: %p\n", CriticalSection); @@ -575,62 +612,97 @@ RtlInitializeCriticalSectionAndSpinCount(PRTL_CRITICAL_SECTION CriticalSection, CriticalSection->SpinCount = (NtCurrentPeb()->NumberOfProcessors > 1) ? SpinCount : 0; CriticalSection->LockSemaphore = 0; - /* Allocate the Debug Data */ - CritcalSectionDebugData = RtlpAllocateDebugInfo(); - DPRINT("Allocated Debug Data: %p inside Process: %p\n", - CritcalSectionDebugData, - NtCurrentTeb()->ClientId.UniqueProcess); - - if (!CritcalSectionDebugData) + if (Flags & RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO) { - /* This is bad! */ - DPRINT1("Couldn't allocate Debug Data for: %p\n", CriticalSection); - return STATUS_NO_MEMORY; + CriticalSection->DebugInfo = LongToPtr(-1); } + else + { + /* Allocate the Debug Data */ + CritcalSectionDebugData = RtlpAllocateDebugInfo(); + DPRINT("Allocated Debug Data: %p inside Process: %p\n", + CritcalSectionDebugData, + NtCurrentTeb()->ClientId.UniqueProcess); - /* Set it up */ - CritcalSectionDebugData->Type = RTL_CRITSECT_TYPE; - CritcalSectionDebugData->ContentionCount = 0; - CritcalSectionDebugData->EntryCount = 0; - CritcalSectionDebugData->CriticalSection = CriticalSection; - CritcalSectionDebugData->Flags = 0; - CriticalSection->DebugInfo = CritcalSectionDebugData; + if (!CritcalSectionDebugData) + { + /* This is bad! */ + DPRINT1("Couldn't allocate Debug Data for: %p\n", CriticalSection); + return STATUS_NO_MEMORY; + } - /* - * Add it to the List of Critical Sections owned by the process. - * If we've initialized the Lock, then use it. If not, then probably - * this is the lock initialization itself, so insert it directly. - */ - if ((CriticalSection != &RtlCriticalSectionLock) && (RtlpCritSectInitialized)) - { - DPRINT("Securely Inserting into ProcessLocks: %p, %p, %p\n", - &CritcalSectionDebugData->ProcessLocksList, - CriticalSection, - &RtlCriticalSectionList); + /* Set it up */ + CritcalSectionDebugData->Type = RTL_CRITSECT_TYPE; + CritcalSectionDebugData->ContentionCount = 0; + CritcalSectionDebugData->EntryCount = 0; + CritcalSectionDebugData->CriticalSection = CriticalSection; + CritcalSectionDebugData->Flags = 0; + CriticalSection->DebugInfo = CritcalSectionDebugData; - /* Protect List */ - RtlEnterCriticalSection(&RtlCriticalSectionLock); + /* + * Add it to the List of Critical Sections owned by the process. + * If we've initialized the Lock, then use it. If not, then probably + * this is the lock initialization itself, so insert it directly. + */ + if ((CriticalSection != &RtlCriticalSectionLock) && (RtlpCritSectInitialized)) + { + DPRINT("Securely Inserting into ProcessLocks: %p, %p, %p\n", + &CritcalSectionDebugData->ProcessLocksList, + CriticalSection, + &RtlCriticalSectionList); - /* Add this one */ - InsertTailList(&RtlCriticalSectionList, &CritcalSectionDebugData->ProcessLocksList); + /* Protect List */ + RtlEnterCriticalSection(&RtlCriticalSectionLock); - /* Unprotect */ - RtlLeaveCriticalSection(&RtlCriticalSectionLock); - } - else - { - DPRINT("Inserting into ProcessLocks: %p, %p, %p\n", - &CritcalSectionDebugData->ProcessLocksList, - CriticalSection, - &RtlCriticalSectionList); + /* Add this one */ + InsertTailList(&RtlCriticalSectionList, &CritcalSectionDebugData->ProcessLocksList); + + /* Unprotect */ + RtlLeaveCriticalSection(&RtlCriticalSectionLock); + } + else + { + DPRINT("Inserting into ProcessLocks: %p, %p, %p\n", + &CritcalSectionDebugData->ProcessLocksList, + CriticalSection, + &RtlCriticalSectionList); - /* Add it directly */ - InsertTailList(&RtlCriticalSectionList, &CritcalSectionDebugData->ProcessLocksList); + /* Add it directly */ + InsertTailList(&RtlCriticalSectionList, &CritcalSectionDebugData->ProcessLocksList); + } } return STATUS_SUCCESS; } +/*++ + * RtlInitializeCriticalSectionAndSpinCount + * @implemented NT4 + * + * Initialises a new critical section. + * + * Params: + * CriticalSection - Critical section to initialise + * + * SpinCount - Spin count for the critical section. + * + * Returns: + * STATUS_SUCCESS. + * + * Remarks: + * SpinCount is ignored on single-processor systems. + * + *--*/ +NTSTATUS +NTAPI +RtlInitializeCriticalSectionAndSpinCount( + _Out_ PRTL_CRITICAL_SECTION CriticalSection, + _In_ ULONG SpinCount) +{ + SpinCount &= ~RTL_CRITICAL_SECTION_ALL_FLAG_BITS; + return RtlInitializeCriticalSectionEx(CriticalSection, SpinCount, 0); +} + /*++ * RtlGetCriticalSectionRecursionCount * @implemented NT5.2 SP1

1 year, 4 months

[reactos] 01/02: [NTDLL_APITEST] Add tests for critical sections

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d59cf43af3ad38ea853b… commit 1d59cf43af3ad38ea853b883468358f648d6da97 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 14 22:07:15 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Sep 7 08:36:48 2023 +0300 [NTDLL_APITEST] Add tests for critical sections --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../rostests/apitests/ntdll/RtlCriticalSection.c | 411 +++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + sdk/include/xdk/winnt_old.h | 14 +- 4 files changed, 427 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 14c12de120e..85515a2efaf 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -59,6 +59,7 @@ list(APPEND SOURCE RtlBitmap.c RtlComputePrivatizedDllName_U.c RtlCopyMappedMemory.c + RtlCriticalSection.c RtlDebugInformation.c RtlDeleteAce.c RtlDetermineDosPathNameType.c diff --git a/modules/rostests/apitests/ntdll/RtlCriticalSection.c b/modules/rostests/apitests/ntdll/RtlCriticalSection.c new file mode 100644 index 00000000000..920cc3a97a3 --- /dev/null +++ b/modules/rostests/apitests/ntdll/RtlCriticalSection.c @@ -0,0 +1,411 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Test for Rtl Critical Section API + * COPYRIGHT: Copyright 2023 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include "precomp.h" +#include <pseh/pseh2.h> + +SYSTEM_INFO g_SysInfo; +OSVERSIONINFOEXA g_VerInfo; +ULONG g_Version; +ULONG g_DefaultSpinCount; + +typedef +NTSTATUS +NTAPI +FN_RtlInitializeCriticalSectionEx( + _Out_ PRTL_CRITICAL_SECTION CriticalSection, + _In_ ULONG SpinCount, + _In_ ULONG Flags); + +FN_RtlInitializeCriticalSectionEx* pfnRtlInitializeCriticalSectionEx; +RTL_CRITICAL_SECTION CritSect; +HANDLE hEventThread1Ready, hEventThread1Cont; +HANDLE hEventThread2Ready, hEventThread2Cont; + +static +void +Test_Init(void) +{ + NTSTATUS Status; + BOOL HasDebugInfo = (g_Version <= _WIN32_WINNT_VISTA); + + _SEH2_TRY + { + RtlInitializeCriticalSection(NULL); + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_ntstatus(Status, STATUS_ACCESS_VIOLATION); + + Status = RtlInitializeCriticalSection(&CritSect); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_long(CritSect.LockCount, -1); + ok_long(CritSect.RecursionCount, 0); + ok_ptr(CritSect.OwningThread, NULL); + ok_ptr(CritSect.LockSemaphore, NULL); + ok_size_t(CritSect.SpinCount, g_DefaultSpinCount); + if (HasDebugInfo) + { + ok(CritSect.DebugInfo != NULL, "DebugInfo is %p\n", CritSect.DebugInfo); + ok(CritSect.DebugInfo != LongToPtr(-1), "DebugInfo is %p\n", CritSect.DebugInfo); + } + else + { + ok(CritSect.DebugInfo == LongToPtr(-1), "DebugInfo is %p\n", CritSect.DebugInfo); + } + + Status = RtlInitializeCriticalSectionAndSpinCount(&CritSect, 0); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_long(CritSect.LockCount, -1); + ok_long(CritSect.RecursionCount, 0); + ok_ptr(CritSect.OwningThread, NULL); + ok_ptr(CritSect.LockSemaphore, NULL); + ok_size_t(CritSect.SpinCount, g_DefaultSpinCount); + if (HasDebugInfo) + { + ok(CritSect.DebugInfo != NULL, "DebugInfo is %p\n", CritSect.DebugInfo); + ok(CritSect.DebugInfo != LongToPtr(-1), "DebugInfo is %p\n", CritSect.DebugInfo); + } + else + { + ok(CritSect.DebugInfo == LongToPtr(-1), "DebugInfo is %p\n", CritSect.DebugInfo); + } + + Status = RtlInitializeCriticalSectionAndSpinCount(&CritSect, 0xFF000000); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_size_t(CritSect.SpinCount, g_DefaultSpinCount); + + Status = RtlInitializeCriticalSectionAndSpinCount(&CritSect, 0x1234); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_size_t(CritSect.SpinCount, (g_SysInfo.dwNumberOfProcessors > 1) ? 0x1234 : 0); + + if (pfnRtlInitializeCriticalSectionEx != NULL) + { + _SEH2_TRY + { + pfnRtlInitializeCriticalSectionEx(NULL, 0, 0); + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_ntstatus(Status, STATUS_ACCESS_VIOLATION); + + Status = pfnRtlInitializeCriticalSectionEx(&CritSect, 0, 0); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_long(CritSect.LockCount, -1); + ok_long(CritSect.RecursionCount, 0); + ok_ptr(CritSect.OwningThread, NULL); + ok_ptr(CritSect.LockSemaphore, NULL); + ok_size_t(CritSect.SpinCount, g_DefaultSpinCount); + if (HasDebugInfo) + { + ok(CritSect.DebugInfo != NULL, "DebugInfo is %p\n", CritSect.DebugInfo); + ok(CritSect.DebugInfo != LongToPtr(-1), "DebugInfo is %p\n", CritSect.DebugInfo); + if ((CritSect.DebugInfo != NULL) && (CritSect.DebugInfo != LongToPtr(-1))) + { + ok_int(CritSect.DebugInfo->Type, 0); + ok_int(CritSect.DebugInfo->CreatorBackTraceIndex, 0); + ok_int(CritSect.DebugInfo->CreatorBackTraceIndexHigh, 0); + ok_ptr(CritSect.DebugInfo->CriticalSection, &CritSect); + ok(CritSect.DebugInfo->ProcessLocksList.Flink != NULL, "Flink is NULL\n"); + ok(CritSect.DebugInfo->ProcessLocksList.Blink != NULL, "Blink is NULL\n"); + if ((CritSect.DebugInfo->ProcessLocksList.Flink != NULL) && + (CritSect.DebugInfo->ProcessLocksList.Blink != NULL)) + { + ok_ptr(CritSect.DebugInfo->ProcessLocksList.Flink->Blink, + &CritSect.DebugInfo->ProcessLocksList); + ok_ptr(CritSect.DebugInfo->ProcessLocksList.Blink->Flink, + &CritSect.DebugInfo->ProcessLocksList); + } + ok_long(CritSect.DebugInfo->EntryCount, 0); + ok_long(CritSect.DebugInfo->ContentionCount, 0); + ok_long(CritSect.DebugInfo->Flags, 0); + ok_int(CritSect.DebugInfo->SpareWORD, 0); + } + } + else + { + ok(CritSect.DebugInfo == LongToPtr(-1), "DebugInfo is %p\n", CritSect.DebugInfo); + } + + Status = pfnRtlInitializeCriticalSectionEx(&CritSect, 0x00FFFFFF, 0); + ok_size_t(CritSect.SpinCount, (g_SysInfo.dwNumberOfProcessors > 1) ? 0x00FFFFFF : 0); + + Status = pfnRtlInitializeCriticalSectionEx(&CritSect, 0x01000000, 0); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER_2); + + Status = pfnRtlInitializeCriticalSectionEx(&CritSect, 0x80000000, 0); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER_2); + + _SEH2_TRY + { + Status = pfnRtlInitializeCriticalSectionEx(NULL, 0x12345678, 0); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_ntstatus(Status, STATUS_INVALID_PARAMETER_2); + + for (ULONG i = 0; i < 32; i++) + { + ULONG Flags = 1UL << i; + ULONG AllowedFlags = 0x07FFFFFF; + if (g_Version >= _WIN32_WINNT_WIN7) AllowedFlags |= 0x18000000; + NTSTATUS ExpectedStatus = (Flags & ~AllowedFlags) ? + STATUS_INVALID_PARAMETER_3 : STATUS_SUCCESS; + Status = pfnRtlInitializeCriticalSectionEx(&CritSect, 0, Flags); + ok(Status == ExpectedStatus, "Wrong Status (0x%lx) for Flags 0x%lx\n", + Status, Flags); + if (NT_SUCCESS(Status)) + { + ULONG SetFlags = Flags & 0x08000000; + if (g_Version >= _WIN32_WINNT_WIN7) SetFlags |= (Flags & 0x03000000); + ok_size_t(CritSect.SpinCount, (g_SysInfo.dwNumberOfProcessors > 1) ? g_DefaultSpinCount | SetFlags : SetFlags); + } + } + + Status = pfnRtlInitializeCriticalSectionEx(&CritSect, 0, 0xFFFFFFFF); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER_3); + _SEH2_TRY + { + Status = pfnRtlInitializeCriticalSectionEx(NULL, 0, 0xFFFFFFFF); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_ntstatus(Status, STATUS_INVALID_PARAMETER_3); + + Status = pfnRtlInitializeCriticalSectionEx(&CritSect, 0x12345678, 0xFFFFFFFF); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER_3); + + Status = pfnRtlInitializeCriticalSectionEx(&CritSect, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + if (g_Version >= _WIN32_WINNT_WIN7) + { + ok_ntstatus(Status, STATUS_SUCCESS); + ok(CritSect.DebugInfo != NULL, "DebugInfo is %p\n", CritSect.DebugInfo); + ok(CritSect.DebugInfo != LongToPtr(-1), "DebugInfo is %p\n", CritSect.DebugInfo); + if ((CritSect.DebugInfo != NULL) && (CritSect.DebugInfo != LongToPtr(-1))) + { + ok_int(CritSect.DebugInfo->Type, 0); + ok_int(CritSect.DebugInfo->CreatorBackTraceIndex, 0); + ok_int(CritSect.DebugInfo->CreatorBackTraceIndexHigh, 0); + ok_ptr(CritSect.DebugInfo->CriticalSection, &CritSect); + ok(CritSect.DebugInfo->ProcessLocksList.Flink != NULL, "Flink is NULL\n"); + ok(CritSect.DebugInfo->ProcessLocksList.Blink != NULL, "Blink is NULL\n"); + if ((CritSect.DebugInfo->ProcessLocksList.Flink != NULL) && + (CritSect.DebugInfo->ProcessLocksList.Blink != NULL)) + { + ok_ptr(CritSect.DebugInfo->ProcessLocksList.Flink->Blink, + &CritSect.DebugInfo->ProcessLocksList); + ok_ptr(CritSect.DebugInfo->ProcessLocksList.Blink->Flink, + &CritSect.DebugInfo->ProcessLocksList); + } + ok_long(CritSect.DebugInfo->EntryCount, 0); + ok_long(CritSect.DebugInfo->ContentionCount, 0); + ok_long(CritSect.DebugInfo->Flags, 0); + ok_int(CritSect.DebugInfo->SpareWORD, 0); + } + } + else + { + ok_ntstatus(Status, STATUS_INVALID_PARAMETER_3); + } + } + else + { + skip("RtlInitializeCriticalSectionEx not available.\n"); + } +} + +static +DWORD +WINAPI +ThreadProc1( + _In_ LPVOID lpParameter) +{ + printf("ThreadProc1 starting\n"); + RtlEnterCriticalSection(&CritSect); + + SetEvent(hEventThread1Ready); + + printf("ThreadProc1 waiting\n"); + WaitForSingleObject(hEventThread1Cont, INFINITE); + printf("ThreadProc1 returned from wait\n"); + + RtlLeaveCriticalSection(&CritSect); + + return 0; +} + +static +DWORD +WINAPI +ThreadProc2( + _In_ LPVOID lpParameter) +{ + printf("ThreadProc2 starting\n"); + RtlEnterCriticalSection(&CritSect); + + SetEvent(hEventThread2Ready); + + printf("ThreadProc2 waiting\n"); + WaitForSingleObject(hEventThread2Cont, INFINITE); + printf("ThreadProc2 returned from wait\n"); + + RtlLeaveCriticalSection(&CritSect); + + return 0; +} + +static +void +Test_Acquire(void) +{ + DWORD dwThreadId1, dwThreadId2; + HANDLE hThread1, hThread2; + + RtlInitializeCriticalSection(&CritSect); + + // Acquire once + RtlEnterCriticalSection(&CritSect); + ok_long(CritSect.LockCount, -2); + ok_long(CritSect.RecursionCount, 1); + ok_ptr(CritSect.OwningThread, UlongToHandle(GetCurrentThreadId())); + ok_ptr(CritSect.LockSemaphore, NULL); + ok_size_t(CritSect.SpinCount, g_DefaultSpinCount); + + // Acquire recursively + RtlEnterCriticalSection(&CritSect); + ok_long(CritSect.LockCount, -2); + ok_long(CritSect.RecursionCount, 2); + ok_ptr(CritSect.OwningThread, UlongToHandle(GetCurrentThreadId())); + ok_ptr(CritSect.LockSemaphore, NULL); + ok_size_t(CritSect.SpinCount, g_DefaultSpinCount); + + hEventThread1Ready = CreateEvent(NULL, TRUE, FALSE, NULL); + hEventThread1Cont = CreateEvent(NULL, TRUE, FALSE, NULL); + hEventThread2Ready = CreateEvent(NULL, TRUE, FALSE, NULL); + hEventThread2Cont = CreateEvent(NULL, TRUE, FALSE, NULL); + + // Create thread 1 and wait to it time to try to acquire the critical section + hThread1 = CreateThread(NULL, 0, ThreadProc1, NULL, 0, &dwThreadId1); + + // Wait up to 10 s + for (ULONG i = 0; (CritSect.LockCount == -2) && (i < 1000); i++) + { + Sleep(10); + } + + ok_long(CritSect.LockCount, -6); + ok_long(CritSect.RecursionCount, 2); + ok_ptr(CritSect.OwningThread, UlongToHandle(GetCurrentThreadId())); + //ok_ptr(CritSect.LockSemaphore, LongToPtr(-1)); // TODO: this behaves differently on different OS versions + ok_size_t(CritSect.SpinCount, g_DefaultSpinCount); + + // Create thread 2 and wait to it time to try to acquire the critical section + hThread2 = CreateThread(NULL, 0, ThreadProc2, NULL, 0, &dwThreadId2); + + // Wait up to 10 s + for (ULONG i = 0; (CritSect.LockCount == -6) && (i < 1000); i++) + { + Sleep(10); + } + + ok_long(CritSect.LockCount, -10); + ok_long(CritSect.RecursionCount, 2); + ok_ptr(CritSect.OwningThread, UlongToHandle(GetCurrentThreadId())); + //ok_ptr(CritSect.LockSemaphore, LongToPtr(-1)); + ok_size_t(CritSect.SpinCount, g_DefaultSpinCount); + + RtlLeaveCriticalSection(&CritSect); + ok_long(CritSect.LockCount, -10); + ok_long(CritSect.RecursionCount, 1); + RtlLeaveCriticalSection(&CritSect); + + // Wait until thread 1 has acquired the critical section + WaitForSingleObject(hEventThread1Ready, INFINITE); + + ok_long(CritSect.LockCount, -6); + ok_long(CritSect.RecursionCount, 1); + ok_ptr(CritSect.OwningThread, UlongToHandle(dwThreadId1)); + //ok_ptr(CritSect.LockSemaphore, LongToPtr(-1)); + if (g_DefaultSpinCount != 0) + { + ok(CritSect.SpinCount <= g_DefaultSpinCount, "SpinCount increased\n"); + } + else + { + ok_size_t(CritSect.SpinCount, g_DefaultSpinCount); + } + + ok_size_t(CritSect.SpinCount, g_DefaultSpinCount ? g_DefaultSpinCount - 1 : 0); + + // Release thread 1, wait for thread 2 to acquire the critical section + SetEvent(hEventThread1Cont); + WaitForSingleObject(hEventThread2Ready, INFINITE); + + ok_long(CritSect.LockCount, -2); + ok_long(CritSect.RecursionCount, 1); + ok_ptr(CritSect.OwningThread, UlongToHandle(dwThreadId2)); + //ok_ptr(CritSect.LockSemaphore, LongToPtr(-1)); + if (g_DefaultSpinCount != 0) + { + ok(CritSect.SpinCount <= g_DefaultSpinCount, "SpinCount increased\n"); + } + else + { + ok_size_t(CritSect.SpinCount, g_DefaultSpinCount); + } + + // Release thread 2 + SetEvent(hEventThread2Cont); + + // To make Thomas happy :) + WaitForSingleObject(hThread1, INFINITE); + WaitForSingleObject(hThread2, INFINITE); +} + +START_TEST(RtlCriticalSection) +{ + HMODULE hmodNtDll = GetModuleHandleA("ntdll.dll"); + pfnRtlInitializeCriticalSectionEx = (FN_RtlInitializeCriticalSectionEx*) + GetProcAddress(hmodNtDll, "RtlInitializeCriticalSectionEx"); + + g_VerInfo.dwOSVersionInfoSize = sizeof(g_VerInfo); + GetVersionExA((LPOSVERSIONINFOA)&g_VerInfo); + g_Version = g_VerInfo.dwMajorVersion << 8 | g_VerInfo.dwMinorVersion; + printf("g_VerInfo: %lu.%lu.%lu ('%s')\n ", + g_VerInfo.dwMajorVersion, + g_VerInfo.dwMinorVersion, + g_VerInfo.dwBuildNumber, + g_VerInfo.szCSDVersion); + GetSystemInfo(&g_SysInfo); + printf("g_SysInfo.dwNumberOfProcessors = %lu\n", g_SysInfo.dwNumberOfProcessors); + + if ((g_Version >= _WIN32_WINNT_VISTA) && (g_SysInfo.dwNumberOfProcessors > 1)) + { + g_DefaultSpinCount = 0x20007d0; + } + else + { + g_DefaultSpinCount = 0; + } + + Test_Init(); + Test_Acquire(); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 7f80f42420b..2be58938238 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -55,6 +55,7 @@ extern void func_RtlAllocateHeap(void); extern void func_RtlBitmap(void); extern void func_RtlComputePrivatizedDllName_U(void); extern void func_RtlCopyMappedMemory(void); +extern void func_RtlCriticalSection(void); extern void func_RtlDebugInformation(void); extern void func_RtlDeleteAce(void); extern void func_RtlDetermineDosPathNameType(void); @@ -150,6 +151,7 @@ const struct test winetest_testlist[] = { "RtlBitmapApi", func_RtlBitmap }, { "RtlComputePrivatizedDllName_U", func_RtlComputePrivatizedDllName_U }, { "RtlCopyMappedMemory", func_RtlCopyMappedMemory }, + { "RtlCriticalSection", func_RtlCriticalSection }, { "RtlDebugInformation", func_RtlDebugInformation }, { "RtlDeleteAce", func_RtlDeleteAce }, { "RtlDetermineDosPathNameType", func_RtlDetermineDosPathNameType }, diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index 7e564277b9a..15d353fc9ef 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -1116,7 +1116,19 @@ typedef VOID (NTAPI *WORKERCALLBACKFUNC)(PVOID); #define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003 #define IO_REPARSE_TAG_SYMLINK 0xA000000CL -#define RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO 0x01000000 +#define RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO 0x01000000 +#define RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN 0x02000000 +#define RTL_CRITICAL_SECTION_FLAG_STATIC_INIT 0x04000000 +#define RTL_CRITICAL_SECTION_FLAG_RESOURCE_TYPE 0x08000000 +#define RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO 0x10000000 +#define RTL_CRITICAL_SECTION_ALL_FLAG_BITS 0xFF000000 +#define RTL_CRITICAL_SECTION_FLAG_RESERVED \ + (RTL_CRITICAL_SECTION_ALL_FLAG_BITS & \ + (~(RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO | \ + RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN | \ + RTL_CRITICAL_SECTION_FLAG_STATIC_INIT | \ + RTL_CRITICAL_SECTION_FLAG_RESOURCE_TYPE | \ + RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO))) #ifndef RC_INVOKED

1 year, 4 months

[reactos] 01/01: [KERNEL32][RTL] Implement One-Time initialization API and improve RTL support (#5046)

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f491d7cc99ecaf156b47b… commit f491d7cc99ecaf156b47baf33e3d9933a7f49e6e Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Thu Sep 7 06:40:53 2023 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 6 15:40:53 2023 -0700 [KERNEL32][RTL] Implement One-Time initialization API and improve RTL support (#5046) * [KERNEL32][RTL] Implement One-Time initialization API and improve RTL support --- dll/win32/kernel32/kernel32.spec | 6 +- dll/win32/kernel32/kernel32_vista/CMakeLists.txt | 2 +- dll/win32/kernel32/kernel32_vista/InitOnce.c | 62 +++++ .../kernel32/kernel32_vista/InitOnceExecuteOnce.c | 19 -- .../kernel32/kernel32_vista/kernel32_vista.spec | 4 + modules/rostests/apitests/kernel32/CMakeLists.txt | 1 + modules/rostests/apitests/kernel32/InitOnce.c | 280 +++++++++++++++++++++ modules/rostests/apitests/kernel32/testlist.c | 2 + sdk/include/ndk/rtlfuncs.h | 37 +++ sdk/include/psdk/winbase.h | 37 ++- sdk/include/xdk/winnt_old.h | 10 +- sdk/lib/rtl/runonce.c | 77 +++--- 12 files changed, 472 insertions(+), 65 deletions(-) diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index e72f99fb295..c4583be816f 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -708,10 +708,10 @@ @ stdcall -stub -version=0x600+ IdnToNameprepUnicode(long wstr long ptr long) @ stdcall -stub -version=0x600+ IdnToUnicode(long wstr long ptr long) @ stdcall InitAtomTable(long) -@ stdcall -stub -version=0x600+ InitOnceBeginInitialize(ptr long ptr ptr) -@ stdcall -stub -version=0x600+ InitOnceComplete(ptr long ptr) +@ stdcall -version=0x600+ InitOnceBeginInitialize(ptr long ptr ptr) +@ stdcall -version=0x600+ InitOnceComplete(ptr long ptr) @ stdcall -version=0x600+ InitOnceExecuteOnce(ptr ptr ptr ptr) -@ stdcall -stub -version=0x600+ InitOnceInitialize(ptr) +@ stdcall -version=0x600+ InitOnceInitialize(ptr) NTDLL.RtlRunOnceInitialize @ stdcall -version=0x600+ InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) diff --git a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt index acc53b9d80a..3b2b8e735b7 100644 --- a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt +++ b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt @@ -9,7 +9,7 @@ spec2def(kernel32_vista.dll kernel32_vista.spec ADD_IMPORTLIB) list(APPEND SOURCE GetFileInformationByHandleEx.c GetTickCount64.c - InitOnceExecuteOnce.c + InitOnce.c sync.c vista.c) diff --git a/dll/win32/kernel32/kernel32_vista/InitOnce.c b/dll/win32/kernel32/kernel32_vista/InitOnce.c new file mode 100644 index 00000000000..339c157286c --- /dev/null +++ b/dll/win32/kernel32/kernel32_vista/InitOnce.c @@ -0,0 +1,62 @@ +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: One-Time initialization API + * COPYRIGHT: Copyright 2023 Ratin Gao <ratin(a)knsoft.org> + */ + +#include "k32_vista.h" + +BOOL +WINAPI +InitOnceExecuteOnce( + _Inout_ PINIT_ONCE InitOnce, + _In_ __callback PINIT_ONCE_FN InitFn, + _Inout_opt_ PVOID Parameter, + _Outptr_opt_result_maybenull_ LPVOID *Context) +{ + return NT_SUCCESS(RtlRunOnceExecuteOnce(InitOnce, + (PRTL_RUN_ONCE_INIT_FN)InitFn, + Parameter, + Context)); +} + +BOOL +WINAPI +InitOnceBeginInitialize( + _Inout_ LPINIT_ONCE lpInitOnce, + _In_ DWORD dwFlags, + _Out_ PBOOL fPending, + _Outptr_opt_result_maybenull_ LPVOID *lpContext) +{ + NTSTATUS Status; + + Status = RtlRunOnceBeginInitialize(lpInitOnce, dwFlags, lpContext); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + *fPending = (Status == STATUS_PENDING); + return TRUE; +} + +BOOL +WINAPI +InitOnceComplete( + _Inout_ LPINIT_ONCE lpInitOnce, + _In_ DWORD dwFlags, + _In_opt_ LPVOID lpContext) +{ + NTSTATUS Status; + + Status = RtlRunOnceComplete(lpInitOnce, dwFlags, lpContext); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; +} diff --git a/dll/win32/kernel32/kernel32_vista/InitOnceExecuteOnce.c b/dll/win32/kernel32/kernel32_vista/InitOnceExecuteOnce.c deleted file mode 100644 index 1ef59160aef..00000000000 --- a/dll/win32/kernel32/kernel32_vista/InitOnceExecuteOnce.c +++ /dev/null @@ -1,19 +0,0 @@ - -#include "k32_vista.h" - -#include <ndk/exfuncs.h> -#include <wine/config.h> -#include <wine/port.h> - -DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, - void *param, void **context ); - -/* Taken from Wine kernel32/sync.c */ - -/* - * @implemented - */ -BOOL NTAPI InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, void *param, void **context ) -{ - return !RtlRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); -} diff --git a/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec b/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec index 02c1cb05739..bf074328323 100644 --- a/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec +++ b/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec @@ -1,5 +1,9 @@ +@ stdcall InitOnceBeginInitialize(ptr long ptr ptr) +@ stdcall InitOnceComplete(ptr long ptr) @ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) +@ stdcall InitOnceInitialize(ptr) NTDLL.RtlRunOnceInitialize + @ stdcall GetFileInformationByHandleEx(long long ptr long) @ stdcall -ret64 GetTickCount64() diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index 9aebaa979a5..8c26b340edc 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -18,6 +18,7 @@ list(APPEND SOURCE GetDriveType.c GetModuleFileName.c GetVolumeInformation.c + InitOnce.c interlck.c IsDBCSLeadByteEx.c JapaneseCalendar.c diff --git a/modules/rostests/apitests/kernel32/InitOnce.c b/modules/rostests/apitests/kernel32/InitOnce.c new file mode 100644 index 00000000000..586e87bac9d --- /dev/null +++ b/modules/rostests/apitests/kernel32/InitOnce.c @@ -0,0 +1,280 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for One-Time initialization APIs + * COPYRIGHT: Copyright 2023 Ratin Gao <ratin(a)knsoft.org> + */ + +#include "precomp.h" + +typedef +VOID +WINAPI +FN_InitOnceInitialize(_Out_ PINIT_ONCE InitOnce); + +typedef +BOOL +WINAPI +FN_InitOnceExecuteOnce( + _Inout_ PINIT_ONCE InitOnce, + _In_ __callback PINIT_ONCE_FN InitFn, + _Inout_opt_ PVOID Parameter, + _Outptr_opt_result_maybenull_ LPVOID *Context); + +typedef +BOOL +WINAPI +FN_InitOnceBeginInitialize( + _Inout_ LPINIT_ONCE lpInitOnce, + _In_ DWORD dwFlags, + _Out_ PBOOL fPending, + _Outptr_opt_result_maybenull_ LPVOID *lpContext); + +typedef +BOOL +WINAPI +FN_InitOnceComplete( + _Inout_ LPINIT_ONCE lpInitOnce, + _In_ DWORD dwFlags, + _In_opt_ LPVOID lpContext); + +static ULONG g_ulRandom; + +static +VOID +InitWorker(_Inout_ PULONG InitCount, _Out_ PULONG_PTR Context) +{ + /* Increase the initialization count */ + (*InitCount)++; + + /* Output context data */ + *Context = (ULONG_PTR)g_ulRandom; +} + +static +_Success_(return != FALSE) +BOOL +WINAPI +InitOnceProc( + _Inout_ PINIT_ONCE InitOnce, + _Inout_opt_ PVOID Parameter, + _Outptr_opt_result_maybenull_ PVOID* Context) +{ + if (!Parameter || !Context) + { + return FALSE; + } + + InitWorker(Parameter, (PULONG_PTR)Context); + return TRUE; +} + +START_TEST(InitOnce) +{ + BOOL bRet, fPending; + ULONG i, ulInitCount, ulSeed, ulContextData; + ULONG_PTR ulTempContext; + DWORD dwError; + + HMODULE hKernel32; + FN_InitOnceInitialize* pfnInitOnceInitialize; + FN_InitOnceExecuteOnce* pfnInitOnceExecuteOnce; + FN_InitOnceBeginInitialize* pfnInitOnceBeginInitialize; + FN_InitOnceComplete* pfnInitOnceComplete; + + /* Load functions */ + hKernel32 = GetModuleHandleW(L"kernel32.dll"); + if (!hKernel32) + { + skip("Module kernel32 not found\n"); + return; + } + pfnInitOnceInitialize = (FN_InitOnceInitialize*)GetProcAddress(hKernel32, "InitOnceInitialize"); + pfnInitOnceExecuteOnce = (FN_InitOnceExecuteOnce*)GetProcAddress(hKernel32, "InitOnceExecuteOnce"); + pfnInitOnceBeginInitialize = (FN_InitOnceBeginInitialize*)GetProcAddress(hKernel32, "InitOnceBeginInitialize"); + pfnInitOnceComplete = (FN_InitOnceComplete*)GetProcAddress(hKernel32, "InitOnceComplete"); + + /* + * Use a random as output context data, + * which the low-order INIT_ONCE_CTX_RESERVED_BITS bits should be zero. + */ + ulSeed = (ULONG)(ULONG_PTR)&ulSeed ^ GetTickCount(); + g_ulRandom = RtlRandom(&ulSeed); + for (i = 0; i < INIT_ONCE_CTX_RESERVED_BITS; i++) + { + g_ulRandom &= (~(1 << i)); + } + + /* Initialize One-Time initialization structure */ + INIT_ONCE InitOnce = { (PVOID)(ULONG_PTR)0xDEADBEEF }; + if (pfnInitOnceInitialize) + { + pfnInitOnceInitialize(&InitOnce); + } + else + { + skip("InitOnceInitialize not found\n"); + InitOnce = (INIT_ONCE)INIT_ONCE_STATIC_INIT; + } + + if (!pfnInitOnceExecuteOnce) + { + skip("InitOnceExecuteOnce not found\n"); + goto _test_sync; + } + + /* + * Perform synchronous initialization by using InitOnceExecuteOnce, + * which executes user-defined callback to initialize. + * Call InitOnceExecuteOnce twice will success, + * initialization count should be 1 and retrieve correct context data. + */ + ulInitCount = 0; + ulContextData = MAXULONG; + bRet = pfnInitOnceExecuteOnce(&InitOnce, InitOnceProc, &ulInitCount, (LPVOID*)&ulContextData); + ok(bRet, "InitOnceExecuteOnce failed with %lu\n", GetLastError()); + if (bRet) + { + /* Call InitOnceExecuteOnce again and check output values if the first call succeeded */ + bRet = pfnInitOnceExecuteOnce(&InitOnce, + InitOnceProc, + &ulInitCount, + (LPVOID*)&ulContextData); + ok(bRet, "InitOnceExecuteOnce failed with %lu\n", GetLastError()); + ok(ulInitCount == 1, "ulInitCount is not 1\n"); + ok(ulContextData == g_ulRandom, "Output ulContextData is incorrect\n"); + } + +_test_sync: + if (!pfnInitOnceBeginInitialize || !pfnInitOnceComplete) + { + skip("InitOnceBeginInitialize or InitOnceComplete not found\n"); + return; + } + + /* Re-initialize One-Time initialization structure by using INIT_ONCE_STATIC_INIT */ + InitOnce = (INIT_ONCE)INIT_ONCE_STATIC_INIT; + + /* Perform synchronous initialization by using InitOnceBeginInitialize */ + fPending = FALSE; + bRet = pfnInitOnceBeginInitialize(&InitOnce, 0, &fPending, (LPVOID*)&ulContextData); + ok(bRet, "InitOnceBeginInitialize failed with %lu\n", GetLastError()); + if (!bRet) + { + goto _test_async; + } + ok(fPending, "fPending is not TRUE after the first success InitOnceBeginInitialize\n"); + if (!fPending) + { + goto _test_async; + } + + /* Complete the initialization */ + InitWorker(&ulInitCount, &ulTempContext); + bRet = pfnInitOnceComplete(&InitOnce, 0, (LPVOID)ulTempContext); + ok(bRet, "InitOnceComplete failed with %lu\n", GetLastError()); + if (!bRet) + { + goto _test_async; + } + + /* + * Initialization is completed, call InitOnceBeginInitialize with + * INIT_ONCE_CHECK_ONLY should retrieve status and context data successfully + */ + bRet = pfnInitOnceBeginInitialize(&InitOnce, + INIT_ONCE_CHECK_ONLY, + &fPending, + (LPVOID*)&ulContextData); + ok(bRet && !fPending && ulContextData == g_ulRandom, + "InitOnceBeginInitialize returns incorrect result for a completed initialization\n"); + +_test_async: + InitOnce = (INIT_ONCE)INIT_ONCE_STATIC_INIT; + + /* Perform asynchronous initialization */ + fPending = FALSE; + bRet = pfnInitOnceBeginInitialize(&InitOnce, + INIT_ONCE_ASYNC, + &fPending, + (LPVOID*)&ulContextData); + ok(bRet, "InitOnceBeginInitialize failed with %lu\n", GetLastError()); + if (!bRet) + { + return; + } + ok(fPending, "fPending is not TRUE after a success InitOnceBeginInitialize\n"); + if (!fPending) + { + return; + } + + /* + * Now the initialization is in progress but not completed yet, + * call InitOnceBeginInitialize again without INIT_ONCE_ASYNC is invalid, + * should fail with ERROR_INVALID_PARAMETER + */ + bRet = pfnInitOnceBeginInitialize(&InitOnce, 0, &fPending, (LPVOID*)&ulContextData); + ok(!bRet, "InitOnceBeginInitialize should not success\n"); + if (!bRet) + { + dwError = GetLastError(); + ok(dwError == ERROR_INVALID_PARAMETER, + "Last error is %lu, but %u is expected\n", + dwError, + ERROR_INVALID_PARAMETER); + } + + /* + * Call InitOnceBeginInitialize again with INIT_ONCE_ASYNC + * should success because initialization could be executed in parallel + */ + bRet = pfnInitOnceBeginInitialize(&InitOnce, + INIT_ONCE_ASYNC, + &fPending, + (LPVOID*)&ulContextData); + ok(bRet, "InitOnceBeginInitialize failed with %lu\n", GetLastError()); + if (!bRet) + { + return; + } + ok(fPending, "fPending is not TRUE after a success InitOnceBeginInitialize\n"); + if (!fPending) + { + return; + } + + /* Complete the initialization once */ + InitWorker(&ulInitCount, &ulTempContext); + bRet = pfnInitOnceComplete(&InitOnce, INIT_ONCE_ASYNC, (LPVOID)ulTempContext); + ok(bRet, "InitOnceComplete failed with %lu\n", GetLastError()); + if (!bRet) + { + return; + } + + /* Subsequent InitOnceComplete should fail with ERROR_GEN_FAILURE */ + bRet = pfnInitOnceComplete(&InitOnce, INIT_ONCE_ASYNC, (LPVOID)ulTempContext); + ok(!bRet, "InitOnceComplete should not success\n"); + if (!bRet) + { + dwError = GetLastError(); + ok(dwError == ERROR_GEN_FAILURE, + "Last error is %lu, but %u is expected\n", + dwError, + ERROR_GEN_FAILURE); + } + + /* + * Initialization is completed, call InitOnceBeginInitialize with + * INIT_ONCE_CHECK_ONLY should retrieve status and context data successfully + */ + bRet = pfnInitOnceBeginInitialize(&InitOnce, + INIT_ONCE_CHECK_ONLY, + &fPending, + (LPVOID*)&ulContextData); + ok(bRet && !fPending && ulContextData == g_ulRandom, + "InitOnceBeginInitialize returns incorrect result for a completed initialization\n"); + + return; +} diff --git a/modules/rostests/apitests/kernel32/testlist.c b/modules/rostests/apitests/kernel32/testlist.c index b96dfa956f0..4802d88079c 100644 --- a/modules/rostests/apitests/kernel32/testlist.c +++ b/modules/rostests/apitests/kernel32/testlist.c @@ -18,6 +18,7 @@ extern void func_GetCurrentDirectory(void); extern void func_GetDriveType(void); extern void func_GetModuleFileName(void); extern void func_GetVolumeInformation(void); +extern void func_InitOnce(void); extern void func_interlck(void); extern void func_IsDBCSLeadByteEx(void); extern void func_JapaneseCalendar(void); @@ -53,6 +54,7 @@ const struct test winetest_testlist[] = { "GetDriveType", func_GetDriveType }, { "GetModuleFileName", func_GetModuleFileName }, { "GetVolumeInformation", func_GetVolumeInformation }, + { "InitOnce", func_InitOnce }, { "interlck", func_interlck }, { "IsDBCSLeadByteEx", func_IsDBCSLeadByteEx }, { "JapaneseCalendar", func_JapaneseCalendar }, diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index 47830b87990..41aedeb7e2d 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -4961,6 +4961,43 @@ RtlGetNativeSystemInformation( _Out_opt_ PULONG ReturnLength ); +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) + +NTSYSAPI +VOID +NTAPI +RtlRunOnceInitialize( + _Out_ PRTL_RUN_ONCE RunOnce); + +_Maybe_raises_SEH_exception_ +NTSYSAPI +NTSTATUS +NTAPI +RtlRunOnceExecuteOnce( + _Inout_ PRTL_RUN_ONCE RunOnce, + _In_ __inner_callback PRTL_RUN_ONCE_INIT_FN InitFn, + _Inout_opt_ PVOID Parameter, + _Outptr_opt_result_maybenull_ PVOID *Context); + +_Must_inspect_result_ +NTSYSAPI +NTSTATUS +NTAPI +RtlRunOnceBeginInitialize( + _Inout_ PRTL_RUN_ONCE RunOnce, + _In_ ULONG Flags, + _Outptr_opt_result_maybenull_ PVOID *Context); + +NTSYSAPI +NTSTATUS +NTAPI +RtlRunOnceComplete( + _Inout_ PRTL_RUN_ONCE RunOnce, + _In_ ULONG Flags, + _In_opt_ PVOID Context); + +#endif + #if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (defined(__REACTOS__) && defined(_NTDLLBUILD_)) /* Put NTSYSAPI back when this will be really exported. Only statically linked for now */ // NTSYSAPI diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 4872e40d98b..6b616b07b39 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -3837,6 +3837,8 @@ typedef PRTL_RUN_ONCE LPINIT_ONCE; #define INIT_ONCE_ASYNC RTL_RUN_ONCE_ASYNC #define INIT_ONCE_INIT_FAILED RTL_RUN_ONCE_INIT_FAILED +#define INIT_ONCE_CTX_RESERVED_BITS RTL_RUN_ONCE_CTX_RESERVED_BITS + typedef BOOL (WINAPI *PINIT_ONCE_FN)( _Inout_ PINIT_ONCE InitOnce, @@ -3961,14 +3963,41 @@ CopyFile2( #endif /* _WIN32_WINNT >= 0x0601 */ +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) + +WINBASEAPI +VOID +WINAPI +InitOnceInitialize( + _Out_ PINIT_ONCE InitOnce); + +WINBASEAPI +BOOL +WINAPI +InitOnceBeginInitialize( + _Inout_ LPINIT_ONCE lpInitOnce, + _In_ DWORD dwFlags, + _Out_ PBOOL fPending, + _Outptr_opt_result_maybenull_ LPVOID *lpContext); + +WINBASEAPI +BOOL +WINAPI +InitOnceComplete( + _Inout_ LPINIT_ONCE lpInitOnce, + _In_ DWORD dwFlags, + _In_opt_ LPVOID lpContext); + +#endif /* (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) */ + WINBASEAPI BOOL WINAPI InitOnceExecuteOnce( - _Inout_ PINIT_ONCE InitOnce, - _In_ __callback PINIT_ONCE_FN InitFn, - _Inout_opt_ PVOID Parameter, - _Outptr_opt_result_maybenull_ LPVOID *Context); + _Inout_ PINIT_ONCE InitOnce, + _In_ __callback PINIT_ONCE_FN InitFn, + _Inout_opt_ PVOID Parameter, + _Outptr_opt_result_maybenull_ LPVOID *Context); #if defined(_SLIST_HEADER_) && !defined(_NTOS_) && !defined(_NTOSP_) diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index 8e0de26a3da..7e564277b9a 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -2778,6 +2778,8 @@ RtlQueryDepthSList( #define RTL_RUN_ONCE_ASYNC 0x00000002UL #define RTL_RUN_ONCE_INIT_FAILED 0x00000004UL +#define RTL_RUN_ONCE_CTX_RESERVED_BITS 2 + #define RTL_RUN_ONCE_INIT {0} typedef union _RTL_RUN_ONCE { @@ -2787,14 +2789,6 @@ typedef union _RTL_RUN_ONCE { typedef DWORD WINAPI RTL_RUN_ONCE_INIT_FN(PRTL_RUN_ONCE, PVOID, PVOID*); typedef RTL_RUN_ONCE_INIT_FN *PRTL_RUN_ONCE_INIT_FN; -NTSYSAPI -DWORD -WINAPI -RtlRunOnceComplete( - PRTL_RUN_ONCE, - DWORD, - PVOID); - #endif #define RTL_CONDITION_VARIABLE_INIT {0} diff --git a/sdk/lib/rtl/runonce.c b/sdk/lib/rtl/runonce.c index 0ffa49b9fa4..da970e9febd 100644 --- a/sdk/lib/rtl/runonce.c +++ b/sdk/lib/rtl/runonce.c @@ -8,52 +8,58 @@ /****************************************************************** * RtlRunOnceInitialize (NTDLL.@) */ -void WINAPI RtlRunOnceInitialize( RTL_RUN_ONCE *once ) +VOID NTAPI RtlRunOnceInitialize(_Out_ PRTL_RUN_ONCE RunOnce) { - once->Ptr = NULL; + RunOnce->Ptr = NULL; } /****************************************************************** * RtlRunOnceBeginInitialize (NTDLL.@) */ -DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void **context ) +_Must_inspect_result_ +NTSTATUS +NTAPI +RtlRunOnceBeginInitialize( + _Inout_ PRTL_RUN_ONCE RunOnce, + _In_ ULONG Flags, + _Outptr_opt_result_maybenull_ PVOID *Context) { - if (flags & RTL_RUN_ONCE_CHECK_ONLY) + if (Flags & RTL_RUN_ONCE_CHECK_ONLY) { - ULONG_PTR val = (ULONG_PTR)once->Ptr; + ULONG_PTR val = (ULONG_PTR)RunOnce->Ptr; - if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + if (Flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; if ((val & 3) != 2) return STATUS_UNSUCCESSFUL; - if (context) *context = (void *)(val & ~3); + if (Context) *Context = (void *)(val & ~3); return STATUS_SUCCESS; } for (;;) { - ULONG_PTR next, val = (ULONG_PTR)once->Ptr; + ULONG_PTR next, val = (ULONG_PTR)RunOnce->Ptr; switch (val & 3) { case 0: /* first time */ - if (!interlocked_cmpxchg_ptr( &once->Ptr, - (flags & RTL_RUN_ONCE_ASYNC) ? (void *)3 : (void *)1, 0 )) + if (!interlocked_cmpxchg_ptr( &RunOnce->Ptr, + (Flags & RTL_RUN_ONCE_ASYNC) ? (void *)3 : (void *)1, 0)) return STATUS_PENDING; break; case 1: /* in progress, wait */ - if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + if (Flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; next = val & ~3; - if (interlocked_cmpxchg_ptr( &once->Ptr, (void *)((ULONG_PTR)&next | 1), + if (interlocked_cmpxchg_ptr( &RunOnce->Ptr, (void *)((ULONG_PTR)&next | 1), (void *)val ) == (void *)val) NtWaitForKeyedEvent( 0, &next, FALSE, NULL ); break; case 2: /* done */ - if (context) *context = (void *)(val & ~3); + if (Context) *Context = (void *)(val & ~3); return STATUS_SUCCESS; case 3: /* in progress, async */ - if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; + if (!(Flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; return STATUS_PENDING; } } @@ -62,25 +68,30 @@ DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void ** /****************************************************************** * RtlRunOnceComplete (NTDLL.@) */ -DWORD WINAPI RtlRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context ) +NTSTATUS +NTAPI +RtlRunOnceComplete( + _Inout_ PRTL_RUN_ONCE RunOnce, + _In_ ULONG Flags, + _In_opt_ PVOID Context) { - if ((ULONG_PTR)context & 3) return STATUS_INVALID_PARAMETER; + if ((ULONG_PTR)Context & 3) return STATUS_INVALID_PARAMETER; - if (flags & RTL_RUN_ONCE_INIT_FAILED) + if (Flags & RTL_RUN_ONCE_INIT_FAILED) { - if (context) return STATUS_INVALID_PARAMETER; - if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + if (Context) return STATUS_INVALID_PARAMETER; + if (Flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; } - else context = (void *)((ULONG_PTR)context | 2); + else Context = (void *)((ULONG_PTR)Context | 2); for (;;) { - ULONG_PTR val = (ULONG_PTR)once->Ptr; + ULONG_PTR val = (ULONG_PTR)RunOnce->Ptr; switch (val & 3) { case 1: /* in progress */ - if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; + if (interlocked_cmpxchg_ptr( &RunOnce->Ptr, Context, (void *)val ) != (void *)val) break; val &= ~3; while (val) { @@ -91,8 +102,8 @@ DWORD WINAPI RtlRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context return STATUS_SUCCESS; case 3: /* in progress, async */ - if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; - if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; + if (!(Flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; + if (interlocked_cmpxchg_ptr( &RunOnce->Ptr, Context, (void *)val) != (void *)val) break; return STATUS_SUCCESS; default: @@ -104,18 +115,24 @@ DWORD WINAPI RtlRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context /****************************************************************** * RtlRunOnceExecuteOnce (NTDLL.@) */ -DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, - void *param, void **context ) +_Maybe_raises_SEH_exception_ +NTSTATUS +NTAPI +RtlRunOnceExecuteOnce( + _Inout_ PRTL_RUN_ONCE RunOnce, + _In_ __inner_callback PRTL_RUN_ONCE_INIT_FN InitFn, + _Inout_opt_ PVOID Parameter, + _Outptr_opt_result_maybenull_ PVOID *Context) { - DWORD ret = RtlRunOnceBeginInitialize( once, 0, context ); + DWORD ret = RtlRunOnceBeginInitialize( RunOnce, 0, Context ); if (ret != STATUS_PENDING) return ret; - if (!func( once, param, context )) + if (!InitFn( RunOnce, Parameter, Context )) { - RtlRunOnceComplete( once, RTL_RUN_ONCE_INIT_FAILED, NULL ); + RtlRunOnceComplete( RunOnce, RTL_RUN_ONCE_INIT_FAILED, NULL ); return STATUS_UNSUCCESSFUL; } - return RtlRunOnceComplete( once, 0, context ? *context : NULL ); + return RtlRunOnceComplete( RunOnce, 0, Context ? *Context : NULL ); }

1 year, 4 months

[reactos] 01/01: [NTOSKRNL/x64] Fix bug in KiInitializeContextThread

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=583be404ddc0a52091a7a… commit 583be404ddc0a52091a7a22944520d94196cbf70 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Aug 16 01:14:28 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Sep 7 01:16:14 2023 +0300 [NTOSKRNL/x64] Fix bug in KiInitializeContextThread The function set CtxSwitchFrame->ApcBypass to FALSE, preventing APCs (like when user mode sets the context while the thread is suspended) from being delivered as soon as the thread lowers IRQL to PASSIVE_LEVEL. This resulted in the SetContext APC to be delivered only after the user mode APC was initialized, overwriting the user mode APC context in the trap frame. This caused kernel32_winetest process to break. --- ntoskrnl/ke/amd64/thrdini.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/ke/amd64/thrdini.c b/ntoskrnl/ke/amd64/thrdini.c index b2119c6e8a3..3185de21cd6 100644 --- a/ntoskrnl/ke/amd64/thrdini.c +++ b/ntoskrnl/ke/amd64/thrdini.c @@ -134,7 +134,7 @@ KiInitializeContextThread(IN PKTHREAD Thread, /* Set up the Context Switch Frame */ CtxSwitchFrame->Return = (ULONG64)KiThreadStartup; - CtxSwitchFrame->ApcBypass = FALSE; + CtxSwitchFrame->ApcBypass = TRUE; StartFrame->P1Home = (ULONG64)StartRoutine; StartFrame->P2Home = (ULONG64)StartContext;

1 year, 4 months

[reactos] 02/02: [REACTOS] Fix various '% s' typos with a space

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=995d2559623380857ce5f… commit 995d2559623380857ce5f371c2401cd8a8ff2913 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Sep 7 00:34:02 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Sep 7 00:34:02 2023 +0300 [REACTOS] Fix various '% s' typos with a space - [NOTEPAD][REGEDIT][SHELL32] were affected. - Also while being here, fix headers. --- base/applications/notepad/lang/hi-IN.rc | 10 +++++----- base/applications/regedit/lang/it-IT.rc | 16 ++++++++++++---- dll/win32/shell32/lang/hi-IN.rc | 9 ++++++++- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/base/applications/notepad/lang/hi-IN.rc b/base/applications/notepad/lang/hi-IN.rc index 5c568dc677e..59b16bb6cc6 100644 --- a/base/applications/notepad/lang/hi-IN.rc +++ b/base/applications/notepad/lang/hi-IN.rc @@ -1,8 +1,8 @@ /* - * PROJECT: Notepad Hindi Translation - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Hindi Translation Of Notepad - * COPYRIGHT: Copyright 2018 Arnav Bhatt (arnavbhatt2004(a)gmail.com) + * PROJECT: ReactOS Notepad + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Hindi (India) resource file + * TRANSLATOR: Copyright 2018 Arnav Bhatt <arnavbhatt2004(a)gmail.com> */ LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA @@ -159,7 +159,7 @@ BEGIN STRING_UNTITLED "शीर्षकहीन" STRING_ALL_FILES "सभी फाइलें (*.*)" STRING_TEXT_FILES_TXT "पाठ फाइलें (*.txt)" - STRING_TOOLARGE "नोटपैड के लिए फ़ाइल '% s' बहुत बड़ी है।\n\ + STRING_TOOLARGE "नोटपैड के लिए फ़ाइल '%s' बहुत बड़ी है।\n\ कृपया एक अलग इडिटर का प्रयोग करें।" STRING_NOTEXT "आपने कोई टेक्स्ट दर्ज नहीं किया है।\ \nकृपया कुछ टाइप करें और पुनः प्रयास करें" diff --git a/base/applications/regedit/lang/it-IT.rc b/base/applications/regedit/lang/it-IT.rc index 5226bad09d8..5394d596765 100644 --- a/base/applications/regedit/lang/it-IT.rc +++ b/base/applications/regedit/lang/it-IT.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Registry Editor + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Italian resource file + * TRANSLATORS: Copyright 2007-2013 Paolo Devoti <devotip(a)tiscali.it> + * Copyright 2013 Ivan Di Francesco (oswetto) <ivan.difrancesco(a)yahoo.it> + */ + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS @@ -458,10 +466,10 @@ END STRINGTABLE BEGIN - IDS_IMPORT_PROMPT "Aggiungendo informazioni si possono involontariamente modificare o eliminare i valori e causare il giusto funzionamente dei componenti.\n Se non si considera attendibile la fonte di queste informazioni in '% s', non aggiungere al Registro di sistema.\n\n Si desidera continuare? " - IDS_IMPORT_OK "Le chiavi e i valori contenuti in '% s' sono stati correttamente aggiunti al Registro di sistema." - IDS_IMPORT_ERROR "Impossibile importare '% s': Errore durante l'apertura del file. Ci può essere un disco, file cdanneggiati o il file non esiste." - IDS_EXPORT_ERROR "Impossibile esportare '% s': Errore durante la creazione o la scrittura del file. Ci può essere un disco o un file di sistema danneggiato." + IDS_IMPORT_PROMPT "Aggiungendo informazioni si possono involontariamente modificare o eliminare i valori e causare il giusto funzionamente dei componenti.\n Se non si considera attendibile la fonte di queste informazioni in '%s', non aggiungere al Registro di sistema.\n\n Si desidera continuare? " + IDS_IMPORT_OK "Le chiavi e i valori contenuti in '%s' sono stati correttamente aggiunti al Registro di sistema." + IDS_IMPORT_ERROR "Impossibile importare '%s': Errore durante l'apertura del file. Ci può essere un disco, file cdanneggiati o il file non esiste." + IDS_EXPORT_ERROR "Impossibile esportare '%s': Errore durante la creazione o la scrittura del file. Ci può essere un disco o un file di sistema danneggiato." END STRINGTABLE diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index b425b0d6e49..609c2bb38a8 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Shell32 + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Hindi (India) resource file + * TRANSLATOR: Copyright 2019 Arnav Bhatt <arnavbhatt2004(a)gmail.com> + */ + LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA MENU_001 MENUEX @@ -1019,7 +1026,7 @@ BEGIN IDS_SPECIFY_ACTION "आपको एक कार्रवाई निर्दिष्ट करनी चाहिए।" IDS_INVALID_PROGRAM "निर्दिष्ट प्रोग्राम नहीं मिल सका। सुनिश्चित करें कि फ़ाइल का नाम और पथ सही है।" IDS_REMOVE_ACTION "क्या आप वाकई इस कार्रवाई को हटाना चाहते हैं?" - IDS_ACTION_EXISTS "इस फ़ाइल प्रकार के लिए कार्रवाई '% s' पहले से ही पंजीकृत है। कृपया एक अलग नाम दर्ज करें और पुनः प्रयास करें।" + IDS_ACTION_EXISTS "इस फ़ाइल प्रकार के लिए कार्रवाई '%s' पहले से ही पंजीकृत है। कृपया एक अलग नाम दर्ज करें और पुनः प्रयास करें।" IDS_EXE_FILTER "प्रोग्राम\0*.exe\0सारे फ़ाइल\0*.*\0" IDS_EDITING_ACTION "प्रकार के लिए संपादन कार्रवाई:" IDS_NO_ICONS "फ़ाइल '%s' में कोई आइकन नहीं है।\n\nसूची से एक आइकन चुनें या एक अलग फ़ाइल निर्दिष्ट करें।"

1 year, 4 months

[reactos] 01/02: [SHELL32] Fix standard log off dialog layout

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a81e5f4d72edf925aaa8… commit 6a81e5f4d72edf925aaa8942b30bec2db5fcbebb Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Sep 7 00:10:32 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Sep 7 00:16:08 2023 +0300 [SHELL32] Fix standard log off dialog layout Make it consistent between translations and other misc fixes. --- dll/win32/shell32/lang/bg-BG.rc | 4 ++-- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 6 +++--- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/de-DE.rc | 10 +++++----- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/es-ES.rc | 10 +++++----- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/eu-ES.rc | 8 ++++---- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 10 +++++----- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hi-IN.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 4 ++-- dll/win32/shell32/lang/id-ID.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 10 +++++----- dll/win32/shell32/lang/ja-JP.rc | 8 ++++---- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 6 +++--- dll/win32/shell32/lang/pl-PL.rc | 6 +++--- dll/win32/shell32/lang/pt-BR.rc | 4 ++-- dll/win32/shell32/lang/pt-PT.rc | 10 +++++----- dll/win32/shell32/lang/ro-RO.rc | 6 +++--- dll/win32/shell32/lang/ru-RU.rc | 8 ++++---- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 6 +++--- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 10 +++++----- dll/win32/shell32/lang/uk-UA.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 6 +++--- dll/win32/shell32/lang/zh-HK.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- 36 files changed, 84 insertions(+), 84 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 4482ced2728..01e2c9c0023 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -481,13 +481,13 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Излизане от РеактОС" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Сигурни ли сте, че искате да излезете?", -1, 43, 11, 140, 22 + LTEXT "Сигурни ли сте, че искате да излезете?", -1, 49, 15, 156, 8 DEFPUSHBUTTON "&Излизане", IDOK, 49, 38, 43, 14 PUSHBUTTON "Отказ", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 6cfafbc1556..5f2aaa48cc7 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -487,7 +487,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 79b66910561..8af5dce9338 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -493,9 +493,9 @@ CAPTION "Odhlásit se ze systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Opravdu se chcete odhlásit?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "&Odhlásit", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Storno", IDCANCEL, 95, 39, 50, 14 + LTEXT "Opravdu se chcete odhlásit?", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "&Odhlásit", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Storno", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index d7b93f3afd5..a2a8a198f60 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -493,7 +493,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 30dfc52306e..cfe026ee4c9 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -481,15 +481,15 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Abmelden" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 - LTEXT "Sind Sie sicher, dass Sie sich abmelden wollen?", -1, 35, 16, 166, 8 - DEFPUSHBUTTON "&Abmelden", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 95, 39, 50, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Sind Sie sicher, dass Sie sich abmelden wollen?", -1, 49, 15, 156, 8 + DEFPUSHBUTTON "&Abmelden", IDOK, 49, 38, 53, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 109, 38, 53, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 1748705409b..a191eb18ce0 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -487,7 +487,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 3c554179d20..c4df603d9b2 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -487,7 +487,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index be8e2c5b3bb..dc666d4a21b 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -487,7 +487,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index d231def1651..c455913d518 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -490,15 +490,15 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Cerrar sesión de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 - LTEXT "¿Esta seguro de que quiere cerrar la sesión?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "&Cerrar sesión", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 95, 39, 50, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "¿Esta seguro de que quiere cerrar la sesión?", -1, 49, 15, 156, 8 + DEFPUSHBUTTON "&Cerrar sesión", IDOK, 49, 38, 53, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 109, 38, 53, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 82297e87ea5..c61f8875535 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -494,7 +494,7 @@ CAPTION "Logi ReactOS'ist välja" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Kas soovid kindlasti välja logida?", -1, 49, 15, 131, 8 + LTEXT "Kas soovid kindlasti välja logida?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Logi välja", IDOK, 49, 38, 43, 14 PUSHBUTTON "Loobu", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc index 05942f367f5..aae6824a530 100644 --- a/dll/win32/shell32/lang/eu-ES.rc +++ b/dll/win32/shell32/lang/eu-ES.rc @@ -493,10 +493,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Amaitu ReactOS saioa" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 - LTEXT "Ziur zaude saioa amaitu nahi duzula?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "Ama&itu saioa", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Utzi", IDCANCEL, 95, 39, 50, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Ziur zaude saioa amaitu nahi duzula?", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "Ama&itu saioa", IDOK, 49, 38, 53, 14 + PUSHBUTTON "Utzi", IDCANCEL, 109, 38, 53, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 20601d5d01f..5da33435d2e 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -487,7 +487,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index f2371b86e91..02c79aa67c6 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -481,15 +481,15 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Fermer ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 - LTEXT "Êtes-vous sûr de vouloir fermer ReactOS ?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "Fermer", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Annuler", IDCANCEL, 95, 39, 50, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Êtes-vous sûr de vouloir fermer ReactOS ?", -1, 49, 15, 156, 8 + DEFPUSHBUTTON "&Fermer", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Annuler", IDCANCEL, 99, 38, 43, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 1cbdb451cb4..e41a4b769a3 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -489,7 +489,7 @@ CAPTION "התנתקות מ-ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "האם אתה בטוח שברצונך להתנתק?", -1, 49, 15, 131, 8 + LTEXT "האם אתה בטוח שברצונך להתנתק?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "התנתק", IDOK, 49, 38, 43, 14 PUSHBUTTON "ביטול", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 86805ece5a2..b425b0d6e49 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -487,7 +487,7 @@ CAPTION "लॉग ऑफ़ रिऐक्ट ओएस" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "क्या आप वाकई लॉग आफ़ करना चाहते हैं?", -1, 49, 15, 131, 8 + LTEXT "क्या आप वाकई लॉग आफ़ करना चाहते हैं?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&लॉग आफ़", IDOK, 49, 38, 43, 14 PUSHBUTTON "रद्द करें", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index e7837a056b8..28c4cbe7cb9 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -487,9 +487,9 @@ CAPTION "Kijelentkezés a ReactOS-ből" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Biztosan ki akar jelentkezni?", -1, 49, 15, 131, 8 + LTEXT "Biztosan ki akar jelentkezni?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Kijelentkezés", IDOK, 49, 38, 53, 14 - PUSHBUTTON "Mégse", IDCANCEL, 109, 38, 43, 14 + PUSHBUTTON "Mégse", IDCANCEL, 109, 38, 53, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 3663a33cd09..661dac1ccd0 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -487,7 +487,7 @@ CAPTION "Keluar ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Anda yakin ingin keluar?", -1, 49, 15, 131, 8 + LTEXT "Anda yakin ingin keluar?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Keluar", IDOK, 49, 38, 43, 14 PUSHBUTTON "Batal", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 8220be84a37..32189f8de8e 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -481,15 +481,15 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Chiudi sessione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 - LTEXT "Siete sicuro di voler chiudere la sessione?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "&Chiudi sessione", IDOK, 35, 39, 55, 14 - PUSHBUTTON "Annulla", IDCANCEL, 95, 39, 50, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Siete sicuro di voler chiudere la sessione?", -1, 49, 15, 156, 8 + DEFPUSHBUTTON "&Chiudi sessione", IDOK, 49, 38, 57, 14 + PUSHBUTTON "Annulla", IDCANCEL, 113, 38, 57, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 0bda0c01b04..7cf8c34729f 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -486,10 +486,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOS のログオフ" FONT 9, "MS UI Gothic" BEGIN - ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 22, 21 - LTEXT "ログオフしてもよろしいですか?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "ログオフ(&L)", IDOK, 41, 39, 50, 14 - PUSHBUTTON "キャンセル", IDCANCEL, 95, 39, 50, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "ログオフしてもよろしいですか?", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "ログオフ(&L)", IDOK, 49, 38, 43, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 99, 38, 43, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 71e8ec1c27c..fdbc263ae98 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -494,7 +494,7 @@ CAPTION "Log Off ReactOS" FONT 9, "굴림" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 2a5def28b66..fca4d439f46 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -487,7 +487,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 2f5b88a6c5e..07aaf2547e6 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -487,9 +487,9 @@ CAPTION "Logg av ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Er du sikker på at du vil logge av?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Logg av", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 122, 40, 60, 14 + LTEXT "Er du sikker på at du vil logge av?", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "&Logg av", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 99, 38, 43, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index cd90289414a..6f0eeef2235 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -493,9 +493,9 @@ CAPTION "Wylogowywanie z systemu ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Czy na pewno chcesz się wylogować?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "&Wyloguj", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Anuluj", IDCANCEL, 95, 39, 50, 14 + LTEXT "Czy na pewno chcesz się wylogować?", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "&Wyloguj", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 99, 38, 43, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 278, 122 diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 9421ebf518e..d610d4a66f1 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -481,13 +481,13 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Você tem certeza que desejar realizar log off?", -1, 35, 15, 148, 8 + LTEXT "Você tem certeza que desejar realizar log off?", -1, 49, 15, 156, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancelar", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 5c24aa3e344..35a71da2a44 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_PORTUGAL MENU_001 MENUEX BEGIN @@ -481,15 +481,15 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Terminar sessão ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Pretende terminar a sessão?", -1, 43, 15, 170, 8 - DEFPUSHBUTTON "&Terminar a sessão", IDOK, 30, 38, 64, 14 - PUSHBUTTON "&Cancelar", IDCANCEL, 99, 38, 43, 14 + LTEXT "Pretende terminar a sessão?", -1, 49, 15, 156, 8 + DEFPUSHBUTTON "&Terminar a sessão", IDOK, 49, 38, 67, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 123, 38, 67, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 546c875f56b..2ad102e0fc6 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -490,9 +490,9 @@ CAPTION "Deautentificare" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Sigur doriți să vă deautentificați?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "&Deautentifică", IDOK, 41, 39, 50, 14 - PUSHBUTTON "A&nulează", IDCANCEL, 95, 39, 50, 14 + LTEXT "Sigur doriți să vă deautentificați?", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "&Deautentifică", IDOK, 49, 38, 53, 14 + PUSHBUTTON "Anulează", IDCANCEL, 109, 38, 53, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index ab5a7e3d928..4b2d22971d9 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -488,15 +488,15 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Выход из ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Вы действительно хотите выйти из системы?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "В&ыход", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Отмена", IDCANCEL, 95, 39, 50, 14 + LTEXT "Вы действительно хотите выйти из системы?", -1, 49, 15, 156, 8 + DEFPUSHBUTTON "В&ыход", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Отмена", IDCANCEL, 99, 38, 43, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 8f82b531d90..bcc4af294ce 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -487,7 +487,7 @@ CAPTION "Odhlásiť ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Ste si istý, že sa chcete odhlásiť?", -1, 49, 15, 131, 8 + LTEXT "Ste si istý, že sa chcete odhlásiť?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "O&dhlásiť", IDOK, 49, 38, 43, 14 PUSHBUTTON "Zrušiť", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index e29cf6de4e4..d8ae90a55af 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -487,7 +487,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 35da9ad8e5e..408a46ee2f5 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -491,9 +491,9 @@ CAPTION "Dil nga ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Jeni te sigurte qe doni të dilni?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "&Dil", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Anulo", IDCANCEL, 95, 39, 50, 14 + LTEXT "Jeni te sigurte qe doni të dilni?", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "&Dil", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Anulo", IDCANCEL, 99, 38, 43, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 361fcae0b5a..e00a5433304 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -487,7 +487,7 @@ CAPTION "Logga ut från ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Är du säker på att du vill logga ut?", -1, 49, 15, 131, 8 + LTEXT "Är du säker på att du vill logga ut?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Logga ut", IDOK, 49, 38, 43, 14 PUSHBUTTON "Avbryt", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 2466291200f..b45a252a61f 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -483,15 +483,15 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOS Oturumunu Kapat" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 21, 20 - LTEXT "Oturumu kapatmak istediğinizden emin misiniz?", -1, 33, 16, 151, 8 - DEFPUSHBUTTON "&Oturumu Kapat", IDOK, 30, 39, 60, 14 - PUSHBUTTON "İptal", IDCANCEL, 95, 39, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Oturumu kapatmak istediğinizden emin misiniz?", -1, 49, 15, 156, 8 + DEFPUSHBUTTON "&Oturumu Kapat", IDOK, 49, 38, 57, 14 + PUSHBUTTON "İptal", IDCANCEL, 113, 38, 57, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index e34d4d2d355..09997ef3c96 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -487,7 +487,7 @@ CAPTION "Вихід із ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Ви дійсно бажаєте вийти із системи?", -1, 49, 15, 131, 8 + LTEXT "Ви дійсно бажаєте вийти із системи?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "В&ихід", IDOK, 49, 38, 43, 14 PUSHBUTTON "Скасувати", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index ce95ea14128..32f4421c1b0 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -497,9 +497,9 @@ CAPTION "注销 ReactOS" FONT 9, "宋体" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "您确定要注销 ReactOS 吗？", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "注销(&L)", IDOK, 41, 39, 50, 14 - PUSHBUTTON "取消", IDCANCEL, 95, 39, 50, 14 + LTEXT "您确定要注销 ReactOS 吗？", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "注销(&L)", IDOK, 49, 38, 43, 14 + PUSHBUTTON "取消", IDCANCEL, 99, 38, 43, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc index 0af7a25a294..80a753e83f4 100644 --- a/dll/win32/shell32/lang/zh-HK.rc +++ b/dll/win32/shell32/lang/zh-HK.rc @@ -495,7 +495,7 @@ CAPTION "登出 ReactOS" FONT 9, "新細明體" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "您確定要登出 ReactOS 嗎？", -1, 49, 15, 131, 8 + LTEXT "您確定要登出 ReactOS 嗎？", -1, 49, 15, 132, 8 DEFPUSHBUTTON "登出(&L)", IDOK, 49, 38, 43, 14 PUSHBUTTON "取消", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index af19932540c..6f3f37c48eb 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -496,7 +496,7 @@ CAPTION "登出 ReactOS" FONT 9, "新細明體" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "您確定要登出 ReactOS 嗎？", -1, 49, 15, 131, 8 + LTEXT "您確定要登出 ReactOS 嗎？", -1, 49, 15, 132, 8 DEFPUSHBUTTON "登出(&L)", IDOK, 49, 38, 43, 14 PUSHBUTTON "取消", IDCANCEL, 99, 38, 43, 14 END

1 year, 4 months

[reactos] 01/01: [WINHTTP_WINETEST] Skip wine_dbgstr_wn() call when returned text length is zero (#5656)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ce81f648517263cbc5a8… commit 9ce81f648517263cbc5a83883354c8589a3474c6 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Wed Sep 6 16:02:48 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 7 00:02:48 2023 +0300 [WINHTTP_WINETEST] Skip wine_dbgstr_wn() call when returned text length is zero (#5656) On receiving a zero length response, do not try to print returned text using wine_dbgstr_wn(). Instead check the returned string for zero length and skip the print in that case. ROSTESTS-377 --- modules/rostests/winetests/winhttp/winhttp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/rostests/winetests/winhttp/winhttp.c b/modules/rostests/winetests/winhttp/winhttp.c index 776ee53e379..5655432f73b 100644 --- a/modules/rostests/winetests/winhttp/winhttp.c +++ b/modules/rostests/winetests/winhttp/winhttp.c @@ -4276,7 +4276,12 @@ static void test_IWinHttpRequest(int port) hr = IWinHttpRequest_get_ResponseText( req, &response ); ok( hr == S_OK, "got %08x\n", hr ); +#ifdef __REACTOS__ + ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", + wine_dbgstr_wn(response, min(SysStringLen(response), 32)) ); +#else ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); +#endif SysFreeString( response ); IWinHttpRequest_Release( req );

1 year, 4 months

[reactos] 01/01: [NTOSKRNL] Mute some good-path log-spam, no functional change

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=195c491880c6e6e9cd7d4… commit 195c491880c6e6e9cd7d4669c1242da1f3836bda Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Sep 6 14:53:53 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Sep 6 14:53:53 2023 +0200 [NTOSKRNL] Mute some good-path log-spam, no functional change Now that the Memory Management is a bit more under control again, and branching releases/0.4.15 is near, do mute some frequent log-spam that got introduced during 0.4.15-dev'ing regarding lazy-flushes and MM balancing. It frequently logged even while being idle. Slightly improve the headers of the two touched files. No rocket-science. --- ntoskrnl/config/cmlazy.c | 11 +++++------ ntoskrnl/mm/balance.c | 14 ++++++-------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/ntoskrnl/config/cmlazy.c b/ntoskrnl/config/cmlazy.c index 13b74570b00..ed03247a8c7 100644 --- a/ntoskrnl/config/cmlazy.c +++ b/ntoskrnl/config/cmlazy.c @@ -1,15 +1,14 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/config/cmlazy.c - * PURPOSE: Configuration Manager - Internal Registry APIs - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Configuration Manager - Internal Registry APIs + * PROGRAMMERS: Alex Ionescu <alex.ionescu(a)reactos.org> */ /* INCLUDES *******************************************************************/ #include "ntoskrnl.h" -//#define NDEBUG +#define NDEBUG #include "debug.h" /* GLOBALS ********************************************************************/ diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index f33189dc247..3b11aeab2c8 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/balance.c - * PURPOSE: kernel memory management functions - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - * Cameron Gutman (cameron.gutman(a)reactos.org) + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: kernel memory management functions + * PROGRAMMERS: David Welch <welch(a)cwcom.net> + * Cameron Gutman <cameron.gutman(a)reactos.org> */ /* INCLUDES *****************************************************************/ @@ -144,7 +142,7 @@ MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) (*NrFreedPages) = 0; - DPRINT1("MM BALANCER: %s\n", Priority ? "Paging out!" : "Removing access bit!"); + DPRINT("MM BALANCER: %s\n", Priority ? "Paging out!" : "Removing access bit!"); FirstPage = MmGetLRUFirstUserPage(); CurrentPage = FirstPage;

1 year, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs