Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 34867: - implement changing drive volume name - display default volume label "local disk" if there is no title - verify that provided clsid is valid - display drive property dialog - note: changing volume label currently leads to a crash
by janderwald＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: janderwald Date: Sun Jul 27 17:58:19 2008 New Revision: 34867 URL: http://svn.reactos.org/svn/reactos?rev=34867&view=rev Log: - implement changing drive volume name - display default volume label "local disk" if there is no title - verify that provided clsid is valid - display drive property dialog - note: changing volume label currently leads to a crash Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Sun Jul 27 17:58:19 2008 @@ -229,12 +229,13 @@ ) { LPPROPSHEETPAGEW ppsp; - LPDRAWITEMSTRUCT drawItem; + LPDRAWITEMSTRUCT drawItem; STARTUPINFOW si; PROCESS_INFORMATION pi; WCHAR * lpstr; WCHAR szPath[MAX_PATH]; UINT length; + LPPSHNOTIFY lppsn; switch(uMsg) { @@ -246,11 +247,11 @@ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)lpstr); InitializeGeneralDriveDialog(hwndDlg, lpstr); return TRUE; - case WM_DRAWITEM: - drawItem = (LPDRAWITEMSTRUCT)lParam; - if (drawItem->CtlID >= 14013 && drawItem->CtlID <= 14015) + case WM_DRAWITEM: + drawItem = (LPDRAWITEMSTRUCT)lParam; + if (drawItem->CtlID >= 14013 && drawItem->CtlID <= 14015) { - PaintStaticControls(hwndDlg, drawItem); + PaintStaticControls(hwndDlg, drawItem); return TRUE; } break; @@ -272,7 +273,32 @@ CloseHandle(pi.hProcess); CloseHandle(pi.hThread); } + break; } + case WM_NOTIFY: + lppsn = (LPPSHNOTIFY) lParam; + if (LOWORD(wParam) == 14001) + { + if (HIWORD(wParam) == EN_CHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + if (lppsn->hdr.code == PSN_APPLY) + { + lpstr = (LPWSTR)GetWindowLong(hwndDlg, DWLP_USER); + if (lpstr && SendDlgItemMessageW(hwndDlg, 14001, WM_GETTEXT, sizeof(szPath)/sizeof(WCHAR), (LPARAM)szPath)) + { + szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0'; + SetVolumeLabelW(lpstr, szPath); + } + SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR ); + return TRUE; + } + break; + + default: break; } @@ -409,6 +435,8 @@ PROPSHEETHEADERW psh; BOOL ret; UINT i; + WCHAR szName[MAX_PATH]; + DWORD dwMaxComponent, dwFileSysFlags; ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); psh.dwSize = sizeof(PROPSHEETHEADERW); @@ -417,6 +445,30 @@ psh.nStartPage = 0; psh.phpage = hpsp; + + if (GetVolumeInformationW(drive, szName, sizeof(szName)/sizeof(WCHAR), NULL, &dwMaxComponent, + &dwFileSysFlags, NULL, 0)) + { + psh.pszCaption = szName; + psh.dwFlags |= PSH_PROPTITLE; + if (!wcslen(szName)) + { + /* FIXME + * check if disk is a really a local hdd + */ + i = LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, szName, sizeof(szName)/sizeof(WCHAR)); + if (i > 0 && i < (sizeof(szName)/sizeof(WCHAR)) + 6) + { + szName[i] = L' '; + szName[i+1] = L'('; + wcscpy(&szName[i+2], drive); + szName[i+4] = L')'; + szName[i+5] = L'\0'; + } + } + } + + for (i = 0; i < DRIVE_PROPERTY_PAGES; i++) { HPROPSHEETPAGE hprop = SH_CreatePropertySheetPage(PropPages[i].resname, PropPages[i].dlgproc, (LPARAM)drive, NULL); Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Sun Jul 27 17:58:19 2008 @@ -674,6 +674,7 @@ UINT Length; DWORD dwName; int Pages; + CLSID clsid; pOffset = wcsrchr(wFileName, L'.'); if (!pOffset) @@ -681,8 +682,16 @@ Length = wcslen(szName); if (Length >=94) return 0; - wcscpy(szName, L"CLSID\\"); - wcscpy(&szName[6], wFileName); + + if (CLSIDFromString(wFileName, &clsid) == NOERROR) + { + wcscpy(szName, L"CLSID\\"); + wcscpy(&szName[6], wFileName); + } + else + { + wcscpy(szName, wFileName); + } } else { @@ -767,12 +776,17 @@ strcpyW(wFileName, lpf); } - if (PathIsDirectoryW(wFileName) || strlenW(wFileName) == 3) - { - FIXME("directory / drive resources are missing\n"); - return FALSE; - } - + if (PathIsDirectoryW(wFileName)) + { + FIXME("directory resources are missing\n"); + return FALSE; + } + + if (wcslen(wFileName) == 3) + { + return SH_ShowDriveProperties(wFileName); + } + wcscpy(szTemp, wFileName); pFileName = wcsrchr(szTemp, '\\'); if (pFileName)

1 0

[tkreuzer] 34866: give ndis it's own def file for amd64, yes that breaks arm build... :-@
by tkreuzer＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: tkreuzer Date: Sun Jul 27 17:43:41 2008 New Revision: 34866 URL: http://svn.reactos.org/svn/reactos?rev=34866&view=rev Log: give ndis it's own def file for amd64, yes that breaks arm build... :-@ Added: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis-amd64.def (with props) branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis-i386.def (with props) Removed: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis.def Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis.rbuild Added: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis-amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis-amd64.def (added) +++ branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis-amd64.def [iso-8859-1] Sun Jul 27 17:43:41 2008 @@ -1,0 +1,273 @@ +; NDIS Kernel Module - ReactOS Operating System + +LIBRARY NDIS.SYS + +EXPORTS +ArcFilterDprIndicateReceive +ArcFilterDprIndicateReceiveComplete +EthFilterDprIndicateReceive +EthFilterDprIndicateReceiveComplete +FddiFilterDprIndicateReceive +FddiFilterDprIndicateReceiveComplete +NDIS_BUFFER_TO_SPAN_PAGES +NdisAcquireReadWriteLock +NdisAcquireSpinLock +NdisAdjustBufferLength +NdisAllocateBuffer +NdisAllocateBufferPool +NdisAllocateDmaChannel +NdisAllocateMemory +NdisAllocateMemoryWithTag +NdisAllocatePacket +NdisAllocatePacketPool +NdisAllocatePacketPoolEx +NdisAllocateSharedMemory +NdisAllocateSpinLock +NdisAnsiStringToUnicodeString +NdisBufferLength +NdisBufferVirtualAddress +NdisCancelTimer +NdisClAddParty +NdisClCloseAddressFamily +NdisClCloseCall +NdisClDeregisterSap +NdisClDropParty +NdisClIncomingCallComplete +NdisClMakeCall +NdisClModifyCallQoS +NdisClOpenAddressFamily +NdisClRegisterSap +NdisCloseAdapter +NdisCloseConfiguration +NdisCloseFile +NdisCmActivateVc +NdisCmAddPartyComplete +NdisCmCloseAddressFamilyComplete +NdisCmCloseCallComplete +NdisCmDeactivateVc +NdisCmDeregisterSapComplete +NdisCmDispatchCallConnected +NdisCmDispatchIncomingCall +NdisCmDispatchIncomingCallQoSChange +NdisCmDispatchIncomingCloseCall +NdisCmDispatchIncomingDropParty +NdisCmDropPartyComplete +NdisCmMakeCallComplete +NdisCmModifyCallQoSComplete +NdisCmOpenAddressFamilyComplete +NdisCmRegisterAddressFamily +NdisCmRegisterSapComplete +NdisCoCreateVc +NdisCoDeleteVc +NdisCoRequest +NdisCoRequestComplete +NdisCoSendPackets +;NdisCompareAnsiString ? +;NdisCompareUnicodeString ? +NdisCompleteBindAdapter +NdisCompleteCloseAdapter +NdisCompleteDmaTransfer +NdisCompleteOpenAdapter +NdisCompletePnPEvent +NdisCompleteQueryStatistics +NdisCompleteUnbindAdapter +NdisConvertStringToAtmAddress +NdisCopyBuffer +NdisCopyFromPacketToPacket +NdisDeregisterAdapter +NdisDeregisterAdapterShutdownHandler +NdisDeregisterMac +NdisDeregisterProtocol +NdisDprAcquireSpinLock +NdisDprAllocatePacket +NdisDprAllocatePacketNonInterlocked +NdisDprFreePacket +NdisDprFreePacketNonInterlocked +NdisDprReleaseSpinLock +NdisEqualString +NdisFreeBuffer +NdisFreeBufferPool +NdisFreeDmaChannel +NdisFreeMemory +NdisFreePacket +NdisFreePacketPool +NdisFreeSharedMemory +NdisFreeSpinLock +NdisGetBufferPhysicalArraySize +NdisGetCurrentProcessorCounts +NdisGetCurrentProcessorCpuUsage +NdisGetCurrentSystemTime +NdisGetDriverHandle +NdisGetFirstBufferFromPacket +NdisGetReceivedPacket +NdisGetSystemUpTime +NdisIMAssociateMiniport +NdisIMCancelInitializeDeviceInstance +NdisIMCopySendCompletePerPacketInfo +NdisIMCopySendPerPacketInfo +NdisIMDeInitializeDeviceInstance +NdisIMDeregisterLayeredMiniport +NdisIMGetBindingContext +NdisIMGetDeviceContext +NdisIMInitializeDeviceInstance +NdisIMInitializeDeviceInstanceEx +NdisImmediateReadPciSlotInformation +NdisImmediateReadPortUchar +NdisImmediateReadPortUlong +NdisImmediateReadPortUshort +NdisImmediateReadSharedMemory +NdisImmediateWritePciSlotInformation +NdisImmediateWritePortUchar +NdisImmediateWritePortUlong +NdisImmediateWritePortUshort +NdisImmediateWriteSharedMemory +NdisIMQueueMiniportCallback +NdisIMRegisterLayeredMiniport +NdisIMRevertBack +NdisIMSwitchToMiniport +NdisInitAnsiString +NdisInitializeEvent +NdisInitializeReadWriteLock +NdisInitializeString +NdisInitializeTimer +NdisInitializeWrapper +NdisInitUnicodeString +;NdisInterlockedAddLargeInterger ? +NdisInterlockedAddUlong +NdisInterlockedDecrement +NdisInterlockedIncrement +NdisInterlockedInsertHeadList +NdisInterlockedInsertTailList +NdisInterlockedPopEntrySList +NdisInterlockedPushEntrySList +NdisInterlockedRemoveHeadList +NdisMAllocateMapRegisters +NdisMAllocateSharedMemory +NdisMAllocateSharedMemoryAsync +NdisMapFile +NdisMapIoSpace +;NdisMatchPdoWithPacket ? +NdisMCancelTimer +NdisMCloseLog +NdisMCmActivateVc +NdisMCmCreateVc +NdisMCmDeactivateVc +NdisMCmDeleteVc +NdisMCmRegisterAddressFamily +NdisMCmRequest +NdisMCoActivateVcComplete +NdisMCoDeactivateVcComplete +NdisMCoIndicateReceivePacket +NdisMCoIndicateStatus +NdisMCompleteBufferPhysicalMapping +NdisMCoReceiveComplete +NdisMCoRequestComplete +NdisMCoSendComplete +NdisMCreateLog +NdisMDeregisterAdapterShutdownHandler +NdisMDeregisterDevice +NdisMDeregisterDmaChannel +NdisMDeregisterInterrupt +NdisMDeregisterIoPortRange +NdisMFlushLog +NdisMFreeMapRegisters +NdisMFreeSharedMemory +NdisMGetDeviceProperty +NdisMGetDmaAlignment +NdisMIndicateStatus +NdisMIndicateStatusComplete +NdisMInitializeScatterGatherDma +NdisMInitializeTimer +NdisMMapIoSpace +NdisMPciAssignResources +NdisMPromoteMiniport +NdisMQueryAdapterInstanceName +NdisMQueryAdapterResources +NdisMQueryInformationComplete +NdisMReadDmaCounter +NdisMRegisterAdapterShutdownHandler +NdisMRegisterDevice +NdisMRegisterDmaChannel +NdisMRegisterInterrupt +NdisMRegisterIoPortRange +NdisMRegisterMiniport +NdisMRegisterUnloadHandler +NdisMRemoveMiniport +NdisMResetComplete +NdisMSendComplete +NdisMSendResourcesAvailable +NdisMSetAttributes +NdisMSetAttributesEx +NdisMSetInformationComplete +NdisMSetMiniportSecondary +NdisMSetPeriodicTimer +NdisMSetTimer +NdisMSleep +NdisMStartBufferPhysicalMapping +NdisMSynchronizeWithInterrupt +NdisMTransferDataComplete +NdisMUnmapIoSpace +NdisMWanIndicateReceive +NdisMWanIndicateReceiveComplete +NdisMWanSendComplete +NdisMWriteLogData +NdisOpenAdapter +NdisOpenConfiguration +NdisOpenConfigurationKeyByIndex +NdisOpenConfigurationKeyByName +NdisOpenFile +NdisOpenProtocolConfiguration +;NdisOverrideBusNumber ? +NdisPacketPoolUsage +NdisPciAssignResources +NdisQueryAdapterInstanceName +;NdisQueryBindInstanceName? +NdisQueryBuffer +NdisQueryBufferOffset +NdisQueryBufferSafe +NdisQueryMapRegisterCount +NdisReadConfiguration +NdisReadEisaSlotInformation +NdisReadEisaSlotInformationEx +NdisReadMcaPosInformation +NdisReadNetworkAddress +NdisReadPciSlotInformation +NdisReadPcmciaAttributeMemory +;NdisReEnumerateProtocolBindings ? +NdisRegisterAdapter +NdisRegisterAdapterShutdownHandler +NdisRegisterProtocol +;NdisRegisterTdiCallBack ? +NdisReleaseAdapterResources +NdisReleaseReadWriteLock +NdisReleaseSpinLock +NdisRequest +NdisReset +NdisResetEvent +NdisReturnPackets +NdisSend +NdisSendPackets +NdisSetEvent +;NdisSetPacketPoolProtocolId ? +;NdisSetProtocolFilter ? +NdisSetTimer +NdisSetupDmaTransfer +NdisSystemProcessorCount +NdisTerminateWrapper +NdisTransferData +NdisUnchainBufferAtBack +NdisUnchainBufferAtFront +NdisUnicodeStringToAnsiString +NdisUnmapFile +NdisUpcaseUnicodeString +NdisUpdateSharedMemory +NdisWaitEvent +NdisWriteConfiguration +NdisWriteErrorLogEntry +NdisWritePciSlotInformation +NdisWritePcmciaAttributeMemory +TrFilterDprIndicateReceive +TrFilterDprIndicateReceiveComplete +NdisScheduleWorkItem + +; EOF Propchange: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis-amd64.def ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis-i386.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis-i386.def (added) +++ branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis-i386.def [iso-8859-1] Sun Jul 27 17:43:41 2008 @@ -1,0 +1,274 @@ +; NDIS Kernel Module - ReactOS Operating System + +LIBRARY NDIS.SYS + +EXPORTS +ArcFilterDprIndicateReceive@16 +ArcFilterDprIndicateReceiveComplete@4 +EthFilterDprIndicateReceive@32 +EthFilterDprIndicateReceiveComplete@4 +FddiFilterDprIndicateReceive@36 +FddiFilterDprIndicateReceiveComplete@4 +NDIS_BUFFER_TO_SPAN_PAGES@4 +NdisAcquireReadWriteLock@12 +NdisAcquireSpinLock@4 +NdisAdjustBufferLength@8 +NdisAllocateBuffer@20 +NdisAllocateBufferPool@12 +NdisAllocateDmaChannel@20 +NdisAllocateMemory@20 +NdisAllocateMemoryWithTag@12 +NdisAllocatePacket@12 +NdisAllocatePacketPool@16 +NdisAllocatePacketPoolEx@20 +NdisAllocateSharedMemory@20 +NdisAllocateSpinLock@4 +NdisAnsiStringToUnicodeString@8 +NdisBufferLength@4 +NdisBufferVirtualAddress@4 +NdisCancelTimer@8 +NdisClAddParty@16 +NdisClCloseAddressFamily@4 +NdisClCloseCall@16 +NdisClDeregisterSap@4 +NdisClDropParty@12 +NdisClIncomingCallComplete@12 +NdisClMakeCall@16 +NdisClModifyCallQoS@8 +NdisClOpenAddressFamily@24 +NdisClRegisterSap@16 +NdisCloseAdapter@8 +NdisCloseConfiguration@4 +NdisCloseFile@4 +NdisCmActivateVc@8 +NdisCmAddPartyComplete@16 +NdisCmCloseAddressFamilyComplete@8 +NdisCmCloseCallComplete@12 +NdisCmDeactivateVc@4 +NdisCmDeregisterSapComplete@8 +NdisCmDispatchCallConnected@4 +NdisCmDispatchIncomingCall@12 +NdisCmDispatchIncomingCallQoSChange@8 +NdisCmDispatchIncomingCloseCall@16 +NdisCmDispatchIncomingDropParty@16 +NdisCmDropPartyComplete@8 +NdisCmMakeCallComplete@20 +NdisCmModifyCallQoSComplete@12 +NdisCmOpenAddressFamilyComplete@12 +NdisCmRegisterAddressFamily@16 +NdisCmRegisterSapComplete@12 +NdisCoCreateVc@16 +NdisCoDeleteVc@4 +NdisCoRequest@20 +NdisCoRequestComplete@20 +NdisCoSendPackets@12 +;NdisCompareAnsiString ? +;NdisCompareUnicodeString ? +NdisCompleteBindAdapter@12 +NdisCompleteCloseAdapter@8 +NdisCompleteDmaTransfer@24 +NdisCompleteOpenAdapter@12 +NdisCompletePnPEvent@12 +NdisCompleteQueryStatistics@12 +NdisCompleteUnbindAdapter@8 +NdisConvertStringToAtmAddress@12 +NdisCopyBuffer@24 +NdisCopyFromPacketToPacket@24 +NdisDeregisterAdapter@4 +NdisDeregisterAdapterShutdownHandler@4 +NdisDeregisterMac@8 +NdisDeregisterProtocol@8 +NdisDprAcquireSpinLock@4 +NdisDprAllocatePacket@12 +NdisDprAllocatePacketNonInterlocked@12 +NdisDprFreePacket@4 +NdisDprFreePacketNonInterlocked@4 +NdisDprReleaseSpinLock@4 +NdisEqualString@12 +NdisFreeBuffer@4 +NdisFreeBufferPool@4 +NdisFreeDmaChannel@4 +NdisFreeMemory@12 +NdisFreePacket@4 +NdisFreePacketPool@4 +NdisFreeSharedMemory@24 +NdisFreeSpinLock@4 +NdisGetBufferPhysicalArraySize@8 +NdisGetCurrentProcessorCounts@12 +NdisGetCurrentProcessorCpuUsage@4 +NdisGetCurrentSystemTime@4 +NdisGetDriverHandle@8 +NdisGetFirstBufferFromPacket@20 +NdisGetReceivedPacket@8 +NdisGetSystemUpTime@4 +NdisIMAssociateMiniport@8 +NdisIMCancelInitializeDeviceInstance@8 +NdisIMCopySendCompletePerPacketInfo@8 +NdisIMCopySendPerPacketInfo@8 +NdisIMDeInitializeDeviceInstance@4 +NdisIMDeregisterLayeredMiniport@4 +NdisIMGetBindingContext@4 +NdisIMGetDeviceContext@4 +NdisIMInitializeDeviceInstance@8 +NdisIMInitializeDeviceInstanceEx@12 +NdisImmediateReadPciSlotInformation@20 +NdisImmediateReadPortUchar@12 +NdisImmediateReadPortUlong@12 +NdisImmediateReadPortUshort@12 +NdisImmediateReadSharedMemory@16 +NdisImmediateWritePciSlotInformation@20 +NdisImmediateWritePortUchar@12 +NdisImmediateWritePortUlong@12 +NdisImmediateWritePortUshort@12 +NdisImmediateWriteSharedMemory@16 +NdisIMQueueMiniportCallback@12 +NdisIMRegisterLayeredMiniport@16 +NdisIMRevertBack@8 +NdisIMSwitchToMiniport@8 +NdisInitAnsiString@8 +NdisInitializeEvent@4 +NdisInitializeReadWriteLock@4 +NdisInitializeString@8 +NdisInitializeTimer@12 +NdisInitializeWrapper@16 +NdisInitUnicodeString@8 +;NdisInterlockedAddLargeInterger ? +NdisInterlockedAddUlong@12 +NdisInterlockedDecrement@4 +NdisInterlockedIncrement@4 +NdisInterlockedInsertHeadList@12 +NdisInterlockedInsertTailList@12 +NdisInterlockedPopEntrySList@8 +NdisInterlockedPushEntrySList@12 +NdisInterlockedRemoveHeadList@8 +NdisMAllocateMapRegisters@20 +NdisMAllocateSharedMemory@20 +NdisMAllocateSharedMemoryAsync@16 +NdisMapFile@12 +NdisMapIoSpace@24 +;NdisMatchPdoWithPacket ? +NdisMCancelTimer@8 +NdisMCloseLog@4 +NdisMCmActivateVc@8 +NdisMCmCreateVc@16 +NdisMCmDeactivateVc@4 +NdisMCmDeleteVc@4 +NdisMCmRegisterAddressFamily@16 +NdisMCmRequest@16 +NdisMCoActivateVcComplete@12 +NdisMCoDeactivateVcComplete@8 +NdisMCoIndicateReceivePacket@12 +NdisMCoIndicateStatus@20 +NdisMCompleteBufferPhysicalMapping@12 +NdisMCoReceiveComplete@4 +NdisMCoRequestComplete@12 +NdisMCoSendComplete@12 +NdisMCreateLog@12 +NdisMDeregisterAdapterShutdownHandler@4 +NdisMDeregisterDevice@4 +NdisMDeregisterDmaChannel@4 +NdisMDeregisterInterrupt@4 +NdisMDeregisterIoPortRange@16 +NdisMFlushLog@4 +NdisMFreeMapRegisters@4 +NdisMFreeSharedMemory@24 +NdisMGetDeviceProperty@24 +NdisMGetDmaAlignment@4 +NdisMIndicateStatus@16 +NdisMIndicateStatusComplete@4 +NdisMInitializeScatterGatherDma@12 +NdisMInitializeTimer@16 +NdisMMapIoSpace@20 +NdisMPciAssignResources@12 +NdisMPromoteMiniport@4 +NdisMQueryAdapterInstanceName@8 +NdisMQueryAdapterResources@16 +NdisMQueryInformationComplete@8 +NdisMReadDmaCounter@4 +NdisMRegisterAdapterShutdownHandler@12 +NdisMRegisterDevice@24 +NdisMRegisterDmaChannel@24 +NdisMRegisterInterrupt@28 +NdisMRegisterIoPortRange@16 +NdisMRegisterMiniport@12 +NdisMRegisterUnloadHandler@8 +NdisMRemoveMiniport@4 +NdisMResetComplete@12 +NdisMSendComplete@12 +NdisMSendResourcesAvailable@4 +NdisMSetAttributes@16 +NdisMSetAttributesEx@20 +NdisMSetInformationComplete@8 +NdisMSetMiniportSecondary@8 +NdisMSetPeriodicTimer@8 +NdisMSetTimer@8 +NdisMSleep@4 +NdisMStartBufferPhysicalMapping@24 +NdisMSynchronizeWithInterrupt@12 +NdisMTransferDataComplete@16 +NdisMUnmapIoSpace@12 +NdisMWanIndicateReceive@20 +NdisMWanIndicateReceiveComplete@4 +NdisMWanSendComplete@12 +NdisMWriteLogData@12 +NdisOpenAdapter@44 +NdisOpenConfiguration@12 +NdisOpenConfigurationKeyByIndex@20 +NdisOpenConfigurationKeyByName@16 +NdisOpenFile@24 +NdisOpenProtocolConfiguration@12 +;NdisOverrideBusNumber ? +NdisPacketPoolUsage@4 +NdisPciAssignResources@20 +NdisQueryAdapterInstanceName@8 +;NdisQueryBindInstanceName? +NdisQueryBuffer@12 +NdisQueryBufferOffset@12 +NdisQueryBufferSafe@16 +NdisQueryMapRegisterCount@8 +NdisReadConfiguration@20 +NdisReadEisaSlotInformation@16 +NdisReadEisaSlotInformationEx@20 +NdisReadMcaPosInformation@16 +NdisReadNetworkAddress@16 +NdisReadPciSlotInformation@20 +NdisReadPcmciaAttributeMemory@16 +;NdisReEnumerateProtocolBindings ? +NdisRegisterAdapter@24 +NdisRegisterAdapterShutdownHandler@12 +NdisRegisterProtocol@16 +;NdisRegisterTdiCallBack ? +NdisReleaseAdapterResources@4 +NdisReleaseReadWriteLock@8 +NdisReleaseSpinLock@4 +NdisRequest@12 +NdisReset@8 +NdisResetEvent@4 +NdisReturnPackets@8 +NdisSend@12 +NdisSendPackets@12 +NdisSetEvent@4 +;NdisSetPacketPoolProtocolId ? +;NdisSetProtocolFilter ? +NdisSetTimer@8 +NdisSetupDmaTransfer@24 +NdisSystemProcessorCount@0 +NdisTerminateWrapper@8 +NdisTransferData@28 +NdisUnchainBufferAtBack@8 +NdisUnchainBufferAtFront@8 +NdisUnicodeStringToAnsiString@8 +NdisUnmapFile@4 +NdisUpcaseUnicodeString@8 +NdisUpdateSharedMemory@20 +NdisWaitEvent@8 +NdisWriteConfiguration@16 +NdisWriteErrorLogEntry +NdisWriteEventLogEntry@28 +NdisWritePciSlotInformation@20 +NdisWritePcmciaAttributeMemory@16 +TrFilterDprIndicateReceive@28 +TrFilterDprIndicateReceiveComplete@4 +NdisScheduleWorkItem@4 + +; EOF Propchange: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis-i386.def ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis.def (removed) @@ -1,274 +1,0 @@ -; NDIS Kernel Module - ReactOS Operating System - -LIBRARY NDIS.SYS - -EXPORTS -ArcFilterDprIndicateReceive@16 -ArcFilterDprIndicateReceiveComplete@4 -EthFilterDprIndicateReceive@32 -EthFilterDprIndicateReceiveComplete@4 -FddiFilterDprIndicateReceive@36 -FddiFilterDprIndicateReceiveComplete@4 -NDIS_BUFFER_TO_SPAN_PAGES@4 -NdisAcquireReadWriteLock@12 -NdisAcquireSpinLock@4 -NdisAdjustBufferLength@8 -NdisAllocateBuffer@20 -NdisAllocateBufferPool@12 -NdisAllocateDmaChannel@20 -NdisAllocateMemory@20 -NdisAllocateMemoryWithTag@12 -NdisAllocatePacket@12 -NdisAllocatePacketPool@16 -NdisAllocatePacketPoolEx@20 -NdisAllocateSharedMemory@20 -NdisAllocateSpinLock@4 -NdisAnsiStringToUnicodeString@8 -NdisBufferLength@4 -NdisBufferVirtualAddress@4 -NdisCancelTimer@8 -NdisClAddParty@16 -NdisClCloseAddressFamily@4 -NdisClCloseCall@16 -NdisClDeregisterSap@4 -NdisClDropParty@12 -NdisClIncomingCallComplete@12 -NdisClMakeCall@16 -NdisClModifyCallQoS@8 -NdisClOpenAddressFamily@24 -NdisClRegisterSap@16 -NdisCloseAdapter@8 -NdisCloseConfiguration@4 -NdisCloseFile@4 -NdisCmActivateVc@8 -NdisCmAddPartyComplete@16 -NdisCmCloseAddressFamilyComplete@8 -NdisCmCloseCallComplete@12 -NdisCmDeactivateVc@4 -NdisCmDeregisterSapComplete@8 -NdisCmDispatchCallConnected@4 -NdisCmDispatchIncomingCall@12 -NdisCmDispatchIncomingCallQoSChange@8 -NdisCmDispatchIncomingCloseCall@16 -NdisCmDispatchIncomingDropParty@16 -NdisCmDropPartyComplete@8 -NdisCmMakeCallComplete@20 -NdisCmModifyCallQoSComplete@12 -NdisCmOpenAddressFamilyComplete@12 -NdisCmRegisterAddressFamily@16 -NdisCmRegisterSapComplete@12 -NdisCoCreateVc@16 -NdisCoDeleteVc@4 -NdisCoRequest@20 -NdisCoRequestComplete@20 -NdisCoSendPackets@12 -;NdisCompareAnsiString ? -;NdisCompareUnicodeString ? -NdisCompleteBindAdapter@12 -NdisCompleteCloseAdapter@8 -NdisCompleteDmaTransfer@24 -NdisCompleteOpenAdapter@12 -NdisCompletePnPEvent@12 -NdisCompleteQueryStatistics@12 -NdisCompleteUnbindAdapter@8 -NdisConvertStringToAtmAddress@12 -NdisCopyBuffer@24 -NdisCopyFromPacketToPacket@24 -NdisDeregisterAdapter@4 -NdisDeregisterAdapterShutdownHandler@4 -NdisDeregisterMac@8 -NdisDeregisterProtocol@8 -NdisDprAcquireSpinLock@4 -NdisDprAllocatePacket@12 -NdisDprAllocatePacketNonInterlocked@12 -NdisDprFreePacket@4 -NdisDprFreePacketNonInterlocked@4 -NdisDprReleaseSpinLock@4 -NdisEqualString@12 -NdisFreeBuffer@4 -NdisFreeBufferPool@4 -NdisFreeDmaChannel@4 -NdisFreeMemory@12 -NdisFreePacket@4 -NdisFreePacketPool@4 -NdisFreeSharedMemory@24 -NdisFreeSpinLock@4 -NdisGetBufferPhysicalArraySize@8 -NdisGetCurrentProcessorCounts@12 -NdisGetCurrentProcessorCpuUsage@4 -NdisGetCurrentSystemTime@4 -NdisGetDriverHandle@8 -NdisGetFirstBufferFromPacket@20 -NdisGetReceivedPacket@8 -NdisGetSystemUpTime@4 -NdisIMAssociateMiniport@8 -NdisIMCancelInitializeDeviceInstance@8 -NdisIMCopySendCompletePerPacketInfo@8 -NdisIMCopySendPerPacketInfo@8 -NdisIMDeInitializeDeviceInstance@4 -NdisIMDeregisterLayeredMiniport@4 -NdisIMGetBindingContext@4 -NdisIMGetDeviceContext@4 -NdisIMInitializeDeviceInstance@8 -NdisIMInitializeDeviceInstanceEx@12 -NdisImmediateReadPciSlotInformation@20 -NdisImmediateReadPortUchar@12 -NdisImmediateReadPortUlong@12 -NdisImmediateReadPortUshort@12 -NdisImmediateReadSharedMemory@16 -NdisImmediateWritePciSlotInformation@20 -NdisImmediateWritePortUchar@12 -NdisImmediateWritePortUlong@12 -NdisImmediateWritePortUshort@12 -NdisImmediateWriteSharedMemory@16 -NdisIMQueueMiniportCallback@12 -NdisIMRegisterLayeredMiniport@16 -NdisIMRevertBack@8 -NdisIMSwitchToMiniport@8 -NdisInitAnsiString@8 -NdisInitializeEvent@4 -NdisInitializeReadWriteLock@4 -NdisInitializeString@8 -NdisInitializeTimer@12 -NdisInitializeWrapper@16 -NdisInitUnicodeString@8 -;NdisInterlockedAddLargeInterger ? -NdisInterlockedAddUlong@12 -NdisInterlockedDecrement@4 -NdisInterlockedIncrement@4 -NdisInterlockedInsertHeadList@12 -NdisInterlockedInsertTailList@12 -NdisInterlockedPopEntrySList@8 -NdisInterlockedPushEntrySList@12 -NdisInterlockedRemoveHeadList@8 -NdisMAllocateMapRegisters@20 -NdisMAllocateSharedMemory@20 -NdisMAllocateSharedMemoryAsync@16 -NdisMapFile@12 -NdisMapIoSpace@24 -;NdisMatchPdoWithPacket ? -NdisMCancelTimer@8 -NdisMCloseLog@4 -NdisMCmActivateVc@8 -NdisMCmCreateVc@16 -NdisMCmDeactivateVc@4 -NdisMCmDeleteVc@4 -NdisMCmRegisterAddressFamily@16 -NdisMCmRequest@16 -NdisMCoActivateVcComplete@12 -NdisMCoDeactivateVcComplete@8 -NdisMCoIndicateReceivePacket@12 -NdisMCoIndicateStatus@20 -NdisMCompleteBufferPhysicalMapping@12 -NdisMCoReceiveComplete@4 -NdisMCoRequestComplete@12 -NdisMCoSendComplete@12 -NdisMCreateLog@12 -NdisMDeregisterAdapterShutdownHandler@4 -NdisMDeregisterDevice@4 -NdisMDeregisterDmaChannel@4 -NdisMDeregisterInterrupt@4 -NdisMDeregisterIoPortRange@16 -NdisMFlushLog@4 -NdisMFreeMapRegisters@4 -NdisMFreeSharedMemory@24 -NdisMGetDeviceProperty@24 -NdisMGetDmaAlignment@4 -NdisMIndicateStatus@16 -NdisMIndicateStatusComplete@4 -NdisMInitializeScatterGatherDma@12 -NdisMInitializeTimer@16 -NdisMMapIoSpace@20 -NdisMPciAssignResources@12 -NdisMPromoteMiniport@4 -NdisMQueryAdapterInstanceName@8 -NdisMQueryAdapterResources@16 -NdisMQueryInformationComplete@8 -NdisMReadDmaCounter@4 -NdisMRegisterAdapterShutdownHandler@12 -NdisMRegisterDevice@24 -NdisMRegisterDmaChannel@24 -NdisMRegisterInterrupt@28 -NdisMRegisterIoPortRange@16 -NdisMRegisterMiniport@12 -NdisMRegisterUnloadHandler@8 -NdisMRemoveMiniport@4 -NdisMResetComplete@12 -NdisMSendComplete@12 -NdisMSendResourcesAvailable@4 -NdisMSetAttributes@16 -NdisMSetAttributesEx@20 -NdisMSetInformationComplete@8 -NdisMSetMiniportSecondary@8 -NdisMSetPeriodicTimer@8 -NdisMSetTimer@8 -NdisMSleep@4 -NdisMStartBufferPhysicalMapping@24 -NdisMSynchronizeWithInterrupt@12 -NdisMTransferDataComplete@16 -NdisMUnmapIoSpace@12 -NdisMWanIndicateReceive@20 -NdisMWanIndicateReceiveComplete@4 -NdisMWanSendComplete@12 -NdisMWriteLogData@12 -NdisOpenAdapter@44 -NdisOpenConfiguration@12 -NdisOpenConfigurationKeyByIndex@20 -NdisOpenConfigurationKeyByName@16 -NdisOpenFile@24 -NdisOpenProtocolConfiguration@12 -;NdisOverrideBusNumber ? -NdisPacketPoolUsage@4 -NdisPciAssignResources@20 -NdisQueryAdapterInstanceName@8 -;NdisQueryBindInstanceName? -NdisQueryBuffer@12 -NdisQueryBufferOffset@12 -NdisQueryBufferSafe@16 -NdisQueryMapRegisterCount@8 -NdisReadConfiguration@20 -NdisReadEisaSlotInformation@16 -NdisReadEisaSlotInformationEx@20 -NdisReadMcaPosInformation@16 -NdisReadNetworkAddress@16 -NdisReadPciSlotInformation@20 -NdisReadPcmciaAttributeMemory@16 -;NdisReEnumerateProtocolBindings ? -NdisRegisterAdapter@24 -NdisRegisterAdapterShutdownHandler@12 -NdisRegisterProtocol@16 -;NdisRegisterTdiCallBack ? -NdisReleaseAdapterResources@4 -NdisReleaseReadWriteLock@8 -NdisReleaseSpinLock@4 -NdisRequest@12 -NdisReset@8 -NdisResetEvent@4 -NdisReturnPackets@8 -NdisSend@12 -NdisSendPackets@12 -NdisSetEvent@4 -;NdisSetPacketPoolProtocolId ? -;NdisSetProtocolFilter ? -NdisSetTimer@8 -NdisSetupDmaTransfer@24 -NdisSystemProcessorCount@0 -NdisTerminateWrapper@8 -NdisTransferData@28 -NdisUnchainBufferAtBack@8 -NdisUnchainBufferAtFront@8 -NdisUnicodeStringToAnsiString@8 -NdisUnmapFile@4 -NdisUpcaseUnicodeString@8 -NdisUpdateSharedMemory@20 -NdisWaitEvent@8 -NdisWriteConfiguration@16 -NdisWriteErrorLogEntry -NdisWriteEventLogEntry@28 -NdisWritePciSlotInformation@20 -NdisWritePcmciaAttributeMemory@16 -TrFilterDprIndicateReceive@28 -TrFilterDprIndicateReceiveComplete@4 -NdisScheduleWorkItem@4 - -; EOF Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis.rbuild [iso-8859-1] Sun Jul 27 17:43:41 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="ndis" type="kernelmodedriver" installbase="system32/drivers" installname="ndis.sys"> - <importlibrary definition="ndis.def"></importlibrary> + <importlibrary definition="ndis-$(ARCH).def"></importlibrary> <include base="ndis">include</include> <define name="NDIS_WRAPPER" /> <define name="NDIS50" />

1 0

[ros-arm-bringup] 34865: It seems unclear as to what the point of the Page Reference Count Table in the React Addres Space structure really was. It seems an over-engineered approach that actually causes more problems then it attempts to solve. The idea is to be able to unmap PDEs when they are not required anymore (a noble idea), which saves you 4KB of non-paged pool whenever a process frees a chunk of 4MB memory (oversimplification). The problem is that to keep track of this, an extremly expens
by ros-arm-bringup＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: ros-arm-bringup Date: Sun Jul 27 17:39:54 2008 New Revision: 34865 URL: http://svn.reactos.org/svn/reactos?rev=34865&view=rev Log: It seems unclear as to what the point of the Page Reference Count Table in the React Addres Space structure really was. It seems an over-engineered approach that actually causes more problems then it attempts to solve. The idea is to be able to unmap PDEs when they are not required anymore (a noble idea), which saves you 4KB of non-paged pool whenever a process frees a chunk of 4MB memory (oversimplification). The problem is that to keep track of this, an extremly expensive series of branches, comparisons, masks and shifts is applied every single time that a page is mapped or unmapped. It also adds 8KB of non-paged pool to keep track of the references, which in some cases can be more wasteful than keeping the page tables around. Finally, if the process quickly allocates and de-allocates memory in the same PDE range, we will effectively map and unmap the PDE continously, fragmenting hyperspace and slowing down perf. This patch removes this functionality from the system and re-uses the code that was already present in Mmi386ReleaseMmInfo (with some optimizations and changes) to do this unmapping when the process exists. This should make things faster, with a very small amount of increased memory footprint (we're talking about less than 100kb of non paged pool, in worse-case scenarios). Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/aspace.c trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sun Jul 27 17:39:54 2008 @@ -255,7 +255,6 @@ PMEMORY_AREA MemoryAreaRoot; PVOID LowestAddress; PEPROCESS Process; - PUSHORT PageTableRefCountTable; PEX_PUSH_LOCK Lock; } MADDRESS_SPACE, *PMADDRESS_SPACE; Modified: trunk/reactos/ntoskrnl/mm/aspace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/aspace.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/aspace.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/aspace.c [iso-8859-1] Sun Jul 27 17:39:54 2008 @@ -39,8 +39,6 @@ MmInitializeAddressSpace(PEPROCESS Process, PMADDRESS_SPACE AddressSpace) { - ULONG Count; - AddressSpace->MemoryAreaRoot = NULL; if (Process != NULL) @@ -48,19 +46,12 @@ AddressSpace->LowestAddress = MM_LOWEST_USER_ADDRESS; AddressSpace->Process = Process; AddressSpace->Lock = (PEX_PUSH_LOCK)&Process->AddressCreationLock; - ExInitializePushLock((PULONG_PTR)AddressSpace->Lock); - Count = MiGetUserPageDirectoryCount(); - AddressSpace->PageTableRefCountTable = ExAllocatePoolWithTag(NonPagedPool, - Count * sizeof(USHORT), - TAG_PTRC); - RtlZeroMemory(AddressSpace->PageTableRefCountTable, Count * sizeof(USHORT)); - + ExInitializePushLock((PULONG_PTR)AddressSpace->Lock); } else { AddressSpace->LowestAddress = MmSystemRangeStart; AddressSpace->Process = NULL; - AddressSpace->PageTableRefCountTable = NULL; AddressSpace->Lock = (PEX_PUSH_LOCK)&PsGetCurrentProcess()->AddressCreationLock; ExInitializePushLock((PULONG_PTR)AddressSpace->Lock); } @@ -72,11 +63,6 @@ NTAPI MmDestroyAddressSpace(PMADDRESS_SPACE AddressSpace) { - if (AddressSpace->PageTableRefCountTable) - { - ExFreePool(AddressSpace->PageTableRefCountTable); - } - return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sun Jul 27 17:39:54 2008 @@ -145,9 +145,8 @@ { PUSHORT LdtDescriptor; ULONG LdtBase; - PULONG Pde; PULONG PageDir; - ULONG i, j; + ULONG i; DPRINT("Mmi386ReleaseMmInfo(Process %x)\n",Process); @@ -168,28 +167,7 @@ { if (PageDir[i] != 0) { - DPRINT1("Pde for %08x - %08x is not freed, RefCount %d\n", - i * 4 * 1024 * 1024, (i + 1) * 4 * 1024 * 1024 - 1, - ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable[i]); - Pde = MmCreateHyperspaceMapping(PTE_TO_PFN(PageDir[i])); - for (j = 0; j < 1024; j++) - { - if(Pde[j] != 0) - { - if (Pde[j] & PA_PRESENT) - { - DPRINT1("Page at %08x is not freed\n", - i * 4 * 1024 * 1024 + j * PAGE_SIZE); - } - else - { - DPRINT1("Swapentry %x at %x is not freed\n", - Pde[j], i * 4 * 1024 * 1024 + j * PAGE_SIZE); - - } - } - } - MmDeleteHyperspaceMapping(Pde); + MiZeroPage(PTE_TO_PFN(PageDir[i])); MmReleasePageMemoryConsumer(MC_NPPOOL, PTE_TO_PFN(PageDir[i])); } } @@ -604,25 +582,6 @@ { *Page = Pfn; } - /* - * Decrement the reference count for this page table. - */ - if (Process != NULL && WasValid && - ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable != NULL && - Address < MmSystemRangeStart) - { - PUSHORT Ptrc; - ULONG Idx; - - Ptrc = ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; - Idx = ADDR_TO_PAGE_TABLE(Address); - - Ptrc[Idx]--; - if (Ptrc[Idx] == 0) - { - MmFreePageTable(Process, Address); - } - } } VOID @@ -650,25 +609,6 @@ Pte = InterlockedExchangeUL(Pt, 0); MiFlushTlb(Pt, Address); - - /* - * Decrement the reference count for this page table. - */ - if (Process != NULL && Pte && - ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable != NULL && - Address < MmSystemRangeStart) - { - PUSHORT Ptrc; - - Ptrc = ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; - - Ptrc[ADDR_TO_PAGE_TABLE(Address)]--; - if (Ptrc[ADDR_TO_PAGE_TABLE(Address)] == 0) - { - MmFreePageTable(Process, Address); - } - } - /* * Return some information to the caller @@ -971,17 +911,6 @@ MmUnmapPageTable(Pt); } - if (Process != NULL && - ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable != NULL && - Address < MmSystemRangeStart) - { - PUSHORT Ptrc; - ULONG Idx; - - Ptrc = ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; - Idx = ADDR_TO_PAGE_TABLE(Address); - Ptrc[Idx]++; - } return(STATUS_SUCCESS); } @@ -1092,16 +1021,6 @@ MmMarkPageUnmapped(PTE_TO_PFN((Pte))); } (void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); - if (Address < MmSystemRangeStart && - ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable != NULL && - Attributes & PA_PRESENT) - { - PUSHORT Ptrc; - - Ptrc = ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; - - Ptrc[ADDR_TO_PAGE_TABLE(Addr)]++; - } if (Pte != 0) { if (Address > MmSystemRangeStart || @@ -1411,13 +1330,6 @@ } } -ULONG -NTAPI -MiGetUserPageDirectoryCount(VOID) -{ - return ADDR_TO_PDE_OFFSET(MmSystemRangeStart); -} - VOID INIT_FUNCTION NTAPI

1 0

[tkreuzer] 34864: fix some ULONG to pointer casts
by tkreuzer＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: tkreuzer Date: Sun Jul 27 17:20:01 2008 New Revision: 34864 URL: http://svn.reactos.org/svn/reactos?rev=34864&view=rev Log: fix some ULONG to pointer casts Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/io.c Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Sun Jul 27 17:20:01 2008 @@ -133,7 +133,7 @@ OUT PUCHAR Data) { NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - *Data = READ_PORT_UCHAR((PUCHAR)Port); // FIXME: What to do with WrapperConfigurationContext? + *Data = READ_PORT_UCHAR(UlongToPtr(Port)); // FIXME: What to do with WrapperConfigurationContext? } @@ -148,7 +148,7 @@ OUT PULONG Data) { NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - *Data = READ_PORT_ULONG((PULONG)Port); // FIXME: What to do with WrapperConfigurationContext? + *Data = READ_PORT_ULONG(UlongToPtr(Port)); // FIXME: What to do with WrapperConfigurationContext? } @@ -163,7 +163,7 @@ OUT PUSHORT Data) { NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - *Data = READ_PORT_USHORT((PUSHORT)Port); // FIXME: What to do with WrapperConfigurationContext? + *Data = READ_PORT_USHORT(UlongToPtr(Port)); // FIXME: What to do with WrapperConfigurationContext? } @@ -178,7 +178,7 @@ IN UCHAR Data) { NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - WRITE_PORT_UCHAR((PUCHAR)Port, Data); // FIXME: What to do with WrapperConfigurationContext? + WRITE_PORT_UCHAR(UlongToPtr(Port), Data); // FIXME: What to do with WrapperConfigurationContext? } @@ -193,7 +193,7 @@ IN ULONG Data) { NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - WRITE_PORT_ULONG((PULONG)Port, Data); // FIXME: What to do with WrapperConfigurationContext? + WRITE_PORT_ULONG(UlongToPtr(Port), Data); // FIXME: What to do with WrapperConfigurationContext? } @@ -208,7 +208,7 @@ IN USHORT Data) { NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - WRITE_PORT_USHORT((PUSHORT)Port, Data); // FIXME: What to do with WrapperConfigurationContext? + WRITE_PORT_USHORT(UlongToPtr(Port), Data); // FIXME: What to do with WrapperConfigurationContext? }

