Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[greatlrd] 28298: update with more test for w32knapi

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Aug 12 16:31:10 2007 New Revision: 28298 URL: http://svn.reactos.org/svn/reactos?rev=28298&view=rev Log: update with more test for w32knapi Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Sun Aug 12 16:31:10 2007 @@ -200,11 +200,13 @@ /* FIXME DD_HALINFO_V4 test */ - RtlCopyMemory(&oldHalInfo, &HalInfo, sizeof(DD_HALINFO)); +/* Next Start 2 */ + RtlCopyMemory(&oldHalInfo, &HalInfo, sizeof(DD_HALINFO)); pHalInfo = &HalInfo; pCallBackFlags = CallBackFlags; RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, @@ -223,8 +225,180 @@ /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); - - + RTEST(pCallBackFlags[0] != 0); + RTEST(pCallBackFlags[1] != 0); + + /* NT4 this will fail */ + RTEST(pCallBackFlags[2] == 0); + +/* Next Start 3 */ + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + puD3dCallbacks = &D3dCallbacks; + + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); + + RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC)== FALSE); + RTEST(pHalInfo != NULL); + RTEST(pCallBackFlags != NULL); + + if (pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE ) + { + RTEST(puD3dCallbacks != NULL); + } + + RTEST(puD3dDriverData == NULL); + RTEST(puD3dBufferCallbacks == NULL); + RTEST(puD3dTextureFormats == NULL); + RTEST(puNumFourCC == NULL); + RTEST(puFourCC == NULL); + ASSERT1(pHalInfo != NULL); + + /* We do not retesting DD_HALINFO, instead we compare it */ + RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); + RTEST(pCallBackFlags[0] != 0); + RTEST(pCallBackFlags[1] != 0); + + /* NT4 this will fail */ + RTEST(pCallBackFlags[2] == 0); + +/* Next Start 4 */ + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + puD3dCallbacks = &D3dCallbacks; + puD3dDriverData = &D3dDriverData; + + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); + RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); + + RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC)== FALSE); + RTEST(pHalInfo != NULL); + RTEST(pCallBackFlags != NULL); + + if (pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE ) + { + RTEST(puD3dCallbacks != NULL); + RTEST(puD3dDriverData != NULL); + } + + RTEST(puD3dBufferCallbacks == NULL); + RTEST(puD3dTextureFormats == NULL); + RTEST(puNumFourCC == NULL); + RTEST(puFourCC == NULL); + ASSERT1(pHalInfo != NULL); + + /* We do not retesting DD_HALINFO, instead we compare it */ + RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); + RTEST(pCallBackFlags[0] != 0); + RTEST(pCallBackFlags[1] != 0); + + /* NT4 this will fail */ + RTEST(pCallBackFlags[2] == 0); + +/* Next Start 5 */ + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + puD3dCallbacks = &D3dCallbacks; + puD3dDriverData = &D3dDriverData; + puD3dBufferCallbacks = &D3dBufferCallbacks; + + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); + RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); + RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_CALLBACKS)); + + RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC)== FALSE); + RTEST(pHalInfo != NULL); + RTEST(pCallBackFlags != NULL); + + if (pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE ) + { + RTEST(puD3dCallbacks != NULL); + RTEST(puD3dDriverData != NULL); + } + + RTEST(puD3dBufferCallbacks == NULL); + RTEST(puD3dTextureFormats == NULL); + RTEST(puNumFourCC == NULL); + RTEST(puFourCC == NULL); + ASSERT1(pHalInfo != NULL); + + /* We do not retesting DD_HALINFO, instead we compare it */ + RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); + RTEST(pCallBackFlags[0] != 0); + RTEST(pCallBackFlags[1] != 0); + + /* NT4 this will fail */ + RTEST(pCallBackFlags[2] == 0); + + + +/* Next Start 6 */ + //pHalInfo = &HalInfo; + //pCallBackFlags = CallBackFlags; + //puD3dCallbacks = &D3dCallbacks; + //puD3dDriverData = &D3dDriverData; + //puD3dBufferCallbacks = &D3dBufferCallbacks; + + //RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + //RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); + //RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); + ////RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_CALLBACKS)); + //RtlZeroMemory(&D3dBufferCallbacks,sizeof(D3DNTHAL_CALLBACKS)); + + //RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, + // pCallBackFlags, puD3dCallbacks, + // puD3dDriverData, puD3dBufferCallbacks, + // puD3dTextureFormats, puNumHeaps, + // puvmList, puNumFourCC, + // puFourCC)== FALSE); + //RTEST(pHalInfo != NULL); + //RTEST(pCallBackFlags != NULL); + + //if (pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE ) + //{ + // RTEST(puD3dCallbacks != NULL); + // RTEST(puD3dDriverData != NULL); + // RTEST(puD3dBufferCallbacks != NULL); + //} + + + //RTEST(puD3dTextureFormats == NULL); + //RTEST(puNumFourCC == NULL); + //RTEST(puFourCC == NULL); + //ASSERT1(pHalInfo != NULL); + + ///* We do not retesting DD_HALINFO, instead we compare it */ + //RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); + + ///* NT4 this will fail */ + //RTEST(pCallBackFlags[2] == 0); + + +/* FIXME + RTEST(puD3dTextureFormats == NULL); + RTEST(puNumFourCC == NULL); + RTEST(puFourCC == NULL); +*/ /* Cleanup ReactX setup */ DeleteDC(hdc); Syscall(L"NtGdiDdDeleteDirectDrawObject", 1, &hDirectDraw);

17 years, 1 month

[hpoussin] 28297: Update code to add back support for ACPI

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Aug 12 12:37:38 2007 New Revision: 28297 URL: http://svn.reactos.org/svn/reactos?rev=28297&view=rev Log: Update code to add back support for ACPI Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Sun Aug 12 12:37:38 2007 @@ -15,6 +15,8 @@ #define NDEBUG #include <internal/debug.h> +//#define ENABLE_ACPI + /* GLOBALS *******************************************************************/ PDEVICE_NODE IopRootDeviceNode; @@ -195,7 +197,7 @@ IRP_MN_START_DEVICE, &Stack); - KeLeaveCriticalRegion(); + KeLeaveCriticalRegion(); if (!NT_SUCCESS(Status)) { @@ -2688,9 +2690,11 @@ const UNICODE_STRING IdentifierPci = RTL_CONSTANT_STRING(L"PCI BIOS"); UNICODE_STRING HardwareIdPci = RTL_CONSTANT_STRING(L"*PNP0A03\0"); static ULONG DeviceIndexPci = 0; - /*const UNICODE_STRING IdentifierAcpi = RTL_CONSTANT_STRING(L"ACPI BIOS"); +#ifdef ENABLE_ACPI + const UNICODE_STRING IdentifierAcpi = RTL_CONSTANT_STRING(L"ACPI BIOS"); UNICODE_STRING HardwareIdAcpi = RTL_CONSTANT_STRING(L"*PNP0C08\0"); - static ULONG DeviceIndexAcpi = 0;*/ + static ULONG DeviceIndexAcpi = 0; +#endif const UNICODE_STRING IdentifierSerial = RTL_CONSTANT_STRING(L"SerialController"); UNICODE_STRING HardwareIdSerial = RTL_CONSTANT_STRING(L"*PNP0501\0"); static ULONG DeviceIndexSerial = 0; @@ -2950,11 +2954,13 @@ pHardwareId = &HardwareIdPci; DeviceIndex = DeviceIndexPci++; } - /*else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0) +#ifdef ENABLE_ACPI + else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0) { pHardwareId = &HardwareIdAcpi; DeviceIndex = DeviceIndexAcpi++; - }*/ + } +#endif else { /* Unknown device */ @@ -3016,33 +3022,35 @@ ZwDeleteKey(hLevel2Key); goto nextdevice; } + /* Create 'LogConf' subkey */ + InitializeObjectAttributes(&ObjectAttributes, &LogConfU, OBJ_KERNEL_HANDLE, hLevel2Key, NULL); + Status = ZwCreateKey( + &hLogConf, + KEY_SET_VALUE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); + ZwDeleteKey(hLevel2Key); + goto nextdevice; + } if (BootResourcesLength > 0) { /* Save boot resources to 'LogConf\BootConfig' */ - InitializeObjectAttributes(&ObjectAttributes, &LogConfU, OBJ_KERNEL_HANDLE, hLevel2Key, NULL); - Status = ZwCreateKey( - &hLogConf, - KEY_SET_VALUE, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE, - NULL); + Status = ZwSetValueKey(hLogConf, &BootConfigU, 0, REG_FULL_RESOURCE_DESCRIPTOR, BootResources, BootResourcesLength); if (!NT_SUCCESS(Status)) { - DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); + DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status); + ZwClose(hLogConf); ZwDeleteKey(hLevel2Key); goto nextdevice; } - Status = ZwSetValueKey(hLogConf, &BootConfigU, 0, REG_FULL_RESOURCE_DESCRIPTOR, BootResources, BootResourcesLength); - ZwClose(hLogConf); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status); - ZwDeleteKey(hLevel2Key); - goto nextdevice; - } - } + } + ZwClose(hLogConf); nextdevice: if (BootResources && BootResources != ParentBootResources) @@ -3076,8 +3084,9 @@ static BOOLEAN INIT_FUNCTION IopIsAcpiComputer(VOID) { +#ifndef ENABLE_ACPI return FALSE; -#if 0 +#else UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); UNICODE_STRING IdentifierU = RTL_CONSTANT_STRING(L"Identifier"); UNICODE_STRING AcpiBiosIdentifier = RTL_CONSTANT_STRING(L"ACPI BIOS"); @@ -3219,12 +3228,13 @@ UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); UNICODE_STRING DeviceDescU = RTL_CONSTANT_STRING(L"DeviceDesc"); UNICODE_STRING HardwareIDU = RTL_CONSTANT_STRING(L"HardwareID"); + UNICODE_STRING LogConfU = RTL_CONSTANT_STRING(L"LogConf"); UNICODE_STRING HalAcpiDevice = RTL_CONSTANT_STRING(L"ACPI_HAL"); UNICODE_STRING HalAcpiId = RTL_CONSTANT_STRING(L"0000"); UNICODE_STRING HalAcpiDeviceDesc = RTL_CONSTANT_STRING(L"HAL ACPI"); UNICODE_STRING HalAcpiHardwareID = RTL_CONSTANT_STRING(L"*PNP0C08\0"); OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hRoot, hHalAcpiDevice, hHalAcpiId; + HANDLE hRoot, hHalAcpiDevice, hHalAcpiId, hLogConf; NTSTATUS Status; InitializeObjectAttributes(&ObjectAttributes, &RootPathU, OBJ_KERNEL_HANDLE, NULL, NULL); @@ -3255,6 +3265,13 @@ Status = ZwSetValueKey(hHalAcpiId, &DeviceDescU, 0, REG_SZ, HalAcpiDeviceDesc.Buffer, HalAcpiDeviceDesc.MaximumLength); if (NT_SUCCESS(Status)) Status = ZwSetValueKey(hHalAcpiId, &HardwareIDU, 0, REG_MULTI_SZ, HalAcpiHardwareID.Buffer, HalAcpiHardwareID.MaximumLength); + if (NT_SUCCESS(Status)) + { + InitializeObjectAttributes(&ObjectAttributes, &LogConfU, OBJ_KERNEL_HANDLE, hHalAcpiId, NULL); + Status = ZwCreateKey(&hLogConf, 0, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); + if (NT_SUCCESS(Status)) + ZwClose(hLogConf); + } ZwClose(hHalAcpiId); return Status; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Sun Aug 12 12:37:38 2007 @@ -208,7 +208,7 @@ InsertTailList( &DeviceExtension->DeviceListHead, &Device->ListEntry); - DeviceExtension->DeviceListCount++; + DeviceExtension->DeviceListCount++; *PhysicalDeviceObject = Device->Pdo; DPRINT("Created PDO %p (%wZ\\%wZ)\n", *PhysicalDeviceObject, &Device->DeviceID, &Device->InstanceID);

17 years, 1 month

[jimtabor] 28296: Added two new subroutines in support for writing data to and from user space. Fixed calc in CoordCnvP to use float not fixed.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Aug 12 11:34:23 2007 New Revision: 28296 URL: http://svn.reactos.org/svn/reactos?rev=28296&view=rev Log: Added two new subroutines in support for writing data to and from user space. Fixed calc in CoordCnvP to use float not fixed. Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c trunk/reactos/subsystems/win32/win32k/eng/float.c trunk/reactos/subsystems/win32/win32k/include/gdifloat.h Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/co… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/coord.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c Sun Aug 12 11:34:23 2007 @@ -70,18 +70,20 @@ CoordCnvP(MATRIX_S * mx, LPPOINT Point) { FLOAT x, y; - gxf_long a, b; + gxf_long a, b, c; x = (FLOAT)Point->x; y = (FLOAT)Point->y; a.l = EFtoF( &mx->efM11 ); b.l = EFtoF( &mx->efM21 ); - x = x * a.f + y * b.f + mx->fxDx; + c.l = EFtoF( &mx->efDx ); + x = x * a.f + y * b.f + c.f; a.l = EFtoF( &mx->efM12 ); b.l = EFtoF( &mx->efM22 ); - y = x * a.f + y * b.f + mx->fxDy; + c.l = EFtoF( &mx->efDy ); + y = x * a.f + y * b.f + c.f; FLOAT_TO_INT(x, Point->x ); FLOAT_TO_INT(y, Point->y ); Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/float.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/float.c Sun Aug 12 11:34:23 2007 @@ -198,6 +198,43 @@ #endif } +VOID FASTCALL +XForm2MatrixS( MATRIX_S * Matrix, PXFORM XForm) +{ +gxf_long f; + f.f = XForm->eM11; + FtoEF( &Matrix->efM11, f.l); + f.f = XForm->eM12; + FtoEF( &Matrix->efM12, f.l); + f.f = XForm->eM21; + FtoEF( &Matrix->efM21, f.l); + f.f = XForm->eM22; + FtoEF( &Matrix->efM22, f.l); + f.f = XForm->eDx; + FtoEF( &Matrix->efDx, f.l); + f.f = XForm->eDy; + FtoEF( &Matrix->efDy, f.l); +} + +VOID FASTCALL +MatrixS2XForm( PXFORM XForm, MATRIX_S * Matrix) +{ +gxf_long f; + f.l = EFtoF(&Matrix->efM11); + XForm->eM11 = f.f; + f.l = EFtoF(&Matrix->efM12); + XForm->eM12 = f.f; + f.l = EFtoF(&Matrix->efM21); + XForm->eM21 = f.f; + f.l = EFtoF(&Matrix->efM22); + XForm->eM22 = f.f; + f.l = EFtoF(&Matrix->efDx); + XForm->eDx = f.f; + f.l = EFtoF(&Matrix->efDy); + XForm->eDy = f.f; +} + + VOID STDCALL FLOATOBJ_AddLong( Modified: trunk/reactos/subsystems/win32/win32k/include/gdifloat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdifloat.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdifloat.h Sun Aug 12 11:34:23 2007 @@ -101,3 +101,7 @@ MulDiv((ty), (dc)->Dc_Attr.szlViewportExt.cy, (dc)->Dc_Attr.szlWindowExt.cy) #endif + +VOID FASTCALL XForm2MatrixS( MATRIX_S *, PXFORM); +VOID FASTCALL MatrixS2XForm( PXFORM, MATRIX_S *); +

17 years, 1 month

[cwittich] 28295: put typelibs which are embedded in win32dlls into $(INTERMEDIATE)

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Aug 12 01:42:02 2007 New Revision: 28295 URL: http://svn.reactos.org/svn/reactos?rev=28295&view=rev Log: put typelibs which are embedded in win32dlls into $(INTERMEDIATE) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Aug 12 01:42:02 2007 @@ -1272,8 +1272,11 @@ dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string basename = GetBasename ( filename ); - string EmbeddedTypeLibFilename = basename + ".tlb"; - + + string EmbeddedTypeLibFilename = PassThruCacheDirectory ( + basename + ".tlb", + backend->intermediateDirectory ); + fprintf ( fMakefile, "%s: %s $(WIDL_TARGET) | %s\n", GetTargetMacro ( module ).c_str (),

17 years, 1 month

[cwittich] 28294: don't touch absolute paths this fixes the build when using absolute paths in ROS_INTERMEDIATE or ROS_OUTPUT

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Aug 12 01:22:00 2007 New Revision: 28294 URL: http://svn.reactos.org/svn/reactos?rev=28294&view=rev Log: don't touch absolute paths this fixes the build when using absolute paths in ROS_INTERMEDIATE or ROS_OUTPUT Modified: trunk/reactos/tools/wpp/preproc.c Modified: trunk/reactos/tools/wpp/preproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/preproc.c?rev=28… ============================================================================== --- trunk/reactos/tools/wpp/preproc.c (original) +++ trunk/reactos/tools/wpp/preproc.c Sun Aug 12 01:22:00 2007 @@ -327,6 +327,15 @@ { char *tok; char *cpy = pp_xstrdup(path); + + /* check for absolute windows paths */ + if (strchr(cpy, ':') != NULL) + { + nincludepath++; + includepath = pp_xrealloc(includepath, nincludepath * sizeof(*includepath)); + includepath[nincludepath-1] = cpy; + return; + } tok = strtok(cpy, INCLUDESEPARATOR); while(tok)

17 years, 1 month

[ekohl] 28293: Add high contrast settings

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 12 00:53:52 2007 New Revision: 28293 URL: http://svn.reactos.org/svn/reactos?rev=28293&view=rev Log: Add high contrast settings Modified: trunk/reactos/dll/cpl/access/access.rbuild trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/access/resource.h Modified: trunk/reactos/dll/cpl/access/access.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rbui… ============================================================================== --- trunk/reactos/dll/cpl/access/access.rbuild (original) +++ trunk/reactos/dll/cpl/access/access.rbuild Sun Aug 12 00:53:52 2007 @@ -9,8 +9,8 @@ <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> <library>user32</library> + <library>advapi32</library> <library>comctl32</library> - <library>msvcrt</library> <file>access.c</file> <file>display.c</file> <file>general.c</file> Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c (original) +++ trunk/reactos/dll/cpl/access/display.c Sun Aug 12 00:53:52 2007 @@ -1,8 +1,7 @@ -/* $Id$ - * +/* * PROJECT: ReactOS System Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/system/advanced.c + * FILE: dll/cpl/access/display.c * PURPOSE: Memory, start-up and profiles settings * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: @@ -10,8 +9,126 @@ */ #include <windows.h> #include <stdlib.h> +#include <commctrl.h> +#include <prsht.h> +#include <tchar.h> #include "resource.h" #include "access.h" + +typedef struct _GLOBAL_DATA +{ + HIGHCONTRAST highContrast; +} GLOBAL_DATA, *PGLOBAL_DATA; + + +static VOID +FillColorSchemeComboBox(HWND hwnd) +{ + TCHAR szValue[128]; + DWORD dwDisposition; + DWORD dwLength; + HKEY hKey; + LONG lError; + INT i; + + lError = RegCreateKeyEx(HKEY_CURRENT_USER, + _T("Control Panel\\Appearance\\Schemes"), + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ENUMERATE_SUB_KEYS | KEY_EXECUTE | KEY_QUERY_VALUE, + NULL, + &hKey, + &dwDisposition); + if (lError != ERROR_SUCCESS) + return; + + for (i = 0; ; i++) + { + dwLength = 128; + lError = RegEnumValue(hKey, + i, + szValue, + &dwLength, NULL, NULL, NULL, NULL); + if (lError == ERROR_NO_MORE_ITEMS) + break; + + SendMessage(hwnd, + CB_ADDSTRING, + 0, + (LPARAM)szValue); + } + + RegCloseKey(hKey); +} + + +INT_PTR CALLBACK +HighContrastDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PGLOBAL_DATA pGlobalData; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + pGlobalData = (PGLOBAL_DATA)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + CheckDlgButton(hwndDlg, + IDC_CONTRAST_ACTIVATE_CHECK, + pGlobalData->highContrast.dwFlags & HCF_HOTKEYACTIVE ? BST_CHECKED : BST_UNCHECKED); + + FillColorSchemeComboBox(GetDlgItem(hwndDlg, IDC_CONTRAST_COMBO)); + + SendDlgItemMessage(hwndDlg, + IDC_CONTRAST_COMBO, + CB_SELECTSTRING, + -1, + (LPARAM)pGlobalData->highContrast.lpszDefaultScheme); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_CONTRAST_ACTIVATE_CHECK: + pGlobalData->highContrast.dwFlags ^= HCF_HOTKEYACTIVE; + break; + + case IDC_CONTRAST_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + INT nSel; + + nSel = SendDlgItemMessage(hwndDlg, IDC_CONTRAST_COMBO, + CB_GETCURSEL, 0, 0); + SendDlgItemMessage(hwndDlg, IDC_CONTRAST_COMBO, + CB_GETLBTEXT, nSel, + (LPARAM)pGlobalData->highContrast.lpszDefaultScheme); + } + break; + + case IDOK: + EndDialog(hwndDlg, TRUE); + break; + + case IDCANCEL: + EndDialog(hwndDlg, FALSE); + break; + + default: + break; + } + break; + } + + return FALSE; +} + /* Property page dialog callback */ INT_PTR CALLBACK @@ -20,26 +137,69 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); + PGLOBAL_DATA pGlobalData; + LPPSHNOTIFY lppsn; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: - break; + pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + if (pGlobalData == NULL) + return FALSE; + + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + /* Get sticky keys information */ + pGlobalData->highContrast.cbSize = sizeof(HIGHCONTRAST); + SystemParametersInfo(SPI_GETHIGHCONTRAST, + sizeof(HIGHCONTRAST), + &pGlobalData->highContrast, + 0); + + /* Set the checkbox */ + CheckDlgButton(hwndDlg, + IDC_CONTRAST_BOX, + pGlobalData->highContrast.dwFlags & HCF_HIGHCONTRASTON ? BST_CHECKED : BST_UNCHECKED); + return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_CONTRAST_BOX: + pGlobalData->highContrast.dwFlags ^= HCF_HIGHCONTRASTON; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_CONTRAST_BUTTON: + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_CONTRASTOPTIONS), + hwndDlg, + (DLGPROC)HighContrastDlgProc, + (LPARAM)pGlobalData)) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; default: break; } + break; + + case WM_NOTIFY: + lppsn = (LPPSHNOTIFY)lParam; + if (lppsn->hdr.code == PSN_APPLY) + { + SystemParametersInfo(SPI_SETHIGHCONTRAST, + sizeof(HIGHCONTRAST), + &pGlobalData->highContrast, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE /*0*/); + return TRUE; + } + break; + + case WM_DESTROY: + HeapFree(GetProcessHeap(), 0, pGlobalData); break; } Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/access/lang/cs-CZ.rc Sun Aug 12 00:53:52 2007 @@ -139,6 +139,25 @@ END +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "High Contrast Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + + GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Monosti usnadnìní" Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Sun Aug 12 00:53:52 2007 @@ -141,6 +141,25 @@ END +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "High Contrast Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + + GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Bedienbarkeit" Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc Sun Aug 12 00:53:52 2007 @@ -138,6 +138,25 @@ END +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "High Contrast Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + + GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibility" Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc Sun Aug 12 00:53:52 2007 @@ -142,6 +142,25 @@ END +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "High Contrast Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + + GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibilidad" Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc Sun Aug 12 00:53:52 2007 @@ -140,6 +140,25 @@ END +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "High Contrast Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + + GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibilité" Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/hu-HU.rc Sun Aug 12 00:53:52 2007 @@ -140,6 +140,25 @@ END +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "High Contrast Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + + GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Kisegítõ lehetõségek" Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/access/lang/id-ID.rc Sun Aug 12 00:53:52 2007 @@ -141,6 +141,25 @@ END +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "High Contrast Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + + GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Aksesibilitas" Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc Sun Aug 12 00:53:52 2007 @@ -139,6 +139,25 @@ END +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "High Contrast Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + + GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibility" Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc Sun Aug 12 00:53:52 2007 @@ -139,6 +139,25 @@ END +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "High Contrast Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + + GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "[U[â" Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/nl-NL.rc Sun Aug 12 00:53:52 2007 @@ -141,6 +141,25 @@ END +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "High Contrast Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + + GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Toegankelijkheidsopties" Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Sun Aug 12 00:53:52 2007 @@ -142,6 +142,25 @@ END +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "High Contrast Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + + GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "U³atwienia dostêpu" Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Sun Aug 12 00:53:52 2007 @@ -139,6 +139,25 @@ END +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "High Contrast Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + + GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Ñïåöèàëüíûå âîçìîæíîñòè" Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/access/resource.h (original) +++ trunk/reactos/dll/cpl/access/resource.h Sun Aug 12 00:53:52 2007 @@ -23,6 +23,8 @@ #define IDD_STICKYKEYSOPTIONS 105 #define IDD_FILTERKEYSOPTIONS 106 #define IDD_TOGGLEKEYSOPTIONS 107 + +#define IDD_CONTRASTOPTIONS 108 #define IDS_CPLSYSTEMNAME 1001 #define IDS_CPLSYSTEMDESCRIPTION 2001 @@ -68,6 +70,9 @@ #define IDC_TOGGLE_ACTIVATE_CHECK 246 +#define IDC_CONTRAST_ACTIVATE_CHECK 260 +#define IDC_CONTRAST_COMBO 261 + #endif /* __CPL_RESOURCE_H */ /* EOF */

17 years, 1 month

[fireball] 28292: - Last part of Alex's work on CM before he left ReactOS development. It was unfinished, so I had to insert a few hacks and comment out some code to make it working in trunk. - Implement subkey creation code (for NtCreateKey and CmiConnectHive) based on the new Cm branch code (just as all the other routines were changed previously). - Also support creating hash leaves, used in XP hives, since all the new code was already able to read them.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Aug 11 23:03:00 2007 New Revision: 28292 URL: http://svn.reactos.org/svn/reactos?rev=28292&view=rev Log: - Last part of Alex's work on CM before he left ReactOS development. It was unfinished, so I had to insert a few hacks and comment out some code to make it working in trunk. - Implement subkey creation code (for NtCreateKey and CmiConnectHive) based on the new Cm branch code (just as all the other routines were changed previously). - Also support creating hash leaves, used in XP hives, since all the new code was already able to read them. Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/config/cmindex.c trunk/reactos/ntoskrnl/config/cmparse.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=28292… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Sat Aug 11 23:03:00 2007 @@ -294,6 +294,21 @@ NTSTATUS CmiInitHives(BOOLEAN SetupBoot); +NTSTATUS +NTAPI +CmpDoCreate( + IN PHHIVE Hive, + IN HCELL_INDEX Cell, + IN PACCESS_STATE AccessState, + IN PUNICODE_STRING Name, + IN KPROCESSOR_MODE AccessMode, + IN PUNICODE_STRING Class, + IN ULONG CreateOptions, + IN PKEY_OBJECT Parent, + IN PVOID OriginatingHive OPTIONAL, + OUT PVOID *Object +); + HCELL_INDEX NTAPI CmpFindValueByName( Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Sat Aug 11 23:03:00 2007 @@ -138,7 +138,6 @@ OUT PULONG Disposition) { UNICODE_STRING RemainingPath = {0}; - BOOLEAN FreeRemainingPath = TRUE; ULONG LocalDisposition; PKEY_OBJECT KeyObject; NTSTATUS Status = STATUS_SUCCESS; @@ -303,53 +302,27 @@ DPRINT("RemainingPath %S ParentObject 0x%p\n", RemainingPath.Buffer, Object); - Status = ObCreateObject(PreviousMode, - CmpKeyObjectType, - NULL, - PreviousMode, - NULL, - sizeof(KEY_OBJECT), - 0, - 0, - (PVOID*)&KeyObject); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObCreateObject() failed!\n"); - PostCreateKeyInfo.Object = NULL; - PostCreateKeyInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - - goto Cleanup; - } - - KeyObject->ParentKey = Object; - KeyObject->RegistryHive = KeyObject->ParentKey->RegistryHive; - KeyObject->Flags = 0; - KeyObject->SubKeyCounts = 0; - KeyObject->SizeOfSubKeys = 0; - KeyObject->SubKeys = NULL; - /* Acquire hive lock */ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - InsertTailList(&CmiKeyObjectListHead, &KeyObject->ListEntry); - - /* add key to subkeys of parent if needed */ - Status = CmiAddSubKey(KeyObject->RegistryHive, - KeyObject->ParentKey, - KeyObject, - &RemainingPath, - TitleIndex, - &CapturedClass, - CreateOptions); + /* Create the key */ + Status = CmpDoCreate(&((PKEY_OBJECT)Object)->RegistryHive->Hive, + ((PKEY_OBJECT)Object)->KeyCellOffset, + NULL, + &RemainingPath, + KernelMode, + Class, + CreateOptions, + (PKEY_OBJECT)Object, + NULL, + (PVOID*)&KeyObject); if (!NT_SUCCESS(Status)) { DPRINT1("CmiAddSubKey() failed (Status %lx)\n", Status); /* Release hive lock */ ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); - ObDereferenceObject(KeyObject); PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = STATUS_UNSUCCESSFUL; @@ -359,15 +332,8 @@ goto Cleanup; } - if (Start == RemainingPath.Buffer) - { - KeyObject->Name = RemainingPath; - FreeRemainingPath = FALSE; - } - else - { - RtlCreateUnicodeString(&KeyObject->Name, Start); - } + InsertTailList(&CmiKeyObjectListHead, &KeyObject->ListEntry); + RtlCreateUnicodeString(&KeyObject->Name, Start); KeyObject->KeyCell->Parent = KeyObject->ParentKey->KeyCellOffset; KeyObject->KeyCell->SecurityKeyOffset = KeyObject->ParentKey->KeyCell->SecurityKeyOffset; @@ -437,7 +403,7 @@ PreviousMode); } if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); - if (FreeRemainingPath) RtlFreeUnicodeString(&RemainingPath); + RtlFreeUnicodeString(&RemainingPath); if (Object != NULL) ObDereferenceObject(Object); return Status; Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Sat Aug 11 23:03:00 2007 @@ -263,39 +263,19 @@ DPRINT("RemainingPath %wZ ParentKey %p\n", &RemainingPath, ParentKey); - Status = ObCreateObject(KernelMode, - CmpKeyObjectType, - NULL, - KernelMode, - NULL, - sizeof(KEY_OBJECT), - 0, - 0, - (PVOID*)&NewKey); - - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("ObCreateObject() failed (Status %lx)\n", Status); - ObDereferenceObject (ParentKey); - RtlFreeUnicodeString(&RemainingPath); - return Status; - } - - NewKey->Flags = 0; - NewKey->SubKeyCounts = 0; - NewKey->SubKeys = NULL; - NewKey->SizeOfSubKeys = 0; - InsertTailList(&CmiKeyObjectListHead, &NewKey->ListEntry); - DPRINT ("SubName %S\n", SubName); - Status = CmiAddSubKey(ParentKey->RegistryHive, - ParentKey, - NewKey, - &RemainingPath, - 0, - NULL, - REG_OPTION_VOLATILE); + /* Create the key */ + Status = CmpDoCreate(&ParentKey->RegistryHive->Hive, + ParentKey->KeyCellOffset, + NULL, + &RemainingPath, + KernelMode, + NULL, + REG_OPTION_VOLATILE, + ParentKey, + NULL, + (PVOID*)&NewKey); if (!NT_SUCCESS(Status)) { DPRINT1("CmiAddSubKey() failed (Status %lx)\n", Status); Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c Sat Aug 11 23:03:00 2007 @@ -14,6 +14,16 @@ #include "debug.h" /* GLOBALS *******************************************************************/ + +ULONG CmpMaxFastIndexPerHblock = + (HBLOCK_SIZE - (sizeof(HBIN) + + sizeof(HCELL) + + FIELD_OFFSET(CM_KEY_FAST_INDEX, List))) / sizeof(CM_INDEX); + +ULONG CmpMaxIndexPerHblock = + (HBLOCK_SIZE - (sizeof(HBIN) + + sizeof(HCELL) + + FIELD_OFFSET(CM_KEY_INDEX, List))) / sizeof(HCELL_INDEX) - 1; /* FUNCTIONS *****************************************************************/ @@ -922,6 +932,396 @@ /* Free the search name and return failure */ if (IsCompressed) ExFreePool(SearchName.Buffer); return FALSE; +} + +HCELL_INDEX +NTAPI +CmpAddToLeaf(IN PHHIVE Hive, + IN HCELL_INDEX LeafCell, + IN HCELL_INDEX NewKey, + IN PUNICODE_STRING Name) +{ + PCM_KEY_INDEX Leaf; + PCM_KEY_FAST_INDEX FastLeaf; + ULONG Size, OldSize, EntrySize, i, j; + HCELL_INDEX NewCell, Child; + LONG Result; + + /* Mark the leaf dirty */ + HvMarkCellDirty(Hive, LeafCell); + + /* Get the leaf cell */ + Leaf = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + if (!Leaf) + { + /* Shouldn't happen */ + ASSERT(FALSE); + return HCELL_NIL; + } + + /* Release it */ + HvReleaseCell(Hive, LeafCell); + + /* Check if this is an index leaf */ + if (Leaf->Signature == CM_KEY_INDEX_LEAF) + { + /* This is an old-style leaf */ + FastLeaf = NULL; + EntrySize = sizeof(HCELL_INDEX); + } + else + { + /* Sanity check */ + ASSERT((Leaf->Signature == CM_KEY_FAST_LEAF) || + (Leaf->Signature == CM_KEY_HASH_LEAF)); + + /* This is a new-style optimized fast (or hash) leaf */ + FastLeaf = (PCM_KEY_FAST_INDEX)Leaf; + EntrySize = sizeof(CM_INDEX); + } + + /* Get the current size of the leaf */ + OldSize = HvGetCellSize(Hive, Leaf); + + /* Calculate the size of the free entries */ + Size = OldSize; + Size -= EntrySize * Leaf->Count + FIELD_OFFSET(CM_KEY_INDEX, List); + + /* Assume we'll re-use the same leaf */ + NewCell = LeafCell; + + /* Check if we're out of space */ + if ((Size / EntrySize) < 1) + { + /* Grow the leaf by 1.5x, making sure we can at least fit this entry */ + Size = OldSize + OldSize / 2; + if (Size < (OldSize + EntrySize)) Size = OldSize + EntrySize; + + /* Re-allocate the leaf */ + NewCell = HvReallocateCell(Hive, LeafCell, Size); + if (NewCell == HCELL_NIL) return HCELL_NIL; + + /* Get the leaf cell */ + Leaf = (PCM_KEY_INDEX)HvGetCell(Hive, NewCell); + if (!Leaf) + { + /* This shouldn't happen */ + ASSERT(FALSE); + return HCELL_NIL; + } + + /* Release the cell */ + HvReleaseCell(Hive, NewCell); + + /* Update the fast leaf pointer if we had one */ + if (FastLeaf) FastLeaf = (PCM_KEY_FAST_INDEX)Leaf; + } + + /* Find the insertion point for our entry */ + i = CmpFindSubKeyInLeaf(Hive, Leaf, Name, &Child); + if (i & 0x80000000) return HCELL_NIL; + ASSERT(Child == HCELL_NIL); + + /* Check if we're not last */ + if (i != Leaf->Count) + { + /* Find out where we should go */ + Result = CmpCompareInIndex(Hive, + Name, + i, + Leaf, + &Child); + if (Result == 2) return HCELL_NIL; + ASSERT(Result != 0); + + /* Check if we come after */ + if (Result > 0) + { + /* We do, insert us after the key */ + ASSERT(Result == 1); + i++; + } + + /* Check if we're still not last */ + if (i != Leaf->Count) + { + /* Check if we had a fast leaf or not */ + if (FastLeaf) + { + /* Copy the fast indexes */ + RtlMoveMemory(&FastLeaf->List[i + 1], + &FastLeaf->List[i], + (FastLeaf->Count - i) * sizeof(CM_INDEX)); + } + else + { + /* Copy the indexes themselves */ + RtlMoveMemory(&Leaf->List[i + 1], + &Leaf->List[i], + (Leaf->Count - i) * sizeof(HCELL_INDEX)); + } + } + } + + /* Check if this is a new-style leaf */ + if (FastLeaf) + { + /* Set our cell */ + FastLeaf->List[i].Cell = NewKey; + + /* Check if this is a hash leaf */ + if( FastLeaf->Signature == CM_KEY_HASH_LEAF ) + { + /* Set our hash key */ + FastLeaf->List[i].HashKey = CmpComputeHashKey(0, Name, FALSE); + } + else + { + /* First, clear the name */ + FastLeaf->List[i].NameHint[0] = 0; + FastLeaf->List[i].NameHint[1] = 0; + FastLeaf->List[i].NameHint[2] = 0; + FastLeaf->List[i].NameHint[3] = 0; + + /* Now, figure out if we can fit */ + if (Name->Length / sizeof(WCHAR) < 4) + { + /* We can fit, use our length */ + j = Name->Length / sizeof(WCHAR); + } + else + { + /* We can't, use a maximum of 4 */ + j = 4; + } + + /* Now fill out the name hint */ + do + { + /* Look for invalid characters and break out if we found one */ + if ((USHORT)Name->Buffer[j - 1] > (UCHAR)-1) break; + + /* Otherwise, copy the a character */ + FastLeaf->List[i].NameHint[j - 1] = (UCHAR)Name->Buffer[j - 1]; + } while (--j > 0); + } + } + else + { + /* This is an old-style leaf, just set our index directly */ + Leaf->List[i] = NewKey; + } + + /* Update the leaf count and return the new cell */ + Leaf->Count += 1; + return NewCell; +} + +BOOLEAN +NTAPI +CmpAddSubKey(IN PHHIVE Hive, + IN HCELL_INDEX Parent, + IN HCELL_INDEX Child) +{ + PCM_KEY_NODE KeyNode; + PCM_KEY_INDEX Index; + UNICODE_STRING Name; + HCELL_INDEX IndexCell = HCELL_NIL, CellToRelease = HCELL_NIL, LeafCell; + PHCELL_INDEX RootPointer = NULL; + ULONG Type; + BOOLEAN IsCompressed; + PAGED_CODE(); + + /* Get the key node */ + KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Child); + if (!KeyNode) + { + /* Shouldn't happen */ + ASSERT(FALSE); + return FALSE; + } + + /* Check if the name is compressed */ + if (KeyNode->Flags & KEY_COMP_NAME) + { + /* Remember for later */ + IsCompressed = TRUE; + + /* Create the compressed name and allocate it */ + Name.Length = CmpCompressedNameSize(KeyNode->Name, KeyNode->NameLength); + Name.MaximumLength = Name.Length; + Name.Buffer = Hive->Allocate(Name.Length, TRUE); + if (!Name.Buffer) + { + /* Release the cell and fail */ + HvReleaseCell(Hive, Child); + ASSERT(FALSE); + return FALSE; + } + + /* Copy the compressed name */ + CmpCopyCompressedName(Name.Buffer, + Name.MaximumLength, + KeyNode->Name, + KeyNode->NameLength); + } + else + { + /* Remember for later */ + IsCompressed = FALSE; + + /* Build the unicode string */ + Name.Length = KeyNode->NameLength; + Name.MaximumLength = KeyNode->NameLength; + Name.Buffer = &KeyNode->Name[0]; + } + + /* Release the cell */ + HvReleaseCell(Hive, Child); + + /* Get the parent node */ + KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Parent); + if (!KeyNode) + { + /* Not handled */ + ASSERT(FALSE); + } + + /* Find out the type of the cell, and check if this is the first subkey */ + Type = HvGetCellType(Child); + if (!KeyNode->SubKeyCounts[Type]) + { + /* Allocate a fast leaf */ + IndexCell = HvAllocateCell(Hive, sizeof(CM_KEY_FAST_INDEX), Type); + if (IndexCell == HCELL_NIL) + { + /* Not handled */ + ASSERT(FALSE); + } + + /* Get the leaf cell */ + Index = (PCM_KEY_INDEX)HvGetCell(Hive, IndexCell); + if (!Index) + { + /* Shouldn't happen */ + ASSERT(FALSE); + } + + /* Now check what kind of hive we're dealing with */ + if (Hive->Version >= 5) + { + /* XP Hive: Use hash leaf */ + Index->Signature = CM_KEY_HASH_LEAF; + } + else if (Hive->Version >= 3) + { + /* Windows 2000 and ReactOS: Use fast leaf */ + Index->Signature = CM_KEY_FAST_LEAF; + } + else + { + /* NT 4: Use index leaf */ + Index->Signature = CM_KEY_INDEX_LEAF; + } + + /* Setup the index list */ + Index->Count = 0; + KeyNode->SubKeyLists[Type] = IndexCell; + } + else + { + /* We already have an index, get it */ + Index = (PCM_KEY_INDEX)HvGetCell(Hive, KeyNode->SubKeyLists[Type]); + if (!Index) + { + /* Not handled */ + ASSERT(FALSE); + } + + /* Remember to release the cell later */ + CellToRelease = KeyNode->SubKeyLists[Type]; + + /* Check if this is a fast leaf that's gotten too full */ + if ((Index->Signature == CM_KEY_FAST_LEAF) && + (Index->Count >= CmpMaxFastIndexPerHblock)) + { + /* Not handled yet */ + DPRINT1("Fast->Slow Leaf Conversion not yet implemented!\n"); + ASSERT(FALSE); + } + else if (((Index->Signature == CM_KEY_INDEX_LEAF) || + (Index->Signature == CM_KEY_HASH_LEAF)) && + (Index->Count >= CmpMaxIndexPerHblock)) + { + /* This is an old/hashed leaf that's gotten too large, root it */ + IndexCell = HvAllocateCell(Hive, + sizeof(CM_KEY_INDEX) + + sizeof(HCELL_INDEX), + Type); + if (IndexCell == HCELL_NIL) + { + /* Not handled */ + ASSERT(FALSE); + } + + /* Get the index cell */ + Index = (PCM_KEY_INDEX)HvGetCell(Hive, IndexCell); + if (!Index) + { + /* Shouldn't happen */ + ASSERT(FALSE); + } + + /* Mark the index as a root, and set the index cell */ + Index->Signature = CM_KEY_INDEX_ROOT; + Index->Count = 1; + Index->List[0] = KeyNode->SubKeyLists[Type]; + KeyNode->SubKeyLists[Type] = IndexCell; + } + } + + /* Now we can choose the leaf cell */ + LeafCell = KeyNode->SubKeyLists[Type]; + + /* Check if we turned the index into a root */ + if (Index->Signature == CM_KEY_INDEX_ROOT) + { + /* Not handled yet */ + DPRINT1("Leaf->Root Index Conversion not yet implemented!\n"); + ASSERT(FALSE); + } + + /* Add our leaf cell */ + LeafCell = CmpAddToLeaf(Hive, LeafCell, Child, &Name); + if (LeafCell == HCELL_NIL) + { + /* Not handled */ + ASSERT(FALSE); + } + + /* Update the key counts */ + KeyNode->SubKeyCounts[Type]++; + + /* Check if caller wants us to return the leaf */ + if (RootPointer) + { + /* Return it */ + *RootPointer = LeafCell; + } + else + { + /* Otherwise, mark it as the list index for the cell */ + KeyNode->SubKeyLists[Type] = LeafCell; + } + + /* If the name was compressed, free our copy */ + if (IsCompressed) Hive->Free(Name.Buffer); + + /* Release all our cells */ + if (IndexCell != HCELL_NIL) HvReleaseCell(Hive, IndexCell); + if (CellToRelease != HCELL_NIL) HvReleaseCell(Hive, CellToRelease); + HvReleaseCell(Hive, Parent); + return TRUE; } BOOLEAN Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Sat Aug 11 23:03:00 2007 @@ -73,3 +73,329 @@ *LastName = !RemainingName->Length; return NameValid; } + +NTSTATUS +NTAPI +CmpDoCreateChild(IN PHHIVE Hive, + IN HCELL_INDEX ParentCell, + IN PSECURITY_DESCRIPTOR ParentDescriptor OPTIONAL, + IN PACCESS_STATE AccessState, + IN PUNICODE_STRING Name, + IN KPROCESSOR_MODE AccessMode, + IN PUNICODE_STRING Class, + IN PKEY_OBJECT Parent, + IN ULONG CreateOptions, + OUT PHCELL_INDEX KeyCell, + OUT PVOID *Object) +{ + NTSTATUS Status = STATUS_SUCCESS; + PKEY_OBJECT KeyBody; + HCELL_INDEX ClassCell = HCELL_NIL; + PCM_KEY_NODE KeyNode; + PCELL_DATA CellData; + ULONG StorageType; + LARGE_INTEGER SystemTime; + BOOLEAN Hack = FALSE; + + /* ReactOS Hack */ + if (Name->Buffer[0] == OBJ_NAME_PATH_SEPARATOR) + { + /* Skip initial path separator */ + Name->Buffer++; + Name->Length -= sizeof(OBJ_NAME_PATH_SEPARATOR); + Name->MaximumLength -= sizeof(OBJ_NAME_PATH_SEPARATOR); + Hack = TRUE; + } + + /* Get the storage type */ + StorageType = HvStable; + if (CreateOptions & REG_OPTION_VOLATILE) StorageType = HvVolatile; + + /* Allocate the child */ + *KeyCell = HvAllocateCell(Hive, + FIELD_OFFSET(CM_KEY_NODE, Name) + + CmpNameSize(Hive, Name), + StorageType); + if (*KeyCell == HCELL_NIL) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Get the key node */ + KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, *KeyCell); + if (!KeyNode) + { + /* Fail, this should never happen */ + ASSERT(FALSE); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Release the cell */ + HvReleaseCell(Hive, *KeyCell); + + /* Check if we have a class name */ + if (Class->Length > 0) + { + /* Allocate a class cell */ + ClassCell = HvAllocateCell(Hive, Class->Length, StorageType); + if (ClassCell == HCELL_NIL) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + } + + /* Allocate the Cm Object */ + Status = ObCreateObject(AccessMode, + CmpKeyObjectType, + NULL, + AccessMode, + NULL, + sizeof(KEY_OBJECT), + 0, + 0, + Object); + if (!NT_SUCCESS(Status)) goto Quickie; + KeyBody = (PKEY_OBJECT)(*Object); + + /* Check if we had a class */ + if (Class->Length > 0) + { + /* Get the class cell */ + CellData = HvGetCell(Hive, ClassCell); + if (!CellData) + { + /* Fail, this should never happen */ + ASSERT(FALSE); + Status = STATUS_INSUFFICIENT_RESOURCES; + ObDereferenceObject(*Object); + goto Quickie; + } + + /* Release the cell */ + HvReleaseCell(Hive, ClassCell); + + /* Copy the class data */ + RtlCopyMemory(&CellData->u.KeyString[0], + Class->Buffer, + Class->Length); + } + + /* Fill out the key node */ + KeyNode->Signature = CM_KEY_NODE_SIGNATURE; + KeyNode->Flags = CreateOptions; + KeQuerySystemTime(&SystemTime); + KeyNode->LastWriteTime = SystemTime; + KeyNode->Spare = 0; + KeyNode->Parent = ParentCell; + KeyNode->SubKeyCounts[HvStable] = 0; + KeyNode->SubKeyCounts[HvVolatile] = 0; + KeyNode->SubKeyLists[HvStable] = HCELL_NIL; + KeyNode->SubKeyLists[HvVolatile] = HCELL_NIL; + KeyNode->ValueList.Count = 0; + KeyNode->ValueList.List = HCELL_NIL; + KeyNode->Security = HCELL_NIL; + KeyNode->Class = ClassCell; + KeyNode->ClassLength = Class->Length; + KeyNode->MaxValueDataLen = 0; + KeyNode->MaxNameLen = 0; + KeyNode->MaxValueNameLen = 0; + KeyNode->MaxClassLen = 0; + KeyNode->NameLength = CmpCopyName(Hive, KeyNode->Name, Name); + if (KeyNode->NameLength < Name->Length) KeyNode->Flags |= KEY_COMP_NAME; + + /* Now fill out the Cm object */ + KeyBody->KeyCell = KeyNode; + KeyBody->KeyCellOffset = *KeyCell; + KeyBody->Flags = 0; + KeyBody->SubKeyCounts = 0; + KeyBody->SubKeys = NULL; + KeyBody->SizeOfSubKeys = 0; + KeyBody->ParentKey = Parent; + KeyBody->RegistryHive = KeyBody->ParentKey->RegistryHive; + InsertTailList(&CmiKeyObjectListHead, &KeyBody->ListEntry); + +Quickie: + /* Check if we got here because of failure */ + if (!NT_SUCCESS(Status)) + { + /* Free any cells we might've allocated */ + if (Class->Length > 0) HvFreeCell(Hive, ClassCell); + HvFreeCell(Hive, *KeyCell); + } + + /* Check if we applied ReactOS hack */ + if (Hack) + { + /* Restore name */ + Name->Buffer--; + Name->Length += sizeof(OBJ_NAME_PATH_SEPARATOR); + Name->MaximumLength += sizeof(OBJ_NAME_PATH_SEPARATOR); + } + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +CmpDoCreate(IN PHHIVE Hive, + IN HCELL_INDEX Cell, + IN PACCESS_STATE AccessState, + IN PUNICODE_STRING Name, + IN KPROCESSOR_MODE AccessMode, + IN PUNICODE_STRING Class OPTIONAL, + IN ULONG CreateOptions, + IN PKEY_OBJECT Parent, + IN PCMHIVE OriginatingHive OPTIONAL, + OUT PVOID *Object) +{ + NTSTATUS Status; + PCELL_DATA CellData; + HCELL_INDEX KeyCell; + ULONG ParentType; + PKEY_OBJECT KeyBody; + PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; + LARGE_INTEGER TimeStamp; + PCM_KEY_NODE KeyNode; + UNICODE_STRING LocalClass = {0}; + if (!Class) Class = &LocalClass; + + /* Acquire the flusher lock */ + //ExAcquirePushLockShared((PVOID)&((PCMHIVE)Hive)->FlusherLock); + + /* Check if the parent is being deleted */ + #define KO_MARKED_FOR_DELETE 0x00000001 + if (Parent->Flags & KO_MARKED_FOR_DELETE) + { + /* It has, quit */ + ASSERT(FALSE); + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Exit; + } + + /* Get the parent node */ + KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Cell); + if (!KeyNode) + { + /* Fail */ + ASSERT(FALSE); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Exit; + } + + /* Make sure nobody added us yet */ + if (CmpFindSubKeyByName(Hive, KeyNode, Name) != HCELL_NIL) + { + /* Fail */ + ASSERT(FALSE); + Status = STATUS_REPARSE; + goto Exit; + } + + /* Sanity check */ + ASSERT(Cell == Parent->KeyCellOffset); + + /* Get the parent type */ + ParentType = HvGetCellType(Cell); + if ((ParentType == HvVolatile) && !(CreateOptions & REG_OPTION_VOLATILE)) + { + /* Children of volatile parents must also be volatile */ + ASSERT(FALSE); + Status = STATUS_CHILD_MUST_BE_VOLATILE; + goto Exit; + } + + /* Don't allow children under symlinks */ + if (Parent->Flags & KEY_SYM_LINK) + { + /* Fail */ + ASSERT(FALSE); + Status = STATUS_ACCESS_DENIED; + goto Exit; + } + + /* Make the cell dirty for now */ + HvMarkCellDirty(Hive, Cell); + + /* Do the actual create operation */ + Status = CmpDoCreateChild(Hive, + Cell, + SecurityDescriptor, + AccessState, + Name, + AccessMode, + Class, + Parent, + CreateOptions, + &KeyCell, + Object); + if (NT_SUCCESS(Status)) + { + /* Get the key body */ + KeyBody = (PKEY_OBJECT)(*Object); + + /* Now add the subkey */ + if (!CmpAddSubKey(Hive, Cell, KeyCell)) + { + /* Failure! We don't handle this yet! */ + ASSERT(FALSE); + } + + /* Get the key node */ + KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Cell); + if (!KeyNode) + { + /* Fail, this shouldn't happen */ + ASSERT(FALSE); + } + + /* Sanity checks */ + ASSERT(KeyBody->ParentKey->KeyCellOffset == Cell); + ASSERT(&KeyBody->ParentKey->RegistryHive->Hive == Hive); + ASSERT(KeyBody->ParentKey == Parent); + + /* Update the timestamp */ + KeQuerySystemTime(&TimeStamp); + KeyNode->LastWriteTime = TimeStamp; + + /* Check if we need to update name maximum */ + if (KeyNode->MaxNameLen < Name->Length) + { + /* Do it */ + KeyNode->MaxNameLen = Name->Length; + } + + /* Check if we need toupdate class length maximum */ + if (KeyNode->MaxClassLen < Class->Length) + { + /* Update it */ + KeyNode->MaxClassLen = Class->Length; + } + + /* Check if we're creating a symbolic link */ + if (CreateOptions & REG_OPTION_CREATE_LINK) + { + /* Get the cell data */ + CellData = HvGetCell(Hive, KeyCell); + if (!CellData) + { + /* This shouldn't happen */ + ASSERT(FALSE); + } + + /* Update the flags */ + CellData->u.KeyNode.Flags |= KEY_SYM_LINK; + HvReleaseCell(Hive, KeyCell); + } + } + +Exit: + /* Release the flusher lock and return status */ + //ExReleasePushLock((PVOID)&((PCMHIVE)Hive)->FlusherLock); + return Status; +}

17 years, 1 month

[jimtabor] 28291: Added a set option to ModifyWorldTransform.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Aug 11 22:15:02 2007 New Revision: 28291 URL: http://svn.reactos.org/svn/reactos?rev=28291&view=rev Log: Added a set option to ModifyWorldTransform. Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c 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 (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Sat Aug 11 22:15:02 2007 @@ -192,6 +192,11 @@ IntGdiCombineTransform(&pDc->w.xformWorld2Wnd, &pDc->w.xformWorld2Wnd, lpXForm); break; + case MWT_MAX+1: // Must be MWT_SET???? + pDc->w.xformWorld2Wnd = *lpXForm; // Do it like Wine. + DC_UpdateXforms(pDc); // Good wine port here too. + break; + default: SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE;

17 years, 1 month

[greatlrd] 28290: adding more dx test to w32knapi, convert from win32kdxtest tool

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Aug 11 19:48:50 2007 New Revision: 28290 URL: http://svn.reactos.org/svn/reactos?rev=28290&view=rev Log: adding more dx test to w32knapi, convert from win32kdxtest tool Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Sat Aug 11 19:48:50 2007 @@ -35,6 +35,7 @@ DWORD *puFourCC = NULL; DD_HALINFO HalInfo; + DD_HALINFO oldHalInfo; DWORD CallBackFlags[4]; D3DNTHAL_CALLBACKS D3dCallbacks; D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; @@ -137,9 +138,7 @@ /* unsuse always 0 */ RTEST(pHalInfo->vmiData.dwFlags == 0 ); - /* fixme check the res */ - - + /* Check the res */ RTEST(pHalInfo->vmiData.dwDisplayWidth == devmode.dmPelsWidth ); RTEST(pHalInfo->vmiData.dwDisplayHeight == devmode.dmPelsHeight ); /* FIXME @@ -148,6 +147,9 @@ RTEST(pHalInfo->vmiData.ddpfDisplay.dwSize == sizeof(DDPIXELFORMAT) ); ASSERT1(pHalInfo->vmiData.ddpfDisplay.dwSize == sizeof(DDPIXELFORMAT)); + /* Fail on 8bit screen deep */ + RTEST(pHalInfo->vmiData.ddpfDisplay.dwFlags == DDPF_RGB); + /* No fourcc are use on primary screen */ RTEST(pHalInfo->vmiData.ddpfDisplay.dwFourCC == 0 ); @@ -159,6 +161,7 @@ //RTEST(pHalInfo->vmiData.ddpfDisplay.dwRBitMask == 0 ); //RTEST(pHalInfo->vmiData.ddpfDisplay.dwGBitMask == 0 ); //RTEST(pHalInfo->vmiData.ddpfDisplay.dwBBitMask == 0 ); + /* primary never set the alpha blend mask */ RTEST(pHalInfo->vmiData.ddpfDisplay.dwRGBAlphaBitMask == 0 ); @@ -170,8 +173,57 @@ // pHalInfo->vmiData->dwAlphaAlign : 0x00000000 /* the primary display address */ - RTEST(pHalInfo->vmiData.pvPrimary != 0x00000000 ); + /* test see if it in kmode memory or not */ + RTEST(pHalInfo->vmiData.pvPrimary != 0 ); + + /* Test see if we got any hardware acclartions for 2d or 3d */ + //RTEST(pHalInfo->ddCaps.dwSize == sizeof(DDCORECAPS)); + + /* Testing see if we got any hw support for + * This test can fail on video card that does not support 2d/overlay/3d + */ + RTEST( pHalInfo->ddCaps.dwCaps != 0); + RTEST( pHalInfo->ddCaps.ddsCaps.dwCaps != 0); + + /* if this fail we do not have a dx driver install acodring ms, some version of windows it + * is okay this fail and drv does then only support basic dx + */ + RTEST( (pHalInfo->dwFlags & (DDHALINFO_GETDRIVERINFOSET | DDHALINFO_GETDRIVERINFO2)) != 0 ); + + if (pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE ) + { + RTEST( pHalInfo->lpD3DGlobalDriverData != 0); + RTEST( pHalInfo->lpD3DHALCallbacks != 0); + RTEST( pHalInfo->lpD3DBufCallbacks != 0); + } } + + /* FIXME DD_HALINFO_V4 test */ + + RtlCopyMemory(&oldHalInfo, &HalInfo, sizeof(DD_HALINFO)); + + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC)== FALSE); + RTEST(pHalInfo != NULL); + RTEST(pCallBackFlags != NULL); + RTEST(puD3dCallbacks == NULL); + RTEST(puD3dDriverData == NULL); + RTEST(puD3dBufferCallbacks == NULL); + RTEST(puD3dTextureFormats == NULL); + RTEST(puNumFourCC == NULL); + RTEST(puFourCC == NULL); + ASSERT1(pHalInfo != NULL); + + /* We do not retesting DD_HALINFO, instead we compare it */ + RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); + /* Cleanup ReactX setup */ DeleteDC(hdc);

17 years, 1 month

[fireball] 28289: - Merge 26992, 27646, 27679, 27966, 28258. - WinLdr now is up-to-date with trunk (28288).

by fireball＠svn.reactos.org

Author: fireball Date: Sat Aug 11 18:38:31 2007 New Revision: 28289 URL: http://svn.reactos.org/svn/reactos?rev=28289&view=rev Log: - Merge 26992, 27646, 27679, 27966, 28258. - WinLdr now is up-to-date with trunk (28288). Modified: branches/winldr/ (props changed) branches/winldr/arch/ (props changed) branches/winldr/arch/i386/ (props changed) branches/winldr/arch/i386/hwpci.c branches/winldr/arch/powerpc/ (props changed) branches/winldr/cache/ (props changed) branches/winldr/comm/ (props changed) branches/winldr/disk/ (props changed) branches/winldr/fs/ (props changed) branches/winldr/include/ (props changed) branches/winldr/include/arch/ (props changed) branches/winldr/include/arch/i386/ (props changed) branches/winldr/include/fs/ (props changed) branches/winldr/include/ui/ (props changed) branches/winldr/include/ui.h branches/winldr/inffile/ (props changed) branches/winldr/inifile/ (props changed) branches/winldr/math/ (props changed) branches/winldr/mm/ (props changed) branches/winldr/reactos/ (props changed) branches/winldr/reactos/binhive.c branches/winldr/rtl/ (props changed) branches/winldr/ui/ (props changed) branches/winldr/ui/tui.c branches/winldr/ui/ui.c branches/winldr/video/ (props changed) branches/winldr/windows/ (props changed) Propchange: branches/winldr/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,7 +1,4 @@ -*.d -*.map -*.exe -*.sys GNUmakefile *.vcproj *.user +*.cbp Propchange: branches/winldr/arch/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,0 +1,4 @@ +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/arch/i386/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,3 +1,4 @@ -*.d +GNUmakefile *.vcproj *.user +*.cbp Modified: branches/winldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/arch/i386/hwpci.c?rev=28… ============================================================================== --- branches/winldr/arch/i386/hwpci.c (original) +++ branches/winldr/arch/i386/hwpci.c Sat Aug 11 18:38:31 2007 @@ -184,8 +184,8 @@ } /* Set 'Configuration Data' value */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + - Table->Size; + Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors) + + 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + Table->Size; FullResourceDescriptor = MmAllocateMemory(Size); if (FullResourceDescriptor == NULL) { @@ -198,14 +198,22 @@ memset(FullResourceDescriptor, 0, Size); FullResourceDescriptor->InterfaceType = Isa; FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Count = 1; + FullResourceDescriptor->PartialResourceList.Version = 1; + FullResourceDescriptor->PartialResourceList.Revision = 1; + FullResourceDescriptor->PartialResourceList.Count = 2; PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + PartialDescriptor->Type = CmResourceTypeBusNumber; + PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + PartialDescriptor->u.BusNumber.Start = 0; + PartialDescriptor->u.BusNumber.Length = 1; + + PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1]; PartialDescriptor->Type = CmResourceTypeDeviceSpecific; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->u.DeviceSpecificData.DataSize = Table->Size; - memcpy((PVOID)((ULONG_PTR)FullResourceDescriptor + sizeof(CM_FULL_RESOURCE_DESCRIPTOR)), + memcpy(&FullResourceDescriptor->PartialResourceList.PartialDescriptors[2], Table, Table->Size); Propchange: branches/winldr/arch/powerpc/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,0 +1,4 @@ +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/cache/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,1 +1,4 @@ -*.d +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/comm/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,1 +1,4 @@ -*.d +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/disk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,1 +1,4 @@ -*.d +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/fs/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,1 +1,4 @@ -*.d +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/include/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,0 +1,4 @@ +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/include/arch/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,0 +1,4 @@ +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/include/arch/i386/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,0 +1,4 @@ +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/include/fs/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,0 +1,4 @@ +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/include/ui/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,0 +1,4 @@ +GNUmakefile +*.vcproj +*.user +*.cbp Modified: branches/winldr/include/ui.h URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/ui.h?rev=28289&r… ============================================================================== --- branches/winldr/include/ui.h (original) +++ branches/winldr/include/ui.h Sat Aug 11 18:38:31 2007 @@ -50,6 +50,7 @@ extern BOOLEAN UiMenuBox; extern BOOLEAN UiMinimal; extern CHAR UiTimeText[]; +extern BOOLEAN UiDrawTime; extern const CHAR UiMonthNames[12][15]; Propchange: branches/winldr/inffile/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,1 +1,4 @@ -*.d +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/inifile/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,1 +1,4 @@ -*.d +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/math/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,1 +1,4 @@ -*.d +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/mm/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,1 +1,4 @@ -*.d +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/reactos/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,1 +1,4 @@ -*.d +GNUmakefile +*.vcproj +*.user +*.cbp Modified: branches/winldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/reactos/binhive.c?rev=28… ============================================================================== --- branches/winldr/reactos/binhive.c (original) +++ branches/winldr/reactos/binhive.c Sat Aug 11 18:38:31 2007 @@ -27,7 +27,7 @@ static PVOID NTAPI -CmpAllocate (ULONG Size, BOOLEAN Paged) +CmpAllocate (SIZE_T Size, BOOLEAN Paged) { return MmAllocateMemory(Size); } Propchange: branches/winldr/rtl/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,1 +1,4 @@ -*.d +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/ui/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,1 +1,4 @@ -*.d +GNUmakefile +*.vcproj +*.user +*.cbp Modified: branches/winldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/ui/tui.c?rev=28289&r1=28… ============================================================================== --- branches/winldr/ui/tui.c (original) +++ branches/winldr/ui/tui.c Sat Aug 11 18:38:31 2007 @@ -20,7 +20,6 @@ #include <freeldr.h> PVOID TextVideoBuffer = NULL; -extern BOOLEAN UiDrawTime; extern BOOLEAN UiMinimal; /* Modified: branches/winldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/ui/ui.c?rev=28289&r1=282… ============================================================================== --- branches/winldr/ui/ui.c (original) +++ branches/winldr/ui/ui.c Sat Aug 11 18:38:31 2007 @@ -269,6 +269,7 @@ 0, ATTR(UiBackdropFgColor, UiBackdropBgColor)); + UiDrawTime = FALSE; UiStatusBarBgColor = 7; UserInterfaceUp = TRUE; Propchange: branches/winldr/video/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,1 +1,4 @@ -*.d +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/winldr/windows/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Aug 11 18:38:31 2007 @@ -1,0 +1,4 @@ +GNUmakefile +*.vcproj +*.user +*.cbp

17 years, 1 month

← Newer
1
...
41
42
43
44
45
46
47
...
67
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 August 2007