Module: wine Branch: master Commit: 823560d472dcf27a1a115ec6fae76cd57dbf7ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=823560d472dcf27a1a115ec6fa...
Author: Hans Leidekker hans@codeweavers.com Date: Thu Jun 30 12:16:02 2011 +0200
msi: Get rid of the remaining tabs.
---
dlls/msi/cond.y | 10 ++--- dlls/msi/custom.c | 99 +++++++++++++++++++++++---------------------------- dlls/msi/dialog.c | 4 +-- dlls/msi/msi.c | 4 +-- dlls/msi/msi_main.c | 4 +- 5 files changed, 53 insertions(+), 68 deletions(-)
diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 5bde044..97bb002 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -488,7 +488,7 @@ static INT compare_substring( LPCWSTR a, INT operator, LPCWSTR b ) return !strncmpiW( a + (l - r), b, r ); } default: - ERR("invalid substring operator\n"); + ERR("invalid substring operator\n"); return 0; } return 0; @@ -498,7 +498,7 @@ static INT compare_string( LPCWSTR a, INT operator, LPCWSTR b, BOOL convert ) { if (operator >= COND_SS && operator <= COND_RHS) return compare_substring( a, operator, b ); - + /* null and empty string are equivalent */ if (!a) a = szEmpty; if (!b) b = szEmpty; @@ -665,8 +665,7 @@ static int COND_GetOne( struct cond_str *str, COND_input *cond ) if (ch == '"' ) { LPCWSTR p = strchrW( str->data + 1, '"' ); - if (!p) - return COND_ERROR; + if (!p) return COND_ERROR; len = p - str->data + 1; rc = COND_LITER; } @@ -813,8 +812,7 @@ MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *package, LPCWSTR szCondition )
TRACE("%s\n", debugstr_w( szCondition ) );
- if ( szCondition == NULL ) - return MSICONDITION_NONE; + if (szCondition == NULL) return MSICONDITION_NONE;
cond.package = package; cond.str = szCondition; diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 8de6431..5032cfc 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -522,22 +522,22 @@ static UINT get_action_info( const GUID *guid, INT *type, MSIHANDLE *handle, #ifdef __i386__ extern UINT CUSTOMPROC_wrapper( MsiCustomActionEntryPoint proc, MSIHANDLE handle ); __ASM_GLOBAL_FUNC( CUSTOMPROC_wrapper, - "pushl %ebp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") - "movl %esp,%ebp\n\t" - __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") - "pushl 12(%ebp)\n\t" - "movl 8(%ebp),%eax\n\t" - "call *%eax\n\t" - "leave\n\t" - __ASM_CFI(".cfi_def_cfa %esp,4\n\t") - __ASM_CFI(".cfi_same_value %ebp\n\t") - "ret" ) + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 12(%ebp)\n\t" + "movl 8(%ebp),%eax\n\t" + "call *%eax\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) #else static inline UINT CUSTOMPROC_wrapper( MsiCustomActionEntryPoint proc, MSIHANDLE handle ) { - return proc(handle); + return proc(handle); } #endif
@@ -1078,12 +1078,10 @@ static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, return ERROR_FUNCTION_FAILED;
r = MSI_RecordReadStream(row, 2, NULL, &sz); - if (r != ERROR_SUCCESS) - return r; + if (r != ERROR_SUCCESS) return r;
- buffer = msi_alloc(sizeof(CHAR)*(sz+1)); - if (!buffer) - return ERROR_FUNCTION_FAILED; + buffer = msi_alloc( sz + 1 ); + if (!buffer) return ERROR_FUNCTION_FAILED;
r = MSI_RecordReadStream(row, 2, buffer, &sz); if (r != ERROR_SUCCESS) @@ -1124,36 +1122,32 @@ static UINT HANDLE_CustomType21_22(MSIPACKAGE *package, LPCWSTR source, file = msi_get_loaded_file(package, source); if (!file) { - ERR("invalid file key %s\n", debugstr_w(source)); - return ERROR_FUNCTION_FAILED; + ERR("invalid file key %s\n", debugstr_w(source)); + return ERROR_FUNCTION_FAILED; }
hFile = CreateFileW(file->TargetPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) - return ERROR_FUNCTION_FAILED; + if (hFile == INVALID_HANDLE_VALUE) return ERROR_FUNCTION_FAILED;
sz = GetFileSize(hFile, &szHighWord); if (sz == INVALID_FILE_SIZE || szHighWord != 0) { - CloseHandle(hFile); - return ERROR_FUNCTION_FAILED; + CloseHandle(hFile); + return ERROR_FUNCTION_FAILED; } - - buffer = msi_alloc(sizeof(CHAR)*(sz+1)); + buffer = msi_alloc( sz + 1 ); if (!buffer) { - CloseHandle(hFile); - return ERROR_FUNCTION_FAILED; + CloseHandle(hFile); + return ERROR_FUNCTION_FAILED; } - bRet = ReadFile(hFile, buffer, sz, &read, NULL); CloseHandle(hFile); if (!bRet) { - r = ERROR_FUNCTION_FAILED; + r = ERROR_FUNCTION_FAILED; goto done; } - buffer[read] = 0; bufferw = strdupAtoW(buffer); if (!bufferw) @@ -1161,7 +1155,6 @@ static UINT HANDLE_CustomType21_22(MSIPACKAGE *package, LPCWSTR source, r = ERROR_FUNCTION_FAILED; goto done; } - info = do_msidbCustomActionTypeScript( package, type, bufferw, target, action ); r = wait_thread_handle( info ); release_custom_action_data( info ); @@ -1182,8 +1175,7 @@ static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, TRACE("%s %s\n", debugstr_w(source), debugstr_w(target));
prop = msi_dup_property( package->db, source ); - if (!prop) - return ERROR_SUCCESS; + if (!prop) return ERROR_SUCCESS;
info = do_msidbCustomActionTypeScript( package, type, prop, NULL, action ); msi_free(prop); @@ -1340,26 +1332,25 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL msi_reset_folders( package, TRUE ); msi_free(deformated); break; - case 37: /* JScript/VBScript text stored in target column. */ - case 38: - rc = HANDLE_CustomType37_38(package,source,target,type,action); - break; - case 5: - case 6: /* JScript/VBScript file stored in a Binary table stream. */ - rc = HANDLE_CustomType5_6(package,source,target,type,action); - break; - case 21: /* JScript/VBScript file installed with the product. */ - case 22: - rc = HANDLE_CustomType21_22(package,source,target,type,action); - break; - case 53: /* JScript/VBScript text specified by a property value. */ - case 54: - rc = HANDLE_CustomType53_54(package,source,target,type,action); - break; - default: - FIXME("UNHANDLED ACTION TYPE %i (%s %s)\n", - type & CUSTOM_ACTION_TYPE_MASK, debugstr_w(source), - debugstr_w(target)); + case 37: /* JScript/VBScript text stored in target column. */ + case 38: + rc = HANDLE_CustomType37_38(package,source,target,type,action); + break; + case 5: + case 6: /* JScript/VBScript file stored in a Binary table stream. */ + rc = HANDLE_CustomType5_6(package,source,target,type,action); + break; + case 21: /* JScript/VBScript file installed with the product. */ + case 22: + rc = HANDLE_CustomType21_22(package,source,target,type,action); + break; + case 53: /* JScript/VBScript text specified by a property value. */ + case 54: + rc = HANDLE_CustomType53_54(package,source,target,type,action); + break; + default: + FIXME("unhandled action type %u (%s %s)\n", type & CUSTOM_ACTION_TYPE_MASK, + debugstr_w(source), debugstr_w(target)); }
end: diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index f49feda..6159c7b 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1251,9 +1251,7 @@ static void msi_scrolltext_add_text( msi_control *control, LPCWSTR text )
static UINT msi_dialog_scrolltext_control( msi_dialog *dialog, MSIRECORD *rec ) { - static const WCHAR szRichEdit20W[] = { - 'R','i','c','h','E','d','i','t','2','0','W',0 - }; + static const WCHAR szRichEdit20W[] = {'R','i','c','h','E','d','i','t','2','0','W',0}; struct msi_scrolltext_info *info; msi_control *control; HMODULE hRichedit; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 5075756..aaa1d84 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2244,8 +2244,7 @@ LANGID WINAPI MsiLoadStringW( MSIHANDLE handle, UINT id, LPWSTR lpBuffer, if( !p ) return 0;
- for (i = 0; i < (id&0xf); i++) - p += *p + 1; + for (i = 0; i < (id & 0xf); i++) p += *p + 1; len = *p;
if( nBufferMax <= len ) @@ -2255,7 +2254,6 @@ LANGID WINAPI MsiLoadStringW( MSIHANDLE handle, UINT id, LPWSTR lpBuffer, lpBuffer[ len ] = 0;
TRACE("found -> %s\n", debugstr_w(lpBuffer)); - return lang; }
diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 7288f3d..ab3e68f 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -228,7 +228,7 @@ HRESULT WINAPI DllCanUnloadNow(void) }
/*********************************************************************** - * DllRegisterServer (MSI.@) + * DllRegisterServer (MSI.@) */ HRESULT WINAPI DllRegisterServer(void) { @@ -236,7 +236,7 @@ HRESULT WINAPI DllRegisterServer(void) }
/*********************************************************************** - * DllUnregisterServer (MSI.@) + * DllUnregisterServer (MSI.@) */ HRESULT WINAPI DllUnregisterServer(void) {