1 0

[tkreuzer] 34863: put back rbuild files in a proper state, so x86 can be compiled again (as soon as someone fixed Interlocked stuff)
by tkreuzer＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: tkreuzer Date: Sun Jul 27 17:07:36 2008 New Revision: 34863 URL: http://svn.reactos.org/svn/reactos?rev=34863&view=rev Log: put back rbuild files in a proper state, so x86 can be compiled again (as soon as someone fixed Interlocked stuff) Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild (with props) Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild branches/ros-amd64-bringup/reactos/lib/drivers/directory.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sun Jul 27 17:07:36 2008 @@ -104,6 +104,19 @@ <directory name="fastfat"> <xi:include href="drivers/filesystems/fastfat/vfatfs.rbuild" /> </directory> + <directory name="ext2"> +  + </directory> + </directory> + <directory name="storage"> + <directory name="ide"> + <directory name="atapi"> +  + </directory> + </directory> + <directory name="scsiport"> +  + </directory> </directory> </directory> @@ -123,7 +136,7 @@ </directory> <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> + <xi:include href="ntoskrnl/ntoskrnl-amd64hack.rbuild" /> </directory>  <directory name="chew"> <xi:include href="chew/chew.rbuild" /> </directory> Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] Sun Jul 27 17:07:36 2008 @@ -1,0 +1,471 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> +<module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe" allowwarnings="true"> + <bootstrap installbase="$(CDOUTPUT)" /> + <importlibrary definition="ntoskrnl_$(ARCH).def" /> + <define name="_DISABLE_TIDENTS" /> + <define name="__NTOSKRNL__" /> + <define name="_NTOSKRNL_" /> + <define name="_NTSYSTEM_" /> + <define name="__NO_CTYPE_INLINES" /> + <define name="WIN9X_COMPAT_SPINLOCK" /> + <define name="_IN_KERNEL_" /> + <if property="_WINKD_" value="1"> + <define name="_WINKD_" /> + </if> + <if property="_ELF" value="1"> + <define name="_ELF_" /> + </if> + <include base="cmlib">.</include> + <include base="ntoskrnl">include</include> + <include base="ntoskrnl" root="intermediate"></include> + <include base="ntoskrnl" root="intermediate">include</include> + <include base="ntoskrnl" root="intermediate">include/internal</include> + <include base="ReactOS">include/reactos/drivers</include> + <library>csq</library> + <library>hal</library> + <library>pseh</library> + <library>cmlib</library> + <library>rtl</library> + <library>rossym</library> + <library>libcntpr</library> + <library>kdcom</library> + <library>bootvid</library> + <library>wdmguid</library> + <dependency>bugcodes</dependency> + <directory name="include"> + <pch>ntoskrnl.h</pch> + </directory> + <file>amd64stubs.c</file> + <directory name="ke"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file first="true">boot.S</file> + <file>abios.c</file> + <file>cpu.c</file> + <file>ctxswitch.S</file> + <file>exp.c</file> + <file>irqobj.c</file> + <file>kiinit.c</file> + <file>ldt.c</file> + <file>mtrr.c</file> + <file>patpge.c</file> + <file>systimer.S</file> + <file>thrdini.c</file> + <file>trap.s</file> + <file>usercall_asm.S</file> + <file>usercall.c</file> + <file>v86vdm.c</file> + <file>v86m_sup.S</file> + </directory> + </if> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file first="true">boot.s</file> + <file>cpu.c</file> + <file>ctxswtch.s</file> + <file>exp.c</file> + <file>kiinit.c</file> + <file>stubs_asm.s</file> + <file>thrdini.c</file> + <file>time.c</file> + <file>trap.s</file> + <file>trapc.c</file> + <file>usercall.c</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file first="true">main_asm.S</file> + <file>cpu.c</file> + <file>exp.c</file> + <file>kiinit.c</file> + <file>ppc_irq.c</file> + <file>stubs.c</file> + <file>systimer.c</file> + <file>thrdini.c</file> + <file>ctxswitch.c</file> + <file>ctxhelp.S</file> + </directory> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file first="true">boot.S</file> + <file>kiinit.c</file> + </directory> + </if> + <file>apc.c</file> + <file>balmgr.c</file> +  + <file>clock.c</file> + <file>config.c</file> + <file>devqueue.c</file> + <file>dpc.c</file> + <file>eventobj.c</file> + <file>except.c</file> + <file>freeldr.c</file> + <file>gate.c</file> + <file>gmutex.c</file> + <file>ipi.c</file> + <file>krnlinit.c</file> + <file>mutex.c</file> + <file>procobj.c</file> + <file>profobj.c</file> + <file>queue.c</file> + <file>semphobj.c</file> + <file>spinlock.c</file> + <file>thrdschd.c</file> + <file>thrdobj.c</file> + <file>timerobj.c</file> + <file>wait.c</file> + </directory> + <directory name="cc"> + <file>cacheman.c</file> + <file>copy.c</file> + <file>fs.c</file> + <file>mdl.c</file> + <file>pin.c</file> + <file>view.c</file> + </directory> + <directory name="config"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>cmhardwr.c</file> + </directory> + </if> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>cmhardwr.c</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file>cmhardwr.c</file> + </directory> + </if> + <file>cmalloc.c</file> + <file>cmapi.c</file> + <file>cmboot.c</file> + <file>cmcheck.c</file> + <file>cmcontrl.c</file> + <file>cmconfig.c</file> + <file>cmdata.c</file> + <file>cmdelay.c</file> + <file>cmindex.c</file> + <file>cminit.c</file> + <file>cmhook.c</file> + <file>cmkcbncb.c</file> + <file>cmkeydel.c</file> + <file>cmlazy.c</file> + <file>cmmapvw.c</file> + <file>cmname.c</file> + <file>cmparse.c</file> + <file>cmse.c</file> + <file>cmsecach.c</file> + <file>cmsysini.c</file> + <file>cmvalue.c</file> + <file>cmvalche.c</file> + <file>cmwraprs.c</file> + <file>ntapi.c</file> + </directory> + <directory name="dbgk"> + <file>dbgkutil.c</file> +  + </directory> + <directory name="ex" root="intermediate"> + <file>zw.S</file> + </directory> + <directory name="ex"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>interlck_asm.S</file> + <file>fastinterlck_asm.S</file> + <file>ioport.S</file> + </directory> + </if> + <file>atom.c</file> + <file>callback.c</file> + <file>dbgctrl.c</file> + <file>efi.c</file> +  + <file>evtpair.c</file> + <file>exintrin.c</file> + <file>fastinterlck.c</file> + <file>fmutex.c</file> + <file>handle.c</file> + <file>harderr.c</file> + <file>hdlsterm.c</file> + <file>init.c</file> + <file>keyedevt.c</file> + <file>locale.c</file> +  +  + <file>pushlock.c</file> + <file>profile.c</file> + <file>resource.c</file> + <file>rundown.c</file> +  + <file>shutdown.c</file> +  + <file>time.c</file> +  + <file>uuid.c</file> + <file>win32k.c</file> + <file>work.c</file> + <file>xipdisp.c</file> + <file>zone.c</file> + </directory> + <directory name="fsrtl"> + <file>dbcsname.c</file> + <file>fastio.c</file> + <file>faulttol.c</file> + <file>filelock.c</file> + <file>filter.c</file> + <file>filtrctx.c</file> + <file>fsfilter.c</file> + <file>fsrtlpc.c</file> + <file>largemcb.c</file> + <file>name.c</file> + <file>notify.c</file> + <file>oplock.c</file> + <file>pnp.c</file> + <file>stackovf.c</file> + <file>tunnel.c</file> + <file>unc.c</file> + </directory> + <directory name="fstub"> + <file>disksup.c</file> + <file>fstubex.c</file> + <file>halstub.c</file> + </directory> + <directory name="inbv"> + <file>inbv.c</file> + </directory> + <directory name="io"> + <directory name="iomgr"> + <file>adapter.c</file> + <file>arcname.c</file> + <file>bootlog.c</file> + <file>controller.c</file> + <file>device.c</file> + <file>deviface.c</file> + <file>driver.c</file> + <file>drvrlist.c</file> + <file>error.c</file> + <file>file.c</file> +  + <file>ioevent.c</file> + <file>iofunc.c</file> + <file>iomdl.c</file> + <file>iomgr.c</file> + <file>iorsrce.c</file> + <file>iotimer.c</file> + <file>iowork.c</file> + <file>irp.c</file> + <file>irq.c</file> + <file>ramdisk.c</file> + <file>rawfs.c</file> + <file>remlock.c</file> +  + <file>symlink.c</file> + <file>volume.c</file> + </directory> + <directory name="pnpmgr"> + <file>plugplay.c</file> + <file>pnpdma.c</file> + <file>pnpmgr.c</file> + <file>pnpnotify.c</file> + <file>pnpreport.c</file> + <file>pnproot.c</file> + </directory> + </directory> + <if property="_WINKD_" value="0"> + <directory name="kdbg"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <if property="KDBG" value="1"> + <group> + <file>i386-dis.c</file> + <file>kdb_help.S</file> + <file>longjmp.S</file> + <file>setjmp.S</file> + </group> + </if> + </directory> + </if> + <if property="KDBG" value="1"> +  +  + <file>kdb_expr.c</file> + <file>kdb_keyboard.c</file> + <file>kdb_serial.c</file> + </if> + <if property="DBG_OR_KDBG" value="true"> + <file>kdb_symbols.c</file> + </if> + </directory> + <directory name="kd"> + <directory name="wrappers"> + <file>bochs.c</file> + <if property="ARCH" value="i386"> + <file>gdbstub.c</file> + </if> + <if property="ARCH" value="powerpc"> + <file>gdbstub_powerpc.c</file> + </if> + <file>kdbg.c</file> + </directory> + <file>kdinit.c</file> + <file>kdio.c</file> + <file>kdmain.c</file> + </directory> + </if> + <if property="_WINKD_" value ="1"> + <directory name="kd64"> + <file>kdapi.c</file> + <file>kdbreak.c</file> + <file>kddata.c</file> + <file>kdinit.c</file> + <file>kdlock.c</file> + <file>kdprint.c</file> + <file>kdtrap.c</file> + </directory> + </if> + <directory name="lpc"> + <file>close.c</file> + <file>complete.c</file> + <file>connect.c</file> + <file>create.c</file> + <file>listen.c</file> + <file>port.c</file> + <file>reply.c</file> + <file>send.c</file> + </directory> + <directory name="mm"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>page.c</file> + </directory> + </if> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>stubs.c</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file>pfault.c</file> + <file>page.c</file> + </directory> + </if> + <file>anonmem.c</file> + <file>aspace.c</file> + <file>balance.c</file> +  + <file>drvlck.c</file> + <file>freelist.c</file> +  + <file>kmap.c</file> + <file>marea.c</file> +  +  +  + <file>mpw.c</file> +  + <file>npool.c</file> + <file>pagefile.c</file> + <file>pageop.c</file> + <file>pager.c</file> + <file>pagfault.c</file> + <file>paging.c</file> + <file>pe.c</file> + <file>physical.c</file> +  + <file>ppool.c</file> +  +  + <file>rmap.c</file> +  + <file>sysldr.c</file> + <file>verifier.c</file> +  + <file>wset.c</file> + <if property="_ELF_" value="1"> + <file>elf32.c</file> + <file>elf64.c</file> + </if> + </directory> + <directory name="ob"> + <file>obdir.c</file> + <file>obinit.c</file> + <file>obhandle.c</file> + <file>obname.c</file> + <file>oblife.c</file> + <file>obref.c</file> + <file>obsdcach.c</file> + <file>obsecure.c</file> + <file>oblink.c</file> + <file>obwait.c</file> + </directory> + <directory name="po"> + <file>power.c</file> + <file>events.c</file> + </directory> + <directory name="ps"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>psctx.c</file> + </directory> + </if> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>psctx.c</file> + </directory> + </if> + <file>debug.c</file> + <file>job.c</file> + <file>kill.c</file> + <file>psnotify.c</file> + <file>process.c</file> + <file>psmgr.c</file> + <file>query.c</file> + <file>quota.c</file> + <file>security.c</file> + <file>state.c</file> +  +  + </directory> + <directory name="rtl"> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>rtlexcpt.c</file> + </directory> + </if> +  + <file>misc.c</file> + <file>strtok.c</file> + </directory> + <directory name="se"> + <file>access.c</file> + <file>acl.c</file> + <file>audit.c</file> + <file>lsa.c</file> + <file>priv.c</file> + <file>sd.c</file> + <file>semgr.c</file> + <file>sid.c</file> +  + </directory> + <directory name="vdm"> + <if property="ARCH" value="i386"> + <file>vdmmain.c</file> + <file>vdmexec.c</file> + </if> + </directory> + <directory name="wmi"> + <file>wmi.c</file> + </directory> + <file>ntoskrnl.rc</file> + <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> +</module> + Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jul 27 17:07:36 2008 @@ -36,7 +36,6 @@ <directory name="include"> <pch>ntoskrnl.h</pch> </directory> - <file>amd64stubs.c</file> <directory name="ke"> <if property="ARCH" value="i386"> <directory name="i386"> @@ -88,15 +87,9 @@ <file>ctxhelp.S</file> </directory> </if> - <if property="ARCH" value="amd64"> - <directory name="amd64"> - <file first="true">boot.S</file> - <file>kiinit.c</file> - </directory> - </if> <file>apc.c</file> <file>balmgr.c</file> -  + <file>bug.c</file> <file>clock.c</file> <file>config.c</file> <file>devqueue.c</file> @@ -170,7 +163,7 @@ </directory> <directory name="dbgk"> <file>dbgkutil.c</file> -  + <file>dbgkobj.c</file> </directory> <directory name="ex" root="intermediate"> <file>zw.S</file> @@ -187,7 +180,7 @@ <file>callback.c</file> <file>dbgctrl.c</file> <file>efi.c</file> -  + <file>event.c</file> <file>evtpair.c</file> <file>exintrin.c</file> <file>fastinterlck.c</file> @@ -198,17 +191,17 @@ <file>init.c</file> <file>keyedevt.c</file> <file>locale.c</file> -  -  + <file>lookas.c</file> + <file>mutant.c</file> <file>pushlock.c</file> <file>profile.c</file> <file>resource.c</file> <file>rundown.c</file> -  + <file>sem.c</file> <file>shutdown.c</file> -  + <file>sysinfo.c</file> <file>time.c</file> -  + <file>timer.c</file> <file>uuid.c</file> <file>win32k.c</file> <file>work.c</file> @@ -253,7 +246,7 @@ <file>drvrlist.c</file> <file>error.c</file> <file>file.c</file> -  + <file>iocomp.c</file> <file>ioevent.c</file> <file>iofunc.c</file> <file>iomdl.c</file> @@ -266,7 +259,7 @@ <file>ramdisk.c</file> <file>rawfs.c</file> <file>remlock.c</file> -  + <file>util.c</file> <file>symlink.c</file> <file>volume.c</file> </directory> @@ -294,8 +287,8 @@ </directory> </if> <if property="KDBG" value="1"> -  -  + <file>kdb.c</file> + <file>kdb_cli.c</file> <file>kdb_expr.c</file> <file>kdb_keyboard.c</file> <file>kdb_serial.c</file> @@ -361,17 +354,17 @@ <file>anonmem.c</file> <file>aspace.c</file> <file>balance.c</file> -  + <file>cont.c</file> <file>drvlck.c</file> <file>freelist.c</file> -  + <file>iospace.c</file> <file>kmap.c</file> <file>marea.c</file> -  -  -  + <file>mdlsup.c</file> + <file>mm.c</file> + <file>mminit.c</file> <file>mpw.c</file> -  + <file>ncache.c</file> <file>npool.c</file> <file>pagefile.c</file> <file>pageop.c</file> @@ -380,15 +373,15 @@ <file>paging.c</file> <file>pe.c</file> <file>physical.c</file> -  + <file>pool.c</file> <file>ppool.c</file> -  -  + <file>procsup.c</file> + <file>region.c</file> <file>rmap.c</file> -  + <file>section.c</file> <file>sysldr.c</file> <file>verifier.c</file> -  + <file>virtual.c</file> <file>wset.c</file> <if property="_ELF_" value="1"> <file>elf32.c</file> @@ -432,8 +425,8 @@ <file>quota.c</file> <file>security.c</file> <file>state.c</file> -  -  + <file>thread.c</file> + <file>win32.c</file> </directory> <directory name="rtl"> <if property="ARCH" value="arm"> @@ -441,7 +434,7 @@ <file>rtlexcpt.c</file> </directory> </if> -  + <file>libsupp.c</file> <file>misc.c</file> <file>strtok.c</file> </directory> @@ -454,7 +447,7 @@ <file>sd.c</file> <file>semgr.c</file> <file>sid.c</file> -  + <file>token.c</file> </directory> <directory name="vdm"> <if property="ARCH" value="i386">

1 0

[tkreuzer] 34862: yet another advapi32 fix
by tkreuzer＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: tkreuzer Date: Sun Jul 27 17:05:13 2008 New Revision: 34862 URL: http://svn.reactos.org/svn/reactos?rev=34862&view=rev Log: yet another advapi32 fix Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sun Jul 27 17:05:13 2008 @@ -224,7 +224,7 @@ @ stub FlushTraceW @ stub FreeEncryptedFileKeyInfo @ stub FreeEncryptionCertificateHashList - @ stub FreeInheritedFromArray + @ stdcall FreeInheritedFromArray(ptr long ptr) @ stdcall FreeSid(ptr) @ stub GetAccessPermissionsForObjectA @ stub GetAccessPermissionsForObjectW @@ -244,7 +244,7 @@ @ stub GetInformationCodeAuthzLevelW @ stub GetInformationCodeAuthzPolicyW @ stub GetInheritanceSourceA - @ stub GetInheritanceSourceW + @ stdcall GetInheritanceSourceW (ptr long long long ptr long ptr ptr ptr ptr) @ stdcall GetKernelObjectSecurity(long long ptr long ptr) @ stdcall GetLengthSid(ptr) @ stub GetLocalManagedApplicationData

1 0

[pschweitzer] 34860: Fixed some kernel exports
by pschweitzer＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: pschweitzer Date: Sun Jul 27 16:19:15 2008 New Revision: 34860 URL: http://svn.reactos.org/svn/reactos?rev=34860&view=rev Log: Fixed some kernel exports Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ntoskrnl_ar… ============================================================================== --- branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] Sun Jul 27 16:19:15 2008 @@ -187,10 +187,10 @@ FsRtlDeleteKeyFromTunnelCache FsRtlDeleteTunnelCache FsRtlDeregisterUncProvider -FsRtlDissectDbcs -FsRtlDissectName -FsRtlDoesDbcsContainWildCards -FsRtlDoesNameContainWildCards +FsRtlDissectDbcs@16 +FsRtlDissectName@16 +FsRtlDoesDbcsContainWildCards@4 +FsRtlDoesNameContainWildCards@4 FsRtlFastCheckLockForRead FsRtlFastCheckLockForWrite FsRtlFastUnlockAll Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ntoskrnl_i3… ============================================================================== --- branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Sun Jul 27 16:19:15 2008 @@ -204,9 +204,9 @@ FsRtlDeleteKeyFromTunnelCache FsRtlDeleteTunnelCache FsRtlDeregisterUncProvider -FsRtlDissectDbcs +FsRtlDissectDbcs@16 FsRtlDissectName@16 -FsRtlDoesDbcsContainWildCards +FsRtlDoesDbcsContainWildCards@4 FsRtlDoesNameContainWildCards@4 FsRtlFastCheckLockForRead FsRtlFastCheckLockForWrite

2 1

[tkreuzer] 34861: advapi32: fix a forwarded export that got stubbed when changing to spec
by tkreuzer＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: tkreuzer Date: Sun Jul 27 16:33:32 2008 New Revision: 34861 URL: http://svn.reactos.org/svn/reactos?rev=34861&view=rev Log: advapi32: fix a forwarded export that got stubbed when changing to spec Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sun Jul 27 16:33:32 2008 @@ -415,7 +415,7 @@ @ stub MakeAbsoluteSD2 @ stdcall MakeAbsoluteSD(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall MakeSelfRelativeSD(ptr ptr ptr) - @ stub MapGenericMask #(ptr ptr) + @ stdcall MapGenericMask (ptr ptr) NTDLL.RtlMapGenericMask @ stdcall NotifyBootConfigStatus(long) @ stdcall NotifyChangeEventLog (long long) @ stdcall ObjectCloseAuditAlarmA(str ptr long)

1 0

[ros-arm-bringup] 34859: - Fix a couple of bugs, and majorly refactor MmDeleteVirtualMapping to sync it to the x86 version somewhat more.
by ros-arm-bringup＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: ros-arm-bringup Date: Sun Jul 27 15:58:23 2008 New Revision: 34859 URL: http://svn.reactos.org/svn/reactos?rev=34859&view=rev Log: - Fix a couple of bugs, and majorly refactor MmDeleteVirtualMapping to sync it to the x86 version somewhat more. Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c 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] Sun Jul 27 15:58:23 2008 @@ -569,80 +569,42 @@ { PMMPTE PointerPte; MMPTE Pte; + PFN_NUMBER Pfn = 0; // // Get the PTE // PointerPte = MiGetPageTableForProcess(NULL, Address, FALSE); - if (!PointerPte) - { - // - // Invalid PDE - // - if (WasDirty) *WasDirty = FALSE; - if (Page) *Page = 0; - return; - } - - // - // Save the PTE - // - Pte = *PointerPte; - if (PointerPte->u.Hard.L1.Fault.Type == FaultPte) - { - // - // Invalid PTE - // - if (WasDirty) *WasDirty = FALSE; - if (Page) *Page = 0; - return; - } - - // - // Destroy the PTE - // - PointerPte->u.Hard.AsUlong = 0; - ASSERT(PointerPte->u.Hard.L2.Fault.Type == FaultPte); - - // - // Flush the TLB - // - MiFlushTlb(PointerPte, Address); - - // - // Check if the PTE was valid - // - if (Pte.u.Hard.L2.Fault.Type != FaultPte) - { - // - // Mark the page as unmapped - // - MmMarkPageUnmapped(Pte.u.Hard.L2.Small.BaseAddress); - } - else - { - // - // Make it sane - // - Pte.u.Hard.L2.Small.BaseAddress = 0; - } - - // - // Check if this was our page, and valid - // - if ((FreePage) && (Pte.u.Hard.L2.Fault.Type != FaultPte)) - { - // - // Release it - // - MmReleasePageMemoryConsumer(MC_NPPOOL, Pte.u.Hard.L2.Small.BaseAddress); + if (PointerPte) + { + // + // Save and destroy the PTE + // + Pte = *PointerPte; + PointerPte->u.Hard.AsUlong = 0; + + // + // Flush the TLB + // + MiFlushTlb(PointerPte, Address); + + // + // Unmap the PFN + // + Pfn = Pte.u.Hard.L2.Small.BaseAddress; + if (Pfn) MmMarkPageUnmapped(Pfn); + + // + // Release the PFN if it was ours + // + if ((FreePage) && (Pfn)) MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); } // // Return if the page was dirty // - if (WasDirty) *WasDirty = TRUE; // LIE!!! - if (Page) *Page = Pte.u.Hard.L2.Small.BaseAddress; + if (WasDirty) *WasDirty = FALSE; // LIE!!! + if (Page) *Page = Pfn; } PVOID

1 0

[jmorlan] 34858: - Work with screen buffer data using pointers rather than offsets; remove confusing GET_CELL_BUFFER and SET_CELL_BUFFER macros. - CsrFreeProcessData: Merge two ifs with the same condition. - Use the pointer-to-pointer trick to simplify linked list handling in CsrFreeProcessData, IntInsertAliasHeader, IntInsertAliasEntry, and IntDeleteAliasEntry.
by jmorlan＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: jmorlan Date: Sun Jul 27 15:08:18 2008 New Revision: 34858 URL: http://svn.reactos.org/svn/reactos?rev=34858&view=rev Log: - Work with screen buffer data using pointers rather than offsets; remove confusing GET_CELL_BUFFER and SET_CELL_BUFFER macros. - CsrFreeProcessData: Merge two ifs with the same condition. - Use the pointer-to-pointer trick to simplify linked list handling in CsrFreeProcessData, IntInsertAliasHeader, IntInsertAliasEntry, and IntDeleteAliasEntry. Modified: trunk/reactos/subsystems/win32/csrss/api/process.c trunk/reactos/subsystems/win32/csrss/include/conio.h trunk/reactos/subsystems/win32/csrss/win32csr/alias.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] Sun Jul 27 15:08:18 2008 @@ -129,18 +129,16 @@ { ULONG hash; UINT c; - PCSRSS_PROCESS_DATA pProcessData, pPrevProcessData = NULL; + PCSRSS_PROCESS_DATA pProcessData, *pPrevLink; hash = ((ULONG_PTR)Pid >> 2) % (sizeof(ProcessData) / sizeof(*ProcessData)); + pPrevLink = &ProcessData[hash]; LOCK; - pProcessData = ProcessData[hash]; - - while (pProcessData && pProcessData->ProcessId != Pid) - { - pPrevProcessData = pProcessData; - pProcessData = pProcessData->next; + while ((pProcessData = *pPrevLink) && pProcessData->ProcessId != Pid) + { + pPrevLink = &pProcessData->next; } if (pProcessData) @@ -150,10 +148,6 @@ { NtClose(pProcessData->Process); } - if (pProcessData->Console) - { - RemoveEntryList(&pProcessData->ProcessEntry); - } if (pProcessData->HandleTable) { for (c = 0; c < pProcessData->HandleTableSize; c++) @@ -168,6 +162,7 @@ RtlDeleteCriticalSection(&pProcessData->HandleTableLock); if (pProcessData->Console) { + RemoveEntryList(&pProcessData->ProcessEntry); CsrReleaseObjectByPointer((Object_t *) pProcessData->Console); } if (pProcessData->CsrSectionViewBase) @@ -178,14 +173,7 @@ { NtClose(pProcessData->ServerCommunicationPort); } - if (pPrevProcessData) - { - pPrevProcessData->next = pProcessData->next; - } - else - { - ProcessData[hash] = pProcessData->next; - } + *pPrevLink = pProcessData->next; RtlFreeHeap(CsrssApiHeap, 0, pProcessData); UNLOCK; Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/conio.h [iso-8859-1] Sun Jul 27 15:08:18 2008 @@ -90,7 +90,7 @@ VOID STDCALL ConioDeleteConsole(Object_t *Object); VOID STDCALL ConioDeleteScreenBuffer(Object_t *Buffer); void STDCALL ConioProcessKey(MSG *msg, PCSRSS_CONSOLE Console, BOOL TextMode); -DWORD FASTCALL ConioGetBufferOffset(PCSRSS_SCREEN_BUFFER Buf, ULONG X, ULONG Y); +PBYTE FASTCALL ConioCoordToPointer(PCSRSS_SCREEN_BUFFER Buf, ULONG X, ULONG Y); VOID FASTCALL ConioDrawConsole(PCSRSS_CONSOLE Console); VOID FASTCALL ConioConsoleCtrlEvent(DWORD Event, PCSRSS_PROCESS_DATA ProcessData); VOID FASTCALL ConioConsoleCtrlEventTimeout(DWORD Event, PCSRSS_PROCESS_DATA ProcessData, Modified: trunk/reactos/subsystems/win32/csrss/win32csr/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] Sun Jul 27 15:08:18 2008 @@ -86,35 +86,20 @@ IntInsertAliasHeader(PALIAS_HEADER * RootHeader, PALIAS_HEADER NewHeader) { PALIAS_HEADER CurrentHeader; - PALIAS_HEADER LastHeader = NULL; - - if (*RootHeader == 0) - { - *RootHeader = NewHeader; - return; - } - - CurrentHeader = *RootHeader; - - while(CurrentHeader) + PALIAS_HEADER *LastLink = RootHeader; + + while ((CurrentHeader = *LastLink) != NULL) { INT Diff = _wcsicmp(NewHeader->lpExeName, CurrentHeader->lpExeName); if (Diff < 0) { - if (!LastHeader) - *RootHeader = NewHeader; - else - LastHeader->Next = NewHeader; - - NewHeader->Next = CurrentHeader; - return; + break; } - LastHeader = CurrentHeader; - CurrentHeader = CurrentHeader->Next; + LastLink = &CurrentHeader->Next; } - LastHeader->Next = NewHeader; - NewHeader->Next = NULL; + *LastLink = NewHeader; + NewHeader->Next = CurrentHeader; } PALIAS_ENTRY @@ -144,35 +129,20 @@ IntInsertAliasEntry(PALIAS_HEADER Header, PALIAS_ENTRY NewEntry) { PALIAS_ENTRY CurrentEntry; - PALIAS_ENTRY LastEntry = NULL; - - CurrentEntry = Header->Data; - - if (!CurrentEntry) - { - Header->Data = NewEntry; - NewEntry->Next = NULL; - return; - } - - while(CurrentEntry) + PALIAS_ENTRY *LastLink = &Header->Data; + + while ((CurrentEntry = *LastLink) != NULL) { INT Diff = _wcsicmp(NewEntry->lpSource, CurrentEntry->lpSource); if (Diff < 0) { - if (!LastEntry) - Header->Data = NewEntry; - else - LastEntry->Next = NewEntry; - NewEntry->Next = CurrentEntry; - return; - } - LastEntry = CurrentEntry; - CurrentEntry = CurrentEntry->Next; + break; + } + LastLink = &CurrentEntry->Next; } - LastEntry->Next = NewEntry; - NewEntry->Next = NULL; + *LastLink = NewEntry; + NewEntry->Next = CurrentEntry; } PALIAS_ENTRY @@ -289,28 +259,18 @@ VOID IntDeleteAliasEntry(PALIAS_HEADER Header, PALIAS_ENTRY Entry) { - PALIAS_ENTRY LastEntry; + PALIAS_ENTRY *LastLink = &Header->Data; PALIAS_ENTRY CurEntry; - if (Header->Data == Entry) - { - Header->Data = Entry->Next; - RtlFreeHeap(Win32CsrApiHeap, 0, Entry); - return; - } - LastEntry = Header->Data; - CurEntry = LastEntry->Next; - - while(CurEntry) + while ((CurEntry = *LastLink) != NULL) { if (CurEntry == Entry) { - LastEntry->Next = Entry->Next; + *LastLink = Entry->Next; RtlFreeHeap(Win32CsrApiHeap, 0, Entry); return; } - LastEntry = CurEntry; - CurEntry = CurEntry->Next; + LastLink = &CurEntry->Next; } } VOID Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Sun Jul 27 15:08:18 2008 @@ -83,29 +83,23 @@ ConioConsoleCtrlEventTimeout(Event, ProcessData, 0); } -DWORD FASTCALL -ConioGetBufferOffset(PCSRSS_SCREEN_BUFFER Buff, ULONG X, ULONG Y) -{ - return 2 * (((Y + Buff->VirtualY) % Buff->MaxY) * Buff->MaxX + X); -} - -#define GET_CELL_BUFFER(b,o)\ -(b)->Buffer[(o)++] - -#define SET_CELL_BUFFER(b,o,c,a)\ -(b)->Buffer[(o)++]=(c),\ -(b)->Buffer[(o)++]=(a) +PBYTE FASTCALL +ConioCoordToPointer(PCSRSS_SCREEN_BUFFER Buff, ULONG X, ULONG Y) +{ + return &Buff->Buffer[2 * (((Y + Buff->VirtualY) % Buff->MaxY) * Buff->MaxX + X)]; +} static VOID FASTCALL ClearLineBuffer(PCSRSS_SCREEN_BUFFER Buff) { - DWORD Offset = ConioGetBufferOffset(Buff, 0, Buff->CurrentY); + PBYTE Ptr = ConioCoordToPointer(Buff, 0, Buff->CurrentY); UINT Pos; for (Pos = 0; Pos < Buff->MaxX; Pos++) { - /* Fill the cell: Offset is incremented by the macro */ - SET_CELL_BUFFER(Buff, Offset, ' ', Buff->DefaultAttrib); + /* Fill the cell */ + *Ptr++ = ' '; + *Ptr++ = Buff->DefaultAttrib; } } @@ -433,7 +427,7 @@ CHAR *Buffer, DWORD Length, BOOL Attrib) { UINT i; - DWORD Offset; + PBYTE Ptr; RECT UpdateRect; LONG CursorStartX, CursorStartY; UINT ScrolledLines; @@ -474,8 +468,9 @@ { Buff->CurrentX--; } - Offset = ConioGetBufferOffset(Buff, Buff->CurrentX, Buff->CurrentY); - SET_CELL_BUFFER(Buff, Offset, ' ', Buff->DefaultAttrib); + Ptr = ConioCoordToPointer(Buff, Buff->CurrentX, Buff->CurrentY); + Ptr[0] = ' '; + Ptr[1] = Buff->DefaultAttrib; UpdateRect.left = min(UpdateRect.left, (LONG) Buff->CurrentX); UpdateRect.right = max(UpdateRect.right, (LONG) Buff->CurrentX); } @@ -500,12 +495,11 @@ { EndX = Buff->MaxX; } - Offset = ConioGetBufferOffset(Buff, Buff->CurrentX, Buff->CurrentY); + Ptr = ConioCoordToPointer(Buff, Buff->CurrentX, Buff->CurrentY); while (Buff->CurrentX < EndX) { - Buff->Buffer[Offset] = ' '; - Buff->Buffer[Offset + 1] = Buff->DefaultAttrib; - Offset += 2; + *Ptr++ = ' '; + *Ptr++ = Buff->DefaultAttrib; Buff->CurrentX++; } UpdateRect.right = max(UpdateRect.right, (LONG) Buff->CurrentX - 1); @@ -526,11 +520,11 @@ } UpdateRect.left = min(UpdateRect.left, (LONG)Buff->CurrentX); UpdateRect.right = max(UpdateRect.right, (LONG) Buff->CurrentX); - Offset = ConioGetBufferOffset(Buff, Buff->CurrentX, Buff->CurrentY); - Buff->Buffer[Offset++] = Buffer[i]; + Ptr = ConioCoordToPointer(Buff, Buff->CurrentX, Buff->CurrentY); + Ptr[0] = Buffer[i]; if (Attrib) { - Buff->Buffer[Offset] = Buff->DefaultAttrib; + Ptr[1] = Buff->DefaultAttrib; } Buff->CurrentX++; if (Buff->CurrentX == Buff->MaxX) @@ -786,8 +780,8 @@ } for (i = 0; i < Height; i++) { - PWORD SRow = (PWORD)&ScreenBuffer->Buffer[ConioGetBufferOffset(ScreenBuffer, 0, SY)]; - PWORD DRow = (PWORD)&ScreenBuffer->Buffer[ConioGetBufferOffset(ScreenBuffer, 0, DY)]; + PWORD SRow = (PWORD)ConioCoordToPointer(ScreenBuffer, 0, SY); + PWORD DRow = (PWORD)ConioCoordToPointer(ScreenBuffer, 0, DY); SX = SrcRegion->left; DX = DstRegion->left; @@ -2210,7 +2204,7 @@ COORD BufferCoord; COORD BufferSize; NTSTATUS Status; - DWORD Offset; + PBYTE Ptr; DWORD PSize; DPRINT("CsrWriteConsoleOutput\n"); @@ -2270,19 +2264,20 @@ for (i = 0, Y = WriteRegion.top; Y <= WriteRegion.bottom; i++, Y++) { CurCharInfo = CharInfo + (i + BufferCoord.Y) * BufferSize.X + BufferCoord.X; - Offset = ConioGetBufferOffset(Buff, WriteRegion.left, Y); + Ptr = ConioCoordToPointer(Buff, WriteRegion.left, Y); for (X = WriteRegion.left; X <= WriteRegion.right; X++) { + CHAR AsciiChar; if (Request->Data.WriteConsoleOutputRequest.Unicode) { - CHAR AsciiChar; ConsoleUnicodeCharToAnsiChar(Console, &AsciiChar, &CurCharInfo->Char.UnicodeChar); - SET_CELL_BUFFER(Buff, Offset, AsciiChar, CurCharInfo->Attributes); } else { - SET_CELL_BUFFER(Buff, Offset, CurCharInfo->Char.AsciiChar, CurCharInfo->Attributes); - } + AsciiChar = CurCharInfo->Char.AsciiChar; + } + *Ptr++ = AsciiChar; + *Ptr++ = CurCharInfo->Attributes; CurCharInfo++; } } @@ -2716,7 +2711,8 @@ COORD BufferCoord; RECT ReadRegion; RECT ScreenRect; - DWORD i, Offset; + DWORD i; + PBYTE Ptr; LONG X, Y; UINT CodePage; @@ -2769,20 +2765,20 @@ { CurCharInfo = CharInfo + (i * BufferSize.X); - Offset = ConioGetBufferOffset(Buff, ReadRegion.left, Y); + Ptr = ConioCoordToPointer(Buff, ReadRegion.left, Y); for (X = ReadRegion.left; X < ReadRegion.right; ++X) { if (Request->Data.ReadConsoleOutputRequest.Unicode) { MultiByteToWideChar(CodePage, 0, - (PCHAR)&GET_CELL_BUFFER(Buff, Offset), 1, + (PCHAR)Ptr++, 1, &CurCharInfo->Char.UnicodeChar, 1); } else { - CurCharInfo->Char.AsciiChar = GET_CELL_BUFFER(Buff, Offset); - } - CurCharInfo->Attributes = GET_CELL_BUFFER(Buff, Offset); + CurCharInfo->Char.AsciiChar = *Ptr++; + } + CurCharInfo->Attributes = *Ptr++; ++CurCharInfo; } } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Sun Jul 27 15:08:18 2008 @@ -880,7 +880,7 @@ for (Line = TopLine; Line <= BottomLine; Line++) { - From = Buff->Buffer + ConioGetBufferOffset(Buff, LeftChar, Line); + From = ConioCoordToPointer(Buff, LeftChar, Line); Start = LeftChar; To = GuiData->LineBuffer; @@ -934,7 +934,7 @@ { CursorHeight = 1; } - From = Buff->Buffer + ConioGetBufferOffset(Buff, Buff->CurrentX, Buff->CurrentY) + 1; + From = ConioCoordToPointer(Buff, Buff->CurrentX, Buff->CurrentY) + 1; if (*From != DEFAULT_ATTRIB) { Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] Sun Jul 27 15:08:18 2008 @@ -86,7 +86,7 @@ LONG i; PBYTE Src, SrcEnd; - Src = Buff->Buffer + ConioGetBufferOffset(Buff, Region->left, Region->top); + Src = ConioCoordToPointer(Buff, Region->left, Region->top); SrcDelta = Buff->MaxX * 2; SrcEnd = Buff->Buffer + Buff->MaxY * Buff->MaxX * 2; DestDelta = ConioRectWidth(Region) * 2;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs