Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[cwittich] 64972: [TASKMGR] fix HMENU leak in TaskManager_OnTabWndSelChange CORE-8705

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Oct 24 20:41:25 2014 New Revision: 64972 URL: http://svn.reactos.org/svn/reactos?rev=64972&view=rev Log: [TASKMGR] fix HMENU leak in TaskManager_OnTabWndSelChange CORE-8705 Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Fri Oct 24 20:41:25 2014 @@ -38,6 +38,8 @@ HWND hStatusWnd; /* Status Bar Window */ HWND hTabWnd; /* Tab Control Window */ +HMENU hWindowMenu = NULL; + int nMinimumWidth; /* Minimum width of the dialog (OnSize()'s cx) */ int nMinimumHeight; /* Minimum height of the dialog (OnSize()'s cy) */ @@ -187,6 +189,8 @@ SaveSettings(); PerfDataUninitialize(); CloseHandle(hMutex); + if (hWindowMenu) + DestroyMenu(hWindowMenu); return 0; } @@ -974,6 +978,8 @@ RemoveMenu(hViewMenu, i, MF_BYPOSITION); } RemoveMenu(hOptionsMenu, 3, MF_BYPOSITION); + if (hWindowMenu) + DestroyMenu(hWindowMenu); switch (TaskManagerSettings.ActiveTabPage) { case 0: ShowWindow(hApplicationPage, SW_SHOW); @@ -991,10 +997,10 @@ AppendMenuW(hViewMenu, MF_STRING, ID_VIEW_DETAILS, szTemp); if (GetMenuItemCount(hMenu) <= 5) { - hSubMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_WINDOWSMENU)); + hWindowMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_WINDOWSMENU)); LoadStringW(hInst, IDS_MENU_WINDOWS, szTemp, 256); - InsertMenuW(hMenu, 3, MF_BYPOSITION|MF_POPUP, (UINT_PTR) hSubMenu, szTemp); + InsertMenuW(hMenu, 3, MF_BYPOSITION|MF_POPUP, (UINT_PTR) hWindowMenu, szTemp); DrawMenuBar(hMainWnd); }

10 years, 2 months

