Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[tkreuzer] 50354: [CRT] Improve code readability a bit

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 11 12:17:46 2011 New Revision: 50354 URL: http://svn.reactos.org/svn/reactos?rev=50354&view=rev Log: [CRT] Improve code readability a bit Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Tue Jan 11 12:17:46 2011 @@ -14,10 +14,15 @@ #include <float.h> #ifdef _UNICODE -#define streamout wstreamout -#define format_float format_floatw -#define _flsbuf _flswbuf +# define streamout wstreamout +# define format_float format_floatw +# define _flsbuf _flswbuf int __cdecl _flswbuf(int ch, FILE *stream); +#endif + +#ifdef _LIBCNT_ +# undef _flsbuf +# define _flsbuf(chr, stream) _TEOF #endif #define MB_CUR_MAX 10 @@ -68,11 +73,6 @@ #define va_arg_ffp(argptr, flags) \ (flags & FLAG_LONGDOUBLE) ? va_arg(argptr, long double) : \ va_arg(argptr, double) - -#ifdef _LIBCNT_ -# undef _flsbuf -# define _flsbuf(chr, stream) _TEOF -#endif #define get_exp(f) floor(f == 0 ? 0 : (f >= 0 ? log10(f) : log10(-f))) #define round(x) floor((x) + 0.5)

13 years, 10 months

[akhaldi] 50353: [CMAKE] - Fix wmi and drmk entry points. - Don't use both reactos and wine debug headers in iphlpapi. Fixes the macro redefinition warnings.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 10 20:59:17 2011 New Revision: 50353 URL: http://svn.reactos.org/svn/reactos?rev=50353&view=rev Log: [CMAKE] - Fix wmi and drmk entry points. - Don't use both reactos and wine debug headers in iphlpapi. Fixes the macro redefinition warnings. Modified: branches/cmake-bringup/dll/win32/iphlpapi/dhcp_reactos.c branches/cmake-bringup/dll/win32/iphlpapi/ifenum_reactos.c branches/cmake-bringup/dll/win32/iphlpapi/registry.c branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt branches/cmake-bringup/drivers/wmi/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/iphlpapi/dhcp_reactos.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpap… ============================================================================== --- branches/cmake-bringup/dll/win32/iphlpapi/dhcp_reactos.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/iphlpapi/dhcp_reactos.c [iso-8859-1] Mon Jan 10 20:59:17 2011 @@ -11,9 +11,6 @@ #include "dhcpcsdk.h" #include "dhcpcapi.h" #include <assert.h> - -#define NDEBUG -#include "debug.h" DWORD APIENTRY DhcpRosGetAdapterInfo(DWORD AdapterIndex, PBOOL DhcpEnabled, Modified: branches/cmake-bringup/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpap… ============================================================================== --- branches/cmake-bringup/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] Mon Jan 10 20:59:17 2011 @@ -40,9 +40,6 @@ #include "ifenum.h" #include <assert.h> -//#define NDEBUG -#include "debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); /* Functions */ Modified: branches/cmake-bringup/dll/win32/iphlpapi/registry.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpap… ============================================================================== --- branches/cmake-bringup/dll/win32/iphlpapi/registry.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/iphlpapi/registry.c [iso-8859-1] Mon Jan 10 20:59:17 2011 @@ -1,6 +1,4 @@ #include "iphlpapi_private.h" - -#include "debug.h" int GetLongestChildKeyName( HANDLE RegHandle ) { LONG Status; Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Mon Jan 10 20:59:17 2011 @@ -11,6 +11,7 @@ add_library(drmk SHARED ${SOURCE}) set_module_type(drmk kernelmodedriver) +set_entrypoint(drmk 0) add_importlibs(drmk ntoskrnl) add_importlib_target(drmk.spec drmk.sys) Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMake… ============================================================================== --- branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Mon Jan 10 20:59:17 2011 @@ -9,7 +9,7 @@ add_library(wmilib SHARED ${SOURCE}) set_module_type(wmilib kernelmodedriver) - +set_entrypoint(wmilib 0) add_importlibs(wmilib ntoskrnl) add_importlib_target(wmilib.spec wmilib.sys)

13 years, 10 months

[tkreuzer] 50352: [WIN32K] Remove debugging code.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 10 09:53:56 2011 New Revision: 50352 URL: http://svn.reactos.org/svn/reactos?rev=50352&view=rev Log: [WIN32K] Remove debugging code. Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Mon Jan 10 09:53:56 2011 @@ -3565,9 +3565,6 @@ if (!NT_SUCCESS(Status)) { EngSetLastError(ERROR_INVALID_PARAMETER); - DbgPrint("Region == %p\n", Region); - __debugbreak(); - ASSERT(FALSE); RGNOBJAPI_Unlock(Region); GreDeleteObject(hRgn); return NULL;

13 years, 10 months

[jimtabor] 50351: [Win32k] - Implement NtGdiCreateMetafileDC. - Since most of the gdi work I committed is being reverted or if'ed out of existence, this will be the last.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jan 10 01:36:14 2011 New Revision: 50351 URL: http://svn.reactos.org/svn/reactos?rev=50351&view=rev Log: [Win32k] - Implement NtGdiCreateMetafileDC. - Since most of the gdi work I committed is being reverted or if'ed out of existence, this will be the last. Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/metafile.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/metafile.c [iso-8859-1] Mon Jan 10 01:36:14 2011 @@ -28,213 +28,29 @@ } /* - * @unimplemented + * @implemented */ HDC APIENTRY NtGdiCreateMetafileDC(IN HDC hdc) { + PDC pDc; + HDC ret = NULL; - UNIMPLEMENTED; - return NULL; - - -#if 0 - PDC Dc; - HDC ret = NULL; - DWORD length = 0; - HDC tempHDC; - DWORD MemSize; - DWORD dwDesiredAccess; - - tempHDC = hDCRef; - if (hDCRef == NULL) + if (hdc) { - /* FIXME ?? - * Shall we create hdc NtGdiHdcCompatible hdc ?? - */ - UNICODE_STRING DriverName; - RtlInitUnicodeString(&DriverName, L"DISPLAY"); - //IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); - tempHDC = NtGdiOpenDCW( &DriverName, - NULL, - NULL, - 0, // DCW 0 and ICW 1. - NULL, - (PVOID) NULL, - (PVOID) NULL ); - } - - GDIOBJ_SetOwnership(GdiHandleTable, tempHDC, PsGetCurrentProcess()); - DC_SetOwnership(tempHDC, PsGetCurrentProcess()); - - Dc = DC_LockDc(tempHDC); - if (Dc == NULL) - { - if (hDCRef == NULL) - { - NtGdiDeleteObjectApp(tempHDC); - } - EngSetLastError(ERROR_INVALID_HANDLE); - return NULL; - } - - if(Description) - { - length = wcslen(Description); - length += wcslen(Description + length + 1); - length += 3; - length *= 2; - } - - MemSize = sizeof(ENHMETAHEADER) + (length + 3) / 4 * 4; - - if (!(Dc->emh = EngAllocMem(FL_ZERO_MEMORY, MemSize, 0))) - { - DC_UnlockDc(Dc); - if (hDCRef == NULL) - { - NtGdiDeleteObjectApp(tempHDC); - } - EngSetLastError(ERROR_INVALID_HANDLE); - return NULL; - } - - Dc->emh->iType = EMR_HEADER; - Dc->emh->nSize = MemSize; - - Dc->emh->rclBounds.left = Dc->emh->rclBounds.top = 0; - Dc->emh->rclBounds.right = Dc->emh->rclBounds.bottom = -1; - - if(Rect) - { - Dc->emh->rclFrame.left = Rect->left; - Dc->emh->rclFrame.top = Rect->top; - Dc->emh->rclFrame.right = Rect->right; - Dc->emh->rclFrame.bottom = Rect->bottom; + pDc = DC_LockDc(hdc); + if (pDc) + { // Not sure this is right for getting the HDEV handle, maybe Timo could help or just if'ed it out. + ret = IntGdiCreateDisplayDC(pDc->ppdev->BaseObject.hHmgr, DC_TYPE_INFO, TRUE); + DC_UnlockDc(pDc); + } } else { - /* Set this to {0,0 - -1,-1} and update it at the end */ - Dc->emh->rclFrame.left = Dc->emh->rclFrame.top = 0; - Dc->emh->rclFrame.right = Dc->emh->rclFrame.bottom = -1; + ret = UserGetDesktopDC(DC_TYPE_INFO, TRUE, FALSE); } - - Dc->emh->dSignature = ENHMETA_SIGNATURE; - Dc->emh->nVersion = 0x10000; - Dc->emh->nBytes = Dc->emh->nSize; - Dc->emh->nRecords = 1; - Dc->emh->nHandles = 1; - - Dc->emh->sReserved = 0; /* According to docs, this is reserved and must be 0 */ - Dc->emh->nDescription = length / 2; - - Dc->emh->offDescription = length ? sizeof(ENHMETAHEADER) : 0; - - Dc->emh->nPalEntries = 0; /* I guess this should start at 0 */ - - /* Size in pixels */ - Dc->emh->szlDevice.cx = NtGdiGetDeviceCaps(tempHDC, HORZRES); - Dc->emh->szlDevice.cy = NtGdiGetDeviceCaps(tempHDC, VERTRES); - - /* Size in millimeters */ - Dc->emh->szlMillimeters.cx = NtGdiGetDeviceCaps(tempHDC, HORZSIZE); - Dc->emh->szlMillimeters.cy = NtGdiGetDeviceCaps(tempHDC, VERTSIZE); - - /* Size in micrometers */ - Dc->emh->szlMicrometers.cx = Dc->emh->szlMillimeters.cx * 1000; - Dc->emh->szlMicrometers.cy = Dc->emh->szlMillimeters.cy * 1000; - - if(Description) - { - memcpy((char *)Dc->emh + sizeof(ENHMETAHEADER), Description, length); - } - - ret = tempHDC; - if (File) - { - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - IO_STATUS_BLOCK Iosb; - UNICODE_STRING NtPathU; - NTSTATUS Status; - ULONG FileAttributes = (FILE_ATTRIBUTE_VALID_FLAGS & ~FILE_ATTRIBUTE_DIRECTORY); - - DPRINT1("Trying Create EnhMetaFile\n"); - - /* disk based metafile */ - dwDesiredAccess = GENERIC_WRITE | GENERIC_READ | SYNCHRONIZE | FILE_READ_ATTRIBUTES; - - if (!RtlDosPathNameToNtPathName_U (File, &NtPathU, NULL, NULL)) - { - DC_UnlockDc(Dc); - if (hDCRef == NULL) - { - NtGdiDeleteObjectApp(tempHDC); - } - DPRINT1("Can not Create EnhMetaFile\n"); - EngSetLastError(ERROR_PATH_NOT_FOUND); - return NULL; - } - - InitializeObjectAttributes(&ObjectAttributes, &NtPathU, 0, NULL, NULL); - - Status = NtCreateFile (&Dc->hFile, dwDesiredAccess, &ObjectAttributes, &IoStatusBlock, - NULL, FileAttributes, 0, FILE_OVERWRITE_IF, FILE_NON_DIRECTORY_FILE, - NULL, 0); - - RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathU.Buffer); - - if (!NT_SUCCESS(Status)) - { - Dc->hFile = NULL; - DC_UnlockDc(Dc); - if (hDCRef == NULL) - { - NtGdiDeleteObjectApp(tempHDC); - } - DPRINT1("Create EnhMetaFile fail\n"); - EngSetLastError(ERROR_INVALID_HANDLE); - return NULL; - } - - EngSetLastError(IoStatusBlock.Information == FILE_OVERWRITTEN ? ERROR_ALREADY_EXISTS : 0); - - Status = NtWriteFile(Dc->hFile, NULL, NULL, NULL, &Iosb, (PVOID)&Dc->emh, Dc->emh->nSize, NULL, NULL); - if (Status == STATUS_PENDING) - { - Status = NtWaitForSingleObject(Dc->hFile,FALSE,NULL); - if (NT_SUCCESS(Status)) - { - Status = Iosb.Status; - } - } - - if (NT_SUCCESS(Status)) - { - ret = tempHDC; - DC_UnlockDc(Dc); - } - else - { - Dc->hFile = NULL; - DPRINT1("Write to EnhMetaFile fail\n"); - EngSetLastError(ERROR_CAN_NOT_COMPLETE); - ret = NULL; - DC_UnlockDc(Dc); - if (hDCRef == NULL) - { - NtGdiDeleteObjectApp(tempHDC); - } - } - } - else - { - DC_UnlockDc(Dc); - } - - return ret; -#endif + return ret; } /*

13 years, 10 months

[jimtabor] 50350: [Win32k] - Win32k implementation of GetCharacterPlacementW, work is dedicated to the late Professor John Collins.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jan 10 01:30:17 2011 New Revision: 50350 URL: http://svn.reactos.org/svn/reactos?rev=50350&view=rev Log: [Win32k] - Win32k implementation of GetCharacterPlacementW, work is dedicated to the late Professor John Collins. Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Mon Jan 10 01:30:17 2011 @@ -75,6 +75,19 @@ return Count; } +/* + + It is recommended that an application use the GetFontLanguageInfo function + to determine whether the GCP_DIACRITIC, GCP_DBCS, GCP_USEKERNING, GCP_LIGATE, + GCP_REORDER, GCP_GLYPHSHAPE, and GCP_KASHIDA values are valid for the + currently selected font. If not valid, GetCharacterPlacement ignores the + value. + + M$ must use a preset "compiled in" support for each language based releases. + ReactOS uses FreeType, this will need to be supported. ATM this is hard coded + for GCPCLASS_LATIN! + + */ #if 0 DWORD FASTCALL @@ -86,16 +99,166 @@ LPGCP_RESULTSW pgcpw, DWORD dwFlags) { + GCP_RESULTSW gcpwSave; + UINT i, nSet, cSet; + INT *tmpDxCaretPos; + LONG Cx; SIZE Size = {0,0}; - - if (!pgcpw) - { - if (GreGetTextExtentW( hdc, pwsz, nCount, &Size, 0)) - return MAKELONG(Size.cx, Size.cy); + + DPRINT1("GreGCPW Start\n"); + + if (!pgcpw) + { + if (GreGetTextExtentW( hdc, pwsz, nCount, &Size, 1)) + return MAKELONG(Size.cx, Size.cy); + return 0; + } + + DPRINT1("GreGCPW 1\n"); + + RtlCopyMemory(&gcpwSave, pgcpw, sizeof(GCP_RESULTSW)); + + cSet = nSet = nCount; + + if ( nCount > gcpwSave.nGlyphs ) cSet = gcpwSave.nGlyphs; + + /* GCP_JUSTIFY may only be used in conjunction with GCP_MAXEXTENT. */ + if ( dwFlags & GCP_JUSTIFY) dwFlags |= GCP_MAXEXTENT; + + if ( !gcpwSave.lpDx && gcpwSave.lpCaretPos ) + tmpDxCaretPos = gcpwSave.lpCaretPos; + else + tmpDxCaretPos = gcpwSave.lpDx; + + if ( !GreGetTextExtentExW( hdc, + pwsz, + cSet, + nMaxExtent, + ((dwFlags & GCP_MAXEXTENT) ? (PULONG) &cSet : NULL), + (PULONG) tmpDxCaretPos, + &Size, + 0) ) + { return 0; } - UNIMPLEMENTED; - return 0; + + DPRINT1("GreGCPW 2\n"); + + nSet = cSet; + + if ( tmpDxCaretPos && nSet > 0) + { + for (i = (nSet - 1); i > 0; i--) + { + tmpDxCaretPos[i] -= tmpDxCaretPos[i - 1]; + } + } + + if ( !(dwFlags & GCP_MAXEXTENT) || nSet ) + { + if ( (dwFlags & GCP_USEKERNING) && + ( gcpwSave.lpDx || + gcpwSave.lpCaretPos ) && + nSet >= 2 ) + { + DWORD Count; + LPKERNINGPAIR pKP; + + Count = GreGetKerningPairs( hdc, 0, NULL); + if (Count) + { + pKP = ExAllocatePoolWithTag(PagedPool, Count * sizeof(KERNINGPAIR), GDITAG_TEXT); + if (pKP) + { + if ( GreGetKerningPairs( hdc, Count, pKP) != Count) + { + ExFreePoolWithTag( pKP, GDITAG_TEXT); + return 0; + } + + if ( (ULONG_PTR)(pKP) < ((ULONG_PTR)(pKP) + (ULONG_PTR)(Count * sizeof(KERNINGPAIR))) ) + { + DPRINT1("We Need to Do Something HERE!\n"); + } + + ExFreePoolWithTag( pKP, GDITAG_TEXT); + + if ( dwFlags & GCP_MAXEXTENT ) + { + if ( Size.cx > nMaxExtent ) + { + for (Cx = Size.cx; nSet > 0; nSet--) + { + Cx -= tmpDxCaretPos[nSet - 1]; + Size.cx = Cx; + if ( Cx <= nMaxExtent ) break; + } + } + if ( !nSet ) + { + pgcpw->nGlyphs = 0; + pgcpw->nMaxFit = 0; + return 0; + } + } + } + } + } + + if ( (dwFlags & GCP_JUSTIFY) && + ( gcpwSave.lpDx || + gcpwSave.lpCaretPos ) && + nSet ) + { + DPRINT1("We Need to Do Something HERE 2!\n"); + } + + if ( gcpwSave.lpDx && gcpwSave.lpCaretPos ) + RtlCopyMemory( gcpwSave.lpCaretPos, gcpwSave.lpDx, nSet * sizeof(LONG)); + + if ( gcpwSave.lpCaretPos ) + { + int pos = 0; + i = 0; + if ( nSet > 0 ) + { + do + { + Cx = gcpwSave.lpCaretPos[i]; + gcpwSave.lpCaretPos[i] = pos; + pos += Cx; + ++i; + } + while ( i < nSet ); + } + } + + if ( gcpwSave.lpOutString ) + RtlCopyMemory(gcpwSave.lpOutString, pwsz, nSet * sizeof(WCHAR)); + + if ( gcpwSave.lpClass ) + RtlFillMemory(gcpwSave.lpClass, nSet, GCPCLASS_LATIN); + + if ( gcpwSave.lpOrder ) + { + for (i = 0; i < nSet; i++) + gcpwSave.lpOrder[i] = i; + } + + if ( gcpwSave.lpGlyphs ) + { + if ( GreGetGlyphIndicesW( hdc, pwsz, nSet, gcpwSave.lpGlyphs, 0, 0) == GDI_ERROR ) + { + nSet = 0; + Size.cx = 0; + Size.cy = 0; + } + } + pgcpw->nGlyphs = nSet; + pgcpw->nMaxFit = nSet; + } + DPRINT1("GreGCPW Exit\n"); + return MAKELONG(Size.cx, Size.cy); } #endif @@ -359,6 +522,14 @@ { UNIMPLEMENTED; return 0; +#if 0 + return GreGetCharacterPlacementW( hdc, + pwsz, + nCount, + nMaxExtent, + pgcpw, + dwFlags); +#endif } DWORD

13 years, 10 months

[tkreuzer] 50349: [WIN32K] Fix use of XFORMOBJ. Should fix gdi32_winetest clipping regression and release breakage.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 9 23:23:42 2011 New Revision: 50349 URL: http://svn.reactos.org/svn/reactos?rev=50349&view=rev Log: [WIN32K] Fix use of XFORMOBJ. Should fix gdi32_winetest clipping regression and release breakage. Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Sun Jan 9 23:23:42 2011 @@ -3486,6 +3486,7 @@ DWORD dwSize = 0; NTSTATUS Status = STATUS_SUCCESS; MATRIX matrix; + XFORMOBJ xo; DPRINT("NtGdiExtCreateRegion\n"); _SEH2_TRY @@ -3531,13 +3532,14 @@ /* Init the XFORMOBJ from the Xform struct */ Status = STATUS_INVALID_PARAMETER; - ret = XFORMOBJ_iSetXform((XFORMOBJ*)&matrix, (XFORML*)Xform); + XFORMOBJ_vInit(&xo, &matrix); + ret = XFORMOBJ_iSetXform(&xo, (XFORML*)Xform); /* Check for error, also no scale and shear allowed */ if (ret != DDI_ERROR && ret != GX_GENERAL) { /* Apply the coordinate transformation on the rects */ - if (XFORMOBJ_bApplyXform((XFORMOBJ*)&matrix, + if (XFORMOBJ_bApplyXform(&xo, XF_LTOL, nCount * 2, RgnData->Buffer, @@ -3563,6 +3565,9 @@ if (!NT_SUCCESS(Status)) { EngSetLastError(ERROR_INVALID_PARAMETER); + DbgPrint("Region == %p\n", Region); + __debugbreak(); + ASSERT(FALSE); RGNOBJAPI_Unlock(Region); GreDeleteObject(hRgn); return NULL;

13 years, 10 months

[akhaldi] 50348: [CMAKE] - Fix another warning in libxml2. Thanks to Timo.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 9 21:34:20 2011 New Revision: 50348 URL: http://svn.reactos.org/svn/reactos?rev=50348&view=rev Log: [CMAKE] - Fix another warning in libxml2. Thanks to Timo. Modified: branches/cmake-bringup/include/psdk/wspiapi.h Modified: branches/cmake-bringup/include/psdk/wspiapi.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/wspi… ============================================================================== --- branches/cmake-bringup/include/psdk/wspiapi.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/wspiapi.h [iso-8859-1] Sun Jan 9 21:34:20 2011 @@ -442,9 +442,9 @@ } WSPIAPI_FUNCTION; #define WSPIAPI_FUNCTION_ARRAY { \ - "getaddrinfo", (FARPROC) WspiapiLegacyGetAddrInfo, \ - "getnameinfo", (FARPROC) WspiapiLegacyGetNameInfo, \ - "freeaddrinfo", (FARPROC) WspiapiLegacyFreeAddrInfo, \ + {"getaddrinfo", (FARPROC) WspiapiLegacyGetAddrInfo}, \ + {"getnameinfo", (FARPROC) WspiapiLegacyGetNameInfo}, \ + {"freeaddrinfo", (FARPROC) WspiapiLegacyFreeAddrInfo} \ } WSPIAPI_INLINE

13 years, 10 months

[rmessiant] 50347: [NTOS] Complete rewrite reserving and releasing of System PTEs. The previous algorithm, in a nutshell, worked as follows: - PTE clusters are in a singly linked list, ordered by t...

by rmessiant＠svn.reactos.org

Author: rmessiant Date: Sun Jan 9 20:52:22 2011 New Revision: 50347 URL: http://svn.reactos.org/svn/reactos?rev=50347&view=rev Log: [NTOS] Complete rewrite reserving and releasing of System PTEs. The previous algorithm, in a nutshell, worked as follows: - PTE clusters are in a singly linked list, ordered by their base address. - All PTEs in the clusters are zeroed (except for cluster list bookkeeping). - Upon reservation: Walk the list to get the first cluster that's large enough, cut the requested amount of PTEs off its tail and return them. - Upon release: Create a new cluster using the PTEs to release, and merge it together with possible adjacent clusters. Problems with the previous algorithm: - While the idea is that all PTEs in clusters are zeroed, which requesters rely on, cluster bookkeeping isn't zeroed on merges. The side effect of this was that PTEs that weren't really zeroed were randomly delivered to requesters. - 99% of the time, allocations are serviced using the first cluster in the list, which is virtually always the first suitable cluster. This is so because the ordering is based on the base address of the clusters, and allocations are serviced using the cluster tail. Because the first cluster starts out as the whole pool, and the pool is quite sizable, it can deal with virtually allocations.. for a while. - A corollary of the previous point is *massive fragmentation* because: as long as an allocation isn't released back into the pool, the space of previous allocations that have been released isn't reused because the first cluster can't suck them up, and enough allocations remain in use. - The combined effect of the previous two points: a first cluster that effectively shrinks mostly, with small clusters forming behind it. Once the first cluster has shrunk far enough (which of course takes a long time), 90% of the space may still be free, scattered in mostly small clusters. This would make decent sized allocations fail because of the heavy fragmentation. - An implementation detail that caused the head of the list to be treated as a genuine cluster when the first cluster in the list was too small. The algorithm (as explained above) made this case quite unlikely until your system has been running for a while, after which it could happily corrupt list heads of other pools, depending on where the list head is with respect to its own pool. Empirically obtained data revealed that after just *booting to the desktop*, the pool for System Pte Space entries contained roughly 70 (unusable) clusters, blocking 15 to 20% of the pool. These figures increased to roughly 100 clusters and 30 to 35% after opening a foxy browser and using it to visit a mathematically inspired search engine. The same data also showed that over 95% of allocations requested just a single PTE, and a noticable allocation spike also occured in the range of 65-128 PTEs. It should be clear optimizing for small allocations is a good idea, and preferably encourage reuse the same PTEs for such allocations. And the new algorithm was born: - PTE clusters are in a singly linked list, ordered by increasing cluster size. - All PTEs in the clusters are zeroed (except for cluster list bookkeeping) .. really this time! - Upon reservation: Walk the list to get the first cluster that's large enough, cut the requested amount of PTEs off its tail and return them. - Upon release: Create a new cluster using the PTEs to release, and merge it together with possible adjacent clusters. - Both in the reservation and release actions, insertions into the list preserve the increasing cluster size order. Empirically obtained data now revealed that after just booting to the desktop, the pool for System Pte Space entries contained exactly 2 clusters. This increased to 10 clusters after some minor internet browsing and watching a 5 minute video using a media player. Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Sun Jan 9 20:52:22 2011 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/mm/ARM3/syspte.c * PURPOSE: ARM Memory Manager System PTE Allocator * PROGRAMMERS: ReactOS Portable Systems Group + * Roel Messiant (roel.messiant(a)reactos.org) */ /* INCLUDES *******************************************************************/ @@ -25,6 +26,55 @@ ULONG MmTotalSystemPtes; /* PRIVATE FUNCTIONS **********************************************************/ + +// +// The free System Page Table Entries are stored in a bunch of clusters, +// each consisting of one or more PTEs. These PTE clusters are connected +// in a singly linked list, ordered by increasing cluster size. +// +// A cluster consisting of a single PTE is marked by having the OneEntry flag +// of its PTE set. The forward link is contained in the NextEntry field. +// +// Clusters containing multiple PTEs have the OneEntry flag of their first PTE +// reset. The NextEntry field of the first PTE contains the forward link, and +// the size of the cluster is stored in the NextEntry field of its second PTE. +// +// Reserving PTEs currently happens by walking the linked list until a cluster +// is found that contains the requested amount of PTEs or more. This cluster +// is removed from the list, and the requested amount of PTEs is taken from the +// tail of this cluster. If any PTEs remain in the cluster, the linked list is +// walked again until a second cluster is found that contains the same amount +// of PTEs or more. The first cluster is then inserted in front of the second +// one. +// +// Releasing PTEs currently happens by walking the whole linked list, recording +// the first cluster that contains the amount of PTEs to release or more. When +// a cluster is found that is adjacent to the PTEs being released, this cluster +// is removed from the list and subsequently added to the PTEs being released. +// This ensures no two clusters are adjacent, which maximizes their size. +// After the walk is complete, a new cluster is created that contains the PTEs +// being released, which is then inserted in front of the recorded cluster. +// + +/* This definition does not belong here and is most likely platform-dependent */ +#define MM_EMPTY_LIST (ULONG) (0xFFFFF) + +ULONG +FORCEINLINE +MI_GET_CLUSTER_SIZE(IN PMMPTE Pte) +{ + // + // First check for a single PTE + // + if (Pte->u.List.OneEntry) + return 1; + + // + // Then read the size from the trailing PTE + // + Pte++; + return Pte->u.List.NextEntry; +} PMMPTE NTAPI @@ -33,8 +83,8 @@ IN ULONG Alignment) { KIRQL OldIrql; - PMMPTE PointerPte, NextPte, PreviousPte; - ULONG_PTR ClusterSize; + PMMPTE PreviousPte, NextPte, ReturnPte; + ULONG ClusterSize; // // Sanity check @@ -42,125 +92,146 @@ ASSERT(Alignment <= PAGE_SIZE); // - // Lock the system PTE space + // Acquire the System PTE lock // OldIrql = KeAcquireQueuedSpinLock(LockQueueSystemSpaceLock); // - // Get the first free cluster and make sure we have PTEs available - // - PointerPte = &MmFirstFreeSystemPte[SystemPtePoolType]; - if (PointerPte->u.List.NextEntry == ((ULONG)0xFFFFF)) - { - // - // Fail + // Find the last cluster in the list that doesn't contain enough PTEs + // + PreviousPte = &MmFirstFreeSystemPte[SystemPtePoolType]; + + while (PreviousPte->u.List.NextEntry != MM_EMPTY_LIST) + { + // + // Get the next cluster and its size + // + NextPte = MmSystemPteBase + PreviousPte->u.List.NextEntry; + ClusterSize = MI_GET_CLUSTER_SIZE(NextPte); + + // + // Check if this cluster contains enough PTEs + // + if (NumberOfPtes <= ClusterSize) + break; + + // + // On to the next cluster + // + PreviousPte = NextPte; + } + + // + // Make sure we didn't reach the end of the cluster list + // + if (PreviousPte->u.List.NextEntry == MM_EMPTY_LIST) + { + // + // Release the System PTE lock and return failure // KeReleaseQueuedSpinLock(LockQueueSystemSpaceLock, OldIrql); return NULL; } // - // Now move to the first free system PTE cluster - // - PreviousPte = PointerPte; - PointerPte = MmSystemPteBase + PointerPte->u.List.NextEntry; - - // - // Loop each cluster - // - while (TRUE) - { - // - // Check if we're done to only one PTE left - // - if (!PointerPte->u.List.OneEntry) - { - // - // Keep track of the next cluster in case we have to relink - // - NextPte = PointerPte + 1; - - // - // Can this cluster satisfy the request? - // - ClusterSize = (ULONG_PTR)NextPte->u.List.NextEntry; - if (NumberOfPtes < ClusterSize) - { - // - // It can, and it will leave just one PTE left - // - if ((ClusterSize - NumberOfPtes) == 1) - { - // - // This cluster becomes a single system PTE entry - // - PointerPte->u.List.OneEntry = 1; - } - else - { - // - // Otherwise, the next cluster aborbs what's left - // - NextPte->u.List.NextEntry = ClusterSize - NumberOfPtes; - } - - // - // Decrement the free count and move to the next starting PTE - // - MmTotalFreeSystemPtes[SystemPtePoolType] -= NumberOfPtes; - PointerPte += (ClusterSize - NumberOfPtes); + // Unlink the cluster + // + PreviousPte->u.List.NextEntry = NextPte->u.List.NextEntry; + + // + // Check if the reservation spans the whole cluster + // + if (ClusterSize == NumberOfPtes) + { + // + // Return the first PTE of this cluster + // + ReturnPte = NextPte; + + // + // Zero the cluster + // + if (NextPte->u.List.OneEntry == 0) + { + NextPte->u.Long = 0; + NextPte++; + } + NextPte->u.Long = 0; + } + else + { + // + // Divide the cluster into two parts + // + ClusterSize -= NumberOfPtes; + ReturnPte = NextPte + ClusterSize; + + // + // Set the size of the first cluster, zero the second if needed + // + if (ClusterSize == 1) + { + NextPte->u.List.OneEntry = 1; + ReturnPte->u.Long = 0; + } + else + { + NextPte++; + NextPte->u.List.NextEntry = ClusterSize; + } + + // + // Step through the cluster list to find out where to insert the first + // + PreviousPte = &MmFirstFreeSystemPte[SystemPtePoolType]; + + while (PreviousPte->u.List.NextEntry != MM_EMPTY_LIST) + { + // + // Get the next cluster + // + NextPte = MmSystemPteBase + PreviousPte->u.List.NextEntry; + + // + // Check if the cluster to insert is smaller or of equal size + // + if (ClusterSize <= MI_GET_CLUSTER_SIZE(NextPte)) break; - } - - // - // Did we find exactly what you wanted? - // - if (NumberOfPtes == ClusterSize) - { - // - // Yes, fixup the cluster and decrease free system PTE count - // - PreviousPte->u.List.NextEntry = PointerPte->u.List.NextEntry; - MmTotalFreeSystemPtes[SystemPtePoolType] -= NumberOfPtes; - break; - } - } - else if (NumberOfPtes == 1) - { - // - // We have one PTE in this cluster, and it's all you want - // - PreviousPte->u.List.NextEntry = PointerPte->u.List.NextEntry; - MmTotalFreeSystemPtes[SystemPtePoolType]--; - break; - } - - // - // We couldn't find what you wanted -- is this the last cluster? - // - if (PointerPte->u.List.NextEntry == ((ULONG)0xFFFFF)) - { - // - // Fail - // - KeReleaseQueuedSpinLock(LockQueueSystemSpaceLock, OldIrql); - return NULL; - } - - // - // Go to the next cluster - // - PreviousPte = PointerPte; - PointerPte = MmSystemPteBase + PointerPte->u.List.NextEntry; - ASSERT(PointerPte > PreviousPte); - } - - // - // Release the lock, flush the TLB and return the first PTE + + // + // On to the next cluster + // + PreviousPte = NextPte; + } + + // + // Retrieve the first cluster and link it back into the cluster list + // + NextPte = ReturnPte - ClusterSize; + + NextPte->u.List.NextEntry = PreviousPte->u.List.NextEntry; + PreviousPte->u.List.NextEntry = NextPte - MmSystemPteBase; + } + + // + // Decrease availability + // + MmTotalFreeSystemPtes[SystemPtePoolType] -= NumberOfPtes; + + // + // Release the System PTE lock // KeReleaseQueuedSpinLock(LockQueueSystemSpaceLock, OldIrql); + + // + // Flush the TLB + // KeFlushProcessTb(); - return PointerPte; + + // + // Return the reserved PTEs + // + return ReturnPte; } PMMPTE @@ -199,24 +270,23 @@ IN MMSYSTEM_PTE_POOL_TYPE SystemPtePoolType) { KIRQL OldIrql; - ULONG_PTR ClusterSize, CurrentSize; - PMMPTE CurrentPte, NextPte, PointerPte; + ULONG_PTR ClusterSize; + PMMPTE PreviousPte, NextPte, InsertPte; // // Check to make sure the PTE address is within bounds // ASSERT(NumberOfPtes != 0); ASSERT(StartingPte >= MmSystemPtesStart[SystemPtePoolType]); - ASSERT(StartingPte <= MmSystemPtesEnd[SystemPtePoolType]); + ASSERT(StartingPte + NumberOfPtes - 1 <= MmSystemPtesEnd[SystemPtePoolType]); // // Zero PTEs // RtlZeroMemory(StartingPte, NumberOfPtes * sizeof(MMPTE)); - CurrentSize = (ULONG_PTR)(StartingPte - MmSystemPteBase); - - // - // Acquire the system PTE lock + + // + // Acquire the System PTE lock // OldIrql = KeAcquireQueuedSpinLock(LockQueueSystemSpaceLock); @@ -226,141 +296,94 @@ MmTotalFreeSystemPtes[SystemPtePoolType] += NumberOfPtes; // - // Get the free cluster and start going through them - // - CurrentPte = &MmFirstFreeSystemPte[SystemPtePoolType]; - while (TRUE) - { - // - // Get the first real cluster of PTEs and check if it's ours - // - PointerPte = MmSystemPteBase + CurrentPte->u.List.NextEntry; - if (CurrentSize < CurrentPte->u.List.NextEntry) - { - // - // Sanity check - // - ASSERT(((StartingPte + NumberOfPtes) <= PointerPte) || - (CurrentPte->u.List.NextEntry == ((ULONG)0xFFFFF))); - - // - // Get the next cluster in case it's the one - // - NextPte = CurrentPte + 1; - - // - // Check if this was actually a single-PTE entry - // - if (CurrentPte->u.List.OneEntry) + // Step through the cluster list to find where to insert the PTEs + // + PreviousPte = &MmFirstFreeSystemPte[SystemPtePoolType]; + InsertPte = NULL; + + while (PreviousPte->u.List.NextEntry != MM_EMPTY_LIST) + { + // + // Get the next cluster and its size + // + NextPte = MmSystemPteBase + PreviousPte->u.List.NextEntry; + ClusterSize = MI_GET_CLUSTER_SIZE(NextPte); + + // + // Check if this cluster is adjacent to the PTEs being released + // + if ((NextPte + ClusterSize == StartingPte) || + (StartingPte + NumberOfPtes == NextPte)) + { + // + // Add the PTEs in the cluster to the PTEs being released + // + NumberOfPtes += ClusterSize; + + if (NextPte < StartingPte) + StartingPte = NextPte; + + // + // Unlink this cluster and zero it + // + PreviousPte->u.List.NextEntry = NextPte->u.List.NextEntry; + + if (NextPte->u.List.OneEntry == 0) { - // - // We only have one page - // - ClusterSize = 1; + NextPte->u.Long = 0; + NextPte++; } - else - { - // - // The next cluster will have the page count - // - ClusterSize = (ULONG_PTR)NextPte->u.List.NextEntry; - } - - // - // So check if this cluster actually describes the entire mapping - // - if ((CurrentPte + ClusterSize) == StartingPte) - { - // - // It does -- collapse the free PTEs into the next cluster - // - NumberOfPtes += ClusterSize; - NextPte->u.List.NextEntry = NumberOfPtes; - CurrentPte->u.List.OneEntry = 0; - - // - // Make another pass - // - StartingPte = CurrentPte; - } - else - { - // - // There's still PTEs left -- make us into a cluster - // - StartingPte->u.List.NextEntry = CurrentPte->u.List.NextEntry; - CurrentPte->u.List.NextEntry = CurrentSize; - - // - // Is there just one page left? - // - if (NumberOfPtes == 1) - { - // - // Then this actually becomes a single PTE entry - // - StartingPte->u.List.OneEntry = 1; - } - else - { - // - // Otherwise, create a new cluster for the remaining pages - // - StartingPte->u.List.OneEntry = 0; - NextPte = StartingPte + 1; - NextPte->u.List.NextEntry = NumberOfPtes; - } - } - - // - // Now check if we've arrived at yet another cluster - // - if ((StartingPte + NumberOfPtes) == PointerPte) - { - // - // We'll collapse the next cluster into us - // - StartingPte->u.List.NextEntry = PointerPte->u.List.NextEntry; - StartingPte->u.List.OneEntry = 0; - NextPte = StartingPte + 1; - - // - // Check if the cluster only had one page - // - if (PointerPte->u.List.OneEntry) - { - // - // So will we... - // - ClusterSize = 1; - } - else - { - // - // Otherwise, grab the page count from the next-next cluster - // - PointerPte++; - ClusterSize = (ULONG_PTR)PointerPte->u.List.NextEntry; - } - - // - // And create the final combined cluster - // - NextPte->u.List.NextEntry = NumberOfPtes + ClusterSize; - } - - // - // We released the PTEs into their cluster (and optimized the list) - // - KeReleaseQueuedSpinLock(LockQueueSystemSpaceLock, OldIrql); - break; - } - - // - // Try the next cluster of PTEs... - // - CurrentPte = PointerPte; - } + NextPte->u.Long = 0; + + // + // Invalidate the previously found insertion location, if any + // + InsertPte = NULL; + } + else + { + // + // Check if the insertion location is right before this cluster + // + if ((InsertPte == NULL) && (NumberOfPtes <= ClusterSize)) + InsertPte = PreviousPte; + + // + // On to the next cluster + // + PreviousPte = NextPte; + } + } + + // + // If no insertion location was found, use the tail of the list + // + if (InsertPte == NULL) + InsertPte = PreviousPte; + + // + // Create a new cluster using the PTEs being released + // + if (NumberOfPtes != 1) + { + StartingPte->u.List.OneEntry = 0; + + NextPte = StartingPte + 1; + NextPte->u.List.NextEntry = NumberOfPtes; + } + else + StartingPte->u.List.OneEntry = 1; + + // + // Link the new cluster into the cluster list at the insertion location + // + StartingPte->u.List.NextEntry = InsertPte->u.List.NextEntry; + InsertPte->u.List.NextEntry = StartingPte - MmSystemPteBase; + + // + // Release the System PTE lock + // + KeReleaseQueuedSpinLock(LockQueueSystemSpaceLock, OldIrql); } VOID @@ -392,7 +415,7 @@ // // Make the first entry free and link it // - StartingPte->u.List.NextEntry = ((ULONG)0xFFFFF); + StartingPte->u.List.NextEntry = MM_EMPTY_LIST; MmFirstFreeSystemPte[PoolType].u.Long = 0; MmFirstFreeSystemPte[PoolType].u.List.NextEntry = StartingPte - MmSystemPteBase;

13 years, 10 months

[akhaldi] 50346: [CMAKE] - Reduce libxml2 warnings.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 9 20:40:34 2011 New Revision: 50346 URL: http://svn.reactos.org/svn/reactos?rev=50346&view=rev Log: [CMAKE] - Reduce libxml2 warnings. Modified: branches/cmake-bringup/include/psdk/wspiapi.h Modified: branches/cmake-bringup/include/psdk/wspiapi.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/wspi… ============================================================================== --- branches/cmake-bringup/include/psdk/wspiapi.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/wspiapi.h [iso-8859-1] Sun Jan 9 20:40:34 2011 @@ -44,6 +44,12 @@ #define getaddrinfo WspiapiGetAddrInfo #define getnameinfo WspiapiGetNameInfo #define freeaddrinfo WspiapiFreeAddrInfo + +#if _MSC_VER +#define WSPIAPI_INLINE __inline +#else +#define WSPIAPI_INLINE static inline +#endif typedef int (WINAPI *WSPIAPI_PGETADDRINFO)( @@ -441,7 +447,7 @@ "freeaddrinfo", (FARPROC) WspiapiLegacyFreeAddrInfo, \ } -FORCEINLINE +WSPIAPI_INLINE FARPROC WINAPI WspiapiLoad( @@ -503,7 +509,7 @@ return (rgtGlobal[wFunction].pfAddress); } -FORCEINLINE +WSPIAPI_INLINE int WINAPI WspiapiGetAddrInfo( @@ -522,7 +528,7 @@ return iError; } -FORCEINLINE +WSPIAPI_INLINE int WINAPI WspiapiGetNameInfo( @@ -544,7 +550,7 @@ return iError; } -FORCEINLINE +WSPIAPI_INLINE void WINAPI WspiapiFreeAddrInfo(

13 years, 10 months

[tkreuzer] 50345: [WIN32K] Cleanup pooltags a little, use official tags where known and applicable.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 9 19:51:06 2011 New Revision: 50345 URL: http://svn.reactos.org/svn/reactos?rev=50345&view=rev Log: [WIN32K] Cleanup pooltags a little, use official tags where known and applicable. Modified: trunk/reactos/subsystems/win32/win32k/eng/clip.c trunk/reactos/subsystems/win32/win32k/eng/engevent.c trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/eng/semaphor.c trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/icm.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/pen.c trunk/reactos/subsystems/win32/win32k/objects/print.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/eng/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/clip.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/clip.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -224,7 +224,7 @@ { RECTL *dest; - Clip = EngAllocMem(0, sizeof(CLIPGDI) + ((count - 1) * sizeof(RECTL)), TAG_CLIPOBJ); + Clip = EngAllocMem(0, sizeof(CLIPGDI) + ((count - 1) * sizeof(RECTL)), GDITAG_CLIPOBJ); if(Clip != NULL) { @@ -245,7 +245,7 @@ } else { - Clip = EngAllocMem(0, sizeof(CLIPGDI), TAG_CLIPOBJ); + Clip = EngAllocMem(0, sizeof(CLIPGDI), GDITAG_CLIPOBJ); if(Clip != NULL) { @@ -274,7 +274,7 @@ CLIPOBJ * APIENTRY EngCreateClip(VOID) { - CLIPGDI *Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof(CLIPGDI), TAG_CLIPOBJ); + CLIPGDI *Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof(CLIPGDI), GDITAG_CLIPOBJ); if(Clip != NULL) { return GDIToObj(Clip, CLIP); @@ -409,7 +409,7 @@ *Count = Boundary->bottom - Boundary->top; if (*Count > 0) { - *Spans = ExAllocatePoolWithTag(PagedPool, *Count * sizeof(SPAN), TAG_CLIP); + *Spans = ExAllocatePoolWithTag(PagedPool, *Count * sizeof(SPAN), GDITAG_CLIPOBJ); if (NULL == *Spans) { *Count = 0; @@ -444,12 +444,12 @@ } if (NewCount != *Count) { - NewSpans = ExAllocatePoolWithTag(PagedPool, NewCount * sizeof(SPAN), TAG_CLIP); + NewSpans = ExAllocatePoolWithTag(PagedPool, NewCount * sizeof(SPAN), GDITAG_CLIPOBJ); if (NULL == NewSpans) { if (NULL != *Spans) { - ExFreePoolWithTag(*Spans, TAG_CLIP); + ExFreePoolWithTag(*Spans, GDITAG_CLIPOBJ); *Spans = NULL; } *Count = 0; @@ -463,7 +463,7 @@ { *dest++ = *src++; } - ExFreePoolWithTag(*Spans, TAG_CLIP); + ExFreePoolWithTag(*Spans, GDITAG_CLIPOBJ); } *Spans = NewSpans; } Modified: trunk/reactos/subsystems/win32/win32k/eng/engevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engevent.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engevent.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -14,9 +14,6 @@ #define NDEBUG #include <debug.h> -/* Dfsm - <unknown> - Eng event allocation (ENG_KEVENTALLOC,ENG_ALLOC) in ntgdi\gre */ -#define TAG_GRE_EVENT 'msfD' - /* PUBLIC FUNCTIONS ***********************************************************/ BOOL @@ -29,7 +26,7 @@ /* Allocate memory for the event structure */ EngEvent = ExAllocatePoolWithTag(NonPagedPool, sizeof(ENG_EVENT) + sizeof(KEVENT), - TAG_GRE_EVENT); + GDITAG_ENG_EVENT); if (EngEvent) { /* Set KEVENT pointer */ @@ -48,7 +45,7 @@ else { /* Out of memory */ - DPRINT("EngCreateEvent() failed\n"); + DPRINT("EngCreateEvent() failed\n"); Result = FALSE; } @@ -117,13 +114,13 @@ /* Allocate memory for the event structure */ EngEvent = ExAllocatePoolWithTag(NonPagedPool, sizeof(ENG_EVENT), - TAG_GRE_EVENT); + GDITAG_ENG_EVENT); if (!EngEvent) return NULL; - + /* Zero it out */ EngEvent->fFlags = 0; EngEvent->pKEvent = NULL; - + /* Create a handle, and have Ob fill out the pKEvent field */ Status = ObReferenceObjectByHandle(EngEvent, EVENT_ALL_ACCESS, @@ -143,7 +140,7 @@ ExFreePool(EngEvent); EngEvent = NULL; } - + /* Support legacy interface */ if (Reserved1) *(PVOID*)Reserved1 = EngEvent; return EngEvent; @@ -155,10 +152,10 @@ { /* Must be a usermapped event */ if (!(Event->fFlags & ENG_EVENT_USERMAPPED)) return FALSE; - + /* Dereference the object, destroying it */ ObDereferenceObject(Event->pKEvent); - + /* Free the Eng object */ ExFreePool(Event); return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -226,7 +226,7 @@ } /* Create WNDOBJ */ - WndObjInt = EngAllocMem(0, sizeof (WNDGDI), TAG_WNDOBJ); + WndObjInt = EngAllocMem(0, sizeof (WNDGDI), GDITAG_WNDOBJ); if (WndObjInt == NULL) { DPRINT1("Failed to allocate memory for a WND structure!\n"); Modified: trunk/reactos/subsystems/win32/win32k/eng/semaphor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/semaphor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/semaphor.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -11,12 +11,12 @@ EngCreateSemaphore ( VOID ) { // www.osr.com/ddk/graphics/gdifncs_95lz.htm - PERESOURCE psem = ExAllocatePoolWithTag( NonPagedPool, sizeof(ERESOURCE), TAG_GSEM ); + PERESOURCE psem = ExAllocatePoolWithTag( NonPagedPool, sizeof(ERESOURCE), GDITAG_SEMAPHORE ); if ( !psem ) return NULL; if ( !NT_SUCCESS(ExInitializeResourceLite ( psem )) ) { - ExFreePoolWithTag ( psem, TAG_GSEM ); + ExFreePoolWithTag ( psem, GDITAG_SEMAPHORE ); return NULL; } return (HSEMAPHORE)psem; @@ -94,7 +94,7 @@ ExDeleteResourceLite((PERESOURCE)hsem); - ExFreePoolWithTag( (PVOID)hsem, TAG_GSEM); + ExFreePoolWithTag( (PVOID)hsem, GDITAG_SEMAPHORE); } /* Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -446,7 +446,7 @@ { pexlo->xlo.pulXlate = EngAllocMem(0, cEntries * sizeof(ULONG), - TAG_XLATEOBJ); + GDITAG_PXLATE); if (!pexlo->xlo.pulXlate) { DPRINT1("Could not allocate pulXlate buffer.\n"); Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -247,7 +247,7 @@ ObDereferenceObject((MsgQueue)->NewMessages); \ if ((MsgQueue)->NewMessagesHandle != NULL) \ ZwClose((MsgQueue)->NewMessagesHandle); \ - ExFreePool((MsgQueue)); \ + ExFreePoolWithTag((MsgQueue), USERTAG_Q); \ } \ } while(0) Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -1,48 +1,35 @@ #pragma once #define TAG_STRING ' RTS' /* string */ -#define TAG_RTLREGISTRY 'vrqR' /* RTL registry */ - -/* ntuser */ -#define TAG_MOUSE 'SUOM' /* mouse */ -#define TAG_KEYBOARD ' DBK' /* keyboard */ -#define TAG_ACCEL 'LCCA' /* accelerator */ -#define TAG_HOOK 'KHNW' /* hook */ -#define TAG_HOTKEY 'KTOH' /* hotkey */ -#define TAG_MENUITEM 'INEM' /* menu item */ +#define TAG_HOOK 'ohsU' /* hook */ +#define TAG_MENUITEM 'emsU' /* menu item */ #define TAG_MSG 'GSEM' /* message */ -#define TAG_MSGQ 'QGSM' /* message queue */ #define TAG_USRMSG 'GSMU' /* user message */ -#define TAG_WNDPROP 'PRPW' /* window property */ -#define TAG_WNAM 'MANW' /* window name */ -#define TAG_WINLIST 'SLNW' /* window handle list */ -#define TAG_WININTLIST 'PINW' /* window internal pos */ -#define TAG_WINPROCLST 'LPNW' /* window proc list */ #define TAG_SBARINFO 'NIBS' /* scrollbar info */ -#define TAG_TIMER 'RMIT' /* timer entry */ -#define TAG_TIMERTD 'TMIT' /* timer thread dereference list */ #define TAG_TIMERBMP 'BMIT' /* timers bitmap */ -#define TAG_CALLBACK 'KCBC' /* callback memory */ #define TAG_WINSTA 'ATSW' /* window station */ -#define TAG_PDCE 'cdsU' /* dce */ -#define TAG_ATTACHINFO 'iasU' /* Attach Info Input */ -#define TAG_INPUT 'yssU' /* Input */ +#define TAG_FONT 'ETNF' /* font entry */ +#define TAG_BEZIER 'RZEB' /* bezier */ +#define TAG_SHAPE 'phSG' /* shape */ +#define TAG_COLORMAP 'MLOC' /* color map */ +#define TAG_GDIHNDTBLE 'bthG' /* gdi handle table */ +#define TAG_DIB ' BID' /* dib */ /* gdi objects from the handle table */ -#define TAG_DC '1alG' /* dc */ -#define TAG_REGION '4alG' /* region */ -#define TAG_SURFACE '5alG' /* bitmap */ +#define TAG_DC GDITAG_HMGR_LOOKASIDE_DC_TYPE +#define TAG_REGION GDITAG_HMGR_LOOKASIDE_RGN_TYPE +#define TAG_SURFACE GDITAG_HMGR_LOOKASIDE_SURF_TYPE #define TAG_CLIENTOBJ '60hG' #define TAG_PATH '70hG' -#define TAG_PALETTE '8alG' +#define TAG_PALETTE GDITAG_HMGR_LOOKASIDE_PAL_TYPE #define TAG_ICMLCS '90hG' -#define TAG_LFONT ':alG' +#define TAG_LFONT GDITAG_HMGR_LOOKASIDE_LFONT_TYPE #define TAG_RFONT ';0gG' /* correct? */ #define TAG_PFE '<0hG' #define TAG_PFT '=0hG' /* correct? */ #define TAG_ICMCXF '>0hG' /* correct? */ #define TAG_SPRITE '?0hG' /* correct? */ -#define TAG_BRUSH '@alG' +#define TAG_BRUSH GDITAG_HMGR_LOOKASIDE_BRUSH_TYPE #define TAG_UMPD 'A0hG' /* correct? */ #define TAG_SPACE 'c0hG' /* correct? */ #define TAG_META 'E0hG' /* correct? */ @@ -56,290 +43,256 @@ #define TAG_DCIOBJ 'M0hG' /* correct? */ #define TAG_SPOOL 'N0hG' /* correct? */ -/* other gdi objects */ -#define TAG_BEZIER 'RZEB' /* bezier */ -#define TAG_BITMAP 'PMTB' /* bitmap */ -#define TAG_PATBLT 'TLBP' /* patblt */ -#define TAG_CLIP 'PILC' /* clipping */ -#define TAG_COORD 'DROC' /* coords */ -#define TAG_GDIDEV 'vedG' /* gdi dev support*/ -#define TAG_GDIPDEV 'veDG' /* gdi PDev */ -#define TAG_GDIHNDTBLE 'HIDG' /* gdi handle table */ -#define TAG_GDIICM 'mciG' /* gdi Icm */ -#define TAG_DIB ' BID' /* dib */ -#define TAG_COLORMAP 'MLOC' /* color map */ -#define TAG_SHAPE 'PAHS' /* shape */ -#define TAG_PALETTEMAP 'MLAP' /* palette mapping */ -#define TAG_PRINT 'TNRP' /* print */ -#define TAG_GDITEXT 'OTXT' /* text */ -#define TAG_PENSTYLES 'ytsG' /* pen styles */ - -/* Eng objects */ -#define TAG_CLIPOBJ 'OPLC' /* clip object */ -#define TAG_DRIVEROBJ 'OVRD' /* driver object */ -#define TAG_DFSM 'msfD' /* Eng event allocation */ -#define TAG_EPATH 'tapG' /* path object */ -#define TAG_FONT 'ETNF' /* font entry */ -#define TAG_FONTOBJ 'tnfG' /* font object */ -#define TAG_WNDOBJ 'ODNW' /* window object */ -#define TAG_XLATEOBJ 'OALX' /* xlate object */ -#define TAG_GSEM 'mesG' /* Gdi Semaphore */ - -/* misc */ -#define TAG_DRIVER 'VRDG' /* video drivers */ -#define TAG_FNTFILE 'FTNF' /* font file */ -#define TAG_SSECTPOOL 'PCSS' /* shared section pool */ -#define TAG_PFF 'ffpG' /* physical font file */ - /* Dx internal tags rember I do not known if it right namees */ #define TAG_DXPVMLIST 'LPXD' /* pmvlist for the driver */ #define TAG_DXFOURCC 'OFXD' /* pdwFourCC for the driver */ -#define TAG_DDRAW '1 hD' +#define TAG_DDRAW '1 hD' #define TAG_DDSURF '2 hD' #define TAG_EDDGBL 'GDDE' /* ? edd_directdraw_global ??*/ /* Official tags */ -#define GDITAG_ATM_FONT 'Adbe' -#define GDITAG_BMP_FONT 'dfmB' -#define GDITAG_ENG_EVENT 'msfD' -#define GDITAG_DWM_HWND_LOOKUP 'LmwD' -#define GDITAG_DWM_VALIDATION 'vMWD' -#define GDITAG_LOCKED_PRIMARY 'ddxD' -#define GDITAG_DC_COLOR_TRANSFORM 'bdaG' -#define GDITAG_DC_FONT 'ddaG' -#define GDITAG_ALPHABLEND 'plaG' -#define GDITAG_BRUSH_FREELIST 'fabG' -#define GDITAG_ICM_DIB_LIST 'ldbG' -#define GDITAG_FONTCACHE 'cacG' -#define GDITAG_SCRIPTS 'lscG' -#define GDITAG_CHAR_TO_WIDE_CHAR 'cwcG' -#define GDITAG_RBRUSH 'rbdG' -#define GDITAG_DC_FREELIST 'fcdG' -#define GDITAG_DWMSTATE 'scDG' -#define GDITAG_DEVMODE 'vedG' -#define GDITAG_PDEV 'veDG' -#define GDITAG_HGLYPH_ARRAY 'mfdG' -#define GDITAG_DRVSUP 'srdG' -#define GDITAG_CLIPOBJ 'vrdG' -#define GDITAG_SEMAPHORE_VALIDATE 'dtdG' -#define GDITAG_WATCHDOG 'dwdG' -#define GDITAG_ENGBRUSH 'rbeG' -#define GDITAG_ENUM_DISPLAY_DEVICES 'ddeG' -#define GDITAG_EDGE 'gdeG' -#define GDITAG_TRIANGLEDATA 'gdEg' -#define GDITAG_TEXTOUT 'oteG' -#define GDITAG_FONT_DEFAULT_FAMILY 'fdfG' -#define GDITAG_FONTFILEVIEW 'vffG' -#define GDITAG_UNIVERSAL_FONT_ID 'difG' -#define GDITAG_FILEPATH 'liFG' -#define GDITAG_MAPFILE 'lifG' -#define GDITAG_FLOODFILL 'dlFG' -#define GDITAG_RFONT 'tnfG' -#define GDITAG_FONT_SUB 'bsfG' -#define GDITAG_FONT_STOCKFONT 'fsfG' -#define GDITAG_FAST_MUTEX 'msfG' -#define GDITAG_FULLSCREEN 'lufG' -#define GDITAG_FONTVICTIM 'ivfG' -#define GDITAG_GLYPHBLOCK ' bgG' -#define GDITAG_GDEVICE 'vdgG' -#define GDITAG_GLYPHSET 'slgG' -#define GDITAG_HGLYPH 'ylgG' -#define GDITAG_HMGR_LFONT_TYPE ':?hG' -#define GDITAG_HMGR_RFONT_TYPE ';?hG' -#define GDITAG_HMGR_BRUSH_TYPE '@?hG' -#define GDITAG_HMGR_ICMCXF_TYPE '>?hG' -#define GDITAG_HMGR_DEF_TYPE '0?hG' -#define GDITAG_HMGR_DC_TYPE '1?hG' -#define GDITAG_HMGR_RGN_TYPE '4?hG' -#define GDITAG_HMGR_SURF_TYPE '5?hG' -#define GDITAG_HMGR_CLIENTOBJ_TYPE '6?hG' -#define GDITAG_HMGR_PATH_TYPE '7?hG' -#define GDITAG_HMGR_PAL_TYPE '8?hG' -#define GDITAG_HMGR_ICMLCS_TYPE '9?hG' -#define GDITAG_HMGR_UMPD_TYPE 'A?hG' -#define GDITAG_HMGR_HLSURF_TYPE 'B?hG' -#define GDITAG_HMGR_META_TYPE 'E?hG' -#define GDITAG_HMGR_DRVOBJ_TYPE 'L?hG' -#define GDITAG_HMGR_SPRITE_TYPE '??hG' -#define GDITAG_HMGR_START '00hG' -#define GDITAG_PFE_HASHBUCKET 'bahG' -#define GDITAG_PFE_HASHTABLE 'sahG' -#define GDITAG_HMGR_LOCK 'lmhG' -#define GDITAG_HALFTONE_COLORTRIAD 'cthG' -#define GDITAG_HMGR_TEMP 'mthG' -#define GDITAG_DDCCI 'c2iG' -#define GDITAG_ICM 'mciG' -#define GDITAG_KMODE_BITMAP 'mbkG' +#define GDITAG_ATM_FONT 'ebdA' +#define GDITAG_BMP_FONT 'dfmB' +#define GDITAG_ENG_EVENT 'msfD' +#define GDITAG_DWM_HWND_LOOKUP 'LmwD' +#define GDITAG_DWM_VALIDATION 'vMWD' +#define GDITAG_LOCKED_PRIMARY 'ddxD' +#define GDITAG_DC_COLOR_TRANSFORM 'bdaG' +#define GDITAG_DC_FONT 'ddaG' +#define GDITAG_ALPHABLEND 'plaG' +#define GDITAG_BRUSH_FREELIST 'fabG' +#define GDITAG_ICM_DIB_LIST 'ldbG' +#define GDITAG_FONTCACHE 'cacG' +#define GDITAG_SCRIPTS 'lscG' +#define GDITAG_CHAR_TO_WIDE_CHAR 'cwcG' +#define GDITAG_RBRUSH 'rbdG' +#define GDITAG_DC_FREELIST 'fcdG' +#define GDITAG_DWMSTATE 'scDG' +#define GDITAG_DEVMODE 'vedG' +#define GDITAG_PDEV 'veDG' +#define GDITAG_HGLYPH_ARRAY 'mfdG' +#define GDITAG_DRVSUP 'srdG' +#define GDITAG_CLIPOBJ 'vrdG' +#define GDITAG_SEMAPHORE_VALIDATE 'dtdG' +#define GDITAG_WATCHDOG 'dwdG' +#define GDITAG_ENGBRUSH 'rbeG' +#define GDITAG_ENUM_DISPLAY_DEVICES 'ddeG' +#define GDITAG_EDGE 'gdeG' +#define GDITAG_TRIANGLEDATA 'gdEg' +#define GDITAG_TEXTOUT 'oteG' +#define GDITAG_FONT_DEFAULT_FAMILY 'fdfG' +#define GDITAG_FONTFILEVIEW 'vffG' +#define GDITAG_UNIVERSAL_FONT_ID 'difG' +#define GDITAG_FILEPATH 'liFG' +#define GDITAG_MAPFILE 'lifG' +#define GDITAG_FLOODFILL 'dlFG' +#define GDITAG_RFONT 'tnfG' +#define GDITAG_FONT_SUB 'bsfG' +#define GDITAG_FONT_STOCKFONT 'fsfG' +#define GDITAG_FAST_MUTEX 'msfG' +#define GDITAG_FULLSCREEN 'lufG' +#define GDITAG_FONTVICTIM 'ivfG' +#define GDITAG_GLYPHBLOCK ' bgG' +#define GDITAG_GDEVICE 'vdgG' +#define GDITAG_GLYPHSET 'slgG' +#define GDITAG_HGLYPH 'ylgG' +#define GDITAG_HMGR_LFONT_TYPE ':?hG' +#define GDITAG_HMGR_RFONT_TYPE ';?hG' +#define GDITAG_HMGR_BRUSH_TYPE '@?hG' +#define GDITAG_HMGR_ICMCXF_TYPE '>?hG' +#define GDITAG_HMGR_DEF_TYPE '0?hG' +#define GDITAG_HMGR_DC_TYPE '1?hG' +#define GDITAG_HMGR_RGN_TYPE '4?hG' +#define GDITAG_HMGR_SURF_TYPE '5?hG' +#define GDITAG_HMGR_CLIENTOBJ_TYPE '6?hG' +#define GDITAG_HMGR_PATH_TYPE '7?hG' +#define GDITAG_HMGR_PAL_TYPE '8?hG' +#define GDITAG_HMGR_ICMLCS_TYPE '9?hG' +#define GDITAG_HMGR_UMPD_TYPE 'A?hG' +#define GDITAG_HMGR_HLSURF_TYPE 'B?hG' +#define GDITAG_HMGR_META_TYPE 'E?hG' +#define GDITAG_HMGR_DRVOBJ_TYPE 'L?hG' +#define GDITAG_HMGR_SPRITE_TYPE '??hG' +#define GDITAG_HMGR_START '00hG' +#define GDITAG_PFE_HASHBUCKET 'bahG' +#define GDITAG_PFE_HASHTABLE 'sahG' +#define GDITAG_HMGR_LOCK 'lmhG' +#define GDITAG_HALFTONE_COLORTRIAD 'cthG' +#define GDITAG_HMGR_TEMP 'mthG' +#define GDITAG_DDCCI 'c2iG' +#define GDITAG_ICM 'mciG' +#define GDITAG_KMODE_BITMAP 'mbkG' #define GDITAG_HMGR_LOOKASIDE_LFONT_TYPE ':alG' #define GDITAG_HMGR_LOOKASIDE_RFONT_TYPE ';alG' #define GDITAG_HMGR_LOOKASIDE_BRUSH_TYPE '@alG' -#define GDITAG_HMGR_LOOKASIDE_START '0alG' -#define GDITAG_HMGR_LOOKASIDE_DC_TYPE '1alG' -#define GDITAG_HMGR_LOOKASIDE_RGN_TYPE '4alG' -#define GDITAG_HMGR_LOOKASIDE_SURF_TYPE '5alG' -#define GDITAG_HMGR_LOOKASIDE_PAL_TYPE '8alG' -#define GDITAG_LDEV 'vdlG' -#define GDITAG_LOCALEINFO 'dilG' -#define GDITAG_PFE_LINK 'knlG' -#define GDITAG_FONT_MAPPER 'pamG' -#define GDITAG_DISPURF_SORT 'osmG' -#define GDITAG_MULTIFONT 'lumG' -#define GDITAG_NLS 'slnG' -#define GDITAG_OPENGL 'lgoG' -#define GDITAG_OPM 'MPOG' -#define GDITAG_PALETTE 'laPG' -#define GDITAG_PANNING_PDEV 'napG' -#define GDITAG_PATHOBJ 'tapG' -#define GDITAG_PFF_INDEXES 'efpG' -#define GDITAG_PFF 'ffpG' -#define GDITAG_PFT 'tfpG' -#define GDITAG_PLGBLT_DATA 'bgpG' -#define GDITAG_PRINTCLIENTID 'dipG' -#define GDITAG_CLIP_PATHOBJ 'oppG' -#define GDITAG_PROXYPORT 'tppG' -#define GDITAG_PRESENT 'erpG' -#define GDITAG_LFONT_QUICKLOOKUP 'knqG' -#define GDITAG_PALETTE_RGB_XLATE 'bgrG' -#define GDITAG_REGION 'ngrG' -#define GDITAG_SEMAPHORE 'mesG' -#define GDITAG_SPRITE ' psG' -#define GDITAG_METASPRITE 'mpsG' -#define GDITAG_SPRITESCAN 'rpsG' -#define GDITAG_STACKTRACE 'atsG' -#define GDITAG_STRETCHBLT 'htsG' -#define GDITAG_PENSTYLE 'ytsG' -#define GDITAG_SFM 'xusG' -#define GDITAG_TEMP 'pmtG' -#define GDITAG_TEMP_THREADLOCK 'pmTG' -#define GDITAG_TEXTMETRICS 'wmtG' -#define GDITAG_PFF_DATA 'pvtG' -#define GDITAG_TRIANGLE_MESH 'tvtG' -#define GDITAG_TEXT 'txtG' -#define GDITAG_UMODE_BITMAP 'mbuG' -#define GDITAG_ENG_USER_MEM_ALLOC_TABLE 'amUG' -#define GDITAG_UMPD 'pmuG' -#define GDITAG_HDEV 'sdvG' -#define GDITAG_VDEV 'vdVG' -#define GDITAG_MULTISAVEBITS 'smVG' -#define GDITAG_MDSURF 'fsVG' -#define GDITAG_WNDOBJ 'dnwG' -#define GDITAG_PXLATE 'tlxG' -#define GDITAG_UMPDOBJ 'dpxG' -#define GDITAG_FONT_LINK 'flnk' -#define GDITAG_PANNING_SURFACE 'fSAP' -#define GDITAG_PANNING_SHADOWLOCK 'olSP' -#define GDITAG_SINGLEREADERLOCK 'lrsS' -#define GDITAG_TT_FONT_CACHE 'CFTT' -#define GDITAG_TT_FONT 'dftT' -#define GDITAG_VF_FONT 'dftV' -#define GDITAG_W32PIDLOCK 'l23W' -#define GDITAG_HANDLEPUSHLOCK 'lpHG' -#define USERTAG_SERVICE_TABLE 'lacU' -#define USERTAG_MONITOR_MARGIN 'mamU' -#define USERTAG_REDIRECT 'rdrU' -#define USERTAG_ACCEL 'casU' -#define USERTAG_ATTACHINFO 'iasU' -#define USERTAG_ALTTAB 'lasU' -#define USERTAG_DEBUG 'gbsU' -#define USERTAG_CLIPBOARD 'bcsU' -#define USERTAG_CALLBACK 'ccsU' -#define USERTAG_COMPOSITIONPROP 'dcsU' -#define USERTAG_CLIENTTHREADINFO 'icsU' -#define USERTAG_CLASS 'lcsU' -#define USERTAG_SCANCODEMAP 'mcsU' -#define USERTAG_CLIPBOARDPALETTE 'pcsU' -#define USERTAG_COLORS 'rcsU' -#define USERTAG_CHECKPT 'tcsU' -#define USERTAG_CURSOR 'ucsU' -#define USERTAG_COLORVALUES 'vcsU' -#define USERTAG_DDE1 '1dsU' -#define USERTAG_DDE2 '2dsU' -#define USERTAG_DDE4 '4dsU' -#define USERTAG_DDE5 '5dsU' -#define USERTAG_DDE6 '6dsU' -#define USERTAG_DDE7 '7dsU' -#define USERTAG_DDE8 '8dsU' -#define USERTAG_DDE9 '9dsU' -#define USERTAG_DDEa 'AdsU' -#define USERTAG_DDEb 'BdsU' -#define USERTAG_DCE 'cdsU' -#define USERTAG_DDEd 'DdsU' -#define USERTAG_DDE 'EdsU' -#define USERTAG_DEVICEINFO 'IDsU' -#define USERTAG_DISPLAYINFO 'idsU' -#define USERTAG_DRAGDROP 'sdsU' -#define USERTAG_DEVICECHANGE 'vdsU' -#define USERTAG_WSEXCOMPINVALID 'CEsU' -#define USERTAG_ERESOURCE 'resU' -#define USERTAG_EVENT 'vesU' -#define USERTAG_FORWARDTOUCHMESSAGE 'tfsU' -#define USERTAG_GRANTEDHANDLES 'hgsU' -#define USERTAG_GESTUREINFO 'igsU' -#define USERTAG_GLOBALTHREADLOCK 'lgsU' -#define USERTAG_GHOST 'tgsU' -#define USERTAG_HIDDATA 'ahsU' -#define USERTAG_HIDDESC 'DhsU' -#define USERTAG_HOTKEY 'khsU' -#define USERTAG_IMEHOTKEY 'hisU' -#define USERTAG_IME 'misU' -#define USERTAG_W32JOB 'bjsU' -#define USERTAG_W32JOBEXTRA 'xjsU' -#define USERTAG_KBDLAYOUT 'bksU' -#define USERTAG_KBDEXID 'eksU' -#define USERTAG_KBDFILE 'fksU' -#define USERTAG_KBDSTATE 'sksU' -#define USERTAG_KBDTABLE 'tksU' -#define USERTAG_LOOKASIDE 'alsU' -#define USERTAG_LOGDESKTOP 'dlsU' -#define USERTAG_LOCKRECORD 'rlsU' -#define USERTAG_MAGNIFICATION 'gmsU' -#define USERTAG_MIRROR 'imsU' -#define USERTAG_MESSAGE_FILTER 'lmsU' -#define USERTAG_MONITORRECTS 'rmsU' -#define USERTAG_MOVESIZE 'smsU' -#define USERTAG_MENUSTATE 'tmsU' -#define USERTAG_NKAPC 'ansU' -#define USERTAG_NOTIFY 'ynsU' -#define USERTAG_POWERBROADCAST 'bpsU' -#define USERTAG_PROCESSINFO 'ipsU' -#define USERTAG_POPUPMENU 'mpsU' -#define USERTAG_PROFILEUSERNAME 'npsU' -#define USERTAG_POWER 'opsU' -#define USERTAG_PNP 'ppsU' -#define USERTAG_PROFILE 'rpsU' -#define USERTAG_WINDOWARRAY 'wpsU' -#define USERTAG_SQM 'mqsU' -#define USERTAG_QMSG 'mqsU' -#define USERTAG_Q 'uqsU' -#define USERTAG_RTL 'trsU' -#define USERTAG_SMS_ASYNC 'assU' -#define USERTAG_SPB 'bssU' -#define USERTAG_SMS_CAPTURE 'cssU' -#define USERTAG_SHADOW 'dssU' -#define USERTAG_SECURITY 'essU' -#define USERTAG_SENDINPUT 'issU' -#define USERTAG_SENDTOUCHINPUT 'jssU' -#define USERTAG_SMS 'mssU' -#define USERTAG_SMS_STRING 'sssU' -#define USERTAG_SCROLLTRACK 'tssU' -#define USERTAG_SWP 'wssU' -#define USERTAG_SYSTEM 'yssU' -#define USERTAG_TRACKDESKTOP 'dtsU' -#define USERTAG_THREADINFO 'itsU' -#define USERTAG_STACK 'ktsU' -#define USERTAG_TIMER 'mtsU' -#define USERTAG_TOKEN 'otsU' -#define USERTAG_SECTION 'stsU' -#define USERTAG_TEXT 'xtsU' -#define USERTAG_TEXT2 'ytsU' -#define USERTAG_TOUCHINPUTINFO 'ztsU' -#define USERTAG_UNICODEBUFFER 'busU' -#define USERTAG_UIPI_SQM 'susU' -#define USERTAG_VISRGN 'ivsU' -#define USERTAG_VWPL 'lvsU' -#define USERTAG_WINDOW 'dwsU' -#define USERTAG_WINEVENT 'ewsU' -#define USERTAG_WINDOWLIST 'lwsU' -#define USERTAG_WOWTDB 'owsU' -#define USERTAG_WOWPROCESSINFO 'pwsU' -#define USERTAG_WOWTHREADINFO 'twsU' +#define GDITAG_HMGR_LOOKASIDE_START '0alG' +#define GDITAG_HMGR_LOOKASIDE_DC_TYPE '1alG' +#define GDITAG_HMGR_LOOKASIDE_RGN_TYPE '4alG' +#define GDITAG_HMGR_LOOKASIDE_SURF_TYPE '5alG' +#define GDITAG_HMGR_LOOKASIDE_PAL_TYPE '8alG' +#define GDITAG_LDEV 'vdlG' +#define GDITAG_LOCALEINFO 'dilG' +#define GDITAG_PFE_LINK 'knlG' +#define GDITAG_FONT_MAPPER 'pamG' +#define GDITAG_DISPURF_SORT 'osmG' +#define GDITAG_MULTIFONT 'lumG' +#define GDITAG_NLS 'slnG' +#define GDITAG_OPENGL 'lgoG' +#define GDITAG_OPM 'MPOG' +#define GDITAG_PALETTE 'laPG' +#define GDITAG_PANNING_PDEV 'napG' +#define GDITAG_PATHOBJ 'tapG' +#define GDITAG_PFF_INDEXES 'efpG' +#define GDITAG_PFF 'ffpG' +#define GDITAG_PFT 'tfpG' +#define GDITAG_PLGBLT_DATA 'bgpG' +#define GDITAG_PRINTCLIENTID 'dipG' +#define GDITAG_CLIP_PATHOBJ 'oppG' +#define GDITAG_PROXYPORT 'tppG' +#define GDITAG_PRESENT 'erpG' +#define GDITAG_LFONT_QUICKLOOKUP 'knqG' +#define GDITAG_PALETTE_RGB_XLATE 'bgrG' +#define GDITAG_REGION 'ngrG' +#define GDITAG_SEMAPHORE 'mesG' +#define GDITAG_SPRITE ' psG' +#define GDITAG_METASPRITE 'mpsG' +#define GDITAG_SPRITESCAN 'rpsG' +#define GDITAG_STACKTRACE 'atsG' +#define GDITAG_STRETCHBLT 'htsG' +#define GDITAG_PENSTYLE 'ytsG' +#define GDITAG_SFM 'xusG' +#define GDITAG_TEMP 'pmtG' +#define GDITAG_TEMP_THREADLOCK 'pmTG' +#define GDITAG_TEXTMETRICS 'wmtG' +#define GDITAG_PFF_DATA 'pvtG' +#define GDITAG_TRIANGLE_MESH 'tvtG' +#define GDITAG_TEXT 'txtG' +#define GDITAG_UMODE_BITMAP 'mbuG' +#define GDITAG_ENG_USER_MEM_ALLOC_TABLE 'amUG' +#define GDITAG_UMPD 'pmuG' +#define GDITAG_HDEV 'sdvG' +#define GDITAG_VDEV 'vdVG' +#define GDITAG_MULTISAVEBITS 'smVG' +#define GDITAG_MDSURF 'fsVG' +#define GDITAG_WNDOBJ 'dnwG' +#define GDITAG_PXLATE 'tlxG' +#define GDITAG_UMPDOBJ 'dpxG' +#define GDITAG_FONT_LINK 'flnk' +#define GDITAG_PANNING_SURFACE 'fSAP' +#define GDITAG_PANNING_SHADOWLOCK 'olSP' +#define GDITAG_SINGLEREADERLOCK 'lrsS' +#define GDITAG_TT_FONT_CACHE 'CFTT' +#define GDITAG_TT_FONT 'dftT' +#define GDITAG_VF_FONT 'dftV' +#define GDITAG_W32PIDLOCK 'l23W' +#define GDITAG_HANDLEPUSHLOCK 'lpHG' + +#define USERTAG_SERVICE_TABLE 'lacU' +#define USERTAG_MONITOR_MARGIN 'mamU' +#define USERTAG_REDIRECT 'rdrU' +#define USERTAG_ACCEL 'casU' +#define USERTAG_ATTACHINFO 'iasU' +#define USERTAG_ALTTAB 'lasU' +#define USERTAG_DEBUG 'gbsU' +#define USERTAG_CLIPBOARD 'bcsU' +#define USERTAG_CALLBACK 'ccsU' +#define USERTAG_COMPOSITIONPROP 'dcsU' +#define USERTAG_CLIENTTHREADINFO 'icsU' +#define USERTAG_CLASS 'lcsU' +#define USERTAG_SCANCODEMAP 'mcsU' +#define USERTAG_CLIPBOARDPALETTE 'pcsU' +#define USERTAG_COLORS 'rcsU' +#define USERTAG_CHECKPT 'tcsU' +#define USERTAG_CURSOR 'ucsU' +#define USERTAG_COLORVALUES 'vcsU' +#define USERTAG_DDE1 '1dsU' +#define USERTAG_DDE2 '2dsU' +#define USERTAG_DDE4 '4dsU' +#define USERTAG_DDE5 '5dsU' +#define USERTAG_DDE6 '6dsU' +#define USERTAG_DDE7 '7dsU' +#define USERTAG_DDE8 '8dsU' +#define USERTAG_DDE9 '9dsU' +#define USERTAG_DDEa 'AdsU' +#define USERTAG_DDEb 'BdsU' +#define USERTAG_DCE 'cdsU' +#define USERTAG_DDEd 'DdsU' +#define USERTAG_DDE 'EdsU' +#define USERTAG_DEVICEINFO 'IDsU' +#define USERTAG_DISPLAYINFO 'idsU' +#define USERTAG_DRAGDROP 'sdsU' +#define USERTAG_DEVICECHANGE 'vdsU' +#define USERTAG_WSEXCOMPINVALID 'CEsU' +#define USERTAG_ERESOURCE 'resU' +#define USERTAG_EVENT 'vesU' +#define USERTAG_FORWARDTOUCHMESSAGE 'tfsU' +#define USERTAG_GRANTEDHANDLES 'hgsU' +#define USERTAG_GESTUREINFO 'igsU' +#define USERTAG_GLOBALTHREADLOCK 'lgsU' +#define USERTAG_GHOST 'tgsU' +#define USERTAG_HIDDATA 'ahsU' +#define USERTAG_HIDDESC 'DhsU' +#define USERTAG_HOTKEY 'khsU' +#define USERTAG_IMEHOTKEY 'hisU' +#define USERTAG_IME 'misU' +#define USERTAG_W32JOB 'bjsU' +#define USERTAG_W32JOBEXTRA 'xjsU' +#define USERTAG_KBDLAYOUT 'bksU' +#define USERTAG_KBDEXID 'eksU' +#define USERTAG_KBDFILE 'fksU' +#define USERTAG_KBDSTATE 'sksU' +#define USERTAG_KBDTABLE 'tksU' +#define USERTAG_LOOKASIDE 'alsU' +#define USERTAG_LOGDESKTOP 'dlsU' +#define USERTAG_LOCKRECORD 'rlsU' +#define USERTAG_MAGNIFICATION 'gmsU' +#define USERTAG_MIRROR 'imsU' +#define USERTAG_MESSAGE_FILTER 'lmsU' +#define USERTAG_MONITORRECTS 'rmsU' +#define USERTAG_MOVESIZE 'smsU' +#define USERTAG_MENUSTATE 'tmsU' +#define USERTAG_NKAPC 'ansU' +#define USERTAG_NOTIFY 'ynsU' +#define USERTAG_POWERBROADCAST 'bpsU' +#define USERTAG_PROCESSINFO 'ipsU' +#define USERTAG_POPUPMENU 'mpsU' +#define USERTAG_PROFILEUSERNAME 'npsU' +#define USERTAG_POWER 'opsU' +#define USERTAG_PNP 'ppsU' +#define USERTAG_PROFILE 'rpsU' +#define USERTAG_WINDOWARRAY 'wpsU' +#define USERTAG_SQM 'mqsU' +#define USERTAG_QMSG 'mqsU' +#define USERTAG_Q 'uqsU' +#define USERTAG_RTL 'trsU' +#define USERTAG_SMS_ASYNC 'assU' +#define USERTAG_SPB 'bssU' +#define USERTAG_SMS_CAPTURE 'cssU' +#define USERTAG_SHADOW 'dssU' +#define USERTAG_SECURITY 'essU' +#define USERTAG_SENDINPUT 'issU' +#define USERTAG_SENDTOUCHINPUT 'jssU' +#define USERTAG_SMS 'mssU' +#define USERTAG_SMS_STRING 'sssU' +#define USERTAG_SCROLLTRACK 'tssU' +#define USERTAG_SWP 'wssU' +#define USERTAG_SYSTEM 'yssU' +#define USERTAG_TRACKDESKTOP 'dtsU' +#define USERTAG_THREADINFO 'itsU' +#define USERTAG_STACK 'ktsU' +#define USERTAG_TIMER 'mtsU' +#define USERTAG_TOKEN 'otsU' +#define USERTAG_SECTION 'stsU' +#define USERTAG_TEXT 'xtsU' +#define USERTAG_TEXT2 'ytsU' +#define USERTAG_TOUCHINPUTINFO 'ztsU' +#define USERTAG_UNICODEBUFFER 'busU' +#define USERTAG_UIPI_SQM 'susU' +#define USERTAG_VISRGN 'ivsU' +#define USERTAG_VWPL 'lvsU' +#define USERTAG_WINDOW 'dwsU' +#define USERTAG_WINEVENT 'ewsU' +#define USERTAG_WINDOWLIST 'lwsU' +#define USERTAG_WOWTDB 'owsU' +#define USERTAG_WOWPROCESSINFO 'pwsU' +#define USERTAG_WOWTHREADINFO 'twsU' Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -370,7 +370,7 @@ Accel->Count = EntriesCount; if (Accel->Count > 0) { - Accel->Table = ExAllocatePoolWithTag(PagedPool, EntriesCount * sizeof(ACCEL), TAG_ACCEL); + Accel->Table = ExAllocatePoolWithTag(PagedPool, EntriesCount * sizeof(ACCEL), USERTAG_ACCEL); if (Accel->Table == NULL) { UserDereferenceObject(Accel); @@ -388,10 +388,10 @@ } else { - RtlMultiByteToUnicodeN(&Accel->Table[Index].key, - sizeof(WCHAR), - NULL, - (PCSTR)&Entries[Index].key, + RtlMultiByteToUnicodeN(&Accel->Table[Index].key, + sizeof(WCHAR), + NULL, + (PCSTR)&Entries[Index].key, sizeof(CHAR)); } @@ -438,7 +438,7 @@ if (Accel->Table != NULL) { - ExFreePoolWithTag(Accel->Table, TAG_ACCEL); + ExFreePoolWithTag(Accel->Table, USERTAG_ACCEL); Accel->Table = NULL; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -35,7 +35,7 @@ PTHREADINFO W32Thread; if(!(Mem = ExAllocatePoolWithTag(PagedPool, Size + sizeof(INT_CALLBACK_HEADER), - TAG_CALLBACK))) + USERTAG_CALLBACK))) { return NULL; } @@ -67,7 +67,7 @@ RemoveEntryList(&Mem->ListEntry); /* free memory */ - ExFreePoolWithTag(Mem, TAG_CALLBACK); + ExFreePoolWithTag(Mem, USERTAG_CALLBACK); } VOID FASTCALL @@ -475,15 +475,15 @@ case WH_MOUSE: RtlCopyMemory(Extra, (PVOID) lParam, sizeof(MOUSEHOOKSTRUCT)); Common->lParam = (LPARAM) (Extra - (PCHAR) Common); - break; + break; case WH_CALLWNDPROC: RtlCopyMemory(Extra, (PVOID) lParam, sizeof(CWPSTRUCT)); Common->lParam = (LPARAM) (Extra - (PCHAR) Common); - break; + break; case WH_CALLWNDPROCRET: RtlCopyMemory(Extra, (PVOID) lParam, sizeof(CWPRETSTRUCT)); Common->lParam = (LPARAM) (Extra - (PCHAR) Common); - break; + break; case WH_MSGFILTER: case WH_SYSMSGFILTER: case WH_GETMESSAGE: @@ -494,7 +494,7 @@ case WH_FOREGROUNDIDLE: case WH_KEYBOARD: case WH_SHELL: - break; + break; } ResultPointer = NULL; @@ -618,7 +618,7 @@ UserEnterCo(); IntCbFreeMemory(Argument); - + if (!NT_SUCCESS(Status)) { return 0; @@ -654,7 +654,7 @@ Common = (PLOADMENU_CALLBACK_ARGUMENTS) Argument; // Help Intersource check and MenuName is now 4 bytes + so zero it. - RtlZeroMemory(Common, ArgumentLength); + RtlZeroMemory(Common, ArgumentLength); Common->hModule = hModule; if (pMenuName->Length) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -192,7 +192,7 @@ RETURN( FALSE); } - HotKeyItem = ExAllocatePoolWithTag (PagedPool, sizeof(HOT_KEY_ITEM), TAG_HOTKEY); + HotKeyItem = ExAllocatePoolWithTag (PagedPool, sizeof(HOT_KEY_ITEM), USERTAG_HOTKEY); if (HotKeyItem == NULL) { RETURN( FALSE); @@ -235,7 +235,7 @@ if (HotKeyItem->hWnd == hWnd && HotKeyItem->id == id) { RemoveEntryList (&HotKeyItem->ListEntry); - ExFreePool (HotKeyItem); + ExFreePoolWithTag(HotKeyItem, USERTAG_HOTKEY); RETURN( TRUE); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -376,7 +376,7 @@ Ret = ExAllocatePoolWithTag(PagedPool, Size, - TAG_KEYBOARD); + USERTAG_KBDTABLE); while (Ret) { @@ -392,13 +392,13 @@ if (Status != STATUS_BUFFER_TOO_SMALL) break; - ExFreePoolWithTag(Ret, TAG_KEYBOARD); + ExFreePoolWithTag(Ret, USERTAG_KBDTABLE); Size += sizeof(KEYBOARD_INDICATOR_TRANSLATION); Ret = ExAllocatePoolWithTag(PagedPool, Size, - TAG_KEYBOARD); + USERTAG_KBDTABLE); } if (!Ret) @@ -406,7 +406,7 @@ if (Status != STATUS_SUCCESS) { - ExFreePoolWithTag(Ret, TAG_KEYBOARD); + ExFreePoolWithTag(Ret, USERTAG_KBDTABLE); return Status; } @@ -942,7 +942,7 @@ KeInitializeEvent(&InputThreadsStart, NotificationEvent, FALSE); - MasterTimer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KTIMER), TAG_INPUT); + MasterTimer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KTIMER), USERTAG_SYSTEM); if (!MasterTimer) { DPRINT1("Win32K: Failed making Raw Input thread a win32 thread.\n"); @@ -1423,7 +1423,7 @@ /* If Attach set, allocate and link. */ if ( fAttach ) { - pai = ExAllocatePoolWithTag(PagedPool, sizeof(ATTACHINFO), TAG_ATTACHINFO); + pai = ExAllocatePoolWithTag(PagedPool, sizeof(ATTACHINFO), USERTAG_ATTACHINFO); if ( !pai ) return FALSE; pai->paiNext = gpai; @@ -1451,7 +1451,7 @@ if (paiprev) paiprev->paiNext = pai->paiNext; - ExFreePoolWithTag(pai, TAG_ATTACHINFO); + ExFreePoolWithTag(pai, USERTAG_ATTACHINFO); } return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -196,7 +196,7 @@ ULONG hKl; LANGID langid; - NewKbl = ExAllocatePoolWithTag(PagedPool, sizeof(KBL), TAG_KEYBOARD); + NewKbl = ExAllocatePoolWithTag(PagedPool, sizeof(KBL), USERTAG_KBDLAYOUT); if(!NewKbl) { @@ -209,7 +209,7 @@ if(!UserLoadKbdDll(NewKbl->Name, &NewKbl->hModule, &NewKbl->KBTables)) { DPRINT("%s: failed to load %x dll!\n", __FUNCTION__, LocaleId); - ExFreePoolWithTag(NewKbl, TAG_KEYBOARD); + ExFreePoolWithTag(NewKbl, USERTAG_KBDLAYOUT); return NULL; } @@ -398,7 +398,7 @@ //Unload the layout EngUnloadImage(pKbl->hModule); RemoveEntryList(&pKbl->List); - ExFreePoolWithTag(pKbl, TAG_KEYBOARD); + ExFreePoolWithTag(pKbl, USERTAG_KBDLAYOUT); } return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -566,10 +566,10 @@ if (ForegroundQueue) ptiForeground = ForegroundQueue->Thread->Tcb.Win32Thread; - + pti = PsGetCurrentThreadWin32Thread(); - if ( pti ) + if ( pti ) { pti->pClientInfo->cSpins = 0; // Reset spins. @@ -696,7 +696,7 @@ (LPARAM)Time, 0); } - return retval; + return retval; } else { @@ -713,7 +713,7 @@ // Need a window! if ( !Window ) return 0; - /* Since we are doing a callback on the same thread right away, there is + /* Since we are doing a callback on the same thread right away, there is no need to copy the lparam to kernel mode and then back to usermode. We just pretend it isn't a pointer */ @@ -842,12 +842,12 @@ } if ((ProcessMask & QS_INPUT) && - co_MsqPeekHardwareMessage( ThreadQueue, - RemoveMessages, - Window, - MsgFilterMin, + co_MsqPeekHardwareMessage( ThreadQueue, + RemoveMessages, + Window, + MsgFilterMin, MsgFilterMax, - ProcessMask, + ProcessMask, Msg)) { return TRUE; @@ -1124,9 +1124,9 @@ EngSetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - co_IntSendMessageNoWait(KernelModeMsg.hwnd, - KernelModeMsg.message, - KernelModeMsg.wParam, + co_IntSendMessageNoWait(KernelModeMsg.hwnd, + KernelModeMsg.message, + KernelModeMsg.wParam, KernelModeMsg.lParam); if (MsgMemoryEntry && KernelModeMsg.lParam) @@ -1164,7 +1164,7 @@ { UserPostMessage(List[i], Msg, wParam, lParam); } - ExFreePoolWithTag(List,TAG_WINLIST);//ExFreePool(List); + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } } else @@ -1190,13 +1190,13 @@ /* FIXME - last error code? */ return FALSE; } - + if (WM_QUIT == Msg) { MsqPostQuitMessage(Window->head.pti->MessageQueue, wParam); } else - { + { MsqPostMessage(Window->head.pti->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); } } @@ -1401,7 +1401,7 @@ return (LRESULT) TRUE; } -LRESULT FASTCALL +LRESULT FASTCALL co_IntSendMessageNoWait(HWND hWnd, UINT Msg, WPARAM wParam, @@ -1538,7 +1538,7 @@ Message->QS_Flags = QS_SENDMESSAGE; MsqWakeQueue(Window->head.pti->MessageQueue, QS_SENDMESSAGE, FALSE); - + InsertTailList(&Window->head.pti->MessageQueue->SentMessagesListHead, &Message->ListEntry); IntDereferenceMessageQueue(Window->head.pti->MessageQueue); @@ -1689,9 +1689,9 @@ // wine: Changes &= (QS_ALLINPUT|QS_ALLPOSTMESSAGE|QS_SMRESULT); - /* High word, types of messages currently in the queue. + /* High word, types of messages currently in the queue. Low word, types of messages that have been added to the queue and that - are still in the queue + are still in the queue */ Result = MAKELONG(pti->pcti->fsChangeBits & Changes, pti->pcti->fsWakeBits & Changes); @@ -1762,7 +1762,7 @@ ret = UserPostThreadMessage( idThread, Msg, wParam, lParam); UserLeave(); - + return ret; } @@ -1776,7 +1776,7 @@ ret = co_IntWaitMessage(NULL, 0, 0); DPRINT("NtUserWaitMessage Leave\n"); UserLeave(); - + return ret; } @@ -1859,7 +1859,7 @@ } _SEH2_END; } - + return Ret; } @@ -1963,7 +1963,7 @@ BOOL APIENTRY NtUserMessageCall( HWND hWnd, - UINT Msg, + UINT Msg, WPARAM wParam, LPARAM lParam, ULONG_PTR ResultInfo, @@ -2076,7 +2076,7 @@ { CALL_BACK_INFO CallBackInfo; ULONG_PTR uResult; - + _SEH2_TRY { ProbeForRead((PVOID)ResultInfo, sizeof(CALL_BACK_INFO), 1); @@ -2133,7 +2133,7 @@ } _SEH2_END; } - + Ret = co_IntDoSendMessage( hWnd, Msg, wParam, lParam, &dsm ); if (pdsm) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -121,7 +121,7 @@ pti = Queue->Thread->Tcb.Win32Thread; if (MessageBits & QS_KEY) - { + { if (--Queue->nCntsQBits[QSRosKey] == 0) ClrMask |= QS_KEY; } if (MessageBits & QS_MOUSEMOVE) // ReactOS hard coded. @@ -244,7 +244,7 @@ pwnd != NULL; pwnd = pwnd->spwndNext ) { - if((pwnd->style & WS_VISIBLE) && + if((pwnd->style & WS_VISIBLE) && IntPtInWindow(pwnd, Msg->pt.x, Msg->pt.y)) { Msg->hwnd = pwnd->head.h; @@ -869,7 +869,7 @@ if (pwndParent == pwndDesktop) break; pt.x += pwnd->rcClient.left - pwndParent->rcClient.left; pt.y += pwnd->rcClient.top - pwndParent->rcClient.top; - + pwnd = pwndParent; co_IntSendMessage( UserHMGetHandle(pwnd), WM_PARENTNOTIFY, MAKEWPARAM( event, idChild ), MAKELPARAM( pt.x, pt.y ) ); @@ -911,7 +911,7 @@ } DPRINT("Got mouse message for 0x%x, hittest: 0x%x\n", msg->hwnd, hittest ); - + if (pwndMsg == NULL || pwndMsg->head.pti != pti) { /* Remove and ignore the message */ @@ -981,7 +981,7 @@ } } - if (!((first == 0 && last == 0) || (message >= first || message <= last))) + if (!((first == 0 && last == 0) || (message >= first || message <= last))) { DPRINT("Message out of range!!!\n"); RETURN(FALSE); @@ -1104,8 +1104,8 @@ if (pwndTop && pwndTop != pwndDesktop) { - LONG ret = co_IntSendMessage( msg->hwnd, - WM_MOUSEACTIVATE, + LONG ret = co_IntSendMessage( msg->hwnd, + WM_MOUSEACTIVATE, (WPARAM)UserHMGetHandle(pwndTop), MAKELONG( hittest, msg->message)); switch(ret) @@ -1259,7 +1259,7 @@ CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); - do + do { if (IsListEmpty(CurrentEntry)) break; if (!CurrentMessage) break; @@ -1305,7 +1305,7 @@ PLIST_ENTRY CurrentEntry; PUSER_MESSAGE CurrentMessage; PLIST_ENTRY ListHead; - + CurrentEntry = MessageQueue->PostedMessagesListHead.Flink; ListHead = &MessageQueue->PostedMessagesListHead; @@ -1351,7 +1351,7 @@ ret = KeWaitForSingleObject(MessageQueue->NewMessages, Executive, UserMode, - FALSE, + FALSE, NULL); UserEnterCo(); return ret; @@ -1414,7 +1414,7 @@ PUSER_MESSAGE CurrentMessage; PUSER_SENT_MESSAGE CurrentSentMessage; PTHREADINFO pti; - + pti = MessageQueue->Thread->Tcb.Win32Thread; @@ -1437,7 +1437,7 @@ DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); /* remove the message from the dispatching list if needed */ - if ((!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) + if ((!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) && (CurrentSentMessage->DispatchingListEntry.Flink != NULL)) { RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); @@ -1539,7 +1539,7 @@ MessageQueue = (PUSER_MESSAGE_QUEUE)ExAllocatePoolWithTag(NonPagedPool, sizeof(USER_MESSAGE_QUEUE) + sizeof(THRDCARETINFO), - TAG_MSGQ); + USERTAG_Q); if (!MessageQueue) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -82,14 +82,14 @@ { PDCE pDce; - pDce = ExAllocatePoolWithTag(PagedPool, sizeof(DCE), TAG_PDCE); + pDce = ExAllocatePoolWithTag(PagedPool, sizeof(DCE), USERTAG_DCE); if(!pDce) return NULL; pDce->hDC = DceCreateDisplayDC(); if (!pDce->hDC) { - ExFreePoolWithTag(pDce, TAG_PDCE); + ExFreePoolWithTag(pDce, USERTAG_DCE); return NULL; } DCECount++; @@ -246,7 +246,7 @@ } while (pLE != &LEDce ); } -#endif +#endif } return 1; // Released! } @@ -461,7 +461,7 @@ if (!Dce) break; // // The way I understand this, you can have more than one DC per window. -// Only one Owned if one was requested and saved and one Cached. +// Only one Owned if one was requested and saved and one Cached. // if ((Dce->DCXFlags & (DCX_CACHE | DCX_DCEBUSY)) == DCX_CACHE) { @@ -510,7 +510,7 @@ KeLeaveCriticalRegion(); if ( (Flags & (DCX_INTERSECTRGN|DCX_EXCLUDERGN)) && - (Dce->DCXFlags & (DCX_INTERSECTRGN|DCX_EXCLUDERGN)) ) + (Dce->DCXFlags & (DCX_INTERSECTRGN|DCX_EXCLUDERGN)) ) { DceDeleteClipRgn(Dce); } @@ -593,7 +593,7 @@ NtGdiSetLayout(Dce->hDC, -1, LAYOUT_RTL); } - if (Dce->DCXFlags & DCX_PROCESSOWNED) + if (Dce->DCXFlags & DCX_PROCESSOWNED) { ppi = PsGetCurrentProcessWin32Process(); ppi->W32PF_flags |= W32PF_OWNDCCLEANUP; @@ -657,7 +657,7 @@ return NULL; } - ExFreePoolWithTag(pdce, TAG_PDCE); + ExFreePoolWithTag(pdce, USERTAG_DCE); DCECount--; DPRINT("Freed DCE's! %d \n", DCECount); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -201,7 +201,7 @@ for (Child = Window->spwndChild; Child; Child = Child->spwndNext) ++NumChildren; - List = ExAllocatePoolWithTag(PagedPool, (NumChildren + 1) * sizeof(HWND), TAG_WINLIST); + List = ExAllocatePoolWithTag(PagedPool, (NumChildren + 1) * sizeof(HWND), USERTAG_WINDOWLIST); if(!List) { DPRINT1("Failed to allocate memory for children array\n"); @@ -297,7 +297,7 @@ PCLIENTINFO ClientInfo = GetWin32ClientInfo(); if (!Wnd) return; - + if (ClientInfo->CallbackWnd.pWnd == DesktopHeapAddressToUser(Wnd)) { ClientInfo->CallbackWnd.hWnd = NULL; @@ -942,8 +942,8 @@ } -/* - link the window into siblings list +/* + link the window into siblings list children and parent are kept in place. */ VOID FASTCALL @@ -975,14 +975,14 @@ { if (hWndPrev == HWND_NOTOPMOST) { - if (!(Wnd->ExStyle & WS_EX_TOPMOST) && + if (!(Wnd->ExStyle & WS_EX_TOPMOST) && (Wnd->ExStyle2 & WS_EX2_LINKED)) return; /* nothing to do */ Wnd->ExStyle &= ~WS_EX_TOPMOST; hWndPrev = HWND_TOP; /* fallback to the HWND_TOP case */ } IntUnlinkWindow(Wnd); /* unlink it from the previous location */ - + if (hWndPrev == HWND_BOTTOM) { /* Link in the bottom of the list */ @@ -1042,7 +1042,7 @@ IntLinkWindow(Wnd, WndInsertAfter); /* Fix the WS_EX_TOPMOST flag */ - if (!(WndInsertAfter->ExStyle & WS_EX_TOPMOST)) + if (!(WndInsertAfter->ExStyle & WS_EX_TOPMOST)) { Wnd->ExStyle &= ~WS_EX_TOPMOST; } @@ -1253,13 +1253,13 @@ { if (Wnd->spwndNext) Wnd->spwndNext->spwndPrev = Wnd->spwndPrev; - + if (Wnd->spwndPrev) Wnd->spwndPrev->spwndNext = Wnd->spwndNext; if (Wnd->spwndParent && Wnd->spwndParent->spwndChild == Wnd) Wnd->spwndParent->spwndChild = Wnd->spwndNext; - + Wnd->spwndPrev = Wnd->spwndNext = NULL; } @@ -1556,7 +1556,7 @@ { co_IntSendMessage( pWindow->spwndParent->head.h, WM_PARENTNOTIFY, - MAKEWPARAM( msg, pWindow->IDMenu), + MAKEWPARAM( msg, pWindow->IDMenu), (LPARAM)pWindow->head.h ); } } @@ -1645,8 +1645,8 @@ } /* Allocates and initializes a window*/ -PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, - PLARGE_STRING WindowName, +PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, + PLARGE_STRING WindowName, PCLS Class, PWND ParentWindow, PWND OwnerWindow) @@ -1670,7 +1670,7 @@ Cs->dwExStyle |= WS_EX_LAYOUTRTL; } else - {/* + {/* Note from MSDN http://msdn.microsoft.com/en-us/library/aa913269.aspx : Dialog boxes and message boxes do not inherit layout, so you must @@ -1684,7 +1684,7 @@ Cs->dwExStyle |= WS_EX_LAYOUTRTL; } } - } + } } /* Automatically add WS_EX_WINDOWEDGE */ @@ -1762,7 +1762,7 @@ if (bUnicodeWindow) { if (GETPFNCLIENTA(pWnd->pcls->fnid) == pWnd->lpfnWndProc) - pWnd->lpfnWndProc = GETPFNCLIENTW(pWnd->pcls->fnid); + pWnd->lpfnWndProc = GETPFNCLIENTW(pWnd->pcls->fnid); } else { @@ -1807,7 +1807,7 @@ } /* BugBoy Comments: if the window being created is a edit control, ATOM 0xCxxx, - then my testing shows that windows (2k and XP) creates a CallProc for it immediately + then my testing shows that windows (2k and XP) creates a CallProc for it immediately Dont understand why it does this. */ if (Class->atomClassName == gpsi->atomSysClass[ICLS_EDIT]) { @@ -1916,7 +1916,7 @@ if(pWnd) UserDereferenceObject(pWnd); - + SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); return NULL; } @@ -1995,17 +1995,17 @@ OwnerWindow = UserGetAncestor(OwnerWindow, GA_ROOT); /* Fix the position and the size of the window */ - if (ParentWindow) + if (ParentWindow) { UserRefObjectCo(ParentWindow, &ParentRef); IntFixWindowCoordinates(Cs, ParentWindow, &dwShowMode); } /* Allocate and initialize the new window */ - Window = IntCreateWindow(Cs, - WindowName, - Class, - ParentWindow, + Window = IntCreateWindow(Cs, + WindowName, + Class, + ParentWindow, OwnerWindow); if(!Window) { @@ -2075,7 +2075,7 @@ UnicodeString.MaximumLength = Name.Length + sizeof(UNICODE_NULL); pszName = UserHeapAlloc(UnicodeString.MaximumLength); RtlZeroMemory(pszName, UnicodeString.MaximumLength); - UnicodeString.Buffer = (PWSTR)pszName; + UnicodeString.Buffer = (PWSTR)pszName; RtlCopyUnicodeString(&UnicodeString, &Name); } if (pszName) pCsw->lpszName = UserHeapAddressToUser(pszName); @@ -2124,7 +2124,7 @@ Window->rcWindow.bottom = Cs->y + Size.cy; if (0 != (Window->style & WS_CHILD) && ParentWindow) { - RECTL_vOffsetRect(&Window->rcWindow, + RECTL_vOffsetRect(&Window->rcWindow, ParentWindow->rcClient.left, ParentWindow->rcClient.top); } @@ -2243,7 +2243,7 @@ { DPRINT("co_UserCreateWindowEx(): Error Created window!\n"); /* If the window was created, the class will be dereferenced by co_UserDestroyWindow */ - if (Window) + if (Window) co_UserDestroyWindow(Window); else if (Class) IntDereferenceClass(Class, pti->pDeskInfo, pti->ppi); @@ -2434,7 +2434,7 @@ return hwnd; } - + BOOLEAN FASTCALL co_UserDestroyWindow(PWND Window) { @@ -2661,7 +2661,7 @@ CurrentWindowName.Buffer = Child->strName.Buffer; CurrentWindowName.Length = Child->strName.Length; CurrentWindowName.MaximumLength = Child->strName.MaximumLength; - if(!CheckWindowName || + if(!CheckWindowName || (Child->strName.Length < 0xFFFF && !RtlCompareUnicodeString(WindowName, &CurrentWindowName, TRUE))) { @@ -2838,8 +2838,8 @@ ustr.Buffer = TopLevelWindow->strName.Buffer; ustr.Length = TopLevelWindow->strName.Length; ustr.MaximumLength = TopLevelWindow->strName.MaximumLength; - WindowMatches = !CheckWindowName || - (TopLevelWindow->strName.Length < 0xFFFF && + WindowMatches = !CheckWindowName || + (TopLevelWindow->strName.Length < 0xFFFF && !RtlCompareUnicodeString(&WindowName, &ustr, TRUE)); ClassMatches = (ClassAtom == (RTL_ATOM)0) || ClassAtom == TopLevelWindow->pcls->atomClassName; @@ -3073,7 +3073,7 @@ sizeof(POINT), 1); } - + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -3082,7 +3082,7 @@ } _SEH2_END; - wndpl.length = sizeof(WINDOWPLACEMENT); + wndpl.length = sizeof(WINDOWPLACEMENT); if (IntGetWindowPlacement(Window, &wndpl) && !Hit) { @@ -3096,7 +3096,7 @@ { RtlCopyMemory(ptIcon, &wndpl.ptMinPosition, sizeof(POINT)); } - + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -3893,7 +3893,7 @@ RETURN( FALSE); } } - + Wnd->fnid |= fnID; RETURN( TRUE); Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -489,8 +489,8 @@ * 1 0 1 0 1101xax = 111ax = 11x = 0 * 1 1 0 1 0110xax = 011ax = 01x = 1 * 1 1 1 1 1111xax = 110ax = 10x = 1 - * - * Operation index = 11001010 = 0xCA = PSaDPnao = DPSDxax + * + * Operation index = 11001010 = 0xCA = PSaDPnao = DPSDxax * ^ no, this is not random letters, its reverse Polish notation */ @@ -1062,7 +1062,7 @@ if (cRects > 0) { - rb = ExAllocatePoolWithTag(PagedPool, sizeof(PATRECT) * cRects, TAG_PATBLT); + rb = ExAllocatePoolWithTag(PagedPool, sizeof(PATRECT) * cRects, GDITAG_PLGBLT_DATA); if (!rb) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -1085,7 +1085,7 @@ if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(rb, TAG_PATBLT); + ExFreePoolWithTag(rb, GDITAG_PLGBLT_DATA); SetLastNtError(Status); return FALSE; } @@ -1094,7 +1094,7 @@ Ret = IntGdiPolyPatBlt(hDC, dwRop, rb, cRects, Mode); if (cRects > 0) - ExFreePoolWithTag(rb, TAG_PATBLT); + ExFreePoolWithTag(rb, GDITAG_PLGBLT_DATA); return Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -275,7 +275,7 @@ Size = Count * sizeof(POINT); // FIXME: It would be wise to have a small stack buffer as optimization - Points = ExAllocatePoolWithTag(PagedPool, Size, TAG_COORD); + Points = ExAllocatePoolWithTag(PagedPool, Size, GDITAG_TEMP); if (!Points) { DC_UnlockDc(pdc); @@ -333,7 +333,7 @@ // leave: DC_UnlockDc(pdc); - ExFreePoolWithTag(Points, TAG_COORD); + ExFreePoolWithTag(Points, GDITAG_TEMP); return ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -5,7 +5,7 @@ * PURPOSE: Font * PROGRAMMER: */ - + /** Includes ******************************************************************/ #include <win32k.h> @@ -60,7 +60,7 @@ EngSetLastError(ERROR_INSUFFICIENT_BUFFER); return 0; } - pKP = ExAllocatePoolWithTag(PagedPool, Count * sizeof(KERNINGPAIR), TAG_GDITEXT); + pKP = ExAllocatePoolWithTag(PagedPool, Count * sizeof(KERNINGPAIR), GDITAG_TEXT); if (!pKP) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -70,7 +70,7 @@ RtlCopyMemory(krnpair, pKP, Count * sizeof(KERNINGPAIR)); - ExFreePoolWithTag(pKP,TAG_GDITEXT); + ExFreePoolWithTag(pKP,GDITAG_TEXT); } return Count; } @@ -449,7 +449,7 @@ hFont = pdcattr->hlfntNew; TextObj = RealizeFontInit(hFont); - + if ( TextObj == NULL) { EngSetLastError(ERROR_INVALID_HANDLE); @@ -461,7 +461,7 @@ if (Size && pgs) { - pgsSafe = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + pgsSafe = ExAllocatePoolWithTag(PagedPool, Size, GDITAG_TEXT); if (!pgsSafe) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -472,7 +472,7 @@ Size = ftGetFontUnicodeRanges( FontGdi, pgsSafe); if (Size) - { + { _SEH2_TRY { ProbeForWrite(pgs, Size, 1); @@ -486,7 +486,7 @@ if (!NT_SUCCESS(Status)) Size = 0; } - ExFreePoolWithTag(pgsSafe, TAG_GDITEXT); + ExFreePoolWithTag(pgsSafe, GDITAG_TEXT); } Exit: TEXTOBJ_UnlockText(TextObj); @@ -521,7 +521,7 @@ if (UnsafeBuf && cjBuf) { - pvBuf = ExAllocatePoolWithTag(PagedPool, cjBuf, TAG_GDITEXT); + pvBuf = ExAllocatePoolWithTag(PagedPool, cjBuf, GDITAG_TEXT); if (!pvBuf) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -551,7 +551,7 @@ } _SEH2_END - ExFreePoolWithTag(pvBuf, TAG_GDITEXT); + ExFreePoolWithTag(pvBuf, GDITAG_TEXT); } if (pgm) @@ -622,7 +622,7 @@ EngSetLastError(ERROR_INSUFFICIENT_BUFFER); return 0; } - pKP = ExAllocatePoolWithTag(PagedPool, Count * sizeof(KERNINGPAIR), TAG_GDITEXT); + pKP = ExAllocatePoolWithTag(PagedPool, Count * sizeof(KERNINGPAIR), GDITAG_TEXT); if (!pKP) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -643,8 +643,8 @@ { EngSetLastError(ERROR_INVALID_PARAMETER); Count = 0; - } - ExFreePoolWithTag(pKP,TAG_GDITEXT); + } + ExFreePoolWithTag(pKP,GDITAG_TEXT); } return Count; } @@ -693,7 +693,7 @@ EngSetLastError(ERROR_INSUFFICIENT_BUFFER); return 0; } - potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + potm = ExAllocatePoolWithTag(PagedPool, Size, GDITAG_TEXT); if (!potm) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -719,7 +719,7 @@ Size = 0; } } - ExFreePoolWithTag(potm,TAG_GDITEXT); + ExFreePoolWithTag(potm,GDITAG_TEXT); return Size; } Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -372,7 +372,7 @@ return 0; } - FontGDI = EngAllocMem(FL_ZERO_MEMORY, sizeof(FONTGDI), TAG_FONTOBJ); + FontGDI = EngAllocMem(FL_ZERO_MEMORY, sizeof(FONTGDI), GDITAG_RFONT); if (FontGDI == NULL) { FT_Done_Face(Face); @@ -382,7 +382,7 @@ return 0; } - FontGDI->Filename = ExAllocatePoolWithTag(PagedPool, FileName->Length + sizeof(WCHAR), TAG_PFF); + FontGDI->Filename = ExAllocatePoolWithTag(PagedPool, FileName->Length + sizeof(WCHAR), GDITAG_PFF); if (FontGDI->Filename == NULL) { EngFreeMem(FontGDI); @@ -1019,7 +1019,7 @@ RtlZeroMemory(Info, sizeof(FONTFAMILYINFO)); Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); - Otm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + Otm = ExAllocatePoolWithTag(PagedPool, Size, GDITAG_TEXT); if (!Otm) { return; @@ -1076,7 +1076,7 @@ if (0 == (TM->tmPitchAndFamily & TMPF_VECTOR)) Info->FontType |= RASTER_FONTTYPE; - ExFreePoolWithTag(Otm, TAG_GDITEXT); + ExFreePoolWithTag(Otm, GDITAG_TEXT); wcsncpy(Info->EnumLogFontEx.elfLogFont.lfFaceName, FaceName, LF_FACESIZE); wcsncpy(Info->EnumLogFontEx.elfFullName, FaceName, LF_FULLFACESIZE); @@ -1548,7 +1548,7 @@ orientation = FT_IS_SCALABLE(ft_face) ? TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation: 0; Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); - potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + potm = ExAllocatePoolWithTag(PagedPool, Size, GDITAG_TEXT); if (!potm) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -1615,7 +1615,7 @@ { DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); IntUnLockFreeType; - if (potm) ExFreePoolWithTag(potm, TAG_GDITEXT); + if (potm) ExFreePoolWithTag(potm, GDITAG_TEXT); return GDI_ERROR; } IntUnLockFreeType; @@ -1693,7 +1693,7 @@ needsTransform = TRUE; } - if (potm) ExFreePoolWithTag(potm, TAG_GDITEXT); /* It looks like we are finished with potm ATM.*/ + if (potm) ExFreePoolWithTag(potm, GDITAG_TEXT); /* It looks like we are finished with potm ATM.*/ if (!needsTransform) { @@ -2601,7 +2601,7 @@ } Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); - Otm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + Otm = ExAllocatePoolWithTag(PagedPool, Size, GDITAG_TEXT); if (NULL == Otm) { return Score; @@ -3075,7 +3075,7 @@ } /* Allocate space for a safe copy */ - Info = ExAllocatePoolWithTag(PagedPool, Size * sizeof(FONTFAMILYINFO), TAG_GDITEXT); + Info = ExAllocatePoolWithTag(PagedPool, Size * sizeof(FONTFAMILYINFO), GDITAG_TEXT); if (NULL == Info) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -3682,7 +3682,7 @@ if (BufSize > STACK_TEXT_BUFFER_SIZE) { /* It's not, allocate a temp buffer */ - Buffer = ExAllocatePoolWithTag(PagedPool, BufSize, TAG_GDITEXT); + Buffer = ExAllocatePoolWithTag(PagedPool, BufSize, GDITAG_TEXT); if (!Buffer) { return FALSE; @@ -3753,7 +3753,7 @@ /* If we allocated a buffer, free it */ if (Buffer != LocalBuffer) { - ExFreePoolWithTag(Buffer, TAG_GDITEXT); + ExFreePoolWithTag(Buffer, GDITAG_TEXT); } return Result; @@ -3812,7 +3812,7 @@ } BufferSize = Count * sizeof(ABC); // Same size! - SafeBuff = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT); + SafeBuff = ExAllocatePoolWithTag(PagedPool, BufferSize, GDITAG_TEXT); if (!fl) SafeBuffF = (LPABCFLOAT) SafeBuff; if (SafeBuff == NULL) { @@ -3979,7 +3979,7 @@ } BufferSize = Count * sizeof(INT); // Same size! - SafeBuff = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT); + SafeBuff = ExAllocatePoolWithTag(PagedPool, BufferSize, GDITAG_TEXT); if (!fl) SafeBuffF = (PFLOAT) SafeBuff; if (SafeBuff == NULL) { @@ -4114,7 +4114,7 @@ FontGDI = ObjToGDI(TextObj->Font, FONT); TEXTOBJ_UnlockText(TextObj); - Buffer = ExAllocatePoolWithTag(PagedPool, cwc*sizeof(WORD), TAG_GDITEXT); + Buffer = ExAllocatePoolWithTag(PagedPool, cwc*sizeof(WORD), GDITAG_TEXT); if (!Buffer) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -4125,7 +4125,7 @@ else { Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); - potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + potm = ExAllocatePoolWithTag(PagedPool, Size, GDITAG_TEXT); if (!potm) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -4159,7 +4159,7 @@ RtlCopyMemory( pgi, Buffer, cwc*sizeof(WORD)); ErrorRet: - if (Buffer) ExFreePoolWithTag(Buffer, TAG_GDITEXT); + if (Buffer) ExFreePoolWithTag(Buffer, GDITAG_TEXT); return cwc; } @@ -4210,7 +4210,7 @@ FontGDI = ObjToGDI(TextObj->Font, FONT); TEXTOBJ_UnlockText(TextObj); - Buffer = ExAllocatePoolWithTag(PagedPool, cwc*sizeof(WORD), TAG_GDITEXT); + Buffer = ExAllocatePoolWithTag(PagedPool, cwc*sizeof(WORD), GDITAG_TEXT); if (!Buffer) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -4221,7 +4221,7 @@ else { Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); - potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + potm = ExAllocatePoolWithTag(PagedPool, Size, GDITAG_TEXT); if (!potm) { Status = ERROR_NOT_ENOUGH_MEMORY; @@ -4282,7 +4282,7 @@ _SEH2_END; ErrorRet: - ExFreePoolWithTag(Buffer, TAG_GDITEXT); + ExFreePoolWithTag(Buffer, GDITAG_TEXT); if (NT_SUCCESS(Status)) return cwc; EngSetLastError(Status); return GDI_ERROR; Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -146,7 +146,7 @@ return FALSE; } - SafeRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), TAG_GDIICM); + SafeRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), GDITAG_ICM); if (!SafeRamp) { DC_UnlockDc(dc); @@ -174,7 +174,7 @@ _SEH2_END; DC_UnlockDc(dc); - ExFreePoolWithTag(SafeRamp, TAG_GDIICM); + ExFreePoolWithTag(SafeRamp, GDITAG_ICM); if (!NT_SUCCESS(Status)) { @@ -204,16 +204,16 @@ if (pdcattr->hColorSpace == hColorSpace) { DC_UnlockDc(pDC); - return TRUE; - } - + return TRUE; + } + pCS = COLORSPACEOBJ_LockCS(hColorSpace); if (!pCS) { EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } - + if (pDC->dclevel.pColorSpace) { GDIOBJ_ShareUnlockObjByPtr((POBJ) pDC->dclevel.pColorSpace); @@ -345,7 +345,7 @@ // This way we have a record of the change in memory. if (!pGDev->pvGammaRamp && !(pGDev->flFlags & PDEV_GAMMARAMP_TABLE)) { // If the above is true and we have nothing allocated, create it. - pGDev->pvGammaRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), TAG_GDIICM); + pGDev->pvGammaRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), GDITAG_ICM); pGDev->flFlags |= PDEV_GAMMARAMP_TABLE; } if (pGDev->pvGammaRamp) @@ -377,7 +377,7 @@ return FALSE; } - SafeRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), TAG_GDIICM); + SafeRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), GDITAG_ICM); if (!SafeRamp) { DC_UnlockDc(dc); @@ -402,14 +402,14 @@ if (!NT_SUCCESS(Status)) { DC_UnlockDc(dc); - ExFreePoolWithTag(SafeRamp, TAG_GDIICM); + ExFreePoolWithTag(SafeRamp, GDITAG_ICM); SetLastNtError(Status); return FALSE; } Ret = IntSetDeviceGammaRamp((HDEV)dc->ppdev, SafeRamp, TRUE); DC_UnlockDc(dc); - ExFreePoolWithTag(SafeRamp, TAG_GDIICM); + ExFreePoolWithTag(SafeRamp, GDITAG_ICM); return Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -262,7 +262,7 @@ if (!(pbrLine->flAttrs & GDIBRUSH_IS_NULL)) { - Points = EngAllocMem(0, Count * sizeof(POINT), TAG_COORD); + Points = EngAllocMem(0, Count * sizeof(POINT), GDITAG_TEMP); if (Points != NULL) { psurf = dc->dclevel.pSurface; Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -228,10 +228,10 @@ if (cbCount < cbRetCount) return 0; - if ( (pbrushPen->ulPenStyle & PS_STYLE_MASK) == PS_NULL && + if ( (pbrushPen->ulPenStyle & PS_STYLE_MASK) == PS_NULL && cbCount == sizeof(EXTLOGPEN)) { - pExtLogPen = (PEXTLOGPEN)pBuffer; + pExtLogPen = (PEXTLOGPEN)pBuffer; pExtLogPen->elpPenStyle = pbrushPen->ulPenStyle; pExtLogPen->elpWidth = 0; pExtLogPen->elpBrushStyle = pbrushPen->ulStyle; @@ -331,7 +331,7 @@ if (dwStyleCount > 0) { - pSafeStyle = ExAllocatePoolWithTag(NonPagedPool, dwStyleCount * sizeof(DWORD), TAG_PENSTYLES); + pSafeStyle = ExAllocatePoolWithTag(NonPagedPool, dwStyleCount * sizeof(DWORD), GDITAG_PENSTYLE); if (!pSafeStyle) { SetLastNtError(ERROR_NOT_ENOUGH_MEMORY); @@ -352,7 +352,7 @@ if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - ExFreePoolWithTag(pSafeStyle, TAG_PENSTYLES); + ExFreePoolWithTag(pSafeStyle, GDITAG_PENSTYLE); return 0; } } @@ -371,7 +371,7 @@ if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - if (pSafeStyle) ExFreePoolWithTag(pSafeStyle, TAG_PENSTYLES); + if (pSafeStyle) ExFreePoolWithTag(pSafeStyle, GDITAG_PENSTYLE); return 0; } } @@ -390,7 +390,7 @@ if (!hPen && pSafeStyle) { - ExFreePoolWithTag(pSafeStyle, TAG_PENSTYLES); + ExFreePoolWithTag(pSafeStyle, GDITAG_PENSTYLE); } return hPen; } Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -174,7 +174,7 @@ return -1; } - SafeInData = ExAllocatePoolWithTag ( PagedPool, InSize, TAG_PRINT ); + SafeInData = ExAllocatePoolWithTag ( PagedPool, InSize, GDITAG_TEMP ); if ( !SafeInData ) { DC_UnlockDc(pDC); @@ -197,7 +197,7 @@ if ( !NT_SUCCESS(Status) ) { - ExFreePoolWithTag ( SafeInData, TAG_PRINT ); + ExFreePoolWithTag ( SafeInData, GDITAG_TEMP ); DC_UnlockDc(pDC); SetLastNtError(Status); return -1; @@ -224,13 +224,13 @@ goto freeout; } - SafeOutData = ExAllocatePoolWithTag ( PagedPool, OutSize, TAG_PRINT ); + SafeOutData = ExAllocatePoolWithTag ( PagedPool, OutSize, GDITAG_TEMP ); if ( !SafeOutData ) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); freeout: if ( SafeInData ) - ExFreePoolWithTag ( SafeInData, TAG_PRINT ); + ExFreePoolWithTag ( SafeInData, GDITAG_TEMP ); DC_UnlockDc(pDC); return -1; } @@ -241,7 +241,7 @@ DC_UnlockDc(pDC); if ( SafeInData ) - ExFreePoolWithTag ( SafeInData ,TAG_PRINT ); + ExFreePoolWithTag ( SafeInData ,GDITAG_TEMP ); if ( SafeOutData ) { @@ -258,7 +258,7 @@ } _SEH2_END; - ExFreePoolWithTag ( SafeOutData, TAG_PRINT ); + ExFreePoolWithTag ( SafeOutData, GDITAG_TEMP ); if ( !NT_SUCCESS(Status) ) { SetLastNtError(Status); Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Sun Jan 9 19:51:06 2011 @@ -3,9 +3,9 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: subsystems/win32/win32k/objects/text.c * PURPOSE: Text/Font - * PROGRAMMER: + * PROGRAMMER: */ - + /** Includes ******************************************************************/ #include <win32k.h> @@ -70,7 +70,7 @@ DC_UnlockDc(pdc); return Result; -} +} /* @@ -103,10 +103,10 @@ if ( !Count ) { - if ( Fit ) Fit = 0; + if ( Fit ) Fit = 0; return TRUE; } - + pdc = DC_LockDc(hDC); if (NULL == pdc) { @@ -295,7 +295,7 @@ return TRUE; } - String = ExAllocatePoolWithTag(PagedPool, Count * sizeof(WCHAR), TAG_GDITEXT); + String = ExAllocatePoolWithTag(PagedPool, Count * sizeof(WCHAR), GDITAG_TEXT); if (NULL == String) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -304,10 +304,10 @@ if (NULL != UnsafeDx) { - Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); + Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), GDITAG_TEXT); if (NULL == Dx) { - ExFreePoolWithTag(String, TAG_GDITEXT); + ExFreePoolWithTag(String, GDITAG_TEXT); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -322,9 +322,9 @@ { if (NULL != Dx) { - ExFreePoolWithTag(Dx, TAG_GDITEXT); - } - ExFreePoolWithTag(String, TAG_GDITEXT); + ExFreePoolWithTag(Dx, GDITAG_TEXT); + } + ExFreePoolWithTag(String, GDITAG_TEXT); SetLastNtError(Status); return FALSE; } @@ -334,9 +334,9 @@ { if (NULL != Dx) { - ExFreePoolWithTag(Dx, TAG_GDITEXT); - } - ExFreePoolWithTag(String, TAG_GDITEXT); + ExFreePoolWithTag(Dx, GDITAG_TEXT); + } + ExFreePoolWithTag(String, GDITAG_TEXT); EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -359,12 +359,12 @@ Result = FALSE; DC_UnlockDc(dc); - ExFreePoolWithTag(String, TAG_GDITEXT); + ExFreePoolWithTag(String, GDITAG_TEXT); if (! Result) { if (NULL != Dx) { - ExFreePoolWithTag(Dx, TAG_GDITEXT); + ExFreePoolWithTag(Dx, GDITAG_TEXT); } return FALSE; } @@ -376,7 +376,7 @@ { if (NULL != Dx) { - ExFreePoolWithTag(Dx, TAG_GDITEXT); + ExFreePoolWithTag(Dx, GDITAG_TEXT); } SetLastNtError(Status); return FALSE; @@ -390,7 +390,7 @@ { if (NULL != Dx) { - ExFreePoolWithTag(Dx, TAG_GDITEXT); + ExFreePoolWithTag(Dx, GDITAG_TEXT); } SetLastNtError(Status); return FALSE; @@ -398,7 +398,7 @@ } if (NULL != Dx) { - ExFreePoolWithTag(Dx,TAG_GDITEXT); + ExFreePoolWithTag(Dx,GDITAG_TEXT); } Status = MmCopyToCaller(UnsafeSize, &Size, sizeof(SIZE)); @@ -506,7 +506,7 @@ } else { - ret = fLen; + ret = fLen; } TEXTOBJ_UnlockText(TextObj);

13 years, 10 months

← Newer
1
...
21
22
23
24
25
26
27
...
34
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 January 2011