Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[fireball] 29008: - Import new, unchanged vmwinst from trunk.
by fireball＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: fireball Date: Tue Sep 11 17:09:33 2007 New Revision: 29008 URL: http://svn.reactos.org/svn/reactos?rev=29008&view=rev Log: - Import new, unchanged vmwinst from trunk. Added: branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/ - copied from r29006, trunk/reactos/base/setup/vmwinst/

1 0

[fireball] 29007: - Delete old vmwinst.
by fireball＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: fireball Date: Tue Sep 11 17:08:06 2007 New Revision: 29007 URL: http://svn.reactos.org/svn/reactos?rev=29007&view=rev Log: - Delete old vmwinst. Removed: branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/

1 0

[gedmurphy] 29006: delete comments
by gedmurphy＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: gedmurphy Date: Tue Sep 11 17:06:20 2007 New Revision: 29006 URL: http://svn.reactos.org/svn/reactos?rev=29006&view=rev Log: delete comments Modified: trunk/reactos/base/services/tcpsvcs/skelserver.c Modified: trunk/reactos/base/services/tcpsvcs/skelserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/skel… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/skelserver.c (original) +++ trunk/reactos/base/services/tcpsvcs/skelserver.c Tue Sep 11 17:06:20 2007 @@ -37,17 +37,6 @@ return INVALID_SOCKET; } -/* note: consider allowing a maximum number of connections - * A number of threads can be allocated and worker threads will - * only be spawned if a free space is available - -typedef struct _WORKER_THREAD { - DWORD num; - BOOL available; - HANDLE hThread; -} WORKER_THREAD; - -*/ static VOID AcceptConnections(SOCKET ListeningSocket, @@ -62,13 +51,13 @@ INT nAddrSize = sizeof(Client); DWORD ThreadID; TCHAR buf[256]; - INT TimeOut = 2000; // 2 seconds + INT TimeOut = 2000; /* set timeout values */ TimeVal.tv_sec = TimeOut / 1000; TimeVal.tv_usec = TimeOut % 1000; - while (! bShutDown) // (i<MAX_CLIENTS && !bShutDown) + while (!bShutDown) { INT SelRet = 0;

1 0

[gedmurphy] 29005: - Send the SERVICE_STATUS_HANDLE to the SCM so SetServiceStatus has something to work with - Add control code to stop, pause and resume services and forward it onto the service control handler
by gedmurphy＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: gedmurphy Date: Tue Sep 11 16:59:38 2007 New Revision: 29005 URL: http://svn.reactos.org/svn/reactos?rev=29005&view=rev Log: - Send the SERVICE_STATUS_HANDLE to the SCM so SetServiceStatus has something to work with - Add control code to stop, pause and resume services and forward it onto the service control handler Modified: trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Tue Sep 11 16:59:38 2007 @@ -21,7 +21,7 @@ handle_t BindingHandle = NULL; -static VOID +VOID HandleBind(VOID) { LPWSTR pszStringBinding; @@ -1987,38 +1987,6 @@ return TRUE; } -/********************************************************************** - * SetServiceStatus - * - * @implemented - */ -BOOL STDCALL -SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus, - LPSERVICE_STATUS lpServiceStatus) -{ - DWORD dwError; - - DPRINT("SetServiceStatus() called\n"); - DPRINT("ThreadId %lu, data addr %p called\n", hServiceStatus, lpServiceStatus); - - HandleBind(); - - /* Call to services.exe using RPC */ - dwError = ScmrSetServiceStatus(BindingHandle, - (unsigned long)hServiceStatus, - lpServiceStatus); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrSetServiceStatus() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("SetServiceStatus() done (ret %lu\n", dwError); - - return TRUE; -} - /********************************************************************** * StartServiceA Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c Tue Sep 11 16:59:38 2007 @@ -20,9 +20,11 @@ /* TYPES *********************************************************************/ +VOID HandleBind(VOID); + typedef struct _ACTIVE_SERVICE { - DWORD ThreadId; + SERVICE_STATUS_HANDLE hServiceStatus; UNICODE_STRING ServiceName; union { @@ -40,6 +42,7 @@ /* GLOBALS *******************************************************************/ +extern handle_t BindingHandle; static DWORD dwActiveServiceCount = 0; static PACTIVE_SERVICE lpActiveServices = NULL; @@ -64,25 +67,6 @@ return NULL; } -/* -static PACTIVE_SERVICE -ScLookupServiceByThreadId(DWORD ThreadId) -{ - DWORD i; - - for (i = 0; i < dwActiveServiceCount; i++) - { - if (lpActiveServices[i].ThreadId == ThreadId) - { - return &lpActiveServices[i]; - } - } - - SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - - return NULL; -} -*/ static DWORD WINAPI ScServiceMainStub(LPVOID Context) @@ -213,7 +197,6 @@ ScConnectControlPipe(HANDLE *hPipe) { DWORD dwBytesWritten; - DWORD dwProcessId; DWORD dwState; if (!WaitNamedPipeW(L"\\\\.\\pipe\\net\\NtControlPipe", 15000)) @@ -243,14 +226,14 @@ return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; } - dwProcessId = GetCurrentProcessId(); + /* HACK: send the SERVICE_STATUS_HANDLE handle */ WriteFile(*hPipe, - &dwProcessId, - sizeof(DWORD), + (DWORD *)&lpActiveServices->hServiceStatus, + sizeof(SERVICE_STATUS_HANDLE), &dwBytesWritten, NULL); - DPRINT("Sent process id %lu\n", dwProcessId); + DPRINT("Sent SERVICE_STATUS_HANDLE handle %lu\n", lpActiveServices->hServiceStatus); return ERROR_SUCCESS; } @@ -262,6 +245,7 @@ { PACTIVE_SERVICE lpService; HANDLE ThreadHandle; + DWORD ThreadId; DPRINT("ScStartService() called\n"); DPRINT("Size: %lu\n", ControlPacket->dwSize); @@ -281,17 +265,56 @@ ControlPacket->szArguments, ControlPacket->dwSize * sizeof(WCHAR)); + /* invoke the services entry point and implement the command loop */ ThreadHandle = CreateThread(NULL, 0, ScServiceMainStub, lpService, CREATE_SUSPENDED, - &lpService->ThreadId); + &ThreadId); if (ThreadHandle == NULL) return ERROR_SERVICE_NO_THREAD; ResumeThread(ThreadHandle); CloseHandle(ThreadHandle); + + return ERROR_SUCCESS; +} + + +static DWORD +ScControlService(PSCM_CONTROL_PACKET ControlPacket) +{ + PACTIVE_SERVICE lpService; + + DPRINT("ScControlService() called\n"); + DPRINT("Size: %lu\n", ControlPacket->dwSize); + DPRINT("Service: %S\n", &ControlPacket->szArguments[0]); + + lpService = ScLookupServiceByServiceName(&ControlPacket->szArguments[0]); + if (lpService == NULL) + return ERROR_SERVICE_DOES_NOT_EXIST; + + if (lpService->HandlerFunction) + { + DPRINT("Calling HandlerFunction with %lu\n", ControlPacket->dwControl); + (lpService->HandlerFunction)(ControlPacket->dwControl); + } + else if (lpService->HandlerFunctionEx) + { + DPRINT("Calling HandlerFunctionEx with %lu\n", ControlPacket->dwControl); + /* FIXME: send correct params */ + (lpService->HandlerFunctionEx)(ControlPacket->dwControl, 0, NULL, NULL); + } + + if (ControlPacket->dwControl == SERVICE_CONTROL_STOP) + { + HeapFree(GetProcessHeap(), + 0, + lpService->Arguments); + } + + DPRINT("ScControlService() done\n"); return ERROR_SUCCESS; } @@ -333,19 +356,20 @@ switch (ControlPacket->dwControl) { case SERVICE_CONTROL_START: - DPRINT("Start command\n"); + DPRINT("Start command - recieved SERVICE_CONTROL_START\n"); if (ScStartService(ControlPacket) == ERROR_SUCCESS) dwRunningServices++; break; case SERVICE_CONTROL_STOP: - DPRINT("Stop command\n"); - dwRunningServices--; + DPRINT("Stop command - recieved SERVICE_CONTROL_STOP\n"); + if (ScControlService(ControlPacket) == ERROR_SUCCESS) + dwRunningServices--; break; default: - DPRINT1("Unknown command %lu", ControlPacket->dwControl); - break; + DPRINT("Unknown command %lu", ControlPacket->dwControl); + continue; } if (dwRunningServices == 0) @@ -409,7 +433,9 @@ Service->HandlerFunction = lpHandlerProc; Service->HandlerFunctionEx = NULL; - return (SERVICE_STATUS_HANDLE)Service->ThreadId; + DPRINT("RegisterServiceCtrlHandler returning %lu\n", Service->hServiceStatus); + + return Service->hServiceStatus; } @@ -456,6 +482,7 @@ { PACTIVE_SERVICE Service; + /* FIXME: WinXP can start services with incorrect names */ Service = ScLookupServiceByServiceName(lpServiceName); if (Service == NULL) { @@ -466,7 +493,9 @@ Service->HandlerFunctionEx = lpHandlerProc; Service->HandlerContext = lpContext; - return (SERVICE_STATUS_HANDLE)Service->ThreadId; + DPRINT("RegisterServiceCtrlHandlerEx returning %lu", Service->hServiceStatus); + + return Service->hServiceStatus; } @@ -487,6 +516,39 @@ /********************************************************************** + * SetServiceStatus + * + * @implemented + */ +BOOL STDCALL +SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus, + LPSERVICE_STATUS lpServiceStatus) +{ + DWORD dwError; + + DPRINT("SetServiceStatus() called\n"); + DPRINT("hServiceStatus %lu\n", hServiceStatus); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrSetServiceStatus(BindingHandle, + (unsigned long)hServiceStatus, + lpServiceStatus); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrSetServiceStatus() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + DPRINT("SetServiceStatus() done (ret %lu)\n", dwError); + + return TRUE; +} + + +/********************************************************************** * StartServiceCtrlDispatcherA * * @unimplemented @@ -522,6 +584,7 @@ RtlCreateUnicodeStringFromAsciiz(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); lpActiveServices[i].Main.lpFuncA = lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].hServiceStatus = (SERVICE_STATUS_HANDLE)&lpActiveServices[i]; lpActiveServices[i].bUnicode = FALSE; } @@ -599,6 +662,7 @@ RtlCreateUnicodeString(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); lpActiveServices[i].Main.lpFuncW = lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].hServiceStatus = (SERVICE_STATUS_HANDLE)&lpActiveServices[i]; lpActiveServices[i].bUnicode = TRUE; }

1 0

[gedmurphy] 29004: - store the SERVICE_STATUS_HANDLE and use it for setting service status - add functionality for controlling services
by gedmurphy＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: gedmurphy Date: Tue Sep 11 16:56:22 2007 New Revision: 29004 URL: http://svn.reactos.org/svn/reactos?rev=29004&view=rev Log: - store the SERVICE_STATUS_HANDLE and use it for setting service status - add functionality for controlling services Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Tue Sep 11 16:56:22 2007 @@ -27,6 +27,7 @@ /* FUNCTIONS *****************************************************************/ + PSERVICE ScmGetServiceEntryByName(LPWSTR lpServiceName) { @@ -115,13 +116,13 @@ PSERVICE -ScmGetServiceEntryByThreadId(ULONG ThreadId) +ScmGetServiceEntryByServiceStatusHandle(ULONG Handle) { PLIST_ENTRY ServiceEntry; PSERVICE CurrentService; - DPRINT("ScmGetServiceEntryByThreadId() called\n"); - DPRINT("Finding ThreadId %lu\n", ThreadId); + DPRINT("ScmGetServiceEntryByServiceStatusHandle() called\n"); + DPRINT("looking for %lu\n", Handle); ServiceEntry = ServiceListHead.Flink; while (ServiceEntry != &ServiceListHead) @@ -129,10 +130,10 @@ CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); - DPRINT("Found threadId %lu\n", CurrentService->ThreadId); - if (CurrentService->ThreadId == ThreadId) - { - DPRINT("Found service: '%S'\n", CurrentService->lpDisplayName); + + if (CurrentService->hServiceStatus == Handle) + { + DPRINT1("Found service: '%S'\n", CurrentService->lpDisplayName); return CurrentService; } @@ -567,21 +568,27 @@ { PSCM_CONTROL_PACKET ControlPacket; DWORD Count; + DWORD TotalLength; DPRINT("ScmControlService() called\n"); - ControlPacket = (SCM_CONTROL_PACKET*) HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(SCM_CONTROL_PACKET)); + TotalLength = wcslen(Service->lpServiceName) + 1; + + ControlPacket = (SCM_CONTROL_PACKET*)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SCM_CONTROL_PACKET) + (TotalLength * sizeof(WCHAR))); if (ControlPacket == NULL) return ERROR_NOT_ENOUGH_MEMORY; ControlPacket->dwControl = dwControl; + + ControlPacket->dwSize = TotalLength; + wcscpy(&ControlPacket->szArguments[0], Service->lpServiceName); /* Send the start command */ WriteFile(Service->ControlPipeHandle, ControlPacket, - sizeof(SCM_CONTROL_PACKET), + sizeof(SCM_CONTROL_PACKET) + (TotalLength * sizeof(WCHAR)), &Count, NULL); @@ -591,6 +598,10 @@ HeapFree(GetProcessHeap(), 0, ControlPacket); + + RtlCopyMemory(lpServiceStatus, + &Service->Status, + sizeof(SERVICE_STATUS)); DPRINT("ScmControlService) done\n"); @@ -609,7 +620,7 @@ PWSTR Ptr; DWORD Count; - DPRINT("ScmSendStartCommand() called\n"); + DPRINT1("ScmSendStartCommand() called\n"); /* Calculate the total length of the start command line */ TotalLength = wcslen(Service->lpServiceName) + 1; @@ -776,14 +787,13 @@ if (ConnectNamedPipe(Service->ControlPipeHandle, NULL) ? TRUE : (dwError = GetLastError()) == ERROR_PIPE_CONNECTED) { - DWORD dwProcessId = 0; DWORD dwRead = 0; DPRINT("Control pipe connected!\n"); - /* Read thread id from pipe */ + /* Read SERVICE_STATUS_HANDLE from pipe */ if (!ReadFile(Service->ControlPipeHandle, - (LPVOID)&dwProcessId, + (LPVOID)&Service->hServiceStatus, sizeof(DWORD), &dwRead, NULL)) @@ -794,7 +804,8 @@ } else { - DPRINT("Received process id %lu\n", dwProcessId); + DPRINT("Received service status %lu\n", Service->hServiceStatus); + DPRINT("calling ScmSendStartCommand on %S\n", Service->lpDisplayName); /* Send start command */ dwError = ScmSendStartCommand(Service, lpArgs); Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Tue Sep 11 16:56:22 2007 @@ -717,7 +717,7 @@ if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; - lpService = ScmGetServiceEntryByThreadId((ULONG)hServiceStatus); + lpService = ScmGetServiceEntryByServiceStatusHandle((ULONG)hServiceStatus); if (lpService == NULL) { DPRINT1("lpService == NULL!\n"); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h (original) +++ trunk/reactos/base/system/services/services.h Tue Sep 11 16:56:22 2007 @@ -41,6 +41,7 @@ BOOL bDeleted; DWORD dwResumeCount; + SERVICE_STATUS_HANDLE hServiceStatus; SERVICE_STATUS Status; DWORD dwStartType; DWORD dwErrorControl; @@ -104,7 +105,7 @@ PSERVICE ScmGetServiceEntryByName(LPWSTR lpServiceName); PSERVICE ScmGetServiceEntryByDisplayName(LPWSTR lpDisplayName); PSERVICE ScmGetServiceEntryByResumeCount(DWORD dwResumeCount); -PSERVICE ScmGetServiceEntryByThreadId(ULONG ThreadId); +PSERVICE ScmGetServiceEntryByServiceStatusHandle(ULONG ThreadId); DWORD ScmCreateNewServiceRecord(LPWSTR lpServiceName, PSERVICE *lpServiceRecord); DWORD ScmMarkServiceForDelete(PSERVICE pService);

1 0

[fireball] 29003: - Merge 29002.
by fireball＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: fireball Date: Tue Sep 11 16:31:30 2007 New Revision: 29003 URL: http://svn.reactos.org/svn/reactos?rev=29003&view=rev Log: - Merge 29002. Modified: branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/common.c branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/create.c Modified: branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/common.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dr… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/common.c (original) +++ branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/common.c Tue Sep 11 16:31:30 2007 @@ -199,6 +199,9 @@ NewStatus = IoVerifyVolume(DeviceToVerify, FALSE); DPRINT1("IoVerifyVolume() retuned (Status %lx)\n", NewStatus); + + if (NewStatus == STATUS_SUCCESS || NewStatus == STATUS_WRONG_VOLUME) + Status = STATUS_SUCCESS; } DPRINT("Returning Status %x\n", Status); Modified: branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dr… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/create.c (original) +++ branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/create.c Tue Sep 11 16:31:30 2007 @@ -141,6 +141,10 @@ DPRINT ("Status %lx\n", Status); if (!NT_SUCCESS(Status)) { + if (Status == STATUS_NO_MEDIA_IN_DEVICE || Status == STATUS_VERIFY_REQUIRED) + { + DeviceExt->VolumeDevice->Flags |= DO_VERIFY_VOLUME; + } DPRINT1 ("Status %lx\n", Status); return Status; }

1 0

[fireball] 29002: - When media is changed, set VolumeDevice's DO_VERIFY_VOLUME flag so it actually gets verified. - IoVerifyVolume() actually gives two successful statuses - STATUS_SUCCESS and STATUS_WRONG_VOLUME. Respect that when processing an device ioctl. - "Inability to change CD after boot" issue is fixed.
by fireball＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: fireball Date: Tue Sep 11 14:29:03 2007 New Revision: 29002 URL: http://svn.reactos.org/svn/reactos?rev=29002&view=rev Log: - When media is changed, set VolumeDevice's DO_VERIFY_VOLUME flag so it actually gets verified. - IoVerifyVolume() actually gives two successful statuses - STATUS_SUCCESS and STATUS_WRONG_VOLUME. Respect that when processing an device ioctl. - "Inability to change CD after boot" issue is fixed. Modified: trunk/reactos/drivers/filesystems/cdfs/common.c trunk/reactos/drivers/filesystems/cdfs/create.c Modified: trunk/reactos/drivers/filesystems/cdfs/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/common.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/common.c Tue Sep 11 14:29:03 2007 @@ -199,6 +199,9 @@ NewStatus = IoVerifyVolume(DeviceToVerify, FALSE); DPRINT1("IoVerifyVolume() returned (Status %lx)\n", NewStatus); + + if (NewStatus == STATUS_SUCCESS || NewStatus == STATUS_WRONG_VOLUME) + Status = STATUS_SUCCESS; } DPRINT("Returning Status %x\n", Status); Modified: trunk/reactos/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/create.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/create.c Tue Sep 11 14:29:03 2007 @@ -141,6 +141,10 @@ DPRINT ("Status %lx\n", Status); if (!NT_SUCCESS(Status)) { + if (Status == STATUS_NO_MEDIA_IN_DEVICE || Status == STATUS_VERIFY_REQUIRED) + { + DeviceExt->VolumeDevice->Flags |= DO_VERIFY_VOLUME; + } DPRINT1 ("Status %lx\n", Status); return Status; }

1 0

[dreimer] 29001: RosBE 0.3.8 is released. Update and Clean up the Changelog and wipe the Subreleases out of the history.
by dreimer＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: dreimer Date: Tue Sep 11 12:19:39 2007 New Revision: 29001 URL: http://svn.reactos.org/svn/reactos?rev=29001&view=rev Log: RosBE 0.3.8 is released. Update and Clean up the Changelog and wipe the Subreleases out of the history. Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Tue Sep 11 12:19:39 2007 @@ -1,30 +1,22 @@ -*** Oct XXth, 2007 - RosBE 0.3.8 Released +*** Sep 11th, 2007 - RosBE 0.3.8 Released -- Added DrFred's Config Tool. (Daniel Reimer) -- Added ShortCut Tool. (Daniel Reimer) -- Updated w32api-3.9 to w32api-3.10. (except float.h which breaks build) (Daniel Reimer) -- Updated mingw-runtime-3.12 to mingw-runtime-3.13. (Daniel Reimer) -- Other small Bugfixes (Daniel Reimer) -- Updated to NSIS 2.30. (Daniel Reimer) -- Updated Binutils 2.17.50 to Build 20070806 (Daniel Reimer) +- Updated: w32api-3.9 to w32api-3.10. (except float.h which breaks build) (Daniel Reimer) +- Updated: mingw-runtime-3.12 to mingw-runtime-3.13. (Daniel Reimer) +- Updated: to NSIS 2.30. (Daniel Reimer) +- Updated: Binutils 2.17.50 to Build 20070806 (Daniel Reimer) - Updated: GCC 4.1.3 Build 20070829 (Daniel Reimer) - -*** Aug XXst, 2007 - RosBE 0.3.7.2 Released (Unsupported) - -- Updated NASM to 0.99.02 (Daniel Reimer, David Leon) -- Updated Binutils 2.17.50 to Build 20070730 (Hervé Poussineau, David Leon, Daniel Reimer) - (Small modification by Hervé Poussineau in LD to fix Bug 1244) -- Fixed the double \\ Bug introduced in 0.3.7. (Daniel Reimer) -- Added Build Begin Time into Topic. (Daniel Reimer) -- Added svnversion. (Daniel Reimer) -- Updated Tools. (Daniel Reimer) +- Updated: SVN 1.44 -> 1.45. (Daniel Reimer) +- Updated: NASM to 0.99.02 (Daniel Reimer, David Leon) +- Updated: Tools. (Daniel Reimer) +- Added: DrFred's Config Tool. (Daniel Reimer) +- Added: ShortCut Tool. (Daniel Reimer) +- Added: Build Begin Time into Topic. (Daniel Reimer) +- Added: svnversion. (Daniel Reimer) +- Fixed: Double \\ Bug introduced in 0.3.7. (Daniel Reimer) +- Fixed: "No SVN Tree found" message in Vista. (Daniel Reimer) +- Fixed: DOZENS of bugs/stupid coded parts/things you could get easier... (Daniel Reimer) - sSVN asks you if you wanna update if Offline Source Tree is old. (Daniel Reimer) -- Fixed DOZENS of bugs/stupid coded parts/things you could get easier... (Daniel Reimer) - Add a new option called update to Config.cmd and add some security stuff. (Daniel Reimer) - -*** July 26th, 2007 - RosBE 0.3.7.1 Released - -- Fixed: "No SVN Tree found" message in Vista. (Daniel Reimer) - All commands use the current dir now. SO you can use several SVN Source Trees now. (Daniel Reimer) *** July 22nd, 2007 - RosBE 0.3.7 Released

1 0

[hpoussin] 29000: Rename strFile/strDirectory to a more meaningful name, and move them to appropriate place
by hpoussin＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: hpoussin Date: Tue Sep 11 11:14:32 2007 New Revision: 29000 URL: http://svn.reactos.org/svn/reactos?rev=29000&view=rev Log: Rename strFile/strDirectory to a more meaningful name, and move them to appropriate place Modified: trunk/reactos/tools/rbuild/backend/backend.cpp trunk/reactos/tools/rbuild/backend/backend.h trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.h trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/backend.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/backe… ============================================================================== --- trunk/reactos/tools/rbuild/backend/backend.cpp (original) +++ trunk/reactos/tools/rbuild/backend/backend.cpp Tue Sep 11 11:14:32 2007 @@ -79,3 +79,48 @@ Backend::~Backend() { } + +string +Backend::GetFullPath ( const FileLocation& file ) const +{ + string directory; + switch ( file.directory ) + { + case SourceDirectory: + directory = ""; + break; + case IntermediateDirectory: + directory = Environment::GetIntermediatePath (); + break; + case OutputDirectory: + directory = Environment::GetOutputPath (); + break; + case InstallDirectory: + directory = Environment::GetInstallPath (); + break; + default: + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid directory %d.", + file.directory ); + } + + if ( file.relative_path.length () > 0 ) + { + if ( directory.length () > 0 ) + directory += sSep; + directory += file.relative_path; + } + return directory; +} + +string +Backend::GetFullName ( const FileLocation& file ) const +{ + string directory = GetFullPath ( file ); + + if ( directory.length () > 0 ) + directory += sSep; + + return directory + file.name; +} Modified: trunk/reactos/tools/rbuild/backend/backend.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/backe… ============================================================================== --- trunk/reactos/tools/rbuild/backend/backend.h (original) +++ trunk/reactos/tools/rbuild/backend/backend.h Tue Sep 11 11:14:32 2007 @@ -69,6 +69,8 @@ public: virtual ~Backend(); + virtual std::string GetFullName ( const FileLocation& file ) const; + virtual std::string GetFullPath ( const FileLocation& file ) const; virtual void Process () = 0; Project& ProjectNode; Configuration& configuration; Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Tue Sep 11 11:14:32 2007 @@ -35,12 +35,12 @@ typedef set<string> set_string; string -strDirectory ( const FileLocation *file ) -{ - MingwModuleHandler::PassThruCacheDirectory ( file ); +MingwBackend::GetFullPath ( const FileLocation& file ) const +{ + MingwModuleHandler::PassThruCacheDirectory ( &file ); string directory; - switch ( file->directory ) + switch ( file.directory ) { case SourceDirectory: directory = ""; @@ -60,23 +60,24 @@ default: throw InvalidOperationException ( __FILE__, __LINE__, - "Invalid directory." ); - } - - if ( file->relative_path.length () > 0 ) + "Invalid directory %d.", + file.directory ); + } + + if ( file.relative_path.length () > 0 ) { if ( directory.length () > 0 ) directory += sSep; - directory += file->relative_path; + directory += file.relative_path; } return directory; } string -strFile ( const FileLocation *file ) +MingwBackend::GetFullName ( const FileLocation& file ) const { string directory; - switch ( file->directory ) + switch ( file.directory ) { case SourceDirectory: directory = ""; @@ -96,25 +97,25 @@ default: throw InvalidOperationException ( __FILE__, __LINE__, - "Invalid directory." ); - } - - if ( file->relative_path.length () > 0 ) + "Invalid directory %d.", + file.directory ); + } + + if ( file.relative_path.length () > 0 ) { if ( directory.length () > 0 ) directory += sSep; - directory += file->relative_path; + directory += file.relative_path; } if ( directory.length () > 0 ) directory += sSep; - return directory + file->name; -} - - -string -v2s ( const vector<FileLocation>& files, int wrap_at ) + return directory + file.name; +} + +string +v2s ( const Backend* backend, const vector<FileLocation>& files, int wrap_at ) { if ( !files.size() ) return ""; @@ -127,7 +128,7 @@ s += " \\\n\t\t"; else if ( s.size() ) s += " "; - s += strFile ( &file ); + s += backend->GetFullName ( file ); } return s; } @@ -587,7 +588,7 @@ { if ( dependencies.length () > 0 ) dependencies += " "; - dependencies += strFile ( module.dependency ); + dependencies += GetFullName ( *module.dependency ); } } return dependencies; @@ -1184,15 +1185,15 @@ { fprintf ( fMakefile, "%s: %s | %s\n", - strFile( &target ).c_str (), - strFile( &source ).c_str (), - strDirectory( &target ).c_str () ); + GetFullName ( target ).c_str (), + GetFullName ( source ).c_str (), + GetFullPath ( target ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, "\t${cp} %s %s 1>$(NUL)\n", - strFile( &source ).c_str (), - strFile( &target ).c_str () ); + GetFullName ( source ).c_str (), + GetFullName ( target ).c_str () ); } void @@ -1257,7 +1258,7 @@ registry_files.push_back ( FileLocation ( InstallDirectory, system32ConfigDirectory, "software" ) ); registry_files.push_back ( FileLocation ( InstallDirectory, system32ConfigDirectory, "system" ) ); - return v2s( registry_files, 6 ); + return v2s( this, registry_files, 6 ); } void @@ -1274,12 +1275,12 @@ "%s: %s %s $(MKHIVE_TARGET)\n", registryTargetFiles.c_str (), registrySourceFiles.c_str (), - strDirectory ( &system32 ).c_str () ); + GetFullPath ( system32 ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, "\t$(MKHIVE_TARGET) boot%cbootdata %s boot%cbootdata%chiveinst.inf\n", - cSep, strDirectory ( &system32 ).c_str (), + cSep, GetFullPath ( system32 ).c_str (), cSep, cSep ); fprintf ( fMakefile, "\n" ); @@ -1290,7 +1291,7 @@ { vector<FileLocation> vInstallTargetFiles; GetInstallTargetFiles ( vInstallTargetFiles ); - string installTargetFiles = v2s ( vInstallTargetFiles, 5 ); + string installTargetFiles = v2s ( this, vInstallTargetFiles, 5 ); string registryTargetFiles = GetRegistryTargetFiles (); fprintf ( fMakefile, Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h Tue Sep 11 11:14:32 2007 @@ -30,7 +30,7 @@ class MingwModuleHandler; extern std::string -v2s ( const std::vector<FileLocation>& files, int wrap_at ); +v2s ( const Backend* backend, const std::vector<FileLocation>& files, int wrap_at ); extern std::string v2s ( const string_list& v, int wrap_at ); @@ -54,6 +54,10 @@ Directory* intermediateDirectory; Directory* outputDirectory; Directory* installDirectory; + + std::string GetFullName ( const FileLocation& file ) const; + std::string GetFullPath ( const FileLocation& file ) const; + private: void CreateMakefile (); void CloseMakefile () const; Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Sep 11 11:14:32 2007 @@ -25,17 +25,12 @@ using std::string; using std::vector; -#define CLEAN_FILE(f) clean_files.push_back ( (f)->name.length () > 0 ? strFile ( f ) : strDirectory ( f ) ); +#define CLEAN_FILE(f) clean_files.push_back ( (f).name.length () > 0 ? backend->GetFullName ( f ) : backend->GetFullPath ( f ) ); MingwBackend* MingwModuleHandler::backend = NULL; FILE* MingwModuleHandler::fMakefile = NULL; - -extern string -strDirectory ( const FileLocation *file ); -extern string -strFile ( const FileLocation *file ); string PrefixFilename ( @@ -135,7 +130,7 @@ if ( pclean_files ) { string_list& clean_files = *pclean_files; - CLEAN_FILE ( target ); + CLEAN_FILE ( *target ); } return target; } @@ -149,7 +144,7 @@ if ( pclean_files ) { string_list& clean_files = *pclean_files; - CLEAN_FILE ( target ); + CLEAN_FILE ( *target ); } return target; } @@ -314,11 +309,11 @@ if ( extension == ".idl" || extension == ".IDL" ) { if ( (module.type == RpcServer) || (module.type == RpcClient) ) - return strFile ( GetRpcServerHeaderFilename ( file ) ) + return backend->GetFullName ( *GetRpcServerHeaderFilename ( file ) ) + " " - + strFile ( GetRpcClientHeaderFilename ( file ) ); + + backend->GetFullName ( *GetRpcClientHeaderFilename ( file ) ); else if ( module.type == IdlHeader ) - return strFile ( GetIdlHeaderFilename ( file ) ); + return backend->GetFullName ( *GetIdlHeaderFilename ( file ) ); else return ""; } @@ -336,7 +331,7 @@ for ( size_t i = 0; i < compilationUnit.files.size (); i++ ) { File& file = *compilationUnit.files[i]; - sourceFiles.push_back ( strFile ( &file.file ) ); + sourceFiles.push_back ( backend->GetFullName ( file.file ) ); } return v2s ( sourceFiles, 10 ); } @@ -381,8 +376,8 @@ "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, "\t${cp} %s %s 1>$(NUL)\n", - strFile ( &source ).c_str (), - strFile ( PassThruCacheDirectory ( &destination ) ).c_str () ); + backend->GetFullName ( source ).c_str (), + backend->GetFullName ( *PassThruCacheDirectory ( &destination ) ).c_str () ); } string @@ -393,7 +388,7 @@ if ( ReferenceObjects ( importedModule ) ) dep = GetTargetMacro ( importedModule ); else - dep = strFile ( GetImportLibraryFilename ( importedModule, NULL ) ); + dep = backend->GetFullName ( *GetImportLibraryFilename ( importedModule, NULL ) ); return dep; } @@ -434,7 +429,7 @@ for ( size_t i = 0; i < v.size (); i++ ) { const FileLocation& file = v[i]; - dependencies.push_back ( strFile ( &file ) ); + dependencies.push_back ( backend->GetFullName ( file ) ); } } @@ -524,7 +519,7 @@ if ( pclean_files ) { string_list& clean_files = *pclean_files; - CLEAN_FILE ( obj_file ); + CLEAN_FILE ( *obj_file ); } return obj_file; } @@ -580,7 +575,7 @@ fprintf ( fMakefile, "%s_install: %s\n", module.name.c_str (), - strFile ( module.install ).c_str () ); + backend->GetFullName ( *module.install ).c_str () ); } void @@ -611,7 +606,7 @@ { if ( objectFilenames.size () > 0 ) objectFilenames += " "; - objectFilenames += strFile ( GetObjectFilename ( compilationUnits[i]->GetFilename (), NULL ) ); + objectFilenames += backend->GetFullName ( *GetObjectFilename ( compilationUnits[i]->GetFilename (), NULL ) ); } return objectFilenames; } @@ -672,7 +667,7 @@ Include& include = *includes[i]; if ( parameters.length () > 0 ) parameters += " "; - parameters += "-I" + strDirectory ( include.directory );; + parameters += "-I" + backend->GetFullPath ( *include.directory );; } return parameters; } @@ -763,7 +758,7 @@ { fprintf ( fMakefile, " -I%s", - strDirectory ( GetPrecompiledHeaderFilename () ).c_str () ); + backend->GetFullPath ( *GetPrecompiledHeaderFilename () ).c_str () ); } string compilerParameters = GenerateCompilerParametersFromVector ( data.compilerFlags ); @@ -782,7 +777,7 @@ fprintf ( fMakefile, " -I%s", - strDirectory ( includeDirectory ).c_str() ); + backend->GetFullPath ( *includeDirectory ).c_str() ); } for ( i = 0; i < data.defines.size(); i++ ) { @@ -905,7 +900,7 @@ fprintf ( fMakefile, "%s := %s $(%s)\n", objectsMacro.c_str(), - strFile ( GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ).c_str (), + backend->GetFullName ( *GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ).c_str (), objectsMacro.c_str() ); } } @@ -923,7 +918,7 @@ fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), - strFile ( GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ).c_str () ); + backend->GetFullName ( *GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ).c_str () ); } } fprintf ( fMakefile, "\n" ); @@ -964,7 +959,7 @@ fMakefile, "%s += %s\n", objectsMacro.c_str(), - strFile ( GetObjectFilename ( sourceCompilationUnits[i]->GetFilename (), NULL ) ).c_str () ); + backend->GetFullName ( *GetObjectFilename ( sourceCompilationUnits[i]->GetFilename (), NULL ) ).c_str () ); } CleanupCompilationUnitVector ( sourceCompilationUnits ); } @@ -985,25 +980,25 @@ const string& cc, const string& cflagsMacro ) { - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); if ( extraDependencies != "" ) dependencies += " " + extraDependencies; if ( module.pch && use_pch ) - dependencies += " " + strFile ( GetPrecompiledHeaderFilename () ); + dependencies += " " + backend->GetFullName ( *GetPrecompiledHeaderFilename () ); /* WIDL generated headers may be used */ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); - dependencies += " " + v2s ( rpcDependencies, 5 ); + dependencies += " " + v2s ( backend, rpcDependencies, 5 ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files ); fprintf ( fMakefile, "%s: %s | %s\n", - strFile ( objectFilename ).c_str (), + backend->GetFullName ( *objectFilename ).c_str (), dependencies.c_str (), - strDirectory ( objectFilename ).c_str () ); + backend->GetFullPath ( *objectFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_CC)\n" ); fprintf ( fMakefile, "\t%s -c $< -o $@ %s\n", @@ -1017,16 +1012,16 @@ const string& cc, const string& cflagsMacro ) { - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files ); fprintf ( fMakefile, "%s: %s | %s\n", - strFile ( objectFilename ).c_str (), + backend->GetFullName ( *objectFilename ).c_str (), dependencies.c_str (), - strDirectory ( objectFilename ).c_str () ); + backend->GetFullPath ( *objectFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_GAS)\n" ); fprintf ( fMakefile, "\t%s -x assembler-with-cpp -c $< -o $@ -D__ASM__ %s\n", @@ -1039,16 +1034,16 @@ const FileLocation* sourceFile, const string& nasmflagsMacro ) { - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files ); fprintf ( fMakefile, "%s: %s | %s\n", - strFile ( objectFilename ).c_str (), + backend->GetFullName ( *objectFilename ).c_str (), dependencies.c_str (), - strDirectory ( objectFilename ).c_str () ); + backend->GetFullPath ( *objectFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_NASM)\n" ); fprintf ( fMakefile, "\t%s -f win32 $< -o $@ %s\n", @@ -1061,7 +1056,7 @@ const FileLocation* sourceFile, const string& windresflagsMacro ) { - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files ); @@ -1078,42 +1073,42 @@ fprintf ( fMakefile, "%s: %s $(WRC_TARGET) | %s\n", - strFile ( objectFilename ).c_str (), + backend->GetFullName ( *objectFilename ).c_str (), dependencies.c_str (), - strDirectory ( objectFilename ).c_str () ); + backend->GetFullPath ( *objectFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); fprintf ( fMakefile, "\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n", windresflagsMacro.c_str (), - strFile ( sourceFile ).c_str (), - strFile ( &rciFilename ).c_str () ); + backend->GetFullName ( *sourceFile ).c_str (), + backend->GetFullName ( rciFilename ).c_str () ); fprintf ( fMakefile, "\t$(Q)$(WRC_TARGET) ${%s} %s %s\n", windresflagsMacro.c_str (), - strFile ( &rciFilename ).c_str (), - strFile ( &resFilename ).c_str () ); + backend->GetFullName ( rciFilename ).c_str (), + backend->GetFullName ( resFilename ).c_str () ); fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", - strFile ( &rciFilename ).c_str () ); + backend->GetFullName ( rciFilename ).c_str () ); fprintf ( fMakefile, "\t${windres} %s -o $@\n", - strFile ( &resFilename ).c_str () ); + backend->GetFullName ( resFilename ).c_str () ); fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", - strFile ( &resFilename ).c_str () ); + backend->GetFullName ( resFilename ).c_str () ); } else { fprintf ( fMakefile, "%s: %s $(WRC_TARGET) | %s\n", - strFile ( objectFilename ).c_str (), + backend->GetFullName ( *objectFilename ).c_str (), dependencies.c_str (), - strDirectory ( objectFilename ).c_str () ); + backend->GetFullPath ( *objectFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); fprintf ( fMakefile, "\t${windres} $(%s) %s -o $@\n", windresflagsMacro.c_str (), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( *sourceFile ).c_str () ); } } @@ -1121,41 +1116,41 @@ MingwModuleHandler::GenerateWinebuildCommands ( const FileLocation* sourceFile ) { - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string basename = GetBasename ( sourceFile->name ); FileLocation def_file ( IntermediateDirectory, sourceFile->relative_path, basename + ".spec.def" ); - CLEAN_FILE ( &def_file ); + CLEAN_FILE ( def_file ); FileLocation stub_file ( IntermediateDirectory, sourceFile->relative_path, basename + ".stubs.c" ); - CLEAN_FILE ( &stub_file ); + CLEAN_FILE ( stub_file ); fprintf ( fMakefile, "%s: %s $(WINEBUILD_TARGET) | %s\n", - strFile ( &def_file ).c_str (), + backend->GetFullName ( def_file ).c_str (), dependencies.c_str (), - strDirectory ( &def_file ).c_str () ); + backend->GetFullPath ( def_file ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" ); fprintf ( fMakefile, "\t%s -o %s --def -E %s\n", "$(Q)$(WINEBUILD_TARGET)", - strFile ( &def_file ).c_str (), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( def_file ).c_str (), + backend->GetFullName ( *sourceFile ).c_str () ); fprintf ( fMakefile, "%s: %s $(WINEBUILD_TARGET)\n", - strFile ( &stub_file ).c_str (), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( stub_file ).c_str (), + backend->GetFullName ( *sourceFile ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" ); fprintf ( fMakefile, "\t%s -o %s --pedll %s\n", "$(Q)$(WINEBUILD_TARGET)", - strFile ( &stub_file ).c_str (), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( stub_file ).c_str (), + backend->GetFullName ( *sourceFile ).c_str () ); } string @@ -1189,34 +1184,34 @@ const string& widlflagsMacro ) { const FileLocation* sourceFile = compilationUnit.GetFilename (); - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string basename = GetBasename ( sourceFile->name ); const FileLocation *generatedHeaderFilename = GetRpcServerHeaderFilename ( sourceFile ); - CLEAN_FILE(generatedHeaderFilename); + CLEAN_FILE ( *generatedHeaderFilename ); FileLocation generatedServerFilename ( IntermediateDirectory, sourceFile->relative_path, basename + "_s.c" ); - CLEAN_FILE(&generatedServerFilename); + CLEAN_FILE ( generatedServerFilename ); fprintf ( fMakefile, "%s %s: %s $(WIDL_TARGET) | %s\n", - strFile ( &generatedServerFilename ).c_str (), - strFile ( generatedHeaderFilename ).c_str (), + backend->GetFullName ( generatedServerFilename ).c_str (), + backend->GetFullName ( *generatedHeaderFilename ).c_str (), dependencies.c_str (), - strDirectory ( &generatedServerFilename ).c_str () ); + backend->GetFullPath ( generatedServerFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); fprintf ( fMakefile, "\t%s %s %s -h -H %s -s -S %s %s\n", "$(Q)$(WIDL_TARGET)", GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), - strFile ( generatedHeaderFilename ).c_str (), - strFile ( &generatedServerFilename ).c_str (), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( *generatedHeaderFilename ).c_str (), + backend->GetFullName ( generatedServerFilename ).c_str (), + backend->GetFullName ( *sourceFile ).c_str () ); } const FileLocation* @@ -1239,7 +1234,7 @@ const string& widlflagsMacro ) { const FileLocation* sourceFile = compilationUnit.GetFilename (); - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string basename = GetBasename ( sourceFile->name ); @@ -1252,15 +1247,15 @@ "%s: %s $(WIDL_TARGET) | %s\n", GetTargetMacro ( module ).c_str (), dependencies.c_str (), - strDirectory ( &EmbeddedTypeLibFilename ).c_str () ); + backend->GetFullPath ( EmbeddedTypeLibFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); fprintf ( fMakefile, "\t%s %s %s -t -T %s %s\n", "$(Q)$(WIDL_TARGET)", GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), - strFile ( &EmbeddedTypeLibFilename ).c_str(), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( EmbeddedTypeLibFilename ).c_str(), + backend->GetFullName ( *sourceFile ).c_str () ); } void @@ -1269,34 +1264,34 @@ const string& widlflagsMacro ) { const FileLocation* sourceFile = compilationUnit.GetFilename (); - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string basename = GetBasename ( sourceFile->name ); const FileLocation *generatedHeaderFilename = GetRpcClientHeaderFilename ( sourceFile ); - CLEAN_FILE(generatedHeaderFilename); + CLEAN_FILE ( *generatedHeaderFilename ); FileLocation generatedClientFilename ( IntermediateDirectory, sourceFile->relative_path, basename + "_c.c" ); - CLEAN_FILE(&generatedClientFilename); + CLEAN_FILE ( generatedClientFilename ); fprintf ( fMakefile, "%s %s: %s $(WIDL_TARGET) | %s\n", - strFile ( &generatedClientFilename ).c_str (), - strFile ( generatedHeaderFilename ).c_str (), + backend->GetFullName ( generatedClientFilename ).c_str (), + backend->GetFullName ( *generatedHeaderFilename ).c_str (), dependencies.c_str (), - strDirectory ( &generatedClientFilename ).c_str () ); + backend->GetFullPath ( generatedClientFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); fprintf ( fMakefile, "\t%s %s %s -h -H %s -c -C %s %s\n", "$(Q)$(WIDL_TARGET)", GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), - strFile ( generatedHeaderFilename ).c_str (), - strFile ( &generatedClientFilename ).c_str (), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( *generatedHeaderFilename ).c_str (), + backend->GetFullName ( generatedClientFilename ).c_str (), + backend->GetFullName ( *sourceFile ).c_str () ); } void @@ -1305,27 +1300,27 @@ const string& widlflagsMacro ) { const FileLocation* sourceFile = compilationUnit.GetFilename (); - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string basename = GetBasename ( sourceFile->name ); const FileLocation *generatedHeader = GetIdlHeaderFilename ( sourceFile ); - CLEAN_FILE(generatedHeader); + CLEAN_FILE ( *generatedHeader ); fprintf ( fMakefile, "%s: %s $(WIDL_TARGET) | %s\n", - strFile( generatedHeader ).c_str (), + backend->GetFullName( *generatedHeader ).c_str (), dependencies.c_str (), - strDirectory ( generatedHeader ).c_str () ); + backend->GetFullPath ( *generatedHeader ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); fprintf ( fMakefile, "\t%s %s %s -h -H %s %s\n", "$(Q)$(WIDL_TARGET)", GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), - strFile( generatedHeader ).c_str (), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( *generatedHeader ).c_str (), + backend->GetFullName ( *sourceFile ).c_str () ); } void @@ -1358,7 +1353,7 @@ const string& widlflagsMacro ) { const FileLocation* sourceFile = compilationUnit.GetFilename (); - string filename = strFile ( sourceFile ); + string filename = backend->GetFullName ( *sourceFile ); string extension = GetExtension ( filename ); if ( extension == ".c" || extension == ".C" ) { @@ -1436,14 +1431,14 @@ FileLocation mapFilename ( OutputDirectory, module.output->relative_path, GetBasename ( module.output->name ) + ".map" ); - CLEAN_FILE ( &mapFilename ); + CLEAN_FILE ( mapFilename ); fprintf ( fMakefile, "\t$(ECHO_OBJDUMP)\n" ); fprintf ( fMakefile, "\t$(Q)${objdump} -d -S %s > %s\n", - mapTarget ? strFile ( mapTarget ).c_str () : "$@", - strFile ( &mapFilename ).c_str () ); + mapTarget ? backend->GetFullName ( *mapTarget ).c_str () : "$@", + backend->GetFullName ( mapFilename ).c_str () ); fprintf ( fMakefile, "else\n" ); @@ -1454,8 +1449,8 @@ "\t$(ECHO_NM)\n" ); fprintf ( fMakefile, "\t$(Q)${nm} --numeric-sort %s > %s\n", - mapTarget ? strFile ( mapTarget ).c_str () : "$@", - strFile ( &mapFilename ).c_str () ); + mapTarget ? backend->GetFullName ( *mapTarget ).c_str () : "$@", + backend->GetFullName ( mapFilename ).c_str () ); fprintf ( fMakefile, "endif\n" ); @@ -1474,7 +1469,7 @@ FileLocation nostripFilename ( OutputDirectory, module.output->relative_path, GetBasename ( filename ) + ".nostrip" + GetExtension ( filename ) ); - CLEAN_FILE ( &nostripFilename ); + CLEAN_FILE ( nostripFilename ); OutputCopyCommand ( *module.output, nostripFilename ); @@ -1483,7 +1478,8 @@ } void -MergeStringVector ( const vector<FileLocation>& input, +MergeStringVector ( const Backend* backend, + const vector<FileLocation>& input, vector<string>& output ) { int wrap_at = 25; @@ -1499,7 +1495,7 @@ } else if ( s.size () > 0) s += " "; - s += strFile ( &input[i] ); + s += backend->GetFullName ( input[i] ); } if ( s.length () > 0 ) output.push_back ( s ); @@ -1525,7 +1521,8 @@ GetObjectsVector ( module.non_if_data, objectFiles ); vector<string> lines; - MergeStringVector ( objectFiles, + MergeStringVector ( backend, + objectFiles, lines ); for ( size_t i = 0; i < lines.size (); i++ ) { @@ -1568,7 +1565,7 @@ const string& pefixupParameters ) { string target ( GetTargetMacro ( module ) ); - string target_folder ( strDirectory ( GetTargetFilename ( module, NULL ) ) ); + string target_folder ( backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ) ); const FileLocation *definitionFilename = GetDefinitionFilename (); string linkerScriptArgument; @@ -1580,7 +1577,7 @@ fprintf ( fMakefile, "%s: %s %s $(RSYM_TARGET) $(PEFIXUP_TARGET) | %s\n", target.c_str (), - strFile ( definitionFilename ).c_str (), + backend->GetFullName ( *definitionFilename ).c_str (), dependencies.c_str (), target_folder.c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); @@ -1603,13 +1600,13 @@ FileLocation temp_exp ( TemporaryDirectory, "", module.name + ".temp.exp" ); - CLEAN_FILE ( &temp_exp ); + CLEAN_FILE ( temp_exp ); fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-exp %s %s %s\n", targetName.c_str (), - strFile ( definitionFilename ).c_str (), - strFile ( &temp_exp ).c_str (), + backend->GetFullName ( *definitionFilename ).c_str (), + backend->GetFullName ( temp_exp ).c_str (), module.mangledSymbols ? "" : "--kill-at", module.underscoreSymbols ? "--add-underscore" : "" ); @@ -1618,7 +1615,7 @@ linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), - strFile ( &temp_exp ).c_str (), + backend->GetFullName ( temp_exp ).c_str (), target.c_str (), objectsMacro.c_str (), libsMacro.c_str (), @@ -1631,7 +1628,7 @@ fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", - strFile ( &temp_exp ).c_str () ); + backend->GetFullName ( temp_exp ).c_str () ); } else { @@ -1668,7 +1665,7 @@ targetMacro.c_str ()); fprintf ( fMakefile, "%s: | %s\n", targetMacro.c_str (), - strDirectory ( GetTargetFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); } void @@ -1737,23 +1734,23 @@ { const FileLocation& baseHeaderFile = module.pch->file; const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); - CLEAN_FILE(pchFilename); - string dependencies = strFile ( &baseHeaderFile ); + CLEAN_FILE ( *pchFilename ); + string dependencies = backend->GetFullName ( baseHeaderFile ); /* WIDL generated headers may be used */ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); - dependencies += " " + v2s ( rpcDependencies, 5 ); + dependencies += " " + v2s ( backend, rpcDependencies, 5 ); fprintf ( fMakefile, "%s: %s\n", - strFile ( pchFilename ).c_str(), + backend->GetFullName ( *pchFilename ).c_str(), dependencies.c_str() ); fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); fprintf ( fMakefile, "\t%s -o %s %s -g %s\n\n", module.cplusplus ? cppc.c_str() : cc.c_str(), - strFile ( pchFilename ).c_str(), + backend->GetFullName ( *pchFilename ).c_str(), cflagsMacro.c_str(), - strFile ( &baseHeaderFile ).c_str() ); + backend->GetFullName ( baseHeaderFile ).c_str() ); } GenerateObjectFileTargets ( module.non_if_data, @@ -1774,9 +1771,9 @@ fprintf ( fMakefile, "%s: %s | %s\n", - strFile ( archiveFilename ).c_str (), + backend->GetFullName ( *archiveFilename ).c_str (), objs_macro.c_str (), - strDirectory ( archiveFilename ).c_str() ); + backend->GetFullPath ( *archiveFilename ).c_str() ); if ( module.type == StaticLibrary && module.importLibrary ) { @@ -1785,7 +1782,7 @@ fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib $@ %s %s\n", module.importLibrary->dllname.c_str (), - strFile ( definitionFilename ).c_str (), + backend->GetFullName ( *definitionFilename ).c_str (), module.mangledSymbols ? "" : "--kill-at", module.underscoreSymbols ? "--add-underscore" : "" ); } @@ -1843,7 +1840,7 @@ if ( ReferenceObjects ( module ) ) return GetObjectsMacro ( module ); else - return strFile ( GetTargetFilename ( module, NULL ) ).c_str (); + return backend->GetFullName ( *GetTargetFilename ( module, NULL ) ).c_str (); } void @@ -1938,7 +1935,7 @@ for ( size_t i = 0; i < s.size(); i++ ) fprintf ( fMakefile, " %s", - strFile ( &s[i] ).c_str () ); + backend->GetFullName ( s[i] ).c_str () ); fprintf ( fMakefile, "\n" ); } @@ -2036,12 +2033,12 @@ FileLocation proxyMakefile ( OutputDirectory, module.output->relative_path, "makefile" ); - CLEAN_FILE ( &proxyMakefile ); + CLEAN_FILE ( proxyMakefile ); } string targetMacro = GetTargetMacro ( module ); - //CLEAN_FILE ( &targetMacro ); - CLEAN_FILE ( new FileLocation ( SourceDirectory, "", targetMacro ) ); + //CLEAN_FILE ( targetMacro ); + CLEAN_FILE ( FileLocation ( SourceDirectory, "", targetMacro ) ); // generate phony target for module name fprintf ( fMakefile, ".PHONY: %s\n", @@ -2062,7 +2059,7 @@ if ( !ReferenceObjects ( module ) ) { const FileLocation* ar_target = GenerateArchiveTarget ( ar, objectsMacro ); - CLEAN_FILE ( ar_target ); + CLEAN_FILE ( *ar_target ); } GenerateObjectFileTargets ( cc, @@ -2130,11 +2127,11 @@ invoke_targets[i].c_str () ); fprintf ( fMakefile, ": %s\n", - NormalizeFilename ( strFile ( invoke.invokeModule->output ) ).c_str () ); + NormalizeFilename ( backend->GetFullName ( *invoke.invokeModule->output ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_INVOKE)\n" ); fprintf ( fMakefile, "\t%s %s\n\n", - NormalizeFilename ( strFile ( invoke.invokeModule->output ) ).c_str (), + NormalizeFilename ( backend->GetFullName ( *invoke.invokeModule->output ) ).c_str (), invoke.GetParameters ().c_str () ); } } @@ -2190,7 +2187,7 @@ { fprintf ( fMakefile, "%s: ${%s}\n", - strFile ( &sourceFilenames[i] ).c_str (), + backend->GetFullName ( sourceFilenames[i] ).c_str (), preconditionDependenciesName.c_str ()); } fprintf ( fMakefile, "\n" ); @@ -2239,24 +2236,24 @@ fprintf ( fMakefile, "# IMPORT LIBRARY RULE:\n" ); fprintf ( fMakefile, "%s: %s", - strFile ( library_target ).c_str (), - strFile ( defFilename ).c_str () ); + backend->GetFullName ( *library_target ).c_str (), + backend->GetFullName ( *defFilename ).c_str () ); size_t i, iend = deps.size(); for ( i = 0; i < iend; i++ ) fprintf ( fMakefile, " %s", - strFile ( &deps[i] ).c_str () ); + backend->GetFullName ( deps[i] ).c_str () ); fprintf ( fMakefile, " | %s\n", - strDirectory ( GetImportLibraryFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *GetImportLibraryFilename ( module, NULL ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" ); fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib %s %s %s\n\n", module.output->name.c_str (), - strFile ( defFilename ).c_str (), - strFile ( library_target ).c_str (), + backend->GetFullName ( *defFilename ).c_str (), + backend->GetFullName ( *library_target ).c_str (), module.mangledSymbols ? "" : "--kill-at", module.underscoreSymbols ? "--add-underscore" : "" ); } @@ -2373,7 +2370,7 @@ targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), - strDirectory(GetTargetFilename(module,NULL)).c_str () ); + backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); fprintf ( fMakefile, "\t%s %s -o $@ %s %s\n\n", @@ -3001,7 +2998,7 @@ FileLocation junk_tmp ( TemporaryDirectory, "", module.name + ".junk.tmp" ); - CLEAN_FILE ( &junk_tmp ); + CLEAN_FILE ( junk_tmp ); string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); string libsMacro = GetLibsMacro (); @@ -3012,23 +3009,23 @@ targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), - strDirectory(GetTargetFilename(module,NULL)).c_str () ); + backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); fprintf ( fMakefile, "\t${ld} %s -N -Ttext=0x8000 -o %s %s %s\n", GetLinkerMacro ().c_str (), - strFile ( &junk_tmp ).c_str (), + backend->GetFullName ( junk_tmp ).c_str (), objectsMacro.c_str (), linkDepsMacro.c_str () ); fprintf ( fMakefile, "\t${objcopy} -O binary %s $@\n", - strFile ( &junk_tmp ).c_str () ); + backend->GetFullName ( junk_tmp ).c_str () ); GenerateBuildMapCode ( &junk_tmp ); fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", - strFile ( &junk_tmp ).c_str () ); + backend->GetFullName ( junk_tmp ).c_str () ); } @@ -3088,9 +3085,9 @@ FileLocation junk_cpy ( TemporaryDirectory, "", module.name + ".junk.elf" ); - CLEAN_FILE ( &junk_tmp ); - CLEAN_FILE ( &junk_elf ); - CLEAN_FILE ( &junk_cpy ); + CLEAN_FILE ( junk_tmp ); + CLEAN_FILE ( junk_elf ); + CLEAN_FILE ( junk_cpy ); string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); string libsMacro = GetLibsMacro (); @@ -3103,34 +3100,36 @@ objectsMacro.c_str (), linkDepsMacro.c_str (), payload->name.c_str (), - strDirectory(GetTargetFilename(module,NULL)).c_str () ); + backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" ); fprintf ( fMakefile, "\t$(%s_PREPARE) $(OUTPUT)$(SEP)%s %s\n", module.buildtype.c_str (), - NormalizeFilename( strFile ( payload->output ) ).c_str (), - strFile ( &junk_cpy ).c_str () ); + NormalizeFilename( backend->GetFullName ( *payload->output ) ).c_str (), + backend->GetFullName ( junk_cpy ).c_str () ); fprintf ( fMakefile, "\t${objcopy} $(%s_FLATFORMAT) %s %s\n", module.buildtype.c_str (), - strFile ( &junk_cpy ).c_str (), - strFile ( &junk_tmp ).c_str () ); + backend->GetFullName ( junk_cpy ).c_str (), + backend->GetFullName ( junk_tmp ).c_str () ); fprintf ( fMakefile, "\t${ld} $(%s_LINKFORMAT) %s %s -g -o %s\n", module.buildtype.c_str (), linkDepsMacro.c_str (), - strFile ( &junk_tmp ).c_str (), - strFile ( &junk_elf ).c_str () ); + backend->GetFullName ( junk_tmp ).c_str (), + backend->GetFullName ( junk_elf ).c_str () ); fprintf ( fMakefile, "\t${objcopy} $(%s_COPYFORMAT) %s $(INTERMEDIATE)$(SEP)%s\n", module.buildtype.c_str (), - strFile ( &junk_elf ).c_str (), - strFile ( module.output ) .c_str () ); + backend->GetFullName ( junk_elf ).c_str (), + backend->GetFullName ( *module.output ) .c_str () ); fprintf ( fMakefile, "\t-@${rm} %s %s %s 2>$(NUL)\n", - strFile ( &junk_tmp ).c_str (), strFile ( &junk_elf ).c_str (), strFile ( &junk_cpy ).c_str () ); + backend->GetFullName ( junk_tmp ).c_str (), + backend->GetFullName ( junk_elf ).c_str (), + backend->GetFullName ( junk_cpy ).c_str () ); } @@ -3308,36 +3307,36 @@ IsoName = "ReactOS.iso"; - string sourceFiles = v2s ( vSourceFiles, 5 ); + string sourceFiles = v2s ( backend, vSourceFiles, 5 ); // fill cdrom GetCdDirectories ( vCdDirectories, bootcdDirectory ); GetCdFiles ( vCdFiles ); string cdDirectories = "";//v2s ( vCdDirectories, 5 ); - string cdFiles = v2s ( vCdFiles, 5 ); + string cdFiles = v2s ( backend, vCdFiles, 5 ); fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); fprintf ( fMakefile, "%s: all %s %s %s $(CABMAN_TARGET) $(CDMAKE_TARGET) %s\n", module.name.c_str (), - strFile ( &isoboot ).c_str (), + backend->GetFullName ( isoboot ).c_str (), sourceFiles.c_str (), cdFiles.c_str (), cdDirectories.c_str () ); fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" ); fprintf ( fMakefile, "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I -P $(OUTPUT)\n", - strFile ( &reactosDff ).c_str (), - strDirectory ( &bootcdReactos ).c_str () ); + backend->GetFullName ( reactosDff ).c_str (), + backend->GetFullPath ( bootcdReactos ).c_str () ); fprintf ( fMakefile, "\t$(Q)$(CABMAN_TARGET) -C %s -RC %s -L %s -N -P $(OUTPUT)\n", - strFile ( &reactosDff ).c_str (), - strFile ( &reactosInf ).c_str (), - strDirectory ( &bootcdReactos ).c_str ()); + backend->GetFullName ( reactosDff ).c_str (), + backend->GetFullName ( reactosInf ).c_str (), + backend->GetFullPath ( bootcdReactos ).c_str ()); fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", - strFile ( &reactosInf ).c_str () ); + backend->GetFullName ( reactosInf ).c_str () ); OutputBootstrapfileCopyCommands ( bootcdDirectory ); OutputCdfileCopyCommands ( bootcdDirectory ); @@ -3347,8 +3346,8 @@ fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, "\t$(Q)$(CDMAKE_TARGET) -v -j -m -b %s %s REACTOS %s\n", - strFile ( &isoboot ).c_str (), - strDirectory ( &bootcd ).c_str (), + backend->GetFullName ( isoboot ).c_str (), + backend->GetFullPath ( bootcd ).c_str (), IsoName.c_str() ); fprintf ( fMakefile, "\n" ); @@ -3459,7 +3458,7 @@ "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, "\t$(MKHIVE_TARGET) boot%cbootdata %s boot%cbootdata%clivecd.inf boot%cbootdata%chiveinst.inf\n", - cSep, strDirectory ( &reactosSystem32ConfigDirectory ).c_str (), + cSep, backend->GetFullPath ( reactosSystem32ConfigDirectory ).c_str (), cSep, cSep, cSep, cSep ); } @@ -3490,15 +3489,15 @@ FileLocation livecdReactos ( OutputDirectory, livecdReactosNoFixup, "" ); - CLEAN_FILE ( &livecdReactos ); + CLEAN_FILE ( livecdReactos ); fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); fprintf ( fMakefile, "%s: all %s %s $(MKHIVE_TARGET) $(CDMAKE_TARGET)\n", module.name.c_str (), - strFile ( &isoboot) .c_str (), - strDirectory ( &livecdReactos ).c_str () ); + backend->GetFullName ( isoboot) .c_str (), + backend->GetFullPath ( livecdReactos ).c_str () ); OutputModuleCopyCommands ( livecdDirectory, reactosDirectory ); OutputNonModuleCopyCommands ( livecdDirectory, @@ -3509,8 +3508,8 @@ fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, "\t$(Q)$(CDMAKE_TARGET) -v -m -j -b %s %s REACTOS %s\n", - strFile( &isoboot ).c_str (), - strDirectory ( &livecd ).c_str (), + backend->GetFullName( isoboot ).c_str (), + backend->GetFullPath ( livecd ).c_str (), IsoName.c_str() ); fprintf ( fMakefile, "\n" ); @@ -3654,7 +3653,7 @@ targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), - strDirectory(GetTargetFilename(module,NULL)).c_str () ); + backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" );

1 0

[gedmurphy] 28999: fix the service name to match the registry key
by gedmurphy＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: gedmurphy Date: Tue Sep 11 02:28:34 2007 New Revision: 28999 URL: http://svn.reactos.org/svn/reactos?rev=28999&view=rev Log: fix the service name to match the registry key Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/tcps… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.c (original) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.c Tue Sep 11 02:28:34 2007 @@ -18,7 +18,7 @@ static SERVICE_STATUS_HANDLE hSStat; LPCTSTR LogFileName = _T("C:\\tcpsvcs_log.log"); -LPTSTR ServiceName = _T("Simp Tcp"); +LPTSTR ServiceName = _T("tcpsvcs"); static SERVICES Services[NUM_SERVICES] =

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
59
Older →

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 September 2007