Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 26772: Update painting.c with new storage method for floating point operations.
by jimtabor＠svn.reactos.org 14 May '07

14 May '07

Author: jimtabor Date: Mon May 14 07:18:42 2007 New Revision: 26772 URL: http://svn.reactos.org/svn/reactos?rev=26772&view=rev Log: Update painting.c with new storage method for floating point operations. Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Mon May 14 07:18:42 2007 @@ -1,15 +1,66 @@ #include "precomp.h" - -typedef union -{ - FLOAT f; - ULONG l; -} gxf_long; - -#define XFPMANT(fp) ((fp.l) & 0x7fffff) -#define XFPEXP(fp) ((fp.l) >> 23) & 0xff) -#define XFPBUILD(e, m) (((e << 23) & 0x7f800000) | (m & 0x7fffff)) +/* the following deal with IEEE single-precision numbers */ +#define EXCESS 126L +#define SIGNBIT 0x80000000L +#define SIGN(fp) ((fp) & SIGNBIT) +#define EXP(fp) (((fp) >> 23L) & 0xFF) +#define MANT(fp) ((fp) & 0x7FFFFFL) +#define PACK(s,e,m) ((s) | ((e) << 23L) | (m)) + +// Sames as lrintf. +#ifdef __GNUC__ +#define FLOAT_TO_INT(in,out) \ + __asm__ __volatile__ ("fistpl %0" : "=m" (out) : "t" (in) : "st"); +#else +#define FLOAT_TO_INT(in,out) \ + __asm fld in \ + __asm fistp out +#endif + +LONG +FASTCALL +EFtoF( EFLOAT_S * efp) +{ + long Mant, Exp, Sign = 0; + + if (!efp->lMant) return 0; + + Mant = efp->lMant; + Exp = efp->lExp; + Sign = SIGN(Mant); + +//// M$ storage emulation + Mant = ((Mant & 0x3fffffff) >> 7); + Exp += (1 - EXCESS); +//// + Mant = MANT(Mant); + return PACK(Sign, Exp, Mant); +} + +VOID +FASTCALL +FtoEF( EFLOAT_S * efp, FLOATL f) +{ + long Mant, Exp; + gxf_long worker; + +#ifdef _X86_ + worker.l = f; // It's a float stored in a long. +#else + worker.f = f; +#endif + + Exp = EXP(worker.l); + Mant = MANT(worker.l); + +//// M$ storage emulation + Mant = ((Mant << 7) | 0x40000000 | SIGN(worker.l)); + Exp -= (1 - EXCESS); +//// + efp->lMant = Mant; + efp->lExp = Exp; +} VOID FASTCALL @@ -21,15 +72,16 @@ x = (FLOAT)Point->x; y = (FLOAT)Point->y; - a.l = XFPBUILD( mx->efM11.lExp, mx->efM11.lMant); - b.l = XFPBUILD( mx->efM21.lExp, mx->efM21.lMant); - - Point->x = x * a.f + y * b.f + mx->fxDx; - - a.l = XFPBUILD( mx->efM12.lExp, mx->efM12.lMant); - b.l = XFPBUILD( mx->efM22.lExp, mx->efM22.lMant); - - Point->y = x * a.f + y * b.f + mx->fxDy; + a.l = EFtoF( &mx->efM11 ); + b.l = EFtoF( &mx->efM21 ); + x = x * a.f + y * b.f + mx->fxDx; + + a.l = EFtoF( &mx->efM12 ); + b.l = EFtoF( &mx->efM22 ); + y = x * a.f + y * b.f + mx->fxDy; + + FLOAT_TO_INT(x, Point->x ); + FLOAT_TO_INT(y, Point->y ); }

1 0

[cwittich] 26771: asome extra space for the german text
by cwittich＠svn.reactos.org 14 May '07

14 May '07

Author: cwittich Date: Mon May 14 05:09:50 2007 New Revision: 26771 URL: http://svn.reactos.org/svn/reactos?rev=26771&view=rev Log: asome extra space for the german text Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Mon May 14 05:09:50 2007 @@ -45,7 +45,7 @@ LBS_NOINTEGRALHEIGHT | WS_VSCROLL LTEXT "ReactOS ist unter der GPL veröffentlicht, wenn Sie also (Teile von) ReactOS wiederverwenden "\ "oder wiederveröffentlichen wollen, müssen Sie die GPL respektieren.", - IDC_STATIC,15,110,227,19 + IDC_STATIC,15,110,227,24 PUSHBUTTON "&GPL &ansehen...",IDC_VIEWGPL,251,110,50,19 LTEXT "Klicken Sie auf Weiter, um mit dem Setup fortzufahren.",IDC_STATIC,15,136, 195,17

1 0

[cwittich] 26770: some extra space for the text (to be displayed completely)
by cwittich＠svn.reactos.org 14 May '07

14 May '07

Author: cwittich Date: Mon May 14 05:05:57 2007 New Revision: 26770 URL: http://svn.reactos.org/svn/reactos?rev=26770&view=rev Log: some extra space for the text (to be displayed completely) Modified: trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc trunk/reactos/base/setup/vmwinst/lang/da-DK.rc trunk/reactos/base/setup/vmwinst/lang/de-DE.rc trunk/reactos/base/setup/vmwinst/lang/en-US.rc trunk/reactos/base/setup/vmwinst/lang/es-ES.rc Modified: trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/cs… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc (original) +++ trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc Mon May 14 05:05:57 2007 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "ReactOS zjistil, e bìí pod VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Pokud chcete nainstalovat VMware(r) SVGA ovladaè klepnìte na 'Dalí', pokud ovladaè instalovat nechcete, klepnìte na 'Storno'.", -1, 100, 140, 160, 17 + LTEXT "Pokud chcete nainstalovat VMware(r) SVGA ovladaè klepnìte na 'Dalí', pokud ovladaè instalovat nechcete, klepnìte na 'Storno'.", -1, 100, 140, 160, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -64,7 +64,7 @@ PUSHBUTTON "Upravit nastavení obrazovky", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Pouít jiný grafický ovladaè", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Odebrat ovladaè VMware(r) SVGA", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Klepnìte na 'Dalí' pro pokraèování nebo na 'Storno' pro ukonèení prùvodce.", -1, 25, 93, 225, 12 + LTEXT "Klepnìte na 'Dalí' pro pokraèování nebo na 'Storno' pro ukonèení prùvodce.", -1, 25, 93, 225, 19 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/da… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/da-DK.rc (original) +++ trunk/reactos/base/setup/vmwinst/lang/da-DK.rc Mon May 14 05:05:57 2007 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "ReactOS Installation har opdaget at du køre ReactOS under VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Hvis du ønsker at installere VMware(r) SVGA driveren Klik 'Næste', Ellers klik på 'Fortryd' for at afbryde.", -1, 100, 140, 160, 17 + LTEXT "Hvis du ønsker at installere VMware(r) SVGA driveren Klik 'Næste', Ellers klik på 'Fortryd' for at afbryde.", -1, 100, 140, 160, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -64,7 +64,7 @@ PUSHBUTTON "Konfigurer Skærm indstillinger", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Benyt en anden Grafikkort Driver", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Afinstallere WMware(r) SVGA driver", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Klik på 'Næste' for at forsætte eller klik på 'Fortryd' for at afslutte guiden.", -1, 25, 93, 225, 12 + LTEXT "Klik på 'Næste' for at forsætte eller klik på 'Fortryd' for at afslutte guiden.", -1, 25, 93, 225, 19 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/de… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/de-DE.rc (original) +++ trunk/reactos/base/setup/vmwinst/lang/de-DE.rc Mon May 14 05:05:57 2007 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Das ReactOS Setup hat festgestellt, dass Sie ReactOS in VMware(r) installieren.", -1, 100, 8, 160, 24 - LTEXT "Wenn Sie den VMware(r) SVGA Treiber installieren möchten, klicken Sie auf 'Weiter', ansonsten auf 'Abbrechen'.", -1, 100, 140, 160, 17 + LTEXT "Wenn Sie den VMware(r) SVGA Treiber installieren möchten, klicken Sie auf 'Weiter', ansonsten auf 'Abbrechen'.", -1, 100, 140, 160, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -64,7 +64,7 @@ PUSHBUTTON "Die Bildeinstellungen ändern", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Einen anderen Grafiktreiber benutzen", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Den VMware(r) SVGA Treiber entfernen", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Klicken Sie auf 'Weiter' um fortzufahren oder 'Abbrechen' um den Asssistenten zu beenden.", -1, 25, 93, 225, 12 + LTEXT "Klicken Sie auf 'Weiter' um fortzufahren oder 'Abbrechen' um den Asssistenten zu beenden.", -1, 25, 93, 225, 19 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/en… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/en-US.rc (original) +++ trunk/reactos/base/setup/vmwinst/lang/en-US.rc Mon May 14 05:05:57 2007 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "The ReactOS setup detected that you run ReactOS inside of VMware(r).", -1, 100, 8, 160, 24 - LTEXT "If you like to install the VMware(r) SVGA driver click 'Next', otherwise click 'Cancel'.", -1, 100, 140, 160, 17 + LTEXT "If you like to install the VMware(r) SVGA driver click 'Next', otherwise click 'Cancel'.", -1, 100, 140, 160, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -64,7 +64,7 @@ PUSHBUTTON "Configure the screen settings", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Use a different graphics driver", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Uninstall the VMware(r) SVGA driver", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Click 'Next' to continue or 'Cancel' to exit the wizard.", -1, 25, 93, 225, 12 + LTEXT "Click 'Next' to continue or 'Cancel' to exit the wizard.", -1, 25, 93, 225, 19 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/es… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/es-ES.rc (original) +++ trunk/reactos/base/setup/vmwinst/lang/es-ES.rc Mon May 14 05:05:57 2007 @@ -8,7 +8,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "El instalador de ReactOS ha detectado que husted está ejecutando ReactOS sobre el emulador VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Si husted desea instalar el controlador SVGA VMware(r), haga click en 'Siguiente', de lo contrario haga click en 'Cancelar'.", -1, 100, 140, 160, 17 + LTEXT "Si husted desea instalar el controlador SVGA VMware(r), haga click en 'Siguiente', de lo contrario haga click en 'Cancelar'.", -1, 100, 140, 160, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -66,7 +66,7 @@ PUSHBUTTON "Configurar las opciones de pantalla", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Usar un controlador gráfico distinto", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Desinstalar el controlador SVGA VMware(r)", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Haga Click en 'Siguiente' para continuar o 'Cancelar' para salir del asistente.", -1, 25, 93, 225, 12 + LTEXT "Haga Click en 'Siguiente' para continuar o 'Cancelar' para salir del asistente.", -1, 25, 93, 225, 19 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