[tkreuzer] 64971: [CMAKE] Improve configure script to allow passing multiple arguments, like "configure VSSolution RTC". Add a small help command ("help" or "/?"), allow passing CMake parameters li...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Oct 24 19:17:58 2014 New Revision: 64971 URL: http://svn.reactos.org/svn/reactos?rev=64971&view=rev Log: [CMAKE] Improve configure script to allow passing multiple arguments, like "configure VSSolution RTC". Add a small help command ("help" or "/?"), allow passing CMake parameters like -DFOO:BOOL=TRUE after our custom parameters. Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=64971&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Fri Oct 24 19:17:58 2014 @@ -7,6 +7,17 @@ :: Precisely needed for configuring Visual Studio Environment. setlocal enabledelayedexpansion +:: Does the user need help? +if /I "%1" == "help" goto help +if /I "%1" == "/?" ( +:help + echo Help for configure script + echo Syntax: path\to\source\configure.cmd [script-options] [Cmake-options] + echo Available script-options: Codeblocks, Eclipse, Makefiles, clang, VSSolution, RTC + echo Cmake-options: -DVARIABLE:TYPE=VALUE + exit /b +) + :: Special case %1 = arm_hosttools %2 = vcvarsall.bat %3 = %CMAKE_GENERATOR% if /I "%1" == "arm_hosttools" ( echo Configuring x86 host tools for ARM cross build @@ -21,7 +32,10 @@ :: Get the source root directory set REACTOS_SOURCE_DIR=%~dp0 -set USE_VSCMD=0 + +:: Set default generator +set CMAKE_GENERATOR="Ninja" +set CMAKE_GENERATOR_HOST=!CMAKE_GENERATOR! :: Detect presence of cmake cmd /c cmake --version 2>&1 | find "cmake version" > NUL || goto cmake_notfound @@ -31,71 +45,25 @@ echo Detected RosBE for %ROS_ARCH% set BUILD_ENVIRONMENT=MinGW set ARCH=%ROS_ARCH% - if /I "%1" == "Codeblocks" ( - set CMAKE_GENERATOR="CodeBlocks - MinGW Makefiles" - ) else if /I "%1" == "Eclipse" ( - set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles" - ) else if /I "%1" == "Makefiles" ( - set CMAKE_GENERATOR="MinGW Makefiles" - ) else if /I "%1" == "clang" ( - set BUILD_ENVIRONMENT=Clang - set CMAKE_GENERATOR="Ninja" - ) else ( - set CMAKE_GENERATOR="Ninja" - ) + set MINGW_TOOCHAIN_FILE=toolchain-gcc.cmake ) else if defined VCINSTALLDIR ( :: VS command prompt does not put this in environment vars cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm - cl 2>&1 | find "15.00." > NUL && set BUILD_ENVIRONMENT=VS9 - cl 2>&1 | find "16.00." > NUL && set BUILD_ENVIRONMENT=VS10 - cl 2>&1 | find "17.00." > NUL && set BUILD_ENVIRONMENT=VS11 - cl 2>&1 | find "18.00." > NUL && set BUILD_ENVIRONMENT=VS12 - if not defined BUILD_ENVIRONMENT ( + cl 2>&1 | find "15.00." > NUL && set VS_VERSION=9 + cl 2>&1 | find "16.00." > NUL && set VS_VERSION=10 + cl 2>&1 | find "17.00." > NUL && set VS_VERSION=11 + cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12 + if not defined VS_VERSION ( echo Error: Visual Studio version too old or version detection failed. exit /b ) - - echo Detected Visual Studio Environment !BUILD_ENVIRONMENT!-!ARCH! - if /I "%1" == "VSSolution" ( - if "!BUILD_ENVIRONMENT!" == "VS9" ( - if "!ARCH!" == "amd64" ( - set CMAKE_GENERATOR="Visual Studio 9 2008 Win64" - ) else ( - set CMAKE_GENERATOR="Visual Studio 9 2008" - ) - ) else if "!BUILD_ENVIRONMENT!" == "VS10" ( - if "!ARCH!" == "amd64" ( - set CMAKE_GENERATOR="Visual Studio 10 Win64" - ) else ( - set CMAKE_GENERATOR="Visual Studio 10" - ) - ) else if "!BUILD_ENVIRONMENT!" == "VS11" ( - if "!ARCH!" == "amd64" ( - set CMAKE_GENERATOR="Visual Studio 11 Win64" - ) else if "!ARCH!" == "arm" ( - set CMAKE_GENERATOR="Visual Studio 11 ARM" - set CMAKE_GENERATOR_HOST="Visual Studio 11" - ) else ( - set CMAKE_GENERATOR="Visual Studio 11" - ) - ) else if "!BUILD_ENVIRONMENT!" == "VS12" ( - if "!ARCH!" == "amd64" ( - set CMAKE_GENERATOR="Visual Studio 12 Win64" - ) else if "!ARCH!" == "arm" ( - set CMAKE_GENERATOR="Visual Studio 12 ARM" - set CMAKE_GENERATOR_HOST="Visual Studio 12" - ) else ( - set CMAKE_GENERATOR="Visual Studio 12" - ) - ) - ) else ( - set USE_VSCMD=1 - echo This script defaults to Ninja. To use Visual Studio GUI specify "VSSolution" as a parameter. - ) - + set BUILD_ENVIRONMENT=VS + set VS_SOLUTION=0 + set VS_RUNTIME_CHECKS=0 + echo Detected Visual Studio Environment !BUILD_ENVIRONMENT!!VS_VERSION!-!ARCH! ) else ( echo Error: Unable to detect build environment. Configure script failure. exit /b @@ -107,20 +75,76 @@ exit /b ) -:: Detect VS command line generator -if %USE_VSCMD% == 1 ( - if /I "%1" == "CodeBlocks" ( - set CMAKE_GENERATOR="CodeBlocks - NMake Makefiles" - ) else if /I "%1" == "Eclipse" ( - set CMAKE_GENERATOR="Eclipse CDT4 - NMake Makefiles" - ) else if /I "%1" == "Makefiles" ( - set CMAKE_GENERATOR="NMake Makefiles" +:: Parse command line parameters +:repeat + if "%BUILD_ENVIRONMENT%" == "MinGW" ( + if /I "%1" == "Codeblocks" ( + set CMAKE_GENERATOR="CodeBlocks - MinGW Makefiles" + ) else if /I "%1" == "Eclipse" ( + set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles" + ) else if /I "%1" == "Makefiles" ( + set CMAKE_GENERATOR="MinGW Makefiles" + ) else if /I "%1" == "clang" ( + set MINGW_TOOCHAIN_FILE=toolchain-clang.cmake + ) else ( + goto continue + ) ) else ( - set CMAKE_GENERATOR="Ninja" + if /I "%1" == "CodeBlocks" ( + set CMAKE_GENERATOR="CodeBlocks - NMake Makefiles" + ) else if /I "%1" == "Eclipse" ( + set CMAKE_GENERATOR="Eclipse CDT4 - NMake Makefiles" + ) else if /I "%1" == "Makefiles" ( + set CMAKE_GENERATOR="NMake Makefiles" + ) else if /I "%1" == "VSSolution" ( + set VS_SOLUTION=1 + if "!VS_VERSION!" == "9" ( + if "!ARCH!" == "amd64" ( + set CMAKE_GENERATOR="Visual Studio 9 2008 Win64" + ) else ( + set CMAKE_GENERATOR="Visual Studio 9 2008" + ) + ) else if "!VS_VERSION!" == "10" ( + if "!ARCH!" == "amd64" ( + set CMAKE_GENERATOR="Visual Studio 10 Win64" + ) else ( + set CMAKE_GENERATOR="Visual Studio 10" + ) + ) else if "!VS_VERSION!" == "11" ( + if "!ARCH!" == "amd64" ( + set CMAKE_GENERATOR="Visual Studio 11 Win64" + ) else if "!ARCH!" == "arm" ( + set CMAKE_GENERATOR="Visual Studio 11 ARM" + set CMAKE_GENERATOR_HOST="Visual Studio 11" + ) else ( + set CMAKE_GENERATOR="Visual Studio 11" + ) + ) else if "!VS_VERSION!" == "12" ( + if "!ARCH!" == "amd64" ( + set CMAKE_GENERATOR="Visual Studio 12 Win64" + ) else if "!ARCH!" == "arm" ( + set CMAKE_GENERATOR="Visual Studio 12 ARM" + set CMAKE_GENERATOR_HOST="Visual Studio 12" + ) else ( + set CMAKE_GENERATOR="Visual Studio 12" + ) + ) + ) else if /I "%1" == "RTC" ( + echo Runtime checks enabled + set VS_RUNTIME_CHECKS=1 + ) else ( + goto continue + ) ) - if "!ARCH!" == "arm" ( - set CMAKE_GENERATOR_HOST=!CMAKE_GENERATOR! - ) + + :: Go to next parameter + SHIFT + goto repeat +:continue + +:: Inform the user about the default build +if "!CMAKE_GENERATOR!" == "Ninja" ( + echo This script defaults to Ninja. Type "configure help" for alternative options. ) :: Create directories @@ -165,11 +189,9 @@ ) if "%BUILD_ENVIRONMENT%" == "MinGW" ( - cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:PATH="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" -) else if "%BUILD_ENVIRONMENT%" == "Clang" ( - cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-clang.cmake -DARCH:STRING=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:PATH="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" + cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=%MINGW_TOOCHAIN_FILE% -DARCH:STRING=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:PATH="%REACTOS_BUILD_TOOLS_DIR%" %* "%REACTOS_SOURCE_DIR%" ) else ( - cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:PATH="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" + cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:PATH="%REACTOS_BUILD_TOOLS_DIR%" -DRUNTIME_CHECKS:BOOL=%VS_RUNTIME_CHECKS% %* "%REACTOS_SOURCE_DIR%" ) cd..

10 years, 2 months

[tfaber] 64970: [RTL] - Implement RtlTryEnterHeapLock and use it to fix RtlpDphEnterCriticalSection

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 24 19:05:54 2014 New Revision: 64970 URL: http://svn.reactos.org/svn/reactos?rev=64970&view=rev Log: [RTL] - Implement RtlTryEnterHeapLock and use it to fix RtlpDphEnterCriticalSection Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/lib/rtl/heappage.c trunk/reactos/lib/rtl/rtlp.h trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Fri Oct 24 19:05:54 2014 @@ -125,6 +125,15 @@ UNREFERENCED_PARAMETER(Exclusive); return RtlEnterCriticalSection(&Lock->CriticalSection); +} + +BOOLEAN +NTAPI +RtlTryEnterHeapLock(IN OUT PHEAP_LOCK Lock, IN BOOLEAN Exclusive) +{ + UNREFERENCED_PARAMETER(Exclusive); + + return RtlTryEnterCriticalSection(&Lock->CriticalSection); } NTSTATUS Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=649… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Fri Oct 24 19:05:54 2014 @@ -236,7 +236,7 @@ if (Flags & HEAP_NO_SERIALIZE) { /* More complex scenario */ - if (!RtlEnterHeapLock(DphRoot->HeapCritSect, TRUE)) + if (!RtlTryEnterHeapLock(DphRoot->HeapCritSect, TRUE)) { if (!DphRoot->nRemoteLockAcquired) { Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=64970&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Fri Oct 24 19:05:54 2014 @@ -103,6 +103,10 @@ NTAPI RtlEnterHeapLock(IN OUT PHEAP_LOCK Lock, IN BOOLEAN Exclusive); +BOOLEAN +NTAPI +RtlTryEnterHeapLock(IN OUT PHEAP_LOCK Lock, IN BOOLEAN Exclusive); + NTSTATUS NTAPI RtlInitializeHeapLock(IN OUT PHEAP_LOCK *Lock); Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Fri Oct 24 19:05:54 2014 @@ -176,6 +176,24 @@ ExAcquireResourceSharedLite(&Lock->Resource, TRUE); return STATUS_SUCCESS; +} + +BOOLEAN +NTAPI +RtlTryEnterHeapLock(IN OUT PHEAP_LOCK Lock, IN BOOLEAN Exclusive) +{ + BOOLEAN Success; + KeEnterCriticalRegion(); + + if (Exclusive) + Success = ExAcquireResourceExclusiveLite(&Lock->Resource, FALSE); + else + Success = ExAcquireResourceSharedLite(&Lock->Resource, FALSE); + + if (!Success) + KeLeaveCriticalRegion(); + + return Success; } NTSTATUS

10 years, 2 months

[jgardou] 64969: [WIN32K] - Properly check for CBM_INIT bit in CreateDIBitmap. - Take into account the fact that we could be passed a BITMAPCOREHEADER CORE-8695

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Oct 24 18:45:25 2014 New Revision: 64969 URL: http://svn.reactos.org/svn/reactos?rev=64969&view=rev Log: [WIN32K] - Properly check for CBM_INIT bit in CreateDIBitmap. - Take into account the fact that we could be passed a BITMAPCOREHEADER CORE-8695 Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Fri Oct 24 18:45:25 2014 @@ -1336,7 +1336,7 @@ // colors, which are black followed by white, nothing else. In all other cases, we create a color bitmap. if (BmpFormat != BMF_1BPP) fColor = TRUE; - else if ((coloruse > DIB_RGB_COLORS) || (init != CBM_INIT) || !data) fColor = FALSE; + else if ((coloruse > DIB_RGB_COLORS) || ((init & CBM_INIT) == 0) || !data) fColor = FALSE; else { const RGBQUAD *rgb = (RGBQUAD*)((PBYTE)data + data->bmiHeader.biSize); @@ -1448,7 +1448,7 @@ PBYTE safeBits = NULL; HBITMAP hbmResult = NULL; - if(pjInit && (fInit == CBM_INIT)) + if(pjInit && (fInit & CBM_INIT)) { if (cjMaxBits == 0) return NULL; safeBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, TAG_DIB); @@ -1462,7 +1462,7 @@ _SEH2_TRY { if(pbmi) ProbeForRead(pbmi, cjMaxInitInfo, 1); - if(pjInit && (fInit == CBM_INIT)) + if(pjInit && (fInit & CBM_INIT)) { ProbeForRead(pjInit, cjMaxBits, 1); RtlCopyMemory(safeBits, pjInit, cjMaxBits); @@ -1540,9 +1540,19 @@ * if bpp != 1 and ignore the real value that was passed */ if (pbmi) { - bpp = pbmi->bmiHeader.biBitCount; - planes = pbmi->bmiHeader.biPlanes; - compression = pbmi->bmiHeader.biCompression; + if (pbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER* CoreHeader = (BITMAPCOREHEADER*)&pbmi->bmiHeader; + bpp = CoreHeader->bcBitCount; + planes = CoreHeader->bcPlanes; + compression = BI_RGB; + } + else + { + bpp = pbmi->bmiHeader.biBitCount; + planes = pbmi->bmiHeader.biPlanes; + compression = pbmi->bmiHeader.biCompression; + } } else {

10 years, 2 months

[akhaldi] 64968: [ADVAPI32] * Move some functions from ac.c to security.c. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 24 17:51:40 2014 New Revision: 64968 URL: http://svn.reactos.org/svn/reactos?rev=64968&view=rev Log: [ADVAPI32] * Move some functions from ac.c to security.c. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/ac.… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/ac.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/ac.c [iso-8859-1] Fri Oct 24 17:51:40 2014 @@ -8,149 +8,7 @@ #include <advapi32.h> WINE_DEFAULT_DEBUG_CHANNEL(advapi); -/* --- ACL --- */ - -/* - * @implemented - */ -BOOL -WINAPI -GetAclInformation(PACL pAcl, - LPVOID pAclInformation, - DWORD nAclInformationLength, - ACL_INFORMATION_CLASS dwAclInformationClass) -{ - NTSTATUS Status; - - Status = RtlQueryInformationAcl(pAcl, - pAclInformation, - nAclInformationLength, - dwAclInformationClass); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -InitializeAcl(PACL pAcl, - DWORD nAclLength, - DWORD dwAclRevision) -{ - NTSTATUS Status; - - Status = RtlCreateAcl(pAcl, - nAclLength, - dwAclRevision); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -IsValidAcl(PACL pAcl) -{ - return RtlValidAcl (pAcl); -} - - -/* - * @implemented - */ -BOOL -WINAPI -SetAclInformation(PACL pAcl, - LPVOID pAclInformation, - DWORD nAclInformationLength, - ACL_INFORMATION_CLASS dwAclInformationClass) -{ - NTSTATUS Status; - - Status = RtlSetInformationAcl(pAcl, - pAclInformation, - nAclInformationLength, - dwAclInformationClass); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - /* --- ACE --- */ - -/* - * @implemented - */ -BOOL -WINAPI -AddAccessAllowedAce(PACL pAcl, - DWORD dwAceRevision, - DWORD AccessMask, - PSID pSid) -{ - NTSTATUS Status; - - Status = RtlAddAccessAllowedAce(pAcl, - dwAceRevision, - AccessMask, - pSid); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -AddAccessAllowedAceEx(PACL pAcl, - DWORD dwAceRevision, - DWORD AceFlags, - DWORD AccessMask, - PSID pSid) -{ - NTSTATUS Status; - - Status = RtlAddAccessAllowedAceEx(pAcl, - dwAceRevision, - AceFlags, - AccessMask, - pSid); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - /* * @implemented @@ -183,60 +41,6 @@ return TRUE; } - -/* - * @implemented - */ -BOOL -WINAPI -AddAccessDeniedAce(PACL pAcl, - DWORD dwAceRevision, - DWORD AccessMask, - PSID pSid) -{ - NTSTATUS Status; - - Status = RtlAddAccessDeniedAce(pAcl, - dwAceRevision, - AccessMask, - pSid); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -AddAccessDeniedAceEx(PACL pAcl, - DWORD dwAceRevision, - DWORD AceFlags, - DWORD AccessMask, - PSID pSid) -{ - NTSTATUS Status; - - Status = RtlAddAccessDeniedAceEx(pAcl, - dwAceRevision, - AceFlags, - AccessMask, - pSid); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - /* * @implemented */ @@ -267,96 +71,6 @@ return TRUE; } - - -/* - * @implemented - */ -BOOL -WINAPI -AddAce(PACL pAcl, - DWORD dwAceRevision, - DWORD dwStartingAceIndex, - LPVOID pAceList, - DWORD nAceListLength) -{ - NTSTATUS Status; - - Status = RtlAddAce(pAcl, - dwAceRevision, - dwStartingAceIndex, - pAceList, - nAceListLength); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -AddAuditAccessAce(PACL pAcl, - DWORD dwAceRevision, - DWORD dwAccessMask, - PSID pSid, - BOOL bAuditSuccess, - BOOL bAuditFailure) -{ - NTSTATUS Status; - - Status = RtlAddAuditAccessAce(pAcl, - dwAceRevision, - dwAccessMask, - pSid, - bAuditSuccess, - bAuditFailure); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -AddAuditAccessAceEx(PACL pAcl, - DWORD dwAceRevision, - DWORD AceFlags, - DWORD dwAccessMask, - PSID pSid, - BOOL bAuditSuccess, - BOOL bAuditFailure) -{ - NTSTATUS Status; - - Status = RtlAddAuditAccessAceEx(pAcl, - dwAceRevision, - AceFlags, - dwAccessMask, - pSid, - bAuditSuccess, - bAuditFailure); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - /* * @implemented @@ -392,65 +106,6 @@ return TRUE; } - -/* - * @implemented - */ -BOOL -WINAPI -DeleteAce(PACL pAcl, - DWORD dwAceIndex) -{ - NTSTATUS Status; - - Status = RtlDeleteAce(pAcl, - dwAceIndex); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -FindFirstFreeAce(PACL pAcl, - LPVOID *pAce) -{ - return RtlFirstFreeAce(pAcl, - (PACE*)pAce); -} - - -/* - * @implemented - */ -BOOL -WINAPI -GetAce(PACL pAcl, - DWORD dwAceIndex, - LPVOID *pAce) -{ - NTSTATUS Status; - - Status = RtlGetAce(pAcl, - dwAceIndex, - pAce); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - /* * @implemented Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Fri Oct 24 17:51:40 2014 @@ -802,6 +802,250 @@ /* * @implemented */ +BOOL +WINAPI +InitializeAcl(PACL pAcl, + DWORD nAclLength, + DWORD dwAclRevision) +{ + NTSTATUS Status; + + Status = RtlCreateAcl(pAcl, + nAclLength, + dwAclRevision); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +AddAccessAllowedAce(PACL pAcl, + DWORD dwAceRevision, + DWORD AccessMask, + PSID pSid) +{ + NTSTATUS Status; + + Status = RtlAddAccessAllowedAce(pAcl, + dwAceRevision, + AccessMask, + pSid); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL WINAPI +AddAccessAllowedAceEx(PACL pAcl, + DWORD dwAceRevision, + DWORD AceFlags, + DWORD AccessMask, + PSID pSid) +{ + NTSTATUS Status; + + Status = RtlAddAccessAllowedAceEx(pAcl, + dwAceRevision, + AceFlags, + AccessMask, + pSid); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +AddAccessDeniedAce(PACL pAcl, + DWORD dwAceRevision, + DWORD AccessMask, + PSID pSid) +{ + NTSTATUS Status; + + Status = RtlAddAccessDeniedAce(pAcl, + dwAceRevision, + AccessMask, + pSid); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL WINAPI +AddAccessDeniedAceEx(PACL pAcl, + DWORD dwAceRevision, + DWORD AceFlags, + DWORD AccessMask, + PSID pSid) +{ + NTSTATUS Status; + + Status = RtlAddAccessDeniedAceEx(pAcl, + dwAceRevision, + AceFlags, + AccessMask, + pSid); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +AddAce(PACL pAcl, + DWORD dwAceRevision, + DWORD dwStartingAceIndex, + LPVOID pAceList, + DWORD nAceListLength) +{ + NTSTATUS Status; + + Status = RtlAddAce(pAcl, + dwAceRevision, + dwStartingAceIndex, + pAceList, + nAceListLength); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +DeleteAce(PACL pAcl, + DWORD dwAceIndex) +{ + NTSTATUS Status; + + Status = RtlDeleteAce(pAcl, + dwAceIndex); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +FindFirstFreeAce(PACL pAcl, + LPVOID *pAce) +{ + return RtlFirstFreeAce(pAcl, + (PACE*)pAce); +} + + +/* + * @implemented + */ +BOOL +WINAPI +GetAce(PACL pAcl, + DWORD dwAceIndex, + LPVOID *pAce) +{ + NTSTATUS Status; + + Status = RtlGetAce(pAcl, + dwAceIndex, + pAce); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +GetAclInformation(PACL pAcl, + LPVOID pAclInformation, + DWORD nAclInformationLength, + ACL_INFORMATION_CLASS dwAclInformationClass) +{ + NTSTATUS Status; + + Status = RtlQueryInformationAcl(pAcl, + pAclInformation, + nAclInformationLength, + dwAclInformationClass); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +IsValidAcl(PACL pAcl) +{ + return RtlValidAcl (pAcl); +} + +/* + * @implemented + */ BOOL WINAPI AllocateLocallyUniqueId(PLUID Luid) { @@ -892,6 +1136,65 @@ return !*AccessStatus; } +/* + * @implemented + */ +BOOL +WINAPI +AddAuditAccessAce(PACL pAcl, + DWORD dwAceRevision, + DWORD dwAccessMask, + PSID pSid, + BOOL bAuditSuccess, + BOOL bAuditFailure) +{ + NTSTATUS Status; + + Status = RtlAddAuditAccessAce(pAcl, + dwAceRevision, + dwAccessMask, + pSid, + bAuditSuccess, + bAuditFailure); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL WINAPI +AddAuditAccessAceEx(PACL pAcl, + DWORD dwAceRevision, + DWORD AceFlags, + DWORD dwAccessMask, + PSID pSid, + BOOL bAuditSuccess, + BOOL bAuditFailure) +{ + NTSTATUS Status; + + Status = RtlAddAuditAccessAceEx(pAcl, + dwAceRevision, + AceFlags, + dwAccessMask, + pSid, + bAuditSuccess, + bAuditFailure); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + /********************************************************************** * PrivilegeCheck EXPORTED * @@ -915,6 +1218,31 @@ } *pfResult = (BOOL)Result; + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +SetAclInformation(PACL pAcl, + LPVOID pAclInformation, + DWORD nAclInformationLength, + ACL_INFORMATION_CLASS dwAclInformationClass) +{ + NTSTATUS Status; + + Status = RtlSetInformationAcl(pAcl, + pAclInformation, + nAclInformationLength, + dwAclInformationClass); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } return TRUE; }

10 years, 2 months

[jgardou] 64967: [USER32] - Use CreateDIBitmap with the CDM_CREATEDIB undocumented flag to create alpha bitmaps. This permits to create display compatible yet 32bpp DDBs. CORE-8695 #comment PLease ...

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Oct 24 17:31:50 2014 New Revision: 64967 URL: http://svn.reactos.org/svn/reactos?rev=64967&view=rev Log: [USER32] - Use CreateDIBitmap with the CDM_CREATEDIB undocumented flag to create alpha bitmaps. This permits to create display compatible yet 32bpp DDBs. CORE-8695 #comment PLease retest, should be OK now. Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] Fri Oct 24 17:31:50 2014 @@ -241,56 +241,41 @@ * * Create the alpha bitmap for a 32-bpp icon that has an alpha channel. */ -static HBITMAP create_alpha_bitmap( - _In_ HBITMAP color, - _In_opt_ const BITMAPINFO *src_info, - _In_opt_ const void *color_bits ) +static +HBITMAP +create_alpha_bitmap( + _In_opt_ HBITMAP color, + _In_opt_ BITMAPINFO *src_info, + _In_opt_ const void *color_bits, + _In_ LONG width, + _In_ LONG height) { HBITMAP alpha = NULL, hbmpOld; - BITMAPINFO *info = NULL; HDC hdc = NULL, hdcScreen; + unsigned char *ptr; void *bits = NULL; - unsigned char *ptr; int i; - LONG width, height; - BITMAP bm; - - if (!GetObjectW( color, sizeof(bm), &bm )) + + hdcScreen = CreateDCW(DISPLAYW, NULL, NULL, NULL); + if (!hdcScreen) return NULL; - if (bm.bmBitsPixel != 32) + hdc = CreateCompatibleDC(hdcScreen); + if (!hdc) + { + DeleteDC(hdcScreen); return NULL; - - hdcScreen = CreateDCW(DISPLAYW, NULL, NULL, NULL); - if(!hdcScreen) - return NULL; - if(GetDeviceCaps(hdcScreen, BITSPIXEL) != 32) - goto done; - hdc = CreateCompatibleDC(hdcScreen); - if(!hdc) - goto done; - - if(src_info) - { - WORD bpp; - DWORD compr; - int size; - - if(!bmi_has_alpha(src_info, color_bits)) + } + + if (color) + { + BITMAP bm; + BITMAPINFO *info = NULL; + + if (!GetObjectW( color, sizeof(bm), &bm )) goto done; - - if(!DIB_GetBitmapInfo(&src_info->bmiHeader, &width, &height, &bpp, &compr)) + if (bm.bmBitsPixel != 32) goto done; - if(bpp != 32) - goto done; - - size = get_dib_image_size(width, height, bpp); - bits = HeapAlloc(GetProcessHeap(), 0, size); - if(!bits) - goto done; - CopyMemory(bits, color_bits, size); - } - else - { + info = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); if(!info) goto done; @@ -308,46 +293,116 @@ bits = HeapAlloc(GetProcessHeap(), 0, info->bmiHeader.biSizeImage); if(!bits) + { + HeapFree(GetProcessHeap(), 0, info); goto done; + } if(!GetDIBits( hdc, color, 0, bm.bmHeight, bits, info, DIB_RGB_COLORS )) + { + HeapFree(GetProcessHeap(), 0, info); goto done; + } if (!bmi_has_alpha( info, bits )) + { + HeapFree(GetProcessHeap(), 0, info); goto done; - width = bm.bmWidth; - height = bm.bmHeight; - } - - /* pre-multiply by alpha */ - for (i = 0, ptr = bits; i < width * height; i++, ptr += 4) - { - unsigned int alpha = ptr[3]; - ptr[0] = ptr[0] * alpha / 255; - ptr[1] = ptr[1] * alpha / 255; - ptr[2] = ptr[2] * alpha / 255; - } - - /* Create the bitmap */ - alpha = CreateCompatibleBitmap(hdcScreen, bm.bmWidth, bm.bmHeight); - if(!alpha) - goto done; - hbmpOld = SelectObject(hdc, alpha); - if(!hbmpOld) - goto done; - if(!StretchDIBits( hdc, 0, 0, bm.bmWidth, bm.bmHeight, - 0, 0, width, height, - bits, src_info ? src_info : info, DIB_RGB_COLORS, SRCCOPY )) - { - SelectObject(hdc, hbmpOld); - hbmpOld = NULL; - DeleteObject(alpha); - alpha = NULL; - } - SelectObject(hdc, hbmpOld); + } + + /* pre-multiply by alpha */ + for (i = 0, ptr = bits; i < width * height; i++, ptr += 4) + { + unsigned int alpha = ptr[3]; + ptr[0] = (ptr[0] * alpha) / 255; + ptr[1] = (ptr[1] * alpha) / 255; + ptr[2] = (ptr[2] * alpha) / 255; + } + + /* Directly create a 32-bits DDB (thanks to undocumented CreateDIBitmap flag). */ + alpha = CreateDIBitmap(hdc, NULL, CBM_INIT | 2, bits, info, DIB_RGB_COLORS); + + HeapFree(GetProcessHeap(), 0, info); + HeapFree(GetProcessHeap(), 0, bits); + } + else + { + WORD bpp; + DWORD compr; + int size; + LONG orig_width, orig_height; + + if(!bmi_has_alpha(src_info, color_bits)) + goto done; + + if(!DIB_GetBitmapInfo(&src_info->bmiHeader, &orig_width, &orig_height, &bpp, &compr)) + goto done; + if(bpp != 32) + goto done; + + size = get_dib_image_size(orig_width, orig_height, bpp); + bits = HeapAlloc(GetProcessHeap(), 0, size); + if(!bits) + goto done; + CopyMemory(bits, color_bits, size); + /* pre-multiply by alpha */ + for (i = 0, ptr = bits; i < width * height; i++, ptr += 4) + { + unsigned int alpha = ptr[3]; + ptr[0] = (ptr[0] * alpha) / 255; + ptr[1] = (ptr[1] * alpha) / 255; + ptr[2] = (ptr[2] * alpha) / 255; + } + + /* Create the bitmap. Set the bitmap info to have the right width and height */ + if(src_info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + ((BITMAPCOREHEADER*)&src_info->bmiHeader)->bcWidth = width; + ((BITMAPCOREHEADER*)&src_info->bmiHeader)->bcHeight = height; + } + else + { + src_info->bmiHeader.biWidth = width; + src_info->bmiHeader.biHeight = height; + } + /* Directly create a 32-bits DDB (thanks to undocumented CreateDIBitmap flag). */ + alpha = CreateDIBitmap(hdcScreen, NULL, 2, NULL, src_info, DIB_RGB_COLORS); + /* Restore values */ + if(src_info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + ((BITMAPCOREHEADER*)&src_info->bmiHeader)->bcWidth = orig_width; + ((BITMAPCOREHEADER*)&src_info->bmiHeader)->bcHeight = orig_height; + } + else + { + src_info->bmiHeader.biWidth = orig_width; + src_info->bmiHeader.biHeight = orig_height; + } + if(!alpha) + goto done; + hbmpOld = SelectObject(hdc, alpha); + if(!hbmpOld) + { + DeleteObject(alpha); + alpha = NULL; + goto done; + } + if(!StretchDIBits( hdc, 0, 0, width, height, + 0, 0, orig_width, orig_height, + bits, src_info, DIB_RGB_COLORS, SRCCOPY )) + { + SelectObject(hdc, hbmpOld); + hbmpOld = NULL; + DeleteObject(alpha); + alpha = NULL; + } + else + { + SelectObject(hdc, hbmpOld); + } + } done: DeleteDC(hdcScreen); - if(hdc) DeleteDC( hdc ); - if(info) HeapFree( GetProcessHeap(), 0, info ); + DeleteDC( hdc ); if(bits) HeapFree(GetProcessHeap(), 0, bits); TRACE("Returning 0x%08x.\n", alpha); @@ -571,8 +626,7 @@ pvColor, pbmiCopy, DIB_RGB_COLORS, SRCCOPY)) goto done; pdata->bpp = GetDeviceCaps(hdcScreen, BITSPIXEL); - if(pdata->bpp == 32) - pdata->hbmAlpha = create_alpha_bitmap(pdata->hbmColor, pbmiCopy, pvColor); + pdata->hbmAlpha = create_alpha_bitmap(NULL, pbmiCopy, pvColor, pdata->cx, pdata->cy); /* Now convert the info to monochrome for the mask bits */ if (pbmiCopy->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) @@ -673,7 +727,7 @@ pCursorData->cx = bm.bmWidth; pCursorData->cy = bm.bmHeight; if(pCursorData->bpp == 32) - pCursorData->hbmAlpha = create_alpha_bitmap(pCursorData->hbmColor, NULL, NULL); + pCursorData->hbmAlpha = create_alpha_bitmap(pCursorData->hbmColor, NULL, NULL, 0, 0); } else {

10 years, 2 months

[jgardou] 64966: [WIN32K] - First implementation of CreateDIBitmap with the undocumented CBM_CREATEDIB flag. CORE-8695

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Oct 24 17:31:46 2014 New Revision: 64966 URL: http://svn.reactos.org/svn/reactos?rev=64966&view=rev Log: [WIN32K] - First implementation of CreateDIBitmap with the undocumented CBM_CREATEDIB flag. CORE-8695 Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/intgdi.h Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Fri Oct 24 17:31:46 2014 @@ -480,6 +480,9 @@ GdiSetLastError(ERROR_INVALID_PARAMETER); return 0; } + + /* Use the header from the data */ + Header = &Data->bmiHeader; } /* Header is required */ @@ -502,6 +505,13 @@ /* Only DIB_RGB_COLORS (0), DIB_PAL_COLORS (1) and 2 are valid. */ if (ColorUse > DIB_PAL_COLORS + 1) + { + GdiSetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + /* If some Bits are given, only DIB_PAL_COLORS and DIB_RGB_COLORS are valid */ + if (Bits && (ColorUse > DIB_PAL_COLORS)) { GdiSetLastError(ERROR_INVALID_PARAMETER); return 0; Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Fri Oct 24 17:31:46 2014 @@ -217,7 +217,9 @@ IntCreateCompatibleBitmap( PDC Dc, INT Width, - INT Height) + INT Height, + UINT Planes, + UINT Bpp) { HBITMAP Bmp = NULL; PPALETTE ppal; @@ -234,8 +236,8 @@ Bmp = GreCreateBitmap(abs(Width), abs(Height), - 1, - Dc->ppdev->gdiinfo.cBitsPixel, + Planes ? Planes : 1, + Bpp ? Bpp : Dc->ppdev->gdiinfo.cBitsPixel, NULL); psurf = SURFACE_ShareLockSurface(Bmp); ASSERT(psurf); @@ -266,8 +268,8 @@ Bmp = GreCreateBitmap(abs(Width), abs(Height), - 1, - dibs.dsBm.bmBitsPixel, + Planes ? Planes : 1, + Bpp ? Bpp : dibs.dsBm.bmBitsPixel, NULL); psurfBmp = SURFACE_ShareLockSurface(Bmp); ASSERT(psurfBmp); @@ -291,8 +293,8 @@ bi->bmiHeader.biSize = sizeof(bi->bmiHeader); bi->bmiHeader.biWidth = Width; bi->bmiHeader.biHeight = Height; - bi->bmiHeader.biPlanes = dibs.dsBmih.biPlanes; - bi->bmiHeader.biBitCount = dibs.dsBmih.biBitCount; + bi->bmiHeader.biPlanes = Planes ? Planes : dibs.dsBmih.biPlanes; + bi->bmiHeader.biBitCount = Bpp ? Bpp : dibs.dsBmih.biBitCount; bi->bmiHeader.biCompression = dibs.dsBmih.biCompression; bi->bmiHeader.biSizeImage = 0; bi->bmiHeader.biXPelsPerMeter = dibs.dsBmih.biXPelsPerMeter; @@ -373,7 +375,7 @@ return NULL; } - Bmp = IntCreateCompatibleBitmap(Dc, Width, Height); + Bmp = IntCreateCompatibleBitmap(Dc, Width, Height, 0, 0); DC_UnlockDc(Dc); return Bmp; Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Fri Oct 24 17:31:46 2014 @@ -1317,7 +1317,9 @@ PDC Dc, INT width, INT height, + UINT planes, UINT bpp, + ULONG compression, DWORD init, LPBYTE bits, PBITMAPINFO data, @@ -1325,12 +1327,16 @@ { HBITMAP handle; BOOL fColor; + ULONG BmpFormat = 0; + + if (planes && bpp) + BmpFormat = BitmapFormat(planes * bpp, compression); // Check if we should create a monochrome or color bitmap. We create a monochrome bitmap only if it has exactly 2 // colors, which are black followed by white, nothing else. In all other cases, we create a color bitmap. - if (bpp != 1) fColor = TRUE; - else if ((coloruse != DIB_RGB_COLORS) || (init != CBM_INIT) || !data) fColor = FALSE; + if (BmpFormat != BMF_1BPP) fColor = TRUE; + else if ((coloruse > DIB_RGB_COLORS) || (init != CBM_INIT) || !data) fColor = FALSE; else { const RGBQUAD *rgb = (RGBQUAD*)((PBYTE)data + data->bmiHeader.biSize); @@ -1351,7 +1357,16 @@ // Now create the bitmap if (fColor) { - handle = IntCreateCompatibleBitmap(Dc, width, height); + if (init & CBM_CREATDIB) + { + /* Undocumented flag which creates a DDB of the format specified by the bitmap info. */ + handle = IntCreateCompatibleBitmap(Dc, width, height, planes, bpp); + } + else + { + /* Create a regular compatible bitmap, in the same format as the device */ + handle = IntCreateCompatibleBitmap(Dc, width, height, 0, 0); + } } else { @@ -1365,8 +1380,47 @@ if (height < 0) height = -height; - if (NULL != handle && CBM_INIT == init) - { + if ((NULL != handle) && (CBM_INIT & init)) + { + if (init & CBM_CREATDIB) + { + PSURFACE Surface; + PPALETTE Palette; + NTSTATUS Status = STATUS_SUCCESS; + + Surface = SURFACE_ShareLockSurface(handle); + ASSERT(Surface); + + Palette = CreateDIBPalette(data, Dc, coloruse); + ASSERT(Palette); + SURFACE_vSetPalette(Surface, Palette); + PALETTE_ShareUnlockPalette(Palette); + + if (Surface->SurfObj.pvBits) + { + _SEH2_TRY + { + RtlCopyMemory(Surface->SurfObj.pvBits, bits, + abs(Surface->sizlDim.cy * Surface->SurfObj.lDelta)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + } + + SURFACE_ShareUnlockSurface(Surface); + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + GreDeleteObject(handle); + handle = NULL; + } + return handle; + } + IntSetDIBits(Dc, handle, 0, height, bits, data, coloruse); } @@ -1458,7 +1512,8 @@ { PDC Dc; HBITMAP Bmp; - WORD bpp; + USHORT bpp, planes; + DWORD compression; HDC hdcDest; if (!hDc) /* 1bpp monochrome bitmap */ @@ -1484,10 +1539,18 @@ /* It's OK to set bpp=0 here, as IntCreateDIBitmap will create a compatible Bitmap * if bpp != 1 and ignore the real value that was passed */ if (pbmi) + { bpp = pbmi->bmiHeader.biBitCount; + planes = pbmi->bmiHeader.biPlanes; + compression = pbmi->bmiHeader.biCompression; + } else + { bpp = 0; - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); + planes = 0; + compression = 0; + } + Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, planes, compression, fInit, pjInit, pbmi, iUsage); DC_UnlockDc(Dc); if(!hDc) Modified: trunk/reactos/win32ss/gdi/ntgdi/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/intgdi.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] Fri Oct 24 17:31:46 2014 @@ -87,9 +87,12 @@ HBITMAP FASTCALL -IntCreateCompatibleBitmap(PDC Dc, - INT Width, - INT Height); +IntCreateCompatibleBitmap( + _In_ PDC Dc, + _In_ INT Width, + _In_ INT Height, + _In_ UINT Bpp, + _In_ UINT Planes); WORD APIENTRY IntGdiSetHookFlags(HDC hDC, WORD Flags);

10 years, 2 months

[jgardou] 64965: [WIN32K] - Differenciate 16bpp 565 from 16bpp 555 in alphablending code. - Fix RGB vs BGR mismatch CORE-8695

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Oct 24 17:31:37 2014 New Revision: 64965 URL: http://svn.reactos.org/svn/reactos?rev=64965&view=rev Log: [WIN32K] - Differenciate 16bpp 565 from 16bpp 555 in alphablending code. - Fix RGB vs BGR mismatch CORE-8695 Modified: trunk/reactos/win32ss/gdi/dib/dib16bpp.c Modified: trunk/reactos/win32ss/gdi/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/dib/dib16bpp.c… ============================================================================== --- trunk/reactos/win32ss/gdi/dib/dib16bpp.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/dib/dib16bpp.c [iso-8859-1] Fri Oct 24 17:31:37 2014 @@ -542,11 +542,23 @@ USHORT us; struct { + USHORT blue :5; + USHORT green :6; USHORT red :5; - USHORT green :6; + } col; +} NICEPIXEL16_565; + +typedef union +{ + USHORT us; + struct + { USHORT blue :5; + USHORT green :5; + USHORT red :5; + USHORT xxxx :1; } col; -} NICEPIXEL16; +} NICEPIXEL16_555; static __inline UCHAR Clamp6(ULONG val) @@ -568,8 +580,7 @@ INT DstX, DstY, SrcX, SrcY; BLENDFUNCTION BlendFunc; NICEPIXEL32 SrcPixel32; - NICEPIXEL16 DstPixel16; - UCHAR Alpha, Alpha6, Alpha5; + UCHAR Alpha; EXLATEOBJ* pexlo; EXLATEOBJ exloSrcRGB; @@ -609,46 +620,97 @@ pexlo = CONTAINING_RECORD(ColorTranslation, EXLATEOBJ, xlo); EXLATEOBJ_vInitialize(&exloSrcRGB, pexlo->ppalSrc, &gpalRGB, 0, 0, 0); - SrcY = SourceRect->top; - DstY = DestRect->top; - while ( DstY < DestRect->bottom ) - { - SrcX = SourceRect->left; - DstX = DestRect->left; - while(DstX < DestRect->right) - { - SrcPixel32.ul = DIB_GetSource(Source, SrcX, SrcY, &exloSrcRGB.xlo); - SrcPixel32.col.red = (SrcPixel32.col.red * BlendFunc.SourceConstantAlpha) / 255; - SrcPixel32.col.green = (SrcPixel32.col.green * BlendFunc.SourceConstantAlpha) / 255; - SrcPixel32.col.blue = (SrcPixel32.col.blue * BlendFunc.SourceConstantAlpha) / 255; - - Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? - (SrcPixel32.col.alpha * BlendFunc.SourceConstantAlpha) / 255 : - BlendFunc.SourceConstantAlpha; - - Alpha6 = Alpha >> 2; - Alpha5 = Alpha >> 3; - - DstPixel16.us = DIB_16BPP_GetPixel(Dest, DstX, DstY) & 0xFFFF; - /* Perform bit loss */ - SrcPixel32.col.red >>= 3; - SrcPixel32.col.green >>= 2; - SrcPixel32.col.blue >>= 3; - - /* Do the blend in the right bit depth */ - DstPixel16.col.red = Clamp5((DstPixel16.col.red * (31 - Alpha5)) / 31 + SrcPixel32.col.red); - DstPixel16.col.green = Clamp6((DstPixel16.col.green * (63 - Alpha6)) / 63 + SrcPixel32.col.green); - DstPixel16.col.blue = Clamp5((DstPixel16.col.blue * (31 - Alpha5)) / 31 + SrcPixel32.col.blue); - - DIB_16BPP_PutPixel(Dest, DstX, DstY, DstPixel16.us); - - DstX++; - SrcX = SourceRect->left + ((DstX-DestRect->left)*(SourceRect->right - SourceRect->left)) - /(DestRect->right-DestRect->left); - } - DstY++; - SrcY = SourceRect->top + ((DstY-DestRect->top)*(SourceRect->bottom - SourceRect->top)) - /(DestRect->bottom-DestRect->top); + if (pexlo->ppalDst->flFlags & PAL_RGB16_555) + { + NICEPIXEL16_555 DstPixel16; + + SrcY = SourceRect->top; + DstY = DestRect->top; + while ( DstY < DestRect->bottom ) + { + SrcX = SourceRect->left; + DstX = DestRect->left; + while(DstX < DestRect->right) + { + SrcPixel32.ul = DIB_GetSource(Source, SrcX, SrcY, &exloSrcRGB.xlo); + SrcPixel32.col.red = (SrcPixel32.col.red * BlendFunc.SourceConstantAlpha) / 255; + SrcPixel32.col.green = (SrcPixel32.col.green * BlendFunc.SourceConstantAlpha) / 255; + SrcPixel32.col.blue = (SrcPixel32.col.blue * BlendFunc.SourceConstantAlpha) / 255; + + Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? + (SrcPixel32.col.alpha * BlendFunc.SourceConstantAlpha) / 255 : + BlendFunc.SourceConstantAlpha; + + Alpha >>= 3; + + DstPixel16.us = DIB_16BPP_GetPixel(Dest, DstX, DstY) & 0xFFFF; + /* Perform bit loss */ + SrcPixel32.col.red >>= 3; + SrcPixel32.col.green >>= 3; + SrcPixel32.col.blue >>= 3; + + /* Do the blend in the right bit depth */ + DstPixel16.col.red = Clamp5((DstPixel16.col.red * (31 - Alpha)) / 31 + SrcPixel32.col.red); + DstPixel16.col.green = Clamp5((DstPixel16.col.green * (31 - Alpha)) / 31 + SrcPixel32.col.green); + DstPixel16.col.blue = Clamp5((DstPixel16.col.blue * (31 - Alpha)) / 31 + SrcPixel32.col.blue); + + DIB_16BPP_PutPixel(Dest, DstX, DstY, DstPixel16.us); + + DstX++; + SrcX = SourceRect->left + ((DstX-DestRect->left)*(SourceRect->right - SourceRect->left)) + /(DestRect->right-DestRect->left); + } + DstY++; + SrcY = SourceRect->top + ((DstY-DestRect->top)*(SourceRect->bottom - SourceRect->top)) + /(DestRect->bottom-DestRect->top); + } + } + else + { + NICEPIXEL16_565 DstPixel16; + UCHAR Alpha6, Alpha5; + + SrcY = SourceRect->top; + DstY = DestRect->top; + while ( DstY < DestRect->bottom ) + { + SrcX = SourceRect->left; + DstX = DestRect->left; + while(DstX < DestRect->right) + { + SrcPixel32.ul = DIB_GetSource(Source, SrcX, SrcY, &exloSrcRGB.xlo); + SrcPixel32.col.red = (SrcPixel32.col.red * BlendFunc.SourceConstantAlpha) / 255; + SrcPixel32.col.green = (SrcPixel32.col.green * BlendFunc.SourceConstantAlpha) / 255; + SrcPixel32.col.blue = (SrcPixel32.col.blue * BlendFunc.SourceConstantAlpha) / 255; + + Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? + (SrcPixel32.col.alpha * BlendFunc.SourceConstantAlpha) / 255 : + BlendFunc.SourceConstantAlpha; + + Alpha6 = Alpha >> 2; + Alpha5 = Alpha >> 3; + + DstPixel16.us = DIB_16BPP_GetPixel(Dest, DstX, DstY) & 0xFFFF; + /* Perform bit loss */ + SrcPixel32.col.red >>= 3; + SrcPixel32.col.green >>= 2; + SrcPixel32.col.blue >>= 3; + + /* Do the blend in the right bit depth */ + DstPixel16.col.red = Clamp5((DstPixel16.col.red * (31 - Alpha5)) / 31 + SrcPixel32.col.red); + DstPixel16.col.green = Clamp6((DstPixel16.col.green * (63 - Alpha6)) / 63 + SrcPixel32.col.green); + DstPixel16.col.blue = Clamp5((DstPixel16.col.blue * (31 - Alpha5)) / 31 + SrcPixel32.col.blue); + + DIB_16BPP_PutPixel(Dest, DstX, DstY, DstPixel16.us); + + DstX++; + SrcX = SourceRect->left + ((DstX-DestRect->left)*(SourceRect->right - SourceRect->left)) + /(DestRect->right-DestRect->left); + } + DstY++; + SrcY = SourceRect->top + ((DstY-DestRect->top)*(SourceRect->bottom - SourceRect->top)) + /(DestRect->bottom-DestRect->top); + } } EXLATEOBJ_vCleanup(&exloSrcRGB);

10 years, 2 months

[tfaber] 64964: [WIN32K] - Move call to UserRegisterClass out of SEH. All parameters are kernel pointers, so exceptions here are critical kernel bugs that shouldn't be hidden. CORE-8702 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 24 17:28:21 2014 New Revision: 64964 URL: http://svn.reactos.org/svn/reactos?rev=64964&view=rev Log: [WIN32K] - Move call to UserRegisterClass out of SEH. All parameters are kernel pointers, so exceptions here are critical kernel bugs that shouldn't be hidden. CORE-8702 #resolve Modified: trunk/reactos/win32ss/user/ntuser/class.c Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Fri Oct 24 17:28:21 2014 @@ -230,7 +230,7 @@ // Fixes running the static test then run class test issue. // Some applications do not use UnregisterClass before exiting. - // Keep from reusing the same atom with case insensitive + // Keep from reusing the same atom with case insensitive // comparisons, remove registration of the atom if not zeroed. if (Class->atomClassName) IntDeregisterClassAtom(Class->atomClassName); @@ -1937,7 +1937,7 @@ // hIconSm, A handle to a small icon that is associated with the window class. // If this member is NULL, the system searches the icon resource specified by // the hIcon member for an icon of the appropriate size to use as the small icon. - // + // case GCLP_HICON: #ifdef NEW_CURSORICON { @@ -2445,6 +2445,7 @@ UNICODE_STRING CapturedName = {0}, CapturedMenuName = {0}; RTL_ATOM Ret = (RTL_ATOM)0; PPROCESSINFO ppi = GetW32ProcessInfo(); + BOOL Exception = FALSE; if (Flags & ~(CSF_ANSIPROC)) { @@ -2536,7 +2537,17 @@ } TRACE("NtUserRegisterClassExWOW MnuN %wZ\n",&CapturedMenuName); - + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("NtUserRegisterClassExWOW Exception Error!\n"); + SetLastNtError(_SEH2_GetExceptionCode()); + Exception = TRUE; + } + _SEH2_END; + + if (!Exception) + { /* Register the class */ Ret = UserRegisterClass(&CapturedClassInfo, &CapturedName, @@ -2544,18 +2555,12 @@ fnID, Flags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ERR("NtUserRegisterClassExWOW Exception Error!\n"); - SetLastNtError(_SEH2_GetExceptionCode()); - } - _SEH2_END; -/* + if (!Ret) { - ERR("NtUserRegisterClassExWOW Null Return!\n"); - } - */ + TRACE("NtUserRegisterClassExWOW Null Return!\n"); + } + UserLeave(); return Ret;

10 years, 2 months

[akhaldi] 64963: [ADVAPI32] * Reorder AllocateLocallyUniqueId() to reduce difference to Wine. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 24 16:57:17 2014 New Revision: 64963 URL: http://svn.reactos.org/svn/reactos?rev=64963&view=rev Log: [ADVAPI32] * Reorder AllocateLocallyUniqueId() to reduce difference to Wine. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Fri Oct 24 16:57:17 2014 @@ -802,6 +802,24 @@ /* * @implemented */ +BOOL WINAPI +AllocateLocallyUniqueId(PLUID Luid) +{ + NTSTATUS Status; + + Status = NtAllocateLocallyUniqueId (Luid); + if (!NT_SUCCESS (Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ BOOL WINAPI AccessCheck(IN PSECURITY_DESCRIPTOR pSecurityDescriptor, @@ -2174,24 +2192,6 @@ DuplicateTokenHandle); } -/* - * @implemented - */ -BOOL WINAPI -AllocateLocallyUniqueId(PLUID Luid) -{ - NTSTATUS Status; - - Status = NtAllocateLocallyUniqueId (Luid); - if (!NT_SUCCESS (Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - /****************************************************************************** * ComputeStringSidSize */

10 years, 2 months

← Newer
1
...
17
18
19
20
21
22
23
...
73
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014