Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mf] 18277: update TODO list
by mf＠svn.reactos.com 05 Oct '05

05 Oct '05

update TODO list Modified: trunk/reactos/subsys/system/explorer/doc/TODO.txt _____ Modified: trunk/reactos/subsys/system/explorer/doc/TODO.txt --- trunk/reactos/subsys/system/explorer/doc/TODO.txt 2005-10-05 19:29:08 UTC (rev 18276) +++ trunk/reactos/subsys/system/explorer/doc/TODO.txt 2005-10-05 19:47:28 UTC (rev 18277) @@ -10,7 +10,6 @@ - command line parameters like "/e,/root,c:\" and "::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\::{21EC2020-3AEA-1069-A2DD-080 02B30309D}" (launch of control panel) - Windows-key combos - Application Desktop Toolbars -- command line in explorer windows - hide CVS subdirectories, may be even implement a CVS managment plugin - printer and RAS connection icons in desktop notification area - use multi threading for launching of programs and filling start menu subdirectories @@ -26,7 +25,7 @@ - Startmenu: You can open the start menu by pressing Win-key, but can't close with another hit of Win-key. - Export von Bookmarks f³r IE (+ Mozilla) -- Search Programs -> performance monitor.msv -> Abort +- Search Programs -> performance monitor.msc -> Abort <Nonvo> Martin, I would have a whish concerning explorer: I often want to start a program and give it some parameters. So nice featue: "Start with param..."

1 0

[greatlrd] 18276: activate PDD_DIRECTDRAW for GDIOBJ_LockObj so it does not fail if it is GDI_OBJECT_TYPE_DIRECTDRAW request. Thx w3seek for his guiding how todo it.
by greatlrd＠svn.reactos.com 05 Oct '05

05 Oct '05

activate PDD_DIRECTDRAW for GDIOBJ_LockObj so it does not fail if it is GDI_OBJECT_TYPE_DIRECTDRAW request. Thx w3seek for his guiding how todo it. Modified: trunk/reactos/subsys/win32k/include/intddraw.h Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c _____ Modified: trunk/reactos/subsys/win32k/include/intddraw.h --- trunk/reactos/subsys/win32k/include/intddraw.h 2005-10-05 18:36:10 UTC (rev 18275) +++ trunk/reactos/subsys/win32k/include/intddraw.h 2005-10-05 19:29:08 UTC (rev 18276) @@ -61,7 +61,7 @@ PDD_SURFCB_UNLOCK DdUnlockD3DBuffer; } DD_DIRECTDRAW, *PDD_DIRECTDRAW; -BOOL FASTCALL DD_Cleanup(PDD_DIRECTDRAW pDD); -BOOL FASTCALL DDSURF_Cleanup(PDD_SURFACE pDDSurf); +BOOL INTERNAL_CALL DD_Cleanup(PVOID pDD); +BOOL INTERNAL_CALL DDSURF_Cleanup(PVOID pDDSurf); #endif /* _INT_W32k_DDRAW */ _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-10-05 18:36:10 UTC (rev 18275) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-10-05 19:29:08 UTC (rev 18276) @@ -17,9 +17,10 @@ /* DIRECT DRAW OBJECT */ /*********************************************************************** */ -BOOL FASTCALL -DD_Cleanup(PDD_DIRECTDRAW pDD) +BOOL INTERNAL_CALL +DD_Cleanup(PVOID ObjectBody) { + PDD_DIRECTDRAW pDD = (PDD_DIRECTDRAW)ObjectBody; pDD->DrvDisableDirectDraw(pDD->Global.dhpdev); return TRUE; } @@ -50,6 +51,8 @@ return NULL; } + + BOOL success = pDC->DriverFunctions.EnableDirectDraw( pDC->PDev, &callbacks, &surface_callbacks, &palette_callbacks); @@ -193,10 +196,12 @@ /* SURFACE OBJECT */ /*********************************************************************** */ -BOOL FASTCALL -DDSURF_Cleanup(PDD_SURFACE pDDSurf) +BOOL INTERNAL_CALL +DDSURF_Cleanup(PVOID pDDSurf) { - //FIXME: implement + /* FIXME: implement + * PDD_SURFACE pDDSurf = PVOID pDDSurf + */ return TRUE; } _____ Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c --- trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-10-05 18:36:10 UTC (rev 18275) +++ trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-10-05 19:29:08 UTC (rev 18276) @@ -83,8 +83,8 @@ {GDI_OBJECT_TYPE_PEN, sizeof(GDIBRUSHOBJ), GDI_CleanupDummy}, {GDI_OBJECT_TYPE_FONT, sizeof(TEXTOBJ), GDI_CleanupDummy}, {GDI_OBJECT_TYPE_DCE, sizeof(DCE), DCE_Cleanup}, -/*{GDI_OBJECT_TYPE_DIRECTDRAW, sizeof(DD_DIRECTDRAW), DD_Cleanup}, - {GDI_OBJECT_TYPE_DD_SURFACE, sizeof(DD_SURFACE), DDSURF_Cleanup},*/ + {GDI_OBJECT_TYPE_DIRECTDRAW, sizeof(DD_DIRECTDRAW), DD_Cleanup}, + {GDI_OBJECT_TYPE_DD_SURFACE, sizeof(DD_SURFACE), DDSURF_Cleanup}, {GDI_OBJECT_TYPE_EXTPEN, 0, GDI_CleanupDummy}, {GDI_OBJECT_TYPE_METADC, 0, GDI_CleanupDummy}, {GDI_OBJECT_TYPE_METAFILE, 0, GDI_CleanupDummy},

1 0

[hbirr] 18275: Implemented SRB_FUNCTION_IO_CONTROL/IOCTL_SCSI_MINIPORT_IDENTIFY.
by hbirr＠svn.reactos.com 05 Oct '05

05 Oct '05

Implemented SRB_FUNCTION_IO_CONTROL/IOCTL_SCSI_MINIPORT_IDENTIFY. Modified: trunk/reactos/drivers/storage/atapi/atapi.c _____ Modified: trunk/reactos/drivers/storage/atapi/atapi.c --- trunk/reactos/drivers/storage/atapi/atapi.c 2005-10-05 18:24:24 UTC (rev 18274) +++ trunk/reactos/drivers/storage/atapi/atapi.c 2005-10-05 18:36:10 UTC (rev 18275) @@ -52,6 +52,8 @@ #include <ddk/srb.h> #include <ddk/scsi.h> #include <ddk/ntddscsi.h> +#include <ddk/ntdddisk.h> +#include <ddk/ntddstor.h> #include "atapi.h" @@ -936,6 +938,60 @@ } break; + case SRB_FUNCTION_IO_CONTROL: + { + PSRB_IO_CONTROL SrbIoControl = (PSRB_IO_CONTROL)Srb->DataBuffer; + if (!_strnicmp((char*)SrbIoControl->Signature, "ScsiDisk", 8)) + { + switch (SrbIoControl->ControlCode) + { + default: + Result = SRB_STATUS_INVALID_REQUEST; + break; + + case IOCTL_SCSI_MINIPORT_IDENTIFY: + { + PSENDCMDOUTPARAMS OutParams = (PSENDCMDOUTPARAMS)((ULONG_PTR)Srb->DataBuffer + sizeof(SRB_IO_CONTROL)); + SENDCMDINPARAMS InParams = *(PSENDCMDINPARAMS)OutParams; + + + RtlZeroMemory(OutParams, Srb->DataTransferLength - sizeof(SRB_IO_CONTROL)); + + if (InParams.irDriveRegs.bCommandReg != IDE_CMD_IDENT_ATA_DRV) + { + DPRINT1("bCommandReg: %x\n", InParams.irDriveRegs.bCommandReg); + OutParams->DriverStatus.bIDEError = 1; + Result = SRB_STATUS_INVALID_REQUEST; + break; + } + + if (InParams.bDriveNumber > 1 || + (DevExt->DeviceFlags[InParams.bDriveNumber] & (DEVICE_PRESENT|DEVICE_ATAPI)) != DEVICE_PRESENT) + { + OutParams->DriverStatus.bIDEError = 1; + Result = SRB_STATUS_NO_DEVICE; + break; + } + + if (Srb->DataTransferLength > sizeof(SRB_IO_CONTROL) + sizeof(SENDCMDOUTPARAMS) - 1) + { + OutParams->cBufferSize = min(IDENTIFY_BUFFER_SIZE, Srb->DataTransferLength - (sizeof(SRB_IO_CONTROL) + sizeof(SENDCMDOUTPARAMS) - 1)); + RtlCopyMemory(OutParams->bBuffer, &DevExt->DeviceParams[InParams.bDriveNumber], OutParams->cBufferSize); + } + + Result = SRB_STATUS_SUCCESS; + break; + } + } + } + else + { + Result = SRB_STATUS_INVALID_REQUEST; + } + + break; + } + default: Result = SRB_STATUS_INVALID_REQUEST; break; @@ -1176,6 +1232,12 @@ { DeviceExtension->DeviceFlags[UnitNumber] |= DEVICE_NO_FLUSH; } + + /* Don't flush CD/DVD drives */ + if (((DeviceExtension->DeviceParams[UnitNumber].ConfigBits >> 8) & 0x1F) == READ_ONLY_DIRECT_ACCESS_DEVICE) + { + DeviceExtension->DeviceFlags[UnitNumber] |= DEVICE_NO_FLUSH; + } DeviceFound = TRUE; } else @@ -1292,6 +1354,9 @@ { LONG i; ULONG mode; + char SerialNumber[20]; + char FirmwareRev[8]; + char ModelNumber[40]; /* Get the Drive Identify block from drive or die */ if (AtapiPolledRead(CommandPort, @@ -1310,9 +1375,12 @@ } /* Report on drive parameters if debug mode */ - IDESwapBytePairs(DrvParms->SerialNumber, 20); - IDESwapBytePairs(DrvParms->FirmwareRev, 8); - IDESwapBytePairs(DrvParms->ModelNumber, 40); + memcpy(SerialNumber, DrvParms->SerialNumber, 20); + memcpy(FirmwareRev, DrvParms->FirmwareRev, 8); + memcpy(ModelNumber, DrvParms->ModelNumber, 40); + IDESwapBytePairs((PUCHAR)SerialNumber, 20); + IDESwapBytePairs((PUCHAR)FirmwareRev, 8); + IDESwapBytePairs((PUCHAR)ModelNumber, 40); DPRINT("Config:%04x Cyls:%5d Heads:%2d Sectors/Track:%3d Gaps:%02d %02d\n", DrvParms->ConfigBits, DrvParms->LogicalCyls, @@ -1323,13 +1391,13 @@ DPRINT("Bytes/PLO:%3d Vendor Cnt:%2d Serial number:[%.20s]\n", DrvParms->BytesInPLO, DrvParms->VendorUniqueCnt, - DrvParms->SerialNumber); + SerialNumber); DPRINT("Cntlr type:%2d BufSiz:%5d ECC bytes:%3d Firmware Rev:[%.8s]\n", DrvParms->ControllerType, DrvParms->BufferSize * IDE_SECTOR_BUF_SZ, DrvParms->ECCByteCnt, - DrvParms->FirmwareRev); - DPRINT("Model:[%.40s]\n", DrvParms->ModelNumber); + FirmwareRev); + DPRINT("Model:[%.40s]\n", ModelNumber); DPRINT("RWMultMax?:%04x RWMult?:%02x LBA:%d DMA:%d MinPIO:%d ns MinDMA:%d ns\n", (DrvParms->RWMultImplemented), (DrvParms->RWMultCurrent) & 0xff, @@ -1897,7 +1965,6 @@ { PIDE_DRIVE_IDENTIFY DeviceParams; PINQUIRYDATA InquiryData; - ULONG i; DPRINT("SCSIOP_INQUIRY: DeviceExtension %p TargetId: %lu\n", DeviceExtension, Srb->TargetId); @@ -1906,10 +1973,7 @@ DeviceParams = &DeviceExtension->DeviceParams[Srb->TargetId]; /* clear buffer */ - for (i = 0; i < Srb->DataTransferLength; i++) - { - ((PUCHAR)Srb->DataBuffer)[i] = 0; - } + memset(Srb->DataBuffer, 0, Srb->DataTransferLength); /* set device class */ if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_ATAPI) @@ -1917,12 +1981,6 @@ /* get it from the ATAPI configuration word */ InquiryData->DeviceType = (DeviceParams->ConfigBits >> 8) & 0x1F; DPRINT("Device class: %u\n", InquiryData->DeviceType); - - /* Don't flush CD/DVD drives */ - if (InquiryData->DeviceType == READ_ONLY_DIRECT_ACCESS_DEVICE) - { - DeviceExtension->DeviceFlags[Srb->TargetId] |= DEVICE_NO_FLUSH; - } } else { @@ -1937,26 +1995,13 @@ InquiryData->RemovableMedia = 1; } - for (i = 0; i < 20; i += 2) - { - InquiryData->VendorId[i] = - ((PUCHAR)DeviceParams->ModelNumber)[i]; - InquiryData->VendorId[i+1] = - ((PUCHAR)DeviceParams->ModelNumber)[i+1]; - } + memcpy(InquiryData->VendorId, DeviceParams->ModelNumber, 20); + IDESwapBytePairs(InquiryData->VendorId, 20); - for (i = 0; i < 4; i++) - { - InquiryData->ProductId[12+i] = ' '; - } + memcpy(&InquiryData->ProductId[12], " ", 4); - for (i = 0; i < 4; i += 2) - { - InquiryData->ProductRevisionLevel[i] = - ((PUCHAR)DeviceParams->FirmwareRev)[i]; - InquiryData->ProductRevisionLevel[i+1] = - ((PUCHAR)DeviceParams->FirmwareRev)[i+1]; - } + memcpy(InquiryData->ProductRevisionLevel, DeviceParams->FirmwareRev, 4); + IDESwapBytePairs(InquiryData->ProductRevisionLevel, 4); InquiryData->AdditionalLength = 31;

1 0

[hbirr] 18274: Implemented IOCTL_SCSI_MINIPORT.
by hbirr＠svn.reactos.com 05 Oct '05

05 Oct '05

Implemented IOCTL_SCSI_MINIPORT. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c --- trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-10-05 16:47:19 UTC (rev 18273) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-10-05 18:24:24 UTC (rev 18274) @@ -33,6 +33,7 @@ #include <ddk/scsi.h> #include <ddk/ntddscsi.h> #include <ddk/ntddstor.h> +#include <ddk/ntdddisk.h> #include <stdio.h> #define NDEBUG @@ -138,6 +139,10 @@ PSCSI_REQUEST_BLOCK Srb); +static NTSTATUS +SpiScsiMiniport(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + /* FUNCTIONS *****************************************************************/ /********************************************************************** @@ -838,6 +843,9 @@ DPRINT ("Created device: %wZ (%p)\n", &DeviceName, PortDeviceObject); + /* Increase the stacksize. We reenter our device on IOCTL_SCSI_MINIPORT */ + PortDeviceObject->StackSize++; + /* Set the buffering strategy here... */ PortDeviceObject->Flags |= DO_DIRECT_IO; PortDeviceObject->AlignmentRequirement = FILE_WORD_ALIGNMENT; @@ -1771,8 +1779,7 @@ DPRINT1(" IOCTL_SCSI_MINIPORT\n"); DPRINT1(" Signature: %.8s\n", ((PSRB_IO_CONTROL)Irp->AssociatedIrp.SystemBuffer)->Signature); DPRINT1(" ControlCode: 0x%lX\n", ((PSRB_IO_CONTROL)Irp->AssociatedIrp.SystemBuffer)->ControlCode); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; + return SpiScsiMiniport(DeviceObject, Irp); default: DPRINT1(" unknown ioctl code: 0x%lX\n", @@ -1787,6 +1794,139 @@ return Status; } +static NTSTATUS STDCALL +SpiCompletion(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PSCSI_REQUEST_BLOCK Srb; + + DPRINT("SpiCompletion(DeviceObject %x, Irp %x, Context %x)\n", + DeviceObject, Irp, Context); + + Srb = (PSCSI_REQUEST_BLOCK)Context; + Irp->IoStatus.Information = 0; + + switch (SRB_STATUS(Srb->SrbStatus)) + { + case SRB_STATUS_SUCCESS: + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = Srb->DataTransferLength; + break; + + case SRB_STATUS_INVALID_PATH_ID: + case SRB_STATUS_INVALID_TARGET_ID: + case SRB_STATUS_INVALID_LUN: + case SRB_STATUS_NO_HBA: + Irp->IoStatus.Status = STATUS_NO_SUCH_DEVICE; + break; + + case SRB_STATUS_NO_DEVICE: + Irp->IoStatus.Status = STATUS_DEVICE_NOT_CONNECTED; + break; + + case SRB_STATUS_BUSY: + Irp->IoStatus.Status = STATUS_DEVICE_BUSY; + break; + + case SRB_STATUS_DATA_OVERRUN: + Irp->IoStatus.Status = STATUS_DATA_OVERRUN; + Irp->IoStatus.Information = Srb->DataTransferLength; + break; + + case SRB_STATUS_INVALID_REQUEST: + Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; + break; + + default: + Irp->IoStatus.Status = STATUS_IO_DEVICE_ERROR; + break; + } + + ExFreePool(Srb); + + if (Irp->PendingReturned) + { + IoMarkIrpPending (Irp); + } + return Irp->IoStatus.Status; +} + +static NTSTATUS +SpiScsiMiniport(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; + PSRB_IO_CONTROL SrbIoControl; + PIO_STACK_LOCATION IrpStack; + PSCSI_REQUEST_BLOCK Srb; + PSCSI_PORT_LUN_EXTENSION LunExtension; + + DPRINT("SpiScsiMiniport(DeviceObject %x, Irp %x)\n", + DeviceObject, Irp); + + DeviceExtension = DeviceObject->DeviceExtension; + SrbIoControl = (PSRB_IO_CONTROL)Irp->AssociatedIrp.SystemBuffer; + + IrpStack = IoGetCurrentIrpStackLocation(Irp); + if (IrpStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(SRB_IO_CONTROL) + sizeof(SENDCMDINPARAMS) - 1) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + if (IrpStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(SRB_IO_CONTROL) + SrbIoControl->Length) + { + Irp->IoStatus.Information = sizeof(SRB_IO_CONTROL) + SrbIoControl->Length; + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_BUFFER_TOO_SMALL; + } + if (IsListEmpty(&DeviceExtension->LunExtensionListHead)) + { + Irp->IoStatus.Status = STATUS_NO_SUCH_DEVICE; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NO_SUCH_DEVICE; + } + + Srb = ExAllocatePool(NonPagedPool, sizeof(SCSI_REQUEST_BLOCK)); + if (Srb == NULL) + { + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlZeroMemory(Srb, sizeof(SCSI_REQUEST_BLOCK)); + Srb->Length = sizeof(SCSI_REQUEST_BLOCK); + Srb->OriginalRequest = Irp; + Srb->Function = SRB_FUNCTION_IO_CONTROL; + Srb->DataBuffer = (PVOID)SrbIoControl; + Srb->DataTransferLength = sizeof(SRB_IO_CONTROL) + SrbIoControl->Length; + + /* We using the first extension from the list. The miniport driver is responsible to find the correct device. */ + LunExtension = CONTAINING_RECORD(DeviceExtension->LunExtensionListHead.Flink, + SCSI_PORT_LUN_EXTENSION, + List); + Srb->PathId = LunExtension->PathId; + Srb->TargetId = LunExtension->TargetId; + Srb->Lun = LunExtension->Lun; + + IrpStack = IoGetNextIrpStackLocation(Irp); + + IrpStack->MajorFunction = IRP_MJ_SCSI; + IrpStack->Parameters.Scsi.Srb = Srb; + + IoSetCompletionRoutine(Irp, + SpiCompletion, + Srb, + TRUE, + TRUE, + TRUE); + + return IoCallDriver(DeviceObject, Irp); +} + static VOID SpiAllocateSrbExtension(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, PSCSI_REQUEST_BLOCK Srb)

1 0

[mf] 18273: create some start menu entries for notepad, regedit and winefile
by mf＠svn.reactos.com 05 Oct '05

05 Oct '05

create some start menu entries for notepad, regedit and winefile Modified: trunk/reactos/lib/syssetup/install.c _____ Modified: trunk/reactos/lib/syssetup/install.c --- trunk/reactos/lib/syssetup/install.c 2005-10-05 16:11:21 UTC (rev 18272) +++ trunk/reactos/lib/syssetup/install.c 2005-10-05 16:47:19 UTC (rev 18273) @@ -159,20 +159,16 @@ static VOID -CreateCmdLink(VOID) +CreateShortcut(int csidl, LPCTSTR linkName, LPCTSTR command, LPCTSTR title) { TCHAR path[MAX_PATH]; LPTSTR p; - CoInitialize(NULL); - - SHGetSpecialFolderPath(0, path, CSIDL_DESKTOP, TRUE); + SHGetSpecialFolderPath(0, path, csidl, TRUE); p = PathAddBackslash(path); + _tcscpy(p, linkName); - _tcscpy(p, _T("Command Prompt.lnk")); - CreateShellLink(path, _T("cmd.exe"), _T(""), NULL, NULL, 0, _T("Open command prompt")); - - CoUninitialize(); + CreateShellLink(path, command, _T(""), NULL, NULL, 0, title); } @@ -399,8 +395,21 @@ return 0; } - CreateCmdLink(); + CoInitialize(NULL); + /* desktop shortcuts */ + CreateShortcut(CSIDL_DESKTOP, _T("Command Prompt.lnk"), _T("cmd.exe"), _T("Open command prompt")); + CreateShortcut(CSIDL_DESKTOP, _T("winefile.lnk"), _T("winefile.exe"), _T("Launch Winefile")); + + /* program startmenu shortcuts */ + CreateShortcut(CSIDL_PROGRAMS, _T("Command Prompt.lnk"), _T("cmd.exe"), _T("Open command prompt")); + CreateShortcut(CSIDL_PROGRAMS, _T("explorer.lnk"), _T("explorer.exe"), _T("Launch Explorer")); + CreateShortcut(CSIDL_PROGRAMS, _T("winefile.lnk"), _T("winefile.exe"), _T("Launch Winefile")); + CreateShortcut(CSIDL_PROGRAMS, _T("notepad.lnk"), _T("notepad.exe"), _T("Launch Text Editor")); + CreateShortcut(CSIDL_PROGRAMS, _T("regedit.lnk"), _T("regedit.exe"), _T("Launch Registry Editor")); + + CoUninitialize(); + /* Create the semi-random Domain-SID */ CreateRandomSid (&DomainSid); if (DomainSid == NULL)

1 0

[mf] 18272: remove duplicate RegQueryStringValue() function
by mf＠svn.reactos.com 05 Oct '05

05 Oct '05

remove duplicate RegQueryStringValue() function Modified: trunk/reactos/subsys/system/regedit/childwnd.c _____ Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-10-05 14:47:07 UTC (rev 18271) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-10-05 16:11:21 UTC (rev 18272) @@ -178,42 +178,6 @@ * Key suggestion */ -static LONG RegQueryStringValue(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, - LPTSTR lpDest, DWORD dwDestLength) -{ - LONG lResult; - HKEY hSubKey = NULL; - DWORD cbData, dwType; - - if (lpSubKey) - { - lResult = RegOpenKey(hKey, lpSubKey, &hSubKey); - if (lResult != ERROR_SUCCESS) - goto done; - hKey = hSubKey; - } - - cbData = (dwDestLength - 1) * sizeof(*lpDest); - lResult = RegQueryValueEx(hKey, lpValueName, NULL, &dwType, - (LPBYTE) lpDest, &cbData); - if (lResult != ERROR_SUCCESS) - goto done; - if (dwType != REG_SZ) - { - lResult = -1; - goto done; - } - - lpDest[cbData / sizeof(*lpDest)] = '\0'; - -done: - if (lResult != ERROR_SUCCESS) - lpDest[0] = '\0'; - if (hSubKey) - RegCloseKey(hSubKey); - return lResult; -} - static void SuggestKeys(HKEY hRootKey, LPCTSTR pszKeyPath, LPTSTR pszSuggestions, size_t iSuggestionsLength) {

1 0

[mf] 18271: partial implementation of ShowWindowAsync() using the synchronous NtUserShowWindow() call to activate the desktop switcher
by mf＠svn.reactos.com 05 Oct '05

05 Oct '05

partial implementation of ShowWindowAsync() using the synchronous NtUserShowWindow() call to activate the desktop switcher Modified: trunk/reactos/include/win32k/ntuser.h Modified: trunk/reactos/lib/user32/windows/window.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-10-05 13:25:14 UTC (rev 18270) +++ trunk/reactos/include/win32k/ntuser.h 2005-10-05 14:47:07 UTC (rev 18271) @@ -1568,11 +1568,11 @@ HWND hWnd, LONG nCmdShow); -DWORD +BOOL STDCALL NtUserShowWindowAsync( - DWORD Unknown0, - DWORD Unknown1); + HWND hWnd, + LONG nCmdShow); BOOL STDCALL _____ Modified: trunk/reactos/lib/user32/windows/window.c --- trunk/reactos/lib/user32/windows/window.c 2005-10-05 13:25:14 UTC (rev 18270) +++ trunk/reactos/lib/user32/windows/window.c 2005-10-05 14:47:07 UTC (rev 18271) @@ -1280,8 +1280,7 @@ ShowWindowAsync(HWND hWnd, int nCmdShow) { - UNIMPLEMENTED; - return FALSE; + return NtUserShowWindowAsync(hWnd, nCmdShow); } _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-10-05 13:25:14 UTC (rev 18270) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-10-05 14:47:07 UTC (rev 18271) @@ -4162,13 +4162,15 @@ /* * @unimplemented */ -DWORD STDCALL -NtUserShowWindowAsync(DWORD Unknown0, - DWORD Unknown1) +BOOL STDCALL +NtUserShowWindowAsync(HWND hWnd, LONG nCmdShow) { +#if 0 UNIMPLEMENTED - return 0; +#else + return NtUserShowWindow(hWnd, nCmdShow); +#endif }

1 0

[npwoods] 18270: Regedit: Now restores last position on startup
by npwoods＠svn.reactos.com 05 Oct '05

05 Oct '05

Regedit: Now restores last position on startup Still need to save position on exit Modified: trunk/reactos/subsys/system/regedit/main.c Modified: trunk/reactos/subsys/system/regedit/regproc.c Modified: trunk/reactos/subsys/system/regedit/regproc.h _____ Modified: trunk/reactos/subsys/system/regedit/main.c --- trunk/reactos/subsys/system/regedit/main.c 2005-10-05 13:08:59 UTC (rev 18269) +++ trunk/reactos/subsys/system/regedit/main.c 2005-10-05 13:25:14 UTC (rev 18270) @@ -34,6 +34,7 @@ #include "main.h" #include "hexedit.h" #include "security.h" +#include "regproc.h" BOOL ProcessCmdLine(LPSTR lpCmdLine); @@ -74,6 +75,8 @@ { BOOL AclUiAvailable; HMENU hEditMenu; + TCHAR szBuffer[256]; + LPCTSTR s; WNDCLASSEX wcFrame = { sizeof(WNDCLASSEX), @@ -158,6 +161,19 @@ SetupStatusBar(hFrameWnd, FALSE); CheckMenuItem(GetSubMenu(hMenuFrame, ID_VIEW_MENU), ID_VIEW_STATUSBAR, MF_BYCOMMAND|MF_CHECKED); } + + /* Restore position */ + if (RegQueryStringValue(HKEY_CURRENT_USER, + _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"), + _T("LastKey"), + szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])) == ERROR_SUCCESS) + { + s = szBuffer; + if (!_tcsncmp(s, _T("My Computer\\"), 12)) + s += 12; + SelectNode(g_pChildWnd->hTreeWnd, s); + } + ShowWindow(hFrameWnd, nCmdShow); UpdateWindow(hFrameWnd); return TRUE; _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-10-05 13:08:59 UTC (rev 18269) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-10-05 13:25:14 UTC (rev 18270) @@ -1659,11 +1659,45 @@ RegDeleteValue(hKey, lpSrcValue); done: - if (hKey) - RegCloseKey(hKey); + if (hSubKey) + RegCloseKey(hSubKey); return lResult; } +LONG RegQueryStringValue(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, LPTSTR pszBuffer, DWORD dwBufferLen) +{ + LONG lResult; + HKEY hSubKey = NULL; + DWORD cbData, dwType; + + if (lpSubKey) + { + lResult = RegOpenKey(hKey, lpSubKey, &hSubKey); + if (lResult != ERROR_SUCCESS) + goto done; + hKey = hSubKey; + } + + cbData = (dwBufferLen - 1) * sizeof(*pszBuffer); + lResult = RegQueryValueEx(hKey, lpValueName, NULL, &dwType, (LPBYTE) pszBuffer, &cbData); + if (lResult != ERROR_SUCCESS) + goto done; + if (dwType != REG_SZ) + { + lResult = -1; + goto done; + } + + pszBuffer[cbData / sizeof(*pszBuffer)] = '\0'; + +done: + if (lResult != ERROR_SUCCESS) + pszBuffer[0] = '\0'; + if (hSubKey) + RegCloseKey(hSubKey); + return lResult; +} + /*********************************************************************** ******* * Key naming and parsing */ @@ -1674,22 +1708,22 @@ if (hRootKey == HKEY_CLASSES_ROOT) pszRootKey = TEXT("HKEY_CLASSES_ROOT"); - else if (hRootKey == HKEY_CURRENT_USER) + else if (hRootKey == HKEY_CURRENT_USER) pszRootKey = TEXT("HKEY_CURRENT_USER"); - else if (hRootKey == HKEY_LOCAL_MACHINE) + else if (hRootKey == HKEY_LOCAL_MACHINE) pszRootKey = TEXT("HKEY_LOCAL_MACHINE"); - else if (hRootKey == HKEY_USERS) + else if (hRootKey == HKEY_USERS) pszRootKey = TEXT("HKEY_USERS"); - else if (hRootKey == HKEY_CURRENT_CONFIG) + else if (hRootKey == HKEY_CURRENT_CONFIG) pszRootKey = TEXT("HKEY_CURRENT_CONFIG"); - else if (hRootKey == HKEY_DYN_DATA) + else if (hRootKey == HKEY_DYN_DATA) pszRootKey = TEXT("HKEY_DYN_DATA"); else return FALSE; if (lpSubKey[0]) _sntprintf(pszDest, iDestLength, TEXT("%s\\%s"), pszRootKey, lpSubKey); - else + else _sntprintf(pszDest, iDestLength, TEXT("%s"), pszRootKey); return TRUE; } _____ Modified: trunk/reactos/subsys/system/regedit/regproc.h --- trunk/reactos/subsys/system/regedit/regproc.h 2005-10-05 13:08:59 UTC (rev 18269) +++ trunk/reactos/subsys/system/regedit/regproc.h 2005-10-05 13:25:14 UTC (rev 18270) @@ -90,6 +90,7 @@ LONG RegMoveKey(HKEY hDestKey, LPCTSTR lpDestSubKey, HKEY hSrcKey, LPCTSTR lpSrcSubKey); LONG RegRenameKey(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpNewName); LONG RegRenameValue(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpDestValue, LPCTSTR lpSrcValue); +LONG RegQueryStringValue(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, LPTSTR pszBuffer, DWORD dwBufferLen); /* * Miscellaneous

1 0

[mf] 18269: fix UNICODE control panel calls to handle double clicks on the task bar clock
by mf＠svn.reactos.com 05 Oct '05

05 Oct '05

fix UNICODE control panel calls to handle double clicks on the task bar clock Modified: trunk/reactos/subsys/system/explorer/utility/utility.cpp _____ Modified: trunk/reactos/subsys/system/explorer/utility/utility.cpp --- trunk/reactos/subsys/system/explorer/utility/utility.cpp 2005-10-05 00:27:25 UTC (rev 18268) +++ trunk/reactos/subsys/system/explorer/utility/utility.cpp 2005-10-05 13:08:59 UTC (rev 18269) @@ -365,12 +365,18 @@ } +#ifdef UNICODE +#define CONTROL_RUNDLL "Control_RunDLLW" +#else +#define CONTROL_RUNDLL "Control_RunDLLA" +#endif + BOOL launch_cpanel(HWND hwnd, LPCTSTR applet) { - //launch_file(_hwnd, applet, SW_SHOWNORMAL); // This would be enough, but we want the fastest solution. - //launch_file(_hwnd, TEXT("rundll32.exe /d shell32.dll,Control_RunDLL ")+applet, SW_SHOWNORMAL); + //launch_file(_hwnd, applet, SW_SHOWNORMAL); // This would be enough, but we want the to use the most direct and fastest call. + //launch_file(_hwnd, String(TEXT("rundll32.exe /d shell32.dll,Control_RunDLL "))+applet, SW_SHOWNORMAL); - return RunDLL(hwnd, TEXT("shell32"), "Control_RunDLL", applet, SW_SHOWNORMAL); + return RunDLL(hwnd, TEXT("shell32"), CONTROL_RUNDLL, applet, SW_SHOWNORMAL); }

1 0

[npwoods] 18268: Rbuild: Enhanced MSVC support
by npwoods＠svn.reactos.com 05 Oct '05

05 Oct '05

Rbuild: Enhanced MSVC support 1. Enhanced the MSVC backends so that it pulls in information from the main project 2. Fixed bugs in Path::RelativeFromDirectory() in tools\rbuild\XML.cpp With these changes, many VC projects generated by rbuild now compile without any tweaking Modified: trunk/reactos/tools/rbuild/XML.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/XML.cpp --- trunk/reactos/tools/rbuild/XML.cpp 2005-10-04 15:32:04 UTC (rev 18267) +++ trunk/reactos/tools/rbuild/XML.cpp 2005-10-05 00:27:25 UTC (rev 18268) @@ -186,20 +186,28 @@ #ifdef WIN32 // this squirreliness is b/c win32 has drive letters and *nix doesn't... // not possible to do relative across different drive letters - if ( vbase[0] != vpath[0] ) - return path; + { + char path_driveletter = (path[1] == ':') ? toupper(path[0]) : 0; + char base_driveletter = (base_directory[1] == ':') ? toupper(base_directory[0]) : 0; + if ( path_driveletter != base_driveletter ) + return path; + } #endif size_t i = 0; while ( i < vbase.size() && i < vpath.size() && vbase[i] == vpath[i] ) ++i; + + // did we go through all of the path? if ( vbase.size() == vpath.size() && i == vpath.size() ) return "."; + if ( i < vbase.size() ) { // path goes above our base directory, we will need some ..'s - for ( size_t j = 0; j < i; j++ ) + for ( size_t j = i; j < vbase.size(); j++ ) vout.push_back ( ".." ); } + while ( i < vpath.size() ) vout.push_back ( vpath[i++] ); _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-10-04 15:32:04 UTC (rev 18267) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-10-05 00:27:25 UTC (rev 18268) @@ -77,12 +77,10 @@ string dsp_path = module.GetBasePath(); vector<string> c_srcs, source_files, resource_files, includes, libraries, defines; vector<const IfableData*> ifs_list; + ifs_list.push_back ( &module.project.non_if_data ); ifs_list.push_back ( &module.non_if_data ); - defines.push_back ( "WIN32" ); - defines.push_back ( "_WINDOWS" ); - defines.push_back ( "WIN32" ); - defines.push_back ( "_MBCS" ); + // this is a define in MinGW w32api, but not Microsoft's headers defines.push_back ( "STDCALL=__stdcall" ); while ( ifs_list.size() ) @@ -107,6 +105,10 @@ const vector<Include*>& incs = data.includes; for ( i = 0; i < incs.size(); i++ ) { + // explicitly omit win32api directories + if ( !strncmp(incs[i]->directory.c_str(), "w32api", 6 ) ) + continue; + string path = Path::RelativeFromDirectory ( incs[i]->directory, module.GetBasePath() ); @@ -361,13 +363,7 @@ fprintf ( OUT, " /c" ); fprintf ( OUT, "\r\n" ); - vector<string> defines2; - defines2.push_back ( "WINVER=0x0501" ); - defines2.push_back ( "_WIN32_WINNT=0x0501" ); - defines2.push_back ( "_WIN32_IE=0x0600" ); - defines2.push_back ( "WIN32" ); - defines2.push_back ( "_WINDOWS" ); - defines2.push_back ( "_MBCS" ); + vector<string> defines2 = defines; if ( debug ) { defines2.push_back ( "_DEBUG" ); @@ -433,7 +429,7 @@ for ( i = 0; i < includes.size(); i++ ) { const string& include = includes[i]; - if ( strpbrk ( include.c_str(), "[\\\"]" ) ) + if ( strpbrk ( include.c_str(), "[\\\"]" ) || !strncmp ( include.c_str(), "../", 3 ) ) { fprintf ( OUT, " /I \"%s\"", include.c_str() ); } @@ -478,7 +474,7 @@ } fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"_DEBUG\"\r\n" ); fprintf ( OUT, "# ADD RSC /l 0x41d" ); - if ( wine ) + /*if ( wine )*/ { for ( i = 0; i < includes.size(); i++ ) { @@ -755,7 +751,7 @@ fprintf ( OUT, "# Begin Group \"Resource Files\"\r\n" ); fprintf ( OUT, "\r\n" ); fprintf ( OUT, "# PROP Default_Filter \"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\"\r\n" ); - for ( i = 0; i < resource_files.size(); i++ ) +/* for ( i = 0; i < resource_files.size(); i++ ) { const string& resource_file = resource_files[i]; fprintf ( OUT, "# Begin Source File\r\n" ); @@ -763,7 +759,7 @@ fprintf ( OUT, "SOURCE=.\\%s\r\n", resource_file.c_str() ); fprintf ( OUT, "# End Source File\r\n" ); } - fprintf ( OUT, "# End Group\r\n" ); +*/ fprintf ( OUT, "# End Group\r\n" ); fprintf ( OUT, "# End Target\r\n" ); fprintf ( OUT, "# End Project\r\n" ); _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-04 15:32:04 UTC (rev 18267) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-05 00:27:25 UTC (rev 18268) @@ -1,408 +1,425 @@ -/* - * Copyright (C) 2002 Patrik Stridvall - * Copyright (C) 2005 Royce Mitchell III - * - * 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. - */ - -#ifdef _MSC_VER -#pragma warning ( disable : 4786 ) -#endif//_MSC_VER - -#include <string> -#include <vector> - -#include <stdio.h> - -#include "msvc.h" - -using std::string; -using std::vector; - -void -MSVCBackend::_generate_vcproj ( const Module& module ) -{ - size_t i; - // TODO FIXME wine hack? - //const bool wine = false; - - string vcproj_file = VcprojFileName(module); - printf ( "Creating MSVC.NET project: '%s'\n", vcproj_file.c_str() ); - FILE* OUT = fopen ( vcproj_file.c_str(), "wb" ); - - vector<string> imports; - for ( i = 0; i < module.non_if_data.libraries.size(); i++ ) - { - imports.push_back ( module.non_if_data.libraries[i]->name ); - } - - string module_type = GetExtension(module.GetTargetName()); - bool lib = (module_type == ".lib") || (module_type == ".a"); - bool dll = (module_type == ".dll"); - bool exe = (module_type == ".exe"); - // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? - - bool console = exe && (module.type == Win32CUI); - - // TODO FIXME - not sure if the count here is right... - int parts = 0; - const char* p = strpbrk ( vcproj_file.c_str(), "/\\" ); - while ( p ) - { - ++parts; - p = strpbrk ( p+1, "/\\" ); - } - string msvc_wine_dir = ".."; - while ( --parts ) - msvc_wine_dir += "\\.."; - - string wine_include_dir = msvc_wine_dir + "\\include"; - - //$progress_current++; - //$output->progress("$dsp_file (file $progress_current of $progress_max)"); - - // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'? - string vcproj_path = module.GetBasePath(); - vector<string> c_srcs, source_files, resource_files, includes, libraries, defines; - vector<const IfableData*> ifs_list; - ifs_list.push_back ( &module.non_if_data ); - - defines.push_back ( "WIN32" ); - defines.push_back ( "_WINDOWS" ); - defines.push_back ( "WIN32" ); - defines.push_back ( "_MBCS" ); - defines.push_back ( "STDCALL=__stdcall" ); - - while ( ifs_list.size() ) - { - const IfableData& data = *ifs_list.back(); - ifs_list.pop_back(); - // TODO FIXME - refactor needed - we're discarding if conditions - for ( i = 0; i < data.ifs.size(); i++ ) - ifs_list.push_back ( &data.ifs[i]->data ); - const vector<File*>& files = data.files; - for ( i = 0; i < files.size(); i++ ) - { - // TODO FIXME - do we want the full path of the file here? - string file = string(".") + &files[i]->name[vcproj_path.size()]; - - source_files.push_back ( file ); - if ( !stricmp ( Right(file,2).c_str(), ".c" ) ) - c_srcs.push_back ( file ); - if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) - resource_files.push_back ( file ); - } - const vector<Include*>& incs = data.includes; - for ( i = 0; i < incs.size(); i++ ) - { - string path = Path::RelativeFromDirectory ( - incs[i]->directory, - module.GetBasePath() ); - includes.push_back ( path ); - } - const vector<Library*>& libs = data.libraries; - for ( i = 0; i < libs.size(); i++ ) - { - libraries.push_back ( libs[i]->name + ".lib" ); - } - const vector<Define*>& defs = data.defines; - for ( i = 0; i < defs.size(); i++ ) - { - if ( defs[i]->value[0] ) - defines.push_back ( defs[i]->name + "=" + defs[i]->value ); - else - defines.push_back ( defs[i]->name ); - } - } - - vector<string> header_files; - - bool no_cpp = true; - bool no_msvc_headers = true; - - std::vector<std::string> cfgs; - - cfgs.push_back ( module.name + " - Win32" ); - - if (!no_cpp) - { - std::vector<std::string> _cfgs; - for ( i = 0; i < cfgs.size(); i++ ) - { - _cfgs.push_back ( cfgs[i] + " C" ); - _cfgs.push_back ( cfgs[i] + " C++" ); - } - cfgs.resize(0); - cfgs = _cfgs; - } - - if (!no_msvc_headers) - { - std::vector<std::string> _cfgs; - for ( i = 0; i < cfgs.size(); i++ ) - { - _cfgs.push_back ( cfgs[i] + " MSVC Headers" ); - _cfgs.push_back ( cfgs[i] + " Wine Headers" ); - } - cfgs.resize(0); - cfgs = _cfgs; - } - - string default_cfg = cfgs.back(); - - fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" ); - fprintf ( OUT, "<VisualStudioProject\r\n" ); - fprintf ( OUT, "\tProjectType=\"Visual C++\"\r\n" ); - fprintf ( OUT, "\tVersion=\"7.00\"\r\n" ); - fprintf ( OUT, "\tName=\"%s\"\r\n", module.name.c_str() ); - fprintf ( OUT, "\tKeyword=\"Win32Proj\">\r\n" ); - - fprintf ( OUT, "\t<Platforms>\r\n" ); - fprintf ( OUT, "\t\t<Platform\r\n" ); - fprintf ( OUT, "\t\t\tName=\"Win32\"/>\r\n" ); - fprintf ( OUT, "\t</Platforms>\r\n" ); - - int n = 0; - - std::string output_dir; - - fprintf ( OUT, "\t<Configurations>\r\n" ); - for ( size_t icfg = 0; icfg < cfgs.size(); icfg++ ) - { - std::string& cfg = cfgs[icfg]; - - bool debug = !strstr ( cfg.c_str(), "Release" ); - //bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) ); - - fprintf ( OUT, "\t\t<Configuration\r\n" ); - fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.c_str() ); - fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\"\r\n", cfg.c_str() ); - fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\"\r\n", cfg.c_str() ); - fprintf ( OUT, "\t\t\tConfigurationType=\"%d\"\r\n", exe ? 1 : dll ? 2 : lib ? 4 : -1 ); - fprintf ( OUT, "\t\t\tCharacterSet=\"2\">\r\n" ); - - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", debug ? 0 : 2 ); - - fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); - bool multiple_includes = false; - for ( i = 0; i < includes.size(); i++ ) - { - const string& include = includes[i]; - if ( strcmp ( include.c_str(), "." ) ) - { - if ( multiple_includes ) - fprintf ( OUT, ";" ); - fprintf ( OUT, "%s", include.c_str() ); - multiple_includes = true; - } - } - fprintf ( OUT, "\"\r\n " ); - - if ( debug ) - { - defines.push_back ( "_DEBUG" ); - if ( lib || exe ) - { - defines.push_back ( "_LIB" ); - } - else - { - defines.push_back ( "_WINDOWS" ); - defines.push_back ( "_USRDLL" ); - } - } - else - { - defines.push_back ( "NDEBUG" ); - if ( lib || exe ) - { - defines.push_back ( "_LIB" ); - } - else - { - defines.push_back ( "_WINDOWS" ); - defines.push_back ( "_USRDLL" ); - } - } - - fprintf ( OUT, "\t\t\t\tPreprocessorDefinitions=\"" ); - for ( i = 0; i < defines.size(); i++ ) - { - if ( i > 0 ) - fprintf ( OUT, ";" ); - fprintf ( OUT, "%s", defines[i].c_str() ); - } - fprintf ( OUT, "\"\r\n" ); - - fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"TRUE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"3\"\r\n" ); - fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"5\"\r\n" ); - fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); - fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); - fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"0\"\r\n" ); - fprintf ( OUT, "\t\t\t\tWarningLevel=\"1\"\r\n" ); - fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"TRUE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"4\"/>\r\n" ); - - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCCustomBuildTool\"/>\r\n" ); - - if ( lib ) - { - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCLibrarianTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"/>\r\n", module.name.c_str(), module_type.c_str() ); - } - else - { - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); - - fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); - for ( i = 0; i < libraries.size(); i++ ) - { - if ( i > 0 ) - fprintf ( OUT, " " ); - fprintf ( OUT, "%s", libraries[i].c_str() ); - } - fprintf ( OUT, "\"\r\n" ); - - fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"\r\n", module.name.c_str(), module_type.c_str() ); - fprintf ( OUT, "\t\t\t\tLinkIncremental=\"%d\"\r\n", debug ? 2 : 1 ); - fprintf ( OUT, "\t\t\t\tGenerateDebugInformation=\"TRUE\"\r\n" ); - - if ( debug ) - fprintf ( OUT, "\t\t\t\tProgramDatabaseFile=\"$(OutDir)/%s.pdb\"\r\n", module.name.c_str() ); - - fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); - fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); - } - - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCMIDLTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCPostBuildEventTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCPreBuildEventTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCPreLinkEventTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCResourceCompilerTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCWebServiceProxyGeneratorTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCWebDeploymentTool\"/>\r\n" ); - fprintf ( OUT, "\t\t</Configuration>\r\n" ); - - n++; - } - fprintf ( OUT, "\t</Configurations>\r\n" ); - - fprintf ( OUT, "\t<Files>\r\n" ); - - // Source files - fprintf ( OUT, "\t\t<Filter\r\n" ); - fprintf ( OUT, "\t\t\tName=\"Source Files\"\r\n" ); - fprintf ( OUT, "\t\t\tFilter=\"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\">\r\n" ); - for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ ) - { - const string& source_file = DosSeparator(source_files[isrcfile]); - fprintf ( OUT, "\t\t\t<File\r\n" ); - fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", source_file.c_str() ); - fprintf ( OUT, "\t\t\t</File>\r\n" ); - } - fprintf ( OUT, "\t\t</Filter>\r\n" ); - - // Header files - fprintf ( OUT, "\t\t<Filter\r\n" ); - fprintf ( OUT, "\t\t\tName=\"Header Files\"\r\n" ); - fprintf ( OUT, "\t\t\tFilter=\"h;hpp;hxx;hm;inl\">\r\n" ); - for ( i = 0; i < header_files.size(); i++ ) - { - const string& header_file = header_files[i]; - fprintf ( OUT, "\t\t\t<File\r\n" ); - fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", header_file.c_str() ); - fprintf ( OUT, "\t\t\t</File>\r\n" ); - } - fprintf ( OUT, "\t\t</Filter>\r\n" ); - - // Resource files - fprintf ( OUT, "\t\t<Filter\r\n" ); - fprintf ( OUT, "\t\t\tName=\"Resource Files\"\r\n" ); - fprintf ( OUT, "\t\t\tFilter=\"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\">\r\n" ); - for ( i = 0; i < header_files.size(); i++ ) - { - const string& resource_file = resource_files[i]; - fprintf ( OUT, "\t\t\t<File\r\n" ); - fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", resource_file.c_str() ); - fprintf ( OUT, "\t\t\t</File>\r\n" ); - } - fprintf ( OUT, "\t\t</Filter>\r\n" ); - - fprintf ( OUT, "\t</Files>\r\n" ); - fprintf ( OUT, "\t<Globals>\r\n" ); - fprintf ( OUT, "\t</Globals>\r\n" ); - fprintf ( OUT, "</VisualStudioProject>\r\n" ); - fclose(OUT); -} - -void -MSVCBackend::_generate_sln_header ( FILE* OUT ) -{ - fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version 9.00\r\n" ); - fprintf ( OUT, "# Visual C++ Express 2005\r\n" ); - fprintf ( OUT, "\r\n" ); -} - -void -MSVCBackend::_generate_sln ( FILE* OUT ) -{ - _generate_sln_header(OUT); - // TODO FIXME - is it necessary to sort them? - for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) - { - Module& module = *ProjectNode.modules[i]; - - std::string vcproj_file = VcprojFileName ( module ); - _generate_dsw_project ( OUT, module, vcproj_file, module.dependencies ); - } -// _generate_dsw_footer ( OUT ); -} - - - -/* - m_devFile << "Microsoft Visual Studio Solution File, Format Version 9.00" << endl; - m_devFile << "# Visual C++ Express 2005" << endl; - - m_devFile << "# FIXME Project listings here" << endl; - m_devFile << "EndProject" << endl; - m_devFile << "Global" << endl; - m_devFile << " GlobalSection(SolutionConfigurationPlatforms) = preSolution" << endl; - m_devFile << " Debug|Win32 = Debug|Win32" << endl; - m_devFile << " Release|Win32 = Release|Win32" << endl; - m_devFile << " EndGlobalSection" << endl; - m_devFile << " GlobalSection(ProjectConfigurationPlatforms) = postSolution" << endl; - m_devFile << " #FIXME Project Listings Here" << endl; - m_devFile << " EndGlobalSection" << endl; - m_devFile << " GlobalSection(SolutionProperties) = preSolution" << endl; - m_devFile << " HideSolutionNode = FALSE" << endl; - m_devFile << " EndGlobalSection" << endl; - m_devFile << "EndGlobal" << endl; - - m_devFile << endl << endl; -*/ +/* + * Copyright (C) 2002 Patrik Stridvall + * Copyright (C) 2005 Royce Mitchell III + * + * 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. + */ + +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) +#endif//_MSC_VER + +#include <string> +#include <vector> + +#include <stdio.h> + +#include "msvc.h" + +using std::string; +using std::vector; + +void +MSVCBackend::_generate_vcproj ( const Module& module ) +{ + size_t i; + // TODO FIXME wine hack? + //const bool wine = false; + + string vcproj_file = VcprojFileName(module); + printf ( "Creating MSVC.NET project: '%s'\n", vcproj_file.c_str() ); + FILE* OUT = fopen ( vcproj_file.c_str(), "wb" ); + + vector<string> imports; + for ( i = 0; i < module.non_if_data.libraries.size(); i++ ) + { + imports.push_back ( module.non_if_data.libraries[i]->name ); + } + + string module_type = GetExtension(module.GetTargetName()); + bool lib = (module_type == ".lib") || (module_type == ".a"); + bool dll = (module_type == ".dll"); + bool exe = (module_type == ".exe"); + // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? + + bool console = exe && (module.type == Win32CUI); + + // TODO FIXME - not sure if the count here is right... + int parts = 0; + const char* p = strpbrk ( vcproj_file.c_str(), "/\\" ); + while ( p ) + { + ++parts; + p = strpbrk ( p+1, "/\\" ); + } + string msvc_wine_dir = ".."; + while ( --parts ) + msvc_wine_dir += "\\.."; + + string wine_include_dir = msvc_wine_dir + "\\include"; + + //$progress_current++; + //$output->progress("$dsp_file (file $progress_current of $progress_max)"); + + // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'? + string vcproj_path = module.GetBasePath(); + vector<string> c_srcs, source_files, resource_files, includes, libraries, defines; + vector<const IfableData*> ifs_list; + ifs_list.push_back ( &module.project.non_if_data ); + ifs_list.push_back ( &module.non_if_data ); + + // this is a define in MinGW w32api, but not Microsoft's headers + defines.push_back ( "STDCALL=__stdcall" ); + + while ( ifs_list.size() ) + { + const IfableData& data = *ifs_list.back(); + ifs_list.pop_back(); + // TODO FIXME - refactor needed - we're discarding if conditions + for ( i = 0; i < data.ifs.size(); i++ ) + ifs_list.push_back ( &data.ifs[i]->data ); + const vector<File*>& files = data.files; + for ( i = 0; i < files.size(); i++ ) + { + // TODO FIXME - do we want the full path of the file here? + string file = string(".") + &files[i]->name[vcproj_path.size()]; + + source_files.push_back ( file ); + if ( !stricmp ( Right(file,2).c_str(), ".c" ) ) + c_srcs.push_back ( file ); + if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) + resource_files.push_back ( file ); + } + const vector<Include*>& incs = data.includes; + for ( i = 0; i < incs.size(); i++ ) + { + // explicitly omit win32api directories + if ( !strncmp(incs[i]->directory.c_str(), "w32api", 6 ) ) + continue; + + string path = Path::RelativeFromDirectory ( + incs[i]->directory, + module.GetBasePath() ); + includes.push_back ( path ); + } + const vector<Library*>& libs = data.libraries; + for ( i = 0; i < libs.size(); i++ ) + { + libraries.push_back ( libs[i]->name + ".lib" ); + } + const vector<Define*>& defs = data.defines; + for ( i = 0; i < defs.size(); i++ ) + { + if ( defs[i]->value[0] ) + defines.push_back ( defs[i]->name + "=" + defs[i]->value ); + else + defines.push_back ( defs[i]->name ); + } + } + + vector<string> header_files; + + bool no_cpp = true; + bool no_msvc_headers = true; + + std::vector<std::string> cfgs; + + cfgs.push_back ( module.name + " - Win32" ); + + if (!no_cpp) + { + std::vector<std::string> _cfgs; + for ( i = 0; i < cfgs.size(); i++ ) + { + _cfgs.push_back ( cfgs[i] + " C" ); + _cfgs.push_back ( cfgs[i] + " C++" ); + } + cfgs.resize(0); + cfgs = _cfgs; + } + + if (!no_msvc_headers) + { + std::vector<std::string> _cfgs; + for ( i = 0; i < cfgs.size(); i++ ) + { + _cfgs.push_back ( cfgs[i] + " MSVC Headers" ); + _cfgs.push_back ( cfgs[i] + " Wine Headers" ); + } + cfgs.resize(0); + cfgs = _cfgs; + } + + string default_cfg = cfgs.back(); + + fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" ); + fprintf ( OUT, "<VisualStudioProject\r\n" ); + fprintf ( OUT, "\tProjectType=\"Visual C++\"\r\n" ); + fprintf ( OUT, "\tVersion=\"7.00\"\r\n" ); + fprintf ( OUT, "\tName=\"%s\"\r\n", module.name.c_str() ); + fprintf ( OUT, "\tKeyword=\"Win32Proj\">\r\n" ); + + fprintf ( OUT, "\t<Platforms>\r\n" ); + fprintf ( OUT, "\t\t<Platform\r\n" ); + fprintf ( OUT, "\t\t\tName=\"Win32\"/>\r\n" ); + fprintf ( OUT, "\t</Platforms>\r\n" ); + + int n = 0; + + std::string output_dir; + + fprintf ( OUT, "\t<Configurations>\r\n" ); + for ( size_t icfg = 0; icfg < cfgs.size(); icfg++ ) + { + std::string& cfg = cfgs[icfg]; + + bool debug = !strstr ( cfg.c_str(), "Release" ); + //bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) ); + + fprintf ( OUT, "\t\t<Configuration\r\n" ); + fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.c_str() ); + fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\"\r\n", cfg.c_str() ); + fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\"\r\n", cfg.c_str() ); + fprintf ( OUT, "\t\t\tConfigurationType=\"%d\"\r\n", exe ? 1 : dll ? 2 : lib ? 4 : -1 ); + fprintf ( OUT, "\t\t\tCharacterSet=\"2\">\r\n" ); + + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", debug ? 0 : 2 ); + + fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); + bool multiple_includes = false; + for ( i = 0; i < includes.size(); i++ ) + { + const string& include = includes[i]; + if ( strcmp ( include.c_str(), "." ) ) + { + if ( multiple_includes ) + fprintf ( OUT, ";" ); + fprintf ( OUT, "%s", include.c_str() ); + multiple_includes = true; + } + } + fprintf ( OUT, "\"\r\n " ); + + if ( debug ) + { + defines.push_back ( "_DEBUG" ); + if ( lib || exe ) + { + defines.push_back ( "_LIB" ); + } + else + { + defines.push_back ( "_WINDOWS" ); + defines.push_back ( "_USRDLL" ); + } + } + else + { + defines.push_back ( "NDEBUG" ); + if ( lib || exe ) + { + defines.push_back ( "_LIB" ); + } + else + { + defines.push_back ( "_WINDOWS" ); + defines.push_back ( "_USRDLL" ); + } + } + + fprintf ( OUT, "\t\t\t\tPreprocessorDefinitions=\"" ); + for ( i = 0; i < defines.size(); i++ ) + { + if ( i > 0 ) + fprintf ( OUT, ";" ); + fprintf ( OUT, "%s", defines[i].c_str() ); + } + fprintf ( OUT, "\"\r\n" ); + + fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"3\"\r\n" ); + fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"5\"\r\n" ); + fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); + fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); + fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"0\"\r\n" ); + fprintf ( OUT, "\t\t\t\tWarningLevel=\"1\"\r\n" ); + fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"4\"/>\r\n" ); + + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCCustomBuildTool\"/>\r\n" ); + + if ( lib ) + { + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCLibrarianTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"/>\r\n", module.name.c_str(), module_type.c_str() ); + } + else + { + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); + + fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); + for ( i = 0; i < libraries.size(); i++ ) + { + if ( i > 0 ) + fprintf ( OUT, " " ); + fprintf ( OUT, "%s", libraries[i].c_str() ); + } + fprintf ( OUT, "\"\r\n" ); + + fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"\r\n", module.name.c_str(), module_type.c_str() ); + fprintf ( OUT, "\t\t\t\tLinkIncremental=\"%d\"\r\n", debug ? 2 : 1 ); + fprintf ( OUT, "\t\t\t\tGenerateDebugInformation=\"TRUE\"\r\n" ); + + if ( debug ) + fprintf ( OUT, "\t\t\t\tProgramDatabaseFile=\"$(OutDir)/%s.pdb\"\r\n", module.name.c_str() ); + + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); + fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); + } + + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCResourceCompilerTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); + multiple_includes = false; + for ( i = 0; i < includes.size(); i++ ) + { + const string& include = includes[i]; + if ( strcmp ( include.c_str(), "." ) ) + { + if ( multiple_includes ) + fprintf ( OUT, ";" ); + fprintf ( OUT, "%s", include.c_str() ); + multiple_includes = true; + } + } + fprintf ( OUT, "\"/>\r\n " ); + + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCMIDLTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCPostBuildEventTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCPreBuildEventTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCPreLinkEventTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCWebServiceProxyGeneratorTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCWebDeploymentTool\"/>\r\n" ); + fprintf ( OUT, "\t\t</Configuration>\r\n" ); + + n++; + } + fprintf ( OUT, "\t</Configurations>\r\n" ); + + fprintf ( OUT, "\t<Files>\r\n" ); + + // Source files + fprintf ( OUT, "\t\t<Filter\r\n" ); + fprintf ( OUT, "\t\t\tName=\"Source Files\"\r\n" ); + fprintf ( OUT, "\t\t\tFilter=\"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\">\r\n" ); + for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ ) + { + const string& source_file = DosSeparator(source_files[isrcfile]); + fprintf ( OUT, "\t\t\t<File\r\n" ); + fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", source_file.c_str() ); + fprintf ( OUT, "\t\t\t</File>\r\n" ); + } + fprintf ( OUT, "\t\t</Filter>\r\n" ); + + // Header files + fprintf ( OUT, "\t\t<Filter\r\n" ); + fprintf ( OUT, "\t\t\tName=\"Header Files\"\r\n" ); + fprintf ( OUT, "\t\t\tFilter=\"h;hpp;hxx;hm;inl\">\r\n" ); + for ( i = 0; i < header_files.size(); i++ ) + { + const string& header_file = header_files[i]; + fprintf ( OUT, "\t\t\t<File\r\n" ); + fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", header_file.c_str() ); + fprintf ( OUT, "\t\t\t</File>\r\n" ); + } + fprintf ( OUT, "\t\t</Filter>\r\n" ); + + // Resource files + fprintf ( OUT, "\t\t<Filter\r\n" ); + fprintf ( OUT, "\t\t\tName=\"Resource Files\"\r\n" ); + fprintf ( OUT, "\t\t\tFilter=\"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\">\r\n" ); + for ( i = 0; i < header_files.size(); i++ ) + { + const string& resource_file = resource_files[i]; + fprintf ( OUT, "\t\t\t<File\r\n" ); + fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", resource_file.c_str() ); + fprintf ( OUT, "\t\t\t</File>\r\n" ); + } + fprintf ( OUT, "\t\t</Filter>\r\n" ); + + fprintf ( OUT, "\t</Files>\r\n" ); + fprintf ( OUT, "\t<Globals>\r\n" ); + fprintf ( OUT, "\t</Globals>\r\n" ); + fprintf ( OUT, "</VisualStudioProject>\r\n" ); + fclose(OUT); +} + +void +MSVCBackend::_generate_sln_header ( FILE* OUT ) +{ + fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version 9.00\r\n" ); + fprintf ( OUT, "# Visual C++ Express 2005\r\n" ); + fprintf ( OUT, "\r\n" ); +} + +void +MSVCBackend::_generate_sln ( FILE* OUT ) +{ + _generate_sln_header(OUT); + // TODO FIXME - is it necessary to sort them? + for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) + { + Module& module = *ProjectNode.modules[i]; + + std::string vcproj_file = VcprojFileName ( module ); + _generate_dsw_project ( OUT, module, vcproj_file, module.dependencies ); + } +// _generate_dsw_footer ( OUT ); +} + + + +/* + m_devFile << "Microsoft Visual Studio Solution File, Format Version 9.00" << endl; + m_devFile << "# Visual C++ Express 2005" << endl; + + m_devFile << "# FIXME Project listings here" << endl; + m_devFile << "EndProject" << endl; + m_devFile << "Global" << endl; + m_devFile << " GlobalSection(SolutionConfigurationPlatforms) = preSolution" << endl; + m_devFile << " Debug|Win32 = Debug|Win32" << endl; + m_devFile << " Release|Win32 = Release|Win32" << endl; + m_devFile << " EndGlobalSection" << endl; + m_devFile << " GlobalSection(ProjectConfigurationPlatforms) = postSolution" << endl; + m_devFile << " #FIXME Project Listings Here" << endl; + m_devFile << " EndGlobalSection" << endl; + m_devFile << " GlobalSection(SolutionProperties) = preSolution" << endl; + m_devFile << " HideSolutionNode = FALSE" << endl; + m_devFile << " EndGlobalSection" << endl; + m_devFile << "EndGlobal" << endl; + + m_devFile << endl << endl; +*/

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