wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Rico Schüller : d3dx9: Handle ST_PARAMETER in d3dx9_parse resource().
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 7e7549abc54c8a243bdd6ea509bdf1eff8920188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7549abc54c8a243bdd6ea50… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jul 1 13:50:27 2011 +0200 d3dx9: Handle ST_PARAMETER in d3dx9_parse resource(). --- dlls/d3dx9_36/effect.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5d76917..b4f1932 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -88,6 +88,7 @@ enum SHADER_CONSTANT_TYPE enum STATE_TYPE { ST_CONSTANT, + ST_PARAMETER, ST_FXLC, }; @@ -4739,7 +4740,7 @@ static HRESULT d3dx9_parse_resource(struct ID3DXBaseEffectImpl *base, const char DWORD index, state_index, usage; struct d3dx_state *state; struct d3dx_parameter *param; - HRESULT hr; + HRESULT hr = E_FAIL; read_dword(ptr, &technique_index); TRACE("techn: %u\n", technique_index); @@ -4828,14 +4829,21 @@ static HRESULT d3dx9_parse_resource(struct ID3DXBaseEffectImpl *base, const char default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); - hr=E_FAIL; break; } break; + case 1: + state->type = ST_PARAMETER; + hr = d3dx9_copy_data(param->data, ptr); + if (hr == D3D_OK) + { + TRACE("Mapping to parameter %s\n", *(char **)param->data); + } + break; + default: FIXME("Unknown usage %x\n", usage); - hr=E_FAIL; break; }

1 0

Rico Schüller : d3dx9: Handle ST_FXLC in d3dx9_parse_resource().
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 05eef50e22a45c985e85cb6ebbebfdc68e3b8718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05eef50e22a45c985e85cb6eb… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jul 1 13:50:03 2011 +0200 d3dx9: Handle ST_FXLC in d3dx9_parse_resource(). --- dlls/d3dx9_36/effect.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4253863..5d76917 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -88,6 +88,7 @@ enum SHADER_CONSTANT_TYPE enum STATE_TYPE { ST_CONSTANT, + ST_FXLC, }; struct d3dx_parameter @@ -4021,6 +4022,28 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr) return D3D_OK; } +static HRESULT d3dx9_copy_data(char **str, const char **ptr) +{ + DWORD size; + + read_dword(ptr, &size); + TRACE("Data size: %#x\n", size); + + *str = HeapAlloc(GetProcessHeap(), 0, size); + if (!*str) + { + ERR("Failed to allocate name memory.\n"); + return E_OUTOFMEMORY; + } + + TRACE("Data: %s.\n", debugstr_an(*ptr, size)); + memcpy(*str, *ptr, size); + + *ptr += ((size + 3) & ~3); + + return D3D_OK; +} + static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr, LPDIRECT3DDEVICE9 device) { DWORD size; @@ -4795,6 +4818,14 @@ static HRESULT d3dx9_parse_resource(struct ID3DXBaseEffectImpl *base, const char hr = d3dx9_parse_data(param, ptr, base->effect->device); break; + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + case D3DXPT_STRING: + state->type = ST_FXLC; + hr = d3dx9_copy_data(param->data, ptr); + break; + default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); hr=E_FAIL;

1 0

Francois Gouget : shell32: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: db36599affde0b594aff0dda79a472e54fa36354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db36599affde0b594aff0dda7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 1 09:32:37 2011 +0200 shell32: Remove WINAPI on static functions where not needed. --- dlls/shell32/shellpath.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 017f101..c468cb8 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3135,7 +3135,7 @@ static HRESULT get_known_folder_registry_path( * However, besides root key, path is always that same, and is stored * as "szKnownFolderRedirections" constant */ -static HRESULT WINAPI get_known_folder_redirection_place( +static HRESULT get_known_folder_redirection_place( REFKNOWNFOLDERID rfid, HKEY *rootKey) { @@ -3173,7 +3173,7 @@ static HRESULT WINAPI get_known_folder_redirection_place( return hr; } -static HRESULT WINAPI redirect_known_folder( +static HRESULT redirect_known_folder( REFKNOWNFOLDERID rfid, HWND hwnd, KF_REDIRECT_FLAGS flags,

1 0

Jacek Caban : d3d10.idl: Added missing D3D10_RESOURCE_MISC_FLAG values.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 4dfa780e47b28fc6aea01a9ef46f6e2f3f9c4855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dfa780e47b28fc6aea01a9ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 30 17:34:51 2011 +0200 d3d10.idl: Added missing D3D10_RESOURCE_MISC_FLAG values. --- include/d3d10.idl | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index 0620587..f8a83ef 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -843,9 +843,11 @@ typedef enum D3D10_CPU_ACCESS_FLAG { } D3D10_CPU_ACCESS_FLAG; typedef enum D3D10_RESOURCE_MISC_FLAG { - D3D10_RESOURCE_MISC_GENERATE_MIPS = 0x1, - D3D10_RESOURCE_MISC_SHARED = 0x2, - D3D10_RESOURCE_MISC_TEXTURECUBE = 0x4 + D3D10_RESOURCE_MISC_GENERATE_MIPS = 0x0001, + D3D10_RESOURCE_MISC_SHARED = 0x0002, + D3D10_RESOURCE_MISC_TEXTURECUBE = 0x0004, + D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX = 0x0010, + D3D10_RESOURCE_MISC_GDI_COMPATIBLE = 0x0020 } D3D10_RESOURCE_MISC_FLAG; typedef enum D3D10_MAP_FLAG {

1 0

Jacek Caban : dxgi.idl: Added DXGI_SWAP_CHAIN_FLAG enum declaration and DXGI_MWA_* flags.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 9b1b70c711820ad40a1a3028e146d614e6d1bb62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b1b70c711820ad40a1a3028e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 30 17:34:39 2011 +0200 dxgi.idl: Added DXGI_SWAP_CHAIN_FLAG enum declaration and DXGI_MWA_* flags. --- include/dxgi.idl | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index 6f36a56..0559769 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -115,6 +115,12 @@ typedef struct DXGI_ADAPTER_DESC { LUID AdapterLuid; } DXGI_ADAPTER_DESC; +typedef enum DXGI_SWAP_CHAIN_FLAG { + DXGI_SWAP_CHAIN_FLAG_NONPREROTATED = 1, + DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH = 2, + DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 4 +} DXGI_SWAP_CHAIN_FLAG; + typedef struct DXGI_SWAP_CHAIN_DESC { DXGI_MODE_DESC BufferDesc; DXGI_SAMPLE_DESC SampleDesc; @@ -305,6 +311,11 @@ interface IDXGISwapChain : IDXGIDeviceSubObject ); } +cpp_quote("#define DXGI_MWA_NO_WINDOW_CHANGES 0x1") +cpp_quote("#define DXGI_MWA_NO_ALT_ENTER 0x2") +cpp_quote("#define DXGI_MWA_NO_PRINT_SCREEN 0x4") +cpp_quote("#define DXGI_MWA_VALID 0x7") + [ object, local,

1 0

Mariusz Pluciński : shell32: Check for known folder existance.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 08186a9c26e954aea26ad0129cae35f24f18054e URL: http://source.winehq.org/git/wine.git/?a=commit;h=08186a9c26e954aea26ad0129… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Jun 30 14:59:46 2011 +0200 shell32: Check for known folder existance. --- dlls/shell32/shellpath.c | 11 +++++++++++ dlls/shell32/tests/shellpath.c | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 598122f..017f101 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3435,6 +3435,7 @@ static HRESULT WINAPI knownfolder_GetPath( struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); HRESULT hr; WCHAR sGuid[39]; + DWORD dwAttributes; TRACE("(%p, 0x%08x, %p)\n", knownfolder, dwFlags, ppszPath); @@ -3449,6 +3450,16 @@ static HRESULT WINAPI knownfolder_GetPath( else hr = SHGetKnownFolderPath( &knownfolder->id, dwFlags, NULL, ppszPath ); + /* check if known folder really exists */ + dwAttributes = GetFileAttributesW(*ppszPath); + if(dwAttributes == INVALID_FILE_ATTRIBUTES || !(dwAttributes & FILE_ATTRIBUTE_DIRECTORY) ) + { + TRACE("directory %s not found\n", debugstr_w(*ppszPath)); + CoTaskMemFree(*ppszPath); + *ppszPath = NULL; + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + return hr; } diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 932aa0e..8cdae30 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1242,9 +1242,7 @@ static void test_knownFolders(void) /* verify sub folder - it should fail now, as we redirected it's parent folder, but we have no sub folder in new location */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "unexpected value from GetPath(): 0x%08x\n", hr); - todo_wine ok(folderPath==NULL, "invalid known folder path retrieved: \"%s\" when NULL pointer was expected\n", wine_dbgstr_w(folderPath)); CoTaskMemFree(folderPath); @@ -1279,7 +1277,9 @@ static void test_knownFolders(void) /* verify sub folder. It still succeedes, so Windows does not check folder presence each time */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); + todo_wine ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); + todo_wine ok(lstrcmpiW(folderPath, sSubFolder2Path)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sSubFolder2Path)); CoTaskMemFree(folderPath); @@ -1354,7 +1354,9 @@ static void test_knownFolders(void) /* verify sub folder */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); + todo_wine ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); + todo_wine ok(lstrcmpiW(folderPath, sSubFolder2Path)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sSubFolder2Path)); CoTaskMemFree(folderPath); @@ -1391,7 +1393,9 @@ static void test_knownFolders(void) /* verify sub folder */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); + todo_wine ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); + todo_wine ok(lstrcmpiW(folderPath, sSubFolder2Path)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sSubFolder2Path)); CoTaskMemFree(folderPath);

1 0

Mariusz Pluciński : shell32: IKnownFolder:: SetPath modified to use redirection instead of overwriting original path.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: e1dc5447e8c6a88f6d03c56a17acb128135ef933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1dc5447e8c6a88f6d03c56a1… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Jun 30 14:58:53 2011 +0200 shell32: IKnownFolder::SetPath modified to use redirection instead of overwriting original path. --- dlls/shell32/shellpath.c | 19 +------------------ dlls/shell32/tests/shellpath.c | 7 ------- 2 files changed, 1 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 66c376e..598122f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3459,8 +3459,6 @@ static HRESULT WINAPI knownfolder_SetPath( { struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); HRESULT hr = S_OK; - HKEY hKey; - WCHAR szPath[MAX_PATH]; TRACE("(%p, 0x%08x, %p)\n", knownfolder, dwFlags, debugstr_w(pszPath)); @@ -3469,22 +3467,7 @@ static HRESULT WINAPI knownfolder_SetPath( hr = E_FAIL; if(SUCCEEDED(hr)) - { - if(dwFlags & KF_FLAG_DONT_UNEXPAND) - lstrcpyW(szPath, pszPath); - else - hr = ( ExpandEnvironmentStringsW(pszPath, szPath, sizeof(szPath)/sizeof(szPath[0]))!=0 ? S_OK : HRESULT_FROM_WIN32(GetLastError())); - } - - if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, 0, KEY_SET_VALUE, &hKey)); - - if(SUCCEEDED(hr)) - { - hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pszPath, (lstrlenW(pszPath)+1)*sizeof(WCHAR))); - - RegCloseKey(hKey); - } + hr = redirect_known_folder(&knownfolder->id, NULL, 0, pszPath, 0, NULL, NULL); return hr; } diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 9387ff9..932aa0e 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1256,7 +1256,6 @@ static void test_knownFolders(void) /* verify */ hr = IKnownFolder_GetPath(folder, 0, &folderPath); ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); - todo_wine ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); CoTaskMemFree(folderPath); @@ -1292,14 +1291,12 @@ static void test_knownFolders(void) /* verify */ hr = IKnownFolder_GetPath(folder, 0, &folderPath); ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); - todo_wine ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); CoTaskMemFree(folderPath); /* verify sub folder */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); - todo_wine ok(lstrcmpiW(folderPath, sSubFolderPath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sSubFolderPath)); CoTaskMemFree(folderPath); @@ -1335,14 +1332,12 @@ static void test_knownFolders(void) /* verify */ hr = IKnownFolder_GetPath(folder, 0, &folderPath); ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); - todo_wine ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); CoTaskMemFree(folderPath); /* verify sub folder */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); - todo_wine ok(lstrcmpiW(folderPath, sSubFolderPath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sSubFolderPath)); CoTaskMemFree(folderPath); @@ -1374,14 +1369,12 @@ static void test_knownFolders(void) /* verify */ hr = IKnownFolder_GetPath(folder, 0, &folderPath); ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); - todo_wine ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); CoTaskMemFree(folderPath); /* verify sub folder */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); - todo_wine ok(lstrcmpiW(folderPath, sSubFolderPath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sSubFolderPath)); CoTaskMemFree(folderPath);

1 0

Hans Leidekker : msi: Get rid of the remaining tabs.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 823560d472dcf27a1a115ec6fae76cd57dbf7ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=823560d472dcf27a1a115ec6f… Author: Hans Leidekker <hans(a)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) {

1 0

Hans Leidekker : msi: Delay creating local installer and patch packages until the product is registered .
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 7d677fc3271367c4c9f8dfab012eb5ad5020368b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d677fc3271367c4c9f8dfab0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 30 12:15:37 2011 +0200 msi: Delay creating local installer and patch packages until the product is registered. --- dlls/msi/action.c | 44 +++++++++++++++++++---- dlls/msi/database.c | 5 --- dlls/msi/msipriv.h | 4 ++- dlls/msi/package.c | 97 +++++++------------------------------------------- dlls/msi/patch.c | 71 +++++++++++++++++++++++++++++++------ 5 files changed, 113 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d677fc3271367c4c9f8d…

1 0

Hans Leidekker : msi: Remove directories after removing all files.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 791fe136a9b7becfe0946ff06cfc35c3b2e4338f URL: http://source.winehq.org/git/wine.git/?a=commit;h=791fe136a9b7becfe0946ff06… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 30 12:15:19 2011 +0200 msi: Remove directories after removing all files. --- dlls/msi/action.c | 30 ++++++++++++++++++++++- dlls/msi/files.c | 66 +++++++++++++++++++++++---------------------------- dlls/msi/msipriv.h | 2 +- 3 files changed, 60 insertions(+), 38 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8fe1221..4671f3e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -878,7 +878,7 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param) folder = msi_get_loaded_folder( package, dir ); if (folder->State == FOLDER_STATE_UNINITIALIZED) msi_create_full_path( full_path ); - folder->State = FOLDER_STATE_CREATED_PERSISTENT; + folder->State = FOLDER_STATE_CREATED; return ERROR_SUCCESS; } @@ -1438,6 +1438,32 @@ static UINT load_all_patches(MSIPACKAGE *package) return ERROR_SUCCESS; } +static UINT load_folder_persistence( MSIPACKAGE *package, MSIFOLDER *folder ) +{ + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','C','r','e','a','t','e','F','o','l','d','e','r','`',' ','W','H','E','R','E',' ', + '`','D','i','r','e','c','t','o','r','y','_','`',' ','=','\'','%','s','\'',0}; + MSIQUERY *view; + + folder->persistent = FALSE; + if (!MSI_OpenQuery( package->db, &view, query, folder->Directory )) + { + if (!MSI_ViewExecute( view, NULL )) + { + MSIRECORD *rec; + if (!MSI_ViewFetch( view, &rec )) + { + TRACE("directory %s is persistent\n", debugstr_w(folder->Directory)); + folder->persistent = TRUE; + msiobj_release( &rec->hdr ); + } + } + msiobj_release( &view->hdr ); + } + return ERROR_SUCCESS; +} + static UINT load_folder( MSIRECORD *row, LPVOID param ) { MSIPACKAGE *package = param; @@ -1488,6 +1514,8 @@ static UINT load_folder( MSIRECORD *row, LPVOID param ) TRACE("SourceLong = %s\n", debugstr_w( folder->SourceLongPath )); TRACE("SourceShort = %s\n", debugstr_w( folder->SourceShortPath )); + load_folder_persistence( package, folder ); + list_add_tail( &package->folders, &folder->entry ); return ERROR_SUCCESS; } diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 69f6b68..5749c69 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1212,43 +1212,30 @@ done: return ret; } -static BOOL has_persistent_dir( MSIPACKAGE *package, MSICOMPONENT *comp ) +static void remove_folder( MSIFOLDER *folder ) { - MSIQUERY *view; - UINT r = ERROR_FUNCTION_FAILED; - - static const WCHAR query[] = { - 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','C','r','e','a','t','e','F','o','l','d','e','r','`',' ','W','H','E','R','E',' ', - '`','C','o','m','p','o','n','e','n','t','_','`',' ','=','\'','%','s','\'',' ','A','N','D',' ', - '`','D','i','r','e','c','t','o','r','y','_','`',' ','=','\'','%','s','\'',0}; + FolderList *fl; - if (!MSI_OpenQuery( package->db, &view, query, comp->Component, comp->Directory )) + LIST_FOR_EACH_ENTRY( fl, &folder->children, FolderList, entry ) { - if (!MSI_ViewExecute( view, NULL )) - { - MSIRECORD *rec; - if (!(r = MSI_ViewFetch( view, &rec ))) - { - TRACE("directory %s is persistent\n", debugstr_w(comp->Directory)); - msiobj_release( &rec->hdr ); - } - } - msiobj_release( &view->hdr ); + remove_folder( fl->folder ); + } + if (!folder->persistent && folder->State != FOLDER_STATE_REMOVED) + { + if (RemoveDirectoryW( folder->ResolvedTarget )) folder->State = FOLDER_STATE_REMOVED; } - return (r == ERROR_SUCCESS); } UINT ACTION_RemoveFiles( MSIPACKAGE *package ) { + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','R','e','m','o','v','e','F','i','l','e','`',0}; MSIQUERY *view; + MSICOMPONENT *comp; MSIFILE *file; UINT r; - static const WCHAR query[] = { - 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','R','e','m','o','v','e','F','i','l','e','`',0}; - r = MSI_DatabaseOpenViewW(package->db, query, &view); if (r == ERROR_SUCCESS) { @@ -1259,10 +1246,9 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { MSIRECORD *uirow; - LPWSTR dir, p; VS_FIXEDFILEINFO *ver; - MSICOMPONENT *comp = file->Component; + comp = file->Component; msi_file_update_ui( package, file, szRemoveFiles ); comp->Action = msi_get_component_action( package, comp ); @@ -1300,15 +1286,6 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) { WARN("failed to delete %s (%u)\n", debugstr_w(file->TargetPath), GetLastError()); } - else if (!has_persistent_dir( package, comp )) - { - if ((dir = strdupW( file->TargetPath ))) - { - if ((p = strrchrW( dir, '\\' ))) *p = 0; - RemoveDirectoryW( dir ); - msi_free( dir ); - } - } file->state = msifs_missing; uirow = MSI_CreateRecord( 9 ); @@ -1317,5 +1294,22 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) msi_ui_actiondata( package, szRemoveFiles, uirow ); msiobj_release( &uirow->hdr ); } + LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) + { + MSIFOLDER *folder; + + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_ABSENT) continue; + + if (comp->assembly && !comp->assembly->application) continue; + + if (comp->Attributes & msidbComponentAttributesPermanent) + { + TRACE("permanent component, not removing directory\n"); + continue; + } + folder = msi_get_loaded_folder( package, comp->Directory ); + remove_folder( folder ); + } return ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 09468c4..e2fb03e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -508,10 +508,10 @@ typedef struct tagMSIFOLDER LPWSTR TargetDefault; LPWSTR SourceLongPath; LPWSTR SourceShortPath; - LPWSTR ResolvedTarget; LPWSTR ResolvedSource; enum folder_state State; + BOOL persistent; INT Cost; INT Space; } MSIFOLDER;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2011