Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 34075: - Implement KiComputeTimerTableIndex and stub KeUpdateRunTime und KeUpdateSystemTime. - Hitting checkpoint in trap.c: DPC/Timer Delivery! - Must now implement clock interrupt in HAL.
by ros-arm-bringup＠svn.reactos.org 25 Jun '08

25 Jun '08

Author: ros-arm-bringup Date: Wed Jun 25 00:01:31 2008 New Revision: 34075 URL: http://svn.reactos.org/svn/reactos?rev=34075&view=rev Log: - Implement KiComputeTimerTableIndex and stub KeUpdateRunTime und KeUpdateSystemTime. - Hitting checkpoint in trap.c: DPC/Timer Delivery! - Must now implement clock interrupt in HAL. Modified: trunk/reactos/ntoskrnl/ke/arm/stubs.c trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s Modified: trunk/reactos/ntoskrnl/ke/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] Wed Jun 25 00:01:31 2008 @@ -9,3 +9,38 @@ ULONG KeProcessorLevel; ULONG KeProcessorRevision; ULONG KeFeatureBits; + +ULONG +KiComputeTimerTableIndex(IN LONGLONG DueTime) +{ + ULONG Hand; + DPRINT1("DueTime: %I64x Max: %lx\n", DueTime, KeMaximumIncrement); + + // + // Compute the timer table index + // + Hand = (DueTime / KeMaximumIncrement); + DPRINT1("HAND: %lx\n", Hand); + Hand %= TIMER_TABLE_SIZE; + DPRINT1("HAND: %lx\n", Hand); + return Hand; +} + +VOID +NTAPI +KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, + IN KIRQL Irql, + IN ULONG Increment) +{ + UNIMPLEMENTED; + while (TRUE); +} + +VOID +NTAPI +KeUpdateRunTime(IN PKTRAP_FRAME TrapFrame, + IN KIRQL Irql) +{ + UNIMPLEMENTED; + while (TRUE); +} Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] Wed Jun 25 00:01:31 2008 @@ -25,8 +25,6 @@ GENERATE_ARM_STUB KeSaveStateForHibernate GENERATE_ARM_STUB KeSetDmaIoCoherency GENERATE_ARM_STUB KeSynchronizeExecution -GENERATE_ARM_STUB KeUpdateRunTime -GENERATE_ARM_STUB KeUpdateSystemTime GENERATE_ARM_STUB KeUserModeCallback GENERATE_ARM_STUB NtSetLdtEntries GENERATE_ARM_STUB NtRaiseException @@ -45,7 +43,6 @@ GENERATE_ARM_STUB KiDispatchException GENERATE_ARM_STUB KiSwapProcess GENERATE_ARM_STUB KeSwitchKernelStack -GENERATE_ARM_STUB KiComputeTimerTableIndex // // Traps, Debugging and Execeptions

1 0

[dchapyshev] 34074: - Start implementing MediaClassInstaller function
by dchapyshev＠svn.reactos.org 24 Jun '08

24 Jun '08

Author: dchapyshev Date: Tue Jun 24 10:17:28 2008 New Revision: 34074 URL: http://svn.reactos.org/svn/reactos?rev=34074&view=rev Log: - Start implementing MediaClassInstaller function Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/mmsys.def Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Tue Jun 24 10:17:28 2008 @@ -1,31 +1,14 @@ /* - * ReactOS - * Copyright (C) 2005 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id: main.c 12852 2005-01-06 13:58:04Z mf $ * * PROJECT: ReactOS Multimedia Control Panel - * FILE: lib/cpl/mmsys/mmsys.c + * FILE: dll/cpl/mmsys/mmsys.c * PURPOSE: ReactOS Multimedia Control Panel * PROGRAMMER: Thoams Weidenmueller <w3seek(a)reactos.com> * Dmitry Chapyshev <dmitry(a)reactos.org> * UPDATE HISTORY: * 2005/11/23 Created */ + #include <windows.h> #include <commctrl.h> #include <initguid.h> @@ -153,31 +136,85 @@ DPRINT1("mmseRunOnce() stubs\n"); } +BOOL WINAPI +MediaPropPageProvider(LPVOID Info, + LPFNADDPROPSHEETPAGE PropSheetPage, + LPARAM lParam) +{ + DPRINT1("MediaPropPageProvider() stubs\n"); + return TRUE; +} + +VOID WINAPI +ShowFullControlPanel(HWND hwnd, + HINSTANCE hInstance, + LPTSTR lpszCmd, + int nCmdShow) +{ + DPRINT1("ShowFullControlPanel() stubs\n"); +} + +DWORD +MMSYS_InstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) +{ + return 0x0; +} + +DWORD +MMSYS_RemoveDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) +{ + return 0x0; +} + +DWORD +MMSYS_AllowInstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) +{ + return 0x0; +} + +DWORD +MMSYS_SelectDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) +{ + return 0x0; +} + +DWORD +MMSYS_DetectDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) +{ + return 0x0; +} + +DWORD +MMSYS_SelectBestCompatDRV(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) +{ + return 0x0; +} + DWORD WINAPI MediaClassInstaller(DI_FUNCTION diFunction, HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) { - DPRINT1("MediaClassInstaller() stubs\n"); - return 0x0; -} - -BOOL WINAPI -MediaPropPageProvider(LPVOID Info, - LPFNADDPROPSHEETPAGE PropSheetPage, - LPARAM lParam) -{ - DPRINT1("MediaPropPageProvider() stubs\n"); - return TRUE; -} - -VOID WINAPI -ShowFullControlPanel(HWND hwnd, - HINSTANCE hInstance, - LPTSTR lpszCmd, - int nCmdShow) -{ - DPRINT1("ShowFullControlPanel() stubs\n"); + switch (diFunction) + { + case DIF_INSTALLDEVICE: + return MMSYS_InstallDevice(hDevInfo, pspDevInfoData); + case DIF_REMOVE: + return MMSYS_RemoveDevice(hDevInfo, pspDevInfoData); + case DIF_ALLOW_INSTALL: + return MMSYS_AllowInstallDevice(hDevInfo, pspDevInfoData); + case DIF_SELECTDEVICE: + return MMSYS_SelectDevice(hDevInfo, pspDevInfoData); + case DIF_DETECT: + return MMSYS_DetectDevice(hDevInfo, pspDevInfoData); + case DIF_SELECTBESTCOMPATDRV: + return MMSYS_SelectBestCompatDRV(hDevInfo, pspDevInfoData); + default: + { + DPRINT1("MediaClassInstaller() not supported function\n"); + return 0x0; + } + } } Modified: trunk/reactos/dll/cpl/mmsys/mmsys.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.def?re… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.def [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.def [iso-8859-1] Tue Jun 24 10:17:28 2008 @@ -12,7 +12,7 @@ ShowDriverSettingsAfterFork ShowDriverSettingsAfterForkW ShowDriverSettingsAfterForkA -MediaClassInstaller +MediaClassInstaller@12 MediaPropPageProvider ;Multichannel ShowFullControlPanel

1 0

[cfinck] 34073: Get shell32 to compile warning-free Patch by Stefan Ginsberg with minor modifications by me
by cfinck＠svn.reactos.org 24 Jun '08

24 Jun '08

Author: cfinck Date: Tue Jun 24 09:37:50 2008 New Revision: 34073 URL: http://svn.reactos.org/svn/reactos?rev=34073&view=rev Log: Get shell32 to compile warning-free Patch by Stefan Ginsberg with minor modifications by me Modified: trunk/reactos/dll/win32/shell32/dataobject.c trunk/reactos/dll/win32/shell32/extracticon.c trunk/reactos/dll/win32/shell32/fprop.c trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shfldr_printers.c trunk/reactos/dll/win32/shell32/shlfileop.c trunk/reactos/dll/win32/shell32/shlview.c trunk/reactos/dll/win32/shell32/shv_item_cmenu.c trunk/reactos/dll/win32/shell32/undocshell.h trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/dll/win32/shell32/dataobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dataobje… ============================================================================== --- trunk/reactos/dll/win32/shell32/dataobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dataobject.c [iso-8859-1] Tue Jun 24 09:37:50 2008 @@ -461,7 +461,7 @@ { if (IsEqualIID(riid, &IID_IDataObject)) { - return CIDLData_CreateFromIDArray(pidlFolder, cidl, apidl, ppv); + return CIDLData_CreateFromIDArray(pidlFolder, cidl, apidl, (IDataObject**)ppv); } return E_FAIL; } Modified: trunk/reactos/dll/win32/shell32/extracticon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/extracti… ============================================================================== --- trunk/reactos/dll/win32/shell32/extracticon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/extracticon.c [iso-8859-1] Tue Jun 24 09:37:50 2008 @@ -22,7 +22,7 @@ struct IconExtraction { - ULONG ref; + LONG ref; IDefaultExtractIconInit defaultExtractIconInitImpl; IExtractIconW extractIconWImpl; IExtractIconA extractIconAImpl; @@ -92,7 +92,7 @@ IDefaultExtractIconInit *This) { struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); - ULONG refCount = InterlockedIncrement((PLONG)&s->ref); + ULONG refCount = InterlockedIncrement(&s->ref); TRACE("(%p)\n", This); return refCount; } @@ -106,7 +106,7 @@ TRACE("(%p)\n", This); - refCount = InterlockedDecrement((PLONG)&s->ref); + refCount = InterlockedDecrement(&s->ref); if (refCount == 0) { if (s->defaultIcon.file) CoTaskMemFree(s->defaultIcon.file); 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] Tue Jun 24 09:37:50 2008 @@ -614,7 +614,7 @@ */ BOOL -SH_ShowPropertiesDialog(WCHAR * lpf) +SH_ShowPropertiesDialog(PCWSTR lpf) { PROPSHEETHEADERW pinfo; HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE]; @@ -635,7 +635,7 @@ if (lpf[0] == '"') { /* remove quotes from lpf */ - LPWSTR src = lpf + 1; + LPCWSTR src = lpf + 1; LPWSTR dst = wFileName; while(*src && *src!='"') Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Tue Jun 24 09:37:50 2008 @@ -1,4 +1,4 @@ -<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" allowwarnings="true"> +<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll"> <autoregister infsection="OleControlDlls" type="Both" /> <importlibrary definition="shell32.spec.def" /> <include base="shell32">.</include> Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Tue Jun 24 09:37:50 2008 @@ -246,5 +246,5 @@ HPROPSHEETPAGE SH_CreatePropertySheetPage(LPSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle); BOOL SH_ShowDriveProperties(WCHAR * drive); BOOL SH_ShowRecycleBinProperties(WCHAR sDrive); -BOOL SH_ShowPropertiesDialog(WCHAR * lpf); +BOOL SH_ShowPropertiesDialog(PCWSTR lpf); #endif Modified: trunk/reactos/dll/win32/shell32/shfldr_printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_p… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] Tue Jun 24 09:37:50 2008 @@ -309,7 +309,7 @@ IShellFolder2Vtbl *lpVtbl; IPersistFolder2Vtbl *lpVtblPersistFolder2; - DWORD ref; + LONG ref; CLSID *pclsid; Modified: trunk/reactos/dll/win32/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] Tue Jun 24 09:37:50 2008 @@ -255,14 +255,12 @@ ids->text_resource_id = IDS_DELETESELECTED_TEXT; return TRUE; case ASK_OVERWRITE_FILE: - ids->hIconInstance = NULL; - ids->icon_resource_id = IDI_WARNING; + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; ids->text_resource_id = IDS_OVERWRITEFILE_TEXT; return TRUE; case ASK_OVERWRITE_FOLDER: - ids->hIconInstance = NULL; - ids->icon_resource_id = IDI_WARNING; + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; ids->text_resource_id = IDS_OVERWRITEFOLDER_TEXT; return TRUE; Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Tue Jun 24 09:37:50 2008 @@ -1669,7 +1669,7 @@ return 1; break; case CWM_GETISHELLBROWSER: - return pThis->pShellBrowser; + return (LRESULT)pThis->pShellBrowser; } return DefWindowProcW(hWnd, uMessage, wParam, lParam); } Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c [iso-8859-1] Tue Jun 24 09:37:50 2008 @@ -122,7 +122,7 @@ HRESULT hr; IShellFolder_AddRef(pSFParent); cm->rfg = SFGAO_BROWSABLE | SFGAO_CANCOPY | SFGAO_CANMOVE | SFGAO_CANDELETE | SFGAO_CANRENAME | SFGAO_HASPROPSHEET; - hr = IShellFolder_GetAttributesOf(pSFParent, cidl, apidl, &cm->rfg); + hr = IShellFolder_GetAttributesOf(pSFParent, cidl, (LPCITEMIDLIST *)apidl, &cm->rfg); if (!SUCCEEDED(hr)) cm->rfg = 0; /* No action available */ } @@ -615,7 +615,7 @@ indexMenu = SH_AddStaticEntryToMenu(hmenu, indexMenu, This); SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION); - pDataObj = IDataObject_Constructor(NULL, This->pidl, This->apidl, This->cidl); + pDataObj = IDataObject_Constructor(NULL, This->pidl, (LPCITEMIDLIST *)This->apidl, This->cidl); if (pDataObj) { indexMenu = SH_LoadContextMenuHandlers(This, pDataObj, hmenu, indexMenu); @@ -733,7 +733,7 @@ PathAddBackslashW(szPath); IPersistFolder2_Release(psf); - szTarget = build_paths_list(szPath, This->cidl, This->apidl); + szTarget = build_paths_list(szPath, This->cidl, (LPCITEMIDLIST *)This->apidl); if (pidl) { Modified: trunk/reactos/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshe… ============================================================================== --- trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] Tue Jun 24 09:37:50 2008 @@ -71,15 +71,6 @@ BOOL WINAPI StrRetToStrNA(LPSTR,DWORD,LPSTRRET,const ITEMIDLIST*); BOOL WINAPI StrRetToStrNW(LPWSTR,DWORD,LPSTRRET,const ITEMIDLIST*); - -/**************************************************************************** -* SHChangeNotifyRegister API -*/ -#define SHCNRF_InterruptLevel 0x0001 -#define SHCNRF_ShellLevel 0x0002 -#define SHCNRF_RecursiveInterrupt 0x1000 /* Must be combined with SHCNRF_InterruptLevel */ -#define SHCNRF_NewDelivery 0x8000 /* Messages use shared memory */ - /**************************************************************************** * Shell Common Dialogs */ Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Tue Jun 24 09:37:50 2008 @@ -133,7 +133,7 @@ #define CFSTR_SHELLURL "UniformResourceLocator" #endif -#define CFSTR_FILENAMEW L"FileNameW" +#define CFSTR_FILENAMEW "FileNameW" #define CFSTR_FILENAMEA "FileName" #define CFSTR_FILENAMEMAPA "FileNameMap" /* CF_FILENAMEMAPA */ #define CFSTR_FILENAMEMAPW "FileNameMapW" /* CF_FILENAMEMAPW */

1 0

[ros-arm-bringup] 34072: - Implement MmGetPfnForProcess, MmIsPageSwapEntry. - Fix a bug in MmDeletePageTable. - Use MmCreateVirtualMappingForKernel when we are already in the right process context, and allow it to be used for addresses < KSEG0_BASE as well. - We now have full memory mapped file support, and get all the way to CmInitSystem1.
by ros-arm-bringup＠svn.reactos.org 24 Jun '08

24 Jun '08

Author: ros-arm-bringup Date: Tue Jun 24 09:16:06 2008 New Revision: 34072 URL: http://svn.reactos.org/svn/reactos?rev=34072&view=rev Log: - Implement MmGetPfnForProcess, MmIsPageSwapEntry. - Fix a bug in MmDeletePageTable. - Use MmCreateVirtualMappingForKernel when we are already in the right process context, and allow it to be used for addresses < KSEG0_BASE as well. - We now have full memory mapped file support, and get all the way to CmInitSystem1. 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] Tue Jun 24 09:16:06 2008 @@ -162,22 +162,9 @@ ASSERT(PointerPde->u.Hard.L1.Fault.Type == FaultPte); // - // Check if this is a kernel PDE - // - if ((PointerPde >= (PMMPTE)PTE_BASE) && (PointerPde < (PMMPTE)PTE_BASE + (1024 * 1024))) - { - // - // Invalidate the TLB entry - // - KiFlushSingleTb(TRUE, Address); - } - else - { - // - // Process PDE, unmap it from hyperspace (will also invalidate TLB entry) - // - MmDeleteHyperspaceMapping((PVOID)PAGE_ROUND_DOWN(PointerPde)); - } + // Invalidate the TLB entry + // + KiFlushSingleTb(TRUE, Address); } PFN_TYPE @@ -185,13 +172,41 @@ MmGetPfnForProcess(IN PEPROCESS Process, IN PVOID Address) { - PFN_TYPE Pfn = {0}; - - // - // TODO - // - UNIMPLEMENTED; - return Pfn; + PMMPTE Pte; + + // + // Check if this is for a different process + // + if ((Process) && (Process != PsGetCurrentProcess())) + { + // + // TODO + // + UNIMPLEMENTED; + return 0; + } + + // + // Get the PDE + // + Pte = MiGetPdeAddress(Address); + if (Pte->u.Hard.L1.Fault.Type != FaultPte) + { + // + // Get the PTE + // + Pte = MiGetPteAddress(Address); + } + + // + // If PTE is invalid, return 0 + // + if (Pte->u.Hard.L2.Fault.Type == FaultPte) return 0; + + // + // Return PFN + // + return Pte->u.Hard.L2.Small.BaseAddress; } VOID @@ -323,8 +338,6 @@ // Return whether or not it's valid // return (Pte->u.Hard.L1.Fault.Type != FaultPte); - - } BOOLEAN @@ -332,11 +345,36 @@ MmIsPageSwapEntry(IN PEPROCESS Process, IN PVOID Address) { - // - // TODO - // - UNIMPLEMENTED; - return 0; + PMMPTE Pte; + + // + // Check if this is for a different process + // + if ((Process) && (Process != PsGetCurrentProcess())) + { + // + // TODO + // + UNIMPLEMENTED; + return 0; + } + + // + // Get the PDE + // + Pte = MiGetPdeAddress(Address); + if (Pte->u.Hard.L1.Fault.Type != FaultPte) + { + // + // Get the PTE + // + Pte = MiGetPteAddress(Address); + } + + // + // Return whether or not it's valid + // + return ((Pte->u.Hard.L2.Fault.Type == FaultPte) && (Pte->u.Hard.AsUlong)); } NTSTATUS @@ -351,7 +389,7 @@ NTSTATUS Status; PFN_NUMBER Pfn; DPRINT1("[KMAP]: %p %d\n", Address, PageCount); - ASSERT(Address >= MmSystemRangeStart); + //ASSERT(Address >= MmSystemRangeStart); // // Get our templates @@ -468,7 +506,7 @@ // // Are we only handling the kernel? // - if (!Process) + if (!(Process) || (Process == PsGetCurrentProcess())) { // // Call the kernel version @@ -675,7 +713,6 @@ // KiFlushSingleTb(TRUE, Address); return Pfn; - } VOID

1 0

[janderwald] 34071: - fix typo
by janderwald＠svn.reactos.org 24 Jun '08

24 Jun '08

Author: janderwald Date: Tue Jun 24 07:57:56 2008 New Revision: 34071 URL: http://svn.reactos.org/svn/reactos?rev=34071&view=rev Log: - fix typo Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Tue Jun 24 07:57:56 2008 @@ -26,7 +26,7 @@ ??3@YAXPAX@Z=MSVCRT_operator_delete @19 ??4__non_rtti_object@@QAEAAV0@ABV0@@Z=__thiscall_MSVCRT___non_rtti_object_opequals @20 ??4bad_cast@@QAEAAV0@ABV0@@Z=__thiscall_MSVCRT_bad_cast_opequals @21 - ???4bad_typeid@@QAEAAV0@ABV0@@Z=__thiscall_MSVCRT_bad_typeid_opequals @22 + ??4bad_typeid@@QAEAAV0@ABV0@@Z=__thiscall_MSVCRT_bad_typeid_opequals @22 ??4exception@@QAEAAV0@ABV0@@Z=__thiscall_MSVCRT_exception_opequals @23 ??8type_info@@QBEHABV0@@Z=__thiscall_MSVCRT_type_info_opequals_equals @24 ??9type_info@@QBEHABV0@@Z=__thiscall_MSVCRT_type_info_opnot_equals @25

1 0

[janderwald] 34070: - check for a valid file descriptor
by janderwald＠svn.reactos.org 24 Jun '08

24 Jun '08

Author: janderwald Date: Tue Jun 24 07:42:22 2008 New Revision: 34070 URL: http://svn.reactos.org/svn/reactos?rev=34070&view=rev Log: - check for a valid file descriptor Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Tue Jun 24 07:42:22 2008 @@ -1255,6 +1255,9 @@ { HANDLE hand = fdtoh(fd); FILETIME at, wt; + + if (hand == INVALID_HANDLE_VALUE) + return -1; if (!t) {

1 0

[dchapyshev] 34069: - Add stubs for more functions
by dchapyshev＠svn.reactos.org 24 Jun '08

24 Jun '08

Author: dchapyshev Date: Tue Jun 24 07:00:53 2008 New Revision: 34069 URL: http://svn.reactos.org/svn/reactos?rev=34069&view=rev Log: - Add stubs for more functions Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/mmsys.def Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Tue Jun 24 07:00:53 2008 @@ -33,6 +33,7 @@ #include <setupapi.h> #include <devguid.h> #include <cpl.h> +#include <debug.h> #include "mmsys.h" #include "resource.h" @@ -60,6 +61,125 @@ { {IDI_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, MmSysApplet}, }; + + +HRESULT WINAPI +DllCanUnloadNow(VOID) +{ + DPRINT1("DllCanUnloadNow() stubs\n"); + return S_OK; +} + +HRESULT WINAPI +DllGetClassObject(REFCLSID rclsid, + REFIID riid, + LPVOID *ppv) +{ + DPRINT1("DllGetClassObject() stubs\n"); + return S_OK; +} + + +VOID WINAPI +ShowDriverSettingsAfterForkW(HWND hwnd, + HINSTANCE hInstance, + LPWSTR lpszCmd, + int nCmdShow) +{ + DPRINT1("ShowDriverSettingsAfterForkW() stubs\n"); +} + +VOID WINAPI +ShowDriverSettingsAfterForkA(HWND hwnd, + HINSTANCE hInstance, + LPTSTR lpszCmd, + int nCmdShow) +{ + DPRINT1("ShowDriverSettingsAfterForkA() stubs\n"); +} + +VOID WINAPI +ShowDriverSettingsAfterFork(HWND hwnd, + HINSTANCE hInstance, + LPTSTR lpszCmd, + int nCmdShow) +{ + DPRINT1("ShowDriverSettingsAfterFork() stubs\n"); +} + +BOOL WINAPI +ShowMMCPLPropertySheet(HWND hwnd, + LPCTSTR pszPropSheet, + LPTSTR pszName, + LPTSTR pszCaption) +{ + DPRINT1("ShowMMCPLPropertySheet() stubs\n"); + return TRUE; +} + +VOID WINAPI +ShowAudioPropertySheet(HWND hwnd, + HINSTANCE hInstance, + LPTSTR lpszCmd, + int nCmdShow) +{ + DPRINT1("ShowAudioPropertySheet() stubs\n"); +} + +VOID WINAPI +mmseRunOnceW(HWND hwnd, + HINSTANCE hInstance, + LPWSTR lpszCmd, + int nCmdShow) +{ + DPRINT1("mmseRunOnceW() stubs\n"); +} + +VOID WINAPI +mmseRunOnceA(HWND hwnd, + HINSTANCE hInstance, + LPTSTR lpszCmd, + int nCmdShow) +{ + DPRINT1("mmseRunOnceA() stubs\n"); +} + +VOID WINAPI +mmseRunOnce(HWND hwnd, + HINSTANCE hInstance, + LPSTR lpszCmd, + int nCmdShow) +{ + DPRINT1("mmseRunOnce() stubs\n"); +} + +DWORD WINAPI +MediaClassInstaller(DI_FUNCTION diFunction, + HDEVINFO hDevInfo, + PSP_DEVINFO_DATA pspDevInfoData) +{ + DPRINT1("MediaClassInstaller() stubs\n"); + return 0x0; +} + +BOOL WINAPI +MediaPropPageProvider(LPVOID Info, + LPFNADDPROPSHEETPAGE PropSheetPage, + LPARAM lParam) +{ + DPRINT1("MediaPropPageProvider() stubs\n"); + return TRUE; +} + +VOID WINAPI +ShowFullControlPanel(HWND hwnd, + HINSTANCE hInstance, + LPTSTR lpszCmd, + int nCmdShow) +{ + DPRINT1("ShowFullControlPanel() stubs\n"); +} + /* Hardware property page dialog callback */ static INT_PTR CALLBACK Modified: trunk/reactos/dll/cpl/mmsys/mmsys.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.def?re… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.def [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.def [iso-8859-1] Tue Jun 24 07:00:53 2008 @@ -2,19 +2,19 @@ EXPORTS CPlApplet@16 -;mmseRunOnce -;mmseRunOnceW -;mmseRunOnceA -;ShowMMCPLPropertySheet -;ShowAudioPropertySheet -;DllCanUnloadNow -;DllGetClassObject -;ShowDriverSettingsAfterFork -;ShowDriverSettingsAfterForkW -;ShowDriverSettingsAfterForkA -;MediaClassInstaller -;MediaPropPageProvider +mmseRunOnce +mmseRunOnceW +mmseRunOnceA +ShowMMCPLPropertySheet +ShowAudioPropertySheet +DllCanUnloadNow +DllGetClassObject +ShowDriverSettingsAfterFork +ShowDriverSettingsAfterForkW +ShowDriverSettingsAfterForkA +MediaClassInstaller +MediaPropPageProvider ;Multichannel -;ShowFullControlPanel +ShowFullControlPanel ; EOF

1 0

[dchapyshev] 34068: - Activate default layout on startup
by dchapyshev＠svn.reactos.org 24 Jun '08

24 Jun '08

Author: dchapyshev Date: Tue Jun 24 04:59:35 2008 New Revision: 34068 URL: http://svn.reactos.org/svn/reactos?rev=34068&view=rev Log: - Activate default layout on startup Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Tue Jun 24 04:59:35 2008 @@ -395,6 +395,8 @@ AddTrayIcon(hwnd); hRightPopupMenu = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0); + ActivateLayout(hwnd, ulCurrentLayoutNum); + return 0; } @@ -484,10 +486,10 @@ case WM_SETTINGCHANGE: { - if (wParam == SPI_SETDEFAULTINPUTLANG) - { - //FIXME: Should detect default language changes by CPL applet or by other tools and update UI - } + if (wParam == SPI_SETDEFAULTINPUTLANG) + { + //FIXME: Should detect default language changes by CPL applet or by other tools and update UI + } } break;

1 0

[dreimer] 34067: Add Rbuild files for WineTestGUI. I had to disable the Icons to be able to build it. They seem to be invalid.
by dreimer＠svn.reactos.org 24 Jun '08

24 Jun '08

Author: dreimer Date: Tue Jun 24 04:05:56 2008 New Revision: 34067 URL: http://svn.reactos.org/svn/reactos?rev=34067&view=rev Log: Add Rbuild files for WineTestGUI. I had to disable the Icons to be able to build it. They seem to be invalid. Added: trunk/rostests/winetests/GUI/GUI.rbuild (with props) Modified: trunk/rostests/winetests/GUI/rsrc.rc Added: trunk/rostests/winetests/GUI/GUI.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/GUI.rbuild?… ============================================================================== --- trunk/rostests/winetests/GUI/GUI.rbuild (added) +++ trunk/rostests/winetests/GUI/GUI.rbuild [iso-8859-1] Tue Jun 24 04:05:56 2008 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="GUI" type="win32gui" installbase="system32" installname="testGUI.exe" allowwarnings="true" unicode="yes"> + <include base="GUI">.</include> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>gdi32</library> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <file>browsewnd.c</file> + <file>mainwnd.c</file> + <file>misc.c</file> + <file>WinetestsGUI.rc</file> + <pch>precomp.h</pch> +</module> Propchange: trunk/rostests/winetests/GUI/GUI.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/GUI/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/rsrc.rc?rev… ============================================================================== --- trunk/rostests/winetests/GUI/rsrc.rc [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/rsrc.rc [iso-8859-1] Tue Jun 24 04:05:56 2008 @@ -3,8 +3,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -IDI_ICON ICON "res/main.ico" -IDI_TESTS ICON "res/tests.ico" +//IDI_ICON ICON "res/main.ico" +//IDI_TESTS ICON "res/tests.ico" //#include "lang/bg-BG.rc" //#include "lang/ca-ES.rc"

1 0

[dchapyshev] 34066: - Update Russian translation
by dchapyshev＠svn.reactos.org 24 Jun '08

24 Jun '08

Author: dchapyshev Date: Tue Jun 24 03:10:16 2008 New Revision: 34066 URL: http://svn.reactos.org/svn/reactos?rev=34066&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Tue Jun 24 03:10:16 2008 @@ -263,13 +263,13 @@ IDS_PETABYTE "Ïá ÎÇÓ" IDS_VARIABLE "Ïåðåìåííàÿ" IDS_VALUE "Çíà÷åíèå" - IDS_NO_DUMP "(None)" - IDS_MINI_DUMP "Minidump(64KB)" - IDS_KERNEL_DUMP "Kernel dump" - IDS_FULL_DUMP "Complete dump" - IDS_USERPROFILE_NAME "Name" - IDS_USERPROFILE_SIZE "Size" - IDS_USERPROFILE_TYPE "Type" - IDS_USERPROFILE_STATUS "Status" - IDS_USERPROFILE_MODIFIED "Modified" -END + IDS_NO_DUMP "(íåò)" + IDS_MINI_DUMP "Ìàëûé äàìï(64Êá)" + IDS_KERNEL_DUMP "Äàìï ÿäðà" + IDS_FULL_DUMP "Ïîëíûé äàìï" + IDS_USERPROFILE_NAME "Èìÿ" + IDS_USERPROFILE_SIZE "Ðàçìåð" + IDS_USERPROFILE_TYPE "Òèï" + IDS_USERPROFILE_STATUS "Ñîñòîÿíèå" + IDS_USERPROFILE_MODIFIED "Èçìåíåí" +END

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