Ros-diffs January 2013

ros-diffs@reactos.org

11 participants
185 discussions

[ekohl] 58117: [SAMSRV] Implement SamrQueryInformationUser.UserParametersInformation and set the Parameters attribute when a new user is created.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jan 5 20:30:06 2013 New Revision: 58117 URL: http://svn.reactos.org/svn/reactos?rev=58117&view=rev Log: [SAMSRV] Implement SamrQueryInformationUser.UserParametersInformation and set the Parameters attribute when a new user is created. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Jan 5 20:30:06 2013 @@ -2297,6 +2297,18 @@ return Status; } + /* Set the Parameters attribute */ + Status = SampSetObjectAttribute(UserObject, + L"Parameters", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + /* FIXME: Set default user attributes */ if (NT_SUCCESS(Status)) @@ -5654,6 +5666,47 @@ } +static NTSTATUS +SampQueryUserParameters(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER *Buffer) +{ + PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Get the Parameters string */ + Status = SampGetObjectAttributeString(UserObject, + L"Parameters", + &InfoBuffer->Parameters.Parameters); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + if (InfoBuffer->Parameters.Parameters.Buffer != NULL) + midl_user_free(InfoBuffer->Parameters.Parameters.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + /* Function 36 */ NTSTATUS NTAPI @@ -5689,6 +5742,7 @@ case UserControlInformation: case UserExpiresInformation: + case UserParametersInformation: DesiredAccess = USER_READ_ACCOUNT; break; @@ -5800,6 +5854,19 @@ Status = SampQueryUserExpires(UserObject, Buffer); break; + +// case UserInternal1Information: + + case UserParametersInformation: + Status = SampQueryUserParameters(UserObject, + Buffer); + break; + +// case UserAllInformation: +// case UserInternal4Information: +// case UserInternal5Information: +// case UserInternal4InformationNew: +// case UserInternal5InformationNew: default: Status = STATUS_INVALID_INFO_CLASS; Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Sat Jan 5 20:30:06 2013 @@ -313,6 +313,13 @@ RegSetValueEx(hAccountKey, L"WorkStations", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"Parameters", 0, REG_SZ, (LPVOID)lpEmptyString,

11 years, 11 months

[tkreuzer] 58116: [WIN32K] In NtGdiStretchDIBitsInternal check early for info dc / mem dc without surface, only allocate memory and copy bits if the caller actually passed bits (they are optional), ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 5 19:57:59 2013 New Revision: 58116 URL: http://svn.reactos.org/svn/reactos?rev=58116&view=rev Log: [WIN32K] In NtGdiStretchDIBitsInternal check early for info dc / mem dc without surface, only allocate memory and copy bits if the caller actually passed bits (they are optional), free the allocation, when an exception happens instead of leaking the memory. Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sat Jan 5 19:57:59 2013 @@ -1071,6 +1071,14 @@ return 0; } + /* Check for info / mem DC without surface */ + if (!pdc->dclevel.pSurface) + { + DC_UnlockDc(pdc); + // CHECKME + return TRUE; + } + /* Transform dest size */ sizel.cx = cxDst; sizel.cy = cyDst; @@ -1099,22 +1107,30 @@ hcmXform); } - pvBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, 'pmeT'); - if (!pvBits) - { - return 0; - } - - _SEH2_TRY - { - ProbeForRead(pjInit, cjMaxBits, 1); - RtlCopyMemory(pvBits, pjInit, cjMaxBits); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - _SEH2_YIELD(return 0); - } - _SEH2_END + if (pjInit && (cjMaxBits > 0)) + { + pvBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, 'pmeT'); + if (!pvBits) + { + return 0; + } + + _SEH2_TRY + { + ProbeForRead(pjInit, cjMaxBits, 1); + RtlCopyMemory(pvBits, pjInit, cjMaxBits); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ExFreePoolWithTag(pvBits, 'pmeT'); + _SEH2_YIELD(return 0); + } + _SEH2_END + } + else + { + pvBits = NULL; + } /* FIXME: Locking twice is cheesy, coord tranlation in UM will fix it */ if (!(pdc = DC_LockDc(hdc))) @@ -1171,13 +1187,6 @@ DC_vPrepareDCsForBlit(pdc, rcDst, NULL, rcSrc); psurfDst = pdc->dclevel.pSurface; - if (!psurfDst) - { - DC_vFinishBlit(pdc, NULL); - // CHECKME - bResult = TRUE; - goto cleanup; - } /* Initialize XLATEOBJ */ EXLATEOBJ_vInitialize(&exlo, @@ -1209,7 +1218,7 @@ if (psurfTmp) SURFACE_ShareUnlockSurface(psurfTmp); if (hbmTmp) GreDeleteObject(hbmTmp); if (pdc) DC_UnlockDc(pdc); - ExFreePoolWithTag(pvBits, 'pmeT'); + if (pvBits) ExFreePoolWithTag(pvBits, 'pmeT'); return bResult; }

11 years, 11 months

[fireball] 58115: [REACTOS] - Happy New Year! This one is better than r54799 which is a good progress!

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 5 11:05:23 2013 New Revision: 58115 URL: http://svn.reactos.org/svn/reactos?rev=58115&view=rev Log: [REACTOS] - Happy New Year! This one is better than r54799 which is a good progress! Modified: trunk/reactos/include/reactos/version.cmake Modified: trunk/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.cm… ============================================================================== --- trunk/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.cmake [iso-8859-1] Sat Jan 5 11:05:23 2013 @@ -32,7 +32,7 @@ set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "0") -set(COPYRIGHT_YEAR "2012") +set(COPYRIGHT_YEAR "2013") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) set(KERNEL_VERSION_BUILD_TYPE "SVN")

11 years, 11 months

[hbelusca] 58114: Sync with trunk r58113.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 4 13:36:15 2013 New Revision: 58114 URL: http://svn.reactos.org/svn/reactos?rev=58114&view=rev Log: Sync with trunk r58113. Removed: branches/ros-csrss/include/reactos/ks386.inc branches/ros-csrss/include/reactos/ksamd64.inc Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/base/applications/rapps/rapps/mpc.txt branches/ros-csrss/base/applications/regedit/childwnd.c branches/ros-csrss/base/applications/regedit/edit.c branches/ros-csrss/base/applications/regedit/error.c branches/ros-csrss/base/applications/regedit/find.c branches/ros-csrss/base/applications/regedit/framewnd.c branches/ros-csrss/base/applications/regedit/listview.c branches/ros-csrss/base/applications/regedit/regproc.c branches/ros-csrss/base/applications/regedit/settings.c branches/ros-csrss/base/applications/regedit/treeview.c branches/ros-csrss/base/applications/taskmgr/lang/fr-FR.rc branches/ros-csrss/boot/freeldr/freeldr/arch/i386/i386bug.c branches/ros-csrss/boot/freeldr/freeldr/debug.c branches/ros-csrss/boot/freeldr/freeldr/include/arch/pc/x86common.h branches/ros-csrss/boot/freeldr/freeldr/include/debug.h branches/ros-csrss/boot/freeldr/freeldr/include/mm.h branches/ros-csrss/boot/freeldr/freeldr/mm/meminit.c branches/ros-csrss/dll/cpl/usrmgr/users.c branches/ros-csrss/dll/win32/kernel32/client/path.c branches/ros-csrss/dll/win32/kernel32/client/proc.c branches/ros-csrss/dll/win32/kernel32/client/thread.c branches/ros-csrss/dll/win32/netapi32/user.c branches/ros-csrss/dll/win32/samlib/samlib.c branches/ros-csrss/dll/win32/samsrv/samrpc.c branches/ros-csrss/dll/win32/shell32/lang/bg-BG.rc branches/ros-csrss/dll/win32/shell32/lang/ca-ES.rc branches/ros-csrss/dll/win32/shell32/lang/cs-CZ.rc branches/ros-csrss/dll/win32/shell32/lang/el-GR.rc branches/ros-csrss/dll/win32/shell32/lang/fi-FI.rc branches/ros-csrss/dll/win32/shell32/lang/fr-FR.rc branches/ros-csrss/dll/win32/shell32/lang/hu-HU.rc branches/ros-csrss/dll/win32/shell32/lang/it-IT.rc branches/ros-csrss/dll/win32/shell32/lang/ja-JP.rc branches/ros-csrss/dll/win32/shell32/lang/ko-KR.rc branches/ros-csrss/dll/win32/shell32/lang/nl-NL.rc branches/ros-csrss/dll/win32/shell32/lang/pl-PL.rc branches/ros-csrss/dll/win32/shell32/lang/pt-BR.rc branches/ros-csrss/dll/win32/shell32/lang/pt-PT.rc branches/ros-csrss/dll/win32/shell32/lang/ru-RU.rc branches/ros-csrss/dll/win32/shell32/lang/sl-SI.rc branches/ros-csrss/dll/win32/shell32/lang/sv-SE.rc branches/ros-csrss/dll/win32/shell32/lang/zh-CN.rc branches/ros-csrss/dll/win32/shell32/lang/zh-TW.rc branches/ros-csrss/dll/win32/shell32/shell32.spec branches/ros-csrss/dll/win32/syssetup/wizard.c branches/ros-csrss/drivers/bus/pcix/device.c branches/ros-csrss/drivers/bus/pcix/enum.c branches/ros-csrss/drivers/bus/pcix/fdo.c branches/ros-csrss/drivers/bus/pcix/init.c branches/ros-csrss/drivers/bus/pcix/intrface/agpintrf.c branches/ros-csrss/drivers/bus/pcix/intrface/busintrf.c branches/ros-csrss/drivers/bus/pcix/intrface/cardbus.c branches/ros-csrss/drivers/bus/pcix/intrface/devhere.c branches/ros-csrss/drivers/bus/pcix/intrface/lddintrf.c branches/ros-csrss/drivers/bus/pcix/intrface/locintrf.c branches/ros-csrss/drivers/bus/pcix/intrface/pmeintf.c branches/ros-csrss/drivers/bus/pcix/intrface/routintf.c branches/ros-csrss/drivers/bus/pcix/pci/config.c branches/ros-csrss/drivers/bus/pcix/pci/ppbridge.c branches/ros-csrss/drivers/bus/pcix/pcivrify.c branches/ros-csrss/drivers/bus/pcix/pdo.c branches/ros-csrss/drivers/bus/pcix/power.c branches/ros-csrss/drivers/bus/pcix/utils.c branches/ros-csrss/drivers/ksfilter/ks/device.c branches/ros-csrss/drivers/ksfilter/ks/irp.c branches/ros-csrss/drivers/ksfilter/ks/ksfunc.h branches/ros-csrss/drivers/storage/class/ramdisk/ramdisk.c branches/ros-csrss/drivers/usb/usbhub/ (props changed) branches/ros-csrss/drivers/usb/usbhub/fdo.c branches/ros-csrss/hal/halx86/acpi/halpnpdd.c branches/ros-csrss/hal/halx86/generic/bios.c branches/ros-csrss/hal/halx86/generic/misc.c branches/ros-csrss/hal/halx86/generic/spinlock.c branches/ros-csrss/hal/halx86/legacy/bus/cmosbus.c branches/ros-csrss/hal/halx86/legacy/bus/pcibus.c branches/ros-csrss/hal/halx86/legacy/halpnpdd.c branches/ros-csrss/include/ddk/ntsam.h branches/ros-csrss/include/reactos/idl/sam.idl branches/ros-csrss/include/reactos/libs/pseh/pseh3.h branches/ros-csrss/lib/cmlib/hivecell.c branches/ros-csrss/ntoskrnl/cache/cachesub.c branches/ros-csrss/ntoskrnl/cache/copysup.c branches/ros-csrss/ntoskrnl/cache/fssup.c branches/ros-csrss/ntoskrnl/cache/logsup.c branches/ros-csrss/ntoskrnl/include/internal/i386/ke.h branches/ros-csrss/ntoskrnl/io/iomgr/irp.c branches/ros-csrss/ntoskrnl/io/pnpmgr/pnpmgr.c branches/ros-csrss/ntoskrnl/kd/kdmain.c branches/ros-csrss/ntoskrnl/kd64/amd64/kdx64.c branches/ros-csrss/ntoskrnl/kd64/arm/kdarm.c branches/ros-csrss/ntoskrnl/ke/bug.c branches/ros-csrss/ntoskrnl/ke/dpc.c branches/ros-csrss/ntoskrnl/ke/i386/context.c branches/ros-csrss/ntoskrnl/ke/i386/traphdlr.c branches/ros-csrss/ntoskrnl/mm/ARM3/arm/init.c branches/ros-csrss/ntoskrnl/mm/ARM3/largepag.c branches/ros-csrss/ntoskrnl/mm/ARM3/mminit.c branches/ros-csrss/ntoskrnl/mm/ARM3/pagfault.c branches/ros-csrss/ntoskrnl/mm/ARM3/pool.c branches/ros-csrss/ntoskrnl/mm/ARM3/procsup.c branches/ros-csrss/ntoskrnl/mm/ARM3/section.c branches/ros-csrss/ntoskrnl/mm/ARM3/sysldr.c branches/ros-csrss/ntoskrnl/mm/ARM3/virtual.c branches/ros-csrss/ntoskrnl/mm/arm/page.c branches/ros-csrss/ntoskrnl/mm/arm/stubs.c branches/ros-csrss/ntoskrnl/po/povolume.c branches/ros-csrss/win32ss/gdi/eng/alphablend.c branches/ros-csrss/win32ss/gdi/eng/bitblt.c branches/ros-csrss/win32ss/gdi/eng/clip.c branches/ros-csrss/win32ss/gdi/eng/copybits.c branches/ros-csrss/win32ss/gdi/eng/debug.c branches/ros-csrss/win32ss/gdi/eng/device.c branches/ros-csrss/win32ss/gdi/eng/driverobj.c branches/ros-csrss/win32ss/gdi/eng/engbrush.c branches/ros-csrss/win32ss/gdi/eng/engevent.c branches/ros-csrss/win32ss/gdi/eng/engmisc.c branches/ros-csrss/win32ss/gdi/eng/error.c branches/ros-csrss/win32ss/gdi/eng/float.c branches/ros-csrss/win32ss/gdi/eng/gradient.c branches/ros-csrss/win32ss/gdi/eng/inteng.h branches/ros-csrss/win32ss/gdi/eng/ldevobj.c branches/ros-csrss/win32ss/gdi/eng/lineto.c branches/ros-csrss/win32ss/gdi/eng/mapping.c branches/ros-csrss/win32ss/gdi/eng/math.c branches/ros-csrss/win32ss/gdi/eng/pdevobj.c branches/ros-csrss/win32ss/gdi/eng/surface.c branches/ros-csrss/win32ss/gdi/eng/xlateobj.c branches/ros-csrss/win32ss/gdi/gdi32/objects/region.c branches/ros-csrss/win32ss/gdi/ntgdi/dc.h branches/ros-csrss/win32ss/gdi/ntgdi/dclife.c branches/ros-csrss/win32ss/gdi/ntgdi/dcobjs.c branches/ros-csrss/win32ss/gdi/ntgdi/dcstate.c branches/ros-csrss/win32ss/gdi/ntgdi/dibobj.c branches/ros-csrss/win32ss/gdi/ntgdi/font.c branches/ros-csrss/win32ss/gdi/ntgdi/gdibatch.c branches/ros-csrss/win32ss/gdi/ntgdi/gdifloat.h branches/ros-csrss/win32ss/gdi/ntgdi/text.h branches/ros-csrss/win32ss/user/ntuser/object.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/error.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/tas… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/i386bug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/usrmgr/users.… Modified: branches/ros-csrss/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/netapi32/us… Modified: branches/ros-csrss/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samlib/saml… Modified: branches/ros-csrss/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/samr… Modified: branches/ros-csrss/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/lan… Modified: branches/ros-csrss/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/she… Modified: branches/ros-csrss/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/syssetup/wi… Modified: branches/ros-csrss/drivers/bus/pcix/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/devi… Modified: branches/ros-csrss/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/enum… Modified: branches/ros-csrss/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/fdo.… Modified: branches/ros-csrss/drivers/bus/pcix/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/init… Modified: branches/ros-csrss/drivers/bus/pcix/intrface/agpintrf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/intr… Modified: branches/ros-csrss/drivers/bus/pcix/intrface/busintrf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/intr… Modified: branches/ros-csrss/drivers/bus/pcix/intrface/cardbus.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/intr… Modified: branches/ros-csrss/drivers/bus/pcix/intrface/devhere.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/intr… Modified: branches/ros-csrss/drivers/bus/pcix/intrface/lddintrf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/intr… Modified: branches/ros-csrss/drivers/bus/pcix/intrface/locintrf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/intr… Modified: branches/ros-csrss/drivers/bus/pcix/intrface/pmeintf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/intr… Modified: branches/ros-csrss/drivers/bus/pcix/intrface/routintf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/intr… Modified: branches/ros-csrss/drivers/bus/pcix/pci/config.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/pci/… Modified: branches/ros-csrss/drivers/bus/pcix/pci/ppbridge.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/pci/… Modified: branches/ros-csrss/drivers/bus/pcix/pcivrify.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/pciv… Modified: branches/ros-csrss/drivers/bus/pcix/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/pdo.… Modified: branches/ros-csrss/drivers/bus/pcix/power.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/powe… Modified: branches/ros-csrss/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/bus/pcix/util… Modified: branches/ros-csrss/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/ksfilter/ks/d… Modified: branches/ros-csrss/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/ksfilter/ks/i… Modified: branches/ros-csrss/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/ksfilter/ks/k… Modified: branches/ros-csrss/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/class… Modified: branches/ros-csrss/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbhub/fd… Modified: branches/ros-csrss/hal/halx86/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/acpi/halpn… Modified: branches/ros-csrss/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/generic/bi… Modified: branches/ros-csrss/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/generic/mi… Modified: branches/ros-csrss/hal/halx86/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/generic/sp… Modified: branches/ros-csrss/hal/halx86/legacy/bus/cmosbus.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/legacy/bus… Modified: branches/ros-csrss/hal/halx86/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/legacy/bus… Modified: branches/ros-csrss/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/legacy/hal… Modified: branches/ros-csrss/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/ntsam.h?r… Modified: branches/ros-csrss/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/idl/s… Removed: branches/ros-csrss/include/reactos/ks386.inc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/ks386… Removed: branches/ros-csrss/include/reactos/ksamd64.inc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/ksamd… Modified: branches/ros-csrss/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/libs/… Modified: branches/ros-csrss/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/cmlib/hivecell.c?… Modified: branches/ros-csrss/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/cache/caches… Modified: branches/ros-csrss/ntoskrnl/cache/copysup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/cache/copysu… Modified: branches/ros-csrss/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/cache/fssup.… Modified: branches/ros-csrss/ntoskrnl/cache/logsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/cache/logsup… Modified: branches/ros-csrss/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/include/inte… Modified: branches/ros-csrss/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/io/iomgr/irp… Modified: branches/ros-csrss/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/io/pnpmgr/pn… Modified: branches/ros-csrss/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/kd/kdmain.c?… Modified: branches/ros-csrss/ntoskrnl/kd64/amd64/kdx64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/kd64/amd64/k… Modified: branches/ros-csrss/ntoskrnl/kd64/arm/kdarm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/kd64/arm/kda… Modified: branches/ros-csrss/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ke/bug.c?rev… Modified: branches/ros-csrss/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ke/dpc.c?rev… Modified: branches/ros-csrss/ntoskrnl/ke/i386/context.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ke/i386/cont… Modified: branches/ros-csrss/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ke/i386/trap… Modified: branches/ros-csrss/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/ARM3/arm/… Modified: branches/ros-csrss/ntoskrnl/mm/ARM3/largepag.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/ARM3/larg… Modified: branches/ros-csrss/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/ARM3/mmin… Modified: branches/ros-csrss/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/ARM3/pagf… Modified: branches/ros-csrss/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/ARM3/pool… Modified: branches/ros-csrss/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/ARM3/proc… Modified: branches/ros-csrss/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/ARM3/sect… Modified: branches/ros-csrss/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/ARM3/sysl… Modified: branches/ros-csrss/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/ARM3/virt… Modified: branches/ros-csrss/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/arm/page.… Modified: branches/ros-csrss/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/arm/stubs… Modified: branches/ros-csrss/ntoskrnl/po/povolume.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/po/povolume.… Modified: branches/ros-csrss/win32ss/gdi/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/alpha… Modified: branches/ros-csrss/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/bitbl… Modified: branches/ros-csrss/win32ss/gdi/eng/clip.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/clip.… Modified: branches/ros-csrss/win32ss/gdi/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/copyb… Modified: branches/ros-csrss/win32ss/gdi/eng/debug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/debug… Modified: branches/ros-csrss/win32ss/gdi/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/devic… Modified: branches/ros-csrss/win32ss/gdi/eng/driverobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/drive… Modified: branches/ros-csrss/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/engbr… Modified: branches/ros-csrss/win32ss/gdi/eng/engevent.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/engev… Modified: branches/ros-csrss/win32ss/gdi/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/engmi… Modified: branches/ros-csrss/win32ss/gdi/eng/error.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/error… Modified: branches/ros-csrss/win32ss/gdi/eng/float.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/float… Modified: branches/ros-csrss/win32ss/gdi/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/gradi… Modified: branches/ros-csrss/win32ss/gdi/eng/inteng.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/inten… Modified: branches/ros-csrss/win32ss/gdi/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/ldevo… Modified: branches/ros-csrss/win32ss/gdi/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/linet… Modified: branches/ros-csrss/win32ss/gdi/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/mappi… Modified: branches/ros-csrss/win32ss/gdi/eng/math.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/math.… Modified: branches/ros-csrss/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/pdevo… Modified: branches/ros-csrss/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/surfa… Modified: branches/ros-csrss/win32ss/gdi/eng/xlateobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/xlate… Modified: branches/ros-csrss/win32ss/gdi/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/gdi32/obj… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dc.… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dcl… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dco… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dcstate.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dcs… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dib… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/fon… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/gdibatch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/gdi… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/gdifloat.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/gdi… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/text.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/tex… Modified: branches/ros-csrss/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/o…

11 years, 11 months

[hbelusca] 58113: [TASKMGR] Fix a misspelling in French translation.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 4 13:26:34 2013 New Revision: 58113 URL: http://svn.reactos.org/svn/reactos?rev=58113&view=rev Log: [TASKMGR] Fix a misspelling in French translation. Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] Fri Jan 4 13:26:34 2013 @@ -513,7 +513,7 @@ BEGIN IDS_APP_TITLE "Gestionnaire des tÃ¢ches" IDC_TASKMGR "Gestionnaire des tÃ¢ches" - IDS_IDLE_PROCESS "Processus systÃ¨me en atente" + IDS_IDLE_PROCESS "Processus systÃ¨me en attente" END STRINGTABLE DISCARDABLE

11 years, 11 months

[hbelusca] 58112: while (TRUE); (when something is unimplemented) ---> ASSERT(FALSE); // while (TRUE); and in some cases, return an adequate value. Part 2/2 Some while(true); remain in our code, ho...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 4 12:54:39 2013 New Revision: 58112 URL: http://svn.reactos.org/svn/reactos?rev=58112&view=rev Log: while (TRUE); (when something is unimplemented) ---> ASSERT(FALSE); // while (TRUE); and in some cases, return an adequate value. Part 2/2 Some while(true); remain in our code, however not in critical regions. Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c trunk/reactos/ntoskrnl/mm/ARM3/largepag.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c trunk/reactos/ntoskrnl/mm/arm/page.c trunk/reactos/ntoskrnl/mm/arm/stubs.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/arm/init.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] Fri Jan 4 12:54:39 2013 @@ -66,7 +66,7 @@ // Always return success for now // DPRINT1("NEVER TELL ME THE ODDS!\n"); - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/largepag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/largepag.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/largepag.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/largepag.c [iso-8859-1] Fri Jan 4 12:54:39 2013 @@ -59,7 +59,7 @@ for (i = 0; i < MiLargePageRangeIndex; i++) { DPRINT1("No support for large pages\n"); - while (TRUE); + ASSERT(FALSE); // while (TRUE); } } Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Fri Jan 4 12:54:39 2013 @@ -106,7 +106,8 @@ { /* Fail */ DPRINT1("Session loading not yet supported!\n"); - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return STATUS_NOT_IMPLEMENTED; } /* Not session load, shouldn't have an entry */ @@ -1217,7 +1218,7 @@ /* We failed, unload the image */ MmUnloadSystemImage(DllEntry); DPRINT1("MmCallDllInitialize failed with status 0x%x\n", Status); - while (TRUE); + ASSERT(FALSE); // while (TRUE); Loaded = FALSE; } } @@ -1720,7 +1721,8 @@ { /* Shouldn't happen */ DPRINT1("[Mm0]: Couldn't allocate driver section!\n"); - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return; } /* This is the new virtual address for the module */ @@ -1773,7 +1775,8 @@ { /* This shouldn't happen */ DPRINT1("Relocations failed!\n"); - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return; } } @@ -2922,7 +2925,8 @@ { /* We don't support session loading yet */ DPRINT1("Unsupported Session-Load!\n"); - while (TRUE); + ASSERT(FALSE); // while (TRUE); + Status = STATUS_NOT_IMPLEMENTED; } /* Do cleanup */ @@ -3023,7 +3027,8 @@ { /* We don't support session loading yet */ DPRINT1("Unsupported Session-Load!\n"); - while (TRUE); + ASSERT(FALSE); // while (TRUE); + goto Quickie; } /* Check the loader list again, we should end up in the path below */ Modified: trunk/reactos/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Fri Jan 4 12:54:39 2013 @@ -125,7 +125,7 @@ IN PVOID Address) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } BOOLEAN @@ -135,7 +135,7 @@ IN PULONG DirectoryTableBase) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return FALSE; } @@ -165,7 +165,7 @@ OUT PPFN_NUMBER Page) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -174,7 +174,7 @@ IN PVOID Address) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } NTSTATUS @@ -186,7 +186,7 @@ IN ULONG PageCount) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_SUCCESS; } @@ -199,7 +199,7 @@ IN ULONG PageCount) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_SUCCESS; } @@ -208,7 +208,7 @@ MmRawDeleteVirtualMapping(IN PVOID Address) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -220,7 +220,7 @@ OUT PPFN_NUMBER Page) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -230,7 +230,7 @@ IN SWAPENTRY *SwapEntry) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } NTSTATUS @@ -240,8 +240,8 @@ IN SWAPENTRY SwapEntry) { UNIMPLEMENTED; - while (TRUE); - return 0; + ASSERT(FALSE); // while (TRUE); + return STATUS_NOT_IMPLEMENTED; } PFN_NUMBER @@ -250,7 +250,7 @@ IN PVOID Address) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return 0; } @@ -260,8 +260,8 @@ IN PVOID Address) { UNIMPLEMENTED; - while (TRUE); - return 0; + ASSERT(FALSE); // while (TRUE); + return FALSE; } VOID @@ -270,7 +270,7 @@ IN PVOID Address) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -279,7 +279,7 @@ IN PVOID Address) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } BOOLEAN @@ -288,7 +288,7 @@ IN PVOID Address) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return FALSE; } @@ -298,7 +298,7 @@ IN PVOID Address) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return FALSE; } @@ -357,7 +357,7 @@ PhysicalAddress.QuadPart = 0; UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return PhysicalAddress; } Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Fri Jan 4 12:54:39 2013 @@ -375,8 +375,8 @@ // FIXME-USER: Need to delete address space // UNIMPLEMENTED; - while (TRUE); - return 0; + ASSERT(FALSE); // while (TRUE); + return STATUS_NOT_IMPLEMENTED; } PULONG @@ -400,7 +400,7 @@ // TODO // UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -412,7 +412,7 @@ // TODO // UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } NTSTATUS @@ -659,7 +659,7 @@ // TODO // UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } NTSTATUS @@ -672,8 +672,8 @@ // TODO // UNIMPLEMENTED; - while (TRUE); - return 0; + ASSERT(FALSE); // while (TRUE); + return STATUS_NOT_IMPLEMENTED; } PFN_NUMBER @@ -704,8 +704,8 @@ // TODO // UNIMPLEMENTED; - while (TRUE); - return 0; + ASSERT(FALSE); // while (TRUE); + return FALSE; } VOID @@ -717,7 +717,7 @@ // TODO // UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -729,7 +729,7 @@ // TODO // UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } BOOLEAN

11 years, 11 months

[hbelusca] 58111: while (TRUE); (when something is unimplemented) ---> ASSERT(FALSE); // while (TRUE); (unless we deal with a 'noreturn' function), and in some cases, return an adequate value. In s...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 4 12:31:46 2013 New Revision: 58111 URL: http://svn.reactos.org/svn/reactos?rev=58111&view=rev Log: while (TRUE); (when something is unimplemented) ---> ASSERT(FALSE); // while (TRUE); (unless we deal with a 'noreturn' function), and in some cases, return an adequate value. In some places however, I add an ASSERT(FALSE); before keeping the while (TRUE); in critical regions. (Only x86, as well as in r58110). More ASSERTS (in debug mode) or BSODs may appear, instead of having hung threads. Part 1-bis/2 Modified: trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/ntoskrnl/cache/cachesub.c trunk/reactos/ntoskrnl/cache/copysup.c trunk/reactos/ntoskrnl/cache/fssup.c trunk/reactos/ntoskrnl/cache/logsup.c trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/kd64/amd64/kdx64.c trunk/reactos/ntoskrnl/kd64/arm/kdarm.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/i386/context.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/po/povolume.c Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=5… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -549,7 +549,7 @@ /* FIXME: TODO */ DPRINT1("ERROR: Too many references\n"); - while (TRUE); + ASSERT(FALSE); // while (TRUE); return FALSE; } Modified: trunk/reactos/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/cachesub.c?… ============================================================================== --- trunk/reactos/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/cachesub.c [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -132,7 +132,7 @@ { LARGE_INTEGER Result = {{0}}; UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return Result; } Modified: trunk/reactos/ntoskrnl/cache/copysup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/copysup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/cache/copysup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/copysup.c [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -122,7 +122,7 @@ OUT PIO_STATUS_BLOCK IoStatus) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } BOOLEAN @@ -209,7 +209,7 @@ IN PVOID Buffer) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } BOOLEAN @@ -220,7 +220,7 @@ IN UCHAR Retrying) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return FALSE; } @@ -234,7 +234,7 @@ IN BOOLEAN Retrying) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } /* EOF */ Modified: trunk/reactos/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/fssup.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -399,7 +399,7 @@ IN ULONG DirtyPageThreshold) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } /* Modified: trunk/reactos/ntoskrnl/cache/logsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/logsup.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/cache/logsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/logsup.c [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -24,7 +24,7 @@ IN BOOLEAN DisableWriteBehind) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -48,7 +48,7 @@ { LARGE_INTEGER Result = {{0}}; UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return Result; } @@ -57,7 +57,7 @@ CcIsThereDirtyData(IN PVPB Vpb) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return FALSE; } @@ -68,7 +68,7 @@ { LARGE_INTEGER Result = {{0}}; UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return Result; } Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -138,8 +138,8 @@ { \ /* Not yet handled */ \ UNIMPLEMENTED; \ - while (TRUE); \ - return TRUE; \ + ASSERT(FALSE); /* while (TRUE); */ \ + return FALSE; \ } C_ASSERT(NPX_FRAME_LENGTH == sizeof(FX_SAVE_AREA)); Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -266,7 +266,8 @@ { /* We should never get this yet */ DPRINT1("Reparse support not yet present!\n"); - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return; } } @@ -1373,7 +1374,7 @@ #else /* Not implemented yet. */ DPRINT1("Not supported!\n"); - while (TRUE); + ASSERT(FALSE); // while (TRUE); #endif } 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -3784,7 +3784,7 @@ #define PIP_RETURN_DATA(x, y) {ReturnLength = x; Data = y; Status = STATUS_SUCCESS; break;} #define PIP_REGISTRY_DATA(x, y) {ValueName = x; ValueType = y; break;} -#define PIP_UNIMPLEMENTED() {UNIMPLEMENTED; ASSERT(FALSE); break;} // while(TRUE); +#define PIP_UNIMPLEMENTED() {UNIMPLEMENTED; ASSERT(FALSE); /* while (TRUE); */ break;} /* * @implemented Modified: trunk/reactos/ntoskrnl/kd64/amd64/kdx64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/amd64/kdx64.… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/amd64/kdx64.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/amd64/kdx64.c [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -140,7 +140,7 @@ OUT PULONG ActualLength) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_UNSUCCESSFUL; } @@ -155,7 +155,7 @@ OUT PULONG ActualLength) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_UNSUCCESSFUL; } @@ -358,7 +358,7 @@ KdpSysCheckLowMemory(IN ULONG Flags) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_UNSUCCESSFUL; } @@ -367,6 +367,6 @@ KdpAllowDisable(VOID) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_ACCESS_DENIED; } Modified: trunk/reactos/ntoskrnl/kd64/arm/kdarm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/arm/kdarm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/arm/kdarm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/arm/kdarm.c [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -23,7 +23,7 @@ IN PCONTEXT Context) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -32,7 +32,7 @@ IN PCONTEXT Context) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } NTSTATUS @@ -41,7 +41,7 @@ OUT PLARGE_INTEGER MsrValue) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_UNSUCCESSFUL; } @@ -51,7 +51,7 @@ IN PLARGE_INTEGER MsrValue) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_UNSUCCESSFUL; } @@ -66,7 +66,7 @@ OUT PULONG ActualLength) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_UNSUCCESSFUL; } @@ -81,7 +81,7 @@ OUT PULONG ActualLength) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_UNSUCCESSFUL; } @@ -94,7 +94,7 @@ OUT PULONG ActualLength) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_UNSUCCESSFUL; } @@ -107,7 +107,7 @@ OUT PULONG ActualLength) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_UNSUCCESSFUL; } @@ -122,7 +122,7 @@ OUT PULONG ActualDataSize) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_UNSUCCESSFUL; } @@ -137,7 +137,7 @@ OUT PULONG ActualDataSize) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_UNSUCCESSFUL; } @@ -146,7 +146,7 @@ KdpSysCheckLowMemory(IN ULONG Flags) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_UNSUCCESSFUL; } @@ -155,6 +155,6 @@ KdpAllowDisable(VOID) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_ACCESS_DENIED; } Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=5811… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -1178,6 +1178,7 @@ KiBugCheckDebugBreak(DBG_STATUS_BUGCHECK_SECOND); /* Shouldn't get here */ + ASSERT(FALSE); while (TRUE); } Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=5811… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -780,6 +780,7 @@ { /* FIXME: Setup Threaded DPC */ DPRINT1("Threaded DPC not supported\n"); + ASSERT(FALSE); while (TRUE); } } Modified: trunk/reactos/ntoskrnl/ke/i386/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/context.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/context.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/context.c [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -36,7 +36,8 @@ { /* Not handled yet */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return; } /* Update CR3 */ Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -663,6 +663,7 @@ { /* Should only happen in VDM mode */ UNIMPLEMENTED; + ASSERT(FALSE); while (TRUE); } @@ -735,6 +736,7 @@ { /* Not implemented */ UNIMPLEMENTED; + ASSERT(FALSE); while (TRUE); } @@ -921,6 +923,7 @@ { /* Should only happen in VDM mode */ UNIMPLEMENTED; + ASSERT(FALSE); while (TRUE); } @@ -1077,6 +1080,7 @@ { /* Not implemented */ UNIMPLEMENTED; + ASSERT(FALSE); while (TRUE); } @@ -1133,6 +1137,7 @@ { /* Otherwise, this is another kind of IRET fault */ UNIMPLEMENTED; + ASSERT(FALSE); while (TRUE); } } @@ -1191,6 +1196,7 @@ { /* The stack is somewhere in between frames, we need to fix it */ UNIMPLEMENTED; + ASSERT(FALSE); while (TRUE); } } @@ -1256,6 +1262,7 @@ { /* Not yet implemented */ UNIMPLEMENTED; + ASSERT(FALSE); while (TRUE); } #endif @@ -1439,7 +1446,7 @@ KiGetTickCountHandler(IN PKTRAP_FRAME TrapFrame) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -1447,7 +1454,7 @@ KiCallbackReturnHandler(IN PKTRAP_FRAME TrapFrame) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } DECLSPEC_NORETURN @@ -1618,6 +1625,7 @@ { /* Access violation */ UNIMPLEMENTED; + ASSERT(FALSE); while (TRUE); } @@ -1683,6 +1691,7 @@ { /* We should never see this call happening */ DPRINT1("Mismatched NT/HAL version"); + ASSERT(FALSE); while (TRUE); } Modified: trunk/reactos/ntoskrnl/po/povolume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/povolume.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/po/povolume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/povolume.c [iso-8859-1] Fri Jan 4 12:31:46 2013 @@ -300,7 +300,9 @@ { /* ReactOS only implements this routine for shutdown, which requires it */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); + KeReleaseGuardedMutex(&PopVolumeLock); + return; } /* Check if there were no volumes at all */

11 years, 11 months

[hbelusca] 58110: while (TRUE); (when something is unimplemented) ---> ASSERT(FALSE); // while (TRUE); (unless we deal with a 'noreturn' function), and in some cases, return an adequate value. Part...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 4 11:47:19 2013 New Revision: 58110 URL: http://svn.reactos.org/svn/reactos?rev=58110&view=rev Log: while (TRUE); (when something is unimplemented) ---> ASSERT(FALSE); // while (TRUE); (unless we deal with a 'noreturn' function), and in some cases, return an adequate value. Part 1/2 Modified: trunk/reactos/dll/win32/kernel32/client/path.c trunk/reactos/dll/win32/kernel32/client/thread.c trunk/reactos/drivers/bus/pcix/device.c trunk/reactos/drivers/bus/pcix/enum.c trunk/reactos/drivers/bus/pcix/fdo.c trunk/reactos/drivers/bus/pcix/init.c trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c trunk/reactos/drivers/bus/pcix/intrface/busintrf.c trunk/reactos/drivers/bus/pcix/intrface/cardbus.c trunk/reactos/drivers/bus/pcix/intrface/devhere.c trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c trunk/reactos/drivers/bus/pcix/intrface/locintrf.c trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c trunk/reactos/drivers/bus/pcix/intrface/routintf.c trunk/reactos/drivers/bus/pcix/pci/config.c trunk/reactos/drivers/bus/pcix/pci/ppbridge.c trunk/reactos/drivers/bus/pcix/pcivrify.c trunk/reactos/drivers/bus/pcix/pdo.c trunk/reactos/drivers/bus/pcix/power.c trunk/reactos/drivers/bus/pcix/utils.c trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/hal/halx86/acpi/halpnpdd.c trunk/reactos/hal/halx86/generic/bios.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/hal/halx86/generic/spinlock.c trunk/reactos/hal/halx86/legacy/bus/cmosbus.c trunk/reactos/hal/halx86/legacy/bus/pcibus.c trunk/reactos/hal/halx86/legacy/halpnpdd.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -237,7 +237,8 @@ { /* This means someone added RTL_PERTHREAD_CURDIR */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); + // while (TRUE); } /* We do not. Do we have the LDR_ENTRY for the executable? */ Modified: trunk/reactos/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -241,7 +241,8 @@ DbgPrint("SXS: %s - Failing thread create because " "NtQueryInformationThread() failed with status %08lx\n", __FUNCTION__, Status); - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return NULL; } /* Allocate the Activation Context Stack */ @@ -252,7 +253,8 @@ DbgPrint("SXS: %s - Failing thread create because " "RtlAllocateActivationContextStack() failed with status %08lx\n", __FUNCTION__, Status); - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return NULL; } /* Save it */ @@ -274,7 +276,8 @@ DbgPrint("SXS: %s - Failing thread create because " "RtlQueryInformationActivationContext() failed with status %08lx\n", __FUNCTION__, Status); - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return NULL; } /* Does it need to be activated? */ @@ -291,7 +294,8 @@ DbgPrint("SXS: %s - Failing thread create because " "RtlActivateActivationContextEx() failed with status %08lx\n", __FUNCTION__, Status); - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return NULL; } } } @@ -367,7 +371,8 @@ /* We should never reach this place */ DPRINT1("It should not happen\n"); - while (TRUE); + ASSERT(FALSE); + while (TRUE); // 'noreturn' function. } /* Modified: trunk/reactos/drivers/bus/pcix/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/device.c?… ============================================================================== --- trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -262,7 +262,7 @@ { /* Not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -272,7 +272,7 @@ { /* Not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -282,7 +282,7 @@ { /* Not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/enum.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -148,13 +148,13 @@ /* Not used in the driver yet */ case 1: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; /* Not used in the driver yet */ case 2: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; /* A drain request */ @@ -541,7 +541,8 @@ { /* Not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -599,7 +600,7 @@ { /* Have not tested this on eVb's machine yet */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } /* Check if the requirements are actually the zero list */ @@ -1522,7 +1523,7 @@ { /* Not really handling this year */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); /* Check for PCI bridges with the ISA bit set, or required */ if ((PdoExtension) && @@ -1532,7 +1533,7 @@ { /* We'll need to do some legacy support */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } } else @@ -1547,7 +1548,7 @@ { /* Again, some more legacy support we'll have to do */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } } } @@ -1557,7 +1558,7 @@ { /* Not yet supported */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } } @@ -1606,7 +1607,7 @@ { DPRINT1("PCI: Bus numbers have been changed! Restoring originals.\n"); UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } } @@ -1668,7 +1669,7 @@ { /* Check if this PCI device is the ACPI Watchdog Device... */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } /* Check for non-simple devices */ @@ -1734,7 +1735,7 @@ { /* Rescan scenarios are not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } /* Bus processing will need to happen */ @@ -2197,7 +2198,7 @@ { /* Don't have hotplug devices to test with yet, QEMU 0.14 should */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } /* Locate the correct resource configurator for this type of device */ Modified: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -94,7 +94,7 @@ /* These resources would only be for non-root FDOs, unhandled for now */ ASSERT(Resources->Count == 1); UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } /* Initialize the arbiter for this FDO */ @@ -112,7 +112,7 @@ /* Unhandled for now */ ASSERT(Resources->Count == 1); UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } /* Commit the transition to the started state */ @@ -137,7 +137,7 @@ IN PPCI_FDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -148,7 +148,7 @@ IN PPCI_FDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -159,7 +159,7 @@ IN PPCI_FDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -170,7 +170,7 @@ IN PPCI_FDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -181,7 +181,7 @@ IN PPCI_FDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -319,7 +319,7 @@ IN PPCI_FDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -330,7 +330,7 @@ IN PPCI_FDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -341,7 +341,7 @@ IN PPCI_FDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -393,7 +393,7 @@ /* HotPlug PCI Support not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } while (FALSE); /* Free the buffer and return */ @@ -545,7 +545,7 @@ { /* Root PDO in ReactOS does not assign boot resources */ UNIMPLEMENTED; -// while (TRUE); + ASSERT(FALSE); // while (TRUE); DPRINT1("Encountered during setup\n"); Descriptor = NULL; } @@ -554,7 +554,7 @@ { /* Root PDO in ReactOS does not assign boot resources */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } else { Modified: trunk/reactos/drivers/bus/pcix/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/init.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -679,7 +679,7 @@ { /* This function is not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_SUCCESS; } @@ -690,7 +690,7 @@ /* This function is not yet implemented */ DPRINT1("PCI: Unload\n"); UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } NTSTATUS Modified: trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -59,7 +59,8 @@ /* Not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return STATUS_NOT_IMPLEMENTED; } /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/intrface/busintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/busintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/busintrf.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -49,7 +49,8 @@ { /* Not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return STATUS_NOT_IMPLEMENTED; } /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/intrface/cardbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/cardbus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/cardbus.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -34,7 +34,7 @@ Cardbus_SaveCurrentSettings(IN PPCI_CONFIGURATOR_CONTEXT Context) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -42,7 +42,7 @@ Cardbus_SaveLimits(IN PPCI_CONFIGURATOR_CONTEXT Context) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -50,7 +50,7 @@ Cardbus_MassageHeaderForLimitsDetermination(IN PPCI_CONFIGURATOR_CONTEXT Context) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -58,7 +58,7 @@ Cardbus_RestoreCurrent(IN PPCI_CONFIGURATOR_CONTEXT Context) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -68,7 +68,7 @@ IN PIO_RESOURCE_DESCRIPTOR IoDescriptor) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -77,7 +77,7 @@ IN PPCI_COMMON_HEADER PciData) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -86,7 +86,7 @@ IN PPCI_COMMON_HEADER PciData) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } NTSTATUS @@ -109,7 +109,8 @@ { /* Not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return STATUS_NOT_IMPLEMENTED; } /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/intrface/devhere.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/devhere.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/devhere.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -51,7 +51,8 @@ /* Not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return STATUS_NOT_IMPLEMENTED; } /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -49,7 +49,8 @@ { /* Not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return STATUS_NOT_IMPLEMENTED; } /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/intrface/locintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/locintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/locintrf.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -49,7 +49,8 @@ { /* Not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return STATUS_NOT_IMPLEMENTED; } /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -52,7 +52,8 @@ /* Not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return STATUS_NOT_IMPLEMENTED; } /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/intrface/routintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/routintf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/routintf.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -54,7 +54,8 @@ /* Not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return STATUS_NOT_IMPLEMENTED; } NTSTATUS Modified: trunk/reactos/drivers/bus/pcix/pci/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/confi… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -66,7 +66,7 @@ { /* Currently this driver only supports the legacy HAL interface */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } else { Modified: trunk/reactos/drivers/bus/pcix/pci/ppbridge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/ppbri… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/ppbridge.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/ppbridge.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -672,7 +672,7 @@ IN PPCI_COMMON_HEADER PciData) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID Modified: trunk/reactos/drivers/bus/pcix/pcivrify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pcivrify.… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pcivrify.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pcivrify.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -80,7 +80,7 @@ { /* This function is not yet implemented */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/bus/pcix/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pdo.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -80,7 +80,7 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -101,7 +101,7 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -219,7 +219,7 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -230,7 +230,7 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -241,7 +241,7 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -252,7 +252,7 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -263,7 +263,7 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -274,7 +274,7 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -405,7 +405,7 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -416,7 +416,7 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -437,7 +437,7 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -448,7 +448,7 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -459,7 +459,7 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_NOT_SUPPORTED; } Modified: trunk/reactos/drivers/bus/pcix/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/power.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/power.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -192,7 +192,8 @@ { /* We would normally re-assign resources after powerup */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); + Status = STATUS_NOT_IMPLEMENTED; } } Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -153,7 +153,7 @@ { /* This scenario shouldn't happen yet, since SetupDD isn't used */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } /* Return if this is Datacenter or not */ @@ -758,7 +758,8 @@ /* eVb has not been able to test such devices yet */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); + return FALSE; } NTSTATUS Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -773,7 +773,7 @@ FailCreate: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_SUCCESS; } @@ -1068,7 +1068,7 @@ DPRINT1("Get drive layout request\n"); UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IOCTL_DISK_GET_PARTITION_INFO: @@ -1080,7 +1080,7 @@ DPRINT1("Invalid request\n"); UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; } @@ -1097,7 +1097,7 @@ DPRINT1("Read/Write request\n"); UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; // @@ -1107,7 +1107,7 @@ DPRINT1("SCSI request\n"); UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; // @@ -1117,7 +1117,7 @@ DPRINT1("Flush request\n"); UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; // @@ -1127,7 +1127,7 @@ DPRINT1("Invalid request: %lx\n", IoStackLocation->MajorFunction); UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; } @@ -1481,8 +1481,7 @@ // // We don't handle anything else yet // - ASSERT(FALSE); - while (TRUE); + ASSERT(FALSE); // while (TRUE); } } else @@ -1498,7 +1497,7 @@ case IOCTL_CDROM_CHECK_VERIFY: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IOCTL_STORAGE_GET_MEDIA_TYPES: @@ -1664,67 +1663,67 @@ case IOCTL_DISK_GET_DRIVE_LAYOUT: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IOCTL_DISK_GET_LENGTH_INFO: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IOCTL_DISK_IS_WRITABLE: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IOCTL_SCSI_MINIPORT: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IOCTL_STORAGE_QUERY_PROPERTY: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IOCTL_MOUNTDEV_QUERY_UNIQUE_ID: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IOCTL_MOUNTDEV_QUERY_STABLE_GUID: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IOCTL_VOLUME_SET_GPT_ATTRIBUTES: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IOCTL_VOLUME_GET_GPT_ATTRIBUTES: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IOCTL_VOLUME_OFFLINE: UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; default: @@ -1793,7 +1792,7 @@ // FIXME: TODO // UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } // @@ -1980,7 +1979,7 @@ IN PIRP Irp) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_SUCCESS; } @@ -2148,37 +2147,37 @@ case IRP_MN_START_DEVICE: DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IRP_MN_QUERY_STOP_DEVICE: DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IRP_MN_CANCEL_STOP_DEVICE: DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IRP_MN_STOP_DEVICE: DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IRP_MN_QUERY_REMOVE_DEVICE: DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IRP_MN_CANCEL_REMOVE_DEVICE: DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IRP_MN_REMOVE_DEVICE: @@ -2213,7 +2212,7 @@ case IRP_MN_SURPRISE_REMOVAL: DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IRP_MN_QUERY_ID: @@ -2224,7 +2223,7 @@ if (DeviceExtension->Type == RamdiskDrive) { DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + ASSERT(FALSE); // while (TRUE); } break; @@ -2236,14 +2235,14 @@ if (DeviceExtension->Type == RamdiskDrive) { DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + ASSERT(FALSE); // while (TRUE); } break; case IRP_MN_EJECT: DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + ASSERT(FALSE); // while (TRUE); break; case IRP_MN_QUERY_DEVICE_TEXT: @@ -2254,7 +2253,7 @@ if (DeviceExtension->Type == RamdiskDrive) { DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + ASSERT(FALSE); // while (TRUE); } break; @@ -2278,7 +2277,7 @@ if (DeviceExtension->Type == RamdiskDrive) { DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + ASSERT(FALSE); // while (TRUE); } break; Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -1,4 +1,4 @@ -ï»¿/* +/* * PROJECT: ReactOS Universal Serial Bus Hub Driver * LICENSE: GPL - See COPYING in the top level directory * FILE: drivers/usb/usbhub/fdo.c Modified: trunk/reactos/hal/halx86/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halpnpdd.c… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -814,7 +814,7 @@ IN PIRP Irp) { DPRINT1("HAL: PnP Driver WMI!\n"); - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_SUCCESS; } Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -216,6 +216,8 @@ /* Strange, it isn't! This can happen during NMI */ DPRINT1("HAL: Trap0D while not in V86 mode\n"); KiDumpTrapFrame(TrapFrame); + + ASSERT(FALSE); while (TRUE); } Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -229,7 +229,7 @@ // // Don't recurse // - if (HalpNMIInProgress++) while (TRUE); + if (HalpNMIInProgress++) ASSERT(FALSE); // while (TRUE); // // Read the system control register B Modified: trunk/reactos/hal/halx86/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/spinloc… ============================================================================== --- trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -182,7 +182,8 @@ { #ifdef CONFIG_SMP ASSERT(FALSE); // FIXME: Unused - while (TRUE); + // while (TRUE); + return FALSE; #endif /* Simply raise to synch */ @@ -206,7 +207,8 @@ { #ifdef CONFIG_SMP ASSERT(FALSE); // FIXME: Unused - while (TRUE); + // while (TRUE); + return FALSE; #endif /* Simply raise to dispatch */ Modified: trunk/reactos/hal/halx86/legacy/bus/cmosbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/cmos… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bus/cmosbus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bus/cmosbus.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -26,7 +26,7 @@ IN ULONG Length) { DPRINT1("CMOS GetData\n"); - while (TRUE); + ASSERT(FALSE); // while (TRUE); return 0; } @@ -40,7 +40,7 @@ IN ULONG Length) { DPRINT1("CMOS SetData\n"); - while (TRUE); + ASSERT(FALSE); // while (TRUE); return 0; } Modified: trunk/reactos/hal/halx86/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pcib… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bus/pcibus.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -537,7 +537,7 @@ IN PPCI_COMMON_CONFIG PciData) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } VOID @@ -549,7 +549,7 @@ IN PPCI_COMMON_CONFIG PciOldData) { UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } NTSTATUS @@ -643,7 +643,8 @@ /* FIXME: TODO */ DPRINT1("You have implemented the KD routines for searching PCI debugger" "devices, but you have forgotten to implement this routine\n"); - while (TRUE); + UNIMPLEMENTED; + ASSERT(FALSE); // while (TRUE); } static ULONG NTAPI @@ -678,7 +679,7 @@ { /* /PCILOCK is not yet supported */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); // while (TRUE); } #endif /* Now create the correct resource list based on the supported bus ranges */ Modified: trunk/reactos/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/halpnpdd… ============================================================================== --- trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -812,7 +812,7 @@ IN PIRP Irp) { DPRINT1("HAL: PnP Driver WMI!\n"); - while (TRUE); + ASSERT(FALSE); // while (TRUE); return STATUS_SUCCESS; } 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Fri Jan 4 11:47:19 2013 @@ -3784,7 +3784,7 @@ #define PIP_RETURN_DATA(x, y) {ReturnLength = x; Data = y; Status = STATUS_SUCCESS; break;} #define PIP_REGISTRY_DATA(x, y) {ValueName = x; ValueType = y; break;} -#define PIP_UNIMPLEMENTED() {UNIMPLEMENTED; while(TRUE); break;} +#define PIP_UNIMPLEMENTED() {UNIMPLEMENTED; ASSERT(FALSE); break;} // while(TRUE); /* * @implemented

11 years, 11 months

[tkreuzer] 58109: [WIN32K] Implement DC_hSelectFont, use it from NtGdiSelectFont and GdiFlushUserBatch. Make sure plfnt is != NULL before dereferencing it in "TEXTOBJ_LockText"

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jan 4 11:02:43 2013 New Revision: 58109 URL: http://svn.reactos.org/svn/reactos?rev=58109&view=rev Log: [WIN32K] Implement DC_hSelectFont, use it from NtGdiSelectFont and GdiFlushUserBatch. Make sure plfnt is != NULL before dereferencing it in "TEXTOBJ_LockText" Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c trunk/reactos/win32ss/gdi/ntgdi/font.c trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c trunk/reactos/win32ss/gdi/ntgdi/text.h Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Fri Jan 4 11:02:43 2013 @@ -523,6 +523,85 @@ DC_UnlockDc(pdc); return success; +} + +HFONT +NTAPI +DC_hSelectFont( + _In_ PDC pdc, + _In_ HFONT hlfntNew) +{ + PLFONT plfntNew; + HFONT hlfntOld; + + // Legacy crap that will die with font engine rewrite + if (!NT_SUCCESS(TextIntRealizeFont(hlfntNew, NULL))) + { + return NULL; + } + + /* Get the current selected font */ + hlfntOld = pdc->dclevel.plfnt->BaseObject.hHmgr; + + /* Check if a new font should be selected */ + if (hlfntNew != hlfntOld) + { + /* Lock the new font */ + plfntNew = LFONT_ShareLockFont(hlfntNew); + if (plfntNew) + { + /* Success, dereference the old font */ + LFONT_ShareUnlockFont(pdc->dclevel.plfnt); + + /* Select the new font */ + pdc->dclevel.plfnt = plfntNew; + pdc->pdcattr->hlfntNew = hlfntNew; + + /* Update dirty flags */ + pdc->pdcattr->ulDirty_ |= DIRTY_CHARSET; + pdc->pdcattr->ulDirty_ &= ~SLOW_WIDTHS; + } + else + { + /* Failed, restore old, return NULL */ + pdc->pdcattr->hlfntNew = hlfntOld; + hlfntOld = NULL; + } + } + + return hlfntOld; +} + +HFONT +APIENTRY +NtGdiSelectFont( + _In_ HDC hdc, + _In_ HFONT hfont) +{ + HFONT hfontOld; + PDC pdc; + + /* Check parameters */ + if ((hdc == NULL) || (hfont == NULL)) + { + return NULL; + } + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) + { + return NULL; + } + + /* Call the internal function */ + hfontOld = DC_hSelectFont(pdc, hfont); + + /* Unlock the DC */ + DC_UnlockDc(pdc); + + /* Return the previously selected font */ + return hfontOld; } HANDLE Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] Fri Jan 4 11:02:43 2013 @@ -395,50 +395,6 @@ return pTextObj; } -HFONT -FASTCALL -GreSelectFont( HDC hDC, HFONT hFont) -{ - PDC pdc; - PDC_ATTR pdcattr; - PTEXTOBJ pOrgFnt, pNewFnt = NULL; - HFONT hOrgFont = NULL; - - if (!hDC || !hFont) return NULL; - - pdc = DC_LockDc(hDC); - if (!pdc) - { - return NULL; - } - - if (NT_SUCCESS(TextIntRealizeFont((HFONT)hFont,NULL))) - { - /* LFONTOBJ use share and locking. */ - pNewFnt = TEXTOBJ_LockText(hFont); - pdcattr = pdc->pdcattr; - pOrgFnt = pdc->dclevel.plfnt; - if (pOrgFnt) - { - hOrgFont = pOrgFnt->BaseObject.hHmgr; - } - else - { - hOrgFont = pdcattr->hlfntNew; - } - if (pdc->dclevel.plfnt) LFONT_ShareUnlockFont(pdc->dclevel.plfnt); - if (pNewFnt) GDIOBJ_vReferenceObjectByPointer(&pNewFnt->BaseObject); - pdc->dclevel.plfnt = pNewFnt; - pdc->hlfntCur = hFont; - pdcattr->hlfntNew = hFont; - pdcattr->ulDirty_ |= DIRTY_CHARSET; - pdcattr->ulDirty_ &= ~SLOW_WIDTHS; - } - - if (pNewFnt) TEXTOBJ_UnlockText(pNewFnt); - DC_UnlockDc(pdc); - return hOrgFont; -} /** Functions ******************************************************************/ @@ -1122,17 +1078,5 @@ return hNewFont; } -/* - * @implemented - */ -HFONT -APIENTRY -NtGdiSelectFont( - IN HDC hDC, - IN HFONT hFont) -{ - return GreSelectFont(hDC, hFont); -} - /* EOF */ Modified: trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdibatch… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c [iso-8859-1] Fri Jan 4 11:02:43 2013 @@ -66,7 +66,6 @@ FASTCALL GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) { - BOOL Hit = FALSE; ULONG Cmd = 0, Size = 0; PDC_ATTR pdcattr = NULL; @@ -82,27 +81,25 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = TRUE; + DPRINT1("WARNING! GdiBatch Fault!\n"); + _SEH2_YIELD(return 0;) } _SEH2_END; - if (Hit) - { - DPRINT1("WARNING! GdiBatch Fault!\n"); - return 0; - } - - // FYI! The thread is approaching the end of sunset. switch(Cmd) { - case GdiBCPatBlt: // Highest pri first! - break; + case GdiBCPatBlt: + break; + case GdiBCPolyPatBlt: break; + case GdiBCTextOut: break; + case GdiBCExtTextOut: break; + case GdiBCSetBrushOrg: { PGDIBSSETBRHORG pgSBO; @@ -112,40 +109,31 @@ DC_vSetBrushOrigin(dc, pgSBO->ptlBrushOrigin.x, pgSBO->ptlBrushOrigin.y); break; } + case GdiBCExtSelClipRgn: break; + case GdiBCSelObj: { PGDIBSOBJECT pgO; - PTEXTOBJ pNewFnt = NULL; if (!dc) break; pgO = (PGDIBSOBJECT) pHdr; - if (NT_SUCCESS(TextIntRealizeFont((HFONT)pgO->hgdiobj,NULL))) - { - /* LFONTOBJ use share and locking. */ - pNewFnt = TEXTOBJ_LockText(pgO->hgdiobj); - - if (dc->dclevel.plfnt) LFONT_ShareUnlockFont(dc->dclevel.plfnt); - if (pNewFnt) GDIOBJ_vReferenceObjectByPointer(&pNewFnt->BaseObject); - dc->dclevel.plfnt = pNewFnt; - dc->hlfntCur = pgO->hgdiobj; - pdcattr->hlfntNew = pgO->hgdiobj; - pdcattr->ulDirty_ |= DIRTY_CHARSET; - pdcattr->ulDirty_ &= ~SLOW_WIDTHS; - } - if (pNewFnt) TEXTOBJ_UnlockText(pNewFnt); - break; - } + DC_hSelectFont(dc, (HFONT)pgO->hgdiobj); + break; + } + case GdiBCDelRgn: DPRINT("Delete Region Object!\n"); + /* Fall through */ case GdiBCDelObj: { PGDIBSOBJECT pgO = (PGDIBSOBJECT) pHdr; GreDeleteObject( pgO->hgdiobj ); break; } + default: break; } Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] Fri Jan 4 11:02:43 2013 @@ -85,8 +85,11 @@ TEXTOBJ_LockText(HFONT hfont) { PLFONT plfnt = LFONT_ShareLockFont(hfont); - KeEnterCriticalRegion(); - ExAcquirePushLockExclusive(&plfnt->lock); + if (plfnt != 0) + { + KeEnterCriticalRegion(); + ExAcquirePushLockExclusive(&plfnt->lock); + } return plfnt; }

11 years, 11 months

[tkreuzer] 58108: [NTOSKRNL] Implement protection changing in NtAllocateVirtualMemory. Fixes "Assertion 'ChangeProtection == FALSE' failed"

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jan 4 01:06:51 2013 New Revision: 58108 URL: http://svn.reactos.org/svn/reactos?rev=58108&view=rev Log: [NTOSKRNL] Implement protection changing in NtAllocateVirtualMemory. Fixes "Assertion 'ChangeProtection == FALSE' failed" Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Fri Jan 4 01:06:51 2013 @@ -4308,7 +4308,6 @@ // There's a change in protection, remember this for later, but do // not yet handle it. // - DPRINT1("Protection change to: 0x%lx not implemented\n", Protect); ChangeProtection = TRUE; } @@ -4317,11 +4316,6 @@ // PointerPte++; } - - // - // This path is not yet handled - // - ASSERT(ChangeProtection == FALSE); // // Release the working set lock, unlock the address space, and detach from @@ -4332,6 +4326,26 @@ Status = STATUS_SUCCESS; FailPath: MmUnlockAddressSpace(AddressSpace); + + // + // Check if we need to update the protection + // + if (ChangeProtection) + { + PVOID ProtectBaseAddress = (PVOID)StartingAddress; + SIZE_T ProtectSize = PRegionSize; + ULONG OldProtection; + + // + // Change the protection of the region + // + MiProtectVirtualMemory(Process, + &ProtectBaseAddress, + &ProtectSize, + Protect, + &OldProtection); + } + FailPathNoLock: if (Attached) KeUnstackDetachProcess(&ApcState); if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process);

11 years, 11 months

← Newer
1
...
12
13
14
15
16
17
18
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2013