1 0

[jimtabor] 26769: Commit union for float conversion.
by jimtabor＠svn.reactos.org 14 May '07

14 May '07

Author: jimtabor Date: Mon May 14 04:47:29 2007 New Revision: 26769 URL: http://svn.reactos.org/svn/reactos?rev=26769&view=rev Log: Commit union for float conversion. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Mon May 14 04:47:29 2007 @@ -143,4 +143,12 @@ FLONG flAccel; } MATRIX_S; +/* Gdi XForm storage union */ +typedef union +{ + FLOAT f; + ULONG l; +} gxf_long; + + #endif

1 0

[ion] 26768: - Implement NtDeleteValueKey as a simple wrapper around CmDeleteValueKey so that handles, callbacks and SEH is abstracted away. - Implement CmpRemoveValueFromList. - Implement CmDeleteValueKey based on the old code, make it use CmpRemoveValueFromList. - Remove CmiDeleteValueFromKey, CmiDestroyValueCell.
by ion＠svn.reactos.org 14 May '07

14 May '07

Author: ion Date: Mon May 14 04:44:26 2007 New Revision: 26768 URL: http://svn.reactos.org/svn/reactos?rev=26768&view=rev Log: - Implement NtDeleteValueKey as a simple wrapper around CmDeleteValueKey so that handles, callbacks and SEH is abstracted away. - Implement CmpRemoveValueFromList. - Implement CmDeleteValueKey based on the old code, make it use CmpRemoveValueFromList. - Remove CmiDeleteValueFromKey, CmiDestroyValueCell. Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmvalue.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26768… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Mon May 14 04:44:26 2007 @@ -261,10 +261,9 @@ OUT PCM_KEY_VALUE *ValueCell); NTSTATUS -CmiDeleteValueFromKey(IN PEREGISTRY_HIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, - IN HCELL_INDEX KeyCellOffset, - IN PUNICODE_STRING ValueName); +NTAPI +CmDeleteValueKey(IN PKEY_OBJECT KeyControlBlock, + IN UNICODE_STRING ValueName); NTSTATUS CmiAllocateHashTableCell(IN PEREGISTRY_HIVE RegistryHive, @@ -307,10 +306,6 @@ NTSTATUS CmiConnectHive(POBJECT_ATTRIBUTES KeyObjectAttributes, PEREGISTRY_HIVE RegistryHive); - -NTSTATUS -CmiDisconnectHive (POBJECT_ATTRIBUTES KeyObjectAttributes, - PEREGISTRY_HIVE *RegistryHive); NTSTATUS CmiInitHives(BOOLEAN SetupBoot); 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 Mon May 14 04:44:26 2007 @@ -1854,88 +1854,48 @@ return Status; } -NTSTATUS STDCALL -NtDeleteValueKey (IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName) -{ - PKEY_OBJECT KeyObject; - NTSTATUS Status; - REG_DELETE_VALUE_KEY_INFORMATION DeleteValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - KPROCESSOR_MODE PreviousMode; - UNICODE_STRING CapturedValueName; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_SET_VALUE, - CmpKeyObjectType, - PreviousMode, - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - Status = ProbeAndCaptureUnicodeString(&CapturedValueName, - PreviousMode, - ValueName); - if (!NT_SUCCESS(Status)) - { - goto Fail; - } - DeleteValueKeyInfo.Object = (PVOID)KeyObject; - DeleteValueKeyInfo.ValueName = &CapturedValueName; - - /* FIXME - check if value exists before calling the callbacks? */ - Status = CmiCallRegisteredCallbacks(RegNtPreDeleteValueKey, &DeleteValueKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostOperationInfo.Object = (PVOID)KeyObject; - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostDeleteValueKey, &PostOperationInfo); - ReleaseCapturedUnicodeString(&CapturedValueName, - PreviousMode); -Fail: - ObDereferenceObject(KeyObject); - return Status; - } - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - - VERIFY_KEY_OBJECT(KeyObject); - - Status = CmiDeleteValueFromKey(KeyObject->RegistryHive, - KeyObject->KeyCell, - KeyObject->KeyCellOffset, - ValueName); - - KeQuerySystemTime (&KeyObject->KeyCell->LastWriteTime); - HvMarkCellDirty (&KeyObject->RegistryHive->Hive, KeyObject->KeyCellOffset); - - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - ReleaseCapturedUnicodeString(&CapturedValueName, - PreviousMode); - - PostOperationInfo.Object = (PVOID)KeyObject; - PostOperationInfo.Status = Status; - - CmiCallRegisteredCallbacks(RegNtPostDeleteValueKey, &PostOperationInfo); - - ObDereferenceObject (KeyObject); - - CmiSyncHives (); - - return Status; +NTSTATUS +NTAPI +NtDeleteValueKey(IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName) +{ + PKEY_OBJECT KeyObject; + NTSTATUS Status; + REG_DELETE_VALUE_KEY_INFORMATION DeleteValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_SET_VALUE, + CmpKeyObjectType, + PreviousMode, + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Do the callback */ + DeleteValueKeyInfo.Object = (PVOID)KeyObject; + DeleteValueKeyInfo.ValueName = ValueName; + Status = CmiCallRegisteredCallbacks(RegNtPreDeleteValueKey, + &DeleteValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmDeleteValueKey(KeyObject, *ValueName); + + /* Do the post callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostDeleteValueKey, + &PostOperationInfo); + } + + /* Dereference the key body and synchronize the hives */ + ObDereferenceObject(KeyObject); + CmiSyncHives(); + return Status; } /* Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Mon May 14 04:44:26 2007 @@ -665,79 +665,6 @@ } NTSTATUS -CmiDeleteValueFromKey(IN PEREGISTRY_HIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, - IN HCELL_INDEX KeyCellOffset, - IN PUNICODE_STRING ValueName) -{ - PVALUE_LIST_CELL ValueListCell; - PCM_KEY_VALUE CurValueCell; - ULONG i; - NTSTATUS Status; - - if (KeyCell->ValueList.List == -1) - { - return STATUS_OBJECT_NAME_NOT_FOUND; - } - - ValueListCell = HvGetCell (&RegistryHive->Hive, KeyCell->ValueList.List); - - VERIFY_VALUE_LIST_CELL(ValueListCell); - - for (i = 0; i < KeyCell->ValueList.Count; i++) - { - CurValueCell = HvGetCell (&RegistryHive->Hive, ValueListCell->ValueOffset[i]); - - if (CmiComparePackedNames(ValueName, - CurValueCell->Name, - CurValueCell->NameSize, - (BOOLEAN)((CurValueCell->Flags & REG_VALUE_NAME_PACKED) ? TRUE : FALSE))) - { - Status = CmiDestroyValueCell(RegistryHive, - CurValueCell, - ValueListCell->ValueOffset[i]); - if (CurValueCell == NULL) - { - DPRINT1("CmiDestroyValueCell() failed\n"); - return Status; - } - - if (i < (KeyCell->ValueList.Count - 1)) - { - RtlMoveMemory(&ValueListCell->ValueOffset[i], - &ValueListCell->ValueOffset[i + 1], - sizeof(HCELL_INDEX) * (KeyCell->ValueList.Count - 1 - i)); - } - ValueListCell->ValueOffset[KeyCell->ValueList.Count - 1] = 0; - - - KeyCell->ValueList.Count--; - - if (KeyCell->ValueList.Count == 0) - { - HvFreeCell(&RegistryHive->Hive, KeyCell->ValueList.List); - KeyCell->ValueList.List = -1; - } - else - { - HvMarkCellDirty(&RegistryHive->Hive, - KeyCell->ValueList.List); - } - - HvMarkCellDirty(&RegistryHive->Hive, - KeyCellOffset); - - return STATUS_SUCCESS; - } - } - - DPRINT("Couldn't find the desired value\n"); - - return STATUS_OBJECT_NAME_NOT_FOUND; -} - - -NTSTATUS CmiAllocateHashTableCell (IN PEREGISTRY_HIVE RegistryHive, OUT PHASH_TABLE_CELL *HashBlock, OUT HCELL_INDEX *HBOffset, @@ -831,31 +758,6 @@ return STATUS_UNSUCCESSFUL; } -NTSTATUS -CmiDestroyValueCell(PEREGISTRY_HIVE RegistryHive, - PCM_KEY_VALUE ValueCell, - HCELL_INDEX ValueCellOffset) -{ - DPRINT("CmiDestroyValueCell(Cell %p Offset %lx)\n", - ValueCell, ValueCellOffset); - - VERIFY_VALUE_CELL(ValueCell); - - /* Destroy the data cell */ - if (!(ValueCell->DataSize & REG_DATA_IN_OFFSET) - && ValueCell->DataSize > sizeof(HCELL_INDEX) - && ValueCell->DataOffset != HCELL_NULL) - { - HvFreeCell (&RegistryHive->Hive, ValueCell->DataOffset); - } - - /* Destroy the value cell */ - HvFreeCell (&RegistryHive->Hive, ValueCellOffset); - - return STATUS_SUCCESS; -} - - ULONG CmiGetPackedNameLength(IN PUNICODE_STRING Name, OUT PBOOLEAN Packable) Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Mon May 14 04:44:26 2007 @@ -1064,6 +1064,14 @@ IN ULONG DataLength ); +NTSTATUS +NTAPI +CmpRemoveValueFromList( + IN PHHIVE Hive, + IN ULONG Index, + IN OUT PCHILD_LIST ChildList +); + // // Boot Routines // Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Mon May 14 04:44:26 2007 @@ -86,7 +86,7 @@ /* Otherwise, set the data length, and make sure the data is dirty */ CellData->u.KeyValue.DataLength = DataSize; - ASSERT(HvIsCellDirty(Hive,CellData->u.KeyValue.Data)); + ASSERT(HvIsCellDirty(Hive, CellData->u.KeyValue.Data)); } else { @@ -105,7 +105,7 @@ /* If we failed, free the entire cell, including the data */ if (!NT_SUCCESS(Status)) CmpFreeValue(Hive, ValueCell); - /* Return status */ + /* Return Status */ return Status; } @@ -340,3 +340,117 @@ return Status; } +NTSTATUS +NTAPI +CmDeleteValueKey(IN PKEY_OBJECT KeyObject, + IN UNICODE_STRING ValueName) +{ + NTSTATUS Status = STATUS_OBJECT_NAME_NOT_FOUND; + PHHIVE Hive; + PCM_KEY_NODE Parent; + HCELL_INDEX ChildCell, Cell; + PCHILD_LIST ChildList; + PCM_KEY_VALUE Value = NULL; + ULONG ChildIndex; + BOOLEAN Result; + + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + /* Get the hive and the cell index */ + Hive = &KeyObject->RegistryHive->Hive; + Cell = KeyObject->KeyCellOffset; + + /* Get the parent key node */ + Parent = (PCM_KEY_NODE)HvGetCell(Hive, Cell); + if (!Parent) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Get the value list and check if it has any entries */ + ChildList = &Parent->ValueList; + if (ChildList->Count) + { + /* Try to find this value */ + Result = CmpFindNameInList(Hive, + ChildList, + &ValueName, + &ChildIndex, + &ChildCell); + if (!Result) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Value not found, return error */ + if (ChildCell == HCELL_NIL) goto Quickie; + + /* We found the value, mark all relevant cells dirty */ + HvMarkCellDirty(Hive, Cell); + HvMarkCellDirty(Hive, Parent->ValueList.List); + HvMarkCellDirty(Hive, ChildCell); + + /* Get the key value */ + Value = (PCM_KEY_VALUE)HvGetCell(Hive,ChildCell); + if (!Value) ASSERT(FALSE); + + /* Mark it and all related data as dirty */ + CmpMarkValueDataDirty(Hive, Value); + + /* Ssanity checks */ + ASSERT(HvIsCellDirty(Hive, Parent->ValueList.List)); + ASSERT(HvIsCellDirty(Hive, ChildCell)); + + /* Remove the value from the child list */ + Status = CmpRemoveValueFromList(Hive, ChildIndex, ChildList); + if(!NT_SUCCESS(Status)) goto Quickie; + + /* Remove the value and its data itself */ + if (!CmpFreeValue(Hive, ChildCell)) + { + /* Failed to free the value, fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Set the last write time */ + KeQuerySystemTime(&Parent->LastWriteTime); + + /* Sanity check */ + ASSERT(HvIsCellDirty(Hive, Cell)); + + /* Check if the value list is empty now */ + if (!Parent->ValueList.Count) + { + /* Then clear key node data */ + Parent->MaxValueNameLen = 0; + Parent->MaxValueDataLen = 0; + } + + /* Change default status to success */ + Status = STATUS_SUCCESS; + } + +Quickie: + /* Release the parent cell, if any */ + if (Parent) HvReleaseCell(Hive, Cell); + + /* Check if we had a value */ + if (Value) + { + /* Release the child cell */ + ASSERT(ChildCell != HCELL_NIL); + HvReleaseCell(Hive, ChildCell); + } + + /* Release hive lock */ + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + return Status; +} Modified: trunk/reactos/ntoskrnl/config/cmvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalue.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalue.c (original) +++ trunk/reactos/ntoskrnl/config/cmvalue.c Mon May 14 04:44:26 2007 @@ -307,3 +307,58 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +CmpRemoveValueFromList(IN PHHIVE Hive, + IN ULONG Index, + IN OUT PCHILD_LIST ChildList) +{ + ULONG Count; + PCELL_DATA CellData; + HCELL_INDEX NewCell; + PAGED_CODE(); + + /* Sanity check */ + ASSERT((((LONG)Index) >= 0) && (Index <= ChildList->Count)); + + /* Get the new count after removal */ + Count = ChildList->Count - 1; + if (Count > 0) + { + /* Get the actual list array */ + CellData = HvGetCell(Hive, ChildList->List); + if (!CellData) return STATUS_INSUFFICIENT_RESOURCES; + + /* Make sure cells data have been made dirty */ + ASSERT(HvIsCellDirty(Hive, ChildList->List)); + ASSERT(HvIsCellDirty(Hive, CellData->u.KeyList[Index])); + + /* Loop the list */ + while (Index < Count) + { + /* Move everything up */ + CellData->u.KeyList[Index] = CellData->u.KeyList[Index + 1]; + Index++; + } + + /* Re-allocate the cell for the list by decreasing the count */ + NewCell = HvReallocateCell(Hive, + ChildList->List, + Count * sizeof(HCELL_INDEX)); + ASSERT(NewCell != HCELL_NIL); + HvReleaseCell(Hive,ChildList->List); + + /* Update the list cell */ + ChildList->List = NewCell; + } + else + { + /* Otherwise, we were the last entry, so free the list entirely */ + HvFreeCell(Hive, ChildList->List); + ChildList->List = HCELL_NIL; + } + + /* Update the child list with the new count */ + ChildList->Count = Count; + return STATUS_SUCCESS; +}

1 0

[arty] 26767: Fixed relocation.
by arty＠svn.reactos.org 13 May '07

13 May '07

Author: arty Date: Mon May 14 03:57:22 2007 New Revision: 26767 URL: http://svn.reactos.org/svn/reactos?rev=26767&view=rev Log: Fixed relocation. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Mon May 14 03:57:22 2007 @@ -505,11 +505,11 @@ memcpy(&symbol, SymbolSection + (ELF32_R_SYM(reloc.r_info) * sizeof(symbol)), sizeof(symbol)); /* Compute addends */ - S = symbol.st_value + KernelAddr; + S = symbol.st_value + ELF_SECTION(symbol.st_shndx)->sh_addr + KernelAddr; A = reloc.r_addend; P = reloc.r_offset + ELF_SECTION(targetSection)->sh_addr; - Target32 = (ULONG*)((PCHAR)KernelMemory) + P; + Target32 = (ULONG*)(((PCHAR)KernelMemory) + P); Target16 = (USHORT *)Target32; x = *Target32; @@ -539,14 +539,19 @@ *Target16 = (S + A + 0x8000) >> 16; break; default: - printf("reloc[%d]: (type %x sym %d val %d) off %x add %x\n", - j, - ELF32_R_TYPE(reloc.r_info), - ELF32_R_SYM(reloc.r_info), - symbol.st_value, - reloc.r_offset, reloc.r_addend); break; } + +#if 0 + printf("reloc[%d:%x]: (type %x sym %d val %d) off %x add %x (old %x new %x)\n", + j, + ((ULONG)Target32) - ((ULONG)KernelMemory), + ELF32_R_TYPE(reloc.r_info), + ELF32_R_SYM(reloc.r_info), + symbol.st_value, + reloc.r_offset, reloc.r_addend, + x, *Target32); +#endif } MmFreeMemory(SymbolSection);

1 0

[dgorbachev] 26766: Fix r26764.
by dgorbachev＠svn.reactos.org 13 May '07

13 May '07

Author: dgorbachev Date: Mon May 14 02:44:36 2007 New Revision: 26766 URL: http://svn.reactos.org/svn/reactos?rev=26766&view=rev Log: Fix r26764. Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=267… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Mon May 14 02:44:36 2007 @@ -1043,8 +1043,8 @@ /* Remove trailing newline */ while ((CsdString.Length > 0) && - ((CsdString.Buffer[CsdString.Length] == '\r') || - (CsdString.Buffer[CsdString.Length] == '\n'))) + ((CsdString.Buffer[CsdString.Length - 1] == '\r') || + (CsdString.Buffer[CsdString.Length - 1] == '\n'))) { /* Skip the trailing character */ CsdString.Length--; @@ -1466,8 +1466,8 @@ /* Make sure to remove the \r\n if we actually have a string */ while ((TempString.Length > 0) && - ((TempString.Buffer[TempString.Length] == '\r') || - (TempString.Buffer[TempString.Length] == '\n'))) + ((TempString.Buffer[TempString.Length - 1] == '\r') || + (TempString.Buffer[TempString.Length - 1] == '\n'))) { /* Skip the trailing character */ TempString.Length--;

1 0

[mbosma] 26765: Lots of additional cases by EmuandCo.
by mbosma＠svn.reactos.org 13 May '07

13 May '07

Author: mbosma Date: Mon May 14 00:31:38 2007 New Revision: 26765 URL: http://svn.reactos.org/svn/reactos?rev=26765&view=rev Log: Lots of additional cases by EmuandCo. Modified: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp Modified: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp Mon May 14 00:31:38 2007 @@ -1,103 +1,208 @@ - HWND CreateBasicWindow (VOID); - + BOOL Test_CreateSurface (INT* passed, INT* failed) { LPDIRECTDRAW7 DirectDraw; LPDIRECTDRAWSURFACE7 DirectDrawSurface = NULL; HWND hwnd; - + /* Preparations */ if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) { printf("ERROR: Failed to set up ddraw\n"); return FALSE; } - + if(!( hwnd = CreateBasicWindow() )) { printf("ERROR: Failed to create window\n"); DirectDraw->Release(); return FALSE; } - + if (DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL) != DD_OK) { printf("ERROR: you not set cooperative level\n"); DirectDraw->Release(); return 0; } - + /* The Test */ - + DDSURFACEDESC2 Desc = { 0 }; - + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, (IUnknown*)0xdeadbeef) == CLASS_E_NOAGGREGATION ); TEST ( DirectDraw->CreateSurface(NULL, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->CreateSurface(&Desc, NULL, NULL) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS ); - + + Desc.dwHeight = 200; + Desc.dwWidth = 200; + + Desc.dwFlags = DDSD_CAPS; Desc.dwSize = sizeof (DDSURFACEDESC2); - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS ); - + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + DirectDrawSurface = NULL; + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_3DDEVICE; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + DirectDrawSurface = NULL; + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_ALLOCONLOAD; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_ALPHA; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_FLIP; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_FRONTBUFFER; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_HWCODEC; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + DirectDrawSurface = NULL; + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_LIVEVIDEO; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + DirectDrawSurface = NULL; + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_MIPMAP; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_MODEX; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + DirectDrawSurface = NULL; + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_NONLOCALVIDMEM; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + DirectDrawSurface = NULL; + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_OPTIMIZED; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_OVERLAY; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + DirectDrawSurface = NULL; + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_OWNDC; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_UNSUPPORTED); + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_PALETTE; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + Desc.dwFlags = DDSD_CAPS; Desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK ); TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); - + DirectDrawSurface = NULL; + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_STANDARDVGAMODE; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + DirectDrawSurface = NULL; + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + DirectDrawSurface = NULL; + DirectDrawSurface = NULL; Desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - - DirectDrawSurface = NULL; - Desc.ddsCaps.dwCaps = DDSCAPS_3DDEVICE; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - - DirectDrawSurface = NULL; - Desc.ddsCaps.dwCaps = DDSCAPS_ALLOCONLOAD; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - DirectDrawSurface = NULL; - Desc.ddsCaps.dwCaps = DDSCAPS_ALPHA; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - - DirectDrawSurface = NULL; - Desc.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - DirectDrawSurface = NULL; - Desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - DirectDrawSurface = NULL; - Desc.ddsCaps.dwCaps = DDSCAPS_FLIP; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - DirectDrawSurface = NULL; - Desc.ddsCaps.dwCaps = DDSCAPS_HWCODEC; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - - DirectDrawSurface = NULL; - Desc.ddsCaps.dwCaps = DDSCAPS_LIVEVIDEO; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - - DirectDrawSurface = NULL; - Desc.ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - DirectDrawSurface = NULL; - Desc.ddsCaps.dwCaps = DDSCAPS_MIPMAP; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - DirectDrawSurface = NULL; - Desc.ddsCaps.dwCaps = DDSCAPS_MODEX; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - - DirectDrawSurface = NULL; - Desc.ddsCaps.dwCaps = DDSCAPS_MODEX; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - + Desc.dwFlags = DDSD_CAPS; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK ); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + DirectDrawSurface = NULL; + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_VIDEOMEMORY; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + DirectDrawSurface = NULL; + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_VIDEOPORT; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + DirectDrawSurface = NULL; + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_VISIBLE; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_WRITEONLY; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + Desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + DirectDraw->Release(); - + return TRUE; -} +}

1 0

[ion] 26764: - Properly remove trailing \r\n depending on system configuration. Previous code assumed our wmc tool used target-newlines instead of host-newlines, causing Linux builds to display incorrect boot messages. New code scans the string.
by ion＠svn.reactos.org 13 May '07

13 May '07

Author: ion Date: Mon May 14 00:26:08 2007 New Revision: 26764 URL: http://svn.reactos.org/svn/reactos?rev=26764&view=rev Log: - Properly remove trailing \r\n depending on system configuration. Previous code assumed our wmc tool used target-newlines instead of host-newlines, causing Linux builds to display incorrect boot messages. New code scans the string. Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=267… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Mon May 14 00:26:08 2007 @@ -1040,7 +1040,17 @@ { /* Setup the string */ RtlInitAnsiString(&CsdString, MsgEntry->Text); - CsdString.Length -= 2; + + /* Remove trailing newline */ + while ((CsdString.Length > 0) && + ((CsdString.Buffer[CsdString.Length] == '\r') || + (CsdString.Buffer[CsdString.Length] == '\n'))) + { + /* Skip the trailing character */ + CsdString.Length--; + } + + /* Fill the buffer with version information */ Status = RtlStringCbPrintfA(Buffer, sizeof(Buffer), "%Z %u%c", @@ -1455,7 +1465,13 @@ RtlInitAnsiString(&TempString, MpString); /* Make sure to remove the \r\n if we actually have a string */ - if (TempString.Length >= 2) TempString.Length -= sizeof(2); + while ((TempString.Length > 0) && + ((TempString.Buffer[TempString.Length] == '\r') || + (TempString.Buffer[TempString.Length] == '\n'))) + { + /* Skip the trailing character */ + TempString.Length--; + } /* Get the information string from our resource file */ MsgStatus = RtlFindMessage(NtosEntry->DllBase,

1 0

[ion] 26763: - Remove confusion.
by ion＠svn.reactos.org 13 May '07

13 May '07

Author: ion Date: Sun May 13 23:57:35 2007 New Revision: 26763 URL: http://svn.reactos.org/svn/reactos?rev=26763&view=rev Log: - Remove confusion. Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=267… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sun May 13 23:57:35 2007 @@ -1040,7 +1040,7 @@ { /* Setup the string */ RtlInitAnsiString(&CsdString, MsgEntry->Text); - CsdString.Length -= sizeof(UNICODE_NULL); + CsdString.Length -= 2; Status = RtlStringCbPrintfA(Buffer, sizeof(Buffer), "%Z %u%c", @@ -1455,7 +1455,7 @@ RtlInitAnsiString(&TempString, MpString); /* Make sure to remove the \r\n if we actually have a string */ - if (TempString.Length >= 2) TempString.Length -= sizeof(UNICODE_NULL); + if (TempString.Length >= 2) TempString.Length -= sizeof(2); /* Get the information string from our resource file */ MsgStatus = RtlFindMessage(NtosEntry->DllBase,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs