Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NDK] mmtypes.h: Fix a copypasta in a comment

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1ee35bdb225da2463ed1… commit a1ee35bdb225da2463ed12dea7eca2e111d15840 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Sep 3 14:33:43 2023 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Sep 10 13:30:11 2023 +0300 [NDK] mmtypes.h: Fix a copypasta in a comment --- sdk/include/ndk/mmtypes.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sdk/include/ndk/mmtypes.h b/sdk/include/ndk/mmtypes.h index f33d5cc8b14..56e918d5c2f 100644 --- a/sdk/include/ndk/mmtypes.h +++ b/sdk/include/ndk/mmtypes.h @@ -79,6 +79,7 @@ extern "C" { #define MEM_EXECUTE_OPTION_VALID_FLAGS 0x3F #ifndef NTOS_MODE_USER + // // Virtual Memory Flags // @@ -100,11 +101,13 @@ extern "C" { #define SEC_NOCACHE 0x10000000 #define SEC_WRITECOMBINE 0x40000000 #define SEC_LARGE_PAGES 0x80000000 -#else + +#else // NTOS_MODE_USER + #define SEC_BASED 0x200000 // -// Section Inherit Flags for NtCreateSection +// Section Inherit Flags for NtMapViewOfSection // typedef enum _SECTION_INHERIT { @@ -139,7 +142,8 @@ typedef enum _POOL_TYPE PagedPoolCacheAlignedSession, NonPagedPoolCacheAlignedMustSSession } POOL_TYPE; -#endif + +#endif // NTOS_MODE_USER // // Memory Manager Page Lists @@ -208,7 +212,6 @@ typedef enum _MI_VAD_TYPE } MI_VAD_TYPE, *PMI_VAD_TYPE; #ifdef NTOS_MODE_USER - // // Virtual Memory Counters //

1 year, 9 months

[reactos] 01/01: [WIN32K:NTUSER] Avoid TOCTOU in ProbeAndCaptureUnicodeStringOrAtom.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9212e4a72a45b04ddd13… commit f9212e4a72a45b04ddd13fca63fb90c78eebf053 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Sep 9 08:59:57 2023 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Sep 9 17:50:49 2023 -0400 [WIN32K:NTUSER] Avoid TOCTOU in ProbeAndCaptureUnicodeStringOrAtom. --- win32ss/user/ntuser/class.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/win32ss/user/ntuser/class.c b/win32ss/user/ntuser/class.c index 90746db3da2..548bef255e6 100644 --- a/win32ss/user/ntuser/class.c +++ b/win32ss/user/ntuser/class.c @@ -152,32 +152,35 @@ ProbeAndCaptureUnicodeStringOrAtom( __in_data_source(USER_MODE) _In_ PUNICODE_STRING pustrUnsafe) { NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING ustrCopy; /* Default to NULL */ - pustrOut->Buffer = NULL; + RtlInitEmptyUnicodeString(pustrOut, NULL, 0); _SEH2_TRY { ProbeForRead(pustrUnsafe, sizeof(UNICODE_STRING), 1); + ustrCopy = *pustrUnsafe; + /* Validate the string */ - if ((pustrUnsafe->Length & 1) || (pustrUnsafe->Buffer == NULL)) + if ((ustrCopy.Length & 1) || (ustrCopy.Buffer == NULL)) { /* This is not legal */ _SEH2_YIELD(return STATUS_INVALID_PARAMETER); } /* Check if this is an atom */ - if (IS_ATOM(pustrUnsafe->Buffer)) + if (IS_ATOM(ustrCopy.Buffer)) { /* Copy the atom, length is 0 */ pustrOut->MaximumLength = pustrOut->Length = 0; - pustrOut->Buffer = pustrUnsafe->Buffer; + pustrOut->Buffer = ustrCopy.Buffer; } else { /* Get the length, maximum length includes zero termination */ - pustrOut->Length = pustrUnsafe->Length; + pustrOut->Length = ustrCopy.Length; pustrOut->MaximumLength = pustrOut->Length + sizeof(WCHAR); /* Allocate a buffer */ @@ -190,8 +193,8 @@ ProbeAndCaptureUnicodeStringOrAtom( } /* Copy the string and zero terminate it */ - ProbeForRead(pustrUnsafe->Buffer, pustrOut->Length, 1); - RtlCopyMemory(pustrOut->Buffer, pustrUnsafe->Buffer, pustrOut->Length); + ProbeForRead(ustrCopy.Buffer, pustrOut->Length, 1); + RtlCopyMemory(pustrOut->Buffer, ustrCopy.Buffer, pustrOut->Length); pustrOut->Buffer[pustrOut->Length / sizeof(WCHAR)] = L'\0'; } }

1 year, 9 months

[reactos] 01/01: [MESA] Change reported OpenGL version to 1.1.0 (#5675)

by Belle Aerni

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce43bf6ba735dfb145d11… commit ce43bf6ba735dfb145d11ebfca24ecaae6d63fef Author: Belle Aerni <belleaerni(a)gmail.com> AuthorDate: Sat Sep 9 12:30:44 2023 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 9 22:30:44 2023 +0300 [MESA] Change reported OpenGL version to 1.1.0 (#5675) Fixes failing opengl32:sw_extensions test. The test expects version `1.1.0` which is what Windows reports, and ReactOS Mesa3D was reporting just `1.1`. --- dll/opengl/mesa/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/opengl/mesa/misc.c b/dll/opengl/mesa/misc.c index 0762d184a02..ccc60073019 100644 --- a/dll/opengl/mesa/misc.c +++ b/dll/opengl/mesa/misc.c @@ -313,7 +313,7 @@ const GLubyte *gl_GetString( GLcontext *ctx, GLenum name ) { static char renderer[1000]; static char *vendor = "Brian Paul & ReactOS Developers"; - static char *version = "1.1"; + static char *version = "1.1.0"; static char *extensions = "GL_EXT_paletted_texture GL_EXT_bgra GL_WIN_swap_hint"; if (INSIDE_BEGIN_END(ctx)) {

1 year, 9 months

[reactos] 01/01: [NTUSER] Reduce debug logging spam (#5661)

by Julio Carchi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4976fba59e32a03113ed0… commit 4976fba59e32a03113ed01da2aff8e181b1b0013 Author: Julio Carchi <juliocarchi(a)yahoo.com> AuthorDate: Sat Sep 9 14:28:19 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 9 22:28:19 2023 +0300 [NTUSER] Reduce debug logging spam (#5661) Silence two of the most debug log spammers in co_MsqSendMessage() and in co_IntProcessMouseMessage() by demoting ERR to WARN. --- win32ss/user/ntuser/msgqueue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c index 8c24de79853..7f308530749 100644 --- a/win32ss/user/ntuser/msgqueue.c +++ b/win32ss/user/ntuser/msgqueue.c @@ -1263,7 +1263,7 @@ co_MsqSendMessage(PTHREADINFO ptirec, Entry = Entry->Flink; } - ERR("MsqSendMessage timed out 2 Status %lx\n", WaitStatus); + WARN("MsqSendMessage timed out 2 Status %lx\n", WaitStatus); break; } // Receiving thread passed on and left us hanging with issues still pending. @@ -1535,7 +1535,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, BOOL* NotForUs, L } else { - ERR("Not the same cursor!\n"); + WARN("Not the same cursor!\n"); } msg->hwnd = UserHMGetHandle(pwndMsg);

1 year, 9 months

[reactos] 01/01: [ATL] CImage: Simplify GetBits/GetPixelAddress (#5671)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b692020160ae9a925af9… commit 6b692020160ae9a925af9ae0b73f31229a107863 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 9 20:20:22 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 9 20:20:22 2023 +0900 [ATL] CImage: Simplify GetBits/GetPixelAddress (#5671) CORE-19008 --- sdk/lib/atl/atlimage.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index 84bfe64fc76..874ef0f60e8 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -285,13 +285,7 @@ public: 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; + return const_cast<CImage*>(this)->GetBits(); } int GetBPP() const noexcept @@ -363,11 +357,7 @@ public: 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; + return const_cast<CImage*>(this)->GetPixelAddress(x, y); } COLORREF GetTransparentColor() const noexcept

1 year, 9 months

[reactos] 01/01: [WIN32K][NTOS] Fix parameter to MmMapViewOfSection

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9666f00572e532a13737f… commit 9666f00572e532a13737fdf47c816103d0f40e63 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 2 00:11:37 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Sep 9 12:15:24 2023 +0300 [WIN32K][NTOS] Fix parameter to MmMapViewOfSection The code was passing 0 instead of SECTION_INHERIT::ViewUnmap (2). 0 isn't even a proper constant to be used here. It worked, because MmMapViewOfSection only compares against ViewShare (1) and treats everything else as ViewUnmap. --- ntoskrnl/mm/ARM3/procsup.c | 2 +- win32ss/gdi/eng/mapping.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index c1c28af18c6..da94b64b7ec 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -1110,7 +1110,7 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, 0, NULL, &ViewSize, - 0, + ViewUnmap, MEM_COMMIT, PAGE_READWRITE); diff --git a/win32ss/gdi/eng/mapping.c b/win32ss/gdi/eng/mapping.c index 0ca9de2dd9a..76b21054215 100644 --- a/win32ss/gdi/eng/mapping.c +++ b/win32ss/gdi/eng/mapping.c @@ -207,7 +207,7 @@ EngMapSection( pSection->cjViewSize, NULL, &pSection->cjViewSize, - 0, + ViewUnmap, 0, PAGE_READWRITE); if (!NT_SUCCESS(Status))

1 year, 9 months

[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, 9 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, 9 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, 9 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, 9 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