Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[gvg] 17389: Have vmwinst add back the registry entries which were so brutally removed.

by gvg＠svn.reactos.com

Have vmwinst add back the registry entries which were so brutally removed. This doesn't fix the problem completely though, blocked by the problem described here: http://reactos.com:8080/archives/public/ros-dev/2005-August/004558.html Modified: trunk/reactos/subsys/system/vmwinst/En.rc Added: trunk/reactos/subsys/system/vmwinst/vmware.inf Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.h Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.rc Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.xml _____ Modified: trunk/reactos/subsys/system/vmwinst/En.rc --- trunk/reactos/subsys/system/vmwinst/En.rc 2005-08-14 20:22:37 UTC (rev 17388) +++ trunk/reactos/subsys/system/vmwinst/En.rc 2005-08-14 21:44:58 UTC (rev 17389) @@ -95,6 +95,7 @@ IDS_FAILEDTOSELVGADRIVER "Failed to activate the ReactOS VGA driver!" IDS_FAILEDTOSELVBEDRIVER "Failed to activate the ReactOS VBE driver!" IDS_UNINSTNOTICE "The VMware(r) SVGA driver files have not yet been deleted.\nPlease delete them manually after a system reboot." + IDS_FAILEDTOADDREGENTRIES "Failed to create registry entries for the VMware(r) SVGA driver!" END STRINGTABLE _____ Added: trunk/reactos/subsys/system/vmwinst/vmware.inf --- trunk/reactos/subsys/system/vmwinst/vmware.inf 2005-08-14 20:22:37 UTC (rev 17388) +++ trunk/reactos/subsys/system/vmwinst/vmware.inf 2005-08-14 21:44:58 UTC (rev 17389) @@ -0,0 +1,32 @@ +[version] +signature="$CHICAGO$" + +[DefaultInstall] +AddReg=VMXReg + +[VMXReg] +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","ErrorControl",0x0001 0001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","Group",0x00000000,"V ideo" +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","ImagePath",0x0002000 0,"system32\drivers\vmx_svga.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","Start",0x00010001,0x 00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","Type",0x00010001,0x0 0000001 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","InstalledDis playDrivers",0x00010000,"vmx_fb" +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.0 ",0x00000001,36,34,30,78,34,38,30,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.1 ",0x00000001,38,30,30,78,36,30,30,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.2 ",0x00000001,31,30,32,34,78,37,36,38,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.3 ",0x00000001,31,31,35,32,78,38,36,34,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.4 ",0x00000001,31,32,38,30,78,39,36,30,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.5 ",0x00000001,31,32,38,30,78,31,30,32,34,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.6 ",0x00000001,31,34,30,30,78,31,30,35,30,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.7 ",0x00000001,31,36,30,30,78,31,32,30,30,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.8 ",0x00000001,31,37,39,32,78,31,33,34,34,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.9 ",0x00000001,31,38,35,36,78,31,33,39,32,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.1 0",0x00000001,31,39,32,30,78,31,34,34,30,00 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","De faultSettings.Flags",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","De faultSettings.VRefresh",0x00010001,85 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","De faultSettings.XPanning",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","De faultSettings.YPanning",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","De faultSettings.BitsPerPel",0x00010001,16 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","De faultSettings.XResolution",0x00010001,800 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","De faultSettings.YResolution",0x00010001,600 +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_15AD&DEV_0405&SUBSYS_040515 AD&REV_00\0000","Service",0x00000000,"vmx_svga" Property changes on: trunk/reactos/subsys/system/vmwinst/vmware.inf ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + CRLF _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c --- trunk/reactos/subsys/system/vmwinst/vmwinst.c 2005-08-14 20:22:37 UTC (rev 17388) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.c 2005-08-14 21:44:58 UTC (rev 17389) @@ -32,6 +32,10 @@ #include <string.h> #include "vmwinst.h" +extern VOID CALLBACK InstallHinfSectionW(HWND hwnd, HINSTANCE ModuleHandle, + PCWSTR CmdLineBuffer, INT nCmdShow); + + HINSTANCE hAppInstance; BOOL StartVMwConfigWizard, DriverFilesFound, ActivateVBE = FALSE, UninstallDriver = FALSE; @@ -382,6 +386,79 @@ return TRUE; } +/* Make sure the required registry entries are present */ +BOOL +AddVmwareRegistryEntries() +{ + HRSRC VmwareInfResource; + HGLOBAL VmwareInfMem; + PVOID VmwareInfLocked; + DWORD Size; + WCHAR TempPath[MAX_PATH]; + WCHAR BufferSize; + WCHAR TempFileName[MAX_PATH]; + HANDLE TempFile; + DWORD Written; + WCHAR CmdLine[19 + MAX_PATH]; + + VmwareInfResource = FindResourceW(hAppInstance, + MAKEINTRESOURCE(IDR_VMWARE_INF), + L"RT_INF"); + if (NULL == VmwareInfResource) + { + return FALSE; + } + Size = SizeofResource(hAppInstance, VmwareInfResource); + if (0 == Size) + { + return FALSE; + } + VmwareInfMem = LoadResource(hAppInstance, VmwareInfResource); + if (NULL == VmwareInfMem) + { + return FALSE; + } + VmwareInfLocked = LockResource(VmwareInfMem); + if (NULL == VmwareInfLocked) + { + return FALSE; + } + + BufferSize = GetTempPathW(sizeof(TempPath) / sizeof(TempPath[0]), TempPath); + if (0 == BufferSize || sizeof(TempPath) / sizeof(TempPath[0]) < BufferSize) + { + return FALSE; + } + if (0 == GetTempFileNameW(TempPath, L"vmx", 0, TempFileName)) + { + return FALSE; + } + + TempFile = CreateFileW(TempFileName, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + if (INVALID_HANDLE_VALUE == TempFile) + { + DeleteFile(TempFileName); + return FALSE; + } + if (! WriteFile(TempFile, VmwareInfLocked, Size, &Written, NULL) || + Written != Size) + { + CloseHandle(TempFile); + DeleteFile(TempFileName); + return FALSE; + } + CloseHandle(TempFile); + + wcscpy(CmdLine, L"DefaultInstall 128 "); + wcscat(CmdLine, TempFileName); + InstallHinfSectionW(NULL, NULL, CmdLine, 0); + + DeleteFile(TempFileName); + + return TRUE; +} + /* GUI */ void @@ -426,8 +503,16 @@ { if(DriverFilesFound) { - if(!EnableVmwareDriver(FALSE, FALSE, TRUE)) + if(!AddVmwareRegistryEntries()) { + WCHAR Msg[1024]; + LoadString(hAppInstance, IDS_FAILEDTOADDREGENTRIES, Msg, sizeof(Msg) / sizeof(WCHAR)); + MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE); + return TRUE; + } + if(!EnableVmwareDriver(TRUE, TRUE, TRUE)) + { WCHAR Msg[1024]; LoadString(hAppInstance, IDS_FAILEDTOACTIVATEDRIVER, Msg, sizeof(Msg) / sizeof(WCHAR)); @@ -548,7 +633,7 @@ if(AbortInstall != 0) goto done; PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_ENABLINGDRIVER, 0); - if(!EnableVmwareDriver(FALSE, FALSE, TRUE)) + if(!EnableVmwareDriver(TRUE, TRUE, TRUE)) { PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOACTIVATEDRIVER, 0); goto cleanup; @@ -935,7 +1020,7 @@ } ActivateVBE = (SendDlgItemMessage(hwndDlg, IDC_VBE, BM_GETCHECK, 0, 0) == BST_CHECKED); if(!EnableVmwareDriver(ActivateVBE, - !ActivateVBE, + TRUE, FALSE)) { WCHAR Msg[1024]; @@ -984,7 +1069,7 @@ if(UninstallDriver) { if(!EnableVmwareDriver(ActivateVBE, - !ActivateVBE, + TRUE, FALSE)) { WCHAR Msg[1024]; _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.h --- trunk/reactos/subsys/system/vmwinst/vmwinst.h 2005-08-14 20:22:37 UTC (rev 17388) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.h 2005-08-14 21:44:58 UTC (rev 17389) @@ -26,6 +26,7 @@ #define IDS_FAILEDTOSELVGADRIVER 104 #define IDS_FAILEDTOSELVBEDRIVER 105 #define IDS_UNINSTNOTICE 106 +#define IDS_FAILEDTOADDREGENTRIES 107 #define IDS_SEARCHINGFORCDROM 201 #define IDS_COPYINGFILES 202 @@ -67,4 +68,6 @@ #define IDD_DOUNINSTALLTITLE 361 #define IDD_DOUNINSTALLSUBTITLE 362 +#define IDR_VMWARE_INF 400 + #endif /* __VMWINST_H */ _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.rc --- trunk/reactos/subsys/system/vmwinst/vmwinst.rc 2005-08-14 20:22:37 UTC (rev 17388) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.rc 2005-08-14 21:44:58 UTC (rev 17389) @@ -16,7 +16,10 @@ IDB_WATERMARK BITMAP "resources/watermark.bmp" IDB_HEADER BITMAP "resources/header.bmp" +/* The vmware.inf file */ +IDR_VMWARE_INF RT_INF "vmware.inf" + /* * Everything specific to any language goes in one of the specific * files. Note that you can and may override resources which also have _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.xml --- trunk/reactos/subsys/system/vmwinst/vmwinst.xml 2005-08-14 20:22:37 UTC (rev 17388) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.xml 2005-08-14 21:44:58 UTC (rev 17389) @@ -8,6 +8,7 @@ <library>advapi32</library> <library>comctl32</library> <library>comdlg32</library> + <library>setupapi</library> <library>shell32</library> <file>vmwinst.c</file> <file>vmwinst.rc</file>

19 years, 4 months

[gvg] 17388: index is 1-based at this point, index == line->nb_fields is the last

by gvg＠svn.reactos.com

index is 1-based at this point, index == line->nb_fields is the last field and is valid Modified: trunk/reactos/lib/setupapi/parser.c _____ Modified: trunk/reactos/lib/setupapi/parser.c --- trunk/reactos/lib/setupapi/parser.c 2005-08-14 17:12:10 UTC (rev 17387) +++ trunk/reactos/lib/setupapi/parser.c 2005-08-14 20:22:37 UTC (rev 17388) @@ -1714,7 +1714,7 @@ SetLastError( ERROR_LINE_NOT_FOUND ); return FALSE; } - if (!index || index >= line->nb_fields) + if (!index || index > line->nb_fields) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; @@ -1773,7 +1773,7 @@ SetLastError( ERROR_LINE_NOT_FOUND ); return FALSE; } - if (!index || index >= line->nb_fields) + if (!index || index > line->nb_fields) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; @@ -1822,7 +1822,7 @@ SetLastError( ERROR_LINE_NOT_FOUND ); return FALSE; } - if (!index || index >= line->nb_fields) + if (!index || index > line->nb_fields) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE;

19 years, 4 months

[hbirr] 17387: Merged r16363:16600 from trunk.

by hbirr＠svn.reactos.com

Merged r16363:16600 from trunk. Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/api/process.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/api/wapi.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/csrss.xml Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/include/conio.h Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/init.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/conio.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/guiconsole. c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/tuiconsole. c Modified: branches/cache_manager_rewrite/reactos/subsys/smss/client.c Modified: branches/cache_manager_rewrite/reactos/subsys/smss/debug.c Modified: branches/cache_manager_rewrite/reactos/subsys/smss/init.c Modified: branches/cache_manager_rewrite/reactos/subsys/smss/initss.c Modified: branches/cache_manager_rewrite/reactos/subsys/smss/smapi.c Modified: branches/cache_manager_rewrite/reactos/subsys/smss/smapiexec.c Modified: branches/cache_manager_rewrite/reactos/subsys/smss/smss.h Property changes on: branches/cache_manager_rewrite/reactos/subsys/csrss ___________________________________________________________________ Name: svn:ignore - csrss.coff csrss.exe csrss.nostrip.exe *.d *.o *.a *.sym *.map win32k.c makefile + csrss.coff csrss.exe csrss.nostrip.exe *.d *.o *.a *.sym *.map win32k.c *.gch makefile _____ Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/api/process.c --- branches/cache_manager_rewrite/reactos/subsys/csrss/api/process.c 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/csrss/api/process.c 2005-08-14 17:12:10 UTC (rev 17387) @@ -118,7 +118,7 @@ NTSTATUS STDCALL CsrFreeProcessData(HANDLE Pid) { ULONG hash; - int c; + UINT c; PCSRSS_PROCESS_DATA pProcessData, pPrevProcessData = NULL; hash = (ULONG_PTR)Pid % (sizeof(ProcessData) / sizeof(*ProcessData)); _____ Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/api/wapi.c --- branches/cache_manager_rewrite/reactos/subsys/csrss/api/wapi.c 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/csrss/api/wapi.c 2005-08-14 17:12:10 UTC (rev 17387) @@ -165,7 +165,7 @@ /* Close the port and exit the thread */ NtClose(ServerPort); - NtTerminateThread(NtCurrentThread(), STATUS_SUCCESS); + RtlExitUserThread(STATUS_SUCCESS); } /********************************************************************** @@ -237,8 +237,8 @@ NULL, FALSE, 0, - NULL, - NULL, + 0, + 0, (PTHREAD_START_ROUTINE)ClientConnectionThread, ServerPort, & ServerThread, _____ Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/csrss.xml --- branches/cache_manager_rewrite/reactos/subsys/csrss/csrss.xml 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/csrss/csrss.xml 2005-08-14 17:12:10 UTC (rev 17387) @@ -4,7 +4,7 @@ <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0501</define> - <library>rosrtl</library> + <library>intrlck</library> <library>ntdll</library> <library>smdll</library> <directory name="api"> _____ Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/include/conio.h --- branches/cache_manager_rewrite/reactos/subsys/csrss/include/conio.h 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/csrss/include/conio.h 2005-08-14 17:12:10 UTC (rev 17387) @@ -50,7 +50,7 @@ typedef struct tagCSRSS_CONSOLE_VTBL { VOID (STDCALL *InitScreenBuffer)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer); - VOID (STDCALL *WriteStream)(PCSRSS_CONSOLE Console, RECT *Block, UINT CursorStartX, UINT CursorStartY, + VOID (STDCALL *WriteStream)(PCSRSS_CONSOLE Console, RECT *Block, LONG CursorStartX, LONG CursorStartY, UINT ScrolledLines, CHAR *Buffer, UINT Length); VOID (STDCALL *DrawRegion)(PCSRSS_CONSOLE Console, RECT *Region); BOOL (STDCALL *SetCursorInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer); _____ Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/init.c --- branches/cache_manager_rewrite/reactos/subsys/csrss/init.c 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/csrss/init.c 2005-08-14 17:12:10 UTC (rev 17387) @@ -284,8 +284,8 @@ NULL, FALSE, 0, - NULL, - NULL, + 0, + 0, (PTHREAD_START_ROUTINE) ListenThread, Port, NULL, @@ -476,7 +476,7 @@ UNICODE_STRING ImagePath; UNICODE_STRING CommandLine; PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; - RTL_PROCESS_INFO ProcessInfo; + RTL_USER_PROCESS_INFORMATION ProcessInfo; DPRINT("CSR: %s called\n", __FUNCTION__); @@ -554,7 +554,7 @@ PWSTR *ArgumentArray ) { - INT i = 0; + UINT i = 0; NTSTATUS Status = STATUS_SUCCESS; DPRINT("CSR: %s called\n", __FUNCTION__); Property changes on: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr ___________________________________________________________________ Name: svn:ignore - win32csr.coff win32csr.dll win32csr.nostrip.dll *.d *.o *.a *.sym *.map makefile + win32csr.coff win32csr.dll win32csr.nostrip.dll *.d *.o *.a *.sym *.map *.gch makefile _____ Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/conio.c --- branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/conio.c 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/conio.c 2005-08-14 17:12:10 UTC (rev 17387) @@ -323,7 +323,7 @@ ConioNextLine(PCSRSS_SCREEN_BUFFER Buff, RECT *UpdateRect, UINT *ScrolledLines) { /* slide the viewable screen */ - if (((Buff->CurrentY - Buff->ShowY + Buff->MaxY) % Buff->MaxY) == Buff->MaxY - 1) + if (((Buff->CurrentY - Buff->ShowY + Buff->MaxY) % Buff->MaxY) == (ULONG)Buff->MaxY - 1) { if (++Buff->ShowY == Buff->MaxY) { @@ -338,7 +338,7 @@ ClearLineBuffer(Buff); UpdateRect->left = 0; UpdateRect->right = Buff->MaxX - 1; - if (UpdateRect->top == Buff->CurrentY) + if (UpdateRect->top == (LONG)Buff->CurrentY) { if (++UpdateRect->top == Buff->MaxY) { @@ -352,7 +352,7 @@ ConioWriteConsole(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff, CHAR *Buffer, DWORD Length, BOOL Attrib) { - int i; + UINT i; DWORD Offset; RECT UpdateRect; LONG CursorStartX, CursorStartY; @@ -394,8 +394,8 @@ { Buff->CurrentY--; } - if ((0 == UpdateRect.top && UpdateRect.bottom < Buff->CurrentY) - || (0 != UpdateRect.top && Buff->CurrentY < UpdateRect.top)) + if ((0 == UpdateRect.top && UpdateRect.bottom < (LONG)Buff->CurrentY) + || (0 != UpdateRect.top && (LONG)Buff->CurrentY < UpdateRect.top)) { UpdateRect.top = Buff->CurrentY; } @@ -406,7 +406,7 @@ } Offset = 2 * ((Buff->CurrentY * Buff->MaxX) + Buff->CurrentX); SET_CELL_BUFFER(Buff, Offset, ' ', Buff->DefaultAttrib); - UpdateRect.left = min(UpdateRect.left, Buff->CurrentX); + UpdateRect.left = min(UpdateRect.left, (LONG) Buff->CurrentX); UpdateRect.right = max(UpdateRect.right, (LONG) Buff->CurrentX); } continue; @@ -415,7 +415,7 @@ else if (Buffer[i] == '\r') { Buff->CurrentX = 0; - UpdateRect.left = min(UpdateRect.left, Buff->CurrentX); + UpdateRect.left = min(UpdateRect.left, (LONG) Buff->CurrentX); UpdateRect.right = max(UpdateRect.right, (LONG) Buff->CurrentX); continue; } @@ -424,7 +424,7 @@ { UINT EndX; - UpdateRect.left = min(UpdateRect.left, Buff->CurrentX); + UpdateRect.left = min(UpdateRect.left, (LONG)Buff->CurrentX); EndX = (Buff->CurrentX + 8) & ~7; if (EndX > Buff->MaxX) { @@ -453,7 +453,7 @@ continue; } } - UpdateRect.left = min(UpdateRect.left, Buff->CurrentX); + UpdateRect.left = min(UpdateRect.left, (LONG)Buff->CurrentX); UpdateRect.right = max(UpdateRect.right, (LONG) Buff->CurrentX); Offset = 2 * (((Buff->CurrentY * Buff->MaxX)) + Buff->CurrentX); Buff->Buffer[Offset++] = Buffer[i]; @@ -495,7 +495,7 @@ ConsoleInput *Input; PUCHAR Buffer; PWCHAR UnicodeBuffer; - int i; + ULONG i; ULONG nNumberOfCharsToRead, CharSize; PCSRSS_CONSOLE Console; NTSTATUS Status; @@ -762,7 +762,7 @@ DWORD SrcOffset; DWORD DstOffset; DWORD BytesPerLine; - ULONG i; + LONG i; DstY = DstRegion->top; BytesPerLine = ConioRectWidth(DstRegion) * 2; @@ -811,7 +811,7 @@ SHORT X, Y; DWORD Offset; DWORD Delta; - ULONG i; + LONG i; CHAR Char; if(bUnicode) @@ -2273,8 +2273,8 @@ BufferCoord = Request->Data.WriteConsoleOutputRequest.BufferCoord; CharInfo = Request->Data.WriteConsoleOutputRequest.CharInfo; if (((PVOID)CharInfo < ProcessData->CsrSectionViewBase) || - (((PVOID)CharInfo + PSize) > - (ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) + (((ULONG_PTR)CharInfo + PSize) > + ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); @@ -2690,7 +2690,7 @@ Size = Length * sizeof(INPUT_RECORD); if (((PVOID)InputRecord < ProcessData->CsrSectionViewBase) - || (((PVOID)InputRecord + Size) > (ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) + || (((ULONG_PTR)InputRecord + Size) > ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { ConioUnlockConsole(Console); Request->Status = STATUS_ACCESS_VIOLATION; @@ -2748,7 +2748,8 @@ COORD BufferCoord; RECT ReadRegion; RECT ScreenRect; - DWORD i, Y, X, Offset; + DWORD i, Offset; + LONG X, Y; UINT CodePage; DPRINT("CsrReadConsoleOutput\n"); @@ -2776,7 +2777,7 @@ CodePage = ProcessData->Console->OutputCodePage; if (((PVOID)CharInfo < ProcessData->CsrSectionViewBase) - || (((PVOID)CharInfo + Size) > (ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) + || (((ULONG_PTR)CharInfo + Size) > ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { ConioUnlockScreenBuffer(Buff); Request->Status = STATUS_ACCESS_VIOLATION; @@ -2856,7 +2857,7 @@ Size = Length * sizeof(INPUT_RECORD); if (((PVOID)InputRecord < ProcessData->CsrSectionViewBase) - || (((PVOID)InputRecord + Size) > (ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) + || (((ULONG_PTR)InputRecord + Size) > ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { ConioUnlockConsole(Console); Request->Status = STATUS_ACCESS_VIOLATION; _____ Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/guiconsole. c --- branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/guiconsole. c 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/guiconsole. c 2005-08-14 17:12:10 UTC (rev 17387) @@ -457,7 +457,7 @@ } static VOID STDCALL -GuiWriteStream(PCSRSS_CONSOLE Console, RECT *Region, UINT CursorStartX, UINT CursorStartY, +GuiWriteStream(PCSRSS_CONSOLE Console, RECT *Region, LONG CursorStartX, LONG CursorStartY, UINT ScrolledLines, CHAR *Buffer, UINT Length) { PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA) Console->PrivateData; _____ Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/tuiconsole. c --- branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/tuiconsole. c 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/tuiconsole. c 2005-08-14 17:12:10 UTC (rev 17387) @@ -54,7 +54,8 @@ static void FASTCALL TuiCopyRect(char *Dest, PCSRSS_SCREEN_BUFFER Buff, RECT *Region) { - UINT SrcDelta, DestDelta, i; + UINT SrcDelta, DestDelta; + LONG i; PBYTE Src, SrcEnd; Src = Buff->Buffer + (((Region->top + Buff->ShowY) % Buff->MaxY) * Buff->MaxX @@ -118,7 +119,7 @@ } static VOID STDCALL -TuiWriteStream(PCSRSS_CONSOLE Console, RECT *Region, UINT CursorStartX, UINT CursorStartY, +TuiWriteStream(PCSRSS_CONSOLE Console, RECT *Region, LONG CursorStartX, LONG CursorStartY, UINT ScrolledLines, CHAR *Buffer, UINT Length) { DWORD BytesWritten; @@ -293,7 +294,7 @@ 0, sizeof(COORD) + Title.MaximumLength); pos = (COORD *)Buffer; - Title.Buffer = Buffer + sizeof( COORD ); + Title.Buffer = (PVOID)((ULONG_PTR)Buffer + sizeof( COORD )); RtlUnicodeStringToAnsiString(&Title, &SwapConsole->Title, FALSE); pos->Y = PhysicalConsoleSize.Y / 2; Property changes on: branches/cache_manager_rewrite/reactos/subsys/smss ___________________________________________________________________ Name: svn:ignore - *.coff *.exe *.d *.o *.a *.sym *.map makefile + *.coff *.exe *.d *.o *.a *.sym *.map *.gch makefile _____ Modified: branches/cache_manager_rewrite/reactos/subsys/smss/client.c --- branches/cache_manager_rewrite/reactos/subsys/smss/client.c 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/smss/client.c 2005-08-14 17:12:10 UTC (rev 17387) @@ -283,7 +283,7 @@ * NTSTATUS: */ NTSTATUS STDCALL -SmCreateClient (PRTL_PROCESS_INFO ProcessInfo, PWSTR ProgramName) +SmCreateClient (PRTL_USER_PROCESS_INFORMATION ProcessInfo, PWSTR ProgramName) { NTSTATUS Status = STATUS_SUCCESS; _____ Modified: branches/cache_manager_rewrite/reactos/subsys/smss/debug.c --- branches/cache_manager_rewrite/reactos/subsys/smss/debug.c 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/smss/debug.c 2005-08-14 17:12:10 UTC (rev 17387) @@ -109,8 +109,8 @@ NULL, FALSE, 0, - NULL, - NULL, + 0, + 0, (PTHREAD_START_ROUTINE) procServingThread, hPort, & Thread, _____ Modified: branches/cache_manager_rewrite/reactos/subsys/smss/init.c --- branches/cache_manager_rewrite/reactos/subsys/smss/init.c 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/smss/init.c 2005-08-14 17:12:10 UTC (rev 17387) @@ -95,7 +95,7 @@ NTSTATUS InitSessionManager(VOID) { - INT i = 0; + UINT i = 0; NTSTATUS Status = STATUS_SUCCESS; for (i=0; i < (sizeof InitRoutine / sizeof InitRoutine[0]); i++) _____ Modified: branches/cache_manager_rewrite/reactos/subsys/smss/initss.c --- branches/cache_manager_rewrite/reactos/subsys/smss/initss.c 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/smss/initss.c 2005-08-14 17:12:10 UTC (rev 17387) @@ -51,7 +51,7 @@ SmpRegisterSmss(VOID) { NTSTATUS Status = STATUS_SUCCESS; - RTL_PROCESS_INFO ProcessInfo; + RTL_USER_PROCESS_INFORMATION ProcessInfo; DPRINT("SM: %s called\n",__FUNCTION__); _____ Modified: branches/cache_manager_rewrite/reactos/subsys/smss/smapi.c --- branches/cache_manager_rewrite/reactos/subsys/smss/smapi.c 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/smss/smapi.c 2005-08-14 17:12:10 UTC (rev 17387) @@ -282,8 +282,8 @@ NULL, FALSE, 0, - NULL, - NULL, + 0, + 0, (PTHREAD_START_ROUTINE) SmpApiConnectedThread, ClientDataApiPort, ClientDataApiPortThread, @@ -383,8 +383,8 @@ NULL, FALSE, 0, - NULL, - NULL, + 0, + 0, (PTHREAD_START_ROUTINE)SmpApiThread, (PVOID)SmApiPort, NULL, _____ Modified: branches/cache_manager_rewrite/reactos/subsys/smss/smapiexec.c --- branches/cache_manager_rewrite/reactos/subsys/smss/smapiexec.c 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/smss/smapiexec.c 2005-08-14 17:12:10 UTC (rev 17387) @@ -51,13 +51,13 @@ LPWSTR CommandLine, BOOLEAN WaitForIt, PLARGE_INTEGER Timeout OPTIONAL, - PRTL_PROCESS_INFO UserProcessInfo OPTIONAL) + PRTL_USER_PROCESS_INFORMATION UserProcessInfo OPTIONAL) { UNICODE_STRING ImagePathString = {0}; UNICODE_STRING CommandLineString = {0}; PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; - RTL_PROCESS_INFO ProcessInfo = {0}; - PRTL_PROCESS_INFO pProcessInfo = & ProcessInfo; + RTL_USER_PROCESS_INFORMATION ProcessInfo = {0}; + PRTL_USER_PROCESS_INFORMATION pProcessInfo = & ProcessInfo; NTSTATUS Status = STATUS_SUCCESS; DPRINT("SM: %s called\n", __FUNCTION__); @@ -184,7 +184,7 @@ { WCHAR ImagePath [MAX_PATH + 1] = {0}; PWCHAR CommandLine = ImagePath; - RTL_PROCESS_INFO ProcessInfo = {0}; + RTL_USER_PROCESS_INFORMATION ProcessInfo = {0}; wcscpy (ImagePath, L"\\??\\"); wcscat (ImagePath, Data); _____ Modified: branches/cache_manager_rewrite/reactos/subsys/smss/smss.h --- branches/cache_manager_rewrite/reactos/subsys/smss/smss.h 2005-08-14 17:10:07 UTC (rev 17386) +++ branches/cache_manager_rewrite/reactos/subsys/smss/smss.h 2005-08-14 17:12:10 UTC (rev 17387) @@ -62,7 +62,7 @@ LPWSTR CommandLine, BOOLEAN WaitForIt, PLARGE_INTEGER Timeout OPTIONAL, - PRTL_PROCESS_INFO UserProcessInfo OPTIONAL); + PRTL_USER_PROCESS_INFORMATION UserProcessInfo OPTIONAL); NTSTATUS FASTCALL SmExecPgm(PSM_PORT_MESSAGE); /* smapicomp.c */ @@ -92,7 +92,7 @@ } SM_CLIENT_DATA, *PSM_CLIENT_DATA; NTSTATUS SmInitializeClientManagement (VOID); -NTSTATUS STDCALL SmCreateClient (PRTL_PROCESS_INFO,PWSTR); +NTSTATUS STDCALL SmCreateClient (PRTL_USER_PROCESS_INFORMATION,PWSTR); NTSTATUS STDCALL SmDestroyClient (ULONG); NTSTATUS STDCALL SmBeginClientInitialization (PSM_PORT_MESSAGE,PSM_CLIENT_DATA*); NTSTATUS STDCALL SmCompleteClientInitialization (ULONG);

19 years, 4 months

[hbirr] 17386: Merged r16363:16600 from trunk.

by hbirr＠svn.reactos.com

Merged r16363:16600 from trunk. Modified: branches/cache_manager_rewrite/reactos/lib/aclui/aclui.c Modified: branches/cache_manager_rewrite/reactos/lib/aclui/aclui.xml Modified: branches/cache_manager_rewrite/reactos/lib/aclui/aclui_De.rc Modified: branches/cache_manager_rewrite/reactos/lib/aclui/aclui_En.rc Modified: branches/cache_manager_rewrite/reactos/lib/aclui/aclui_Sv.rc Added: branches/cache_manager_rewrite/reactos/lib/aclui/acluilib.h Added: branches/cache_manager_rewrite/reactos/lib/aclui/checklist.c Deleted: branches/cache_manager_rewrite/reactos/lib/aclui/internal.h Added: branches/cache_manager_rewrite/reactos/lib/aclui/misc.c Modified: branches/cache_manager_rewrite/reactos/lib/aclui/resource.h Property changes on: branches/cache_manager_rewrite/reactos/lib/aclui ___________________________________________________________________ Name: svn:ignore - *.coff *.dll *.d *.a *.o *.sym *.map *.tmp makefile + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp *.gch makefile _____ Modified: branches/cache_manager_rewrite/reactos/lib/aclui/aclui.c --- branches/cache_manager_rewrite/reactos/lib/aclui/aclui.c 2005-08-14 16:42:46 UTC (rev 17385) +++ branches/cache_manager_rewrite/reactos/lib/aclui/aclui.c 2005-08-14 17:10:07 UTC (rev 17386) @@ -21,100 +21,719 @@ * PROJECT: ReactOS Access Control List Editor * FILE: lib/aclui/aclui.c * PURPOSE: Access Control List Editor - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> * * UPDATE HISTORY: * 08/10/2004 Created */ -#define INITGUID -#include <windows.h> -#include <commctrl.h> -#include <prsht.h> -#include <aclui.h> -#include "internal.h" -#include "resource.h" +#include "acluilib.h" HINSTANCE hDllInstance; -UINT CALLBACK -SecurityPageCallback(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp) +static VOID +DestroySecurityPage(IN PSECURITY_PAGE sp) { - switch(uMsg) - { - case PSPCB_CREATE: + if(sp->hiUsrs != NULL) { - PSECURITY_PAGE sp; + ImageList_Destroy(sp->hiUsrs); + } - sp = LocalAlloc(LHND, sizeof(SECURITY_PAGE)); - if(sp != NULL) - { - /* save the pointer to the ISecurityInformation interface */ - sp->psi = (LPSECURITYINFO)ppsp->lParam; - /* set the lParam to the allocated structure */ - ppsp->lParam = (LPARAM)sp; - return TRUE; - } - return FALSE; + HeapFree(GetProcessHeap(), + 0, + sp); +} + +static VOID +FreeAceList(IN PACE_LISTITEM *AceListHead) +{ + PACE_LISTITEM CurItem, NextItem; + + CurItem = *AceListHead; + while (CurItem != NULL) + { + /* free the SID string if present */ + if (CurItem->DisplayString != NULL) + { + LocalFree((HLOCAL)CurItem->DisplayString); + } + + /* free the ACE list item */ + NextItem = CurItem->Next; + HeapFree(GetProcessHeap(), + 0, + CurItem); + CurItem = NextItem; } - case PSPCB_RELEASE: + + *AceListHead = NULL; +} + +static PACE_LISTITEM +FindSidInAceList(IN PACE_LISTITEM AceListHead, + IN PSID Sid) +{ + PACE_LISTITEM CurItem; + + for (CurItem = AceListHead; + CurItem != NULL; + CurItem = CurItem->Next) { - if(ppsp->lParam != 0) - { - PSECURITY_PAGE sp = (PSECURITY_PAGE)ppsp->lParam; - if(sp->hiUsrs != NULL) + if (EqualSid((PSID)(CurItem + 1), + Sid)) { - ImageList_Destroy(sp->hiUsrs); + return CurItem; } - LocalFree((HLOCAL)sp); - } - return FALSE; } - } + + return NULL; +} - return FALSE; +static VOID +ReloadUsersGroupsList(IN PSECURITY_PAGE sp) +{ + PSECURITY_DESCRIPTOR SecurityDescriptor; + BOOL DaclPresent, DaclDefaulted; + PACL Dacl = NULL; + HRESULT hRet; + + /* delete the cached ACL */ + FreeAceList(&sp->AceListHead); + + /* query the ACL */ + hRet = sp->psi->lpVtbl->GetSecurity(sp->psi, + DACL_SECURITY_INFORMATION, + &SecurityDescriptor, + FALSE); + if (SUCCEEDED(hRet) && SecurityDescriptor != NULL) + { + if (GetSecurityDescriptorDacl(SecurityDescriptor, + &DaclPresent, + &Dacl, + &DaclDefaulted)) + { + PACE_LISTITEM AceListItem, *NextAcePtr; + PSID Sid; + PVOID Ace; + ULONG AceIndex; + DWORD AccountNameSize, DomainNameSize, SidLength; + SID_NAME_USE SidNameUse; + DWORD LookupResult; + + NextAcePtr = &sp->AceListHead; + + for (AceIndex = 0; + AceIndex < Dacl->AceCount; + AceIndex++) + { + GetAce(Dacl, + AceIndex, + &Ace); + + Sid = (PSID)&((PACCESS_ALLOWED_ACE)Ace)->SidStart; + + if (!FindSidInAceList(sp->AceListHead, + Sid)) + { + SidLength = GetLengthSid(Sid); + + AccountNameSize = 0; + DomainNameSize = 0; + + /* calculate the size of the buffer we need to calculate */ + LookupAccountSid(sp->ServerName, + Sid, + NULL, + &AccountNameSize, + NULL, + &DomainNameSize, + &SidNameUse); + + /* allocate the ace */ + AceListItem = HeapAlloc(GetProcessHeap(), + 0, + sizeof(ACE_LISTITEM) + + SidLength + + ((AccountNameSize + DomainNameSize) * sizeof(WCHAR))); + if (AceListItem != NULL) + { + AceListItem->AccountName = (LPWSTR)((ULONG_PTR)(AceListItem + 1) + SidLength); + AceListItem->DomainName = AceListItem->AccountName + AccountNameSize; + + CopySid(SidLength, + (PSID)(AceListItem + 1), + Sid); + + LookupResult = ERROR_SUCCESS; + if (!LookupAccountSid(sp->ServerName, + Sid, + AceListItem->AccountName, + &AccountNameSize, + AceListItem->DomainName, + &DomainNameSize, + &SidNameUse)) + { + LookupResult = GetLastError(); + if (LookupResult != ERROR_NONE_MAPPED) + { + HeapFree(GetProcessHeap(), + 0, + AceListItem); + continue; + } + } + + if (AccountNameSize == 0) + { + AceListItem->AccountName = NULL; + } + if (DomainNameSize == 0) + { + AceListItem->DomainName = NULL; + } + + AceListItem->Next = NULL; + if (LookupResult == ERROR_NONE_MAPPED) + { + if (!ConvertSidToStringSid(Sid, + &AceListItem->DisplayString)) + { + AceListItem->DisplayString = NULL; + } + } + else + { + LSA_HANDLE LsaHandle; + NTSTATUS Status; + + AceListItem->DisplayString = NULL; + + /* read the domain of the SID */ + if (OpenLSAPolicyHandle(sp->ServerName, + POLICY_LOOKUP_NAMES | POLICY_VIEW_LOCAL_INFORMATION, + &LsaHandle)) + { + PLSA_REFERENCED_DOMAIN_LIST ReferencedDomain; + PLSA_TRANSLATED_NAME Names; + PLSA_TRUST_INFORMATION Domain; + PLSA_UNICODE_STRING DomainName; + PPOLICY_ACCOUNT_DOMAIN_INFO PolicyAccountDomainInfo = NULL; + + Status = LsaLookupSids(LsaHandle, + 1, + &Sid, + &ReferencedDomain, + &Names); + if (NT_SUCCESS(Status)) + { + if (ReferencedDomain != NULL && + Names->DomainIndex >= 0) + { + Domain = &ReferencedDomain->Domains[Names->DomainIndex]; + DomainName = &Domain->Name; + } + else + { + Domain = NULL; + DomainName = NULL; + } + + AceListItem->SidNameUse = Names->Use; + + switch (Names->Use) + { + case SidTypeAlias: + if (Domain != NULL) + { + /* query the domain name for BUILTIN accounts */ + Status = LsaQueryInformationPolicy(LsaHandle, + PolicyAccountDomainInformation, + (PVOID*)&PolicyAccountDomainInfo); + if (NT_SUCCESS(Status)) + { + DomainName = &PolicyAccountDomainInfo->DomainName; + + /* make the user believe this is a group */ + AceListItem->SidNameUse = SidTypeGroup; + } + } + /* fall through */ + + case SidTypeUser: + { + if (Domain != NULL) + { + AceListItem->DisplayString = (LPWSTR)LocalAlloc(LMEM_FIXED, + (AccountNameSize * sizeof(WCHAR)) + + (DomainName->Length + sizeof(WCHAR)) + + (Names->Name.Length + sizeof(WCHAR)) + + (4 * sizeof(WCHAR))); + if (AceListItem->DisplayString != NULL) + { + WCHAR *s; + + /* NOTE: LSA_UNICODE_STRINGs are not always NULL-terminated! */ + + wcscpy(AceListItem->DisplayString, + AceListItem->AccountName); + wcscat(AceListItem->DisplayString, + L" ("); + s = AceListItem->DisplayString + wcslen(AceListItem->DisplayString); + CopyMemory(s, + DomainName->Buffer, + DomainName->Length); + s += DomainName->Length / sizeof(WCHAR); + *(s++) = L'\\'; + CopyMemory(s, + Names->Name.Buffer, + Names->Name.Length); + s += Names->Name.Length / sizeof(WCHAR); + *(s++) = L')'; + *s = L'\0'; + } + + /* mark the ace as a user unless it's a + BUILTIN account */ + if (PolicyAccountDomainInfo == NULL) + { + AceListItem->SidNameUse = SidTypeUser; + } + } + break; + } + + case SidTypeWellKnownGroup: + { + /* make the user believe this is a group */ + AceListItem->SidNameUse = SidTypeGroup; + break; + } + + default: + { + DPRINT("Unhandled SID type: 0x%x\n", Names->Use); + break; + } + } + + if (PolicyAccountDomainInfo != NULL) + { + LsaFreeMemory(PolicyAccountDomainInfo); + } + + LsaFreeMemory(ReferencedDomain); + LsaFreeMemory(Names); + } + LsaClose(LsaHandle); + } + } + + /* append item to the cached ACL */ + *NextAcePtr = AceListItem; + NextAcePtr = &AceListItem->Next; + } + } + } + } + LocalFree((HLOCAL)SecurityDescriptor); + } } +static INT +AddAceListEntry(IN PSECURITY_PAGE sp, + IN PACE_LISTITEM AceListItem, + IN INT Index, + IN BOOL Selected) +{ + LVITEM li; -INT_PTR CALLBACK -SecurityPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) + li.mask = LVIF_IMAGE | LVIF_PARAM | LVIF_STATE | LVIF_TEXT; + li.iItem = Index; + li.iSubItem = 0; + li.state = (Selected ? LVIS_SELECTED : 0); + li.stateMask = LVIS_SELECTED; + li.pszText = (AceListItem->DisplayString != NULL ? AceListItem->DisplayString : AceListItem->AccountName); + switch (AceListItem->SidNameUse) + { + case SidTypeUser: + li.iImage = 0; + break; + case SidTypeGroup: + li.iImage = 1; + break; + default: + li.iImage = -1; + break; + } + li.lParam = (LPARAM)AceListItem; + + return ListView_InsertItem(sp->hWndAceList, + &li); +} + +static VOID +FillUsersGroupsList(IN PSECURITY_PAGE sp) { - PSECURITY_PAGE sp; - - switch(uMsg) - { - case WM_INITDIALOG: + LPARAM SelLParam; + PACE_LISTITEM CurItem; + RECT rcLvClient; + + SelLParam = ListViewGetSelectedItemData(sp->hWndAceList); + + DisableRedrawWindow(sp->hWndAceList); + + ListView_DeleteAllItems(sp->hWndAceList); + + ReloadUsersGroupsList(sp); + + for (CurItem = sp->AceListHead; + CurItem != NULL; + CurItem = CurItem->Next) { - sp = (PSECURITY_PAGE)lParam; - if(sp != NULL) - { - LV_COLUMN lvc; - RECT rcLvClient; + AddAceListEntry(sp, + CurItem, + -1, + (SelLParam == (LPARAM)CurItem)); + } + + EnableRedrawWindow(sp->hWndAceList); + + GetClientRect(sp->hWndAceList, &rcLvClient); + + ListView_SetColumnWidth(sp->hWndAceList, + 0, + rcLvClient.right); +} + +static VOID +UpdateControlStates(IN PSECURITY_PAGE sp) +{ + PACE_LISTITEM Selected = (PACE_LISTITEM)ListViewGetSelectedItemData(sp->hWndAceList); + + EnableWindow(sp->hBtnRemove, Selected != NULL); + EnableWindow(sp->hAceCheckList, Selected != NULL); + + if (Selected != NULL) + { + LPWSTR szLabel; + + if (LoadAndFormatString(hDllInstance, + IDS_PERMISSIONS_FOR, + &szLabel, + Selected->AccountName)) + { + SetWindowText(sp->hPermissionsForLabel, + szLabel); + + LocalFree((HLOCAL)szLabel); + } - sp->hWnd = hwndDlg; - sp->hWndUsrList = GetDlgItem(hwndDlg, IDC_ACELIST); - sp->hiUsrs = ImageList_LoadBitmap(hDllInstance, MAKEINTRESOURCE(IDB_USRGRPIMAGES), 16, 3, 0); + /* FIXME - update the checkboxes */ + } + else + { + WCHAR szPermissions[255]; - /* save the pointer to the structure */ - SetWindowLongPtr(hwndDlg, DWL_USER, (DWORD_PTR)sp); + if (LoadString(hDllInstance, + IDS_PERMISSIONS, + szPermissions, + sizeof(szPermissions) / sizeof(szPermissions[0]))) + { + SetWindowText(sp->hPermissionsForLabel, + szPermissions); + } + + SendMessage(sp->hAceCheckList, + CLM_CLEARCHECKBOXES, + 0, + 0); + } +} + +static UINT CALLBACK +SecurityPageCallback(IN HWND hwnd, + IN UINT uMsg, + IN LPPROPSHEETPAGE ppsp) +{ + PSECURITY_PAGE sp = (PSECURITY_PAGE)ppsp->lParam; + + switch(uMsg) + { + case PSPCB_CREATE: + { + return TRUE; + } + case PSPCB_RELEASE: + { + DestroySecurityPage(sp); + UnregisterCheckListControl(); + return FALSE; + } + } + + return FALSE; +} + +static VOID +SetAceCheckListColumns(IN HWND hAceCheckList, + IN UINT Button, + IN HWND hLabel) +{ + POINT pt; + RECT rcLabel; + + GetWindowRect(hLabel, + &rcLabel); + pt.y = 0; + pt.x = (rcLabel.right - rcLabel.left) / 2; + MapWindowPoints(hLabel, + hAceCheckList, + &pt, + 1); + + SendMessage(hAceCheckList, + CLM_SETCHECKBOXCOLUMN, + Button, + pt.x); +} + +static VOID +LoadPermissionsList(IN PSECURITY_PAGE sp, + IN GUID *GuidObjectType, + IN DWORD dwFlags, + OUT SI_ACCESS *DefaultAccess) +{ + HRESULT hRet; + PSI_ACCESS AccessList; + ULONG nAccessList, DefaultAccessIndex; + + /* clear the permissions list */ + + SendMessage(sp->hAceCheckList, + CLM_CLEAR, + 0, + 0); + + /* query the access rights from the server */ + hRet = sp->psi->lpVtbl->GetAccessRights(sp->psi, + GuidObjectType, + dwFlags, + &AccessList, + &nAccessList, + &DefaultAccessIndex); + if (SUCCEEDED(hRet) && nAccessList != 0) + { + LPCWSTR NameStr; + PSI_ACCESS CurAccess, LastAccess; + WCHAR NameBuffer[MAX_PATH]; - GetClientRect(sp->hWndUsrList, &rcLvClient); + /* save the default access rights to be used when adding ACEs later */ + if (DefaultAccess != NULL) + { + *DefaultAccess = AccessList[DefaultAccessIndex]; + } - /* setup the listview control */ - ListView_SetExtendedListViewStyleEx(sp->hWndUsrList, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT); - ListView_SetImageList(sp->hWndUsrList, sp->hiUsrs, LVSIL_SMALL); + LastAccess = AccessList + nAccessList; + for (CurAccess = &AccessList[0]; + CurAccess != LastAccess; + CurAccess++) + { + if (CurAccess->dwFlags & dwFlags) + { + /* get the permission name, load it from a string table if necessary */ + if (IS_INTRESOURCE(CurAccess->pszName)) + { + if (!LoadString(sp->ObjectInfo.hInstance, + (UINT)((ULONG_PTR)CurAccess->pszName), + NameBuffer, + sizeof(NameBuffer) / sizeof(NameBuffer[0]))) + { + LoadString(hDllInstance, + IDS_UNKNOWN, + NameBuffer, + sizeof(NameBuffer) / sizeof(NameBuffer[0])); + } + NameStr = NameBuffer; + } + else + { + NameStr = CurAccess->pszName; + } - /* add a column to the list view */ - lvc.mask = LVCF_FMT | LVCF_WIDTH; - lvc.fmt = LVCFMT_LEFT; - lvc.cx = rcLvClient.right; - ListView_InsertColumn(sp->hWndUsrList, 0, &lvc); + SendMessage(sp->hAceCheckList, + CLM_ADDITEM, + CIS_NONE, + (LPARAM)NameStr); + } + } + } +} + +static INT_PTR CALLBACK +SecurityPageProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PSECURITY_PAGE sp; + + switch(uMsg) + { + case WM_NOTIFY: + { + NMHDR *pnmh = (NMHDR*)lParam; + sp = (PSECURITY_PAGE)GetWindowLongPtr(hwndDlg, + DWL_USER); + if (sp != NULL) + { + if (pnmh->hwndFrom == sp->hWndAceList) + { + switch(pnmh->code) + { + case LVN_ITEMCHANGED: + { + LPNMLISTVIEW pnmv = (LPNMLISTVIEW)lParam; + + if ((pnmv->uChanged & LVIF_STATE) && + ((pnmv->uOldState & (LVIS_FOCUSED | LVIS_SELECTED)) || + (pnmv->uNewState & (LVIS_FOCUSED | LVIS_SELECTED)))) + { + UpdateControlStates(sp); + } + break; + } + } + } + else if (pnmh->hwndFrom == sp->hAceCheckList) + { + switch(pnmh->code) + { + case CLN_CHANGINGITEMCHECKBOX: + { + PNMCHANGEITEMCHECKBOX pcicb = (PNMCHANGEITEMCHECKBOX)lParam; + + /* make sure only one of both checkboxes is only checked + at the same time */ + if (pcicb->Checked) + { + pcicb->NewState &= ~((pcicb->CheckBox != CLB_DENY) ? CIS_DENY : CIS_ALLOW); + } + break; + } + } + } + } + break; + } - /* FIXME - hide controls in case the flags aren't present */ - } - break; + case WM_INITDIALOG: + { + sp = (PSECURITY_PAGE)((LPPROPSHEETPAGE)lParam)->lParam; + if(sp != NULL) + { + LV_COLUMN lvc; + RECT rcLvClient; + + sp->hWnd = hwndDlg; + sp->hWndAceList = GetDlgItem(hwndDlg, IDC_ACELIST); + sp->hBtnRemove = GetDlgItem(hwndDlg, IDC_ACELIST_REMOVE); + sp->hBtnAdvanced = GetDlgItem(hwndDlg, IDC_ADVANCED); + sp->hAceCheckList = GetDlgItem(hwndDlg, IDC_ACE_CHECKLIST); + sp->hPermissionsForLabel = GetDlgItem(hwndDlg, IDC_LABEL_PERMISSIONS_FOR); + + sp->SpecialPermCheckIndex = -1; + + if ((sp->ObjectInfo.dwFlags & SI_SERVER_IS_DC) && + sp->ObjectInfo.pszServerName != NULL && + sp->ObjectInfo.pszServerName[0] != L'\0') + { + sp->ServerName = sp->ObjectInfo.pszServerName; + } + + /* save the pointer to the structure */ + SetWindowLongPtr(hwndDlg, + DWL_USER, + (DWORD_PTR)sp); + + sp->hiUsrs = ImageList_LoadBitmap(hDllInstance, + MAKEINTRESOURCE(IDB_USRGRPIMAGES), + 16, + 3, + 0); + + /* setup the listview control */ + ListView_SetExtendedListViewStyleEx(sp->hWndAceList, + LVS_EX_FULLROWSELECT, + LVS_EX_FULLROWSELECT); + ListView_SetImageList(sp->hWndAceList, + sp->hiUsrs, + LVSIL_SMALL); + + GetClientRect(sp->hWndAceList, &rcLvClient); + + /* add a column to the list view */ + lvc.mask = LVCF_FMT | LVCF_WIDTH; + lvc.fmt = LVCFMT_LEFT; + lvc.cx = rcLvClient.right; + ListView_InsertColumn(sp->hWndAceList, 0, &lvc); + + FillUsersGroupsList(sp); + + ListViewSelectItem(sp->hWndAceList, + 0); + + /* calculate the columns of the allow/deny checkboxes */ + SetAceCheckListColumns(sp->hAceCheckList, + CLB_ALLOW, + GetDlgItem(hwndDlg, IDC_LABEL_ALLOW)); + SetAceCheckListColumns(sp->hAceCheckList, + CLB_DENY, + GetDlgItem(hwndDlg, IDC_LABEL_DENY)); + + LoadPermissionsList(sp, + NULL, + SI_ACCESS_GENERAL | + ((sp->ObjectInfo.dwFlags & SI_CONTAINER) ? SI_ACCESS_CONTAINER : 0), + &sp->DefaultAccess); + + /* hide controls in case the flags aren't present */ + if (sp->ObjectInfo.dwFlags & SI_ADVANCED) + { + WCHAR szSpecialPermissions[255]; + + /* editing the permissions is least the user can do when + the advanced button is showed */ + sp->ObjectInfo.dwFlags |= SI_EDIT_PERMS; + + if (LoadString(hDllInstance, + IDS_SPECIAL_PERMISSIONS, + szSpecialPermissions, + sizeof(szSpecialPermissions) / sizeof(szSpecialPermissions[0]))) + { + /* add the special permissions check item */ + sp->SpecialPermCheckIndex = (INT)SendMessage(sp->hAceCheckList, + CLM_ADDITEM, + CIS_ALLOWDISABLED | CIS_DENYDISABLED | CIS_NONE, + (LPARAM)szSpecialPermissions); + } + } + else + { + ShowWindow(sp->hBtnAdvanced, + SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_LABEL_ADVANCED), + SW_HIDE); + } + + /* enable quicksearch for the permissions checklist control */ + SendMessage(sp->hAceCheckList, + CLM_ENABLEQUICKSEARCH, + TRUE, + 0); + } + break; + } } - } - return 0; + return 0; } @@ -125,48 +744,82 @@ */ HPROPSHEETPAGE WINAPI -CreateSecurityPage(LPSECURITYINFO psi) +CreateSecurityPage(IN LPSECURITYINFO psi) { - PROPSHEETPAGE psp; - SI_OBJECT_INFO ObjectInfo; - HRESULT hRet; + PROPSHEETPAGE psp; + PSECURITY_PAGE sPage; + SI_OBJECT_INFO ObjectInfo; + HRESULT hRet; - if(psi == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); + if(psi == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); - DPRINT("No ISecurityInformation class passed!\n"); - return NULL; - } + DPRINT("No ISecurityInformation class passed!\n"); + return NULL; + } - /* get the object information from the server interface */ - hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo); + /* get the object information from the server. Zero the structure before + because some applications seem to return SUCCESS but only seem to set the + fields they care about. */ + ZeroMemory(&ObjectInfo, sizeof(ObjectInfo)); + hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo); - if(FAILED(hRet)) - { - SetLastError(hRet); + if(FAILED(hRet)) + { + SetLastError(hRet); - DPRINT("CreateSecurityPage() failed!\n"); - return NULL; - } + DPRINT("CreateSecurityPage() failed! Failed to query the object information!\n"); + return NULL; + } + + if (!RegisterCheckListControl(hDllInstance)) + { + DPRINT("Registering the CHECKLIST_ACLUI class failed!\n"); + return NULL; + } + + sPage = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SECURITY_PAGE)); + if (sPage == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + + DPRINT("Not enough memory to allocate a SECURITY_PAGE!\n"); + return NULL; + } + sPage->psi = psi; + sPage->ObjectInfo = ObjectInfo; - psp.dwSize = sizeof(PROPSHEETPAGE); - psp.dwFlags = PSP_DEFAULT | PSP_USECALLBACK; - psp.hInstance = hDllInstance; - psp.pszTemplate = MAKEINTRESOURCE(IDD_SECPAGE); - psp.pfnDlgProc = SecurityPageProc; - psp.lParam = (LPARAM)psi; - psp.pfnCallback = SecurityPageCallback; + ZeroMemory(&psp, sizeof(psp)); - if((ObjectInfo.dwFlags & SI_PAGE_TITLE) != 0 && - ObjectInfo.pszPageTitle != NULL && ObjectInfo.pszPageTitle[0] != L'\0') - { - /* Set the page title if the flag is present and the string isn't empty */ - psp.pszTitle = ObjectInfo.pszPageTitle; - psp.dwFlags |= PSP_USETITLE; - } + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_USECALLBACK; + psp.hInstance = hDllInstance; + psp.pszTemplate = MAKEINTRESOURCE(IDD_SECPAGE); + psp.pfnDlgProc = SecurityPageProc; + psp.lParam = (LPARAM)sPage; + psp.pfnCallback = SecurityPageCallback; - return CreatePropertySheetPage(&psp); + if(ObjectInfo.dwFlags & SI_PAGE_TITLE) + { + psp.pszTitle = ObjectInfo.pszPageTitle; + + if (psp.pszTitle != NULL) + { + psp.dwFlags |= PSP_USETITLE; + } + } + else + { + psp.pszTitle = NULL; + } + + /* NOTE: the SECURITY_PAGE structure will be freed by the property page + callback! */ + + return CreatePropertySheetPage(&psp); } @@ -177,99 +830,89 @@ */ BOOL WINAPI -EditSecurity(HWND hwndOwner, LPSECURITYINFO psi) +EditSecurity(IN HWND hwndOwner, + IN LPSECURITYINFO psi) { - HRESULT hRet; - SI_OBJECT_INFO ObjectInfo; - PROPSHEETHEADER psh; - HPROPSHEETPAGE hPages[1]; - LPVOID lpCaption; - BOOL Ret; - - if(psi == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - - DPRINT("No ISecurityInformation class passed!\n"); - return FALSE; - } - - /* get the object information from the server interface */ - hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo); - - if(FAILED(hRet)) - { - SetLastError(hRet); - - DPRINT("GetObjectInformation() failed!\n"); - return FALSE; - } + HRESULT hRet; + SI_OBJECT_INFO ObjectInfo; + PROPSHEETHEADER psh; + HPROPSHEETPAGE hPages[1]; + LPWSTR lpCaption; + BOOL Ret; - /* create the page */ - hPages[0] = CreateSecurityPage(psi); - if(hPages[0] == NULL) - { - DPRINT("CreateSecurityPage(), couldn't create property sheet!\n"); - return FALSE; - } - - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_DEFAULT; - psh.hwndParent = hwndOwner; - psh.hInstance = hDllInstance; - if((ObjectInfo.dwFlags & SI_PAGE_TITLE) != 0 && - ObjectInfo.pszPageTitle != NULL && ObjectInfo.pszPageTitle[0] != L'\0') - { - /* Set the page title if the flag is present and the string isn't empty */ - psh.pszCaption = ObjectInfo.pszPageTitle; - lpCaption = NULL; - } - else - { + if(psi == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + + DPRINT("No ISecurityInformation class passed!\n"); + return FALSE; + } + + /* get the object information from the server. Zero the structure before + because some applications seem to return SUCCESS but only seem to set the + fields they care about. */ [truncated at 1000 lines; 288 more skipped]

19 years, 4 months

[hbirr] 17385: Merged r16363:16600 from trunk except lib\aclui, subsys\csrss and subsys\smss.

by hbirr＠svn.reactos.com

Merged r16363:16600 from trunk except lib\aclui, subsys\csrss and subsys\smss. Modified: branches/cache_manager_rewrite/reactos/Makefile Modified: branches/cache_manager_rewrite/reactos/ReactOS.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.rc Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/net.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/fake.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ipconfig/ipconfig. c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/route/route.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/ps/ps.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/rosperf/fill.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/rosperf/lines.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/rosperf/rosperf.h Modified: branches/cache_manager_rewrite/reactos/baseaddress.xml Deleted: branches/cache_manager_rewrite/reactos/boot/freeldr/bootsect/Makefile.i3 86 Deleted: branches/cache_manager_rewrite/reactos/boot/freeldr/bootsect/Makefile.po werpc Added: branches/cache_manager_rewrite/reactos/boot/freeldr/bootsect/bootsect.ma k Added: branches/cache_manager_rewrite/reactos/boot/freeldr/bootsect/fat.h Added: branches/cache_manager_rewrite/reactos/boot/freeldr/bootsect/fat32.h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/ha rdware.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/hw pci.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/mb .S Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/pc disk.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/xb oxdisk.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/cache/cache. c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/freeldr_base .xml Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/fs/ext2.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/fs/fat.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/fs/fs.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/fs/iso.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/fs/ntfs.h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/arch .h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/free ldr.h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/mult iboot.h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/reac tos.h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/rtl. h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/inffile/inff ile.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/linuxboot.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/mm/mm.c Deleted: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/multiboot.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/binh ive.c Added: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/load er.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/reac tos.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/regi stry.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/regi stry.h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/setu pldr.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/rtl/print.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/rtl/stdlib.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/tui.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr.xml Added: branches/cache_manager_rewrite/reactos/boot/freeldr/install/installfreel dr.xml Deleted: branches/cache_manager_rewrite/reactos/boot/freeldr/tools/bin2c.c Modified: branches/cache_manager_rewrite/reactos/bootdata/hivesys.inf Modified: branches/cache_manager_rewrite/reactos/bootdata/packages/reactos.dff Modified: branches/cache_manager_rewrite/reactos/bootdata/txtsetup.sif Modified: branches/cache_manager_rewrite/reactos/doc/README.WINE Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/fdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/detect.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/fdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/misc.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/pdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/serenum.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/serenum.h Modified: branches/cache_manager_rewrite/reactos/drivers/dd/blue/blue.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/bootvid.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/null/null.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/parallel/parallel.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/ramdrv/ramdrv.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/dirctl.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/fcb.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/rw.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/ntfs/attrib.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/ntfs/mft.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/vfat/rw.c Modified: branches/cache_manager_rewrite/reactos/drivers/lib/ip/network/receive.c Modified: branches/cache_manager_rewrite/reactos/drivers/lib/ip/transport/udp/udp. c Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/select.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/dd/pcnet/pcnet.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/dd/pcnet/pcnet.h Modified: branches/cache_manager_rewrite/reactos/drivers/net/ndis/ndis/buffer.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/ndis/ndis/io.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/ndis/ndis/miniport.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/npf/read.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/npf/win_bpf_filter.c Modified: branches/cache_manager_rewrite/reactos/drivers/storage/atapi/atapi.c Modified: branches/cache_manager_rewrite/reactos/drivers/storage/cdrom/cdrom.c Modified: branches/cache_manager_rewrite/reactos/drivers/storage/disk/disk.c Modified: branches/cache_manager_rewrite/reactos/drivers/storage/scsiport/scsiport .c Modified: branches/cache_manager_rewrite/reactos/drivers/usb/cromwell/linux/usb.h Modified: branches/cache_manager_rewrite/reactos/drivers/video/displays/vga/object s/bitblt.c Modified: branches/cache_manager_rewrite/reactos/drivers/video/displays/vga/object s/lineto.c Modified: branches/cache_manager_rewrite/reactos/drivers/video/displays/vga/object s/paint.c Modified: branches/cache_manager_rewrite/reactos/drivers/video/displays/vga/object s/pointer.c Modified: branches/cache_manager_rewrite/reactos/drivers/video/displays/vga/vgavid eo/vgavideo.c Modified: branches/cache_manager_rewrite/reactos/drivers/video/miniport/vga/initvg a.c Modified: branches/cache_manager_rewrite/reactos/drivers/video/miniport/xboxvmp/xb oxvmp.c Modified: branches/cache_manager_rewrite/reactos/drivers/video/miniport/xboxvmp/xb oxvmp.h [truncated at 100 lines; 555 more skipped] _____ Modified: branches/cache_manager_rewrite/reactos/Makefile --- branches/cache_manager_rewrite/reactos/Makefile 2005-08-14 13:45:00 UTC (rev 17384) +++ branches/cache_manager_rewrite/reactos/Makefile 2005-08-14 16:42:46 UTC (rev 17385) @@ -169,6 +169,7 @@ ECHO_MKHIVE =@echo $(QUOTE)[MKHIVE] $@$(QUOTE) ECHO_REGTESTS=@echo $(QUOTE)[REGTESTS] $@$(QUOTE) ECHO_TEST =@echo $(QUOTE)[TEST] $@$(QUOTE) + ECHO_GENDIB =@echo $(QUOTE)[GENDIB] $@$(QUOTE) else ECHO_CP = ECHO_MKDIR = @@ -196,6 +197,7 @@ ECHO_MKHIVE = ECHO_REGTESTS= ECHO_TEST = + ECHO_GENDIB = endif @@ -288,16 +290,19 @@ include lib/lib.mak include tools/tools.mak +include boot/freeldr/bootsect/bootsect.mak -include makefile.auto PREAUTO := \ + $(BIN2C_TARGET) \ $(BIN2RES_TARGET) \ $(BUILDNO_H) \ $(BUGCODES_H) \ $(BUGCODES_RC) \ $(ERRCODES_H) \ $(ERRCODES_RC) \ - $(NCI_SERVICE_FILES) + $(NCI_SERVICE_FILES) \ + $(GENDIB_DIB_FILES) makefile.auto: $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ECHO_RBUILD) _____ Modified: branches/cache_manager_rewrite/reactos/ReactOS.xml --- branches/cache_manager_rewrite/reactos/ReactOS.xml 2005-08-14 13:45:00 UTC (rev 17384) +++ branches/cache_manager_rewrite/reactos/ReactOS.xml 2005-08-14 16:42:46 UTC (rev 17385) @@ -28,11 +28,12 @@ <define name="KDBG" value="1" /> <property name="DBG_OR_KDBG" value="true" /> </if> + <compilerflag>-Wpointer-arith</compilerflag> <include>include</include> - <include>include/reactos</include> + <include>include/reactos</include> <include>w32api/include</include> - <include>w32api/include/ddk</include> + <include>w32api/include/ddk</include> <directory name="apps"> <xi:include href="apps/directory.xml" /> _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c --- branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c 2005-08-14 13:45:00 UTC (rev 17384) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c 2005-08-14 16:42:46 UTC (rev 17385) @@ -1,97 +1,465 @@ -/* - * arp - display ARP cache from the IP stack parameters. +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS arp utility + * FILE: apps/utils/net/arp/arp.c + * PURPOSE: view and manipulate the ARP cache + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 27/06/05 Created * - * This source code is in the PUBLIC DOMAIN and has NO WARRANTY. - * - * Robert Dickenson <robd(a)reactos.org>, August 15, 2002. */ + + +#include <windows.h> #include <stdio.h> -#include <windows.h> +#include <stdlib.h> #include <tchar.h> -#include <time.h> - -#include <iptypes.h> -#include <ipexport.h> +#include <string.h> +#include <ctype.h> +#include <winsock2.h> #include <iphlpapi.h> -#include <snmp.h> + +#define WIN32_LEAN_AND_MEAN +#define UNICODE +#define _UNICODE + +/* + * Globals + */ +const char SEPERATOR = '-'; + + + +/* + * function declerations + */ +INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr); +INT PrintEntries(PMIB_IPNETROW pIpAddRow); +INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr); +INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr); +VOID Usage(VOID); + + + +/* + * + * Takes optional parameters of an internet address and interface address. + * Retrieve all entries in the ARP cache. If an internet address is + * specified, display the ARP entry relating to that address. If an + * interface address is specified, display all entries relating to + * that interface. + * + */ +/* FIXME: allow user to specify an interface address, via pszIfAddr */ +INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) +{ + INT iRet; + UINT i, k; + PMIB_IPNETTABLE pIpNetTable; + PMIB_IPADDRTABLE pIpAddrTable; + ULONG ulSize = 0; + struct in_addr inaddr, inaddr2; + DWORD dwSize = 0; + PTCHAR pszIpAddr; + TCHAR szIntIpAddr[20]; + + /* Return required buffer size */ + GetIpNetTable(NULL, &ulSize, 0); + + /* allocate memory for ARP address table */ + pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE)); + ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); + + /* get Arp address table */ + if (pIpNetTable != NULL) { + GetIpNetTable(pIpNetTable, &ulSize, TRUE); + } else { + _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + free(pIpNetTable); + return -1; + } + + /* check there are entries in the table */ + if (pIpNetTable->dwNumEntries == 0) { + _tprintf(_T("No ARP entires found\n")); + free(pIpNetTable); + return -1; + } + + + + /* try doing this in the way it's done above, it's clearer */ + /* Retrieve the interface-to-ip address mapping + * table to get the IP address for adapter */ + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); + GetIpAddrTable(pIpAddrTable, &dwSize, 0); // NULL ? + -#include "trace.h" - -VOID WINAPI SnmpSvcInitUptime(); - -/////////////////////////////////////////////////////////////////////// ///////// - -const char szUsage[] = { "\n" \ - "Displays and modifies the IP Protocol to physical address translation tables\n" \ - "used by address resolution protocol (ARP).\n" \ - "\n" \ - "ARP -s inet_addr eth_addr [if_addr]\n" \ - "ARP -d inet_addr [if_addr]\n" \ - "ARP -a [inet_addr] [-N if_addr]\n" \ - "\n" \ - " -a Displays the active ARP table by querying the current protocol\n" \ - " data. If inet_addr is specified, the IP and physical addresses\n" \ - " for the specified address are displayed. If more than one\n" \ - " network interface is using ARP, each interfaces ARP table is\n" \ - " displayed.\n" \ - " -g Indentical to -a.\n" \ - " inet_addr Specifies the IP address.\n" \ - " -N if_addr Displays the ARP table for the specified interface only\n" \ - " -d Deletes the host entry specified by inet_addr. inet_addr may be\n" \ - " wildcarded with * to delete all host entries in the ARP table.\n" \ - " -s Adds the host and associates the IP address inet_addr with the\n" \ - " physical address eth_addr. The physical address must be specified\n" \ - " as 6 hexadecimal characters delimited by hyphens. The new entry\n" \ - " will become permanent in the ARP table.\n" \ - " eth_addr Specifies the interface physical address.\n" \ - " if_addr If present, this specifies the IP address of the interface whose\n" \ - " address translation table should be modified. If not present, the\n" \ - " first applicable interface will be used.\n" \ - "Example:\n" \ - " > arp -s 192.168.0.12 55-AA-55-01-02-03 .... Static entry creation.\n" \ - " > arp -a .... ARP table display.\n" \ - " > arp -d * .... Delete all ARP table entries.\n" -}; - -void usage(void) + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); + //ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable)); + + if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { // NO_ERROR = 0 + _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); + _tprintf(_T("error: %d\n"), WSAGetLastError()); + } + + + for (k=0; k < pIpAddrTable->dwNumEntries; k++) { + if (pIpNetTable->table[0].dwIndex == pIpAddrTable->table[k].dwIndex) { + //printf("printing pIpAddrTable->table[?].dwIndex = %lx\n", pIpNetTable->table[k].dwIndex); + inaddr2.s_addr = pIpAddrTable->table[k].dwAddr; + pszIpAddr = inet_ntoa(inaddr2); + strcpy(szIntIpAddr, pszIpAddr); + } + } + + + /* print header, including interface IP address and index number */ + _tprintf(_T("\nInterface: %s --- 0x%lx \n"), szIntIpAddr, pIpNetTable->table[0].dwIndex); + _tprintf(_T(" Internet Address Physical Address Type\n")); + + /* go through all ARP entries */ + for (i=0; i < pIpNetTable->dwNumEntries; i++) { + + /* if the user has supplied their own internet addesss * + * only print the arp entry which matches that */ + if (pszInetAddr) { + inaddr.S_un.S_addr = pIpNetTable->table[i].dwAddr; + pszIpAddr = inet_ntoa(inaddr); + + /* check if it matches, print it */ + if (strcmp(pszIpAddr, pszInetAddr) == 0) { + PrintEntries(&pIpNetTable->table[i]); + } + } else { + /* if an address is not supplied, print all entries */ + PrintEntries(&pIpNetTable->table[i]); + } + + } + + free(pIpNetTable); + free(pIpAddrTable); + + return 0; +} + + + +/* + * + * Takes an ARP entry and prints the IP address, + * the MAC address and the entry type to screen + * + */ +INT PrintEntries(PMIB_IPNETROW pIpAddRow) { -// fprintf(stderr,"USAGE:\n"); - fputs(szUsage, stderr); + IN_ADDR inaddr; + TCHAR cMacAddr[20]; + + /* print IP addresses */ + inaddr.S_un.S_addr = pIpAddRow->dwAddr; + _tprintf(_T(" %-22s"), inet_ntoa(inaddr)); //error checking + + /* print MAC address */ + _stprintf(cMacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"), + pIpAddRow->bPhysAddr[0], + pIpAddRow->bPhysAddr[1], + pIpAddRow->bPhysAddr[2], + pIpAddRow->bPhysAddr[3], + pIpAddRow->bPhysAddr[4], + pIpAddRow->bPhysAddr[5]); + _tprintf(_T("%-22s"), cMacAddr); + + /* print cache type */ + switch (pIpAddRow->dwType) { + case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n")); + break; + case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n")); + break; + case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n")); + break; + case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n")); + break; + } + return 0; } - -int main(int argc, char *argv[]) + + + +/* + * + * Takes an internet address, a MAC address and an optional interface + * address as arguments and checks their validity. + * Fill out an MIB_IPNETROW structure and insert the data into the + * ARP cache as a static entry. + * + */ +INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) { - TCHAR szComputerName[50]; - DWORD dwSize = 50; + PMIB_IPNETROW pAddHost; + PMIB_IPADDRTABLE pIpAddrTable; + DWORD dwIpAddr; + DWORD dwSize = 0; + INT iRet, i, val; + TCHAR c; + + /* error checking */ + + /* check IP address */ + if (pszInetAddr != NULL) { + if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) { + _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); + return -1; + } + } else { + Usage(); + return -1; + } + + /* check MAC address */ + if (strlen(pszEthAddr) != 17) { + _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); + return -1; + } + for (i=0; i<17; i++) { + if (pszEthAddr[i] == SEPERATOR) { + continue; + } + if (!isxdigit(pszEthAddr[i])) { + _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); + return -1; + } + } + + /* reserve memory on heap and zero */ + pAddHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW)); + ZeroMemory(pAddHost, sizeof(MIB_IPNETROW)); + + + + + /* set dwIndex field to the index of a local IP address to + * indicate the network on which the ARP entry applies */ + if (pszIfAddr) { + sscanf(pszIfAddr, "%lx", &pAddHost->dwIndex); + } else { + /* map the IP to the index */ + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); + GetIpAddrTable(pIpAddrTable, &dwSize, 0); + + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); + + if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { // NO_ERROR = 0 + _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); + _tprintf(_T("error: %d\n"), WSAGetLastError()); + } + printf("printing pIpAddrTable->table[0].dwIndex = %lx\n", pIpAddrTable->table[0].dwIndex); + pAddHost->dwIndex = 4; - int nBytes = 500; - BYTE* pCache; - - if (argc > 1) { - usage(); - return 1; + free(pIpAddrTable); } - - SnmpSvcInitUptime(); - - GetComputerName(szComputerName, &dwSize); - _tprintf(_T("ReactOS ARP cache on Computer Name: %s\n"), szComputerName); - - pCache = (BYTE*)SnmpUtilMemAlloc(nBytes); - - Sleep(2500); - - if (pCache != NULL) { - - DWORD dwUptime = SnmpSvcGetUptime(); - - _tprintf(_T("SNMP uptime: %ld\n"), dwUptime); - - SnmpUtilMemFree(pCache); + + /* Set MAC address to 6 bytes (typical) */ + pAddHost->dwPhysAddrLen = 6; + + + /* Encode bPhysAddr into correct byte array */ + for (i=0; i<6; i++) { + val =0; + c = toupper(pszEthAddr[i*3]); + c = c - (isdigit(c) ? '0' : ('A' - 10)); + val += c; + val = (val << 4); + c = toupper(pszEthAddr[i*3 + 1]); + c = c - (isdigit(c) ? '0' : ('A' - 10)); + val += c; + pAddHost->bPhysAddr[i] = val; + + } + + + /* copy converted IP address */ + pAddHost->dwAddr = dwIpAddr; + + + /* set type to static */ + pAddHost->dwType = MIB_IPNET_TYPE_STATIC; + + + /* Add the ARP entry */ + if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR) { + _tprintf(_T("The ARP entry addition failed: %d\n"), iRet); + return -1; + } + + free(pAddHost); + + return 0; +} + + + +/* + * + * Takes an internet address and an optional interface address as + * arguments and checks their validity. + * Add the interface number and IP to an MIB_IPNETROW structure + * and remove the entrty from the ARP cache. + * + */ +INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) +{ + PMIB_IPNETROW pDelHost; + PMIB_IPADDRTABLE pIpAddrTable; + DWORD dwIpAddr; + DWORD dwSize = 0; + INT iret; + + /* error checking */ + + /* check IP address */ + if (pszInetAddr != NULL) { + if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) { + _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); + return -1; + } } else { - _tprintf(_T("ERROR: call to SnmpUtilMemAlloc() failed\n")); - return 1; + Usage(); + return -1; } - return 0; + + + pIpAddrTable = (MIB_IPADDRTABLE*) malloc(sizeof(MIB_IPADDRTABLE)); + pDelHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW)); + ZeroMemory(pIpAddrTable, sizeof(MIB_IPADDRTABLE)); + ZeroMemory(pDelHost, sizeof(MIB_IPNETROW)); + /* set dwIndex field to the index of a local IP address to + * indicate the network on which the ARP entry applies */ + if (pszIfAddr) { + sscanf(pszIfAddr, "%lx", &pDelHost->dwIndex); + } else { + /* map the IP to the index */ + if (GetIpAddrTable(pIpAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) { + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); + } + if ((iret = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { + _tprintf(_T("GetIpAddrTable failed: %d\n"), iret); + _tprintf(_T("error: %d\n"), WSAGetLastError()); + } + pDelHost->dwIndex = 4; //pIpAddrTable->table[0].dwIndex; + } + + /* copy converted IP address */ + pDelHost->dwAddr = dwIpAddr; + + /* Add the ARP entry */ + if ((iret = DeleteIpNetEntry(pDelHost)) != NO_ERROR) { + _tprintf(_T("The ARP entry deletion failed: %d\n"), iret); + return -1; + } + + free(pIpAddrTable); + free(pDelHost); + + return 0; } - + + + +/* + * + * print program usage to screen + * + */ +VOID Usage(VOID) +{ + _tprintf(_T("\nDisplays and modifies the IP-to-Physical address translation tables used by\n" + "address resolution protocol (ARP).\n" + "\n" + "ARP -s inet_addr eth_addr [if_addr]\n" + "ARP -d inet_addr [if_addr]\n" + "ARP -a [inet_addr] [-N if_addr]\n" + "\n" + " -a Displays current ARP entries by interrogating the current\n" + " protocol data. If inet_addr is specified, the IP and Physical\n" + " addresses for only the specified computer are displayed. If\n" + " more than one network interface uses ARP, entries for each ARP\n" + " table are displayed.\n" + " -g Same as -a.\n" + " inet_addr Specifies an internet address.\n" + " -N if_addr Displays the ARP entries for the network interface specified\n" + " by if_addr.\n" + " -d Deletes the host specified by inet_addr. inet_addr may be\n" + " wildcarded with * to delete all hosts.\n" + " -s Adds the host and associates the Internet address inet_addr\n" + " with the Physical address eth_addr. The Physical address is\n" + " given as 6 hexadecimal bytes separated by hyphens. The entry\n" + " is permanent.\n" + " eth_addr Specifies a physical address.\n" + " if_addr If present, this specifies the Internet address of the\n" + " interface whose address translation table should be modified.\n" + " If not present, the first applicable interface will be used.\n" + "Example:\n" + " > arp -s 157.55.85.212 00-aa-00-62-c6-09 .... Adds a static entry.\n" + " > arp -a .... Displays the arp table.\n\n")); +} + + + +/* + * + * Program entry. + * Parse command line and call the required function + * + */ +INT main(int argc, char* argv[]) +{ + const char N[] = "-N"; + + if ((argc < 2) || (argc > 5)) + { + Usage(); + return FALSE; + } + + + if (argv[1][0] == '-') { + switch (argv[1][1]) { + /* FIX ME */ + /* need better control for -a, as -N might not be arg 4 */ + case 'a': if (argc == 2) + DisplayArpEntries(NULL, NULL); + else if (argc == 3) + DisplayArpEntries(argv[2], NULL); + else if ((argc == 5) && ((strcmp(argv[3], N)) == 0)) + DisplayArpEntries(argv[2], argv[4]); + else + Usage(); + break; + case 'g': break; + case 'd': if (argc == 3) + Deletehost(argv[2], NULL); + else if (argc == 4) + Deletehost(argv[2], argv[3]); + else + Usage(); + break; + case 's': if (argc == 4) + Addhost(argv[2], argv[3], NULL); + else if (argc == 5) + Addhost(argv[2], argv[3], argv[4]); + else + Usage(); + break; + default: + Usage(); + return -1; + } + } else { + Usage(); + return -1; + } + + return 0; +} _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.rc --- branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.rc 2005-08-14 13:45:00 UTC (rev 17384) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.rc 2005-08-14 16:42:46 UTC (rev 17385) @@ -1,6 +1,5 @@ -/* $Id$ */ - #define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 arp\0" #define REACTOS_STR_INTERNAL_NAME "arp\0" #define REACTOS_STR_ORIGINAL_FILENAME "arp.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy (gedmurphy(a)gmail.com)\0" #include <reactos/version.rc> _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.xml --- branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.xml 2005-08-14 13:45:00 UTC (rev 17384) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.xml 2005-08-14 16:42:46 UTC (rev 17385) @@ -2,8 +2,10 @@ <include base="arp">.</include> <define name="__USE_W32API" /> <library>kernel32</library> - <library>user32</library> - <library>snmpapi</library> + <library>iphlpapi</library> + <library>ws2_32</library> + <library>shlwapi</library> <file>arp.c</file> <file>arp.rc</file> </module> + _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/net.c --- branches/cache_manager_rewrite/reactos/apps/utils/net/finger/net.c 2005-08-14 13:45:00 UTC (rev 17384) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/finger/net.c 2005-08-14 16:42:46 UTC (rev 17385) @@ -59,7 +59,7 @@ return; *host++ = '\0'; - if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != -1) { + if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != (unsigned long)-1) { def.h_name = host; def.h_addr_list = alist; def.h_addr = (char *)&defaddr; _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/fake.c --- branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/fake.c 2005-08-14 13:45:00 UTC (rev 17384) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/fake.c 2005-08-14 16:42:46 UTC (rev 17385) @@ -100,7 +100,7 @@ index = 0; total = recv(s, buffer, sizeof(buffer), 0); - if (total == INVALID_SOCKET) + if (total == SOCKET_ERROR) { total = 0; return ERROR; _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp.c --- branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp.c 2005-08-14 13:45:00 UTC (rev 17384) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp.c 2005-08-14 16:42:46 UTC (rev 17385) @@ -119,7 +119,7 @@ bzero((char *)&hisctladdr, sizeof (hisctladdr)); hisctladdr.sin_addr.s_addr = inet_addr(host); - if (hisctladdr.sin_addr.s_addr != -1) { + if (hisctladdr.sin_addr.s_addr != (unsigned long)-1) { hisctladdr.sin_family = AF_INET; (void) strncpy(hostnamebuf, host, sizeof(hostnamebuf)); } else { _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ipconfig/ipconfig. c --- branches/cache_manager_rewrite/reactos/apps/utils/net/ipconfig/ipconfig. c 2005-08-14 13:45:00 UTC (rev 17384) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/ipconfig/ipconfig. c 2005-08-14 16:42:46 UTC (rev 17385) @@ -1,10 +1,30 @@ +/* $Id: ipconfig.c + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Ipconfig utility + * FILE: apps/utils/net/ipconfig/ipconfig.c + * PURPOSE: Show and set network interface IP parameters + */ /* - * ipconfig - display IP stack parameters. + * History: * - * This source code is in the PUBLIC DOMAIN and has NO WARRANTY. + * 15/8/2002 (Robert Dickenson <robd(a)reactos.org>) + * Original version (PUBLIC DOMAIN and NO WARRANTY) * - * Robert Dickenson <robd(a)reactos.org>, August 15, 2002. - */ + * 26/6/2005 (Tim Jobling <tjob800(a)yahoo.co.uk>) + * Relicense to GPL. + * Display NodeType with meaningfull Human readable names. + * Exclusively use TCHAR strings. + * Display Physical Address, DHCP enabled state, IP Addresses/Netmasks, + * Default Gateway, DHCP server and DHCP Lease times. + * Parse command line options. + * Default to only showing the IP/SM/DG is no options specified + * Handel option: /All and /? + * Display message about all unimplemented options. + * Changed C++ style commenting to C style + * +*/ + #include <stdio.h> #include <windows.h> #include <tchar.h> @@ -18,8 +38,6 @@ #include "trace.h" #endif -/////////////////////////////////////////////////////////////////////// ///////// - /* imported from iphlpapi.dll GetAdapterOrderMap @@ -30,18 +48,43 @@ */ -static TCHAR* GetNodeTypeName(int nNodeType) +static TCHAR* GetNodeTypeName(UINT nNodeType) { switch (nNodeType) { - case 0: return _T("zero"); - case 1: return _T("one"); - case 2: return _T("two"); - case 3: return _T("three"); - case 4: return _T("mixed"); + case 1: return _T("Broadcast"); + case 2: return _T("Peer To Peer"); + case 4: return _T("Mixed"); + case 8: return _T("Hybrid"); default: return _T("unknown"); } } +static TCHAR* GetInterfaceTypeName(UINT nInterfaceType) +{ + switch (nInterfaceType) { + case MIB_IF_TYPE_OTHER: return _T("Other"); + case MIB_IF_TYPE_ETHERNET: return _T("Ethernet"); + case MIB_IF_TYPE_TOKENRING: return _T("Token Ring"); + case MIB_IF_TYPE_FDDI: return _T("FDDI"); + case MIB_IF_TYPE_PPP: return _T("PPP"); + case MIB_IF_TYPE_LOOPBACK: return _T("Loopback"); + case MIB_IF_TYPE_SLIP: return _T("SLIP"); + default: return _T("unknown"); + } +} + +void PrintPhysicalAddr(PBYTE Addr, UINT len) +{ + UINT i=0; + for (i=0; i<len; i++) + { + _tprintf(_T("%02X"), Addr[i]); + if ((i+1)<len) + _tprintf(_T("-")); + } + _tprintf(_T("\n")); +} + static void ShowNetworkFixedInfo() { FIXED_INFO* pFixedInfo = NULL; @@ -64,27 +107,28 @@ if (result == ERROR_SUCCESS) { IP_ADDR_STRING* pIPAddr; - printf("\tHostName. . . . . . . . . . . : %s\n", pFixedInfo->HostName); - printf("\tDomainName. . . . . . . . . . : %s\n", pFixedInfo->DomainName); -// - printf("\tDNS Servers . . . . . . . . . : %s\n", pFixedInfo->DnsServerList.IpAddress.String); + _tprintf(_T("\tHostName. . . . . . . . . . . : %s\n"), pFixedInfo->HostName); + _tprintf(_T("\tDomainName. . . . . . . . . . : %s\n"), pFixedInfo->DomainName); + + _tprintf(_T("\tDNS Servers . . . . . . . . . : %s\n"), pFixedInfo->DnsServerList.IpAddress.String); pIPAddr = pFixedInfo->DnsServerList.Next; while (pIPAddr) { - printf("\t\t\t\t : %s\n", pIPAddr->IpAddress.String); + _tprintf(_T("\t\t\t\t : %s\n"), pIPAddr->IpAddress.String); pIPAddr = pIPAddr->Next; } -// + _tprintf(_T("\tNodeType. . . . . . . . . . . : %d (%s)\n"), pFixedInfo->NodeType, GetNodeTypeName(pFixedInfo->NodeType)); - printf("\tScopeId . . . . . . . . . . . : %s\n", pFixedInfo->ScopeId); + _tprintf(_T("\tScopeId . . . . . . . . . . . : %s\n"), pFixedInfo->ScopeId); _tprintf(_T("\tEnableRouting . . . . . . . . : %s\n"), pFixedInfo->EnableRouting ? _T("yes") : _T("no")); _tprintf(_T("\tEnableProxy . . . . . . . . . : %s\n"), pFixedInfo->EnableProxy ? _T("yes") : _T("no")); _tprintf(_T("\tEnableDns . . . . . . . . . . : %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no")); _tprintf(_T("\n")); - //_tprintf(_T("\n"),); - //_tprintf(_T("GetNetworkParams() returned with %d\n"), pIfTable->NumAdapters); +/* + _tprintf(_T("\n"),); + _tprintf(_T("GetNetworkParams() returned with %d\n"), pIfTable->NumAdapters); -// _tprintf(_T("\tConnection specific DNS suffix: %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no")); - + _tprintf(_T("\tConnection specific DNS suffix: %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no")); +*/ } else { switch (result) { case ERROR_BUFFER_OVERFLOW: @@ -121,10 +165,11 @@ } result = GetInterfaceInfo(pIfTable, &dwOutBufLen); -// dwOutBufLen = sizeof(IP_INTERFACE_INFO) + dwNumIf * sizeof(IP_ADAPTER_INDEX_MAP); -// _tprintf(_T("GetNumberOfInterfaces() returned %d, dwOutBufLen %d\n"), dwNumIf, dwOutBufLen); -// _tprintf(_T("sizeof(IP_INTERFACE_INFO) %d, sizeof(IP_ADAPTER_INDEX_MAP) %d\n"), sizeof(IP_INTERFACE_INFO), sizeof(IP_ADAPTER_INDEX_MAP)); - +/* + dwOutBufLen = sizeof(IP_INTERFACE_INFO) + dwNumIf * sizeof(IP_ADAPTER_INDEX_MAP); + _tprintf(_T("GetNumberOfInterfaces() returned %d, dwOutBufLen %d\n"), dwNumIf, dwOutBufLen); + _tprintf(_T("sizeof(IP_INTERFACE_INFO) %d, sizeof(IP_ADAPTER_INDEX_MAP) %d\n"), sizeof(IP_INTERFACE_INFO), sizeof(IP_ADAPTER_INDEX_MAP)); +*/ pIfTable = (IP_INTERFACE_INFO*)malloc(dwOutBufLen); if (!pIfTable) { _tprintf(_T("ERROR: failed to allocate 0x%08lX bytes of memory\n"), dwOutBufLen); @@ -143,17 +188,13 @@ */ result = GetInterfaceInfo(pIfTable, &dwOutBufLen); if (result == NO_ERROR) { - int i; + UINT i; _tprintf(_T("GetInterfaceInfo() returned with %ld adaptor entries\n"), pIfTable->NumAdapters); for (i = 0; i < pIfTable->NumAdapters; i++) { wprintf(L"[%d] %s\n", i + 1, pIfTable->Adapter[i].Name); - //wprintf(L"[%d] %s\n", pIfTable->Adapter[i].Index, pIfTable->Adapter[i].Name); + /*wprintf(L"[%d] %s\n", pIfTable->Adapter[i].Index, pIfTable->Adapter[i].Name);*/ -// \DEVICE\TCPIP_{DB0E61C1-3498-4C5F-B599-59CDE8A1E357} -// \DEVICE\TCPIP_{BD445697-0945-4591-AE7F-2AB0F383CA87} -// \DEVICE\TCPIP_{6D87DC08-6BC5-4E78-AB5F-18CAB785CFFE} - -//HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\NetBT\Parameters \Interfaces\Tcpip_{DB0E61C1-3498-4C5F-B599-59CDE8A1E357} +/*HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\NetBT\Parameters \Interfaces\Tcpip_{DB0E61C1-3498-4C5F-B599-59CDE8A1E357}*/ } } else { switch (result) { @@ -213,13 +254,20 @@ a Lease Obtained. . . . . . . . . . : Monday, 30 December 2002 5:56:53 PM b Lease Expires . . . . . . . . . . : Monday, 30 December 2002 6:26:53 PM */ -static void ShowAdapterInfo() +static void ShowAdapterInfo(BOOL ShowAll) { IP_ADAPTER_INFO* pAdaptorInfo; ULONG ulOutBufLen; DWORD dwRetVal; + PIP_ADDR_STRING pIpAddrString; + struct tm *LeaseTime; - _tprintf(_T("\nAdaptor Information\t\n")); + + if (ShowAll) + { + _tprintf(_T("\nAdaptor Information\t\n")); + } + pAdaptorInfo = (IP_ADAPTER_INFO*)GlobalAlloc(GPTR, sizeof(IP_ADAPTER_INFO)); ulOutBufLen = sizeof(IP_ADAPTER_INFO); @@ -231,14 +279,57 @@ _tprintf(_T("Call to GetAdaptersInfo failed. Return Value: 0x%08lx\n"), dwRetVal); } else { while (pAdaptorInfo) { - printf(" AdapterName: %s\n", pAdaptorInfo->AdapterName); - printf(" Description: %s\n", pAdaptorInfo->Description); + + /* print the type of interface before the Name of it */ + _tprintf(_T("\n%s Adapter %s:\n\n"), GetInterfaceTypeName(pAdaptorInfo->Type), pAdaptorInfo->AdapterName); + + if (ShowAll) + { + _tprintf(_T("\tDescription. . . . . . : %s\n"), pAdaptorInfo->Description); + + /* print the Physical address to the screen*/ + _tprintf(_T("\tPhysical Address . . . : ")); + PrintPhysicalAddr(pAdaptorInfo->Address, pAdaptorInfo->AddressLength); + + /* Now the DHCP state */ + _tprintf(_T("\tDHCP Enabled . . . . . : %s\n"), pAdaptorInfo->DhcpEnabled ? _T("Yes") : _T("No")); + } + + /* IP Addresses/Netmasks, there may be more than one */ + pIpAddrString = &pAdaptorInfo->IpAddressList; + + do{ + _tprintf(_T("\tIP Address . . . . . . : %s\n"), pIpAddrString->IpAddress.String); + _tprintf(_T("\tSubnet Mask. . . . . . : %s\n"), pIpAddrString->IpMask.String); + pIpAddrString = pIpAddrString->Next; + }while (pIpAddrString!=NULL); + + /* Default Gateway */ + pIpAddrString = &pAdaptorInfo->GatewayList; + _tprintf(_T("\tDefault Gateway. . . . : %s\n"), pIpAddrString->IpAddress.String); + + /* Print some stuff that is only relevant it dhcp is enabled */ + if((pAdaptorInfo->DhcpEnabled)&&(ShowAll)) + { + /* Display the DHCP server address */ + pIpAddrString = &pAdaptorInfo->DhcpServer; + _tprintf(_T("\tDHCP Server. . . . . . : %s\n"), pIpAddrString->IpAddress.String); + + /* Display the Lease times*/ + LeaseTime = localtime(&pAdaptorInfo->LeaseObtained); + _tprintf(_T("\tLease Obtained . . . . : %s"), asctime(LeaseTime)); + + LeaseTime = localtime(&pAdaptorInfo->LeaseExpires); + _tprintf(_T("\tLease Expieres . . . . : %s"), asctime(LeaseTime)); + + } + pAdaptorInfo = pAdaptorInfo->Next; } } } -const char szUsage[] = { "USAGE:\n" \ +const TCHAR szUsage[] = { _T("USAGE:\n" \ " ipconfig [/? | /all | /release [adapter] | /renew [adapter]\n" \ " | /flushdns | /registerdns\n" \ " | /showclassid adapter\n" \ @@ -259,7 +350,7 @@ " /setclassid Modifies the dhcp class id.\n" \ "\n" \ "The default is to display only the IP address, subnet mask and\n" \ - "default gateway for each adapter bound to TCP/IP.\n" + "default gateway for each adapter bound to TCP/IP.\n") }; /* "\n" \ @@ -279,21 +370,114 @@ static void usage(void) { - fputs(szUsage, stderr); + _fputts(szUsage, stderr); } -int main(int argc, char *argv[]) +int _tmain(int argc, TCHAR *argv[]) { - // 10.0.0.100 // As of build 0.0.20 this is hardcoded in the ip stack + BOOL DoUsage=FALSE; + BOOL DoAll=FALSE; + BOOL DoRelease=FALSE; + BOOL DoRenew=FALSE; + BOOL DoFlushdns=FALSE; + BOOL DoRegisterdns=FALSE; + BOOL DoDisplaydns=FALSE; + BOOL DoShowclassid=FALSE; + BOOL DoSetclassid=FALSE; - if (argc > 1) { - usage(); - return 1; + _tprintf(_T("\nReactOS IP Configuration\n\n")); + + /* + Parse command line for options we have been given. + */ + if ( ((argc > 1))&&((argv[1][0]=='/')||(argv[1][0]=='-')) ) + { + if( !_tcsicmp( &argv[1][1], _T("?") )) + { + DoUsage = TRUE; + } + else if( !_tcsnicmp( &argv[1][1], _T("ALL"), _tcslen(&argv[1][1]) )) + { + DoAll = TRUE; + } + else if( !_tcsnicmp( &argv[1][1], _T("RELEASE"), _tcslen(&argv[1][1]) )) + { + DoRelease = TRUE; + } + else if( ! _tcsnicmp( &argv[1][1], _T("RENEW"), _tcslen(&argv[1][1]) )) + { + DoRenew = TRUE; + } + else if( ! _tcsnicmp( &argv[1][1], _T("FLUSHDNS"), _tcslen(&argv[1][1]) )) + { [truncated at 1000 lines; 71690 more skipped]

19 years, 4 months

[hbirr] 17384: Merged r16362:16363 from trunk.

by hbirr＠svn.reactos.com

Merged r16362:16363 from trunk. Added: branches/cache_manager_rewrite/reactos/include/epsapi/ Deleted: branches/cache_manager_rewrite/reactos/include/epsapi.h Added: branches/cache_manager_rewrite/reactos/include/expat/ Added: branches/cache_manager_rewrite/reactos/include/fmifs/ Deleted: branches/cache_manager_rewrite/reactos/include/fmifs.h Added: branches/cache_manager_rewrite/reactos/include/samlib/ Deleted: branches/cache_manager_rewrite/reactos/include/samlib.h Deleted: branches/cache_manager_rewrite/reactos/lib/expat/lib/expat.h Deleted: branches/cache_manager_rewrite/reactos/lib/expat/lib/expat_external.h Modified: branches/cache_manager_rewrite/reactos/lib/expat/lib/xmlparse.c Modified: branches/cache_manager_rewrite/reactos/lib/expat/lib/xmlrole.c Modified: branches/cache_manager_rewrite/reactos/lib/expat/lib/xmltok.c Modified: branches/cache_manager_rewrite/reactos/subsys/system/explorer/utility/xm lstorage.h Modified: branches/cache_manager_rewrite/reactos/subsys/system/ibrowser/utility/xm lstorage.h _____ Copied: branches/cache_manager_rewrite/reactos/include/epsapi (from rev 16363, trunk/reactos/include/epsapi) _____ Deleted: branches/cache_manager_rewrite/reactos/include/epsapi.h --- branches/cache_manager_rewrite/reactos/include/epsapi.h 2005-08-14 13:42:08 UTC (rev 17383) +++ branches/cache_manager_rewrite/reactos/include/epsapi.h 2005-08-14 13:45:00 UTC (rev 17384) @@ -1,135 +0,0 @@ -/* $Id$ -*/ -/* - * epsapi.h - * - * Process Status Helper API, native interface - * - * This file is part of the ReactOS Operating System. - * - * Contributors: - * Created by KJK::Hyperion <noog(a)libero.it> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __EPSAPI_H_INCLUDED__ -#define __EPSAPI_H_INCLUDED__ - -/* TYPES */ -typedef NTSTATUS (NTAPI *PPROC_ENUM_ROUTINE)(IN PSYSTEM_PROCESS_INFORMATION CurrentProcess, - IN OUT PVOID CallbackContext); - -typedef NTSTATUS (NTAPI *PTHREAD_ENUM_ROUTINE)(IN PSYSTEM_THREAD_INFORMATION CurrentThread, - IN OUT PVOID CallbackContext); - -typedef NTSTATUS (NTAPI *PSYSMOD_ENUM_ROUTINE)(IN PSYSTEM_MODULE_INFORMATION_ENTRY CurrentModule, - IN OUT PVOID CallbackContext); - -typedef NTSTATUS (NTAPI *PPROCMOD_ENUM_ROUTINE)(IN HANDLE ProcessHandle, - IN PLDR_DATA_TABLE_ENTRY CurrentModule, - IN OUT PVOID CallbackContext); - -/* CONSTANTS */ -#define FAILED_WITH_STATUS DEFINE_DBG_MSG("%s() failed, status 0x%08X") - -/* PROTOTYPES */ -/* Processes and threads */ -/* enumeration */ -NTSTATUS NTAPI -PsaEnumerateProcessesAndThreads(IN PPROC_ENUM_ROUTINE ProcessCallback, - IN OUT PVOID ProcessCallbackContext, - IN PTHREAD_ENUM_ROUTINE ThreadCallback, - IN OUT PVOID ThreadCallbackContext); - -NTSTATUS NTAPI -PsaEnumerateProcesses(IN PPROC_ENUM_ROUTINE Callback, - IN OUT PVOID CallbackContext); - -NTSTATUS NTAPI -PsaEnumerateThreads(IN PTHREAD_ENUM_ROUTINE Callback, - IN OUT PVOID CallbackContext); - -/* capturing & walking */ -NTSTATUS NTAPI -PsaCaptureProcessesAndThreads(OUT PSYSTEM_PROCESS_INFORMATION * ProcessesAndThreads); - -NTSTATUS NTAPI -PsaWalkProcessesAndThreads(IN PSYSTEM_PROCESS_INFORMATION ProcessesAndThreads, - IN PPROC_ENUM_ROUTINE ProcessCallback, - IN OUT PVOID ProcessCallbackContext, - IN PTHREAD_ENUM_ROUTINE ThreadCallback, - IN OUT PVOID ThreadCallbackContext); - -NTSTATUS NTAPI -PsaWalkProcesses(IN PSYSTEM_PROCESS_INFORMATION ProcessesAndThreads, - IN PPROC_ENUM_ROUTINE Callback, - IN OUT PVOID CallbackContext); - -NTSTATUS NTAPI -PsaWalkThreads(IN PSYSTEM_PROCESS_INFORMATION ProcessesAndThreads, - IN PTHREAD_ENUM_ROUTINE Callback, - IN OUT PVOID CallbackContext); - -PSYSTEM_PROCESS_INFORMATION FASTCALL -PsaWalkFirstProcess(IN PSYSTEM_PROCESS_INFORMATION ProcessesAndThreads); - -PSYSTEM_PROCESS_INFORMATION FASTCALL -PsaWalkNextProcess(IN PSYSTEM_PROCESS_INFORMATION CurrentProcess); - -PSYSTEM_THREAD_INFORMATION FASTCALL -PsaWalkFirstThread(IN PSYSTEM_PROCESS_INFORMATION CurrentProcess); - -PSYSTEM_THREAD_INFORMATION FASTCALL -PsaWalkNextThread(IN PSYSTEM_THREAD_INFORMATION CurrentThread); - -/* System modules */ -/* enumeration */ -NTSTATUS NTAPI -PsaEnumerateSystemModules(IN PSYSMOD_ENUM_ROUTINE Callback, - IN OUT PVOID CallbackContext); - -/* capturing & walking */ -NTSTATUS NTAPI -PsaCaptureSystemModules(OUT PSYSTEM_MODULE_INFORMATION * SystemModules); - -NTSTATUS NTAPI -PsaWalkSystemModules(IN PSYSTEM_MODULE_INFORMATION SystemModules, - IN PSYSMOD_ENUM_ROUTINE Callback, - IN OUT PVOID CallbackContext); - -PSYSTEM_MODULE_INFORMATION_ENTRY FASTCALL -PsaWalkFirstSystemModule(IN PSYSTEM_MODULE_INFORMATION SystemModules); - -PSYSTEM_MODULE_INFORMATION_ENTRY FASTCALL -PsaWalkNextSystemModule(IN PSYSTEM_MODULE_INFORMATION CurrentSystemModule); - -/* Process modules */ -NTSTATUS NTAPI -PsaEnumerateProcessModules(IN HANDLE ProcessHandle, - IN PPROCMOD_ENUM_ROUTINE Callback, - IN OUT PVOID CallbackContext); - -/* Miscellaneous */ -VOID NTAPI -PsaFreeCapture(IN PVOID Capture); - -/* The user must define these functions. They are called by PSAPI to allocate - memory. This allows PSAPI to be called from any environment */ -void *PsaiMalloc(SIZE_T size); -void *PsaiRealloc(void *ptr, SIZE_T size); -void PsaiFree(void *ptr); - -/* MACROS */ -#define DEFINE_DBG_MSG(__str__) "PSAPI: " __str__ "\n" - -#endif /* __EPSAPI_H_INCLUDED__ */ _____ Copied: branches/cache_manager_rewrite/reactos/include/expat (from rev 16363, trunk/reactos/include/expat) _____ Copied: branches/cache_manager_rewrite/reactos/include/fmifs (from rev 16363, trunk/reactos/include/fmifs) _____ Deleted: branches/cache_manager_rewrite/reactos/include/fmifs.h --- branches/cache_manager_rewrite/reactos/include/fmifs.h 2005-08-14 13:42:08 UTC (rev 17383) +++ branches/cache_manager_rewrite/reactos/include/fmifs.h 2005-08-14 13:45:00 UTC (rev 17384) @@ -1,126 +0,0 @@ -#ifndef _FMIFS_H -#define _FMIFS_H -/* $Id$ - * - * fmifs.h - * - * Copyright (c) 1998 Mark Russinovich - * Systems Internals - * http://www.sysinternals.com - * - * Typedefs and definitions for using chkdsk and formatex - * functions exported by the fmifs.dll library. - * - * --- - * - * 1999-02-18 (Emanuele Aliberti) - * Normalized function names. - * - */ - -/* Output command */ -typedef -struct -{ - ULONG Lines; - PCHAR Output; - -} TEXTOUTPUT, *PTEXTOUTPUT; - - -/* Callback command types */ -typedef -enum -{ - PROGRESS, - DONEWITHSTRUCTURE, - UNKNOWN2, - UNKNOWN3, - UNKNOWN4, - UNKNOWN5, - INSUFFICIENTRIGHTS, - UNKNOWN7, - UNKNOWN8, - UNKNOWN9, - UNKNOWNA, - DONE, - UNKNOWNC, - UNKNOWND, - OUTPUT, - STRUCTUREPROGRESS - -} CALLBACKCOMMAND; - - -/* FMIFS callback definition */ -typedef -BOOLEAN -(STDCALL * PFMIFSCALLBACK) ( - CALLBACKCOMMAND Command, - ULONG SubAction, - PVOID ActionInfo - ); - -/* Chkdsk command in FMIFS */ -VOID -STDCALL -Chkdsk( - PWCHAR DriveRoot, - PWCHAR Format, - BOOLEAN CorrectErrors, - BOOLEAN Verbose, - BOOLEAN CheckOnlyIfDirty, - BOOLEAN ScanDrive, - PVOID Unused2, - PVOID Unused3, - PFMIFSCALLBACK Callback - ); - -/* ChkdskEx command in FMIFS (not in the original) */ -VOID -STDCALL -ChkDskEx( - PWCHAR DriveRoot, - PWCHAR Format, - BOOLEAN CorrectErrors, - BOOLEAN Verbose, - BOOLEAN CheckOnlyIfDirty, - BOOLEAN ScanDrive, - PVOID Unused2, - PVOID Unused3, - PFMIFSCALLBACK Callback - ); - -/* DiskCopy command in FMIFS */ - -VOID -STDCALL -DiskCopy(VOID); - -/* Enable/Disable volume compression */ -BOOL -STDCALL -EnableVolumeCompression( - PWCHAR DriveRoot, - USHORT Compression - ); - -/* Format command in FMIFS */ - -/* media flags */ -#define FMIFS_HARDDISK 0xC -#define FMIFS_FLOPPY 0x8 - -VOID -STDCALL -FormatEx( - PWCHAR DriveRoot, - ULONG MediaFlag, - PWCHAR Format, - PWCHAR Label, - BOOLEAN QuickFormat, - ULONG ClusterSize, - PFMIFSCALLBACK Callback - ); - -#endif /* ndef _FMIFS_H */ _____ Copied: branches/cache_manager_rewrite/reactos/include/samlib (from rev 16363, trunk/reactos/include/samlib) _____ Deleted: branches/cache_manager_rewrite/reactos/include/samlib.h --- branches/cache_manager_rewrite/reactos/include/samlib.h 2005-08-14 13:42:08 UTC (rev 17383) +++ branches/cache_manager_rewrite/reactos/include/samlib.h 2005-08-14 13:45:00 UTC (rev 17384) @@ -1,53 +0,0 @@ -/* $Id$ -*/ -/* - * samlib.h - * - * Security Account Manager API, native interface - * - * This file is part of the ReactOS Operating System. - * - * Contributors: - * Created by Eric Kohl <ekohl(a)rz-online.de> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __SAMLIB_H_INCLUDED__ -#define __SAMLIB_H_INCLUDED__ - - -BOOL STDCALL -SamInitializeSAM (VOID); - -BOOL STDCALL -SamGetDomainSid (PSID *Sid); - -BOOL STDCALL -SamSetDomainSid (PSID Sid); - -BOOL STDCALL -SamCreateUser (PWSTR UserName, - PWSTR UserPassword, - PSID UserSid); - -BOOL STDCALL -SamCheckUserPassword (PWSTR UserName, - PWSTR UserPassword); - -BOOL STDCALL -SamGetUserSid (PWSTR UserName, - PSID *Sid); - -#endif /* __SAMLIB_H_INCLUDED__ */ - -/* EOF */ _____ Deleted: branches/cache_manager_rewrite/reactos/lib/expat/lib/expat.h --- branches/cache_manager_rewrite/reactos/lib/expat/lib/expat.h 2005-08-14 13:42:08 UTC (rev 17383) +++ branches/cache_manager_rewrite/reactos/lib/expat/lib/expat.h 2005-08-14 13:45:00 UTC (rev 17384) @@ -1,1013 +0,0 @@ -/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd - See the file COPYING for copying permission. -*/ - -#ifndef Expat_INCLUDED -#define Expat_INCLUDED 1 - -#ifdef __VMS -/* 0 1 2 3 0 1 2 3 - 1234567890123456789012345678901 1234567890123456789012345678901 */ -#define XML_SetProcessingInstructionHandler XML_SetProcessingInstrHandler -#define XML_SetUnparsedEntityDeclHandler XML_SetUnparsedEntDeclHandler -#define XML_SetStartNamespaceDeclHandler XML_SetStartNamespcDeclHandler -#define XML_SetExternalEntityRefHandlerArg XML_SetExternalEntRefHandlerArg -#endif - -#include <stdlib.h> -#include "expat_external.h" - -#ifdef __cplusplus -extern "C" { -#endif - -struct XML_ParserStruct; -typedef struct XML_ParserStruct *XML_Parser; - -/* Should this be defined using stdbool.h when C99 is available? */ -typedef unsigned char XML_Bool; -#define XML_TRUE ((XML_Bool) 1) -#define XML_FALSE ((XML_Bool) 0) - -/* The XML_Status enum gives the possible return values for several - API functions. The preprocessor #defines are included so this - stanza can be added to code that still needs to support older - versions of Expat 1.95.x: - - #ifndef XML_STATUS_OK - #define XML_STATUS_OK 1 - #define XML_STATUS_ERROR 0 - #endif - - Otherwise, the #define hackery is quite ugly and would have been - dropped. -*/ -enum XML_Status { - XML_STATUS_ERROR = 0, -#define XML_STATUS_ERROR XML_STATUS_ERROR - XML_STATUS_OK = 1, -#define XML_STATUS_OK XML_STATUS_OK - XML_STATUS_SUSPENDED = 2 -#define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED -}; - -enum XML_Error { - XML_ERROR_NONE, - XML_ERROR_NO_MEMORY, - XML_ERROR_SYNTAX, - XML_ERROR_NO_ELEMENTS, - XML_ERROR_INVALID_TOKEN, - XML_ERROR_UNCLOSED_TOKEN, - XML_ERROR_PARTIAL_CHAR, - XML_ERROR_TAG_MISMATCH, - XML_ERROR_DUPLICATE_ATTRIBUTE, - XML_ERROR_JUNK_AFTER_DOC_ELEMENT, - XML_ERROR_PARAM_ENTITY_REF, - XML_ERROR_UNDEFINED_ENTITY, - XML_ERROR_RECURSIVE_ENTITY_REF, - XML_ERROR_ASYNC_ENTITY, - XML_ERROR_BAD_CHAR_REF, - XML_ERROR_BINARY_ENTITY_REF, - XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF, - XML_ERROR_MISPLACED_XML_PI, - XML_ERROR_UNKNOWN_ENCODING, - XML_ERROR_INCORRECT_ENCODING, - XML_ERROR_UNCLOSED_CDATA_SECTION, - XML_ERROR_EXTERNAL_ENTITY_HANDLING, - XML_ERROR_NOT_STANDALONE, - XML_ERROR_UNEXPECTED_STATE, - XML_ERROR_ENTITY_DECLARED_IN_PE, - XML_ERROR_FEATURE_REQUIRES_XML_DTD, - XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING, - /* Added in 1.95.7. */ - XML_ERROR_UNBOUND_PREFIX, - /* Added in 1.95.8. */ - XML_ERROR_UNDECLARING_PREFIX, - XML_ERROR_INCOMPLETE_PE, - XML_ERROR_XML_DECL, - XML_ERROR_TEXT_DECL, - XML_ERROR_PUBLICID, - XML_ERROR_SUSPENDED, - XML_ERROR_NOT_SUSPENDED, - XML_ERROR_ABORTED, - XML_ERROR_FINISHED, - XML_ERROR_SUSPEND_PE, - /* Added in 2.0. */ - XML_ERROR_RESERVED_PREFIX_XML, - XML_ERROR_RESERVED_PREFIX_XMLNS, - XML_ERROR_RESERVED_NAMESPACE_URI -}; - -enum XML_Content_Type { - XML_CTYPE_EMPTY = 1, - XML_CTYPE_ANY, - XML_CTYPE_MIXED, - XML_CTYPE_NAME, - XML_CTYPE_CHOICE, - XML_CTYPE_SEQ -}; - -enum XML_Content_Quant { - XML_CQUANT_NONE, - XML_CQUANT_OPT, - XML_CQUANT_REP, - XML_CQUANT_PLUS -}; - -/* If type == XML_CTYPE_EMPTY or XML_CTYPE_ANY, then quant will be - XML_CQUANT_NONE, and the other fields will be zero or NULL. - If type == XML_CTYPE_MIXED, then quant will be NONE or REP and - numchildren will contain number of elements that may be mixed in - and children point to an array of XML_Content cells that will be - all of XML_CTYPE_NAME type with no quantification. - - If type == XML_CTYPE_NAME, then the name points to the name, and - the numchildren field will be zero and children will be NULL. The - quant fields indicates any quantifiers placed on the name. - - CHOICE and SEQ will have name NULL, the number of children in - numchildren and children will point, recursively, to an array - of XML_Content cells. - - The EMPTY, ANY, and MIXED types will only occur at top level. -*/ - -typedef struct XML_cp XML_Content; - -struct XML_cp { - enum XML_Content_Type type; - enum XML_Content_Quant quant; - XML_Char * name; - unsigned int numchildren; - XML_Content * children; -}; - - -/* This is called for an element declaration. See above for - description of the model argument. It's the caller's responsibility - to free model when finished with it. -*/ -typedef void (XMLCALL *XML_ElementDeclHandler) (void *userData, - const XML_Char *name, - XML_Content *model); - -XMLPARSEAPI(void) -XML_SetElementDeclHandler(XML_Parser parser, - XML_ElementDeclHandler eldecl); - -/* The Attlist declaration handler is called for *each* attribute. So - a single Attlist declaration with multiple attributes declared will - generate multiple calls to this handler. The "default" parameter - may be NULL in the case of the "#IMPLIED" or "#REQUIRED" - keyword. The "isrequired" parameter will be true and the default - value will be NULL in the case of "#REQUIRED". If "isrequired" is - true and default is non-NULL, then this is a "#FIXED" default. -*/ -typedef void (XMLCALL *XML_AttlistDeclHandler) ( - void *userData, - const XML_Char *elname, - const XML_Char *attname, - const XML_Char *att_type, - const XML_Char *dflt, - int isrequired); - -XMLPARSEAPI(void) -XML_SetAttlistDeclHandler(XML_Parser parser, - XML_AttlistDeclHandler attdecl); - -/* The XML declaration handler is called for *both* XML declarations - and text declarations. The way to distinguish is that the version - parameter will be NULL for text declarations. The encoding - parameter may be NULL for XML declarations. The standalone - parameter will be -1, 0, or 1 indicating respectively that there - was no standalone parameter in the declaration, that it was given - as no, or that it was given as yes. -*/ -typedef void (XMLCALL *XML_XmlDeclHandler) (void *userData, - const XML_Char *version, - const XML_Char *encoding, - int standalone); - -XMLPARSEAPI(void) -XML_SetXmlDeclHandler(XML_Parser parser, - XML_XmlDeclHandler xmldecl); - - -typedef struct { - void *(*malloc_fcn)(size_t size); - void *(*realloc_fcn)(void *ptr, size_t size); - void (*free_fcn)(void *ptr); -} XML_Memory_Handling_Suite; - -/* Constructs a new parser; encoding is the encoding specified by the - external protocol or NULL if there is none specified. -*/ -XMLPARSEAPI(XML_Parser) -XML_ParserCreate(const XML_Char *encoding); - -/* Constructs a new parser and namespace processor. Element type - names and attribute names that belong to a namespace will be - expanded; unprefixed attribute names are never expanded; unprefixed - element type names are expanded only if there is a default - namespace. The expanded name is the concatenation of the namespace - URI, the namespace separator character, and the local part of the - name. If the namespace separator is '\0' then the namespace URI - and the local part will be concatenated without any separator. - It is a programming error to use the separator '\0' with namespace - triplets (see XML_SetReturnNSTriplet). -*/ -XMLPARSEAPI(XML_Parser) -XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator); - - -/* Constructs a new parser using the memory management suite referred to - by memsuite. If memsuite is NULL, then use the standard library memory - suite. If namespaceSeparator is non-NULL it creates a parser with - namespace processing as described above. The character pointed at - will serve as the namespace separator. - - All further memory operations used for the created parser will come from - the given suite. -*/ -XMLPARSEAPI(XML_Parser) -XML_ParserCreate_MM(const XML_Char *encoding, - const XML_Memory_Handling_Suite *memsuite, - const XML_Char *namespaceSeparator); - -/* Prepare a parser object to be re-used. This is particularly - valuable when memory allocation overhead is disproportionatly high, - such as when a large number of small documnents need to be parsed. - All handlers are cleared from the parser, except for the - unknownEncodingHandler. The parser's external state is re-initialized - except for the values of ns and ns_triplets. - - Added in Expat 1.95.3. -*/ -XMLPARSEAPI(XML_Bool) -XML_ParserReset(XML_Parser parser, const XML_Char *encoding); - -/* atts is array of name/value pairs, terminated by 0; - names and values are 0 terminated. -*/ -typedef void (XMLCALL *XML_StartElementHandler) (void *userData, - const XML_Char *name, - const XML_Char **atts); - -typedef void (XMLCALL *XML_EndElementHandler) (void *userData, - const XML_Char *name); - - -/* s is not 0 terminated. */ -typedef void (XMLCALL *XML_CharacterDataHandler) (void *userData, - const XML_Char *s, - int len); - -/* target and data are 0 terminated */ -typedef void (XMLCALL *XML_ProcessingInstructionHandler) ( - void *userData, - const XML_Char *target, - const XML_Char *data); - -/* data is 0 terminated */ -typedef void (XMLCALL *XML_CommentHandler) (void *userData, - const XML_Char *data); - -typedef void (XMLCALL *XML_StartCdataSectionHandler) (void *userData); -typedef void (XMLCALL *XML_EndCdataSectionHandler) (void *userData); - -/* This is called for any characters in the XML document for which - there is no applicable handler. This includes both characters that - are part of markup which is of a kind that is not reported - (comments, markup declarations), or characters that are part of a - construct which could be reported but for which no handler has been - supplied. The characters are passed exactly as they were in the XML - document except that they will be encoded in UTF-8 or UTF-16. - Line boundaries are not normalized. Note that a byte order mark - character is not passed to the default handler. There are no - guarantees about how characters are divided between calls to the - default handler: for example, a comment might be split between - multiple calls. -*/ -typedef void (XMLCALL *XML_DefaultHandler) (void *userData, - const XML_Char *s, - int len); - -/* This is called for the start of the DOCTYPE declaration, before - any DTD or internal subset is parsed. -*/ -typedef void (XMLCALL *XML_StartDoctypeDeclHandler) ( - void *userData, - const XML_Char *doctypeName, - const XML_Char *sysid, - const XML_Char *pubid, - int has_internal_subset); - -/* This is called for the start of the DOCTYPE declaration when the - closing > is encountered, but after processing any external - subset. -*/ -typedef void (XMLCALL *XML_EndDoctypeDeclHandler)(void *userData); - -/* This is called for entity declarations. The is_parameter_entity - argument will be non-zero if the entity is a parameter entity, zero - otherwise. - - For internal entities (<!ENTITY foo "bar">), value will - be non-NULL and systemId, publicID, and notationName will be NULL. - The value string is NOT nul-terminated; the length is provided in - the value_length argument. Since it is legal to have zero-length - values, do not use this argument to test for internal entities. - - For external entities, value will be NULL and systemId will be - non-NULL. The publicId argument will be NULL unless a public - identifier was provided. The notationName argument will have a - non-NULL value only for unparsed entity declarations. - - Note that is_parameter_entity can't be changed to XML_Bool, since - that would break binary compatibility. -*/ -typedef void (XMLCALL *XML_EntityDeclHandler) ( - void *userData, - const XML_Char *entityName, - int is_parameter_entity, - const XML_Char *value, - int value_length, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId, - const XML_Char *notationName); - -XMLPARSEAPI(void) -XML_SetEntityDeclHandler(XML_Parser parser, - XML_EntityDeclHandler handler); - -/* OBSOLETE -- OBSOLETE -- OBSOLETE - This handler has been superceded by the EntityDeclHandler above. - It is provided here for backward compatibility. - - This is called for a declaration of an unparsed (NDATA) entity. - The base argument is whatever was set by XML_SetBase. The - entityName, systemId and notationName arguments will never be - NULL. The other arguments may be. -*/ -typedef void (XMLCALL *XML_UnparsedEntityDeclHandler) ( - void *userData, - const XML_Char *entityName, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId, - const XML_Char *notationName); - -/* This is called for a declaration of notation. The base argument is - whatever was set by XML_SetBase. The notationName will never be - NULL. The other arguments can be. -*/ -typedef void (XMLCALL *XML_NotationDeclHandler) ( - void *userData, - const XML_Char *notationName, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId); - -/* When namespace processing is enabled, these are called once for - each namespace declaration. The call to the start and end element - handlers occur between the calls to the start and end namespace - declaration handlers. For an xmlns attribute, prefix will be - NULL. For an xmlns="" attribute, uri will be NULL. -*/ -typedef void (XMLCALL *XML_StartNamespaceDeclHandler) ( - void *userData, - const XML_Char *prefix, - const XML_Char *uri); - -typedef void (XMLCALL *XML_EndNamespaceDeclHandler) ( - void *userData, - const XML_Char *prefix); - -/* This is called if the document is not standalone, that is, it has an - external subset or a reference to a parameter entity, but does not - have standalone="yes". If this handler returns XML_STATUS_ERROR, - then processing will not continue, and the parser will return a - XML_ERROR_NOT_STANDALONE error. - If parameter entity parsing is enabled, then in addition to the - conditions above this handler will only be called if the referenced - entity was actually read. -*/ -typedef int (XMLCALL *XML_NotStandaloneHandler) (void *userData); - -/* This is called for a reference to an external parsed general - entity. The referenced entity is not automatically parsed. The - application can parse it immediately or later using - XML_ExternalEntityParserCreate. - - The parser argument is the parser parsing the entity containing the - reference; it can be passed as the parser argument to - XML_ExternalEntityParserCreate. The systemId argument is the - system identifier as specified in the entity declaration; it will - not be NULL. - - The base argument is the system identifier that should be used as - the base for resolving systemId if systemId was relative; this is - set by XML_SetBase; it may be NULL. - - The publicId argument is the public identifier as specified in the - entity declaration, or NULL if none was specified; the whitespace - in the public identifier will have been normalized as required by - the XML spec. - - The context argument specifies the parsing context in the format - expected by the context argument to XML_ExternalEntityParserCreate; - context is valid only until the handler returns, so if the - referenced entity is to be parsed later, it must be copied. - context is NULL only when the entity is a parameter entity. - - The handler should return XML_STATUS_ERROR if processing should not - continue because of a fatal error in the handling of the external - entity. In this case the calling parser will return an - XML_ERROR_EXTERNAL_ENTITY_HANDLING error. - - Note that unlike other handlers the first argument is the parser, - not userData. -*/ -typedef int (XMLCALL *XML_ExternalEntityRefHandler) ( - XML_Parser parser, - const XML_Char *context, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId); - -/* This is called in two situations: - 1) An entity reference is encountered for which no declaration - has been read *and* this is not an error. - 2) An internal entity reference is read, but not expanded, because - XML_SetDefaultHandler has been called. - Note: skipped parameter entities in declarations and skipped general - entities in attribute values cannot be reported, because - the event would be out of sync with the reporting of the - declarations or attribute values -*/ -typedef void (XMLCALL *XML_SkippedEntityHandler) ( - void *userData, - const XML_Char *entityName, - int is_parameter_entity); - -/* This structure is filled in by the XML_UnknownEncodingHandler to - provide information to the parser about encodings that are unknown - to the parser. - - The map[b] member gives information about byte sequences whose - first byte is b. - - If map[b] is c where c is >= 0, then b by itself encodes the - Unicode scalar value c. - - If map[b] is -1, then the byte sequence is malformed. - - If map[b] is -n, where n >= 2, then b is the first byte of an - n-byte sequence that encodes a single Unicode scalar value. - - The data member will be passed as the first argument to the convert - function. - - The convert function is used to convert multibyte sequences; s will - point to a n-byte sequence where map[(unsigned char)*s] == -n. The - convert function must return the Unicode scalar value represented - by this byte sequence or -1 if the byte sequence is malformed. - - The convert function may be NULL if the encoding is a single-byte - encoding, that is if map[b] >= -1 for all bytes b. - - When the parser is finished with the encoding, then if release is - not NULL, it will call release passing it the data member; once - release has been called, the convert function will not be called - again. - - Expat places certain restrictions on the encodings that are supported - using this mechanism. - - 1. Every ASCII character that can appear in a well-formed XML document, - other than the characters - - $@\^`{}~ - - must be represented by a single byte, and that byte must be the - same byte that represents that character in ASCII. - - 2. No character may require more than 4 bytes to encode. - - 3. All characters encoded must have Unicode scalar values <= - 0xFFFF, (i.e., characters that would be encoded by surrogates in - UTF-16 are not allowed). Note that this restriction doesn't - apply to the built-in support for UTF-8 and UTF-16. - - 4. No Unicode character may be encoded by more than one distinct - sequence of bytes. -*/ -typedef struct { - int map[256]; - void *data; - int (XMLCALL *convert)(void *data, const char *s); - void (XMLCALL *release)(void *data); -} XML_Encoding; - -/* This is called for an encoding that is unknown to the parser. - - The encodingHandlerData argument is that which was passed as the - second argument to XML_SetUnknownEncodingHandler. - - The name argument gives the name of the encoding as specified in - the encoding declaration. - - If the callback can provide information about the encoding, it must - fill in the XML_Encoding structure, and return XML_STATUS_OK. - Otherwise it must return XML_STATUS_ERROR. - - If info does not describe a suitable encoding, then the parser will - return an XML_UNKNOWN_ENCODING error. -*/ -typedef int (XMLCALL *XML_UnknownEncodingHandler) ( - void *encodingHandlerData, - const XML_Char *name, - XML_Encoding *info); - -XMLPARSEAPI(void) -XML_SetElementHandler(XML_Parser parser, - XML_StartElementHandler start, - XML_EndElementHandler end); - -XMLPARSEAPI(void) -XML_SetStartElementHandler(XML_Parser parser, - XML_StartElementHandler handler); - -XMLPARSEAPI(void) -XML_SetEndElementHandler(XML_Parser parser, - XML_EndElementHandler handler); - -XMLPARSEAPI(void) -XML_SetCharacterDataHandler(XML_Parser parser, - XML_CharacterDataHandler handler); - -XMLPARSEAPI(void) -XML_SetProcessingInstructionHandler(XML_Parser parser, - XML_ProcessingInstructionHandler handler); -XMLPARSEAPI(void) -XML_SetCommentHandler(XML_Parser parser, - XML_CommentHandler handler); - -XMLPARSEAPI(void) -XML_SetCdataSectionHandler(XML_Parser parser, - XML_StartCdataSectionHandler start, - XML_EndCdataSectionHandler end); - -XMLPARSEAPI(void) -XML_SetStartCdataSectionHandler(XML_Parser parser, - XML_StartCdataSectionHandler start); - -XMLPARSEAPI(void) -XML_SetEndCdataSectionHandler(XML_Parser parser, - XML_EndCdataSectionHandler end); - -/* This sets the default handler and also inhibits expansion of - internal entities. These entity references will be passed to the - default handler, or to the skipped entity handler, if one is set. -*/ -XMLPARSEAPI(void) -XML_SetDefaultHandler(XML_Parser parser, - XML_DefaultHandler handler); - -/* This sets the default handler but does not inhibit expansion of - internal entities. The entity reference will not be passed to the - default handler. -*/ -XMLPARSEAPI(void) -XML_SetDefaultHandlerExpand(XML_Parser parser, - XML_DefaultHandler handler); - -XMLPARSEAPI(void) -XML_SetDoctypeDeclHandler(XML_Parser parser, - XML_StartDoctypeDeclHandler start, - XML_EndDoctypeDeclHandler end); - -XMLPARSEAPI(void) -XML_SetStartDoctypeDeclHandler(XML_Parser parser, - XML_StartDoctypeDeclHandler start); - -XMLPARSEAPI(void) -XML_SetEndDoctypeDeclHandler(XML_Parser parser, - XML_EndDoctypeDeclHandler end); - -XMLPARSEAPI(void) -XML_SetUnparsedEntityDeclHandler(XML_Parser parser, - XML_UnparsedEntityDeclHandler handler); - -XMLPARSEAPI(void) -XML_SetNotationDeclHandler(XML_Parser parser, - XML_NotationDeclHandler handler); - -XMLPARSEAPI(void) -XML_SetNamespaceDeclHandler(XML_Parser parser, - XML_StartNamespaceDeclHandler start, - XML_EndNamespaceDeclHandler end); - -XMLPARSEAPI(void) -XML_SetStartNamespaceDeclHandler(XML_Parser parser, - XML_StartNamespaceDeclHandler start); - -XMLPARSEAPI(void) -XML_SetEndNamespaceDeclHandler(XML_Parser parser, - XML_EndNamespaceDeclHandler end); - -XMLPARSEAPI(void) -XML_SetNotStandaloneHandler(XML_Parser parser, - XML_NotStandaloneHandler handler); - -XMLPARSEAPI(void) -XML_SetExternalEntityRefHandler(XML_Parser parser, - XML_ExternalEntityRefHandler handler); - -/* If a non-NULL value for arg is specified here, then it will be - passed as the first argument to the external entity ref handler - instead of the parser object. -*/ -XMLPARSEAPI(void) -XML_SetExternalEntityRefHandlerArg(XML_Parser parser, - void *arg); - -XMLPARSEAPI(void) -XML_SetSkippedEntityHandler(XML_Parser parser, - XML_SkippedEntityHandler handler); - -XMLPARSEAPI(void) -XML_SetUnknownEncodingHandler(XML_Parser parser, - XML_UnknownEncodingHandler handler, - void *encodingHandlerData); - -/* This can be called within a handler for a start element, end - element, processing instruction or character data. It causes the - corresponding markup to be passed to the default handler. -*/ -XMLPARSEAPI(void) -XML_DefaultCurrent(XML_Parser parser); - -/* If do_nst is non-zero, and namespace processing is in effect, and - a name has a prefix (i.e. an explicit namespace qualifier) then - that name is returned as a triplet in a single string separated by - the separator character specified when the parser was created: URI - + sep + local_name + sep + prefix. - - If do_nst is zero, then namespace information is returned in the - default manner (URI + sep + local_name) whether or not the name - has a prefix. - - Note: Calling XML_SetReturnNSTriplet after XML_Parse or [truncated at 1000 lines; 522 more skipped]

19 years, 4 months

[hbirr] 17383: Merged 16330:16362 from trunk.

by hbirr＠svn.reactos.com

Merged 16330:16362 from trunk. Modified: branches/cache_manager_rewrite/reactos/ReactOS.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/settings.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/null/null.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/rw.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/info.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/lock.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/tdi.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/tcpip/tcpip/dispatch. c Deleted: branches/cache_manager_rewrite/reactos/include/GL/ Deleted: branches/cache_manager_rewrite/reactos/include/ddentry.h Deleted: branches/cache_manager_rewrite/reactos/include/debug.h Added: branches/cache_manager_rewrite/reactos/include/elf/elf.h Deleted: branches/cache_manager_rewrite/reactos/include/elf.h Deleted: branches/cache_manager_rewrite/reactos/include/expat/ Added: branches/cache_manager_rewrite/reactos/include/pseh/pseh.h Deleted: branches/cache_manager_rewrite/reactos/include/pseh.h Added: branches/cache_manager_rewrite/reactos/include/reactos/debug.h Deleted: branches/cache_manager_rewrite/reactos/include/rosky/ Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/devmode.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/gdimacro.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/logfont.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/minmax.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/path.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/priv.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/registry.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/resstr.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/sparse.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/string.h Deleted: branches/cache_manager_rewrite/reactos/include/tcpmisc.h Deleted: branches/cache_manager_rewrite/reactos/include/tgetopt.h Modified: branches/cache_manager_rewrite/reactos/include/win32k/font.h Modified: branches/cache_manager_rewrite/reactos/include/win32k/gdiobj.h Modified: branches/cache_manager_rewrite/reactos/include/win32k/ntddraw.h Deleted: branches/cache_manager_rewrite/reactos/include/wine/wininet.h Modified: branches/cache_manager_rewrite/reactos/lib/aclui/aclui.c Modified: branches/cache_manager_rewrite/reactos/lib/dbghelp/msc.c Modified: branches/cache_manager_rewrite/reactos/lib/dbghelp/stack.c Modified: branches/cache_manager_rewrite/reactos/lib/dbghelp/stackframe.h Modified: branches/cache_manager_rewrite/reactos/lib/gdi32/include/precomp.h Modified: branches/cache_manager_rewrite/reactos/lib/gdi32/misc/stubs.c Modified: branches/cache_manager_rewrite/reactos/lib/gdi32/objects/dc.c Modified: branches/cache_manager_rewrite/reactos/lib/gdi32/objects/font.c Modified: branches/cache_manager_rewrite/reactos/lib/gdi32/objects/utils.c Modified: branches/cache_manager_rewrite/reactos/lib/glu32/include/gluos.h Modified: branches/cache_manager_rewrite/reactos/lib/iphlpapi/iphlpapi_private.h Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/file/dir.c Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/k32.h Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/misc/computername.c Modified: branches/cache_manager_rewrite/reactos/lib/psapi/precomp.h Modified: branches/cache_manager_rewrite/reactos/lib/pseh/framebased.c Deleted: branches/cache_manager_rewrite/reactos/lib/rosky/ Modified: branches/cache_manager_rewrite/reactos/lib/rosrtl/file/sparse.c Modified: branches/cache_manager_rewrite/reactos/lib/rosrtl/misc/devmode.c Modified: branches/cache_manager_rewrite/reactos/lib/rosrtl/misc/logfont.c Modified: branches/cache_manager_rewrite/reactos/lib/rosrtl/registry/registry.c Modified: branches/cache_manager_rewrite/reactos/lib/rosrtl/thread/priv.c Modified: branches/cache_manager_rewrite/reactos/lib/rtl/acl.c Modified: branches/cache_manager_rewrite/reactos/lib/rtl/rtl.h Modified: branches/cache_manager_rewrite/reactos/lib/rtl/unicode.c Modified: branches/cache_manager_rewrite/reactos/lib/smdll/dllmain.c Added: branches/cache_manager_rewrite/reactos/lib/tgetopt/tgetopt.h Modified: branches/cache_manager_rewrite/reactos/lib/user32/include/user32p.h Modified: branches/cache_manager_rewrite/reactos/lib/user32/misc/desktop.c Modified: branches/cache_manager_rewrite/reactos/lib/user32/misc/display.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/include/ntoskrnl.h Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/elf.inc.h Modified: branches/cache_manager_rewrite/reactos/regtests/shared/regtests.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/api/handle.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/api/process.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/api/user.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/api/wapi.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/csrss.c Added: branches/cache_manager_rewrite/reactos/subsys/csrss/csrss.h Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/csrss.xml Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/init.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/print.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/video.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/conio.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/desktopbg.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/dllmain.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/exitros.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/guiconsole. c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/tuiconsole. c Added: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/w32csr.h Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/win32csr.xm l Modified: branches/cache_manager_rewrite/reactos/subsys/smss/smapi.c Modified: branches/cache_manager_rewrite/reactos/subsys/smss/smss.h Modified: branches/cache_manager_rewrite/reactos/subsys/smss/smss.xml Modified: branches/cache_manager_rewrite/reactos/subsys/system/services/database.c Modified: branches/cache_manager_rewrite/reactos/subsys/system/sndvol32/sndvol32.h Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/misc/math.c Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/ntuser/caret.c Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/ntuser/input.c Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/ntuser/msgqueue.c Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/objects/gdiobj.c Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/w32k.h Modified: branches/cache_manager_rewrite/reactos/tools/rbuild/backend/mingw/mingw. cpp Modified: branches/cache_manager_rewrite/reactos/w32api/include/ddk/winddi.h Added: branches/cache_manager_rewrite/reactos/w32api/include/ddrawgdi.h Modified: branches/cache_manager_rewrite/reactos/w32api/include/gdiplus.h [truncated at 100 lines; 1 more skipped] _____ Modified: branches/cache_manager_rewrite/reactos/ReactOS.xml --- branches/cache_manager_rewrite/reactos/ReactOS.xml 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/ReactOS.xml 2005-08-14 13:42:08 UTC (rev 17383) @@ -30,8 +30,9 @@ </if> <include>include</include> + <include>include/reactos</include> <include>w32api/include</include> - <include>w32api/include/ddk</include> + <include>w32api/include/ddk</include> <directory name="apps"> <xi:include href="apps/directory.xml" /> _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/settings.c --- branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/settings.c 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/settings.c 2005-08-14 13:42:08 UTC (rev 17383) @@ -9,7 +9,7 @@ * Sept 27, 2003: Created */ -#include <ntddk.h> +#include <ddk/ntddk.h> #include "mpu401.h" _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/null/null.c --- branches/cache_manager_rewrite/reactos/drivers/dd/null/null.c 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/drivers/dd/null/null.c 2005-08-14 13:42:08 UTC (rev 17383) @@ -14,7 +14,7 @@ /* INCLUDES */ #include <ntddk.h> -#include <pseh.h> +#include <pseh/pseh.h> #include "null.h" _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/rw.c --- branches/cache_manager_rewrite/reactos/drivers/fs/np/rw.c 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/drivers/fs/np/rw.c 2005-08-14 13:42:08 UTC (rev 17383) @@ -10,7 +10,6 @@ /* INCLUDES ******************************************************************/ #include <ntifs.h> -#include <rosrtl/minmax.h> #include "npfs.h" #define NDEBUG @@ -450,7 +449,7 @@ /* Byte stream mode */ while (Length > 0 && Fcb->ReadDataAvailable > 0) { - CopyLength = RtlRosMin(Fcb->ReadDataAvailable, Length); + CopyLength = min(Fcb->ReadDataAvailable, Length); if (Fcb->ReadPtr + CopyLength <= Fcb->Data + Fcb->MaxDataLength) { memcpy(Buffer, Fcb->ReadPtr, CopyLength); @@ -494,7 +493,7 @@ if (Fcb->ReadDataAvailable) { /* Truncate the message if the receive buffer is too small */ - CopyLength = RtlRosMin(Fcb->ReadDataAvailable, Length); + CopyLength = min(Fcb->ReadDataAvailable, Length); memcpy(Buffer, Fcb->Data, CopyLength); #ifndef NDEBUG @@ -694,7 +693,7 @@ DPRINT("Byte stream mode\n"); while (Length > 0 && ReaderFcb->WriteQuotaAvailable > 0) { - CopyLength = RtlRosMin(Length, ReaderFcb->WriteQuotaAvailable); + CopyLength = min(Length, ReaderFcb->WriteQuotaAvailable); if (ReaderFcb->WritePtr + CopyLength <= ReaderFcb->Data + ReaderFcb->MaxDataLength) { memcpy(ReaderFcb->WritePtr, Buffer, CopyLength); @@ -732,7 +731,7 @@ DPRINT("Message mode\n"); if (Length > 0) { - CopyLength = RtlRosMin(Length, ReaderFcb->WriteQuotaAvailable); + CopyLength = min(Length, ReaderFcb->WriteQuotaAvailable); memcpy(ReaderFcb->Data, Buffer, CopyLength); Information = CopyLength; _____ Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/info.c --- branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/info.c 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/info.c 2005-08-14 13:42:08 UTC (rev 17383) @@ -11,7 +11,7 @@ #include "tdi_proto.h" #include "tdiconn.h" #include "debug.h" -#include "pseh.h" +#include "pseh/pseh.h" NTSTATUS STDCALL AfdGetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp, _____ Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/lock.c --- branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/lock.c 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/lock.c 2005-08-14 13:42:08 UTC (rev 17383) @@ -11,7 +11,7 @@ #include "tdi_proto.h" #include "tdiconn.h" #include "debug.h" -#include "pseh.h" +#include "pseh/pseh.h" /* Lock a method_neither request so it'll be available from DISPATCH_LEVEL */ PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ) { _____ Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/tdi.c --- branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/tdi.c 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/tdi.c 2005-08-14 13:42:08 UTC (rev 17383) @@ -9,7 +9,7 @@ */ #include <afd.h> #ifndef _MSC_VER -#include <pseh.h> +#include <pseh/pseh.h> #endif #include "debug.h" #include "tdiconn.h" _____ Modified: branches/cache_manager_rewrite/reactos/drivers/net/tcpip/tcpip/dispatch. c --- branches/cache_manager_rewrite/reactos/drivers/net/tcpip/tcpip/dispatch. c 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/drivers/net/tcpip/tcpip/dispatch. c 2005-08-14 13:42:08 UTC (rev 17383) @@ -10,7 +10,7 @@ */ #include "precomp.h" -#include <pseh.h> +#include <pseh/pseh.h> NTSTATUS DispPrepareIrpForCancel( PTRANSPORT_CONTEXT Context, _____ Deleted: branches/cache_manager_rewrite/reactos/include/ddentry.h --- branches/cache_manager_rewrite/reactos/include/ddentry.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/ddentry.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,95 +0,0 @@ -/* - * DirectDraw GDI32.dll interface definitions - * Copyright (C) 2003 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. - */ -#include <ddk/ddrawi.h> -#include <ddk/d3dhal.h> -#include <ddk/winddi.h> -BOOL STDCALL DdCreateDirectDrawObject( -LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, -HDC hdc -); -BOOL STDCALL DdQueryDirectDrawObject( -LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, -LPDDHALINFO pHalInfo, -LPDDHAL_DDCALLBACKS pDDCallbacks, -LPDDHAL_DDSURFACECALLBACKS pDDSurfaceCallbacks, -LPDDHAL_DDPALETTECALLBACKS pDDPaletteCallbacks, -LPD3DHAL_CALLBACKS pD3dCallbacks, -LPD3DHAL_GLOBALDRIVERDATA pD3dDriverData, -LPDDHAL_DDEXEBUFCALLBACKS pD3dBufferCallbacks, -LPDDSURFACEDESC pD3dTextureFormats, -LPDWORD pdwFourCC, -LPVIDMEM pvmList -); -BOOL STDCALL DdDeleteDirectDrawObject( -LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal -); -BOOL STDCALL DdCreateSurfaceObject( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, -BOOL bPrimarySurface -); -BOOL STDCALL DdDeleteSurfaceObject( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal -); -BOOL STDCALL DdResetVisrgn( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, -HWND hWnd -); -BOOL STDCALL DdGetDC( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, -LPPALETTEENTRY pColorTable -); -BOOL STDCALL DdReleaseDC( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal -); -HBITMAP STDCALL DdCreateDIBSection( -HDC hdc, -CONST BITMAPINFO *pbmi, -UINT iUsage, -VOID **ppvBits, -HANDLE hSectionApp, -DWORD dwOffset -); -BOOL STDCALL DdReenableDirectDrawObject( -LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, -BOOL *pbNewMode -); -BOOL STDCALL DdAttachSurface( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom, -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo -); -VOID STDCALL DdUnattachSurface( -LPDDRAWI_DDRAWSURFACE_LCL pSurface, -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached -); -ULONG STDCALL DdQueryDisplaySettingsUniqueness(VOID); -HANDLE STDCALL DdGetDxHandle( -LPDDRAWI_DIRECTDRAW_LCL pDDraw, -LPDDRAWI_DDRAWSURFACE_LCL pSurface, -BOOL bRelease -); -BOOL STDCALL DdSetGammaRamp( -LPDDRAWI_DIRECTDRAW_LCL pDDraw, -HDC hdc, -LPVOID lpGammaRamp -); -DWORD STDCALL DdSwapTextureHandles( -LPDDRAWI_DIRECTDRAW_LCL pDDraw, -LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, -LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2 -); _____ Deleted: branches/cache_manager_rewrite/reactos/include/debug.h --- branches/cache_manager_rewrite/reactos/include/debug.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/debug.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,101 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: include/internal/debug.h - * PURPOSE: Useful debugging macros - * PROGRAMMER: David Welch (welch(a)mcmail.com) - * UPDATE HISTORY: - * 28/05/98: Created - */ - -/* - * NOTE: Define NDEBUG before including this header to disable debugging - * macros - */ - -#ifndef __INTERNAL_DEBUG -#define __INTERNAL_DEBUG - -//#define UNIMPLEMENTED do {DbgPrint("%s at %s:%d is unimplemented, have a nice day\n",__FUNCTION__,__FILE__,__LINE__); for(;;); } while(0); -#define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); - -/* FIXME: should probably remove this later */ -#if !defined(CHECKED) && !defined(NDEBUG) -#define CHECKED -#endif - -#ifndef assert -#ifndef NASSERT -#define assert(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } -#else -#define assert(x) -#endif -#endif - -#ifndef ASSERT -#ifndef NASSERT -#define ASSERT(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } -#else -#define ASSERT(x) -#endif -#endif - -#ifndef ASSERTMSG -#ifndef NASSERT -#define ASSERTMSG(x,m) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, m); } -#else -#define ASSERTMSG(x) -#endif -#endif - -/* TODO: Make the output of file/line and the debug message atomic */ -#ifdef DBG -#define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint -#define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); -#else -#ifdef __GNUC__ -#define DPRINT1(args...) -#define CHECKPOINT1 -#else -#define DPRINT1 -#define CHECKPOINT1 -#endif /* __GNUC__ */ -#endif - -#ifndef NDEBUG -#define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); -#define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); -#else -#ifdef __GNUC__ -#define DPRINT(args...) -#else -#define DPRINT -#endif /* __GNUC__ */ -#define CHECKPOINT -#endif /* NDEBUG */ - -/* - * FUNCTION: Assert a maximum value for the current irql - * ARGUMENTS: - * x = Maximum irql - */ -#define ASSERT_IRQL(x) assert(KeGetCurrentIrql()<=(x)) -#define assert_irql(x) assert(KeGetCurrentIrql()<=(x)) - -/* Macros expanding to the appropriate inline assembly to raise a breakpoint */ -#if defined(_M_IX86) -#define ASM_BREAKPOINT "\nint $3\n" -#elif defined(_M_ALPHA) -#define ASM_BREAKPOINT "\ncall_pal bpt\n" -#elif defined(_M_MIPS) -#define ASM_BREAKPOINT "\nbreak\n" -#else -#error Unsupported architecture. -#endif - -#ifndef KEBUGCHECK -#define KEBUGCHECK(a) DbgPrint("KeBugCheck (0x%X) at %s:%i\n", a, __FILE__,__LINE__), KeBugCheck(a) -#define KEBUGCHECKEX(a,b,c,d,e) DbgPrint("KeBugCheckEx (0x%X, 0x%X, 0x%X, 0x%X, 0x%X) at %s:%i\n", a, b, c, d, e, __FILE__,__LINE__), KeBugCheckEx(a,b,c,d,e) -#endif - -#endif /* __INTERNAL_DEBUG */ _____ Copied: branches/cache_manager_rewrite/reactos/include/elf/elf.h (from rev 16362, trunk/reactos/include/elf/elf.h) _____ Deleted: branches/cache_manager_rewrite/reactos/include/elf.h --- branches/cache_manager_rewrite/reactos/include/elf.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/elf.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,20 +0,0 @@ -#ifndef _REACTOS_ELF_H_ -#define _REACTOS_ELF_H_ 1 - -/* Machine-independent and word-size-independent definitions */ -#include <elf/common.h> - -/* - * Word-size-dependent definitions. All ReactOS builds support all of them, - * even if (obviously) code for the wrong architecture cannot be executed - the - * files can still be used in machine-independent ways, e.g. as resource DLLs - */ -#include <elf/elf32.h> -#include <elf/elf64.h> - -/* Machine-dependent definitions */ -#include <elf/machine.h> - -#endif - -/* EOF */ _____ Copied: branches/cache_manager_rewrite/reactos/include/pseh/pseh.h (from rev 16362, trunk/reactos/include/pseh/pseh.h) _____ Deleted: branches/cache_manager_rewrite/reactos/include/pseh.h --- branches/cache_manager_rewrite/reactos/include/pseh.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/pseh.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,84 +0,0 @@ -/* - Copyright (c) 2004/2005 KJK::Hyperion - - Permission is hereby granted, free of charge, to any person obtaining a copy of - this software and associated documentation files (the "Software"), to deal in - the Software without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*/ - -#ifndef KJK_PSEH_H_ -#define KJK_PSEH_H_ - -/* Some useful macros */ -#if defined(__cplusplus) -# define _SEH_PVOID_CAST(TYPE_, P_) ((TYPE_)(P_)) -#else -# define _SEH_PVOID_CAST(TYPE_, P_) (P_) -#endif - -#if defined(FIELD_OFFSET) -# define _SEH_FIELD_OFFSET FIELD_OFFSET -#else -# include <stddef.h> -# define _SEH_FIELD_OFFSET offsetof -#endif - -#if defined(CONTAINING_RECORD) -# define _SEH_CONTAINING_RECORD CONTAINING_RECORD -#else -# define _SEH_CONTAINING_RECORD(ADDR_, TYPE_, FIELD_) \ - ((TYPE_ *)(((char *)(ADDR_)) - _SEH_FIELD_OFFSET(TYPE_, FIELD_))) -#endif - -#if defined(__CONCAT) -# define _SEH_CONCAT __CONCAT -#else -# define _SEH_CONCAT1(X_, Y_) X_ ## Y_ -# define _SEH_CONCAT(X_, Y_) _SEH_CONCAT1(X_, Y_) -#endif - -/* - Note: just define __inline to an empty symbol if your C compiler doesn't - support it -*/ -#ifdef __cplusplus -# ifndef __inline -# define __inline inline -# endif -#endif - -/* Locals sharing support */ -#define _SEH_LOCALS_TYPENAME(BASENAME_) \ - struct _SEH_CONCAT(_SEHLocalsTag, BASENAME_) - -#define _SEH_DEFINE_LOCALS(BASENAME_) \ - _SEH_LOCALS_TYPENAME(BASENAME_) - -#define _SEH_DECLARE_LOCALS(BASENAME_) \ - _SEH_LOCALS_TYPENAME(BASENAME_) _SEHLocals; \ - _SEH_LOCALS_TYPENAME(BASENAME_) * _SEHPLocals; \ - _SEHPLocals = &_SEHLocals; - -/* Dummy locals */ -static int _SEHLocals; -static void * const _SEHDummyLocals = &_SEHLocals; - -#include <pseh/framebased.h> - -#endif - -/* EOF */ _____ Copied: branches/cache_manager_rewrite/reactos/include/reactos/debug.h (from rev 16362, trunk/reactos/include/reactos/debug.h) _____ Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/devmode.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/devmode.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/devmode.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,18 +0,0 @@ -/* devmode.h - */ - -#ifdef __cplusplus -extern "C" -{ -#endif - -void -RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA ); -void -RosRtlDevModeW2A( LPDEVMODEA pA, const LPDEVMODEW pW ); - -#ifdef __cplusplus -} -#endif - -/* EOF */ _____ Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/gdimacro.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/gdimacro.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/gdimacro.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,24 +0,0 @@ -/* - * gdimacro.h - */ - -#ifndef ROSRTL_GDIMACRO_H -#define ROSRTL_GDIMACRO_H - -#define IN_RECT(r,x,y) \ -( \ - (x) >= (r).left && \ - (y) >= (r).top && \ - (x) < (r).right && \ - (y) < (r).bottom \ -) - -#define RECT_OVERLAP(a,b) \ -( \ - (a).left < (b).right && \ - (b).left < (a).right && \ - (a).top < (b).bottom && \ - (b).top < (a).bottom \ -) - -#endif /* ROSRTL_GDIMACRO_H */ _____ Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/logfont.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/logfont.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/logfont.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,19 +0,0 @@ -/* logfont.h - */ - -#ifdef __cplusplus -extern "C" -{ -#endif - -void -RosRtlLogFontA2W ( LPLOGFONTW pW, const LOGFONTA *pA ); - -void -RosRtlLogFontW2A ( LPLOGFONTA pA, const LOGFONTW *pW ); - -#ifdef __cplusplus -} -#endif - -/* EOF */ _____ Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/minmax.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/minmax.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/minmax.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,23 +0,0 @@ -/* $Id$ - */ - -#ifndef ROSRTL_MINMAX_H__ -#define ROSRTL_MINMAX_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -#define RtlRosMin(X,Y) (((X) < (Y))? (X) : (Y)) -#define RtlRosMax(X,Y) (((X) > (Y))? (X) : (Y)) -#define RtlRosMin3(X,Y,Z) (((X) < (Y)) ? RtlRosMin(X,Z) : RtlRosMin(Y,Z)) -#define RtlRosMax3(X,Y,Z) (((X) > (Y)) ? RtlRosMax(X,Z) : RtlRosMax(Y,Z)) - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____ Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/path.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/path.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/path.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,21 +0,0 @@ -/* - */ - -#ifndef ROSRTL_PATH_H__ -#define ROSRTL_PATH_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -BOOL STDCALL MakeSureDirectoryPathExistsExA(LPCSTR DirPath, BOOL FileAtEnd); -BOOL STDCALL MakeSureDirectoryPathExistsExW(LPCWSTR DirPath, BOOL FileAtEnd); - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____ Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/priv.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/priv.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/priv.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,23 +0,0 @@ -/* $Id$ - */ - -#ifndef ROSRTL_SEC_H__ -#define ROSRTL_SEC_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -BOOL -RosEnableThreadPrivileges(HANDLE *hToken, LUID *Privileges, DWORD PrivilegeCount); -BOOL -RosResetThreadPrivileges(HANDLE hToken); - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____ Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/registry.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/registry.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/registry.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,16 +0,0 @@ -#ifndef _ROSRTL_REGISTRY_H_ -#define _ROSRTL_REGISTRY_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -NTSTATUS NTAPI RosReadRegistryValue( IN PUNICODE_STRING Key, - IN PUNICODE_STRING Value, - OUT PUNICODE_STRING Result ); - -#ifdef __cplusplus -}; -#endif - -#endif/*_ROSRTL_REGISTRY_H_*/ _____ Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/resstr.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/resstr.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/resstr.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,43 +0,0 @@ -/* $Id$ - */ - -#ifndef ROSRTL_RESSTR_H__ -#define ROSRTL_RESSTR_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -int -RosLenOfStrResource(HINSTANCE hInst, UINT uID); -int -RosAllocAndLoadStringA(LPSTR *lpTarget, HINSTANCE hInst, UINT uID); -int -RosAllocAndLoadStringW(LPWSTR *lpTarget, HINSTANCE hInst, UINT uID); -DWORD -RosFormatStrA(LPSTR *lpTarget, LPSTR lpFormat, ...); -DWORD -RosFormatStrW(LPWSTR *lpTarget, LPWSTR lpFormat, ...); -DWORD -RosLoadAndFormatStrA(HINSTANCE hInst, UINT uID, LPSTR *lpTarget, ...); -DWORD -RosLoadAndFormatStrW(HINSTANCE hInst, UINT uID, LPWSTR *lpTarget, ...); - -#ifdef UNICODE -# define RosFmtString RosFmtStringW -# define RosAllocAndLoadString RosAllocAndLoadStringW -# define RosLoadAndFormatStr RosLoadAndFormatStrW -#else -# define RosFmtString RosFmtStringA -# define RosAllocAndLoadString RosAllocAndLoadStringA -# define RosLoadAndFormatStr RosLoadAndFormatStrA -#endif - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____ Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/sparse.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/sparse.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/sparse.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,36 +0,0 @@ -/* $Id$ - */ - -#ifndef ROSRTL_SPARSE_H__ -#define ROSRTL_SPARSE_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -BOOL -STDCALL -SetFileSparse(HANDLE hFile); - -BOOL -STDCALL -ZeroFileData(HANDLE hFile, - PLARGE_INTEGER pliFileOffset, - PLARGE_INTEGER pliBeyondFinalZero); - -DWORD -STDCALL -QueryAllocatedFileRanges(HANDLE hFile, - PLARGE_INTEGER pliFileOffset, - PLARGE_INTEGER pliLength, - PFILE_ALLOCATED_RANGE_BUFFER lpAllocatedRanges, - DWORD dwBufferSize); - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____ Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/string.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/string.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/string.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,157 +0,0 @@ -/* $Id$ - */ - -#ifndef ROSRTL_STRING_H__ -#define ROSRTL_STRING_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -#define RosInitializeString( \ - __PDEST_STRING__, \ - __LENGTH__, \ - __MAXLENGTH__, \ - __BUFFER__ \ -) \ -{ \ - (__PDEST_STRING__)->Length = (__LENGTH__); \ - (__PDEST_STRING__)->MaximumLength = (__MAXLENGTH__); \ - (__PDEST_STRING__)->Buffer = (__BUFFER__); \ -} - -#define RtlRosInitStringFromLiteral( \ - __PDEST_STRING__, __SOURCE_STRING__) \ - RosInitializeString( \ - (__PDEST_STRING__), \ - sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ - sizeof(__SOURCE_STRING__), \ - (__SOURCE_STRING__) \ - ) - -#define RtlRosInitUnicodeStringFromLiteral \ - RtlRosInitStringFromLiteral - -#define ROS_STRING_INITIALIZER(__SOURCE_STRING__) \ -{ \ - sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ - sizeof(__SOURCE_STRING__), \ - (__SOURCE_STRING__) \ -} - -#define ROS_EMPTY_STRING {0, 0, NULL} - -NTSTATUS -FASTCALL -RtlpOemStringToCountedUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToOemString ( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpDowncaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpAnsiStringToUnicodeString( - IN OUT PUNICODE_STRING DestinationString, - IN PANSI_STRING SourceString, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpOemStringToUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -BOOLEAN -FASTCALL -RtlpCreateUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCWSTR Source, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS STDCALL -RtlpDuplicateUnicodeString( - INT AddNull, - IN PUNICODE_STRING SourceString, - PUNICODE_STRING DestinationString, - POOL_TYPE PoolType); - -NTSTATUS NTAPI RosAppendUnicodeString( PUNICODE_STRING ResultFirst, - PUNICODE_STRING Second, - BOOL Deallocate ); - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____ Deleted: branches/cache_manager_rewrite/reactos/include/tcpmisc.h --- branches/cache_manager_rewrite/reactos/include/tcpmisc.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/tcpmisc.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,98 +0,0 @@ -#ifndef TCPMISC_H -#define TCPMISC_H - -#define IF_MIB_STATS_ID 1 -#define MAX_PHYSADDR_SIZE 8 -#define MAX_IFDESCR_LEN 256 - -/* ID to use for requesting an IFEntry for an interface */ -#define IF_MIB_STATS_ID 1 - -/* ID to use for requesting an IPSNMPInfo for an interface */ -#define IP_MIB_STATS_ID 1 - -/* ID to use for requesting the route table */ -#define IP_MIB_ROUTETABLE_ENTRY_ID 0x101 -#define IP_MIB_ADDRTABLE_ENTRY_ID 0x102 - -typedef struct IFEntry { - ULONG if_index; - ULONG if_type; - ULONG if_mtu; - ULONG if_speed; - ULONG if_physaddrlen; - UCHAR if_physaddr[MAX_PHYSADDR_SIZE]; - ULONG if_adminstatus; - ULONG if_operstatus; - ULONG if_lastchange; - ULONG if_inoctets; - ULONG if_inucastpkts; - ULONG if_innucastpkts; - ULONG if_indiscards; - ULONG if_inerrors; - ULONG if_inunknownprotos; - ULONG if_outoctets; - ULONG if_outucastpkts; - ULONG if_outnucastpkts; - ULONG if_outdiscards; - ULONG if_outerrors; - ULONG if_outqlen; - ULONG if_descrlen; - UCHAR if_descr[1]; -} IFEntry; - -// As in the mib from RFC 1213 - -typedef struct _IPRouteEntry { - ULONG ire_dest; - ULONG ire_index; //matches if_index in IFEntry and iae_index in IPAddrEntry - ULONG ire_metric1; - ULONG ire_metric2; - ULONG ire_metric3; - ULONG ire_metric4; - ULONG ire_gw; - ULONG ire_type; - ULONG ire_proto; - ULONG ire_age; - ULONG ire_mask; - ULONG ire_metric5; - ULONG ire_info; -} IPRouteEntry; - -typedef struct _IPAddrEntry { - ULONG iae_addr; - ULONG iae_index; - ULONG iae_mask; - ULONG iae_bcastaddr; - ULONG iae_reasmsize; - ULONG iae_context; - ULONG iae_pad; -} IPAddrEntry; - -typedef struct _IPSNMPInfo { - ULONG ipsi_index; - ULONG ipsi_forwarding; - ULONG ipsi_defaultttl; - ULONG ipsi_inreceives; - ULONG ipsi_inhdrerrors; - ULONG ipsi_inaddrerrors; - ULONG ipsi_inunknownprotos; - ULONG ipsi_indiscards; - ULONG ipsi_indelivers; - ULONG ipsi_outrequests; - ULONG ipsi_routingdiscards; - ULONG ipsi_outdiscards; - ULONG ipsi_outnoroutes; - ULONG ipsi_reasmtimeout; - ULONG ipsi_reasmreqds; - ULONG ipsi_reasmoks; - ULONG ipsi_reasmfails; - ULONG ipsi_fragoks; - ULONG ipsi_fragfails; - ULONG ipsi_fragcreates; - ULONG ipsi_numif; - ULONG ipsi_numaddr; - ULONG ipsi_numroutes; -} IPSNMPInfo; - -#endif /* TCPMISC_H */ _____ Deleted: branches/cache_manager_rewrite/reactos/include/tgetopt.h --- branches/cache_manager_rewrite/reactos/include/tgetopt.h 2005-08-14 13:18:50 UTC (rev 17382) [truncated at 1000 lines; 4571 more skipped]

19 years, 4 months

[jimtabor] 17382: Implemented USBD_ParseConfigurationDescriptorEx and USBD_ParseDescriptors for bulkusb driver testing.

by jimtabor＠svn.reactos.com

Implemented USBD_ParseConfigurationDescriptorEx and USBD_ParseDescriptors for bulkusb driver testing. Modified: trunk/reactos/drivers/usb/usbd/usbd.c _____ Modified: trunk/reactos/drivers/usb/usbd/usbd.c --- trunk/reactos/drivers/usb/usbd/usbd.c 2005-08-14 10:30:10 UTC (rev 17381) +++ trunk/reactos/drivers/usb/usbd/usbd.c 2005-08-14 13:18:50 UTC (rev 17382) @@ -21,7 +21,7 @@ * USBD_GetPdoRegistryParameters (implemented) */ -#include <windows.h> +#include <ddk/ntddk.h> #include <ddk/usbdi.h> #ifndef PLUGPLAY_REGKEY_DRIVER #define PLUGPLAY_REGKEY_DRIVER 2 @@ -371,6 +371,31 @@ /* * @unimplemented */ +PUSB_COMMON_DESCRIPTOR STDCALL +USBD_ParseDescriptors( + PVOID DescriptorBuffer, + ULONG TotalLength, + PVOID StartPosition, + LONG DescriptorType + ) +{ + PUSB_COMMON_DESCRIPTOR PComDes = StartPosition; + + while(PComDes) + { + if (PComDes >= (PUSB_COMMON_DESCRIPTOR) + ((PLONG)DescriptorBuffer + TotalLength) ) break; + if (PComDes->bDescriptorType == DescriptorType) return PComDes; + if (PComDes->bLength == 0) break; + PComDes = PComDes + PComDes->bLength; + } + return NULL; +} + + +/* + * @unimplemented + */ PUSB_INTERFACE_DESCRIPTOR STDCALL USBD_ParseConfigurationDescriptorEx( PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, @@ -382,7 +407,46 @@ LONG InterfaceProtocol ) { - return NULL; + int x = 0; + PUSB_INTERFACE_DESCRIPTOR UsbInterfaceDesc = StartPosition; + + while(UsbInterfaceDesc) + { + UsbInterfaceDesc = (PUSB_INTERFACE_DESCRIPTOR) + USBD_ParseDescriptors(ConfigurationDescriptor, + ConfigurationDescriptor->wTotalLength, + UsbInterfaceDesc, + USB_INTERFACE_DESCRIPTOR_TYPE); + + if (!UsbInterfaceDesc) break; + + if(InterfaceNumber != -1) + { + if(InterfaceNumber != UsbInterfaceDesc->bInterfaceNumber) x = 1; + } + if(AlternateSetting != -1) + { + if(AlternateSetting != UsbInterfaceDesc->bAlternateSetting) x = 1; + } + if(InterfaceClass != -1) + { + if(InterfaceClass != UsbInterfaceDesc->bInterfaceClass) x = 1; + } + if(InterfaceSubClass != -1) + { + if(InterfaceSubClass != UsbInterfaceDesc->bInterfaceSubClass) x = 1; + } + if(InterfaceProtocol != -1) + { + if(InterfaceProtocol != UsbInterfaceDesc->bInterfaceProtocol) x = 1; + } + + if (!x) return UsbInterfaceDesc; + + if (UsbInterfaceDesc->bLength == 0) break; + UsbInterfaceDesc = UsbInterfaceDesc + UsbInterfaceDesc->bLength; + } + return NULL; } /* @@ -400,19 +464,6 @@ -1, -1, -1); } -/* - * @unimplemented - */ -PUSB_COMMON_DESCRIPTOR STDCALL -USBD_ParseDescriptors( - PVOID DescriptorBuffer, - ULONG TotalLength, - PVOID StartPosition, - LONG DescriptorType - ) -{ - return NULL; -} /* * @implemented

19 years, 4 months

[hbirr] 17381: Merged r16249:16330 from trunk.

by hbirr＠svn.reactos.com

Merged r16249:16330 from trunk. Modified: branches/cache_manager_rewrite/reactos/apps/utils/ps/ps.c Modified: branches/cache_manager_rewrite/reactos/baseaddress.xml Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/multiboot.c Modified: branches/cache_manager_rewrite/reactos/bootdata/hiveinst.inf Modified: branches/cache_manager_rewrite/reactos/bootdata/txtsetup.sif Modified: branches/cache_manager_rewrite/reactos/drivers/dd/blue/blue.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/bootvid.c Added: branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/ntbootvid.h Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/circularbuffer. c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/cleanup.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/close.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/create.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/devctrl.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/info.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/legacy.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/misc.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/pnp.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/power.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/rw.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.h Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/fsctl.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/rw.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/ms/create.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/create.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/fsctrl.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/ntfs/mft.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/ntfs/rw.c Modified: branches/cache_manager_rewrite/reactos/drivers/lib/csq/csq.c Added: branches/cache_manager_rewrite/reactos/drivers/lib/csq/csq.h Modified: branches/cache_manager_rewrite/reactos/drivers/net/ndis/include/ndissys. h Modified: branches/cache_manager_rewrite/reactos/drivers/net/ndis/ndis/stubs.c Modified: branches/cache_manager_rewrite/reactos/drivers/storage/cdrom/cdrom.c Modified: branches/cache_manager_rewrite/reactos/drivers/storage/diskdump/diskdump .c Modified: branches/cache_manager_rewrite/reactos/drivers/storage/scsiport/scsiport .c Modified: branches/cache_manager_rewrite/reactos/drivers/usb/miniport/usbehci/usbe hci.h Modified: branches/cache_manager_rewrite/reactos/drivers/usb/miniport/usbohci/usbo hci.h Modified: branches/cache_manager_rewrite/reactos/drivers/usb/miniport/usbuhci/usbu hci.h Modified: branches/cache_manager_rewrite/reactos/drivers/video/displays/vga/vgavid eo/vgavideo.c Modified: branches/cache_manager_rewrite/reactos/drivers/video/miniport/vbe/vbemp. h Modified: branches/cache_manager_rewrite/reactos/drivers/video/miniport/xboxvmp/xb oxvmp.c Modified: branches/cache_manager_rewrite/reactos/drivers/video/miniport/xboxvmp/xb oxvmp.h Modified: branches/cache_manager_rewrite/reactos/drivers/video/videoprt/videoprt.c Modified: branches/cache_manager_rewrite/reactos/drivers/video/videoprt/videoprt.h Modified: branches/cache_manager_rewrite/reactos/drivers/video/videoprt/videoprt.x ml Modified: branches/cache_manager_rewrite/reactos/hal/halx86/generic/adapter.c Modified: branches/cache_manager_rewrite/reactos/hal/halx86/generic/generic.xml Modified: branches/cache_manager_rewrite/reactos/hal/halx86/generic/reboot.c Modified: branches/cache_manager_rewrite/reactos/hal/halx86/include/hal.h Modified: branches/cache_manager_rewrite/reactos/hal/halx86/mp/apic.c Modified: branches/cache_manager_rewrite/reactos/hal/halx86/mp/mps.S Modified: branches/cache_manager_rewrite/reactos/hal/halx86/xbox/halxbox.xml Modified: branches/cache_manager_rewrite/reactos/include/csrss/csrss.h Deleted: branches/cache_manager_rewrite/reactos/include/cvconst.h Deleted: branches/cache_manager_rewrite/reactos/include/d3d.h Deleted: branches/cache_manager_rewrite/reactos/include/d3d8.h Deleted: branches/cache_manager_rewrite/reactos/include/d3d8caps.h Deleted: branches/cache_manager_rewrite/reactos/include/d3d8types.h Deleted: branches/cache_manager_rewrite/reactos/include/d3d9.h Deleted: branches/cache_manager_rewrite/reactos/include/d3d9caps.h Deleted: branches/cache_manager_rewrite/reactos/include/d3d9types.h Deleted: branches/cache_manager_rewrite/reactos/include/d3dcaps.h Deleted: branches/cache_manager_rewrite/reactos/include/d3dhal.h Deleted: branches/cache_manager_rewrite/reactos/include/d3drm.h Deleted: branches/cache_manager_rewrite/reactos/include/d3dtypes.h Deleted: branches/cache_manager_rewrite/reactos/include/d3dvec.inl Deleted: branches/cache_manager_rewrite/reactos/include/d3dx8core.h Deleted: branches/cache_manager_rewrite/reactos/include/dbghelp.h Deleted: branches/cache_manager_rewrite/reactos/include/dciddi.h Deleted: branches/cache_manager_rewrite/reactos/include/ddk/af_irda.h Added: branches/cache_manager_rewrite/reactos/include/ddk/core.h Deleted: branches/cache_manager_rewrite/reactos/include/ddk/csq.h Deleted: branches/cache_manager_rewrite/reactos/include/ddk/d3dhal.h Deleted: branches/cache_manager_rewrite/reactos/include/ddk/d3dnthal.h Deleted: branches/cache_manager_rewrite/reactos/include/ddk/ddrawi.h Deleted: branches/cache_manager_rewrite/reactos/include/ddk/ddrawint.h Deleted: branches/cache_manager_rewrite/reactos/include/ddk/ldrfuncs.h Deleted: branches/cache_manager_rewrite/reactos/include/ddk/ntbootvid.h Modified: branches/cache_manager_rewrite/reactos/include/ddk/ntddblue.h Added: branches/cache_manager_rewrite/reactos/include/ddk/ntpnp.h Deleted: branches/cache_manager_rewrite/reactos/include/ddraw.h Deleted: branches/cache_manager_rewrite/reactos/include/digitalv.h Deleted: branches/cache_manager_rewrite/reactos/include/dinput.h Deleted: branches/cache_manager_rewrite/reactos/include/dsconf.h Deleted: branches/cache_manager_rewrite/reactos/include/dsdriver.h Deleted: branches/cache_manager_rewrite/reactos/include/dsound.h Deleted: branches/cache_manager_rewrite/reactos/include/dxdiag.h Deleted: branches/cache_manager_rewrite/reactos/include/evntrace.h Deleted: branches/cache_manager_rewrite/reactos/include/excpt.h Deleted: branches/cache_manager_rewrite/reactos/include/getopt.h Deleted: branches/cache_manager_rewrite/reactos/include/ipexport.h Deleted: branches/cache_manager_rewrite/reactos/include/ipifcons.h Deleted: branches/cache_manager_rewrite/reactos/include/iprtrmib.h Modified: branches/cache_manager_rewrite/reactos/include/lsass/lsass.h Deleted: branches/cache_manager_rewrite/reactos/include/mmddk.h Deleted: branches/cache_manager_rewrite/reactos/include/napi/ Added: branches/cache_manager_rewrite/reactos/include/ndk/dbgktypes.h Modified: branches/cache_manager_rewrite/reactos/include/ndk/extypes.h Added: branches/cache_manager_rewrite/reactos/include/ndk/fixmes.txt Modified: branches/cache_manager_rewrite/reactos/include/ndk/halfuncs.h [truncated at 100 lines; 345 more skipped] _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/ps/ps.c --- branches/cache_manager_rewrite/reactos/apps/utils/ps/ps.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/apps/utils/ps/ps.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -23,8 +23,8 @@ */ #include <windows.h> -/* NOTE: W32API ddk/ntapi.h header has wrong definition of SYSTEM_PROCESSES. */ -#include <ntos/types.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> typedef struct _SYSTEM_THREADS { _____ Modified: branches/cache_manager_rewrite/reactos/baseaddress.xml --- branches/cache_manager_rewrite/reactos/baseaddress.xml 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/baseaddress.xml 2005-08-14 10:30:10 UTC (rev 17381) @@ -36,6 +36,7 @@ <property name="BASEADDRESS_LZ32" value="0x73d80000" /> <property name="BASEADDRESS_USERENV" value="0x74850000" /> <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> +<property name="BASEADDRESS_SAMSRV" value="0x74f30000" /> <property name="BASEADDRESS_SAMLIB" value="0x750C0000" /> <property name="BASEADDRESS_CABINET" value="0x75120000" /> <property name="BASEADDRESS_MSGINA" value="0x75970000" /> @@ -48,6 +49,7 @@ <property name="BASEADDRESS_RICHED32" value="0x76340000" /> <property name="BASEADDRESS_RICHED20" value="0x76360000" /> <property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> +<property name="BASEADDRESS_LSASRV" value="0x76540000" /> <property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> <property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> <property name="BASEADDRESS_MPR" value="0x76620000" /> @@ -59,6 +61,7 @@ <property name="BASEADDRESS_IPHLPAPI" value="0x77300000" /> <property name="BASEADDRESS_MMDRV" value="0x77500000" /> <property name="BASEADDRESS_CRTDLL" value="0x77630000" /> +<property name="BASEADDRESS_CFGMGR32" value="0x77700000" /> <property name="BASEADDRESS_MSAFD" value="0x777a0000" /> <property name="BASEADDRESS_MSI" value="0x777b0000" /> <property name="BASEADDRESS_SNMPAPI" value="0x777c0000" /> @@ -95,7 +98,6 @@ <property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> <property name="BASEADDRESS_COMMCTRL" value="0x75e60000" /> <property name="BASEADDRESS_D3D8THK" value="0x76340000" /> -<property name="BASEADDRESS_LSASRV" value="0x76540000" /> <property name="BASEADDRESS_ODBC32" value="0x76660000" /> <property name="BASEADDRESS_MSACM32" value="0x77400000" /> <property name="BASEADDRESS_PACKET" value="0x77780000" /> _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/multiboot.c --- branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/multiboot.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/multiboot.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -71,25 +71,6 @@ /* Kernel Entrypoint in Physical Memory */ ULONG_PTR KernelEntry; -/* Page Directory and Tables for non-PAE Systems */ -extern ULONG_PTR startup_pagedirectory; -extern ULONG_PTR lowmem_pagetable; -extern ULONG_PTR kernel_pagetable; -extern ULONG_PTR hyperspace_pagetable; -extern ULONG_PTR _pae_pagedirtable; -extern ULONG_PTR apic_pagetable; -extern ULONG_PTR kpcr_pagetable; - -/* Page Directory and Tables for PAE Systems */ -extern ULONG_PTR startup_pagedirectorytable_pae; -extern ULONG_PTR startup_pagedirectory_pae; -extern ULONG_PTR lowmem_pagetable_pae; -extern ULONG_PTR kernel_pagetable_pae; -extern ULONG_PTR hyperspace_pagetable_pae; -extern ULONG_PTR pagedirtable_pae; -extern ULONG_PTR apic_pagetable_pae; -extern ULONG_PTR kpcr_pagetable_pae; - typedef struct _HARDWARE_PTE_X86 { ULONG Valid : 1; ULONG Write : 1; @@ -126,7 +107,7 @@ typedef struct _PAGE_DIRECTORY_X86 { HARDWARE_PTE_X86 Pde[1024]; -} PAGE_DIRECTORY_x86, *PPAGE_DIRECTORY_X86; +} PAGE_DIRECTORY_X86, *PPAGE_DIRECTORY_X86; typedef struct _PAGE_DIRECTORY_X64 { HARDWARE_PTE_X64 Pde[2048]; @@ -136,6 +117,25 @@ HARDWARE_PTE_X64 Pde[4]; } PAGE_DIRECTORY_TABLE_X64, *PPAGE_DIRECTORY_TABLE_X64; +/* Page Directory and Tables for non-PAE Systems */ +extern PAGE_DIRECTORY_X86 startup_pagedirectory; +extern PAGE_DIRECTORY_X86 lowmem_pagetable; +extern PAGE_DIRECTORY_X86 kernel_pagetable; +extern ULONG_PTR hyperspace_pagetable; +extern ULONG_PTR _pae_pagedirtable; +extern PAGE_DIRECTORY_X86 apic_pagetable; +extern PAGE_DIRECTORY_X86 kpcr_pagetable; + +/* Page Directory and Tables for PAE Systems */ +extern PAGE_DIRECTORY_TABLE_X64 startup_pagedirectorytable_pae; +extern PAGE_DIRECTORY_X64 startup_pagedirectory_pae; +extern PAGE_DIRECTORY_X64 lowmem_pagetable_pae; +extern PAGE_DIRECTORY_X64 kernel_pagetable_pae; +extern ULONG_PTR hyperspace_pagetable_pae; +extern ULONG_PTR pagedirtable_pae; +extern PAGE_DIRECTORY_X64 apic_pagetable_pae; +extern PAGE_DIRECTORY_X64 kpcr_pagetable_pae; + /* FUNCTIONS *****************************************************************/ /*++ _____ Modified: branches/cache_manager_rewrite/reactos/bootdata/hiveinst.inf --- branches/cache_manager_rewrite/reactos/bootdata/hiveinst.inf 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/bootdata/hiveinst.inf 2005-08-14 10:30:10 UTC (rev 17381) @@ -17,15 +17,3 @@ ; VGA miniport driver HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x000000 01 - - -; -; Mouse driver section -; - -; PS/2 mouse port driver -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Start",0x00010001,0x 00000001 - - -; Serial mouse driver -;HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Start",0x00010001,0 x00000001 _____ Modified: branches/cache_manager_rewrite/reactos/bootdata/txtsetup.sif --- branches/cache_manager_rewrite/reactos/bootdata/txtsetup.sif 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/bootdata/txtsetup.sif 2005-08-14 10:30:10 UTC (rev 17381) @@ -96,23 +96,6 @@ 00000809 = kbduk.dll 00000807 = kbdsg.dll -[Mouse] -;<id> = <user friendly name>,<spare>,<service key name> -i8042ps2 = "PS2 Mouse",,i8042prt -;msps2 = "Microsoft PS2 Mouse",,psaux -msser = "Microsoft Serial Mouse",,sermouse -mswhs = "Microsoft Serial Wheel Mouse",,sermouse -none = "No Mouse" - -[Map.Mouse] -;<id> = <pnp id string> -i8042ps2 = "MICROSOFT PS2 MOUSE" -;msps2 = "MICROSOFT PS2 MOUSE" -msser = "MICROSOFT SERIAL MOUSE" -mswhs = "MICROSOFT MOUSE WITH WHEEL" -none = "NO MOUSE" - - [HiveInfs.Install] AddReg=hivecls.inf,AddReg AddReg=hivedef.inf,AddReg _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/blue/blue.c --- branches/cache_manager_rewrite/reactos/drivers/dd/blue/blue.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/blue/blue.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -12,9 +12,9 @@ /* INCLUDES ******************************************************************/ #include <ddk/ntddk.h> -#include <ntos/halfuncs.h> +#include <wincon.h> #include <ddk/ntddblue.h> -#include <string.h> +#include <ndk/halfuncs.h> #define NDEBUG #include <debug.h> _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/bootvid.c --- branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/bootvid.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/bootvid.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -24,10 +24,9 @@ /* INCLUDES ******************************************************************/ #include <ddk/ntddk.h> -#include <ddk/ntbootvid.h> -#include <ntos/ldrtypes.h> -#include <ddk/ldrfuncs.h> +#include <ndk/ldrfuncs.h> #include "bootvid.h" +#include "ntbootvid.h" #include "resource.h" #define NDEBUG _____ Copied: branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/ntbootvid.h (from rev 16330, trunk/reactos/drivers/dd/bootvid/ntbootvid.h) _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/circularbuffer. c --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/circularbuffer. c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/circularbuffer. c 2005-08-14 10:30:10 UTC (rev 17381) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/circularbuffer.c * PURPOSE: Operations on a circular buffer * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/cleanup.c --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/cleanup.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/cleanup.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/cleanup.c * PURPOSE: Serial IRP_MJ_CLEANUP operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/close.c --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/close.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/close.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/close.c * PURPOSE: Serial IRP_MJ_CLOSE operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/create.c --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/create.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/create.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/create.c * PURPOSE: Serial IRP_MJ_CREATE operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/devctrl.c --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/devctrl.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/devctrl.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/devctrl.c * PURPOSE: Serial IRP_MJ_DEVICE_CONTROL operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG @@ -196,12 +195,13 @@ RtlZeroMemory(pCommProp, sizeof(SERIAL_COMMPROP)); - pCommProp->PacketLength = sizeof(SERIAL_COMMPROP); + if (!(pCommProp->ProvSpec1 & COMMPROP_INITIALIZED)) + pCommProp->PacketLength = sizeof(SERIAL_COMMPROP); pCommProp->PacketVersion = 2; pCommProp->ServiceMask = SERIAL_SP_SERIALCOMM; pCommProp->MaxTxQueue = pCommProp->CurrentTxQueue = DeviceExtension->OutputBuffer.Length - 1; pCommProp->MaxRxQueue = pCommProp->CurrentRxQueue = DeviceExtension->InputBuffer.Length - 1; - pCommProp->ProvSubType = 1; // PST_RS232; + pCommProp->ProvSubType = PST_RS232; pCommProp->ProvCapabilities = SERIAL_PCF_DTRDSR | SERIAL_PCF_INTTIMEOUTS | SERIAL_PCF_PARITY_CHECK | SERIAL_PCF_RTSCTS | SERIAL_PCF_SETXCHAR | SERIAL_PCF_SPECIALCHARS | SERIAL_PCF_TOTALTIMEOUTS | SERIAL_PCF_XONXOFF; @@ -227,6 +227,8 @@ pCommProp->SettableStopParity = SERIAL_STOPBITS_10 | SERIAL_STOPBITS_15 | SERIAL_STOPBITS_20 | SERIAL_PARITY_NONE | SERIAL_PARITY_ODD | SERIAL_PARITY_EVEN | SERIAL_PARITY_MARK | SERIAL_PARITY_SPACE; + pCommProp->ProvSpec2 = 0; /* Size of provider-specific data */ + return STATUS_SUCCESS; } _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/info.c --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/info.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/info.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/info.c * PURPOSE: Serial IRP_MJ_QUERY_INFORMATION operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/legacy.c --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/legacy.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/legacy.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/bus/serial/legacy.c * PURPOSE: Legacy serial port enumeration * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) * Mark Junker (mjscod(a)gmx.de) */ _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/misc.c --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/misc.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/misc.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/misc.c * PURPOSE: Misceallenous operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ /* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/pnp.c --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/pnp.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/pnp.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/pnp.c * PURPOSE: Serial IRP_MJ_PNP operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ /* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/power.c --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/power.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/power.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/power.c * PURPOSE: Serial IRP_MJ_POWER operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/rw.c --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/rw.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/rw.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial port driver * FILE: drivers/dd/serial/create.c * PURPOSE: Serial IRP_MJ_READ/IRP_MJ_WRITE operations * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ #define NDEBUG _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.c --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -1,11 +1,10 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: Serial driver * FILE: drivers/dd/serial/serial.c * PURPOSE: Serial driver loading/unloading * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ //#define NDEBUG _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.h --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.h 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.h 2005-08-14 10:30:10 UTC (rev 17381) @@ -1,47 +1,42 @@ -#if defined(__GNUC__) - #include <ddk/ntddk.h> - #include <ddk/ntddser.h> - #include <stdio.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Serial driver + * FILE: drivers/dd/serial/serial.h + * PURPOSE: Serial driver header + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + */ - #include <debug.h> +#include <ntddk.h> +#include <ntddser.h> +#include <stdio.h> - /* FIXME: these prototypes MUST NOT be here! */ - NTSTATUS STDCALL - IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); - +#if defined(__GNUC__) + #include <debug.h> #elif defined(_MSC_VER) - #include <ntddk.h> - #include <ntddser.h> - #include <stdio.h> - #define STDCALL #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) - - NTSTATUS STDCALL - IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); - - #ifdef NDEBUG2 - #define DPRINT - #define CHECKPOINT - #else - #define DPRINT DPRINT1 - #define CHECKPOINT CHECKPOINT1 - #undef NDEBUG - #endif + #define DPRINT + #define CHECKPOINT #else #error Unknown compiler! #endif #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +/* See winbase.h */ +#define PST_RS232 1 +#define COMMPROP_INITIALIZED 0xE73CF52E + +/* FIXME: I don't know why it is not defined anywhere... */ +NTSTATUS STDCALL +IoAttachDeviceToDeviceStackSafe( + IN PDEVICE_OBJECT SourceDevice, + IN PDEVICE_OBJECT TargetDevice, + OUT PDEVICE_OBJECT *AttachedToDeviceObject); + typedef enum { dsStopped, _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/fsctl.c --- branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/fsctl.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/fsctl.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -30,7 +30,6 @@ #include <ddk/ntddk.h> #include <ntddcdrm.h> -#include <ntos/minmax.h> #define NDEBUG #include <debug.h> _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/rw.c --- branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/rw.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/rw.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -29,7 +29,6 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> -#include <ntos/minmax.h> #define NDEBUG #include <debug.h> _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/ms/create.c --- branches/cache_manager_rewrite/reactos/drivers/fs/ms/create.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/fs/ms/create.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -10,9 +10,7 @@ /* INCLUDES ******************************************************************/ #include <ntifs.h> -#include <ntos/fstypes.h> /* FIXME: NDK */ -/* FIXME: The headers are broken! */ -#undef CreateMailslot +#include <ndk/iotypes.h> #include "msfs.h" #define NDEBUG _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/create.c --- branches/cache_manager_rewrite/reactos/drivers/fs/np/create.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/fs/np/create.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -10,7 +10,7 @@ /* INCLUDES ******************************************************************/ #include <ntifs.h> -#include <ntos/fstypes.h> /* FIXME: NDK */ +#include <ndk/iotypes.h> #include "npfs.h" #define NDEBUG _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/fsctrl.c --- branches/cache_manager_rewrite/reactos/drivers/fs/np/fsctrl.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/fs/np/fsctrl.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -11,7 +11,6 @@ /* INCLUDES ******************************************************************/ #include <ntifs.h> -#include <napi/npipe.h> #include "npfs.h" #define NDEBUG _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/ntfs/mft.c --- branches/cache_manager_rewrite/reactos/drivers/fs/ntfs/mft.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/fs/ntfs/mft.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -29,7 +29,6 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> -#include <ntos/minmax.h> #define NDEBUG #include <debug.h> _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/ntfs/rw.c --- branches/cache_manager_rewrite/reactos/drivers/fs/ntfs/rw.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/fs/ntfs/rw.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -29,7 +29,6 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> -#include <ntos/minmax.h> #define NDEBUG #include <debug.h> _____ Modified: branches/cache_manager_rewrite/reactos/drivers/lib/csq/csq.c --- branches/cache_manager_rewrite/reactos/drivers/lib/csq/csq.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/lib/csq/csq.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -27,7 +27,7 @@ #define __NTDRIVER__ #include <ddk/ntddk.h> -#include <ddk/csq.h> +#include <ddk/ntifs.h> static VOID NTAPI IopCsqCancelRoutine(PDEVICE_OBJECT DeviceObject, _____ Copied: branches/cache_manager_rewrite/reactos/drivers/lib/csq/csq.h (from rev 16330, trunk/reactos/drivers/lib/csq/csq.h) _____ Modified: branches/cache_manager_rewrite/reactos/drivers/net/ndis/include/ndissys. h --- branches/cache_manager_rewrite/reactos/drivers/net/ndis/include/ndissys. h 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/net/ndis/include/ndissys. h 2005-08-14 10:30:10 UTC (rev 17381) @@ -19,12 +19,11 @@ #include <ndis.h> #else /* _MSC_VER */ #include <ddk/ntddk.h> +#include <ddk/ntifs.h> #include <ddk/ndis.h> #include <ddk/xfilter.h> #include <ddk/afilter.h> typedef struct _ATM_ADDRESS *PATM_ADDRESS; -/* FIXME: Get rid of this dependance. */ -#include <ddk/ntapi.h> #endif /* _MSC_VER */ struct _ADAPTER_BINDING; _____ Modified: branches/cache_manager_rewrite/reactos/drivers/net/ndis/ndis/stubs.c --- branches/cache_manager_rewrite/reactos/drivers/net/ndis/ndis/stubs.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/net/ndis/ndis/stubs.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -320,7 +320,7 @@ NULL, // PLARGE_INTEGER AllocationSize 0, // ULONG FileAttributes FILE_SHARE_READ, // ULONG ShareAccess - CREATE_NEW, // ULONG CreateDisposition + FILE_CREATE, // ULONG CreateDisposition FILE_SYNCHRONOUS_IO_NONALERT, // ULONG CreateOptions 0, // PVOID EaBuffer 0 ); // ULONG EaLength _____ Modified: branches/cache_manager_rewrite/reactos/drivers/storage/cdrom/cdrom.c --- branches/cache_manager_rewrite/reactos/drivers/storage/cdrom/cdrom.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/storage/cdrom/cdrom.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -39,7 +39,6 @@ #include <ddk/ntdddisk.h> #include <ddk/ntddcdrm.h> #include <ddk/class2.h> -#include <ntos/minmax.h> #include <stdio.h> #define NDEBUG _____ Modified: branches/cache_manager_rewrite/reactos/drivers/storage/diskdump/diskdump .c --- branches/cache_manager_rewrite/reactos/drivers/storage/diskdump/diskdump .c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/storage/diskdump/diskdump .c 2005-08-14 10:30:10 UTC (rev 17381) @@ -32,9 +32,10 @@ #include <ddk/ntdddisk.h> #include <ddk/ntddscsi.h> #include <ddk/class2.h> +#include <ddk/core.h> -#include <ndk/ntndk.h> -#include <napi/core.h> +#include <ndk/extypes.h> +#include <ndk/rtlfuncs.h> #include "../scsiport/scsiport_int.h" #define NDEBUG _____ Modified: branches/cache_manager_rewrite/reactos/drivers/storage/scsiport/scsiport .c --- branches/cache_manager_rewrite/reactos/drivers/storage/scsiport/scsiport .c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/storage/scsiport/scsiport .c 2005-08-14 10:30:10 UTC (rev 17381) @@ -32,7 +32,6 @@ #include <ddk/srb.h> #include <ddk/scsi.h> #include <ddk/ntddscsi.h> -#include <ntos/minmax.h> #include <stdio.h> #define NDEBUG _____ Modified: branches/cache_manager_rewrite/reactos/drivers/usb/miniport/usbehci/usbe hci.h --- branches/cache_manager_rewrite/reactos/drivers/usb/miniport/usbehci/usbe hci.h 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/usb/miniport/usbehci/usbe hci.h 2005-08-14 10:30:10 UTC (rev 17381) @@ -26,7 +26,6 @@ #include "stddef.h" #include "windef.h" //#include <ddk/miniport.h> -#include <ddk/ntapi.h> #ifdef DBG #define DPRINT(arg) DbgPrint arg; _____ Modified: branches/cache_manager_rewrite/reactos/drivers/usb/miniport/usbohci/usbo hci.h --- branches/cache_manager_rewrite/reactos/drivers/usb/miniport/usbohci/usbo hci.h 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/usb/miniport/usbohci/usbo hci.h 2005-08-14 10:30:10 UTC (rev 17381) @@ -26,7 +26,6 @@ #include "stddef.h" #include "windef.h" //#include <ddk/miniport.h> -#include <ddk/ntapi.h> #ifdef DBG #define DPRINT(arg) DbgPrint arg; _____ Modified: branches/cache_manager_rewrite/reactos/drivers/usb/miniport/usbuhci/usbu hci.h --- branches/cache_manager_rewrite/reactos/drivers/usb/miniport/usbuhci/usbu hci.h 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/usb/miniport/usbuhci/usbu hci.h 2005-08-14 10:30:10 UTC (rev 17381) @@ -26,7 +26,6 @@ #include "stddef.h" #include "windef.h" //#include <ddk/miniport.h> -#include <ddk/ntapi.h> // Export funcs here /* _____ Modified: branches/cache_manager_rewrite/reactos/drivers/video/displays/vga/vgavid eo/vgavideo.c --- branches/cache_manager_rewrite/reactos/drivers/video/displays/vga/vgavid eo/vgavideo.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/video/displays/vga/vgavid eo/vgavideo.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -1,7 +1,6 @@ #include <ddk/ntddk.h> #include <ddk/ntddvdeo.h> #include <ddk/winddi.h> -#include <ntos/minmax.h> #include <stdlib.h> #include "vgavideo.h" _____ Modified: branches/cache_manager_rewrite/reactos/drivers/video/miniport/vbe/vbemp. h --- branches/cache_manager_rewrite/reactos/drivers/video/miniport/vbe/vbemp. h 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/video/miniport/vbe/vbemp. h 2005-08-14 10:30:10 UTC (rev 17381) @@ -27,7 +27,6 @@ #include <ddk/miniport.h> #include <ddk/video.h> #include <ddk/ntddvdeo.h> -#include <ddk/ntapi.h> /* * Compile-time define to get VBE 1.2 support. The implementation _____ Modified: branches/cache_manager_rewrite/reactos/drivers/video/miniport/xboxvmp/xb oxvmp.c --- branches/cache_manager_rewrite/reactos/drivers/video/miniport/xboxvmp/xb oxvmp.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/video/miniport/xboxvmp/xb oxvmp.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -366,7 +366,7 @@ sizeof(SYSTEM_BASIC_INFORMATION), &Length))) { - FrameBuffer.u.LowPart = BasicInfo.HighestPhysicalPage * PAGE_SIZE; + FrameBuffer.u.LowPart = BasicInfo.HighestPhysicalPageNumber * PAGE_SIZE; } else { _____ Modified: branches/cache_manager_rewrite/reactos/drivers/video/miniport/xboxvmp/xb oxvmp.h --- branches/cache_manager_rewrite/reactos/drivers/video/miniport/xboxvmp/xb oxvmp.h 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/video/miniport/xboxvmp/xb oxvmp.h 2005-08-14 10:30:10 UTC (rev 17381) @@ -28,7 +28,7 @@ #include <ddk/miniport.h> #include <ddk/video.h> #include <ddk/ntddvdeo.h> -#include <ddk/ntapi.h> +#include <ndk/ntndk.h> #define NDEBUG #include <debug.h> Property changes on: branches/cache_manager_rewrite/reactos/drivers/video/videoprt ___________________________________________________________________ Name: svn:ignore - videoprt.coff *.o *.a *.sym *.sys *.map .*.d makefile + videoprt.coff *.o *.a *.sym *.sys *.map .*.d makefile *.gch _____ Modified: branches/cache_manager_rewrite/reactos/drivers/video/videoprt/videoprt.c --- branches/cache_manager_rewrite/reactos/drivers/video/videoprt/videoprt.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/video/videoprt/videoprt.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -65,7 +65,7 @@ IN PVOID HwDeviceExtension, IN PUCHAR FunctionName) { - SYSTEM_LOAD_IMAGE GdiDriverInfo; + SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo; PVOID BaseAddress; PIMAGE_EXPORT_DIRECTORY ExportDir; PUSHORT OrdinalPtr; @@ -76,18 +76,18 @@ DPRINT("VideoPortGetProcAddress(%s)\n", FunctionName); - RtlInitUnicodeString(&GdiDriverInfo.ModuleName, L"videoprt"); + RtlInitUnicodeString(&GdiDriverInfo.DriverName, L"videoprt"); Status = ZwSetSystemInformation( - SystemLoadImage, + SystemLoadGdiDriverInformation, &GdiDriverInfo, - sizeof(SYSTEM_LOAD_IMAGE)); + sizeof(SYSTEM_GDI_DRIVER_INFORMATION)); if (!NT_SUCCESS(Status)) { DPRINT("Couldn't get our own module handle?\n"); return NULL; } - BaseAddress = GdiDriverInfo.ModuleBase; + BaseAddress = GdiDriverInfo.ImageAddress; /* Get the pointer to the export directory */ ExportDir = (PIMAGE_EXPORT_DIRECTORY)IntVideoPortImageDirectoryEntryToData( @@ -359,7 +359,7 @@ { ConfigInfo.SystemMemorySize = SystemBasicInfo.NumberOfPhysicalPages * - SystemBasicInfo.PhysicalPageSize; + SystemBasicInfo.PageSize; } /* _____ Modified: branches/cache_manager_rewrite/reactos/drivers/video/videoprt/videoprt.h --- branches/cache_manager_rewrite/reactos/drivers/video/videoprt/videoprt.h 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/video/videoprt/videoprt.h 2005-08-14 10:30:10 UTC (rev 17381) @@ -28,29 +28,14 @@ #include <ddk/miniport.h> #include <ddk/video.h> #include <ddk/ntddvdeo.h> -#include <ddk/ntapi.h> #include <ddk/ntagp.h> -/* For process attaching functions */ #include <ddk/ntifs.h> +#include <ndk/ntndk.h> +#include <reactos/helper.h> + #define NDEBUG #include <debug.h> -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - -int swprintf(wchar_t *buf, const wchar_t *fmt, ...); -int vsprintf(char *buf, const char *fmt, va_list args); - -BOOLEAN STDCALL -HalDisableSystemInterrupt(ULONG Vector, - KIRQL Irql); - -BOOLEAN STDCALL -HalEnableSystemInterrupt(ULONG Vector, - KIRQL Irql, - KINTERRUPT_MODE InterruptMode); - -PIMAGE_NT_HEADERS STDCALL RtlImageNtHeader(IN PVOID BaseAddress); - #define TAG_VIDEO_PORT TAG('V', 'I', 'D', 'P') typedef struct _VIDEO_PORT_ADDRESS_MAPPING _____ Modified: branches/cache_manager_rewrite/reactos/drivers/video/videoprt/videoprt.x ml --- branches/cache_manager_rewrite/reactos/drivers/video/videoprt/videoprt.x ml 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/drivers/video/videoprt/videoprt.x ml 2005-08-14 10:30:10 UTC (rev 17381) @@ -5,6 +5,7 @@ <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> + <pch>videoprt.h</pch> <file>agp.c</file> <file>ddc.c</file> <file>dispatch.c</file> _____ Modified: branches/cache_manager_rewrite/reactos/hal/halx86/generic/adapter.c --- branches/cache_manager_rewrite/reactos/hal/halx86/generic/adapter.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/hal/halx86/generic/adapter.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -17,10 +17,6 @@ #define NDEBUG #include <debug.h> -/* Hmm, needed for KDBG := 1. Why? */ -extern POBJECT_TYPE IMPORTED IoAdapterObjectType; -#undef KeGetCurrentIrql - /* FUNCTIONS *****************************************************************/ /* NOTE: IoAllocateAdapterChannel in NTOSKRNL.EXE */ _____ Modified: branches/cache_manager_rewrite/reactos/hal/halx86/generic/generic.xml --- branches/cache_manager_rewrite/reactos/hal/halx86/generic/generic.xml 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/hal/halx86/generic/generic.xml 2005-08-14 10:30:10 UTC (rev 17381) @@ -24,6 +24,7 @@ <file>sysinfo.c</file> <file>time.c</file> <file>timer.c</file> + <pch>../include/hal.h</pch> </module> <module name="hal_generic_up" type="objectlibrary"> <include base="hal_generic_up">../include</include> _____ Modified: branches/cache_manager_rewrite/reactos/hal/halx86/generic/reboot.c --- branches/cache_manager_rewrite/reactos/hal/halx86/generic/reboot.c 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/hal/halx86/generic/reboot.c 2005-08-14 10:30:10 UTC (rev 17381) @@ -54,7 +54,7 @@ VOID STDCALL HalReturnToFirmware ( - ULONG Action + FIRMWARE_REENTRY Action ) { if (Action == HalHaltRoutine) _____ Modified: branches/cache_manager_rewrite/reactos/hal/halx86/include/hal.h --- branches/cache_manager_rewrite/reactos/hal/halx86/include/hal.h 2005-08-14 09:14:53 UTC (rev 17380) +++ branches/cache_manager_rewrite/reactos/hal/halx86/include/hal.h 2005-08-14 10:30:10 UTC (rev 17381) @@ -8,48 +8,25 @@ /* INCLUDES ******************************************************************/ -/* SDK/DDK/NDK Headers. */ +/* IFS/DDK/NDK Headers */ #include <ddk/ntddk.h> -#include <stdio.h> +#include <ddk/ntifs.h> +#include <ndk/ntndk.h> -/* FIXME: NDK Headers */ -#include <roskrnl.h> - /* Internal Kernel Headers */ //#include <internal/mm.h> #include <internal/ke.h> -#include <internal/i386/ps.h> -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#define KPCR_BASE 0xFF000000 // HACK! -//Temporary hack below. +//Temporary hack below until ntoskrnl is on NDK PVOID STDCALL MmAllocateContiguousAlignedMemory(IN ULONG NumberOfBytes, - IN PHYSICAL_ADDRESS LowestAcceptableAddress, - IN PHYSICAL_ADDRESS HighestAcceptableAddress, - IN PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL, - IN MEMORY_CACHING_TYPE CacheType OPTIONAL, - IN ULONG Alignment); - -/* FIXME: NDK */ -VOID STDCALL KeEnterKernelDebugger (VOID); -VOID FASTCALL KiAcquireSpinLock(PKSPIN_LOCK SpinLock); -VOID FASTCALL KiReleaseSpinLock(PKSPIN_LOCK SpinLock); -VOID STDCALL KiDispatchInterrupt(VOID); -NTSTATUS -STDCALL -ObCreateObject ( - IN KPROCESSOR_MODE ObjectAttributesAccessMode OPTIONAL, - IN POBJECT_TYPE ObjectType, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN KPROCESSOR_MODE AccessMode, - IN OUT PVOID ParseContext OPTIONAL, - IN ULONG ObjectSize, - IN ULONG PagedPoolCharge OPTIONAL, - IN ULONG NonPagedPoolCharge OPTIONAL, - OUT PVOID *Object -); - + IN PHYSICAL_ADDRESS LowestAcceptableAddress, + IN PHYSICAL_ADDRESS HighestAcceptableAddress, [truncated at 1000 lines; 71946 more skipped]

19 years, 4 months

[greatlrd] 17380: change CMDLINE_LENGTH to 8192 to keep rbuild happy until dymatic alloc are in place

by greatlrd＠svn.reactos.com

change CMDLINE_LENGTH to 8192 to keep rbuild happy until dymatic alloc are in place Modified: trunk/reactos/subsys/system/cmd/cmd.h _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-08-14 04:36:36 UTC (rev 17379) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-08-14 09:14:53 UTC (rev 17380) @@ -44,7 +44,7 @@ /* command line buffer length */ #ifdef __REACTOS__ -#define CMDLINE_LENGTH 512 +#define CMDLINE_LENGTH 8192 #else #define CMDLINE_LENGTH 8192 //#define CMDLINE_LENGTH 1024

19 years, 4 months

← Newer
1
...
19
20
21
22
23
24
25
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005