Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 26271: remove a wrong behvoir in DdQueryDirectDrawObject aka GdiEntry2
by greatlrd＠svn.reactos.org 06 Apr '07

06 Apr '07

Author: greatlrd Date: Sat Apr 7 00:54:21 2007 New Revision: 26271 URL: http://svn.reactos.org/svn/reactos?rev=26271&view=rev Log: remove a wrong behvoir in DdQueryDirectDrawObject aka GdiEntry2 Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sat Apr 7 00:54:21 2007 @@ -554,14 +554,7 @@ RtlZeroMemory(&D3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)); RtlZeroMemory(CallbackFlags, sizeof(DWORD)*3); - /* Check if we got a list pointer */ - if (pvmList) - { - /* Allocate memory for it */ - VidMemList = LocalAlloc(LMEM_ZEROINIT, - sizeof(VIDEOMEMORY) * - pHalInfo->vmiData.dwNumHeaps); - } + pvmList = NULL; /* Do the query */ if (!NtGdiDdQueryDirectDrawObject(GetDdHandle(pDirectDrawGlobal->hDD), @@ -577,7 +570,6 @@ pdwFourCC)) { /* We failed, free the memory and return */ - if (VidMemList) LocalFree(VidMemList); return FALSE; } @@ -621,7 +613,7 @@ pHalInfo->vmiData.dwTextureAlign = HalInfo.vmiData.dwTextureAlign; pHalInfo->vmiData.dwZBufferAlign = HalInfo.vmiData.dwZBufferAlign; pHalInfo->vmiData.dwAlphaAlign = HalInfo.vmiData.dwAlphaAlign; - pHalInfo->vmiData.dwNumHeaps = dwNumHeaps; + pHalInfo->vmiData.dwNumHeaps = 0; pHalInfo->vmiData.pvmList = pvmList; RtlCopyMemory( &pHalInfo->ddCaps, &HalInfo.ddCaps,sizeof(DDCORECAPS )); @@ -783,33 +775,6 @@ /* FIXME: Check for D3D Buffer Callbacks */ - /* Check if we have a video memory list */ - if (VidMemList) - { - /* Start a loop here */ - PVIDEOMEMORY VidMem = VidMemList; - - /* Loop all the heaps we have */ - while (dwNumHeaps--) - { - /* Copy from one format to the other */ - pvmList->dwFlags = VidMem->dwFlags; - pvmList->fpStart = VidMem->fpStart; - pvmList->fpEnd = VidMem->fpEnd; - pvmList->ddsCaps = VidMem->ddsCaps; - pvmList->ddsCapsAlt = VidMem->ddsCapsAlt; - pvmList->dwHeight = VidMem->dwHeight; - - /* Advance in both structures */ - pvmList++; - VidMem++; - } - - /* Free our structure */ - LocalFree(VidMemList); - } - - return TRUE; }

1 0

[greatlrd] 26270: Remove a windwos 95/98/Me behvoir in NtGdiDdQueryDirectDrawObject, also tested in windows 2000 see if this bevhoir really exitsed or not. puvmList and puNumHeaps should be ignore by Windows NT when they are pass down, it is not true if both getting a vaild pointer I am getting back data in windows it is not a vmList, what I get back I do not known. Add a comment I did forget setup the copy of puD3dTextureFormats from kmode to umode pointer will be fixed later. After I fix the l
by greatlrd＠svn.reactos.org 06 Apr '07

06 Apr '07

Author: greatlrd Date: Sat Apr 7 00:43:11 2007 New Revision: 26270 URL: http://svn.reactos.org/svn/reactos?rev=26270&view=rev Log: Remove a windwos 95/98/Me behvoir in NtGdiDdQueryDirectDrawObject, also tested in windows 2000 see if this bevhoir really exitsed or not. puvmList and puNumHeaps should be ignore by Windows NT when they are pass down, it is not true if both getting a vaild pointer I am getting back data in windows it is not a vmList, what I get back I do not known. Add a comment I did forget setup the copy of puD3dTextureFormats from kmode to umode pointer will be fixed later. After I fix the last part this api is 99.9% compatible with Windows 2000 and higher. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sat Apr 7 00:43:11 2007 @@ -502,17 +502,18 @@ return FALSE; } + /* FIXME puD3dTextureFormats */ + _SEH_TRY { - ProbeForWrite(puNumHeaps, sizeof(DWORD), 1); - *puNumHeaps = pDirectDraw->dwNumHeaps; - - if ((pDirectDraw->pvmList != NULL) && (puvmList != NULL)) - { - ProbeForWrite(puvmList, sizeof(VIDEOMEMORY) * pDirectDraw->dwNumHeaps, 1); - RtlCopyMemory( puvmList, pDirectDraw->pvmList, sizeof(VIDEOMEMORY) * pDirectDraw->dwNumHeaps); - } - + /* Waring : + * In Windows 2000 puvmList and puNumHeaps does not export from + * NtGdiDdQueryDirectDrawObject + * FIXME remove alloc code for puvmList and puNumHeaps in GDI32.dll + * so I remove the puvmList code I wrote. See MSDN and my + * private note about this matter, the private note will be in + * my book as well when it comes. + */ ProbeForWrite(puNumFourCC, sizeof(DWORD), 1); *puNumFourCC = pDirectDraw->dwNumFourCC;

1 0

[tkreuzer] 26269: fix warnings on gcc 4.1.2
by tkreuzer＠svn.reactos.org 06 Apr '07

06 Apr '07

Author: tkreuzer Date: Fri Apr 6 18:24:59 2007 New Revision: 26269 URL: http://svn.reactos.org/svn/reactos?rev=26269&view=rev Log: fix warnings on gcc 4.1.2 Modified: trunk/rosapps/devutils/gdihv/handlelist.c trunk/rosapps/devutils/gdihv/mainwnd.c trunk/rosapps/devutils/gdihv/proclist.c Modified: trunk/rosapps/devutils/gdihv/handlelist.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/handlelist.… ============================================================================== --- trunk/rosapps/devutils/gdihv/handlelist.c (original) +++ trunk/rosapps/devutils/gdihv/handlelist.c Fri Apr 6 18:24:59 2007 @@ -32,31 +32,31 @@ column.pszText = L"Number"; column.cx = 50; - ListView_InsertColumn(hListCtrl, 0, &column); + (void)ListView_InsertColumn(hListCtrl, 0, &column); column.pszText = L"Index"; - column.cx = 50; - ListView_InsertColumn(hListCtrl, 1, &column); + column.cx = 45; + (void)ListView_InsertColumn(hListCtrl, 1, &column); column.pszText = L"Handle"; column.cx = 90; - ListView_InsertColumn(hListCtrl, 2, &column); + (void)ListView_InsertColumn(hListCtrl, 2, &column); column.pszText = L"Type"; - column.cx = 90; - ListView_InsertColumn(hListCtrl, 3, &column); + column.cx = 80; + (void)ListView_InsertColumn(hListCtrl, 3, &column); column.pszText = L"Process"; - column.cx = 90; - ListView_InsertColumn(hListCtrl, 4, &column); + column.cx = 80; + (void)ListView_InsertColumn(hListCtrl, 4, &column); column.pszText = L"KernelData"; - column.cx = 90; - ListView_InsertColumn(hListCtrl, 5, &column); + column.cx = 80; + (void)ListView_InsertColumn(hListCtrl, 5, &column); column.pszText = L"UserData"; - column.cx = 90; - ListView_InsertColumn(hListCtrl, 6, &column); + column.cx = 80; + (void)ListView_InsertColumn(hListCtrl, 6, &column); HandleList_Update(hListCtrl, 0); } @@ -70,7 +70,7 @@ TCHAR strText[80]; TCHAR* str2; - ListView_DeleteAllItems(hHandleListCtrl); + (void)ListView_DeleteAllItems(hHandleListCtrl); item.mask = LVIF_TEXT|LVIF_PARAM; item.pszText = strText; item.cchTextMax = 80; @@ -86,7 +86,7 @@ item.iSubItem = 0; wsprintf(strText, L"%d", index); - ListView_InsertItem(hHandleListCtrl, &item); + (void)ListView_InsertItem(hHandleListCtrl, &item); wsprintf(strText, L"%d", i); ListView_SetItemText(hHandleListCtrl, index, 1, strText); Modified: trunk/rosapps/devutils/gdihv/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/mainwnd.c?r… ============================================================================== --- trunk/rosapps/devutils/gdihv/mainwnd.c (original) +++ trunk/rosapps/devutils/gdihv/mainwnd.c Fri Apr 6 18:24:59 2007 @@ -64,7 +64,7 @@ memset(&item, 0, sizeof(LV_ITEM)); item.mask = LVIF_PARAM; item.iItem = ListView_GetSelectionMark(hProcessListCtrl); - ListView_GetItem(hProcessListCtrl, &item); + (void)ListView_GetItem(hProcessListCtrl, &item); HandleList_Update(GetDlgItem(hMainWnd, IDC_HANDLELIST), (HANDLE)item.lParam); break; } @@ -91,7 +91,7 @@ memset(&item, 0, sizeof(LV_ITEM)); item.mask = LVIF_PARAM; item.iItem = ((LPNMLISTVIEW)lParam)->iItem; - ListView_GetItem(GetDlgItem(hMainWnd, IDC_PROCESSLIST), &item); + (void)ListView_GetItem(GetDlgItem(hMainWnd, IDC_PROCESSLIST), &item); HandleList_Update(GetDlgItem(hMainWnd, IDC_HANDLELIST), (HANDLE)item.lParam); return TRUE; break; Modified: trunk/rosapps/devutils/gdihv/proclist.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/proclist.c?… ============================================================================== --- trunk/rosapps/devutils/gdihv/proclist.c (original) +++ trunk/rosapps/devutils/gdihv/proclist.c Fri Apr 6 18:24:59 2007 @@ -32,11 +32,11 @@ column.pszText = L"Process"; column.cx = 90; - ListView_InsertColumn(hListCtrl, 0, &column); + (void)ListView_InsertColumn(hListCtrl, 0, &column); column.pszText = L"ProcessID"; column.cx = 90; - ListView_InsertColumn(hListCtrl, 1, &column); + (void)ListView_InsertColumn(hListCtrl, 1, &column); ProcessList_Update(hListCtrl); } @@ -49,7 +49,7 @@ WCHAR strText[MAX_PATH] = L"<unknown>"; INT i; - ListView_DeleteAllItems(hListCtrl); + (void)ListView_DeleteAllItems(hListCtrl); memset(&item, 0, sizeof(LV_ITEM)); item.mask = LVIF_TEXT|LVIF_PARAM; item.pszText = strText; @@ -58,7 +58,7 @@ item.iItem = 0; item.lParam = 0; item.pszText = L"<Kernel>"; - ListView_InsertItem(hListCtrl, &item); + (void)ListView_InsertItem(hListCtrl, &item); item.pszText = strText; wsprintf(strText, L"%#08x", 0); ListView_SetItemText(hListCtrl, 0, 1, strText); @@ -80,13 +80,13 @@ hProcess = 0; /* FIXME: HACK: ROS crashes when using OpenProcess with PROCESS_VM_READ */ -// hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, ProcessIds[i]); + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, ProcessIds[i]); if (hProcess) { GetModuleBaseName(hProcess, NULL, (LPWSTR)strText, MAX_PATH ); CloseHandle(hProcess); } - ListView_InsertItem(hListCtrl, &item); + (void)ListView_InsertItem(hListCtrl, &item); wsprintf(strText, L"%#08x", ProcessIds[i]); ListView_SetItemText(hListCtrl, item.iItem, 1, strText);

1 0

[fireball] 26268: - Make class2 and disk completely warning-free.
by fireball＠svn.reactos.org 05 Apr '07

05 Apr '07

Author: fireball Date: Thu Apr 5 21:36:39 2007 New Revision: 26268 URL: http://svn.reactos.org/svn/reactos?rev=26268&view=rev Log: - Make class2 and disk completely warning-free. Modified: trunk/reactos/drivers/storage/class/class2/class2.c trunk/reactos/drivers/storage/class/class2/class2.rbuild trunk/reactos/drivers/storage/class/disk/disk.c trunk/reactos/drivers/storage/class/disk/disk.rbuild Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c Thu Apr 5 21:36:39 2007 @@ -210,7 +210,7 @@ do { - sprintf(deviceNameBuffer, "\\Device\\ScsiPort%d", portNumber); + sprintf(deviceNameBuffer, "\\Device\\ScsiPort%lu", portNumber); DebugPrint((2, "ScsiClassInitialize: Open Port %s\n", deviceNameBuffer)); @@ -334,7 +334,6 @@ PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(Irp); ULONG transferPages; ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; - LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset; ULONG maximumTransferLength = deviceExtension->PortCapabilities->MaximumTransferLength; NTSTATUS status; @@ -1513,7 +1512,7 @@ retry = TRUE; } - if (retry && (irpStack->Parameters.Others.Argument4 = (ULONG)irpStack->Parameters.Others.Argument4-1)) { + if (retry && (irpStack->Parameters.Others.Argument4 = (PVOID)((ULONG)irpStack->Parameters.Others.Argument4-1))) { // // Retry request. @@ -1665,7 +1664,7 @@ retry = TRUE; } - if (retry && (irpStack->Parameters.Others.Argument4 = (ULONG)irpStack->Parameters.Others.Argument4-1)) { + if (retry && (irpStack->Parameters.Others.Argument4 = (PVOID)((ULONG)irpStack->Parameters.Others.Argument4-1))) { // // Retry request. If the class driver has supplied a StartIo, @@ -2115,7 +2114,7 @@ BOOLEAN retry = TRUE; BOOLEAN logError = FALSE; ULONG badSector = 0; - ULONG uniqueId; + ULONG uniqueId = 0; NTSTATUS logStatus; ULONG readSector; ULONG index; @@ -2885,7 +2884,7 @@ // Pass the request to the port driver. // - (PVOID)IoCallDriver(deviceExtension->PortDeviceObject, Irp); + (VOID)IoCallDriver(deviceExtension->PortDeviceObject, Irp); } // end RetryRequest() @@ -3246,7 +3245,7 @@ PUCHAR limit; ULONG parameterHeaderLength; - limit = ModeSenseBuffer + Length; + limit = (PUCHAR)ModeSenseBuffer + Length; parameterHeaderLength = (Use6Byte) ? sizeof(MODE_PARAMETER_HEADER) : sizeof(MODE_PARAMETER_HEADER10); @@ -3269,7 +3268,7 @@ // - while (ModeSenseBuffer < limit) { + while ((PUCHAR)ModeSenseBuffer < limit) { if (((PMODE_DISCONNECT_PAGE) ModeSenseBuffer)->PageCode == PageMode) { return(ModeSenseBuffer); @@ -4603,7 +4602,7 @@ NULL, NonPagedPoolMustSucceed, SCSI_REQUEST_BLOCK_SIZE, - 'HscS', + TAG('H','s','c','S'), (USHORT)NumberElements); } Modified: trunk/reactos/drivers/storage/class/class2/class2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.rbuild (original) +++ trunk/reactos/drivers/storage/class/class2/class2.rbuild Thu Apr 5 21:36:39 2007 @@ -1,4 +1,4 @@ -<module name="class2" type="exportdriver" installbase="system32/drivers" installname="class2.sys" allowwarnings="true"> +<module name="class2" type="exportdriver" installbase="system32/drivers" installname="class2.sys"> <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <importlibrary definition="class2.def" /> Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c Thu Apr 5 21:36:39 2007 @@ -448,8 +448,6 @@ PSCSI_ADAPTER_BUS_INFO adapterInfo; PINQUIRYDATA inquiryData; ULONG scsiBus; - ULONG size; - ULONG sizeElement; ULONG adapterDisk; NTSTATUS status; BOOLEAN foundOne = FALSE; @@ -638,7 +636,7 @@ PDEVICE_OBJECT physicalDevice; PDISK_GEOMETRY diskGeometry = NULL; PDRIVE_LAYOUT_INFORMATION partitionList; - PDEVICE_EXTENSION deviceExtension; + PDEVICE_EXTENSION deviceExtension = NULL; PDEVICE_EXTENSION physicalDeviceExtension; PDISK_DATA diskData; ULONG bytesPerSector; @@ -649,7 +647,7 @@ BOOLEAN writeCache; PVOID senseData = NULL; ULONG srbFlags; - ULONG dmByteSkew; + ULONG dmByteSkew = 0; PULONG dmSkew; BOOLEAN dmActive = FALSE; ULONG timeOut = 0; @@ -665,7 +663,7 @@ // sprintf(ntNameBuffer, - "\\Device\\Harddisk%d", + "\\Device\\Harddisk%lu", *DeviceCount); RtlInitString(&ntNameString, @@ -723,7 +721,7 @@ // sprintf(ntNameBuffer, - "\\Device\\Harddisk%d\\Partition0", + "\\Device\\Harddisk%lu\\Partition0", *DeviceCount); @@ -1042,7 +1040,7 @@ HalExamineMBR(deviceExtension->DeviceObject, deviceExtension->DiskGeometry->BytesPerSector, (ULONG)0x54, - &dmSkew); + (PVOID)&dmSkew); if (dmSkew) { @@ -1179,7 +1177,7 @@ // sprintf(ntNameBuffer, - "\\Device\\Harddisk%d\\Partition%d", + "\\Device\\Harddisk%lu\\Partition%lu", *DeviceCount, partitionNumber + 1); @@ -1425,9 +1423,6 @@ PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(Irp); ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; LARGE_INTEGER startingOffset; - ULONG maximumTransferLength = - deviceExtension->PortCapabilities->MaximumTransferLength; - ULONG transferPages; // // Verify parameters of this request. @@ -1533,7 +1528,7 @@ case SMART_GET_VERSION: { - PUCHAR buffer; + ULONG_PTR buffer; PSRB_IO_CONTROL srbControl; PGETVERSIONINPARAMS versionParams; @@ -1572,8 +1567,7 @@ // Point to the 'buffer' portion of the SRB_CONTROL // - buffer = (PUCHAR)srbControl; - buffer = (ULONG)buffer + srbControl->HeaderLength; + buffer = (ULONG_PTR)srbControl + srbControl->HeaderLength; // // Ensure correct target is set in the cmd parameters. @@ -1586,7 +1580,7 @@ // Copy the IOCTL parameters to the srb control buffer area. // - RtlMoveMemory(buffer, Irp->AssociatedIrp.SystemBuffer, sizeof(GETVERSIONINPARAMS)); + RtlMoveMemory((PVOID)buffer, Irp->AssociatedIrp.SystemBuffer, sizeof(GETVERSIONINPARAMS)); irp2 = IoBuildDeviceIoControlRequest(IOCTL_SCSI_MINIPORT, @@ -1622,10 +1616,9 @@ if (NT_SUCCESS(status)) { - buffer = (PUCHAR)srbControl; - buffer = (ULONG)buffer + srbControl->HeaderLength; - - RtlMoveMemory ( Irp->AssociatedIrp.SystemBuffer, buffer, sizeof(GETVERSIONINPARAMS)); + buffer = (ULONG_PTR)srbControl + srbControl->HeaderLength; + + RtlMoveMemory ( Irp->AssociatedIrp.SystemBuffer, (PVOID)buffer, sizeof(GETVERSIONINPARAMS)); Irp->IoStatus.Information = sizeof(GETVERSIONINPARAMS); } @@ -1638,7 +1631,7 @@ PSENDCMDINPARAMS cmdInParameters = ((PSENDCMDINPARAMS)Irp->AssociatedIrp.SystemBuffer); ULONG controlCode = 0; PSRB_IO_CONTROL srbControl; - PUCHAR buffer; + ULONG_PTR buffer; if (irpStack->Parameters.DeviceIoControl.InputBufferLength < (sizeof(SENDCMDINPARAMS) - 1)) { @@ -1709,8 +1702,7 @@ // Point to the 'buffer' portion of the SRB_CONTROL // - buffer = (PUCHAR)srbControl; - buffer = (ULONG)buffer + srbControl->HeaderLength; + buffer = (ULONG_PTR)srbControl + srbControl->HeaderLength; // // Ensure correct target is set in the cmd parameters. @@ -1722,7 +1714,7 @@ // Copy the IOCTL parameters to the srb control buffer area. // - RtlMoveMemory(buffer, Irp->AssociatedIrp.SystemBuffer, sizeof(SENDCMDINPARAMS) - 1); + RtlMoveMemory((PVOID)buffer, Irp->AssociatedIrp.SystemBuffer, sizeof(SENDCMDINPARAMS) - 1); irp2 = IoBuildDeviceIoControlRequest(IOCTL_SCSI_MINIPORT, deviceExtension->PortDeviceObject, @@ -1754,17 +1746,16 @@ // If successful, copy the data received into the output buffer // - buffer = (PUCHAR)srbControl; - buffer = (ULONG)buffer + srbControl->HeaderLength; + buffer = (ULONG_PTR)srbControl + srbControl->HeaderLength; if (NT_SUCCESS(status)) { - RtlMoveMemory ( Irp->AssociatedIrp.SystemBuffer, buffer, length - 1); + RtlMoveMemory ( Irp->AssociatedIrp.SystemBuffer, (PVOID)buffer, length - 1); Irp->IoStatus.Information = length - 1; } else { - RtlMoveMemory ( Irp->AssociatedIrp.SystemBuffer, buffer, (sizeof(SENDCMDOUTPARAMS) - 1)); + RtlMoveMemory ( Irp->AssociatedIrp.SystemBuffer, (PVOID)buffer, (sizeof(SENDCMDOUTPARAMS) - 1)); Irp->IoStatus.Information = sizeof(SENDCMDOUTPARAMS) - 1; } @@ -1779,7 +1770,7 @@ PSENDCMDINPARAMS cmdInParameters = ((PSENDCMDINPARAMS)Irp->AssociatedIrp.SystemBuffer); PSRB_IO_CONTROL srbControl; ULONG controlCode = 0; - PUCHAR buffer; + ULONG_PTR buffer; if (irpStack->Parameters.DeviceIoControl.InputBufferLength < (sizeof(SENDCMDINPARAMS) - 1)) { @@ -1877,8 +1868,7 @@ // Point to the 'buffer' portion of the SRB_CONTROL // - buffer = (PUCHAR)srbControl; - buffer = (ULONG)buffer + srbControl->HeaderLength; + buffer = (ULONG_PTR)srbControl + srbControl->HeaderLength; // // Ensure correct target is set in the cmd parameters. @@ -1890,7 +1880,7 @@ // Copy the IOCTL parameters to the srb control buffer area. // - RtlMoveMemory(buffer, Irp->AssociatedIrp.SystemBuffer, sizeof(SENDCMDINPARAMS) - 1); + RtlMoveMemory((PVOID)buffer, Irp->AssociatedIrp.SystemBuffer, sizeof(SENDCMDINPARAMS) - 1); srbControl->ControlCode = controlCode; @@ -1926,8 +1916,7 @@ // either pass this back to the app, or zero it, in case of error. // - buffer = (PUCHAR)srbControl; - buffer = (ULONG)buffer + srbControl->HeaderLength; + buffer = (ULONG_PTR)srbControl + srbControl->HeaderLength; // // Update the return buffer size based on the sub-command. @@ -1939,7 +1928,7 @@ length = sizeof(SENDCMDOUTPARAMS) - 1; } - RtlMoveMemory ( Irp->AssociatedIrp.SystemBuffer, buffer, length); + RtlMoveMemory ( Irp->AssociatedIrp.SystemBuffer, (PVOID)buffer, length); Irp->IoStatus.Information = length; ExFreePool(srbControl); @@ -2532,7 +2521,7 @@ RtlZeroMemory(modeData, MODE_DATA_SIZE); length = ScsiClassModeSense(DeviceObject, - (PUCHAR) modeData, + (PCHAR) modeData, MODE_DATA_SIZE, MODE_SENSE_RETURN_ALL); @@ -2543,7 +2532,7 @@ // length = ScsiClassModeSense(DeviceObject, - (PUCHAR) modeData, + (PCHAR) modeData, MODE_DATA_SIZE, MODE_SENSE_RETURN_ALL); @@ -3004,7 +2993,7 @@ ULONG retries = 1; ULONG length2; NTSTATUS status; - PULONG buffer; + ULONG_PTR buffer; PMODE_PARAMETER_BLOCK blockDescriptor; PAGED_CODE(); @@ -3015,9 +3004,9 @@ // Allocate buffer for mode select header, block descriptor, and mode page. // - buffer = ExAllocatePool(NonPagedPoolCacheAligned,length2); - - RtlZeroMemory(buffer, length2); + buffer = (ULONG_PTR)ExAllocatePool(NonPagedPoolCacheAligned,length2); + + RtlZeroMemory((PVOID)buffer, length2); // // Set length in header to size of mode page. @@ -3025,7 +3014,7 @@ ((PMODE_PARAMETER_HEADER)buffer)->BlockDescriptorLength = sizeof(MODE_PARAMETER_BLOCK); - blockDescriptor = (PULONG)(buffer + 1); + blockDescriptor = (PMODE_PARAMETER_BLOCK)(buffer + 1); // // Set size @@ -3037,7 +3026,7 @@ // Copy mode page to buffer. // - RtlCopyMemory(buffer + 3, ModeSelectBuffer, Length); + RtlCopyMemory((PVOID)(buffer + 3), ModeSelectBuffer, Length); // // Zero SRB. @@ -3067,7 +3056,7 @@ status = ScsiClassSendSrbSynchronous(DeviceObject, &srb, - buffer, + (PVOID)buffer, length2, TRUE); @@ -3092,7 +3081,7 @@ status = STATUS_SUCCESS; } - ExFreePool(buffer); + ExFreePool((PVOID)buffer); if (NT_SUCCESS(status)) { return(TRUE); @@ -3122,7 +3111,7 @@ controller = &ScsiDiskBadControllers[j]; - if (!controller->DisableWriteCache || strncmp(controller->InquiryString, InquiryData->VendorId, strlen(controller->InquiryString))) { + if (!controller->DisableWriteCache || strncmp(controller->InquiryString, (PCCHAR)InquiryData->VendorId, strlen(controller->InquiryString))) { continue; } @@ -3234,7 +3223,7 @@ // if (ScsiDiskModeSelect(DeviceObject, - pageData, + (PCHAR)pageData, length, savePage)) { @@ -3246,7 +3235,7 @@ } else { if (ScsiDiskModeSelect(DeviceObject, - pageData, + (PCHAR)pageData, length, savePage)) { @@ -3488,12 +3477,12 @@ // Open controller name key. // - sprintf(buffer, - "%d", + sprintf((PCHAR)buffer, + "%lu", busNumber); RtlInitString(&string, - buffer); + (PCSZ)buffer); status = RtlAnsiStringToUnicodeString(&unicodeString, &string, @@ -3549,12 +3538,12 @@ // Open disk key. // - sprintf(buffer, - "%d\\DiskPeripheral", + sprintf((PCHAR)buffer, + "%lu\\DiskPeripheral", adapterNumber); RtlInitString(&string, - buffer); + (PCSZ)buffer); status = RtlAnsiStringToUnicodeString(&unicodeString, &string, @@ -3582,12 +3571,12 @@ for (diskNumber = 0; ; diskNumber++) { - sprintf(buffer, - "%d", + sprintf((PCHAR)buffer, + "%lu", diskNumber); RtlInitString(&string, - buffer); + (PCSZ)buffer); status = RtlAnsiStringToUnicodeString(&unicodeString, &string, @@ -3675,7 +3664,7 @@ // Convert checksum to ansi string. // - sprintf(buffer, "%08x", diskData->MbrCheckSum); + sprintf((PCHAR)buffer, "%08lx", diskData->MbrCheckSum); } else { @@ -3683,7 +3672,7 @@ // Convert signature to ansi string. // - sprintf(buffer, "%08x", diskData->Signature); + sprintf((PCHAR)buffer, "%08lx", diskData->Signature); // // Make string point at signature. Can't use scan @@ -3698,7 +3687,7 @@ // RtlInitString(&string, - buffer); + (PCSZ)buffer); // @@ -4314,15 +4303,13 @@ PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; PINQUIRYDATA InquiryData = (PINQUIRYDATA)LunInfo->InquiryData; BAD_CONTROLLER_INFORMATION const *controller; - ULONG j,length; - PVOID modeData; - PUCHAR pageData; + ULONG j; for (j = 0; j < NUMBER_OF_BAD_CONTROLLERS; j++) { controller = &ScsiDiskBadControllers[j]; - if (strncmp(controller->InquiryString, InquiryData->VendorId, strlen(controller->InquiryString))) { + if (strncmp(controller->InquiryString, (PCCHAR)InquiryData->VendorId, strlen(controller->InquiryString))) { continue; } @@ -4376,7 +4363,7 @@ deviceExtension->DeviceFlags |= DEV_SAFE_START_UNIT; if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { - if (_strnicmp(InquiryData->VendorId, "iomega", strlen("iomega"))) { + if (_strnicmp((PCCHAR)InquiryData->VendorId, "iomega", strlen("iomega"))) { deviceExtension->DeviceFlags &= ~DEV_SAFE_START_UNIT; } } @@ -4798,7 +4785,7 @@ // sprintf(ntNameBuffer, - "\\Device\\Harddisk%d\\Partition%d", + "\\Device\\Harddisk%lu\\Partition%lu", physicalExtension->DeviceNumber, partitionNumber); Modified: trunk/reactos/drivers/storage/class/disk/disk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.rbuild (original) +++ trunk/reactos/drivers/storage/class/disk/disk.rbuild Thu Apr 5 21:36:39 2007 @@ -1,4 +1,4 @@ -<module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys" allowwarnings="true"> +<module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys"> <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <linkerflag>-lgcc</linkerflag>

1 0

[greatlrd] 26267: Update Dejavu from 2.14 to 2.16 It add allot of new charaters to all dejavu font.
by greatlrd＠svn.reactos.org 05 Apr '07

05 Apr '07

Author: greatlrd Date: Thu Apr 5 16:20:19 2007 New Revision: 26267 URL: http://svn.reactos.org/svn/reactos?rev=26267&view=rev Log: Update Dejavu from 2.14 to 2.16 It add allot of new charaters to all dejavu font. Modified: trunk/reactos/media/fonts/DejaVuSans-Bold.ttf trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf trunk/reactos/media/fonts/DejaVuSans.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf trunk/reactos/media/fonts/DejaVuSansCondensed.ttf trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf trunk/reactos/media/fonts/DejaVuSansMono.ttf trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf trunk/reactos/media/fonts/DejaVuSerif-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSerif-Oblique.ttf trunk/reactos/media/fonts/DejaVuSerif.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-Oblique.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf trunk/reactos/media/fonts/doc/DejaVu_AUTHORS.txt trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt trunk/reactos/media/fonts/doc/DejaVu_README.txt trunk/reactos/media/fonts/doc/DejaVu_langcover.txt trunk/reactos/media/fonts/doc/DejaVu_status.txt trunk/reactos/media/fonts/doc/DejaVu_unicover.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/fonts/DejaVuSans-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… Modified: trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… Modified: trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Ext… Modified: trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Obl… Modified: trunk/reactos/media/fonts/DejaVuSans.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans.ttf… Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Modified: trunk/reactos/media/fonts/DejaVuSansCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Modified: trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSansMono.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… Modified: trunk/reactos/media/fonts/DejaVuSerif-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… Modified: trunk/reactos/media/fonts/DejaVuSerif-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Ob… Modified: trunk/reactos/media/fonts/DejaVuSerif.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif.tt… Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Modified: trunk/reactos/media/fonts/doc/DejaVu_AUTHORS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_AUT… Modified: trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_NEW… Modified: trunk/reactos/media/fonts/doc/DejaVu_README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_REA… Modified: trunk/reactos/media/fonts/doc/DejaVu_langcover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_lan… Modified: trunk/reactos/media/fonts/doc/DejaVu_status.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_sta… Modified: trunk/reactos/media/fonts/doc/DejaVu_unicover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_uni…

1 0

[ion] 26266: - Refactored some parts of the FS Recognizer Driver. - Added support for some more advanced storage stack support. - Added locking and states. - Added the ability for a file system to span across different device types (such as UDFS which is both for disks and optical media) - Updated NTFS, UDFS validation to use new functions. CDFS validation was removed (NT doesn't do it). - Improved some parts of FAT validation and relaxed others to match NT's.
by ion＠svn.reactos.org 05 Apr '07

05 Apr '07

Author: ion Date: Thu Apr 5 04:11:35 2007 New Revision: 26266 URL: http://svn.reactos.org/svn/reactos?rev=26266&view=rev Log: - Refactored some parts of the FS Recognizer Driver. - Added support for some more advanced storage stack support. - Added locking and states. - Added the ability for a file system to span across different device types (such as UDFS which is both for disks and optical media) - Updated NTFS, UDFS validation to use new functions. CDFS validation was removed (NT doesn't do it). - Improved some parts of FAT validation and relaxed others to match NT's. Modified: trunk/reactos/drivers/filesystems/fs_rec/blockdev.c trunk/reactos/drivers/filesystems/fs_rec/cdfs.c trunk/reactos/drivers/filesystems/fs_rec/fat.c trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h trunk/reactos/drivers/filesystems/fs_rec/ntfs.c trunk/reactos/drivers/filesystems/fs_rec/udfs.c Modified: trunk/reactos/drivers/filesystems/fs_rec/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/blockdev.c (original) +++ trunk/reactos/drivers/filesystems/fs_rec/blockdev.c Thu Apr 5 04:11:35 2007 @@ -1,162 +1,224 @@ -/* - * ReactOS kernel - * Copyright (C) 2002 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. - */ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/fs/fs_rec/blockdev.c - * PURPOSE: Filesystem recognizer driver - * PROGRAMMER: Eric Kohl + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/blockdev.c + * PURPOSE: Generic Helper Functions + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl */ /* INCLUDES *****************************************************************/ +#include "fs_rec.h" #define NDEBUG #include <debug.h> -#include "fs_rec.h" - - /* FUNCTIONS ****************************************************************/ -NTSTATUS -FsRecReadSectors(IN PDEVICE_OBJECT DeviceObject, - IN ULONG DiskSector, - IN ULONG SectorCount, - IN ULONG SectorSize, - IN OUT PUCHAR Buffer) +BOOLEAN +NTAPI +FsRecGetDeviceSectors(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + OUT PLARGE_INTEGER SectorCount) { - IO_STATUS_BLOCK IoStatus; - LARGE_INTEGER Offset; - ULONG BlockSize; - PKEVENT Event; - PIRP Irp; - NTSTATUS Status; - - Event = ExAllocatePool(NonPagedPool, sizeof(KEVENT)); - if (Event == NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - KeInitializeEvent(Event, - NotificationEvent, - FALSE); - - Offset.QuadPart = (LONGLONG)DiskSector * (LONGLONG)SectorSize; - BlockSize = SectorCount * SectorSize; - - DPRINT("FsrecReadSectors(DeviceObject %x, DiskSector %d, Buffer %x)\n", - DeviceObject, DiskSector, Buffer); - DPRINT("Offset %I64x BlockSize %ld\n", - Offset.QuadPart, - BlockSize); - - DPRINT("Building synchronous FSD Request...\n"); - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, - DeviceObject, - Buffer, - BlockSize, - &Offset, - Event, - &IoStatus); - if (Irp == NULL) - { - DPRINT("IoBuildSynchronousFsdRequest failed\n"); - ExFreePool(Event); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - DPRINT("Calling IO Driver... with irp %x\n", Irp); - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - DPRINT("Operation pending\n"); - KeWaitForSingleObject(Event, Suspended, KernelMode, FALSE, NULL); - Status = IoStatus.Status; - } - - ExFreePool(Event); - - return(STATUS_SUCCESS); + PARTITION_INFORMATION PartitionInfo; + IO_STATUS_BLOCK IoStatusBlock; + KEVENT Event; + PIRP Irp; + NTSTATUS Status; + ULONG Remainder; + PAGED_CODE(); + + /* Only needed for disks */ + if (DeviceObject->DeviceType != FILE_DEVICE_DISK) return FALSE; + + /* Build the information IRP */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_PARTITION_INFO, + DeviceObject, + NULL, + 0, + &PartitionInfo, + sizeof(PARTITION_INFORMATION), + FALSE, + &Event, + &IoStatusBlock); + if (!Irp) return FALSE; + + /* Override verification */ + IoGetNextIrpStackLocation(Irp)->Flags |= SL_OVERRIDE_VERIFY_VOLUME; + + /* Do the request */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + /* Fail if we couldn't get the data */ + if (!NT_SUCCESS(Status)) return FALSE; + + /* Otherwise, return the number of sectors */ + *SectorCount = RtlExtendedLargeIntegerDivide(PartitionInfo.PartitionLength, + SectorSize, + &Remainder); + return TRUE; } - -NTSTATUS -FsRecDeviceIoControl(IN PDEVICE_OBJECT DeviceObject, - IN ULONG ControlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferSize, - IN OUT PVOID OutputBuffer, - IN OUT PULONG OutputBufferSize) +BOOLEAN +NTAPI +FsRecGetDeviceSectorSize(IN PDEVICE_OBJECT DeviceObject, + OUT PULONG SectorSize) { - ULONG BufferSize = 0; - PKEVENT Event; - PIRP Irp; - IO_STATUS_BLOCK IoStatus; - NTSTATUS Status; - - if (OutputBufferSize != NULL) - { - BufferSize = *OutputBufferSize; - } - - Event = ExAllocatePool(NonPagedPool, sizeof(KEVENT)); - if (Event == NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - KeInitializeEvent(Event, NotificationEvent, FALSE); - - DPRINT("Building device I/O control request ...\n"); - Irp = IoBuildDeviceIoControlRequest(ControlCode, - DeviceObject, - InputBuffer, - InputBufferSize, - OutputBuffer, - BufferSize, - FALSE, - Event, - &IoStatus); - if (Irp == NULL) - { - DPRINT("IoBuildDeviceIoControlRequest() failed\n"); - ExFreePool(Event); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - DPRINT("Calling IO Driver... with irp %x\n", Irp); - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(Event, Suspended, KernelMode, FALSE, NULL); - Status = IoStatus.Status; - } - - if (OutputBufferSize != NULL) - { - *OutputBufferSize = IoStatus.Information; - } - - ExFreePool(Event); - - return(Status); + DISK_GEOMETRY DiskGeometry; + IO_STATUS_BLOCK IoStatusBlock; + KEVENT Event; + PIRP Irp; + NTSTATUS Status; + ULONG ControlCode; + PAGED_CODE(); + + /* Check what device we have */ + switch (DeviceObject->DeviceType) + { + case FILE_DEVICE_CD_ROM: + + /* Use the CD IOCTL */ + ControlCode = IOCTL_CDROM_GET_DRIVE_GEOMETRY; + break; + + case FILE_DEVICE_DISK: + + /* Use the Disk IOCTL */ + ControlCode = IOCTL_DISK_GET_DRIVE_GEOMETRY; + break; + + default: + + /* Invalid device type */ + return FALSE; + } + + /* Build the information IRP */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest(ControlCode, + DeviceObject, + NULL, + 0, + &DiskGeometry, + sizeof(DISK_GEOMETRY), + FALSE, + &Event, + &IoStatusBlock); + if (!Irp) return FALSE; + + /* Override verification */ + IoGetNextIrpStackLocation(Irp)->Flags |= SL_OVERRIDE_VERIFY_VOLUME; + + /* Do the request */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + /* Fail if we couldn't get the data */ + if (!NT_SUCCESS(Status)) return FALSE; + + /* Return the sector size if it's valid */ + if (!DiskGeometry.BytesPerSector) return FALSE; + *SectorSize = DiskGeometry.BytesPerSector; + return TRUE; } -/* EOF */ +BOOLEAN +NTAPI +FsRecReadBlock(IN PDEVICE_OBJECT DeviceObject, + IN PLARGE_INTEGER Offset, + IN ULONG Length, + IN ULONG SectorSize, + IN OUT PVOID *Buffer, + OUT PBOOLEAN DeviceError OPTIONAL) +{ + IO_STATUS_BLOCK IoStatusBlock; + KEVENT Event; + PIRP Irp; + NTSTATUS Status; + PAGED_CODE(); + + /* Assume failure */ + if (DeviceError) *DeviceError = FALSE; + + /* Check if the caller requested too little */ + if (Length < SectorSize) + { + /* Read at least the sector size */ + Length = SectorSize; + } + else + { + /* Otherwise, just round up the request to sector size */ + Length = ROUND_UP(Length, SectorSize); + } + + /* Check if the caller gave us a buffer */ + if (!*Buffer) + { + /* He didn't, allocate one */ + *Buffer = ExAllocatePoolWithTag(NonPagedPool, + PAGE_ROUND_UP(Length), + FSREC_TAG); + if (!*Buffer) return FALSE; + } + + /* Build the IRP */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, + DeviceObject, + *Buffer, + Length, + Offset, + &Event, + &IoStatusBlock); + if (!Irp) return FALSE; + + /* Override verification */ + IoGetNextIrpStackLocation(Irp)->Flags |= SL_OVERRIDE_VERIFY_VOLUME; + + /* Do the request */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + /* Check if we couldn't get the data */ + if (!NT_SUCCESS(Status)) + { + /* Check if caller wanted to know about the device and fail */ + if (DeviceError) *DeviceError = TRUE; + return FALSE; + } + + /* All went well */ + return TRUE; +} + Modified: trunk/reactos/drivers/filesystems/fs_rec/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/cdfs.c (original) +++ trunk/reactos/drivers/filesystems/fs_rec/cdfs.c Thu Apr 5 04:11:35 2007 @@ -1,140 +1,54 @@ -/* - * ReactOS kernel - * Copyright (C) 2002 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. - */ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/fs/fs_rec/cdfs.c - * PURPOSE: Filesystem recognizer driver - * PROGRAMMER: Eric Kohl + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/cdfs.c + * PURPOSE: CDFS Recognizer + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl */ /* INCLUDES *****************************************************************/ +#include "fs_rec.h" #define NDEBUG #include <debug.h> -#include "fs_rec.h" - - -#define CDFS_PVD_SECTOR 16 - /* FUNCTIONS ****************************************************************/ -static NTSTATUS -FsRecIsCdfsVolume(IN PDEVICE_OBJECT DeviceObject) +NTSTATUS +NTAPI +FsRecCdfsFsControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { - DISK_GEOMETRY DiskGeometry; - PUCHAR Buffer; - NTSTATUS Status; - ULONG Size; + PIO_STACK_LOCATION Stack; + NTSTATUS Status; + PAGED_CODE(); - Size = sizeof(DISK_GEOMETRY); - Status = FsRecDeviceIoControl(DeviceObject, - IOCTL_CDROM_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - &Size); - if (!NT_SUCCESS(Status)) + /* Get the I/O Stack and check the function type */ + Stack = IoGetCurrentIrpStackLocation(Irp); + switch (Stack->MinorFunction) { - DPRINT("FsRecDeviceIoControl() failed (Status %lx)\n", Status); - return(Status); + case IRP_MN_MOUNT_VOLUME: + + /* We don't validate */ + Status = STATUS_FS_DRIVER_REQUIRED; + break; + + case IRP_MN_LOAD_FILE_SYSTEM: + + /* Load the file system */ + Status = FsRecLoadFileSystem(DeviceObject, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Cdfs"); + break; + + default: + + /* Invalid request */ + Status = STATUS_INVALID_DEVICE_REQUEST; } - DPRINT("BytesPerSector: %lu\n", DiskGeometry.BytesPerSector); - Buffer = ExAllocatePool(NonPagedPool, - DiskGeometry.BytesPerSector); - if (Buffer == NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Status = FsRecReadSectors(DeviceObject, - CDFS_PVD_SECTOR, - 1, - DiskGeometry.BytesPerSector, - Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT("FsRecReadSectors() failed (Status %lx)\n", Status); - ExFreePool(Buffer); - return(Status); - } - - Buffer[6] = 0; - DPRINT("CD-identifier: [%.5s]\n", Buffer + 1); - - Status = (Buffer[0] == 1 && - Buffer[1] == 'C' && - Buffer[2] == 'D' && - Buffer[3] == '0' && - Buffer[4] == '0' && - Buffer[5] == '1') ? STATUS_SUCCESS : STATUS_UNRECOGNIZED_VOLUME; - - ExFreePool(Buffer); - - return(Status); -} - - -NTSTATUS -FsRecCdfsFsControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION Stack; - static UNICODE_STRING RegistryPath = - RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Cdfs"); - NTSTATUS Status; - - Stack = IoGetCurrentIrpStackLocation(Irp); - - switch (Stack->MinorFunction) - { - case IRP_MN_MOUNT_VOLUME: - DPRINT("Cdfs: IRP_MN_MOUNT_VOLUME\n"); - Status = FsRecIsCdfsVolume(Stack->Parameters.MountVolume.DeviceObject); - if (NT_SUCCESS(Status)) - { - DPRINT("Identified CDFS volume\n"); - Status = STATUS_FS_DRIVER_REQUIRED; - } - break; - - case IRP_MN_LOAD_FILE_SYSTEM: - DPRINT("Cdfs: IRP_MN_LOAD_FILE_SYSTEM\n"); - Status = ZwLoadDriver(&RegistryPath); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwLoadDriver failed (Status %x)\n", Status); - } - else - { - IoUnregisterFileSystem(DeviceObject); - } - break; - - default: - DPRINT("Cdfs: Unknown minor function %lx\n", Stack->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - return(Status); + /* Return Status */ + return Status; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/fs_rec/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fat.c (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fat.c Thu Apr 5 04:11:35 2007 @@ -1,224 +1,177 @@ -/* - * ReactOS kernel - * Copyright (C) 2002,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. - */ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/fs_rec/vfat.c - * PURPOSE: Filesystem recognizer driver - * PROGRAMMER: Eric Kohl + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/fat.c + * PURPOSE: FAT Recognizer + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl */ /* INCLUDES *****************************************************************/ +#include "fs_rec.h" #define NDEBUG #include <debug.h> -#include "fs_rec.h" - - /* FUNCTIONS ****************************************************************/ -static NTSTATUS -FsRecIsFatVolume(IN PDEVICE_OBJECT DeviceObject) +NTSTATUS +NTAPI +FsRecIsFatVolume(IN PPACKED_BOOT_SECTOR PackedBootSector) { - NTSTATUS Status; - PARTITION_INFORMATION PartitionInfo; - DISK_GEOMETRY DiskGeometry; - ULONG Size; - struct _BootSector* Boot; - BOOLEAN RecognizedFS = FALSE; - Size = sizeof(DISK_GEOMETRY); + BIOS_PARAMETER_BLOCK Bpb; + BOOLEAN Result = TRUE; + PAGED_CODE(); - Status = FsRecDeviceIoControl(DeviceObject, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - &Size); - if (!NT_SUCCESS(Status)) - { - DPRINT("FsRecDeviceIoControl faild (%x)\n", Status); - return Status; - } - if (DiskGeometry.MediaType == FixedMedia || DiskGeometry.MediaType == RemovableMedia) - { - // We have found a hard disk - Size = sizeof(PARTITION_INFORMATION); - Status = FsRecDeviceIoControl(DeviceObject, - IOCTL_DISK_GET_PARTITION_INFO, - NULL, - 0, - &PartitionInfo, - &Size); - if (!NT_SUCCESS(Status)) - { - DPRINT("FsRecDeviceIoControl faild (%x)\n", Status); - return Status; - } + /* Unpack the BPB and do a small fix up */ + FatUnpackBios(&Bpb, &PackedBootSector->PackedBpb); + if (Bpb.Sectors) Bpb.LargeSectors = 0; - if (PartitionInfo.PartitionType) - { - if (PartitionInfo.PartitionType == PARTITION_FAT_12 || - PartitionInfo.PartitionType == PARTITION_FAT_16 || - PartitionInfo.PartitionType == PARTITION_HUGE || - PartitionInfo.PartitionType == PARTITION_FAT32 || - PartitionInfo.PartitionType == PARTITION_FAT32_XINT13 || - PartitionInfo.PartitionType == PARTITION_XINT13) - { - RecognizedFS = TRUE; - } - } - else if (DiskGeometry.MediaType == RemovableMedia && - PartitionInfo.PartitionNumber > 0 && - PartitionInfo.StartingOffset.QuadPart == 0 && - PartitionInfo.PartitionLength.QuadPart > 0) - { - /* This is possible a removable media formated as super floppy */ - RecognizedFS = TRUE; - } - } - if (DiskGeometry.MediaType > Unknown && DiskGeometry.MediaType < RemovableMedia ) - { - RecognizedFS = TRUE; - } - if (RecognizedFS == FALSE) - { - return STATUS_UNRECOGNIZED_VOLUME; - } + /* Recognize jump */ + if ((PackedBootSector->Jump[0] != 0x49) && + (PackedBootSector->Jump[0] != 0xE9) && + (PackedBootSector->Jump[0] != 0xEB)) + { + /* Fail */ + Result = FALSE; + } + else if ((Bpb.BytesPerSector != 128) && + (Bpb.BytesPerSector != 256) && + (Bpb.BytesPerSector != 512) && + (Bpb.BytesPerSector != 1024) && + (Bpb.BytesPerSector != 2048) && + (Bpb.BytesPerSector != 4096)) + { + /* Fail */ + Result = FALSE; + } + else if ((Bpb.SectorsPerCluster != 1) && + (Bpb.SectorsPerCluster != 2) && + (Bpb.SectorsPerCluster != 4) && + (Bpb.SectorsPerCluster != 8) && + (Bpb.SectorsPerCluster != 16) && + (Bpb.SectorsPerCluster != 32) && + (Bpb.SectorsPerCluster != 64) && + (Bpb.SectorsPerCluster != 128)) + { + /* Fail */ + Result = FALSE; + } + else if (!Bpb.ReservedSectors) + { + /* Fail */ + Result = FALSE; + } + else if (!(Bpb.Sectors) && !(Bpb.LargeSectors)) + { + /* Fail */ + Result = FALSE; + } + else if ((Bpb.Media != 0x00) && + (Bpb.Media != 0x01) && + (Bpb.Media != 0xf0) && + (Bpb.Media != 0xf8) && + (Bpb.Media != 0xf9) && + (Bpb.Media != 0xfa) && + (Bpb.Media != 0xfb) && + (Bpb.Media != 0xfc) && + (Bpb.Media != 0xfd) && + (Bpb.Media != 0xfe) && + (Bpb.Media != 0xff)) + { + /* Fail */ + Result = FALSE; + } + else if ((Bpb.SectorsPerFat) && !(Bpb.RootEntries)) + { + /* Fail */ + Result = FALSE; + } - Boot = ExAllocatePool(NonPagedPool, DiskGeometry.BytesPerSector); - if (Boot == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = FsRecReadSectors(DeviceObject, - 0, - 1, - DiskGeometry.BytesPerSector, - (PUCHAR) Boot); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - if (Boot->Signatur1 != 0xaa55) - { - RecognizedFS=FALSE; - } - if (RecognizedFS && - Boot->BytesPerSector != 512 && - Boot->BytesPerSector != 1024 && - Boot->BytesPerSector != 2048 && - Boot->BytesPerSector == 4096) - { - RecognizedFS=FALSE; - } - - if (RecognizedFS && - Boot->FATCount != 1 && - Boot->FATCount != 2) - { - RecognizedFS=FALSE; - } - - if (RecognizedFS && - Boot->Media != 0xf0 && - Boot->Media != 0xf8 && - Boot->Media != 0xf9 && - Boot->Media != 0xfa && - Boot->Media != 0xfb && - Boot->Media != 0xfc && - Boot->Media != 0xfd && - Boot->Media != 0xfe && - Boot->Media != 0xff) - { - RecognizedFS=FALSE; - } - - if (RecognizedFS && - Boot->SectorsPerCluster != 1 && - Boot->SectorsPerCluster != 2 && - Boot->SectorsPerCluster != 4 && - Boot->SectorsPerCluster != 8 && - Boot->SectorsPerCluster != 16 && - Boot->SectorsPerCluster != 32 && - Boot->SectorsPerCluster != 64 && - Boot->SectorsPerCluster != 128) - { - RecognizedFS=FALSE; - } - - if (RecognizedFS && - Boot->BytesPerSector * Boot->SectorsPerCluster > 32 * 1024) - { - RecognizedFS=FALSE; - } - - - ExFreePool(Boot); - return RecognizedFS ? STATUS_SUCCESS : STATUS_UNRECOGNIZED_VOLUME; + /* Return the result */ + return Result; } +NTSTATUS +NTAPI +FsRecVfatFsControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + NTSTATUS Status; + PDEVICE_OBJECT MountDevice; + PPACKED_BOOT_SECTOR Bpb = NULL; + ULONG SectorSize; + LARGE_INTEGER Offset = {{0}}; + BOOLEAN DeviceError = FALSE; + PAGED_CODE(); -NTSTATUS -FsRecVfatFsControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION Stack; - static UNICODE_STRING RegistryPath = - RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Vfatfs"); - NTSTATUS Status; + /* Get the I/O Stack and check the function type */ + Stack = IoGetCurrentIrpStackLocation(Irp); + switch (Stack->MinorFunction) + { + case IRP_MN_MOUNT_VOLUME: - Stack = IoGetCurrentIrpStackLocation(Irp); + /* Assume failure */ + Status = STATUS_UNRECOGNIZED_VOLUME; - switch (Stack->MinorFunction) - { - case IRP_MN_MOUNT_VOLUME: - DPRINT("FAT: IRP_MN_MOUNT_VOLUME\n"); - Status = FsRecIsFatVolume(Stack->Parameters.MountVolume.DeviceObject); - if (NT_SUCCESS(Status)) - { - DPRINT("Identified FAT volume\n"); - Status = STATUS_FS_DRIVER_REQUIRED; - } - break; + /* Get the device object and request the sector size */ + MountDevice = Stack->Parameters.MountVolume.DeviceObject; + if (FsRecGetDeviceSectorSize(MountDevice, &SectorSize)) + { + /* Try to read the BPB */ + if (FsRecReadBlock(MountDevice, + &Offset, + 512, + SectorSize, + (PVOID)&Bpb, + &DeviceError)) + { + /* Check if it's an actual FAT volume */ + if (FsRecIsFatVolume(Bpb)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } - case IRP_MN_LOAD_FILE_SYSTEM: - DPRINT("FAT: IRP_MN_LOAD_FILE_SYSTEM\n"); - Status = ZwLoadDriver(&RegistryPath); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwLoadDriver failed (Status %x)\n", Status); - } - else - { - IoUnregisterFileSystem(DeviceObject); - } - break; + /* Free the boot sector if we have one */ + ExFreePool(Bpb); + } + else + { + /* We have some sort of failure in the storage stack */ + DeviceError = TRUE; + } - default: - DPRINT("FAT: Unknown minor function %lx\n", Stack->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; + /* Check if we have an error on the stack */ + if (DeviceError) + { + /* Was this because of a floppy? */ + if (MountDevice->Characteristics & FILE_FLOPPY_DISKETTE) + { + /* Let the FS try anyway */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + + break; + + case IRP_MN_LOAD_FILE_SYSTEM: + + /* Load the file system */ + Status = FsRecLoadFileSystem(DeviceObject, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Vfatfs"); + break; + + default: + + /* Invalid request */ + Status = STATUS_INVALID_DEVICE_REQUEST; } - return(Status); + + /* Return Status */ + return Status; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c Thu Apr 5 04:11:35 2007 @@ -1,254 +1,362 @@ -/* - * ReactOS kernel - * Copyright (C) 2002,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. - */ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/fs_rec/fs_rec.c - * PURPOSE: Filesystem recognizer driver - * PROGRAMMER: Eric Kohl + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/fs_rec.c + * PURPOSE: Main Driver Entrypoint and FS Registration + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl */ /* INCLUDES *****************************************************************/ +#include "fs_rec.h" #define NDEBUG #include <debug.h> -#include "fs_rec.h" - +PKEVENT FsRecLoadSync; /* FUNCTIONS ****************************************************************/ -static NTSTATUS STDCALL +NTSTATUS +NTAPI +FsRecLoadFileSystem(IN PDEVICE_OBJECT DeviceObject, + IN PWCHAR DriverServiceName) +{ + UNICODE_STRING DriverName; + PDEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + NTSTATUS Status = STATUS_IMAGE_ALREADY_LOADED; + PAGED_CODE(); + + /* Make sure we haven't already been called */ + if (DeviceExtension->State != Loaded) + { + /* Acquire the load lock */ + KeWaitForSingleObject(FsRecLoadSync, + Executive, + KernelMode, + FALSE, + NULL); + KeEnterCriticalRegion(); + + /* Make sure we're active */ + if (DeviceExtension->State == Pending) + { + /* Load the FS driver */ + RtlInitUnicodeString(&DriverName, DriverServiceName); + Status = ZwLoadDriver(&DriverName); + + /* Loop all the linked recognizer objects */ + while (DeviceExtension->State != Unloading) + { + /* Set them to the unload state */ + DeviceExtension->State = Unloading; + + /* Go to the next one */ + DeviceObject = DeviceExtension->Alternate; + DeviceExtension = DeviceObject->DeviceExtension; + } + } + + /* Make sure that we haven't already loaded the FS */ + if (DeviceExtension->State != Loaded) + { + /* Unregiser us, and set us as loaded */ + IoUnregisterFileSystem(DeviceObject); + DeviceExtension->State = Loaded; + } + + /* Release the lock */ + KeSetEvent(FsRecLoadSync, 0, FALSE); + KeLeaveCriticalRegion(); + } + + /* Return */ + return Status; +} + +NTSTATUS +STDCALL FsRecCreate(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - NTSTATUS Status; - - - Status = STATUS_SUCCESS; - - - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); - - return(Status); -} - - -static NTSTATUS STDCALL + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack = IoGetCurrentIrpStackLocation(Irp); + NTSTATUS Status; + PAGED_CODE(); + + /* Make sure we have a file name */ + if (IoStack->FileObject->FileName.Length) + { + /* Fail the request */ + Status = STATUS_OBJECT_PATH_NOT_FOUND; + } + else + { + /* Let it through */ + Status = STATUS_SUCCESS; + } + + /* Complete the IRP */ + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = FILE_OPENED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS +STDCALL FsRecClose(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); - - return(STATUS_SUCCESS); -} - - -static NTSTATUS STDCALL + IN PIRP Irp) +{ + PAGED_CODE(); + + /* Just complete the IRP and return success */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +STDCALL FsRecFsControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PDEVICE_EXTENSION DeviceExt; - NTSTATUS Status; - - DeviceExt = DeviceObject->DeviceExtension; - switch (DeviceExt->FsType) - { - case FS_TYPE_VFAT: - Status = FsRecVfatFsControl(DeviceObject, Irp); - break; - - case FS_TYPE_NTFS: - Status = FsRecNtfsFsControl(DeviceObject, Irp); - break; - - case FS_TYPE_CDFS: - Status = FsRecCdfsFsControl(DeviceObject, Irp); - break; - - case FS_TYPE_UDFS: - Status = FsRecUdfsFsControl(DeviceObject, Irp); - break; - - default: - Status = STATUS_INVALID_DEVICE_REQUEST; - } - - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); - - return(Status); -} - - -static VOID STDCALL + IN PIRP Irp) +{ + PDEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + NTSTATUS Status; + PAGED_CODE(); + + /* Check the file system type */ + switch (DeviceExtension->FsType) + { + case FS_TYPE_VFAT: + + /* Send FAT command */ + Status = FsRecVfatFsControl(DeviceObject, Irp); + break; + + case FS_TYPE_NTFS: + + /* Send NTFS command */ + Status = FsRecNtfsFsControl(DeviceObject, Irp); + break; + + case FS_TYPE_CDFS: + + /* Send CDFS command */ + Status = FsRecCdfsFsControl(DeviceObject, Irp); + break; + + case FS_TYPE_UDFS: + + /* Send UDFS command */ + Status = FsRecUdfsFsControl(DeviceObject, Irp); + break; + + default: + + /* Unrecognized FS */ + Status = STATUS_INVALID_DEVICE_REQUEST; + } + + /* Complete the IRP */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +VOID +STDCALL FsRecUnload(IN PDRIVER_OBJECT DriverObject) { - PDEVICE_OBJECT NextDevice; - PDEVICE_OBJECT ThisDevice; - - /* Delete all remaining device objects */ - NextDevice = DriverObject->DeviceObject; - while (NextDevice != NULL) - { - ThisDevice = NextDevice; - NextDevice = NextDevice->NextDevice; - IoDeleteDevice(ThisDevice); - } -} - - -static NTSTATUS -FsRecRegisterFs(PDRIVER_OBJECT DriverObject, - PCWSTR FsName, - PCWSTR RecognizerName, - ULONG DeviceType, - ULONG FsType) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatus; - PDEVICE_EXTENSION DeviceExt; - UNICODE_STRING DeviceName; - UNICODE_STRING FileName; - PDEVICE_OBJECT DeviceObject; - HANDLE FileHandle; - NTSTATUS Status; - - RtlInitUnicodeString(&FileName, - FsName); - - InitializeObjectAttributes(&ObjectAttributes, - &FileName, - OBJ_CASE_INSENSITIVE, - 0, - NULL); - - Status = ZwCreateFile(&FileHandle, - 0x100000, - &ObjectAttributes, - &IoStatus, - NULL, - 0, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_OPEN, - 0, - NULL, - 0); - if (NT_SUCCESS(Status)) - { - ZwClose(FileHandle); - return(STATUS_IMAGE_ALREADY_LOADED); - } - - /* Create recognizer device object */ - RtlInitUnicodeString(&DeviceName, - RecognizerName); - - Status = IoCreateDevice(DriverObject, - sizeof(DEVICE_EXTENSION), - &DeviceName, - DeviceType, - 0, - FALSE, - &DeviceObject); - - if (NT_SUCCESS(Status)) - { - DeviceExt = DeviceObject->DeviceExtension; - DeviceExt->FsType = FsType; - IoRegisterFileSystem(DeviceObject); - DPRINT("Created recognizer device '%wZ'\n", &DeviceName); - } - - return(Status); -} - - -NTSTATUS STDCALL -DriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) -{ - PCONFIGURATION_INFORMATION ConfigInfo; - ULONG DeviceCount; - NTSTATUS Status; - - DPRINT("FileSystem recognizer 0.0.2\n"); - - DeviceCount = 0; - - DriverObject->MajorFunction[IRP_MJ_CREATE] = FsRecCreate; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = FsRecClose; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = FsRecClose; - DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = FsRecFsControl; - DriverObject->DriverUnload = FsRecUnload; - - ConfigInfo = IoGetConfigurationInformation(); - - if (ConfigInfo->CdRomCount > 0) - { - Status = FsRecRegisterFs(DriverObject, - L"\\Cdfs", - L"\\FileSystem\\CdfsRecognizer", - FILE_DEVICE_CD_ROM_FILE_SYSTEM, - FS_TYPE_CDFS); - if (NT_SUCCESS(Status)) - { - DeviceCount++; - } - - Status = FsRecRegisterFs(DriverObject, - L"\\Udfs", - L"\\FileSystem\\UdfsRecognizer", - FILE_DEVICE_CD_ROM_FILE_SYSTEM, - FS_TYPE_UDFS); - if (NT_SUCCESS(Status)) - { - DeviceCount++; - } - } - - Status = FsRecRegisterFs(DriverObject, - L"\\Fat", - L"\\FileSystem\\FatRecognizer", - FILE_DEVICE_DISK_FILE_SYSTEM, - FS_TYPE_VFAT); - if (NT_SUCCESS(Status)) - { - DeviceCount++; - } - - Status = FsRecRegisterFs(DriverObject, - L"\\Ntfs", - L"\\FileSystem\\NtfsRecognizer", - FILE_DEVICE_DISK_FILE_SYSTEM, - FS_TYPE_NTFS); - if (NT_SUCCESS(Status)) - { - DeviceCount++; - } - - return((DeviceCount > 0) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); + PAGED_CODE(); + + /* Loop all driver device objects */ + while (DriverObject->DeviceObject) + { + /* Delete this device */ + IoDeleteDevice(DriverObject->DeviceObject); + } + + /* Free the lock */ + ExFreePool(FsRecLoadSync); +} + +NTSTATUS +STDCALL +FsRecRegisterFs(IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT ParentObject OPTIONAL, + OUT PDEVICE_OBJECT *NewDeviceObject OPTIONAL, + IN PCWSTR FsName, + IN PCWSTR RecognizerName, + IN ULONG FsType, + IN DEVICE_TYPE DeviceType) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatus; + PDEVICE_EXTENSION DeviceExtension; + UNICODE_STRING DeviceName; + PDEVICE_OBJECT DeviceObject; + HANDLE FileHandle; + NTSTATUS Status; + + /* Assume failure */ + if (NewDeviceObject) *NewDeviceObject = NULL; + + /* Setup the attributes */ + RtlInitUnicodeString(&DeviceName, FsName); + InitializeObjectAttributes(&ObjectAttributes, + &DeviceName, + OBJ_CASE_INSENSITIVE, + 0, + NULL); + + /* Open the device */ + Status = ZwCreateFile(&FileHandle, + SYNCHRONIZE, + &ObjectAttributes, + &IoStatus, + NULL, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + 0, + NULL, + 0); + if (NT_SUCCESS(Status)) + { + /* We suceeded, close the handle */ + ZwClose(FileHandle); + } + else if (Status != STATUS_OBJECT_NAME_NOT_FOUND) + { + /* We failed with anything else then what we want to fail with */ + Status = STATUS_SUCCESS; + } + + /* If we succeeded, there's no point in trying this again */ + if (NT_SUCCESS(Status)) return STATUS_IMAGE_ALREADY_LOADED; + + /* Create recognizer device object */ + RtlInitUnicodeString(&DeviceName, RecognizerName); + Status = IoCreateDevice(DriverObject, + sizeof(DEVICE_EXTENSION), + &DeviceName, + DeviceType, + 0, + FALSE, + &DeviceObject); + if (NT_SUCCESS(Status)) + { + /* Get the device extension and set it up */ + DeviceExtension = DeviceObject->DeviceExtension; + DeviceExtension->FsType = FsType; + DeviceExtension->State = Pending; + + /* Do we have a parent? */ + if (ParentObject) + { + /* Link it in */ + DeviceExtension->Alternate = + ((PDEVICE_EXTENSION)ParentObject->DeviceExtension)->Alternate; + ((PDEVICE_EXTENSION)ParentObject->DeviceExtension)->Alternate = + DeviceObject; + } + else + { + /* Otherwise, we're the only one */ + DeviceExtension->Alternate = DeviceObject; + } + + /* Return the DO if needed */ + if (NewDeviceObject) *NewDeviceObject = DeviceObject; + + /* Register the file system */ + IoRegisterFileSystem(DeviceObject); + } + + /* Return Status */ + return Status; +} + +NTSTATUS +NTAPI +DriverEntry(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + ULONG DeviceCount = 0; + NTSTATUS Status; + PDEVICE_OBJECT UdfsObject; + PAGED_CODE(); + + /* Page the entire driver */ + MmPageEntireDriver(DriverEntry); + + /* Allocate the lock */ + FsRecLoadSync = ExAllocatePoolWithTag(NonPagedPool, + sizeof(KEVENT), + FSREC_TAG); + if (!FsRecLoadSync) return STATUS_INSUFFICIENT_RESOURCES; + + /* Initialize it */ + KeInitializeEvent(FsRecLoadSync, SynchronizationEvent, TRUE); + + /* Setup the major functions */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = FsRecCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = FsRecClose; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = FsRecClose; + DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = FsRecFsControl; + DriverObject->DriverUnload = FsRecUnload; + + /* Register CDFS */ + Status = FsRecRegisterFs(DriverObject, + NULL, + NULL, + L"\\Cdfs", + L"\\FileSystem\\CdfsRecognizer", + FS_TYPE_CDFS, + FILE_DEVICE_CD_ROM_FILE_SYSTEM); + if (NT_SUCCESS(Status)) DeviceCount++; + + /* Register UDFS for CDs */ + Status = FsRecRegisterFs(DriverObject, + NULL, + &UdfsObject, + L"\\UdfsCdRom", + L"\\FileSystem\\UdfsCdRomRecognizer", + FS_TYPE_UDFS, + FILE_DEVICE_CD_ROM_FILE_SYSTEM); + if (NT_SUCCESS(Status)) DeviceCount++; + + /* Register UDFS for HDDs */ + Status = FsRecRegisterFs(DriverObject, + UdfsObject, + NULL, + L"\\UdfsDisk", + L"\\FileSystem\\UdfsDiskRecognizer", + FS_TYPE_UDFS, + FILE_DEVICE_DISK_FILE_SYSTEM); + if (NT_SUCCESS(Status)) DeviceCount++; + + /* Register FAT */ + Status = FsRecRegisterFs(DriverObject, + NULL, + NULL, + L"\\Fat", + L"\\FileSystem\\FatRecognizer", + FS_TYPE_VFAT, + FILE_DEVICE_DISK_FILE_SYSTEM); + if (NT_SUCCESS(Status)) DeviceCount++; + + /* Register NTFS */ + Status = FsRecRegisterFs(DriverObject, + NULL, + NULL, + L"\\Ntfs", + L"\\FileSystem\\NtfsRecognizer", + FS_TYPE_NTFS, + FILE_DEVICE_DISK_FILE_SYSTEM); + if (NT_SUCCESS(Status)) DeviceCount++; + + /* Return appropriate Status */ + return (DeviceCount > 0) ? STATUS_SUCCESS : STATUS_IMAGE_ALREADY_LOADED; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h Thu Apr 5 04:11:35 2007 @@ -1,121 +1,268 @@ -/* - * ReactOS kernel - * Copyright (C) 2002,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. - */ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/fs_rec/fs_rec.h - * PURPOSE: Filesystem recognizer driver - * PROGRAMMER: Eric Kohl + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/fs_rec.h + * PURPOSE: Main Header File + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl */ +// +// IFS Headers +// #include <ntifs.h> #include <ntdddisk.h> #include <ntddcdrm.h> - -#ifdef _MSC_VER -#define STDCALL __stdcall -#endif - -/* Filesystem types (add new filesystems here)*/ - -#define FS_TYPE_UNUSED 0 -#define FS_TYPE_VFAT 1 -#define FS_TYPE_NTFS 2 -#define FS_TYPE_CDFS 3 -#define FS_TYPE_UDFS 4 - - +#include "helper.h" + +// +// Tag for memory allocations +// +#define FSREC_TAG TAG('F', 's', 'R', 'c') + +// +// UDFS Offsets +// +#define UDFS_VRS_START_SECTOR 16 +#define UDFS_AVDP_SECTOR 256 + +// +// Conversion types and macros taken from internal ntifs headers +// +typedef union _UCHAR1 +{ + UCHAR Uchar[1]; + UCHAR ForceAlignment; +} UCHAR1, *PUCHAR1; + +typedef union _UCHAR2 +{ + UCHAR Uchar[2]; + USHORT ForceAlignment; +} UCHAR2, *PUCHAR2; + +typedef union _UCHAR4 +{ + UCHAR Uchar[4]; + ULONG ForceAlignment; +} UCHAR4, *PUCHAR4; + +#define CopyUchar1(Dst,Src) { \ + *((UCHAR1 *)(Dst)) = *((UNALIGNED UCHAR1 *)(Src)); \ +} + +#define CopyUchar2(Dst,Src) { \ + *((UCHAR2 *)(Dst)) = *((UNALIGNED UCHAR2 *)(Src)); \ +} + +#define CopyUchar4(Dst,Src) { \ + *((UCHAR4 *)(Dst)) = *((UNALIGNED UCHAR4 *)(Src)); \ +} + +#define FatUnpackBios(Bios,Pbios) { \ + CopyUchar2(&(Bios)->BytesPerSector, &(Pbios)->BytesPerSector[0] ); \ + CopyUchar1(&(Bios)->SectorsPerCluster, &(Pbios)->SectorsPerCluster[0]); \ + CopyUchar2(&(Bios)->ReservedSectors, &(Pbios)->ReservedSectors[0] ); \ + CopyUchar1(&(Bios)->Fats, &(Pbios)->Fats[0] ); \ + CopyUchar2(&(Bios)->RootEntries, &(Pbios)->RootEntries[0] ); \ + CopyUchar2(&(Bios)->Sectors, &(Pbios)->Sectors[0] ); \ + CopyUchar1(&(Bios)->Media, &(Pbios)->Media[0] ); \ + CopyUchar2(&(Bios)->SectorsPerFat, &(Pbios)->SectorsPerFat[0] ); \ + CopyUchar2(&(Bios)->SectorsPerTrack, &(Pbios)->SectorsPerTrack[0] ); \ + CopyUchar2(&(Bios)->Heads, &(Pbios)->Heads[0] ); \ + CopyUchar4(&(Bios)->HiddenSectors, &(Pbios)->HiddenSectors[0] ); \ + CopyUchar4(&(Bios)->LargeSectors, &(Pbios)->LargeSectors[0] ); \ +} + +// +// Packed versions of the BPB and Boot Sector +// +typedef struct _PACKED_BIOS_PARAMETER_BLOCK +{ + UCHAR BytesPerSector[2]; + UCHAR SectorsPerCluster[1]; + UCHAR ReservedSectors[2]; + UCHAR Fats[1]; + UCHAR RootEntries[2]; + UCHAR Sectors[2]; + UCHAR Media[1]; + UCHAR SectorsPerFat[2]; + UCHAR SectorsPerTrack[2]; + UCHAR Heads[2]; + UCHAR HiddenSectors[4]; + UCHAR LargeSectors[4]; +} PACKED_BIOS_PARAMETER_BLOCK, *PPACKED_BIOS_PARAMETER_BLOCK; + +typedef struct _PACKED_BOOT_SECTOR +{ + UCHAR Jump[3]; + UCHAR Oem[8]; + PACKED_BIOS_PARAMETER_BLOCK PackedBpb; + UCHAR PhysicalDriveNumber; + UCHAR CurrentHead; + UCHAR Signature; + UCHAR Id[4]; + UCHAR VolumeLabel[11]; + UCHAR SystemId[8]; +} PACKED_BOOT_SECTOR, *PPACKED_BOOT_SECTOR; + +// +// Unpacked version of the BPB +// +typedef struct BIOS_PARAMETER_BLOCK +{ + USHORT BytesPerSector; + UCHAR SectorsPerCluster; + USHORT ReservedSectors; + UCHAR Fats; + USHORT RootEntries; + USHORT Sectors; + UCHAR Media; + USHORT SectorsPerFat; + USHORT SectorsPerTrack; + USHORT Heads; + ULONG32 HiddenSectors; + ULONG32 LargeSectors; + ULONG32 LargeSectorsPerFat; + union + { + USHORT ExtendedFlags; + struct + { + ULONG ActiveFat:4; + ULONG Reserved0:3; + ULONG MirrorDisabled:1; + ULONG Reserved1:8; + }; + }; + USHORT FsVersion; + ULONG32 RootDirFirstCluster; + USHORT FsInfoSector; + USHORT BackupBootSector; +} BIOS_PARAMETER_BLOCK, *PBIOS_PARAMETER_BLOCK; + +// +// UDFS Structures +// +#include <pshpack1.h> +typedef struct _TAG +{ + USHORT Identifier; + USHORT Version; + UCHAR Checksum; + UCHAR Reserved; + USHORT SerialNumber; + USHORT Crc; + USHORT CrcLength; + ULONG Location; +} TAG, *PTAG; + +typedef struct _EXTENT +{ + ULONG Length; + ULONG Location; +} EXTENT, *PEXTENT; + +typedef struct _AVDP +{ + TAG DescriptorTag; + EXTENT MainVolumeDescriptorExtent; + EXTENT ReserveVolumeDescriptorExtent; +} AVDP, *PAVDP; +#include <poppack.h> + +// +// Filesystem Types +// +typedef enum _FILE_SYSTEM_TYPE +{ + FS_TYPE_UNUSED, + FS_TYPE_VFAT, + FS_TYPE_NTFS, + FS_TYPE_CDFS, + FS_TYPE_UDFS +} FILE_SYSTEM_TYPE, *PFILE_SYSTEM_TYPE; + +// +// FS Recognizer State +// +typedef enum _FS_REC_STATE +{ + Pending, + Loaded, + Unloading +} FS_REC_STATE, *PFS_REC_STATE; + +// +// Device extension +// typedef struct _DEVICE_EXTENSION { - ULONG FsType; + FS_REC_STATE State; + FILE_SYSTEM_TYPE FsType; + PDEVICE_OBJECT Alternate; } DEVICE_EXTENSION, *PDEVICE_EXTENSION; -#include <pshpack1.h> -struct _BootSector -{ - unsigned char magic0, res0, magic1; - unsigned char OEMName[8]; - unsigned short BytesPerSector; - unsigned char SectorsPerCluster; - unsigned short ReservedSectors; - unsigned char FATCount; - unsigned short RootEntries, Sectors; - unsigned char Media; - unsigned short FATSectors, SectorsPerTrack, Heads; - unsigned long HiddenSectors, SectorsHuge; - unsigned char Drive, Res1, Sig; - unsigned long VolumeID; - unsigned char VolumeLabel[11], SysType[8]; - unsigned char Res2[448]; - unsigned short Signatur1; -}; -#include <poppack.h> - -/* blockdev.c */ - -NTSTATUS -FsRecReadSectors(IN PDEVICE_OBJECT DeviceObject, - IN ULONG DiskSector, - IN ULONG SectorCount, - IN ULONG SectorSize, - IN OUT PUCHAR Buffer); - -NTSTATUS -FsRecDeviceIoControl(IN PDEVICE_OBJECT DeviceObject, - IN ULONG ControlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferSize, - IN OUT PVOID OutputBuffer, - IN OUT PULONG OutputBufferSize); - - -/* cdfs.c */ - -NTSTATUS -FsRecCdfsFsControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - - -/* fat.c */ - -NTSTATUS -FsRecVfatFsControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - - -/* ntfs.c */ - -NTSTATUS -FsRecNtfsFsControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - - -/* udfs.c */ - -NTSTATUS -FsRecUdfsFsControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -/* fs_rec.c */ - -NTSTATUS STDCALL -DriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath); - -/* EOF */ +// +// Prototypes +// +NTSTATUS +NTAPI +FsRecCdfsFsControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + +NTSTATUS +NTAPI +FsRecVfatFsControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + +NTSTATUS +NTAPI +FsRecNtfsFsControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + +NTSTATUS +NTAPI +FsRecUdfsFsControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + +BOOLEAN +NTAPI +FsRecGetDeviceSectors( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + OUT PLARGE_INTEGER SectorCount +); + +BOOLEAN +NTAPI +FsRecGetDeviceSectorSize( + IN PDEVICE_OBJECT DeviceObject, + OUT PULONG SectorSize +); + +BOOLEAN +NTAPI +FsRecReadBlock( + IN PDEVICE_OBJECT DeviceObject, + IN PLARGE_INTEGER Offset, + IN ULONG Length, + IN ULONG SectorSize, + IN OUT PVOID *Buffer, + OUT PBOOLEAN DeviceError OPTIONAL +); + +NTSTATUS +NTAPI +FsRecLoadFileSystem( + IN PDEVICE_OBJECT DeviceObject, + IN PWCHAR DriverServiceName +); Modified: trunk/reactos/drivers/filesystems/fs_rec/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ntfs.c (original) +++ trunk/reactos/drivers/filesystems/fs_rec/ntfs.c Thu Apr 5 04:11:35 2007 @@ -1,139 +1,145 @@ -/* - * ReactOS kernel - * Copyright (C) 2002,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. - */ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/fs_rec/ntfs.c - * PURPOSE: Filesystem recognizer driver - * PROGRAMMER: Eric Kohl + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/ntfs.c + * PURPOSE: NTFS Recognizer + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl */ /* INCLUDES *****************************************************************/ +#include "fs_rec.h" #define NDEBUG #include <debug.h> -#include "fs_rec.h" - - /* FUNCTIONS ****************************************************************/ -static NTSTATUS -FsRecIsNtfsVolume(IN PDEVICE_OBJECT DeviceObject) +BOOLEAN +NTAPI +FsRecIsNtfsVolume(IN PPACKED_BOOT_SECTOR BootSector, + IN ULONG BytesPerSector, + IN PLARGE_INTEGER NumberOfSectors) { - DISK_GEOMETRY DiskGeometry; - PUCHAR Buffer; - ULONG Size; - NTSTATUS Status; + PAGED_CODE(); + BOOLEAN Result; - Size = sizeof(DISK_GEOMETRY); - Status = FsRecDeviceIoControl(DeviceObject, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - &Size); - if (!NT_SUCCESS(Status)) + /* Assume success */ + Result = TRUE; + + if ((BootSector->Oem[0] == 'N') && + (BootSector->Oem[1] == 'T') && + (BootSector->Oem[2] == 'F') && + (BootSector->Oem[3] == 'S') && + (BootSector->Oem[4] == ' ') && + (BootSector->Oem[5] == ' ') && + (BootSector->Oem[6] == ' ') && + (BootSector->Oem[7] == ' ')) { - DPRINT("FsRecDeviceIoControl() failed (Status %lx)\n", Status); - return(Status); + /* Fail */ + Result = FALSE; } - DPRINT("BytesPerSector: %lu\n", DiskGeometry.BytesPerSector); - Buffer = ExAllocatePool(NonPagedPool, - DiskGeometry.BytesPerSector); - if (Buffer == NULL) + /* Return the result */ + return Result; +} + +NTSTATUS +NTAPI +FsRecNtfsFsControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + NTSTATUS Status; + PDEVICE_OBJECT MountDevice; + PPACKED_BOOT_SECTOR Bpb = NULL; + ULONG SectorSize; + LARGE_INTEGER Offset = {{0}}, Offset2, Offset3, SectorCount; + PAGED_CODE(); + + /* Get the I/O Stack and check the function type */ + Stack = IoGetCurrentIrpStackLocation(Irp); + switch (Stack->MinorFunction) { - return(STATUS_INSUFFICIENT_RESOURCES); + case IRP_MN_MOUNT_VOLUME: + + /* Assume failure */ + Status = STATUS_UNRECOGNIZED_VOLUME; + + /* Get the device object and request the sector size */ + MountDevice = Stack->Parameters.MountVolume.DeviceObject; + if ((FsRecGetDeviceSectorSize(MountDevice, &SectorSize)) && + (FsRecGetDeviceSectors(MountDevice, SectorSize, &SectorCount))) + { + /* Setup other offsets to try */ + Offset2.QuadPart = SectorCount.QuadPart >> 1; + Offset2.QuadPart *= SectorSize; + Offset3.QuadPart = (SectorCount.QuadPart - 1) * SectorSize; + + /* Try to read the BPB */ + if (FsRecReadBlock(MountDevice, + &Offset, + 512, + SectorSize, + (PVOID)&Bpb, + NULL)) + { + /* Check if it's an actual FAT volume */ + if (FsRecIsNtfsVolume(Bpb, SectorSize, &SectorCount)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + else if (FsRecReadBlock(MountDevice, + &Offset2, + 512, + SectorSize, + (PVOID)&Bpb, + NULL)) + { + /* Check if it's an actual FAT volume */ + if (FsRecIsNtfsVolume(Bpb, SectorSize, &SectorCount)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + else if (FsRecReadBlock(MountDevice, + &Offset3, + 512, + SectorSize, + (PVOID)&Bpb, + NULL)) + { + /* Check if it's an actual FAT volume */ + if (FsRecIsNtfsVolume(Bpb, SectorSize, &SectorCount)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + + /* Free the boot sector if we have one */ + ExFreePool(Bpb); + } + break; + + case IRP_MN_LOAD_FILE_SYSTEM: + + /* Load the file system */ + Status = FsRecLoadFileSystem(DeviceObject, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Ntfs"); + break; + + default: + + /* Invalid request */ + Status = STATUS_INVALID_DEVICE_REQUEST; } - Status = FsRecReadSectors(DeviceObject, - 0, /* Partition boot sector */ - 1, - DiskGeometry.BytesPerSector, - Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT("FsRecReadSectors() failed (Status %lx)\n", Status); - ExFreePool(Buffer); - return(Status); - } - - DPRINT("NTFS-identifier: [%.8s]\n", &Buffer[3]); - if (RtlCompareMemory(&Buffer[3], "NTFS ", 8) == 8) - { - Status = STATUS_SUCCESS; - } - else - { - Status = STATUS_UNRECOGNIZED_VOLUME; - } - - ExFreePool(Buffer); - - return(Status); -} - - -NTSTATUS -FsRecNtfsFsControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION Stack; - static UNICODE_STRING RegistryPath = - RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Ntfs"); - NTSTATUS Status; - - Stack = IoGetCurrentIrpStackLocation(Irp); - - switch (Stack->MinorFunction) - { - case IRP_MN_MOUNT_VOLUME: - DPRINT("NTFS: IRP_MN_MOUNT_VOLUME\n"); - - Status = FsRecIsNtfsVolume(Stack->Parameters.MountVolume.DeviceObject); - if (NT_SUCCESS(Status)) - { - DPRINT("Identified NTFS volume\n"); - Status = STATUS_FS_DRIVER_REQUIRED; - } - break; - - case IRP_MN_LOAD_FILE_SYSTEM: - DPRINT("NTFS: IRP_MN_LOAD_FILE_SYSTEM\n"); - Status = ZwLoadDriver(&RegistryPath); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwLoadDriver failed (Status %x)\n", Status); - } - else - { - IoUnregisterFileSystem(DeviceObject); - } - break; - - default: - DPRINT("NTFS: Unknown minor function %lx\n", Stack->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - return(Status); + /* Return Status */ + return Status; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/fs_rec/udfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/udfs.c (original) +++ trunk/reactos/drivers/filesystems/fs_rec/udfs.c Thu Apr 5 04:11:35 2007 @@ -1,295 +1,149 @@ -/* - * ReactOS kernel - * 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. - */ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/fs_rec/udfs.c - * PURPOSE: Filesystem recognizer driver - * PROGRAMMER: Eric Kohl + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/udfs.c + * PURPOSE: USFS Recognizer + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl */ /* INCLUDES *****************************************************************/ +#include "fs_rec.h" #define NDEBUG #include <debug.h> -#include "fs_rec.h" - - -#define UDFS_VRS_START_SECTOR 16 -#define UDFS_AVDP_SECTOR 256 - -/* TYPES ********************************************************************/ - -#include <pshpack1.h> - -typedef struct _TAG -{ - USHORT Identifier; - USHORT Version; - UCHAR Checksum; - UCHAR Reserved; - USHORT SerialNumber; - USHORT Crc; - USHORT CrcLength; - ULONG Location; -} TAG, *PTAG; - -typedef struct _EXTENT -{ - ULONG Length; - ULONG Location; -} EXTENT, *PEXTENT; - -typedef struct _AVDP -{ - TAG DescriptorTag; - EXTENT MainVolumeDescriptorExtent; - EXTENT ReserveVolumeDescriptorExtent; -} AVDP, *PAVDP; - -#include <poppack.h> - - /* FUNCTIONS ****************************************************************/ -static NTSTATUS -FsRecCheckVolumeRecognitionSequence(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize) +BOOLEAN +NTAPI +FsRecIsUdfsVolume(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize) { - PUCHAR Buffer; - ULONG Sector; - NTSTATUS Status; - ULONG State; + PUCHAR Buffer = NULL; + LARGE_INTEGER Offset; + ULONG State = 0; - Buffer = ExAllocatePool(NonPagedPool, - SectorSize); - if (Buffer == NULL) + Offset.QuadPart = UDFS_VRS_START_SECTOR; + while (TRUE) { - return(STATUS_INSUFFICIENT_RESOURCES); + if (!FsRecReadBlock(DeviceObject, + &Offset, + 512, + SectorSize, + (PVOID)&Buffer, + NULL)) + { + break; + } + + switch (State) + { + case 0: + + if ((Offset.QuadPart == UDFS_VRS_START_SECTOR) && + (Buffer[1] == 'B') && + (Buffer[2] == 'E') && + (Buffer[3] == 'A') && + (Buffer[4] == '0') && + (Buffer[5] == '1')) + { + State = 1; + } + else + { + ExFreePool(Buffer); + return FALSE; + } + break; + + case 1: + + if ((Buffer[1] == 'N') && + (Buffer[2] == 'S') && + (Buffer[3] == 'R') && + (Buffer[4] == '0') && + ((Buffer[5] == '2') || (Buffer[5] == '3'))) + { + State = 2; + } + break; + + case 2: + + if ((Buffer[1] == 'T') && + (Buffer[2] == 'E') && + (Buffer[3] == 'A') && + (Buffer[4] == '0') && + (Buffer[5] == '1')) + { + ExFreePool(Buffer); + return TRUE; + } + break; + } + + Offset.QuadPart++; + if (Offset.QuadPart == UDFS_AVDP_SECTOR) + { + ExFreePool(Buffer); + return FALSE; + } } - State = 0; - Sector = UDFS_VRS_START_SECTOR; - while (TRUE) + ExFreePool(Buffer); + return TRUE; +} + +NTSTATUS +NTAPI +FsRecUdfsFsControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + NTSTATUS Status; + PDEVICE_OBJECT MountDevice; + ULONG SectorSize; + PAGED_CODE(); + + /* Get the I/O Stack and check the function type */ + Stack = IoGetCurrentIrpStackLocation(Irp); + switch (Stack->MinorFunction) { - Status = FsRecReadSectors(DeviceObject, - Sector, - 1, - SectorSize, - Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT ("FsRecReadSectors() failed (Status %lx)\n", Status); - break; - } + case IRP_MN_MOUNT_VOLUME: - DPRINT ("Descriptor identifier: [%.5s]\n", Buffer + 1); + /* Assume failure */ + Status = STATUS_UNRECOGNIZED_VOLUME; - switch (State) - { - case 0: - if ((Sector == UDFS_VRS_START_SECTOR) && - (Buffer[1] == 'B') && - (Buffer[2] == 'E') && - (Buffer[3] == 'A') && - (Buffer[4] == '0') && - (Buffer[5] == '1')) - { - State = 1; - } - else - { - DPRINT ("VRS start sector is not 'BEA01'\n"); - ExFreePool(Buffer); - return(STATUS_UNRECOGNIZED_VOLUME); - } - break; + /* Get the device object and request the sector size */ + MountDevice = Stack->Parameters.MountVolume.DeviceObject; + if (FsRecGetDeviceSectorSize(MountDevice, &SectorSize)) + { + /* Check if it's an actual FAT volume */ + if (FsRecIsUdfsVolume(MountDevice, SectorSize)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } - case 1: - if ((Buffer[1] == 'N') && - (Buffer[2] == 'S') && - (Buffer[3] == 'R') && - (Buffer[4] == '0') && - ((Buffer[5] == '2') || (Buffer[5] == '3'))) - { - State = 2; - } - break; + break; - case 2: - if ((Buffer[1] == 'T') && - (Buffer[2] == 'E') && - (Buffer[3] == 'A') && - (Buffer[4] == '0') && - (Buffer[5] == '1')) - { - DPRINT ("Found 'TEA01'\n"); - ExFreePool(Buffer); - return(STATUS_SUCCESS); - } - break; - } + case IRP_MN_LOAD_FILE_SYSTEM: - Sector++; - if (Sector == UDFS_AVDP_SECTOR) - { - DPRINT ("No 'TEA01' found\n"); - ExFreePool(Buffer); - return(STATUS_UNRECOGNIZED_VOLUME); - } + /* Load the file system */ + Status = FsRecLoadFileSystem(DeviceObject, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Udfs"); + break; + + default: + + /* Invalid request */ + Status = STATUS_INVALID_DEVICE_REQUEST; } - ExFreePool(Buffer); - - return(STATUS_UNRECOGNIZED_VOLUME); -} - - -static NTSTATUS -FsRecCheckAnchorVolumeDescriptorPointer(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize) -{ - PUCHAR Buffer; - ULONG Sector; - NTSTATUS Status; - PAVDP Avdp; - - Buffer = ExAllocatePool(NonPagedPool, - SectorSize); - if (Buffer == NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Sector = UDFS_AVDP_SECTOR; - Status = FsRecReadSectors(DeviceObject, - Sector, - 1, - SectorSize, - Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT ("FsRecReadSectors() failed (Status %lx)\n", Status); - ExFreePool(Buffer); - return(Status); - } - - Avdp = (PAVDP)Buffer; - DPRINT ("Descriptor identifier: %hu\n", Avdp->DescriptorTag.Identifier); - - DPRINT ("Main volume descriptor sequence location: %lu\n", - Avdp->MainVolumeDescriptorExtent.Location); - - DPRINT ("Main volume descriptor sequence length: %lu\n", - Avdp->MainVolumeDescriptorExtent.Length); - - DPRINT ("Reserve volume descriptor sequence location: %lu\n", - Avdp->ReserveVolumeDescriptorExtent.Location); - - DPRINT ("Reserve volume descriptor sequence length: %lu\n", - Avdp->ReserveVolumeDescriptorExtent.Length); - - ExFreePool(Buffer); - -// return(Status); - return(STATUS_SUCCESS); -} - - -static NTSTATUS -FsRecIsUdfsVolume(IN PDEVICE_OBJECT DeviceObject) -{ - DISK_GEOMETRY DiskGeometry; - ULONG Size; - NTSTATUS Status; - - Size = sizeof(DISK_GEOMETRY); - Status = FsRecDeviceIoControl(DeviceObject, - IOCTL_CDROM_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - &Size); - if (!NT_SUCCESS(Status)) - { - DPRINT ("FsRecDeviceIoControl() failed (Status %lx)\n", Status); - return(Status); - } - - /* Check the volume recognition sequence */ - Status = FsRecCheckVolumeRecognitionSequence(DeviceObject, - DiskGeometry.BytesPerSector); - if (!NT_SUCCESS(Status)) - return(Status); - - Status = FsRecCheckAnchorVolumeDescriptorPointer(DeviceObject, - DiskGeometry.BytesPerSector); - if (!NT_SUCCESS(Status)) - return(Status); - - return(STATUS_SUCCESS); -} - - -NTSTATUS -FsRecUdfsFsControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION Stack; - static UNICODE_STRING RegistryPath = - RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Udfs"); - NTSTATUS Status; - - Stack = IoGetCurrentIrpStackLocation(Irp); - - switch (Stack->MinorFunction) - { - case IRP_MN_MOUNT_VOLUME: - DPRINT("Udfs: IRP_MN_MOUNT_VOLUME\n"); - Status = FsRecIsUdfsVolume(Stack->Parameters.MountVolume.DeviceObject); - if (NT_SUCCESS(Status)) - { - DPRINT("Identified UDFS volume\n"); - Status = STATUS_FS_DRIVER_REQUIRED; - } - break; - - case IRP_MN_LOAD_FILE_SYSTEM: - DPRINT("Udfs: IRP_MN_LOAD_FILE_SYSTEM\n"); - Status = ZwLoadDriver(&RegistryPath); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwLoadDriver failed (Status %x)\n", Status); - } - else - { - IoUnregisterFileSystem(DeviceObject); - } - break; - - default: - DPRINT("Udfs: Unknown minor function %lx\n", Stack->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - return(Status); + /* Return Status */ + return Status; } /* EOF */

1 0

[dgorbachev] 26265: - Fix the damn thing.
by dgorbachev＠svn.reactos.org 04 Apr '07

04 Apr '07

Author: dgorbachev Date: Thu Apr 5 00:12:23 2007 New Revision: 26265 URL: http://svn.reactos.org/svn/reactos?rev=26265&view=rev Log: - Fix the damn thing. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Thu Apr 5 00:12:23 2007 @@ -3320,6 +3320,7 @@ IopRootDeviceNode->PhysicalDeviceObject->Flags |= DO_BUS_ENUMERATED_DEVICE; PnpRootDriverEntry(IopRootDriverObject, NULL); + IopRootDeviceNode->PhysicalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; IopRootDriverObject->DriverExtension->AddDevice( IopRootDriverObject, IopRootDeviceNode->PhysicalDeviceObject);

1 0

[janderwald] 26264: - allow backspace in edit / hex mode - patch by Kamil Hornicek (tykef@atlas.cz) See issue #2129 for more details.
by janderwald＠svn.reactos.org 04 Apr '07

04 Apr '07

Author: janderwald Date: Wed Apr 4 23:43:27 2007 New Revision: 26264 URL: http://svn.reactos.org/svn/reactos?rev=26264&view=rev Log: - allow backspace in edit / hex mode - patch by Kamil Hornicek (tykef(a)atlas.cz) See issue #2129 for more details. Modified: trunk/reactos/base/applications/regedit/edit.c Modified: trunk/reactos/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/edit.c (original) +++ trunk/reactos/base/applications/regedit/edit.c Wed Apr 4 23:43:27 2007 @@ -242,7 +242,7 @@ case WM_CHAR: if (dwordEditMode == EDIT_MODE_DEC) { - if (isdigit((int) wParam & 0xff)) + if (isdigit((int) wParam & 0xff) || iscntrl((int) wParam & 0xff)) { break; } @@ -253,7 +253,7 @@ } else if (dwordEditMode == EDIT_MODE_HEX) { - if (isxdigit((int) wParam & 0xff)) + if (isxdigit((int) wParam & 0xff) || iscntrl((int) wParam & 0xff)) { break; }

1 0

[janderwald] 26263: - move implementation of dialogs to appropiate file (odbccp32.dll) - odbccp32.cpl is therefore complete YUHU - rbuild needs to be hacked that odbccp32.cpl is outputed in the right destination folder (currently it writes into destination of odbccp32.dll)
by janderwald＠svn.reactos.org 04 Apr '07

04 Apr '07

Author: janderwald Date: Wed Apr 4 22:43:24 2007 New Revision: 26263 URL: http://svn.reactos.org/svn/reactos?rev=26263&view=rev Log: - move implementation of dialogs to appropiate file (odbccp32.dll) - odbccp32.cpl is therefore complete YUHU - rbuild needs to be hacked that odbccp32.cpl is outputed in the right destination folder (currently it writes into destination of odbccp32.dll) Removed: trunk/reactos/dll/cpl/odbccp32/about.c trunk/reactos/dll/cpl/odbccp32/drivers.c trunk/reactos/dll/cpl/odbccp32/dsn.c trunk/reactos/dll/cpl/odbccp32/lang/ trunk/reactos/dll/cpl/odbccp32/pool.c trunk/reactos/dll/cpl/odbccp32/resource.h trunk/reactos/dll/cpl/odbccp32/rsrc.rc trunk/reactos/dll/cpl/odbccp32/trace.c Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.c trunk/reactos/dll/cpl/odbccp32/odbccp32.h trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild trunk/reactos/dll/cpl/odbccp32/odbccp32.rc Removed: trunk/reactos/dll/cpl/odbccp32/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/about.c?r… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/about.c (original) +++ trunk/reactos/dll/cpl/odbccp32/about.c (removed) @@ -1,23 +1,0 @@ -/* $Id$ - * - * PROJECT: ReactOS ODBC Control Panel Applet - * FILE: lib/cpl/main/main.c - * PURPOSE: ODBC about dialog - * PROGRAMMER: Johannes Anderwald - */ - -#include "odbccp32.h" - -INT_PTR -CALLBACK -AboutProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - - - - - return FALSE; -} Removed: trunk/reactos/dll/cpl/odbccp32/drivers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/drivers.c… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/drivers.c (original) +++ trunk/reactos/dll/cpl/odbccp32/drivers.c (removed) @@ -1,23 +1,0 @@ -/* $Id: odbccp32.c 22979 2006-07-09 21:10:40Z fireball $ - * - * PROJECT: ReactOS ODBC Control Panel Applet - * FILE: lib/cpl/main/main.c - * PURPOSE: ODBC drivers dialog - * PROGRAMMER: Johannes Anderwald - */ - -#include "odbccp32.h" - -INT_PTR -CALLBACK -DriversProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - - - - - return FALSE; -} Removed: trunk/reactos/dll/cpl/odbccp32/dsn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/dsn.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/dsn.c (original) +++ trunk/reactos/dll/cpl/odbccp32/dsn.c (removed) @@ -1,51 +1,0 @@ -/* $Id$ - * - * PROJECT: ReactOS ODBC Control Panel Applet - * FILE: lib/cpl/main/main.c - * PURPOSE: ODBC DSN functions - * PROGRAMMER: Johannes Anderwald - */ - -#include "odbccp32.h" - -INT_PTR -CALLBACK -UserDSNProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - - - - - return FALSE; -} - -INT_PTR -CALLBACK -SystemDSNProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - - - - - return FALSE; -} - -INT_PTR -CALLBACK -FileDSNProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - - - - - return FALSE; -} Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.c (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.c Wed Apr 4 22:43:24 2007 @@ -8,59 +8,9 @@ #include "odbccp32.h" -HINSTANCE hApplet = 0; - -VOID -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) -{ - ZeroMemory(psp, sizeof(PROPSHEETPAGE)); - - psp->dwSize = sizeof(PROPSHEETPAGE); - psp->dwFlags = PSP_DEFAULT; - psp->hInstance = hApplet; - psp->pszTemplate = MAKEINTRESOURCE(idDlg); - psp->pfnDlgProc = DlgProc; -} - - -LONG -APIENTRY -AppletProc(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) -{ - PROPSHEETPAGE psp[7]; - PROPSHEETHEADER psh; - TCHAR szBuffer[256]; - - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(uMsg); - UNREFERENCED_PARAMETER(hwnd); - - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwFlags = PSH_PROPSHEETPAGE; - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.hwndParent = NULL; - psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); - psh.nStartPage = 0; - psh.ppsp = psp; - psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); - - if (LoadString(hApplet, IDS_CPLNAME, szBuffer, sizeof(szBuffer) / sizeof(TCHAR)) < 256) - { - psh.dwFlags |= PSH_PROPTITLE; - psh.pszCaption = szBuffer; - } - - InitPropSheetPage(&psp[0], IDD_USERDSN, UserDSNProc); - InitPropSheetPage(&psp[1], IDD_SYSTEMDSN, SystemDSNProc); - InitPropSheetPage(&psp[2], IDD_FILEDSN, FileDSNProc); - InitPropSheetPage(&psp[3], IDD_DRIVERS, DriversProc); - InitPropSheetPage(&psp[4], IDD_CONNTRACE, TraceProc); - InitPropSheetPage(&psp[5], IDD_CONNPOOL, PoolProc); - InitPropSheetPage(&psp[6], IDD_ABOUT, AboutProc); - return (LONG)(PropertySheet(&psh) != -1); -} +HINSTANCE hApplet = NULL; +APPLET_PROC ODBCProc = NULL; +HMODULE hLibrary = NULL; LONG @@ -70,32 +20,36 @@ LPARAM lParam1, LPARAM lParam2) { - switch(uMsg) + if (ODBCProc == NULL) { - case CPL_INIT: - return TRUE; + TCHAR szBuffer[MAX_PATH]; - case CPL_GETCOUNT: - return 1; + if (ExpandEnvironmentStrings(_T("%systemroot%\\system32\\odbccp32.dll"), + szBuffer, + sizeof(szBuffer) / sizeof(TCHAR)) > 0) + { + hLibrary = LoadLibrary(szBuffer); + if (hLibrary) + { + ODBCProc = (APPLET_PROC)GetProcAddress(hLibrary, "ODBCCPlApplet"); + } + } + } - case CPL_INQUIRE: + if (ODBCProc) + { + return ODBCProc(hwndCpl, uMsg, lParam1, lParam2); + } + else + { + if(hLibrary) { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - - CPlInfo->lData = lParam1; - CPlInfo->idIcon = CPL_ICON; - CPlInfo->idName = CPL_NAME; - CPlInfo->idInfo = CPL_INFO; - break; + FreeLibrary(hLibrary); } - case CPL_DBLCLK: - { - AppletProc(hwndCpl, uMsg, lParam1, lParam2); - break; - } + TerminateProcess(GetCurrentProcess(), -1); + return (LONG)-1; } - return FALSE; } Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.h (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.h Wed Apr 4 22:43:24 2007 @@ -6,61 +6,7 @@ #include <cpl.h> #include <tchar.h> -#include "resource.h" - extern HINSTANCE hApplet; - -INT_PTR -CALLBACK -UserDSNProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam); - -INT_PTR -CALLBACK -SystemDSNProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam); - -INT_PTR -CALLBACK -FileDSNProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam); - - -INT_PTR -CALLBACK -DriversProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam); - -INT_PTR -CALLBACK -TraceProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam); - - -INT_PTR -CALLBACK -PoolProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam); - -INT_PTR -CALLBACK -AboutProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam); - - +extern HMODULE hLibrary; #endif /* end of ODBCCP32_H__ */ Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild Wed Apr 4 22:43:24 2007 @@ -12,10 +12,5 @@ <library>comctl32</library> <library>msvcrt</library> <file>odbccp32.c</file> - <file>dsn.c</file> - <file>trace.c</file> - <file>pool.c</file> - <file>about.c</file> - <file>drivers.c</file> <file>odbccp32.rc</file> </module> Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.rc (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.rc Wed Apr 4 22:43:24 2007 @@ -7,7 +7,3 @@ #define REACTOS_STR_INTERNAL_NAME "odbccp32\0" #define REACTOS_STR_ORIGINAL_FILENAME "odbccp32.cpl\0" #include <reactos/version.rc> - - - -#include "rsrc.rc" Removed: trunk/reactos/dll/cpl/odbccp32/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/pool.c?re… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/pool.c (original) +++ trunk/reactos/dll/cpl/odbccp32/pool.c (removed) @@ -1,23 +1,0 @@ -/* $Id$ - * - * PROJECT: ReactOS ODBC Control Panel Applet - * FILE: lib/cpl/main/main.c - * PURPOSE: ODBC pool functions - * PROGRAMMER: Johannes Anderwald - */ - -#include "odbccp32.h" - -INT_PTR -CALLBACK -PoolProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - - - - - return FALSE; -} Removed: trunk/reactos/dll/cpl/odbccp32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/resource.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/resource.h (original) +++ trunk/reactos/dll/cpl/odbccp32/resource.h (removed) @@ -1,54 +1,0 @@ -#ifndef RESOURCE_H__ //resource.h -#define RESOURCE_H__ - -// -/// dialog constants -/// -#define IDD_USERDSN 100 -#define IDD_SYSTEMDSN 101 -#define IDD_FILEDSN 102 -#define IDD_DRIVERS 103 -#define IDD_CONNTRACE 104 -#define IDD_CONNPOOL 105 -#define IDD_ABOUT 106 - -#define IDC_CPLICON 150 -#define IDS_CPLNAME 151 -#define CPL_ICON 152 -#define CPL_NAME 153 -#define CPL_INFO 154 - -/// -/// User DSN dialog constants -/// - -#define IDC_USERDSN_ADD 200 -#define IDC_USERDSN_REMOVE 201 -#define IDC_USERDSN_CONFIGURE 202 - -/// -/// System DSN dialog constants -/// - -/// -/// File DSN dialog constants -/// - -/// -/// Drivers dialog constants -/// - -/// -/// Trace dialog constants -/// - -/// -/// Connection pooling dialog constants -/// - -/// -/// About dialog constants -/// - - -#endif /* end of RESOURCE_H__ */ Removed: trunk/reactos/dll/cpl/odbccp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/rsrc.rc (original) +++ trunk/reactos/dll/cpl/odbccp32/rsrc.rc (removed) @@ -1,7 +1,0 @@ -#include <windows.h> -#include <commctrl.h> -#include "resource.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "lang/en-US.rc" Removed: trunk/reactos/dll/cpl/odbccp32/trace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/trace.c?r… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/trace.c (original) +++ trunk/reactos/dll/cpl/odbccp32/trace.c (removed) @@ -1,23 +1,0 @@ -/* $Id$ - * - * PROJECT: ReactOS ODBC Control Panel Applet - * FILE: lib/cpl/main/main.c - * PURPOSE: ODBC trace functions - * PROGRAMMER: Johannes Anderwald - */ - -#include "odbccp32.h" - -INT_PTR -CALLBACK -TraceProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - - - - - return FALSE; -}

1 0

[janderwald] 26262: - beginning of ODBC control panel applet
by janderwald＠svn.reactos.org 04 Apr '07

04 Apr '07

Author: janderwald Date: Wed Apr 4 20:26:16 2007 New Revision: 26262 URL: http://svn.reactos.org/svn/reactos?rev=26262&view=rev Log: - beginning of ODBC control panel applet Added: trunk/reactos/dll/cpl/odbccp32/ (with props) trunk/reactos/dll/cpl/odbccp32/about.c (with props) trunk/reactos/dll/cpl/odbccp32/drivers.c trunk/reactos/dll/cpl/odbccp32/dsn.c (with props) trunk/reactos/dll/cpl/odbccp32/lang/ (with props) trunk/reactos/dll/cpl/odbccp32/lang/en-US.rc (with props) trunk/reactos/dll/cpl/odbccp32/odbccp32.c (with props) trunk/reactos/dll/cpl/odbccp32/odbccp32.def (with props) trunk/reactos/dll/cpl/odbccp32/odbccp32.h (with props) trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild (with props) trunk/reactos/dll/cpl/odbccp32/odbccp32.rc (with props) trunk/reactos/dll/cpl/odbccp32/pool.c (with props) trunk/reactos/dll/cpl/odbccp32/resource.h (with props) trunk/reactos/dll/cpl/odbccp32/rsrc.rc (with props) trunk/reactos/dll/cpl/odbccp32/trace.c (with props) Propchange: trunk/reactos/dll/cpl/odbccp32/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Apr 4 20:26:16 2007 @@ -1,0 +1,18 @@ +*.coff +*.cpl +*.d +*.a +*.o +*.sym +*.map +*.tmp +*.ncb +*.opt +*.plg +*.~* +dummy*.* +Debug +Release +GNUmakefile +*.vcproj +*.user Added: trunk/reactos/dll/cpl/odbccp32/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/about.c?r… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/about.c (added) +++ trunk/reactos/dll/cpl/odbccp32/about.c Wed Apr 4 20:26:16 2007 @@ -1,0 +1,23 @@ +/* $Id$ + * + * PROJECT: ReactOS ODBC Control Panel Applet + * FILE: lib/cpl/main/main.c + * PURPOSE: ODBC about dialog + * PROGRAMMER: Johannes Anderwald + */ + +#include "odbccp32.h" + +INT_PTR +CALLBACK +AboutProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + + + + + return FALSE; +} Propchange: trunk/reactos/dll/cpl/odbccp32/about.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/odbccp32/about.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/cpl/odbccp32/drivers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/drivers.c… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/drivers.c (added) +++ trunk/reactos/dll/cpl/odbccp32/drivers.c Wed Apr 4 20:26:16 2007 @@ -1,0 +1,23 @@ +/* $Id: odbccp32.c 22979 2006-07-09 21:10:40Z fireball $ + * + * PROJECT: ReactOS ODBC Control Panel Applet + * FILE: lib/cpl/main/main.c + * PURPOSE: ODBC drivers dialog + * PROGRAMMER: Johannes Anderwald + */ + +#include "odbccp32.h" + +INT_PTR +CALLBACK +DriversProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + + + + + return FALSE; +} Added: trunk/reactos/dll/cpl/odbccp32/dsn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/dsn.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/dsn.c (added) +++ trunk/reactos/dll/cpl/odbccp32/dsn.c Wed Apr 4 20:26:16 2007 @@ -1,0 +1,51 @@ +/* $Id$ + * + * PROJECT: ReactOS ODBC Control Panel Applet + * FILE: lib/cpl/main/main.c + * PURPOSE: ODBC DSN functions + * PROGRAMMER: Johannes Anderwald + */ + +#include "odbccp32.h" + +INT_PTR +CALLBACK +UserDSNProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + + + + + return FALSE; +} + +INT_PTR +CALLBACK +SystemDSNProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + + + + + return FALSE; +} + +INT_PTR +CALLBACK +FileDSNProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + + + + + return FALSE; +} Propchange: trunk/reactos/dll/cpl/odbccp32/dsn.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/odbccp32/dsn.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: trunk/reactos/dll/cpl/odbccp32/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Apr 4 20:26:16 2007 @@ -1,0 +1,18 @@ +*.coff +*.cpl +*.d +*.a +*.o +*.sym +*.map +*.tmp +*.ncb +*.opt +*.plg +*.~* +dummy*.* +Debug +Release +GNUmakefile +*.vcproj +*.user Added: trunk/reactos/dll/cpl/odbccp32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/lang/en-U… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/lang/en-US.rc (added) +++ trunk/reactos/dll/cpl/odbccp32/lang/en-US.rc Wed Apr 4 20:26:16 2007 @@ -1,0 +1,64 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_USERDSN DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "User DSN" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&User Data Sources:", -1, 10, 15, 80, 12 + //FIXME textbox + PUSHBUTTON "A&dd...", IDC_USERDSN_ADD, 185, 30, 50, 12 + PUSHBUTTON "&Remove...", IDC_USERDSN_REMOVE, 185, 45, 50, 12 + PUSHBUTTON "&Configure...", IDC_USERDSN_CONFIGURE, 185, 60, 50, 12 +// ICON -1, -1, 20, 180, 15, 15 + LTEXT "An ODBC User data source stores information about how to connect to the indicated data provider. A User data source is only visible to you and can only be used on the current machine.", -1, 45, 150, 180, 40 +END + +IDD_SYSTEMDSN DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "System DSN" +FONT 8, "MS Shell Dlg" +BEGIN + +END + +IDD_FILEDSN DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "File DSN" +FONT 8, "MS Shell Dlg" +BEGIN + +END + +IDD_DRIVERS DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Drivers" +FONT 8, "MS Shell Dlg" +BEGIN + +END + +IDD_CONNTRACE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tracing" +FONT 8, "MS Shell Dlg" +BEGIN + +END + +IDD_CONNPOOL DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Connection Pooling" +FONT 8, "MS Shell Dlg" +BEGIN + +END + +IDD_ABOUT DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "About" +FONT 8, "MS Shell Dlg" +BEGIN + +END + Propchange: trunk/reactos/dll/cpl/odbccp32/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.c (added) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.c Wed Apr 4 20:26:16 2007 @@ -1,0 +1,126 @@ +/* $Id$ + * + * PROJECT: ReactOS ODBC Control Panel Applet + * FILE: lib/cpl/main/main.c + * PURPOSE: applet initialization + * PROGRAMMER: Johannes Anderwald + */ + +#include "odbccp32.h" + +HINSTANCE hApplet = 0; + +VOID +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) +{ + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT; + psp->hInstance = hApplet; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; +} + + +LONG +APIENTRY +AppletProc(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +{ + PROPSHEETPAGE psp[7]; + PROPSHEETHEADER psh; + TCHAR szBuffer[256]; + + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(hwnd); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwFlags = PSH_PROPSHEETPAGE; + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.hwndParent = NULL; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); + psh.nStartPage = 0; + psh.ppsp = psp; + psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + + if (LoadString(hApplet, IDS_CPLNAME, szBuffer, sizeof(szBuffer) / sizeof(TCHAR)) < 256) + { + psh.dwFlags |= PSH_PROPTITLE; + psh.pszCaption = szBuffer; + } + + InitPropSheetPage(&psp[0], IDD_USERDSN, UserDSNProc); + InitPropSheetPage(&psp[1], IDD_SYSTEMDSN, SystemDSNProc); + InitPropSheetPage(&psp[2], IDD_FILEDSN, FileDSNProc); + InitPropSheetPage(&psp[3], IDD_DRIVERS, DriversProc); + InitPropSheetPage(&psp[4], IDD_CONNTRACE, TraceProc); + InitPropSheetPage(&psp[5], IDD_CONNPOOL, PoolProc); + InitPropSheetPage(&psp[6], IDD_ABOUT, AboutProc); + return (LONG)(PropertySheet(&psh) != -1); +} + + +LONG +CALLBACK +CPlApplet(HWND hwndCpl, + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) +{ + switch(uMsg) + { + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return 1; + + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + + CPlInfo->lData = lParam1; + CPlInfo->idIcon = CPL_ICON; + CPlInfo->idName = CPL_NAME; + CPlInfo->idInfo = CPL_INFO; + break; + } + + case CPL_DBLCLK: + { + AppletProc(hwndCpl, uMsg, lParam1, lParam2); + break; + } + } + return FALSE; +} + + +BOOL +WINAPI +DllMain(HINSTANCE hinstDLL, + DWORD dwReason, + LPVOID lpReserved) +{ + INITCOMMONCONTROLSEX InitControls; + UNREFERENCED_PARAMETER(lpReserved); + + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + + InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); + InitControls.dwICC = ICC_LISTVIEW_CLASSES | ICC_UPDOWN_CLASS | ICC_BAR_CLASSES; + InitCommonControlsEx(&InitControls); + + hApplet = hinstDLL; + break; + } + + return TRUE; +} + Propchange: trunk/reactos/dll/cpl/odbccp32/odbccp32.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/odbccp32/odbccp32.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/cpl/odbccp32/odbccp32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.def (added) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.def Wed Apr 4 20:26:16 2007 @@ -1,0 +1,6 @@ +LIBRARY odbccp32.cpl + +EXPORTS +CPlApplet + +; EOF Propchange: trunk/reactos/dll/cpl/odbccp32/odbccp32.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/odbccp32/odbccp32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.h (added) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.h Wed Apr 4 20:26:16 2007 @@ -1,0 +1,66 @@ +#ifndef ODBCCP32_H__ // odbccp32.h +#define ODBCCP32_H__ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include <tchar.h> + +#include "resource.h" + +extern HINSTANCE hApplet; + +INT_PTR +CALLBACK +UserDSNProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam); + +INT_PTR +CALLBACK +SystemDSNProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam); + +INT_PTR +CALLBACK +FileDSNProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam); + + +INT_PTR +CALLBACK +DriversProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam); + +INT_PTR +CALLBACK +TraceProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam); + + +INT_PTR +CALLBACK +PoolProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam); + +INT_PTR +CALLBACK +AboutProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam); + + + +#endif /* end of ODBCCP32_H__ */ Propchange: trunk/reactos/dll/cpl/odbccp32/odbccp32.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild (added) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild Wed Apr 4 20:26:16 2007 @@ -1,0 +1,21 @@ +<module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" usewrc="false"> + <importlibrary definition="odbccp32.def" /> + <include base="odbccp32">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <library>msvcrt</library> + <file>odbccp32.c</file> + <file>dsn.c</file> + <file>trace.c</file> + <file>pool.c</file> + <file>about.c</file> + <file>drivers.c</file> + <file>odbccp32.rc</file> +</module> Propchange: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/odbccp32/odbccp32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.rc (added) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.rc Wed Apr 4 20:26:16 2007 @@ -1,0 +1,13 @@ + +#include <windows.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS ODBC Control Panel Applet\0" +#define REACTOS_STR_INTERNAL_NAME "odbccp32\0" +#define REACTOS_STR_ORIGINAL_FILENAME "odbccp32.cpl\0" +#include <reactos/version.rc> + + + +#include "rsrc.rc" Propchange: trunk/reactos/dll/cpl/odbccp32/odbccp32.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/odbccp32/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/pool.c?re… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/pool.c (added) +++ trunk/reactos/dll/cpl/odbccp32/pool.c Wed Apr 4 20:26:16 2007 @@ -1,0 +1,23 @@ +/* $Id$ + * + * PROJECT: ReactOS ODBC Control Panel Applet + * FILE: lib/cpl/main/main.c + * PURPOSE: ODBC pool functions + * PROGRAMMER: Johannes Anderwald + */ + +#include "odbccp32.h" + +INT_PTR +CALLBACK +PoolProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + + + + + return FALSE; +} Propchange: trunk/reactos/dll/cpl/odbccp32/pool.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/odbccp32/pool.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/cpl/odbccp32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/resource.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/resource.h (added) +++ trunk/reactos/dll/cpl/odbccp32/resource.h Wed Apr 4 20:26:16 2007 @@ -1,0 +1,54 @@ +#ifndef RESOURCE_H__ //resource.h +#define RESOURCE_H__ + +// +/// dialog constants +/// +#define IDD_USERDSN 100 +#define IDD_SYSTEMDSN 101 +#define IDD_FILEDSN 102 +#define IDD_DRIVERS 103 +#define IDD_CONNTRACE 104 +#define IDD_CONNPOOL 105 +#define IDD_ABOUT 106 + +#define IDC_CPLICON 150 +#define IDS_CPLNAME 151 +#define CPL_ICON 152 +#define CPL_NAME 153 +#define CPL_INFO 154 + +/// +/// User DSN dialog constants +/// + +#define IDC_USERDSN_ADD 200 +#define IDC_USERDSN_REMOVE 201 +#define IDC_USERDSN_CONFIGURE 202 + +/// +/// System DSN dialog constants +/// + +/// +/// File DSN dialog constants +/// + +/// +/// Drivers dialog constants +/// + +/// +/// Trace dialog constants +/// + +/// +/// Connection pooling dialog constants +/// + +/// +/// About dialog constants +/// + + +#endif /* end of RESOURCE_H__ */ Propchange: trunk/reactos/dll/cpl/odbccp32/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/odbccp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/rsrc.rc (added) +++ trunk/reactos/dll/cpl/odbccp32/rsrc.rc Wed Apr 4 20:26:16 2007 @@ -1,0 +1,7 @@ +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "lang/en-US.rc" Propchange: trunk/reactos/dll/cpl/odbccp32/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/odbccp32/trace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/trace.c?r… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/trace.c (added) +++ trunk/reactos/dll/cpl/odbccp32/trace.c Wed Apr 4 20:26:16 2007 @@ -1,0 +1,23 @@ +/* $Id$ + * + * PROJECT: ReactOS ODBC Control Panel Applet + * FILE: lib/cpl/main/main.c + * PURPOSE: ODBC trace functions + * PROGRAMMER: Johannes Anderwald + */ + +#include "odbccp32.h" + +INT_PTR +CALLBACK +TraceProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + + + + + return FALSE; +} Propchange: trunk/reactos/dll/cpl/odbccp32/trace.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/odbccp32/trace.c ------------------------------------------------------------------------------ svn:keywords = author date id revision

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs