Skip to content

W
wine-winehq
Commit ac6a413b authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard
Browse files
Options

Remove unneeded whitespace, indent correctly.

parent 18a1a6e1
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 65 deletions
dlls/msi/action.c
View file @ ac6a413b
...@@ -164,11 +164,11 @@ static UINT HANDLE_CustomType1(MSIPACKAGE *package, const LPWSTR source, ...@@ -164,11 +164,11 @@ static UINT HANDLE_CustomType1(MSIPACKAGE *package, const LPWSTR source,
const LPWSTR target, const INT type); const LPWSTR target, const INT type);
static UINT HANDLE_CustomType2(MSIPACKAGE *package, const LPWSTR source, static UINT HANDLE_CustomType2(MSIPACKAGE *package, const LPWSTR source,
const LPWSTR target, const INT type); const LPWSTR target, const INT type);
static UINT HANDLE_CustomType18(MSIPACKAGE *package, const LPWSTR source, static UINT HANDLE_CustomType18(MSIPACKAGE *package, const LPWSTR source,
const LPWSTR target, const INT type); const LPWSTR target, const INT type);
static UINT HANDLE_CustomType50(MSIPACKAGE *package, const LPWSTR source, static UINT HANDLE_CustomType50(MSIPACKAGE *package, const LPWSTR source,
const LPWSTR target, const INT type); const LPWSTR target, const INT type);
static UINT HANDLE_CustomType34(MSIPACKAGE *package, const LPWSTR source, static UINT HANDLE_CustomType34(MSIPACKAGE *package, const LPWSTR source,
const LPWSTR target, const INT type); const LPWSTR target, const INT type);
static DWORD deformat_string(MSIPACKAGE *package, WCHAR* ptr,WCHAR** data); static DWORD deformat_string(MSIPACKAGE *package, WCHAR* ptr,WCHAR** data);
...@@ -1566,7 +1566,7 @@ static UINT HANDLE_CustomType2(MSIPACKAGE *package, const LPWSTR source, ...@@ -1566,7 +1566,7 @@ static UINT HANDLE_CustomType2(MSIPACKAGE *package, const LPWSTR source,
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
static UINT HANDLE_CustomType18(MSIPACKAGE *package, const LPWSTR source, static UINT HANDLE_CustomType18(MSIPACKAGE *package, const LPWSTR source,
const LPWSTR target, const INT type) const LPWSTR target, const INT type)
{ {
STARTUPINFOW si; STARTUPINFOW si;
...@@ -1617,7 +1617,7 @@ static UINT HANDLE_CustomType18(MSIPACKAGE *package, const LPWSTR source, ...@@ -1617,7 +1617,7 @@ static UINT HANDLE_CustomType18(MSIPACKAGE *package, const LPWSTR source,
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
static UINT HANDLE_CustomType50(MSIPACKAGE *package, const LPWSTR source, static UINT HANDLE_CustomType50(MSIPACKAGE *package, const LPWSTR source,
const LPWSTR target, const INT type) const LPWSTR target, const INT type)
{ {
STARTUPINFOW si; STARTUPINFOW si;
...@@ -1668,7 +1668,7 @@ static UINT HANDLE_CustomType50(MSIPACKAGE *package, const LPWSTR source, ...@@ -1668,7 +1668,7 @@ static UINT HANDLE_CustomType50(MSIPACKAGE *package, const LPWSTR source,
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
static UINT HANDLE_CustomType34(MSIPACKAGE *package, const LPWSTR source, static UINT HANDLE_CustomType34(MSIPACKAGE *package, const LPWSTR source,
const LPWSTR target, const INT type) const LPWSTR target, const INT type)
{ {
LPWSTR filename, deformated; LPWSTR filename, deformated;
...@@ -1731,31 +1731,31 @@ static BOOL create_full_pathW(const WCHAR *path) ...@@ -1731,31 +1731,31 @@ static BOOL create_full_pathW(const WCHAR *path)
while(!CreateDirectoryW(new_path, NULL)) while(!CreateDirectoryW(new_path, NULL))
{ {
WCHAR *slash; WCHAR *slash;
DWORD last_error = GetLastError(); DWORD last_error = GetLastError();
if(last_error == ERROR_ALREADY_EXISTS) if(last_error == ERROR_ALREADY_EXISTS)
break; break;
if(last_error != ERROR_PATH_NOT_FOUND) if(last_error != ERROR_PATH_NOT_FOUND)
{ {
ret = FALSE; ret = FALSE;
break; break;
} }
if(!(slash = strrchrW(new_path, '\\'))) if(!(slash = strrchrW(new_path, '\\')))
{ {
ret = FALSE; ret = FALSE;
break; break;
} }
len = slash - new_path; len = slash - new_path;
new_path[len] = 0; new_path[len] = 0;
if(!create_full_pathW(new_path)) if(!create_full_pathW(new_path))
{ {
ret = FALSE; ret = FALSE;
break; break;
} }
new_path[len] = '\\'; new_path[len] = '\\';
} }
HeapFree(GetProcessHeap(), 0, new_path); HeapFree(GetProcessHeap(), 0, new_path);
...@@ -2690,55 +2690,55 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) ...@@ -2690,55 +2690,55 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package)
rc = MSI_DatabaseOpenViewW(package->db, ConditionQuery, &view); rc = MSI_DatabaseOpenViewW(package->db, ConditionQuery, &view);
if (rc == ERROR_SUCCESS) if (rc == ERROR_SUCCESS)
{ {
rc = MSI_ViewExecute(view, 0); rc = MSI_ViewExecute(view, 0);
if (rc != ERROR_SUCCESS)
{
MSI_ViewClose(view);
msiobj_release(&view->hdr);
return rc;
}
while (1)
{
WCHAR Feature[0x100];
MSIRECORD * row = 0;
DWORD sz;
int feature_index;
rc = MSI_ViewFetch(view,&row);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
{ {
rc = ERROR_SUCCESS; MSI_ViewClose(view);
break; msiobj_release(&view->hdr);
return rc;
} }
while (1)
{
WCHAR Feature[0x100];
MSIRECORD * row = 0;
DWORD sz;
int feature_index;
sz = 0x100; rc = MSI_ViewFetch(view,&row);
MSI_RecordGetStringW(row,1,Feature,&sz);
feature_index = get_loaded_feature(package,Feature); if (rc != ERROR_SUCCESS)
if (feature_index < 0) {
ERR("FAILED to find loaded feature %s\n",debugstr_w(Feature)); rc = ERROR_SUCCESS;
else break;
{ }
LPWSTR Condition;
Condition = load_dynamic_stringW(row,3); sz = 0x100;
MSI_RecordGetStringW(row,1,Feature,&sz);
feature_index = get_loaded_feature(package,Feature);
if (feature_index < 0)
ERR("FAILED to find loaded feature %s\n",debugstr_w(Feature));
else
{
LPWSTR Condition;
Condition = load_dynamic_stringW(row,3);
if (MSI_EvaluateConditionW(package,Condition) == if (MSI_EvaluateConditionW(package,Condition) ==
MSICONDITION_TRUE) MSICONDITION_TRUE)
{ {
int level = MSI_RecordGetInteger(row,2); int level = MSI_RecordGetInteger(row,2);
TRACE("Reseting feature %s to level %i\n", TRACE("Reseting feature %s to level %i\n",
debugstr_w(Feature), level); debugstr_w(Feature), level);
package->features[feature_index].Level = level; package->features[feature_index].Level = level;
}
HeapFree(GetProcessHeap(),0,Condition);
} }
HeapFree(GetProcessHeap(),0,Condition);
}
msiobj_release(&row->hdr); msiobj_release(&row->hdr);
} }
MSI_ViewClose(view); MSI_ViewClose(view);
msiobj_release(&view->hdr); msiobj_release(&view->hdr);
} }
TRACE("Enabling or Disabling Components\n"); TRACE("Enabling or Disabling Components\n");
......
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