Skip to content

C
core
Kaydet (Commit) d71bd0dd authored tarafından Eilidh McAdam's avatar Eilidh McAdam Kaydeden (comit) Fridrich Štrba
Dosyalara gözat
Seçenekler

Code tidy up of indentation, comments and debug output. 

Change-Id: I966d34205db1825d3aa1d328c03418817bf01bc3
Signed-off-by: 's avatarFridrich Štrba <fridrich.strba@bluewin.ch>
üst 9167f0a1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 189 deletions
setup_native/source/win32/wintools/makecab/parseddf.h
Dosyayı görüntüle @ d71bd0dd
......@@ -20,11 +20,11 @@ typedef enum DDFLOGLEVEL { DDFLOG_ERR = 1, DDFLOG_WRN, DDFLOG_MSG } DDFLOGLEVEL;
typedef struct DDFSRCFILE
{
char fileName[MAX_PATH];
char cabName[DDF_MAX_CABNAME];
BOOL extract;
TCOMP cmpType;
struct DDFSRCFILE * next;
char fileName[MAX_PATH];
char cabName[DDF_MAX_CABNAME];
BOOL extract;
TCOMP cmpType;
struct DDFSRCFILE * next;
} DDFSRCFILE;
unsigned int ParseDdf(char * ddfFile, PCCAB vars, DDFSRCFILE ** srcListH, unsigned int v);
......
setup_native/source/win32/wintools/msidb/msidb.c
Dosyayı görüntüle @ d71bd0dd
......@@ -82,21 +82,17 @@ static BOOL msidbImportStorages(LPCWSTR dbfile, LPCWSTR wdir, LPWSTR storageName
lstrcatW(storagePath, delim);
lstrcatW(storagePath, storageNames[i]);
/* WINE_MESSAGE("Importing from %s\n", wine_dbgstr_w(storagePath)); */
rec = MsiCreateRecord(2);
MsiRecordSetStringW(rec, 1, storageNames[i]);
r = MsiRecordSetStreamW(rec, 2, storagePath);
if (r != ERROR_SUCCESS)
{
/* WINE_MESSAGE("Error setting storage %d\n", r); */
return FALSE;
}
r = MsiViewExecute(view, rec);
if (r != ERROR_SUCCESS)
{
/* WINE_MESSAGE("Unable to update with storage record %d\n", r); */
return FALSE;
}
......@@ -133,10 +129,9 @@ static BOOL msidbExportStorage(LPCWSTR dbfile, LPCWSTR wdir, LPWSTR storageName)
if ((r = MsiRecordReadStream(rec, 2, 0, &dataLen)) != ERROR_SUCCESS)
{
/* WINE_MESSAGE("Problem reading stream, error %d %d %d (%d)\n", r, r == ERROR_INVALID_HANDLE, r == ERROR_INVALID_PARAMETER, dataLen ); */
return FALSE;
}
/* WINE_MESSAGE("Exporting storage %s using query %s\n", storageNameA, queryBuffer); */
if ((dataBuffer = malloc(dataLen)) == NULL) return FALSE;
if (MsiRecordReadStream(rec, 2, dataBuffer, &dataLen) != ERROR_SUCCESS) return FALSE;
......@@ -195,14 +190,12 @@ static BOOL msidbImportStreams(LPCWSTR dbfile, LPCWSTR wdir, LPWSTR streamNames[
r = MsiRecordSetStreamW(rec, 2, streamPath);
if (r != ERROR_SUCCESS)
{
/* WINE_MESSAGE("Error setting stream %d (%s)\n", r, wine_dbgstr_w(streamNames[i])); */
return FALSE;
}
r = MsiViewExecute(view, rec);
if (r != ERROR_SUCCESS)
{
/* WINE_MESSAGE("Unable to update with stream record %d\n", r); */
return FALSE;
}
......@@ -319,7 +312,6 @@ static BOOL msidbImportTables(LPCWSTR dbfile, LPCWSTR wdir, LPWSTR tables[], BOO
if (r != ERROR_SUCCESS)
{
/* WINE_MESSAGE("Error while opening db: %d %d %d %d\n", r == ERROR_BAD_PATHNAME, r == ERROR_FUNCTION_FAILED, r == ERROR_INVALID_HANDLE, r == ERROR_INVALID_PARAMETER); */
return FALSE;
}
......@@ -336,12 +328,6 @@ static BOOL msidbImportTables(LPCWSTR dbfile, LPCWSTR wdir, LPWSTR tables[], BOO
if (strcmp(fileName, ".") == 0 || strcmp(fileName, "..") == 0) continue;
tableFile = strdupAtoW(CP_ACP, fileName);
r = MsiDatabaseImportW(dbhandle, wdir, tableFile);
if (r != ERROR_SUCCESS)
{
/* WINE_MESSAGE("Failed to import %s from %s\n", wine_dbgstr_w(tableFile), wine_dbgstr_w(wdir)); */
}
free(tableFile);
}
}
......@@ -360,11 +346,6 @@ static BOOL msidbImportTables(LPCWSTR dbfile, LPCWSTR wdir, LPWSTR tables[], BOO
lstrcatW(tableFile, ext);
r = MsiDatabaseImportW(dbhandle, wdir, tableFile);
if (r != ERROR_SUCCESS)
{
/* WINE_MESSAGE("Error while importing %s: %d %d %d %d\n", wine_dbgstr_w(tableFile), r == ERROR_BAD_PATHNAME, r == ERROR_FUNCTION_FAILED, r == ERROR_INVALID_HANDLE, r == ERROR_INVALID_PARAMETER); */
}
free(tableFile);
if (r != ERROR_SUCCESS)
......@@ -426,21 +407,11 @@ static BOOL msidbExportTables(LPCWSTR dbfile, LPCWSTR wdir, LPWSTR tables[])
lstrcatW(tableFile, ext);
r = MsiDatabaseExportW(dbhandle, tableName, wdir, tableFile);
#ifdef DEBUG
if (r != ERROR_SUCCESS)
{
/* WINE_MESSAGE("Failed to export %s. Reason: functionfailed(%d) invalidparam(%d) badpath(%d)\n",wine_dbgstr_w(tableFile), r==ERROR_FUNCTION_FAILED, r==ERROR_INVALID_PARAMETER, r==ERROR_BAD_PATHNAME ); */
}
#endif
free(tableFile);
MsiCloseHandle(rec);
}
#ifdef DEBUG
else
{
/* WINE_MESSAGE("Failed with error. Size is now %d. Error: %d %d %d\n", size, r == ERROR_MORE_DATA, r == ERROR_INVALID_HANDLE, r == ERROR_INVALID_PARAMETER); */
}
#endif
r = MsiViewFetch(tableListView, &rec);
}
......@@ -580,10 +551,5 @@ int wmain(int argc, WCHAR *argv[])
if (!msidbExportStorage(dbfile, wdir, storageName))
return 6;
/*for (i = 0; i < 10; i++)
{
WINE_MESSAGE("%s\t%s\t%s\t%s\t%s\n", wine_dbgstr_w(iTables[i]), wine_dbgstr_w(oTables[i]), wine_dbgstr_w(streamName), wine_dbgstr_w(streamFiles[i]), wine_dbgstr_w(storageNames[i]));
}*/
return 0;
}
setup_native/source/win32/wintools/msiinfo/msiinfo.c
Dosyayı görüntüle @ d71bd0dd
......@@ -61,186 +61,193 @@ static const char * commandNames[COMMANDS] =
static void parseDate(LPCWSTR value, SYSTEMTIME *time)
{
LPWSTR field;
uint len = 4*sizeof(WCHAR);
LPWSTR field;
uint len = 4*sizeof(WCHAR);
if (lstrlenW(value) != 19) return;
field = malloc(len + sizeof(WCHAR));
if (field == NULL) return;
memcpy(field, value, len);
field[4] = L'\0';
time->wYear = atoiW(field);
if (lstrlenW(value) != 19) return;
field = malloc(len + sizeof(WCHAR));
if (field == NULL) return;
memcpy(field, value, len);
field[4] = L'\0';
time->wYear = atoiW(field);
len = 2 * sizeof(WCHAR);
memcpy(field, &(value[5]), len);
field[2] = '\0';
time->wMonth = atoiW(field);
len = 2 * sizeof(WCHAR);
memcpy(field, &(value[5]), len);
field[2] = '\0';
time->wMonth = atoiW(field);
memcpy(field, &(value[8]), len);
time->wDay = atoiW(field);
memcpy(field, &(value[8]), len);
time->wDay = atoiW(field);
memcpy(field, &(value[11]), len);
time->wHour = atoiW(field);
memcpy(field, &(value[11]), len);
time->wHour = atoiW(field);
memcpy(field, &(value[14]), len);
time->wMinute = atoiW(field);
memcpy(field, &(value[14]), len);
time->wMinute = atoiW(field);
memcpy(field, &(value[17]), len);
time->wSecond = atoiW(field);
memcpy(field, &(value[17]), len);
time->wSecond = atoiW(field);
free(field);
free(field);
}
static BOOL msiinfoDisplayProperties(LPWSTR dbfile)
{
MSIHANDLE dbhandle, infohandle;
uint i, r, dataType;
INT iVal;
FILETIME ftVal;
SYSTEMTIME sysTime;
LPWSTR szVal = NULL;
DWORD size;
r = MsiOpenDatabaseW(dbfile, (LPWSTR) MSIDBOPEN_READONLY, &dbhandle);
if (r != ERROR_SUCCESS)
{
return FALSE;
}
r = MsiGetSummaryInformationW(dbhandle, 0, 0, &infohandle);
if (r != ERROR_SUCCESS)
{
return FALSE;
}
for (i = 0; i < COMMANDS; i++)
{
MsiSummaryInfoGetPropertyW(infohandle, commandMap[i][1], &dataType,
&iVal, &ftVal, szVal, &size);
wprintf(L"%-24s", commandNames[i]);
if (dataType == VT_LPSTR)
MSIHANDLE dbhandle, infohandle;
uint i, r, dataType;
INT iVal;
FILETIME ftVal;
SYSTEMTIME sysTime;
LPWSTR szVal = NULL;
DWORD size;
r = MsiOpenDatabaseW(dbfile, (LPWSTR) MSIDBOPEN_READONLY, &dbhandle);
if (r != ERROR_SUCCESS)
{
if (szVal!=NULL) wprintf(L"%ls (%d)\n", szVal, lstrlenW(szVal));
else wprintf(L"\n");
return FALSE;
}
else if (dataType == VT_FILETIME)
r = MsiGetSummaryInformationW(dbhandle, 0, 0, &infohandle);
if (r != ERROR_SUCCESS)
{
FileTimeToSystemTime(&ftVal, &sysTime);
wprintf(L"%04d/%02d/%02d %02d:%02d:%02d\n", sysTime.wYear, sysTime.wMonth,
sysTime.wDay, sysTime.wHour, sysTime.wMinute, sysTime.wSecond);
return FALSE;
}
else
for (i = 0; i < COMMANDS; i++)
{
wprintf(L"%d\n", iVal);
MsiSummaryInfoGetPropertyW(infohandle, commandMap[i][1], &dataType,
&iVal, &ftVal, szVal, &size);
wprintf(L"%-24s", commandNames[i]);
if (dataType == VT_LPSTR)
{
if (szVal!=NULL) wprintf(L"%ls (%d)\n", szVal, lstrlenW(szVal));
else wprintf(L"\n");
}
else if (dataType == VT_FILETIME)
{
FileTimeToSystemTime(&ftVal, &sysTime);
wprintf(L"%04d/%02d/%02d %02d:%02d:%02d\n", sysTime.wYear, sysTime.wMonth,
sysTime.wDay, sysTime.wHour, sysTime.wMinute, sysTime.wSecond);
}
else
{
wprintf(L"%d\n", iVal);
}
}
}
MsiCloseHandle(infohandle);
return TRUE;
MsiCloseHandle(infohandle);
return TRUE;
}
static BOOL msiinfoUpdateProperty(MSIHANDLE infoHandle, uint property, uint dataType, LPCWSTR value)
{
uint r;
int iVal = 0;
FILETIME ftVal;
SYSTEMTIME sysTime = {0};
LPCWSTR szVal = NULL;
if (dataType == VT_LPSTR) szVal = value;
else if (dataType == VT_FILETIME)
{
parseDate(value, &sysTime);
SystemTimeToFileTime(&sysTime, &ftVal);
}
else
iVal = atoiW(value);
r = MsiSummaryInfoSetPropertyW(infoHandle, property, dataType, iVal, &ftVal, szVal);
if (r != ERROR_SUCCESS)
{
wprintf(L"Problem updating property: %d %d %d %d\n", r == ERROR_DATATYPE_MISMATCH, r == ERROR_FUNCTION_FAILED, ERROR_UNKNOWN_PROPERTY, ERROR_UNSUPPORTED_TYPE);
return FALSE;
}
return TRUE;
uint r;
int iVal = 0;
FILETIME ftVal;
SYSTEMTIME sysTime = {0};
LPCWSTR szVal = NULL;
if (dataType == VT_LPSTR) szVal = value;
else if (dataType == VT_FILETIME)
{
parseDate(value, &sysTime);
SystemTimeToFileTime(&sysTime, &ftVal);
}
else
iVal = atoiW(value);
r = MsiSummaryInfoSetPropertyW(infoHandle, property, dataType, iVal, &ftVal, szVal);
if (r != ERROR_SUCCESS)
{
wprintf(L"Problem updating property: %d %d %d %d\n", r == ERROR_DATATYPE_MISMATCH, r == ERROR_FUNCTION_FAILED, ERROR_UNKNOWN_PROPERTY, ERROR_UNSUPPORTED_TYPE);
return FALSE;
}
return TRUE;
}
static void usage(void)
{
WINE_MESSAGE(
"Usage: msiinfo {database} [[-b]-d] {options} {data}\n"
"\nOptions:\n"
" -c <cp> Specify codepage\n"
" -t <title> Specify title\n"
" -j <subject> Specify subject\n"
" -a <author> Specify author\n"
" -k <keywords> Specify keywords\n"
" -o <comment> Specify comments\n"
" -p <template> Specify template\n"
" -l <author> Specify last author\n"
" -v <revno> Specify revision number\n"
" -s <date> Specify last printed date\n"
" -r <date> Specify creation date\n"
" -q <date> Specify date of last save\n"
" -g <pages> Specify page count\n"
" -w <words> Specify word count\n"
" -h <chars> Specify character count\n"
" -n <appname> Specify application which created the database\n"
" -u <security> Specify security (0: none, 2: read only (rec.) 3: read only (enforced)\n");
wprintf(
L"Usage: msiinfo {database} [[-b]-d] {options} {data}\n"
L"\nOptions:\n"
L" -c <cp> Specify codepage\n"
L" -t <title> Specify title\n"
L" -j <subject> Specify subject\n"
L" -a <author> Specify author\n"
L" -k <keywords> Specify keywords\n"
L" -o <comment> Specify comments\n"
L" -p <template> Specify template\n"
L" -l <author> Specify last author\n"
L" -v <revno> Specify revision number\n"
L" -s <date> Specify last printed date\n"
L" -r <date> Specify creation date\n"
L" -q <date> Specify date of last save\n"
L" -g <pages> Specify page count\n"
L" -w <words> Specify word count\n"
L" -h <chars> Specify character count\n"
L" -n <appname> Specify application which created the database\n"
L" -u <security> Specify security (0: none, 2: read only (rec.) 3: read only (enforced)\n");
}
int wmain(int argc, WCHAR *argv[])
{
WCHAR *dbfile = NULL;
uint i = 0;
MSIHANDLE dbhandle, infohandle;
uint r;
LPWSTR value = 0;
if (argc > 1)
{
dbfile = argv[1];
argv++; argc--;
}
if (argc == 1)
{
msiinfoDisplayProperties(dbfile);
return 0;
}
r = MsiOpenDatabaseW(dbfile, (LPWSTR) MSIDBOPEN_TRANSACT, &dbhandle);
if (r != ERROR_SUCCESS) return 1;
r = MsiGetSummaryInformationW(dbhandle, 0, 20, &infohandle);
if (r != ERROR_SUCCESS) return 2;
WCHAR *dbfile = NULL;
uint i = 0;
MSIHANDLE dbhandle, infohandle;
uint r;
LPWSTR value = 0;
static const WCHAR h1[] = {'/', '?', 0};
static const WCHAR h2[] = {'-', '?', 0};
if (argc > 1)
{
dbfile = argv[1];
argv++; argc--;
}
while (argv[1] && argv[1][0] == '-')
{
switch (argv[1][1])
if (strcmpW(dbfile, h1) == 0 || strcmpW(dbfile, h2) == 0)
{
case '?':
case 'h':
usage();
return 0;
default:
for (i = 0; i < COMMANDS; i++)
{
if (commandMap[i][0] == argv[1][1])
usage();
return 0;
}
else if (argc == 1)
{
argv++; argc--;
value = argv[1];
msiinfoUpdateProperty(infohandle, commandMap[i][1], commandMap[i][2], value);
break;
msiinfoDisplayProperties(dbfile);
return 0;
}
}
break;
r = MsiOpenDatabaseW(dbfile, (LPWSTR) MSIDBOPEN_TRANSACT, &dbhandle);
if (r != ERROR_SUCCESS) return 1;
r = MsiGetSummaryInformationW(dbhandle, 0, 20, &infohandle);
if (r != ERROR_SUCCESS) return 2;
while (argv[1] && argv[1][0] == '-')
{
switch (argv[1][1])
{
case '?':
case 'h':
usage();
return 0;
default:
for (i = 0; i < COMMANDS; i++)
{
if (commandMap[i][0] == argv[1][1])
{
argv++; argc--;
value = argv[1];
msiinfoUpdateProperty(infohandle, commandMap[i][1], commandMap[i][2], value);
break;
}
}
break;
}
argv++; argc--;
}
argv++; argc--;
}
MsiSummaryInfoPersist(infohandle);
MsiDatabaseCommit(dbhandle);
MsiCloseHandle(dbhandle);
msiinfoDisplayProperties(dbfile);
return 0;
MsiSummaryInfoPersist(infohandle);
MsiDatabaseCommit(dbhandle);
MsiCloseHandle(dbhandle);
msiinfoDisplayProperties(dbfile);
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment