Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 17:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SERVMAN] Respect the user-selected export format (#5394)

Browse source 
- Use either tab or comma separator depending on user's selection.
- Skip adding a separator after the last table cell.

CORE-19001
This commit is contained in:
Yukinari Mitsu 2023-07-04 19:04:44 +09:00 committed by GitHub
parent 7342163b0d
commit cce12eb9ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
base/applications/mscutils/servman/export.c
View file

@ -34,11 +34,17 @@ GetTextFromListView(PMAIN_WND_INFO Info,
static BOOL
SaveServicesToFile(PMAIN_WND_INFO Info,
LPCWSTR pszFileName)
LPCWSTR pszFileName,
DWORD nFormat)
{
HANDLE hFile;
BOOL bSuccess = FALSE;
if (!nFormat || nFormat > 2)
{
return bSuccess;
}
hFile = CreateFileW(pszFileName,
GENERIC_WRITE,
0,
@ -51,7 +57,7 @@ SaveServicesToFile(PMAIN_WND_INFO Info,
{
WCHAR LVText[500];
WCHAR newl[2] = {L'\r', L'\n'};
WCHAR tab = L'\t';
WCHAR seps[2] = {L'\t', L','};
DWORD dwTextLength, dwWritten;
INT NumListedServ = 0;
INT i, k;
@ -60,7 +66,7 @@ SaveServicesToFile(PMAIN_WND_INFO Info,
for (i=0; i < NumListedServ; i++)
{
for (k=0; k<5; k++)
for (k=0; k < LVMAX; k++)
{
dwTextLength = GetTextFromListView(Info,
LVText,
@ -73,9 +79,13 @@ SaveServicesToFile(PMAIN_WND_INFO Info,
sizeof(WCHAR) * dwTextLength,
&dwWritten,
NULL);
}
if (k < LVMAX - 1)
{
/* Do not add separator after the last table cell */
WriteFile(hFile,
&tab,
&seps[nFormat-1],
sizeof(WCHAR),
&dwWritten,
NULL);
@ -113,7 +123,7 @@ VOID ExportFile(PMAIN_WND_INFO Info)
if(GetSaveFileName(&ofn))
{
if (SaveServicesToFile(Info, szFileName))
if (SaveServicesToFile(Info, szFileName, ofn.nFilterIndex))
return;
}

1
base/applications/mscutils/servman/precomp.h
View file

@ -31,6 +31,7 @@
#define LVSTATUS 2
#define LVSTARTUP 3
#define LVLOGONAS 4
#define LVMAX 5
#define IMAGE_UNKNOWN 0
#define IMAGE_SERVICE 1