Ros-diffs May 2012

ros-diffs@reactos.org

12 participants
227 discussions

[tkreuzer] 56481: [WIN32K] Revert a part of 56478.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 3 11:14:11 2012 New Revision: 56481 URL: http://svn.reactos.org/svn/reactos?rev=56481&view=rev Log: [WIN32K] Revert a part of 56478. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Thu May 3 11:14:11 2012 @@ -1727,8 +1727,8 @@ 3: handle to the window whose messages are to be retrieved. */ if ( ( !Window || // 1 - ( Window->head.h == HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 - ( Window->head.h != HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 + ( Window == (PWND)HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 + ( Window != (PWND)HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { @@ -1790,8 +1790,8 @@ 3: handle to the window whose messages are to be retrieved. */ if ( ( !Window || // 1 - ( Window->head.h == HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 - ( Window->head.h != HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 + ( Window == (PWND)HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 + ( Window != (PWND)HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) {

12 years, 7 months

[akhaldi] 56480: [WINED3D] * Fix msvc x64 build. See issue #7032 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed May 2 22:48:35 2012 New Revision: 56480 URL: http://svn.reactos.org/svn/reactos?rev=56480&view=rev Log: [WINED3D] * Fix msvc x64 build. See issue #7032 for more details. Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Wed May 2 22:48:35 2012 @@ -37,12 +37,6 @@ wined3d_main.c ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def) -if(ARCH MATCHES amd64) -list(APPEND SOURCE - powf.c - sqrtf.c) -endif() - add_library(wined3d SHARED ${SOURCE} version.rc)

12 years, 7 months

[fireball] 56479: [LICENSE] - Add the linking exception text to the official ReactOS licensing text. Previously, the exception text was only available at the ReactOS website with no references from...

by fireball＠svn.reactos.org

Author: fireball Date: Wed May 2 21:36:27 2012 New Revision: 56479 URL: http://svn.reactos.org/svn/reactos?rev=56479&view=rev Log: [LICENSE] - Add the linking exception text to the official ReactOS licensing text. Previously, the exception text was only available at the ReactOS website with no references from the source code. Modified: trunk/reactos/COPYING Modified: trunk/reactos/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/COPYING?rev=56479&r1=56478… ============================================================================== --- trunk/reactos/COPYING [iso-8859-1] (original) +++ trunk/reactos/COPYING [iso-8859-1] Wed May 2 21:36:27 2012 @@ -337,3 +337,12 @@ consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. + + +ReactOS may be used, runtime linked, and distributed with non-free software +(meaning that such software has no obligations to open-source, or render +free, their non-free code) such as commercial device drivers and commercial +applications. This exception does not alter any other responsibilities of +the licensee under the GPL (meaning that such software must still obey +the GPL for the free ("open-sourced") code that has been integrated into +the said software).

12 years, 7 months

[tkreuzer] 56478: [WIN32K] A pointer is not a handle. A handle is not a pointer. At least in most cases. Defining STRICT in win32k revealed horrible things...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 2 19:29:33 2012 New Revision: 56478 URL: http://svn.reactos.org/svn/reactos?rev=56478&view=rev Log: [WIN32K] A pointer is not a handle. A handle is not a pointer. At least in most cases. Defining STRICT in win32k revealed horrible things... Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c trunk/reactos/win32ss/gdi/eng/mouse.c trunk/reactos/win32ss/gdi/eng/pdevobj.c trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/pch.h trunk/reactos/win32ss/reactx/ntddraw/dxeng.c trunk/reactos/win32ss/user/ntuser/caret.c trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/clipboard.c trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/keyboard.c trunk/reactos/win32ss/user/ntuser/misc/registry.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/simplecall.c Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -165,7 +165,7 @@ psurfRealize = SURFACE_ShareLockSurface(hbmpRealize); /* Already delete the pattern bitmap (will be kept until dereferenced) */ - EngDeleteSurface(hbmpRealize); + EngDeleteSurface((HSURF)hbmpRealize); if (!psurfRealize) { Modified: trunk/reactos/win32ss/gdi/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mouse.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/mouse.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -477,11 +477,11 @@ failure: /* Cleanup surfaces */ - if (hbmMask) EngDeleteSurface(hbmMask); + if (hbmMask) EngDeleteSurface((HSURF)hbmMask); if (psurfMask) SURFACE_ShareUnlockSurface(psurfMask); - if (hbmColor) EngDeleteSurface(hbmColor); + if (hbmColor) EngDeleteSurface((HSURF)hbmColor); if (psurfColor) SURFACE_ShareUnlockSurface(psurfColor); - if (hbmSave) EngDeleteSurface(hbmSave); + if (hbmSave) EngDeleteSurface((HSURF)hbmSave); if (psurfSave) SURFACE_ShareUnlockSurface(psurfSave); return SPS_ERROR; Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -832,7 +832,7 @@ for (ppdev = gppdevList; ppdev; ppdev = ppdev->ppdevNext) { /* Compare with the given HDEV */ - if (ppdev == hdev) + if (ppdev == (PPDEVOBJ)hdev) { /* Found the PDEV! Get it's dhpdev and break */ dhpdev = ppdev->dhpdev; Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -138,7 +138,7 @@ DPRINT("Locking DCs\n"); ahDC[0] = hDCDest; ahDC[1] = hDCSrc ; - if (!GDIOBJ_bLockMultipleObjects(2, ahDC, apObj, GDIObjType_DC_TYPE)) + if (!GDIOBJ_bLockMultipleObjects(2, (HGDIOBJ*)ahDC, apObj, GDIObjType_DC_TYPE)) { DPRINT1("Invalid dc handle (dest=0x%08x, src=0x%08x) passed to NtGdiAlphaBlend\n", hDCDest, hDCSrc); EngSetLastError(ERROR_INVALID_HANDLE); @@ -286,7 +286,7 @@ DPRINT("Locking DCs\n"); ahDC[0] = hdcDst; ahDC[1] = hdcSrc ; - if (!GDIOBJ_bLockMultipleObjects(2, ahDC, apObj, GDIObjType_DC_TYPE)) + if (!GDIOBJ_bLockMultipleObjects(2, (HGDIOBJ*)ahDC, apObj, GDIObjType_DC_TYPE)) { DPRINT1("Invalid dc handle (dest=0x%08x, src=0x%08x) passed to NtGdiAlphaBlend\n", hdcDst, hdcSrc); EngSetLastError(ERROR_INVALID_HANDLE); @@ -440,7 +440,7 @@ DPRINT("Locking DCs\n"); ahDC[0] = hdcDest; ahDC[1] = UsesSource ? hdcSrc : NULL; - if (!GDIOBJ_bLockMultipleObjects(2, ahDC, apObj, GDIObjType_DC_TYPE)) + if (!GDIOBJ_bLockMultipleObjects(2, (HGDIOBJ*)ahDC, apObj, GDIObjType_DC_TYPE)) { DPRINT1("Invalid dc handle (dest=0x%08x, src=0x%08x) passed to NtGdiAlphaBlend\n", hdcDest, hdcSrc); EngSetLastError(ERROR_INVALID_HANDLE); @@ -635,7 +635,7 @@ ahDC[0] = hDCDest; ahDC[1] = UsesSource ? hDCSrc : NULL; ahDC[2] = UsesMask ? hDCMask : NULL; - if (!GDIOBJ_bLockMultipleObjects(3, ahDC, apObj, GDIObjType_DC_TYPE)) + if (!GDIOBJ_bLockMultipleObjects(3, (HGDIOBJ*)ahDC, apObj, GDIObjType_DC_TYPE)) { DPRINT1("Invalid dc handle (dest=0x%08x, src=0x%08x) passed to NtGdiAlphaBlend\n", hDCDest, hDCSrc); EngSetLastError(ERROR_INVALID_HANDLE); Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -3346,7 +3346,7 @@ ahrgn[0] = hrgnDst; ahrgn[1] = hrgnSrc1; ahrgn[2] = iMode != RGN_COPY ? hrgnSrc2 : NULL; - if (!GDIOBJ_bLockMultipleObjects(3, ahrgn, (PVOID*)aprgn, GDIObjType_RGN_TYPE)) + if (!GDIOBJ_bLockMultipleObjects(3, (HGDIOBJ*)ahrgn, (PVOID*)aprgn, GDIObjType_RGN_TYPE)) { DPRINT1("NtGdiCombineRgn: %p, %p, %p, %d\n", hrgnDst, hrgnSrc1, hrgnSrc2, iMode); Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=56478&r1… ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Wed May 2 19:29:33 2012 @@ -11,6 +11,7 @@ /* INCLUDES ******************************************************************/ #define _NO_COM +#define STRICT /* DDK/NDK/SDK headers */ #undef NTDDI_VERSION Modified: trunk/reactos/win32ss/reactx/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/ntddraw/dxe… ============================================================================== --- trunk/reactos/win32ss/reactx/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/ntddraw/dxeng.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -533,7 +533,7 @@ DPRINT1("hDev : 0x%08lx\n",hDev); - Resource = ppdev->hsemDevLock; + Resource = (PERESOURCE)ppdev->hsemDevLock; if (Resource) { @@ -564,7 +564,7 @@ DxEngUnlockHdev(HDEV hDev) { PPDEVOBJ ppdev = (PPDEVOBJ)hDev; - PERESOURCE Resource = ppdev->hsemDevLock; + PERESOURCE Resource = (PERESOURCE)ppdev->hsemDevLock; DPRINT1("ReactX Calling : DxEngUnlockHdev \n"); @@ -674,7 +674,7 @@ APIENTRY DxEngIsHdevLockedByCurrentThread(HDEV hDev) { // Based on EngIsSemaphoreOwnedByCurrentThread w/o the Ex call. - PERESOURCE pSem = ((PPDEVOBJ)hDev)->hsemDevLock; + PERESOURCE pSem = (PERESOURCE)(((PPDEVOBJ)hDev)->hsemDevLock); return pSem->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)PsGetCurrentThread(); } Modified: trunk/reactos/win32ss/user/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/caret.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -1,4 +1,4 @@ -/* +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Caret functions @@ -164,7 +164,8 @@ if(ThreadQueue->CaretInfo->Visible) { - IntKillTimer(ThreadQueue->CaretInfo->hWnd, IDCARETTIMER, TRUE); + PWND pwnd = UserGetWindowObject(ThreadQueue->CaretInfo->hWnd); + IntKillTimer(pwnd, IDCARETTIMER, TRUE); co_IntHideCaret(ThreadQueue->CaretInfo); ThreadQueue->CaretInfo->Visible = 0; @@ -247,7 +248,8 @@ if (ThreadQueue->CaretInfo->Visible) { - IntKillTimer(hWnd, IDCARETTIMER, TRUE); + PWND pwnd = UserGetWindowObject(hWnd); + IntKillTimer(pwnd, IDCARETTIMER, TRUE); co_IntHideCaret(ThreadQueue->CaretInfo); } 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] Wed May 2 19:29:33 2012 @@ -15,7 +15,7 @@ CS_GLOBALCLASS|CS_DBLCLKS, NULL, 0, - IDC_ARROW, + (HICON)IDC_ARROW, (HBRUSH)(COLOR_BACKGROUND + 1), FNID_DESKTOP, ICLS_DESKTOP @@ -24,7 +24,7 @@ CS_VREDRAW|CS_HREDRAW|CS_SAVEBITS, NULL, // Use User32 procs sizeof(LONG), - IDC_ARROW, + (HICON)IDC_ARROW, NULL, FNID_SWITCH, ICLS_SWITCH @@ -33,7 +33,7 @@ CS_DBLCLKS|CS_SAVEBITS, NULL, // Use User32 procs sizeof(LONG), - IDC_ARROW, + (HICON)IDC_ARROW, (HBRUSH)(COLOR_MENU + 1), FNID_MENU, ICLS_MENU @@ -42,7 +42,7 @@ CS_DBLCLKS|CS_VREDRAW|CS_HREDRAW|CS_PARENTDC, NULL, // Use User32 procs sizeof(SBWND)-sizeof(WND), - IDC_ARROW, + (HICON)IDC_ARROW, NULL, FNID_SCROLLBAR, ICLS_SCROLLBAR @@ -51,7 +51,7 @@ 0, NULL, // Use User32 procs 0, - IDC_ARROW, + (HICON)IDC_ARROW, 0, FNID_ICONTITLE, ICLS_ICONTITLE @@ -60,7 +60,7 @@ CS_GLOBALCLASS, NULL, // Use User32 procs 0, - IDC_ARROW, + (HICON)IDC_ARROW, NULL, FNID_MESSAGEWND, ICLS_HWNDMESSAGE Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -173,7 +173,7 @@ { pMemObj->cbData = sizeof(BITMAPINFOHEADER) + bi.bmiHeader.biSizeImage; memcpy(pMemObj->Data, &bi, sizeof(BITMAPINFOHEADER)); - NtGdiGetDIBitsInternal(hdc, pMemObj->Data, 0, bm.bmHeight, (LPBYTE)pMemObj->Data + sizeof(BITMAPINFOHEADER), &bi, DIB_RGB_COLORS, 0, 0); + NtGdiGetDIBitsInternal(hdc, hBm, 0, bm.bmHeight, (LPBYTE)pMemObj->Data + sizeof(BITMAPINFOHEADER), &bi, DIB_RGB_COLORS, 0, 0); IntAddFormatedData(pWinStaObj, CF_DIB, hMem, TRUE, TRUE); } @@ -478,7 +478,7 @@ NtUserCloseClipboard(VOID) { BOOL bRet; - + UserEnterExclusive(); bRet = UserCloseClipboard(); UserLeave(); @@ -714,7 +714,7 @@ pWinStaObj = IntGetWinStaForCbAccess(); if (!pWinStaObj) goto cleanup; - + if (pWinStaObj->pClipBase == NULL) { iRet = 0; @@ -1002,7 +1002,7 @@ cleanup: if(pWinStaObj) ObDereferenceObject(pWinStaObj); - + UserLeave(); return hWndNext; Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -237,7 +237,7 @@ pwstrDesktop = wcschr(DesktopPath->Buffer, L'\\'); if(pwstrDesktop != NULL) { - *pwstrDesktop = 0; + *pwstrDesktop = 0; pwstrDesktop++; pwstrWinsta = DesktopPath->Buffer; } @@ -245,7 +245,7 @@ { pwstrDesktop = DesktopPath->Buffer; pwstrWinsta = NULL; - } + } TRACE("IntParseDesktopPath pwstrWinsta:%S pwstrDesktop:%S\n", pwstrWinsta, pwstrDesktop); } @@ -279,7 +279,7 @@ if(!pwstrDesktop) pwstrDesktop = L"Default"; } - + if(*hWinSta == NULL) { swprintf(wstrWinstaFullName, L"%wZ\\%ws", &gustrWindowStationsDir, pwstrWinsta); @@ -371,7 +371,7 @@ (PVOID*)Object, NULL); - TRACE("IntValidateDesktopHandle: handle:0x%x obj:0x%x access:0x%x Status:0x%x\n", + TRACE("IntValidateDesktopHandle: handle:0x%x obj:0x%x access:0x%x Status:0x%x\n", Desktop, *Object, DesiredAccess, Status); if (!NT_SUCCESS(Status)) @@ -1042,7 +1042,7 @@ /* * Try to open already existing desktop */ - + Status = ObOpenObjectByName( ObjectAttributes, ExDesktopObjectType, @@ -1087,7 +1087,7 @@ KernelMode, (PVOID)&DesktopObject, NULL); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { ERR("Failed to reference desktop object\n"); RETURN(NULL); @@ -1243,7 +1243,7 @@ { ExFreePoolWithTag(DesktopName.Buffer, TAG_STRING); } - if (!NoHooks && ptiCurrent) + if (!NoHooks && ptiCurrent) { ptiCurrent->TIF_flags &= ~TIF_DISABLEHOOKS; ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; @@ -1355,7 +1355,7 @@ dwDesiredAccess, ExDesktopObjectType, UserMode, - &hdesk); + (PHANDLE)&hdesk); ObDereferenceObject(pdesk); @@ -1818,12 +1818,12 @@ return FALSE; } } - + pdeskOld = pti->rpdesk; hdeskOld = pti->hdesk; pctiOld = pti->pcti; - /* do the switch */ + /* do the switch */ if(pdesk != NULL) { pti->rpdesk = pdesk; @@ -1855,7 +1855,7 @@ pci->pDeskInfo = NULL; pci->pClientThreadInfo = NULL; } - + /* clean up the old desktop */ if(pdeskOld != NULL) { Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -15,7 +15,7 @@ typedef struct _HOOKPACK { - PHOOK pHk; + PHOOK pHk; LPARAM lParam; PVOID pHookStructs; } HOOKPACK, *PHOOKPACK; @@ -42,7 +42,7 @@ { if(!Unload && !(ppi->W32PF_flags & W32PF_APIHOOKLOADED)) { - /* A callback in user mode can trigger UserLoadApiHook to be called and + /* A callback in user mode can trigger UserLoadApiHook to be called and as a result IntLoadHookModule will be called recursively. To solve this we set the flag that means that the appliaction has loaded the api hook before the callback and in case of error we remove it */ @@ -80,11 +80,11 @@ } /* -IntHookModuleUnloaded: -Sends a internal message to all threads of the requested desktop -and notifies them that a global hook was destroyed -and an injected module must be unloaded. -As a result, IntLoadHookModule will be called for all the threads that +IntHookModuleUnloaded: +Sends a internal message to all threads of the requested desktop +and notifies them that a global hook was destroyed +and an injected module must be unloaded. +As a result, IntLoadHookModule will be called for all the threads that will receive the special purpose internal message. */ BOOL @@ -106,7 +106,7 @@ /* FIXME: Do some more security checks here */ /* FIXME: The first check is a reactos specific hack for system threads */ - if(!PsIsSystemProcess(ptiCurrent->ppi->peProcess) && + if(!PsIsSystemProcess(ptiCurrent->ppi->peProcess) && ptiCurrent->ppi != ppiCsr) { if(ptiCurrent->ppi->W32PF_flags & W32PF_APIHOOKLOADED) @@ -129,8 +129,8 @@ return TRUE; } -BOOL -FASTCALL +BOOL +FASTCALL UserLoadApiHook() { return IntLoadHookModule(WH_APIHOOK, 0, FALSE); @@ -436,7 +436,7 @@ break; case HCBT_ACTIVATE: - Size = sizeof(CBTACTIVATESTRUCT); + Size = sizeof(CBTACTIVATESTRUCT); break; case HCBT_CREATEWND: /* Handle ANSI? */ @@ -876,8 +876,8 @@ } } - if (!BadChk) - { + if (!BadChk) + { lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)(lParam ? &EventMsg : NULL)); if (lParam) @@ -917,14 +917,14 @@ case WH_FOREGROUNDIDLE: case WH_KEYBOARD: case WH_SHELL: - lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); + lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); break; default: ERR("Unsupported HOOK Id -> %d\n",Hook->HookId); break; } - return lResult; + return lResult; } PHOOK @@ -932,7 +932,7 @@ IntGetHookObject(HHOOK hHook) { PHOOK Hook; - + if (!hHook) { EngSetLastError(ERROR_INVALID_HOOK_HANDLE); @@ -1274,7 +1274,7 @@ continue; } UserRefObjectCo(Hook, &Ref); - + /* Hook->Thread is null, we hax around this with Hook->head.pti. */ ptiHook = Hook->head.pti; @@ -1421,7 +1421,7 @@ HHOOK APIENTRY -NtUserSetWindowsHookAW( int idHook, +NtUserSetWindowsHookAW( int idHook, HOOKPROC lpfn, BOOL Ansi) { @@ -1523,7 +1523,7 @@ RETURN( NULL); } - if ( (ptiHook->TIF_flags & (TIF_CSRSSTHREAD|TIF_SYSTEMTHREAD)) && + if ( (ptiHook->TIF_flags & (TIF_CSRSSTHREAD|TIF_SYSTEMTHREAD)) && (HookId == WH_GETMESSAGE || HookId == WH_CALLWNDPROC || HookId == WH_CBT || @@ -1539,7 +1539,7 @@ } } else /* System-global hook */ - { + { ptiHook = pti; // gptiCurrent; if ( !Mod && (HookId == WH_GETMESSAGE || @@ -1570,7 +1570,7 @@ } ObDereferenceObject(WinStaObj); - Hook = UserCreateObject(gHandleTable, NULL, &Handle, otHook, sizeof(HOOK)); + Hook = UserCreateObject(gHandleTable, NULL, (PHANDLE)&Handle, otHook, sizeof(HOOK)); if (!Hook) { Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -750,7 +750,7 @@ if (hbm) GreDeleteObject(hbm); if (hdc) - UserReleaseDC(hWnd, hdc, FALSE); + UserReleaseDC(pWnd, hdc, FALSE); } /* Modified: trunk/reactos/win32ss/user/ntuser/misc/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc/r… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc/registry.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc/registry.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -33,7 +33,7 @@ NULL); /* Open the key */ - Status = ZwOpenKey(&hkey, KEY_READ, &ObjectAttributes); + Status = ZwOpenKey((PHANDLE)&hkey, KEY_READ, &ObjectAttributes); if (NT_SUCCESS(Status)) { *phkey = hkey; @@ -198,7 +198,7 @@ NULL); /* Open the key */ - Status = ZwOpenKey(&hkey, KEY_READ, &ObjectAttributes); + Status = ZwOpenKey((PHANDLE)&hkey, KEY_READ, &ObjectAttributes); if (!NT_SUCCESS(Status)) { return FALSE; @@ -292,7 +292,7 @@ Status = RtlAppendUnicodeToString(&usKeyName, pwszKeyName); if (!NT_SUCCESS(Status)) { - DPRINT1("RtlAppendUnicodeToString failed with Status=%lx, buf:%d,%d\n", + DPRINT1("RtlAppendUnicodeToString failed with Status=%lx, buf:%d,%d\n", Status, usKeyName.Length, usKeyName.MaximumLength); return FALSE; } @@ -305,7 +305,7 @@ NULL); /* Open or create the key */ - Status = ZwCreateKey(&hkey, + Status = ZwCreateKey((PHANDLE)&hkey, KEY_READ | KEY_WRITE, &ObjectAttributes, 0, Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -117,7 +117,7 @@ /* Get the screen DC */ if(!(hdcScreen = IntGetScreenDC())) { - return (HCURSOR)0; + return NULL; } OldCursor = MessageQueue->CursorObject; @@ -517,7 +517,7 @@ if (co_HOOK_CallHooks(WH_MOUSE_LL, HC_ACTION, Msg->message, (LPARAM) &MouseHookData)) return; } - + /* Get the desktop window */ pwndDesktop = UserGetDesktopWindow(); if (!pwndDesktop) return; @@ -1727,8 +1727,8 @@ 3: handle to the window whose messages are to be retrieved. */ if ( ( !Window || // 1 - ( Window == HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 - ( Window != HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 + ( Window->head.h == HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 + ( Window->head.h != HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { @@ -1790,8 +1790,8 @@ 3: handle to the window whose messages are to be retrieved. */ if ( ( !Window || // 1 - ( Window == HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 - ( Window != HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 + ( Window->head.h == HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 + ( Window->head.h != HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -188,7 +188,7 @@ RtlZeroMemory(psmwp->acvr, count * sizeof(CVR)); psmwp->bHandle = TRUE; psmwp->ccvr = 0; // actualCount - psmwp->ccvrAlloc = count; // suggestedCount + psmwp->ccvrAlloc = count; // suggestedCount RETURN((DWORD_PTR)hDwp); } @@ -634,7 +634,7 @@ UserRefObjectCo(Window, &Ref); HelpId = IntGetProp(Window, gpsi->atomContextHelpIdProp); - + UserDerefObjectCo(Window); UserLeave(); return (DWORD)HelpId->Data; @@ -665,7 +665,7 @@ switch (Routine) { case HWNDPARAM_ROUTINE_KILLSYSTEMTIMER: - return IntKillTimer(hWnd, (UINT_PTR)Param, TRUE); + return IntKillTimer(UserGetWindowObject(hWnd), (UINT_PTR)Param, TRUE); case HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID: { @@ -702,7 +702,7 @@ UserRefObjectCo(pWnd, &Ref); if (pWnd->head.pti->ppi == PsGetCurrentProcessWin32Process() && - pWnd->cbwndExtra == DLGWINDOWEXTRA && + pWnd->cbwndExtra == DLGWINDOWEXTRA && !(pWnd->state & WNDS_SERVERSIDEWINDOWPROC)) { if (Param) @@ -716,7 +716,7 @@ pWnd->state &= ~WNDS_DIALOGWINDOW; } } - + UserDerefObjectCo(pWnd); UserLeave(); return 0;

12 years, 7 months

[tkreuzer] 56477: [WIN32K] - Add some code stub and comments for realizing DIB brush palettes - Move some function prototypes

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 2 18:55:23 2012 New Revision: 56477 URL: http://svn.reactos.org/svn/reactos?rev=56477&view=rev Log: [WIN32K] - Add some code stub and comments for realizing DIB brush palettes - Move some function prototypes Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c trunk/reactos/win32ss/gdi/ntgdi/brush.h trunk/reactos/win32ss/gdi/ntgdi/intgdi.h Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Wed May 2 18:55:23 2012 @@ -38,6 +38,7 @@ pebo->ppalSurf = pebo->psurfTrg->ppal; GDIOBJ_vReferenceObjectByPointer(&pebo->ppalSurf->BaseObject); + //pebo->ppalDC = pdc->dclevel.ppal; if (pbrush->flAttrs & GDIBRUSH_IS_NULL) { @@ -194,6 +195,7 @@ PSURFACE psurfPattern, psurfMask; PPDEVOBJ ppdev = NULL; EXLATEOBJ exlo; + PPALETTE ppalPattern; /* All EBRUSHOBJs have a surface, see EBRUSHOBJ_vInit */ ASSERT(pebo->psurfTrg); @@ -214,9 +216,22 @@ /* FIXME: implement mask */ psurfMask = NULL; + /* DIB brushes with DIB_PAL_COLORS usage need a new palette */ + if (pebo->pbrush->flAttrs & GDIBRUSH_IS_DIBPALCOLORS) + { + ASSERT(FALSE); + ppalPattern = 0; //CreateDIBPalette(psurfPattern->ppal, pebo->ppalDC); + // pebo->ppalDIB = ppalPattern; + } + else + { + /* The palette is already as it should be */ + ppalPattern = psurfPattern->ppal; + } + /* Initialize XLATEOBJ for the brush */ EXLATEOBJ_vInitialize(&exlo, - psurfPattern->ppal, + ppalPattern, pebo->psurfTrg->ppal, 0, pebo->crCurrentBack, Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Wed May 2 18:55:23 2012 @@ -141,3 +141,16 @@ BOOL FASTCALL IntGdiSetBrushOwner(PBRUSH,DWORD); BOOL FASTCALL GreSetBrushOwner(HBRUSH,DWORD); +HBRUSH APIENTRY +IntGdiCreatePatternBrush( + HBITMAP hBitmap); + +HBRUSH APIENTRY +IntGdiCreateSolidBrush( + COLORREF Color); + +HBRUSH APIENTRY +IntGdiCreateNullBrush(VOID); + +VOID FASTCALL +IntGdiSetSolidBrushColor(HBRUSH hBrush, COLORREF Color); 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] Wed May 2 18:55:23 2012 @@ -4,20 +4,6 @@ extern HDC hSystemBM; extern HSEMAPHORE hsemDriverMgmt; - -HBRUSH APIENTRY -IntGdiCreatePatternBrush( - HBITMAP hBitmap); - -HBRUSH APIENTRY -IntGdiCreateSolidBrush( - COLORREF Color); - -HBRUSH APIENTRY -IntGdiCreateNullBrush(VOID); - -VOID FASTCALL -IntGdiSetSolidBrushColor(HBRUSH hBrush, COLORREF Color); /* Line functions */

12 years, 7 months

[tkreuzer] 56476: [WIN32K] - Fix a palette leak in DIB_CreateDIBSection - Remove PALETTE_AllocPalette and PALETTE_AllocPaletteIndexedRGB, use PALETTE_AllocPalWithHandle instead

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 2 13:56:55 2012 New Revision: 56476 URL: http://svn.reactos.org/svn/reactos?rev=56476&view=rev Log: [WIN32K] - Fix a palette leak in DIB_CreateDIBSection - Remove PALETTE_AllocPalette and PALETTE_AllocPaletteIndexedRGB, use PALETTE_AllocPalWithHandle instead Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/palette.c trunk/reactos/win32ss/gdi/ntgdi/palette.h 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] Wed May 2 13:56:55 2012 @@ -1599,7 +1599,14 @@ /* HACK */ if(hpal != (HPALETTE)0xFFFFFFFF) { - bmp->ppal = PALETTE_ShareLockPalette(hpal); + PPALETTE ppal = PALETTE_ShareLockPalette(hpal); + + if (ppal) + { + if (bmp->ppal) PALETTE_ShareUnlockPalette(bmp->ppal); + bmp->ppal = ppal; + } + /* Lazy delete hpal, it will be freed at surface release */ GreDeleteObject(hpal); } @@ -1771,10 +1778,11 @@ { WORD bits; ULONG ColorCount; - HPALETTE hPal; + HPALETTE hpal; + PPALETTE ppal; ULONG RedMask = 0, GreenMask = 0, BlueMask = 0; PDWORD pdwColors = (PDWORD)((PBYTE)bmi + bmi->bmiHeader.biSize); - INT paletteType; + ULONG paletteType, i; // Determine Bits Per Pixel bits = bmi->bmiHeader.biBitCount; @@ -1833,18 +1841,41 @@ ColorCount = bmi->bmiHeader.biClrUsed; } - if (PAL_INDEXED == paletteType) - { - hPal = PALETTE_AllocPaletteIndexedRGB(ColorCount, (RGBQUAD*)pdwColors); + if (paletteType == PAL_INDEXED) + { + RGBQUAD* pColors = (RGBQUAD*)((PBYTE)bmi + bmi->bmiHeader.biSize); + + /* Allocate a palette */ + ppal = PALETTE_AllocPalWithHandle(PAL_INDEXED, + ColorCount, + NULL, + 0, 0, 0); + if (!ppal) return NULL; + + /* Copy all colors */ + for (i = 0; i < ColorCount; i++) + { + ppal->IndexedColors[i].peRed = pColors[i].rgbRed; + ppal->IndexedColors[i].peGreen = pColors[i].rgbGreen; + ppal->IndexedColors[i].peBlue = pColors[i].rgbBlue; + ppal->IndexedColors[i].peFlags = 0; + } + + /* Get palette handle and unlock the palette */ + hpal = ppal->BaseObject.hHmgr; + PALETTE_UnlockPalette(ppal); } else { - hPal = PALETTE_AllocPalette(paletteType, 0, - NULL, - RedMask, GreenMask, BlueMask); - } - - return hPal; + ppal = PALETTE_AllocPalWithHandle(paletteType, 0, + NULL, + RedMask, GreenMask, BlueMask); + + hpal = ppal->BaseObject.hHmgr; + PALETTE_UnlockPalette(ppal); + } + + return hpal; } /* Converts a BITMAPCOREINFO to a BITMAPINFO structure, Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Wed May 2 13:56:55 2012 @@ -228,87 +228,6 @@ } return ppal; -} - -HPALETTE -FASTCALL -PALETTE_AllocPalette(ULONG Mode, - ULONG NumColors, - ULONG *Colors, - ULONG Red, - ULONG Green, - ULONG Blue) -{ - PPALETTE ppal; - HPALETTE hpal; - - ppal = PALETTE_AllocPalette2(Mode, NumColors, Colors, Red, Green, Blue); - if (!ppal) return NULL; - - hpal = GDIOBJ_hInsertObject(&ppal->BaseObject, GDI_OBJ_HMGR_POWNED); - if (!hpal) - { - DPRINT1("Could not insert palette into handle table.\n"); - GDIOBJ_vFreeObject(&ppal->BaseObject); - return NULL; - } - - PALETTE_UnlockPalette(ppal); - - return hpal; -} - -HPALETTE -FASTCALL -PALETTE_AllocPaletteIndexedRGB(ULONG NumColors, - CONST RGBQUAD *Colors) -{ - HPALETTE NewPalette; - PPALETTE PalGDI; - UINT i; - - PalGDI = (PPALETTE)GDIOBJ_AllocateObject(GDIObjType_PAL_TYPE, - sizeof(PALETTE), - BASEFLAG_LOOKASIDE); - if (!PalGDI) - { - DPRINT1("Could not allocate a palette.\n"); - return NULL; - } - - if (!GDIOBJ_hInsertObject(&PalGDI->BaseObject, GDI_OBJ_HMGR_POWNED)) - { - DPRINT1("Could not insert palette into handle table.\n"); - GDIOBJ_vFreeObject(&PalGDI->BaseObject); - return NULL; - } - - NewPalette = PalGDI->BaseObject.hHmgr; - - PalGDI->flFlags = PAL_INDEXED; - - PalGDI->IndexedColors = ExAllocatePoolWithTag(PagedPool, - sizeof(PALETTEENTRY) * NumColors, - TAG_PALETTE); - if (NULL == PalGDI->IndexedColors) - { - GDIOBJ_vDeleteObject(&PalGDI->BaseObject); - return NULL; - } - - for (i = 0; i < NumColors; i++) - { - PalGDI->IndexedColors[i].peRed = Colors[i].rgbRed; - PalGDI->IndexedColors[i].peGreen = Colors[i].rgbGreen; - PalGDI->IndexedColors[i].peBlue = Colors[i].rgbBlue; - PalGDI->IndexedColors[i].peFlags = 0; - } - - PalGDI->NumColors = NumColors; - - PALETTE_UnlockPalette(PalGDI); - - return NewPalette; } BOOL Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Wed May 2 13:56:55 2012 @@ -156,9 +156,3 @@ ULONG Red, ULONG Green, ULONG Blue); - -HPALETTE -FASTCALL -PALETTE_AllocPaletteIndexedRGB(ULONG NumColors, - CONST RGBQUAD *Colors); -

12 years, 7 months

[akhaldi] 56475: [WIN32SS] * Implement Ctrl+C support on MessageBox. Patch by Guido Pola (prodito {at} live [dot] com). See issue #5281 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed May 2 11:03:51 2012 New Revision: 56475 URL: http://svn.reactos.org/svn/reactos?rev=56475&view=rev Log: [WIN32SS] * Implement Ctrl+C support on MessageBox. Patch by Guido Pola (prodito {at} live [dot] com). See issue #5281 for more details. Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c trunk/reactos/win32ss/user/user32/windows/messagebox.c Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Wed May 2 11:03:51 2012 @@ -579,6 +579,18 @@ if (!IsWindow( hwnd )) return 0; break; } + + /* + * If the user is pressing Ctrl+C, send a WM_COPY message. + * TODO: Is there another way to check if the Dialog it's a MessageBox?. + */ + if( msg.message == WM_KEYDOWN && GetPropW(hwnd, L"ROS_MSGBOX") != NULL && + GetForegroundWindow() == hwnd ) + { + if( msg.wParam == L'C' && GetKeyState(VK_CONTROL) < 0 ) + SendMessageW( hwnd, WM_COPY, 0, 0); + } + if (!IsWindow( hwnd )) return 0; if (!(dlgInfo->flags & DF_END) && !IsDialogMessageW( hwnd, &msg)) { Modified: trunk/reactos/win32ss/user/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] Wed May 2 11:03:51 2012 @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ +/* * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/messagebox.c @@ -75,6 +75,114 @@ } MSGBOXINFO, *PMSGBOXINFO; /* INTERNAL FUNCTIONS ********************************************************/ + +static VOID MessageBoxTextToClipboard(HWND DialogWindow) +{ + HWND hwndText; + PMSGBOXINFO mbi; + int cchTotal, cchTitle, cchText, cchButton, i, n, cchBuffer; + LPWSTR pszBuffer, pszBufferPos, pMessageBoxText, pszTitle, pszText, pszButton; + WCHAR szButton[MSGBOXEX_MAXBTNSTR]; + HGLOBAL hGlobal; + + static const WCHAR szLine[30] = + {'-','-','-','-','-','-','-','-','-','-','-','-','-','-','-', + '-','-','-','-','-','-','-','-','-','-','-','-','\r','\n', 0}; + + mbi = (PMSGBOXINFO)GetPropW(DialogWindow, L"ROS_MSGBOX"); + hwndText = GetDlgItem(DialogWindow, MSGBOX_IDTEXT); + cchTitle = GetWindowTextLengthW(DialogWindow) + 1; + cchText = GetWindowTextLengthW(hwndText) + 1; + + if(!mbi) + return; + + pMessageBoxText = (LPWSTR)RtlAllocateHeap(GetProcessHeap(), 0, (cchTitle + cchText) * sizeof(WCHAR)); + + if(pMessageBoxText == NULL) + { + RtlFreeHeap(GetProcessHeap(), 0, pMessageBoxText); + return; + } + + pszTitle = pMessageBoxText; + pszText = pMessageBoxText + cchTitle; + + + + if(GetWindowTextW(DialogWindow, pszTitle, cchTitle) == 0 || + GetWindowTextW(hwndText, pszText, cchText) == 0) + { + RtlFreeHeap(GetProcessHeap(), 0, pMessageBoxText); + return; + } + + /* + * Calculate the total buffer size. + */ + cchTotal = 6 + cchTitle + cchText + (lstrlenW(szLine) * 4) + (mbi->nButtons * MSGBOXEX_MAXBTNSTR + 3); + + hGlobal = GlobalAlloc(GHND, cchTotal * sizeof(WCHAR)); + + pszBuffer = (LPWSTR)GlobalLock(hGlobal); + + if(pszBuffer == NULL) + { + RtlFreeHeap(GetProcessHeap(), 0, pMessageBoxText); + GlobalFree(hGlobal); + return; + } + + /* + * First format title and text. + * ------------------ + * Title + * ------------------ + * Text + * ------------------ + */ + cchBuffer = wsprintfW(pszBuffer, L"%s%s\r\n%s%s\r\n%s", szLine, pszTitle, szLine, pszText, szLine); + pszBufferPos = pszBuffer + cchBuffer; + + for(i = 0; i < mbi->nButtons; i++) + { + GetDlgItemTextW(DialogWindow, mbi->Btns[i], szButton, MSGBOXEX_MAXBTNSTR); + + cchButton = strlenW(szButton); + pszButton = szButton; + + /* Skip '&' character. */ + if(szButton[0] == '&') + { + pszButton = pszButton + 1; + cchButton = cchButton - 1; + } + + for(n = 0; n < cchButton; n++) + *(pszBufferPos++) = pszButton[n]; + + /* Add spaces. */ + *(pszBufferPos++) = L' '; + *(pszBufferPos++) = L' '; + *(pszBufferPos++) = L' '; + } + + wsprintfW(pszBufferPos, L"\r\n%s", szLine); + + GlobalUnlock(hGlobal); + + if(OpenClipboard(DialogWindow)) + { + EmptyClipboard(); + SetClipboardData(CF_UNICODETEXT, hGlobal); + CloseClipboard(); + } + else + { + GlobalFree(hGlobal); + } + RtlFreeHeap(GetProcessHeap(), 0, pMessageBoxText); +} static INT_PTR CALLBACK MessageBoxProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) @@ -139,6 +247,10 @@ return 0; } return 0; + + case WM_COPY: + MessageBoxTextToClipboard(hwnd); + return 0; case WM_HELP: mbi = (PMSGBOXINFO)GetPropW(hwnd, L"ROS_MSGBOX");

12 years, 7 months

[tkreuzer] 56474: [WIN32K] Modify DIB_MapPaletteColors, first allocating a palette without initializing the colors, then setting up the colors. This wway we don't need to allocate an intermediate b...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 2 10:09:05 2012 New Revision: 56474 URL: http://svn.reactos.org/svn/reactos?rev=56474&view=rev Log: [WIN32K] Modify DIB_MapPaletteColors, first allocating a palette without initializing the colors, then setting up the colors. This wway we don't need to allocate an intermediate buffer. 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] Wed May 2 10:09:05 2012 @@ -1725,14 +1725,14 @@ HPALETTE FASTCALL -DIB_MapPaletteColors(PPALETTE ppal, CONST BITMAPINFO* lpbmi) -{ - PALETTEENTRY* ppalEntries; +DIB_MapPaletteColors(PPALETTE ppalDc, CONST BITMAPINFO* lpbmi) +{ + PPALETTE ppalNew; ULONG nNumColors,i; USHORT *lpIndex; HPALETTE hpal; - if (!(ppal->flFlags & PAL_INDEXED)) + if (!(ppalDc->flFlags & PAL_INDEXED)) { return NULL; } @@ -1743,10 +1743,10 @@ nNumColors = min(nNumColors, lpbmi->bmiHeader.biClrUsed); } - ppalEntries = ExAllocatePoolWithTag(PagedPool, sizeof(PALETTEENTRY) * nNumColors, TAG_COLORMAP); - if (ppalEntries == NULL) - { - DPRINT1("Could not allocate palette entries\n"); + ppalNew = PALETTE_AllocPalWithHandle(PAL_INDEXED, nNumColors, NULL, 0, 0, 0); + if (ppalNew == NULL) + { + DPRINT1("Could not allocate palette\n"); return NULL; } @@ -1754,14 +1754,13 @@ for (i = 0; i < nNumColors; i++) { - ppalEntries[i] = ppal->IndexedColors[*lpIndex % ppal->NumColors]; - + ULONG iColorIndex = *lpIndex % ppalDc->NumColors; + ppalNew->IndexedColors[i] = ppalDc->IndexedColors[iColorIndex]; lpIndex++; } - hpal = PALETTE_AllocPalette(PAL_INDEXED, nNumColors, (ULONG*)ppalEntries, 0, 0, 0); - - ExFreePoolWithTag(ppalEntries, TAG_COLORMAP); + hpal = ppalNew->BaseObject.hHmgr; + PALETTE_UnlockPalette(ppalNew); return hpal; }

12 years, 7 months

[tkreuzer] 56473: [WIN32K] - Implement GreCreatePaletteInternal and make NtGdiCreatePaletteInternal safe regarding user mode memory access. - Allow allocating an indexed palette without initializin...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 2 09:46:07 2012 New Revision: 56473 URL: http://svn.reactos.org/svn/reactos?rev=56473&view=rev Log: [WIN32K] - Implement GreCreatePaletteInternal and make NtGdiCreatePaletteInternal safe regarding user mode memory access. - Allow allocating an indexed palette without initializing the colors - Implement PALETTE_AllocPalWithHandle - remove pointless Self member in PALETTE structure - cleanup palette.h a bit Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c trunk/reactos/win32ss/gdi/ntgdi/palette.c trunk/reactos/win32ss/gdi/ntgdi/palette.h Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Wed May 2 09:46:07 2012 @@ -138,9 +138,25 @@ ROS_DC_INFO rosdc; } DC; +extern PDC defaultDCstate; + /* Internal functions *********************************************************/ -extern PDC defaultDCstate; +/* dcobjs.c */ + +VOID FASTCALL DC_vUpdateFillBrush(PDC pdc); +VOID FASTCALL DC_vUpdateLineBrush(PDC pdc); +VOID FASTCALL DC_vUpdateTextBrush(PDC pdc); +VOID FASTCALL DC_vUpdateBackgroundBrush(PDC pdc); + +HPALETTE +NTAPI +GdiSelectPalette( + HDC hDC, + HPALETTE hpal, + BOOL ForceBackground); + + INIT_FUNCTION NTSTATUS NTAPI InitDcImpl(VOID); PPDEVOBJ FASTCALL IntEnumHDev(VOID); @@ -152,10 +168,6 @@ BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest); VOID FASTCALL DC_vUpdateViewportExt(PDC pdc); VOID FASTCALL DC_vCopyState(PDC pdcSrc, PDC pdcDst, BOOL to); -VOID FASTCALL DC_vUpdateFillBrush(PDC pdc); -VOID FASTCALL DC_vUpdateLineBrush(PDC pdc); -VOID FASTCALL DC_vUpdateTextBrush(PDC pdc); -VOID FASTCALL DC_vUpdateBackgroundBrush(PDC pdc); VOID FASTCALL DC_vFinishBlit(PDC pdc1, PDC pdc2); VOID FASTCALL DC_vPrepareDCsForBlit(PDC pdc1, RECT rc1, PDC pdc2, RECT rc2); @@ -177,6 +189,7 @@ BOOL FASTCALL IntSetDefaultRegion(PDC); BOOL NTAPI GreSetDCOwner(HDC hdc, ULONG ulOwner); + FORCEINLINE PDC DC_LockDc(HDC hdc) Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Wed May 2 09:46:07 2012 @@ -139,7 +139,7 @@ } HPALETTE -FASTCALL +NTAPI GdiSelectPalette( HDC hDC, HPALETTE hpal, Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Wed May 2 09:46:07 2012 @@ -83,7 +83,8 @@ palPtr->palPalEntry[i].peFlags = 0; } - hpalette = NtGdiCreatePaletteInternal(palPtr,NB_RESERVED_COLORS); + hpalette = GreCreatePaletteInternal(palPtr,NB_RESERVED_COLORS); + ASSERT(hpalette); ExFreePoolWithTag(palPtr, TAG_PALETTE); /* palette_size = visual->map_entries; */ @@ -164,10 +165,9 @@ return NULL; } - PalGDI->Self = PalGDI->BaseObject.hHmgr; PalGDI->flFlags = Mode; - if (NULL != Colors) + if (NumColors > 0) { PalGDI->IndexedColors = ExAllocatePoolWithTag(PagedPool, sizeof(PALETTEENTRY) * NumColors, @@ -177,7 +177,7 @@ GDIOBJ_vDeleteObject(&PalGDI->BaseObject); return NULL; } - RtlCopyMemory(PalGDI->IndexedColors, Colors, sizeof(PALETTEENTRY) * NumColors); + if (Colors) RtlCopyMemory(PalGDI->IndexedColors, Colors, sizeof(PALETTEENTRY) * NumColors); } if (Mode & PAL_INDEXED) @@ -203,6 +203,33 @@ return PalGDI; } +PPALETTE +NTAPI +PALETTE_AllocPalWithHandle( + _In_ ULONG iMode, + _In_ ULONG cColors, + _In_ PULONG pulColors, + _In_ FLONG flRed, + _In_ FLONG flGreen, + _In_ FLONG flBlue) +{ + PPALETTE ppal; + + /* Allocate the palette without a handle */ + ppal = PALETTE_AllocPalette2(iMode, cColors, pulColors, flRed, flGreen, flBlue); + if (!ppal) return NULL; + + /* Insert the palette into the handle table */ + if (!GDIOBJ_hInsertObject(&ppal->BaseObject, GDI_OBJ_HMGR_POWNED)) + { + DPRINT1("Could not insert palette into handle table.\n"); + GDIOBJ_vFreeObject(&ppal->BaseObject); + return NULL; + } + + return ppal; +} + HPALETTE FASTCALL PALETTE_AllocPalette(ULONG Mode, @@ -258,7 +285,6 @@ NewPalette = PalGDI->BaseObject.hHmgr; - PalGDI->Self = NewPalette; PalGDI->flFlags = PAL_INDEXED; PalGDI->IndexedColors = ExAllocatePoolWithTag(PagedPool, @@ -285,11 +311,12 @@ return NewPalette; } -BOOL NTAPI +BOOL +NTAPI PALETTE_Cleanup(PVOID ObjectBody) { PPALETTE pPal = (PPALETTE)ObjectBody; - if (NULL != pPal->IndexedColors) + if (pPal->IndexedColors && pPal->IndexedColors != pPal->apalColors) { ExFreePoolWithTag(pPal->IndexedColors, TAG_PALETTE); } @@ -297,7 +324,8 @@ return TRUE; } -INT FASTCALL +INT +FASTCALL PALETTE_GetObject(PPALETTE ppal, INT cbCount, LPLOGBRUSH lpBuffer) { if (!lpBuffer) @@ -318,8 +346,8 @@ ULONG i, ulBestIndex = 0; PALETTEENTRY peColor = *(PPALETTEENTRY)&iColor; - /* Loop all palette entries, break on exact match */ - for (i = 0; i < ppal->NumColors && ulMinimalDiff != 0; i++) + /* Loop all palette entries */ + for (i = 0; i < ppal->NumColors; i++) { /* Calculate distance in the color cube */ ulDiff = peColor.peRed - ppal->IndexedColors[i].peRed; @@ -334,6 +362,9 @@ { ulBestIndex = i; ulMinimalDiff = ulColorDiff; + + /* Break on exact match */ + if (ulMinimalDiff == 0) break; } } @@ -476,7 +507,6 @@ PALETTE *PalGDI; PalGDI = (PALETTE*)PalObj; - /* PalGDI = (PALETTE*)AccessInternalObjectFromUserObject(PalObj); */ if (Start >= PalGDI->NumColors) return 0; @@ -494,39 +524,75 @@ /** Systemcall Interface ******************************************************/ + +HPALETTE +NTAPI +GreCreatePaletteInternal( + IN LPLOGPALETTE pLogPal, + IN UINT cEntries) +{ + HPALETTE hpal = NULL; + PPALETTE ppal; + + pLogPal->palNumEntries = cEntries; + ppal = PALETTE_AllocPalWithHandle(PAL_INDEXED, + cEntries, + (PULONG)pLogPal->palPalEntry, + 0, 0, 0); + + if (ppal != NULL) + { + PALETTE_ValidateFlags(ppal->IndexedColors, ppal->NumColors); + + hpal = ppal->BaseObject.hHmgr; + PALETTE_UnlockPalette(ppal); + } + + return hpal; +} /* * @implemented */ -HPALETTE APIENTRY -NtGdiCreatePaletteInternal ( IN LPLOGPALETTE pLogPal, IN UINT cEntries ) -{ - PPALETTE PalGDI; - HPALETTE NewPalette; - - pLogPal->palNumEntries = cEntries; - NewPalette = PALETTE_AllocPalette( PAL_INDEXED, - cEntries, - (PULONG)pLogPal->palPalEntry, - 0, 0, 0); - - if (NewPalette == NULL) +HPALETTE +APIENTRY +NtGdiCreatePaletteInternal( + IN LPLOGPALETTE plogpalUser, + IN UINT cEntries) +{ + HPALETTE hpal = NULL; + PPALETTE ppal; + ULONG i, cjSize; + + ppal = PALETTE_AllocPalWithHandle(PAL_INDEXED, cEntries, NULL, 0, 0, 0); + if (ppal == NULL) { return NULL; } - PalGDI = (PPALETTE) PALETTE_ShareLockPalette(NewPalette); - if (PalGDI != NULL) - { - PALETTE_ValidateFlags(PalGDI->IndexedColors, PalGDI->NumColors); - PALETTE_ShareUnlockPalette(PalGDI); - } - else - { - /* FIXME: Handle PalGDI == NULL!!!! */ - DPRINT1("PalGDI is NULL\n"); - } - return NewPalette; + cjSize = FIELD_OFFSET(LOGPALETTE, palPalEntry[cEntries]); + + _SEH2_TRY + { + ProbeForRead(plogpalUser, cjSize, 1); + + for (i = 0; i < cEntries; i++) + { + ppal->IndexedColors[i] = plogpalUser->palPalEntry[i]; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + GDIOBJ_vDeleteObject(&ppal->BaseObject); + _SEH2_YIELD(return NULL); + } + _SEH2_END; + + PALETTE_ValidateFlags(ppal->IndexedColors, cEntries); + hpal = ppal->BaseObject.hHmgr; + PALETTE_UnlockPalette(ppal); + + return hpal; } HPALETTE APIENTRY NtGdiCreateHalftonePalette(HDC hDC) @@ -629,7 +695,7 @@ } } - return NtGdiCreatePaletteInternal((LOGPALETTE *)&Palette, Palette.NumberOfEntries); + return GreCreatePaletteInternal((LOGPALETTE *)&Palette, Palette.NumberOfEntries); } BOOL Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Wed May 2 09:46:07 2012 @@ -1,10 +1,4 @@ #pragma once - -#define PALETTE_FIXED 0x0001 /* read-only colormap - have to use XAllocColor (if not virtual) */ -#define PALETTE_VIRTUAL 0x0002 /* no mapping needed - pixel == pixel color */ - -#define PALETTE_PRIVATE 0x1000 /* private colormap, identity mapping */ -#define PALETTE_WHITESET 0x2000 // Palette mode flags #ifndef __WINDDI_H // Defined in ddk/winddi.h @@ -28,61 +22,101 @@ #define PAL_RGB16_565 0x00400000 // 16-bit RGB in 565 format #define PAL_GAMMACORRECTION 0x00800000 // Correct colors - typedef struct _PALETTE { - /* Header for all gdi objects in the handle table. - Do not (re)move this. */ - BASEOBJECT BaseObject; + /* Header for all gdi objects in the handle table. + Do not (re)move this. */ + BASEOBJECT BaseObject; - PALOBJ PalObj; - XLATEOBJ *logicalToSystem; - HPALETTE Self; - FLONG flFlags; // PAL_INDEXED, PAL_BITFIELDS, PAL_RGB, PAL_BGR - ULONG NumColors; - PALETTEENTRY *IndexedColors; - ULONG RedMask; - ULONG GreenMask; - ULONG BlueMask; - ULONG ulRedShift; - ULONG ulGreenShift; - ULONG ulBlueShift; - HDEV hPDev; + PALOBJ PalObj; + XLATEOBJ *logicalToSystem; + FLONG flFlags; // PAL_INDEXED, PAL_BITFIELDS, PAL_RGB, PAL_BGR + ULONG NumColors; + PALETTEENTRY *IndexedColors; + ULONG RedMask; + ULONG GreenMask; + ULONG BlueMask; + ULONG ulRedShift; + ULONG ulGreenShift; + ULONG ulBlueShift; + HDEV hPDev; + PALETTEENTRY apalColors[0]; } PALETTE; extern PALETTE gpalRGB, gpalBGR, gpalMono, gpalRGB555, gpalRGB565, *gppalDefault; extern PPALETTE appalSurfaceDefault[]; -HPALETTE FASTCALL PALETTE_AllocPalette(ULONG Mode, - ULONG NumColors, - ULONG *Colors, - ULONG Red, - ULONG Green, - ULONG Blue); -HPALETTE FASTCALL PALETTE_AllocPaletteIndexedRGB(ULONG NumColors, - CONST RGBQUAD *Colors); -#define PALETTE_FreePalette(pPalette) GDIOBJ_FreeObj((POBJ)pPalette, GDIObjType_PAL_TYPE) -#define PALETTE_FreePaletteByHandle(hPalette) GDIOBJ_FreeObjByHandle((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE) #define PALETTE_UnlockPalette(pPalette) GDIOBJ_vUnlockObject((POBJ)pPalette) - #define PALETTE_ShareLockPalette(hpal) \ ((PPALETTE)GDIOBJ_ShareLockObj((HGDIOBJ)hpal, GDI_OBJECT_TYPE_PALETTE)) #define PALETTE_ShareUnlockPalette(ppal) \ GDIOBJ_vDereferenceObject(&ppal->BaseObject) -BOOL NTAPI PALETTE_Cleanup(PVOID ObjectBody); -INIT_FUNCTION NTSTATUS NTAPI InitPaletteImpl(VOID); -VOID FASTCALL PALETTE_ValidateFlags (PALETTEENTRY* lpPalE, INT size); -INT FASTCALL PALETTE_ToPhysical (PDC dc, COLORREF color); +INIT_FUNCTION +NTSTATUS +NTAPI +InitPaletteImpl(VOID); -INT FASTCALL PALETTE_GetObject(PPALETTE pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer); -ULONG NTAPI PALETTE_ulGetNearestPaletteIndex(PALETTE* ppal, ULONG iColor); -ULONG NTAPI PALETTE_ulGetNearestIndex(PALETTE* ppal, ULONG iColor); -ULONG NTAPI PALETTE_ulGetNearestBitFieldsIndex(PALETTE* ppal, ULONG ulColor); -VOID NTAPI PALETTE_vGetBitMasks(PPALETTE ppal, PULONG pulColors); +PPALETTE +NTAPI +PALETTE_AllocPalette2( + _In_ ULONG iMode, + _In_ ULONG cColors, + _In_ PULONG pulColors, + _In_ FLONG flRed, + _In_ FLONG flGreen, + _In_ FLONG flBlue); -PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID); -HPALETTE FASTCALL GdiSelectPalette(HDC, HPALETTE, BOOL); +PPALETTE +NTAPI +PALETTE_AllocPalWithHandle( + _In_ ULONG iMode, + _In_ ULONG cColors, + _In_ PULONG pulColors, + _In_ FLONG flRed, + _In_ FLONG flGreen, + _In_ FLONG flBlue); + +VOID +FASTCALL +PALETTE_ValidateFlags( + PALETTEENTRY* lpPalE, + INT size); + +INT +FASTCALL +PALETTE_GetObject( + PPALETTE pGdiObject, + INT cbCount, + LPLOGBRUSH lpBuffer); + +ULONG +NTAPI +PALETTE_ulGetNearestPaletteIndex( + PPALETTE ppal, + ULONG iColor); + +ULONG +NTAPI +PALETTE_ulGetNearestIndex( + PPALETTE ppal, + ULONG iColor); + +ULONG +NTAPI +PALETTE_ulGetNearestBitFieldsIndex( + PPALETTE ppal, + ULONG ulColor); + +VOID +NTAPI +PALETTE_vGetBitMasks( + PPALETTE ppal, + PULONG pulColors); + +BOOL +NTAPI +PALETTE_Cleanup(PVOID ObjectBody); ULONG FORCEINLINE @@ -106,3 +140,25 @@ ppal->IndexedColors[ulIndex].peBlue); } +HPALETTE +NTAPI +GreCreatePaletteInternal( + IN LPLOGPALETTE pLogPal, + IN UINT cEntries); + +//// + +HPALETTE +FASTCALL +PALETTE_AllocPalette(ULONG Mode, + ULONG NumColors, + ULONG *Colors, + ULONG Red, + ULONG Green, + ULONG Blue); + +HPALETTE +FASTCALL +PALETTE_AllocPaletteIndexedRGB(ULONG NumColors, + CONST RGBQUAD *Colors); +

12 years, 7 months

[tkreuzer] 56472: [CMD] Fix a typo

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 1 21:03:06 2012 New Revision: 56472 URL: http://svn.reactos.org/svn/reactos?rev=56472&view=rev Log: [CMD] Fix a typo Modified: trunk/reactos/base/shell/cmd/echo.c Modified: trunk/reactos/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/echo.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] Tue May 1 21:03:06 2012 @@ -83,7 +83,7 @@ { /* skip the first character */ ConOutPuts(param + 1); - ConOutPuts("\n"); + ConOutPuts(_T("\n")); } return 0; }

12 years, 7 months

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 May 2012