February 2010 - Wine-commits

Hans Leidekker : msi: Implement the DeleteServices standard action.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: b9da31f11219e2744108f69c2ac5b0dfb4d2907e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9da31f11219e2744108f69c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 4 10:04:09 2010 +0100 msi: Implement the DeleteServices standard action. --- dlls/msi/action.c | 119 ++++++++++++++++++++++++++++++++++----------- dlls/msi/tests/install.c | 43 +++++++++++++++++ 2 files changed, 133 insertions(+), 29 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 885b415..46d0f7e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4570,26 +4570,12 @@ error: return FALSE; } -static UINT ITERATE_StopService(MSIRECORD *rec, LPVOID param) +static UINT stop_service( LPCWSTR name ) { - MSIPACKAGE *package = param; - MSICOMPONENT *comp; + SC_HANDLE scm = NULL, service = NULL; SERVICE_STATUS status; SERVICE_STATUS_PROCESS ssp; - SC_HANDLE scm = NULL, service = NULL; - LPWSTR name, args; - DWORD event, needed; - - event = MSI_RecordGetInteger(rec, 3); - if (!(event & msidbServiceControlEventStop)) - return ERROR_SUCCESS; - - comp = get_loaded_component(package, MSI_RecordGetString(rec, 6)); - if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) - return ERROR_SUCCESS; - - deformat_string(package, MSI_RecordGetString(rec, 2), &name); - deformat_string(package, MSI_RecordGetString(rec, 4), &args); + DWORD needed; scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (!scm) @@ -4604,16 +4590,14 @@ static UINT ITERATE_StopService(MSIRECORD *rec, LPVOID param) SERVICE_ENUMERATE_DEPENDENTS); if (!service) { - WARN("Failed to open service (%s): %d\n", - debugstr_w(name), GetLastError()); + WARN("Failed to open service (%s): %d\n", debugstr_w(name), GetLastError()); goto done; } if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (LPBYTE)&ssp, sizeof(SERVICE_STATUS_PROCESS), &needed)) { - WARN("Failed to query service status (%s): %d\n", - debugstr_w(name), GetLastError()); + WARN("Failed to query service status (%s): %d\n", debugstr_w(name), GetLastError()); goto done; } @@ -4628,8 +4612,28 @@ static UINT ITERATE_StopService(MSIRECORD *rec, LPVOID param) done: CloseServiceHandle(service); CloseServiceHandle(scm); - msi_free(name); - msi_free(args); + + return ERROR_SUCCESS; +} + +static UINT ITERATE_StopService( MSIRECORD *rec, LPVOID param ) +{ + MSIPACKAGE *package = param; + MSICOMPONENT *comp; + LPWSTR name; + DWORD event; + + event = MSI_RecordGetInteger( rec, 3 ); + if (!(event & msidbServiceControlEventStop)) + return ERROR_SUCCESS; + + comp = get_loaded_component( package, MSI_RecordGetString( rec, 6 ) ); + if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) + return ERROR_SUCCESS; + + deformat_string( package, MSI_RecordGetString( rec, 2 ), &name ); + stop_service( name ); + msi_free( name ); return ERROR_SUCCESS; } @@ -4653,6 +4657,69 @@ static UINT ACTION_StopServices( MSIPACKAGE *package ) return rc; } +static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) +{ + MSIPACKAGE *package = param; + MSICOMPONENT *comp; + LPWSTR name = NULL; + DWORD event; + SC_HANDLE scm = NULL, service = NULL; + + event = MSI_RecordGetInteger( rec, 3 ); + if (!(event & msidbServiceControlEventDelete)) + return ERROR_SUCCESS; + + comp = get_loaded_component( package, MSI_RecordGetString(rec, 6) ); + if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) + return ERROR_SUCCESS; + + deformat_string( package, MSI_RecordGetString(rec, 2), &name ); + stop_service( name ); + + scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ); + if (!scm) + { + WARN("Failed to open the SCM: %d\n", GetLastError()); + goto done; + } + + service = OpenServiceW( scm, name, DELETE ); + if (!service) + { + WARN("Failed to open service (%s): %u\n", debugstr_w(name), GetLastError()); + goto done; + } + + if (!DeleteService( service )) + WARN("Failed to delete service (%s): %u\n", debugstr_w(name), GetLastError()); + +done: + CloseServiceHandle( service ); + CloseServiceHandle( scm ); + msi_free( name ); + + return ERROR_SUCCESS; +} + +static UINT ACTION_DeleteServices( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'S','e','r','v','i','c','e','C','o','n','t','r','o','l',0 }; + + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_DeleteService, package ); + msiobj_release( &view->hdr ); + + return rc; +} + static MSIFILE *msi_find_file( MSIPACKAGE *package, LPCWSTR filename ) { MSIFILE *file; @@ -5995,12 +6062,6 @@ static UINT ACTION_SelfUnregModules( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "SelfUnregModules", table ); } -static UINT ACTION_DeleteServices( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { - 'S','e','r','v','i','c','e','C','o','n','t','r','o','l',0 }; - return msi_unimplemented_action_stub( package, "DeleteServices", table ); -} static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) { static const WCHAR table[] = { diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 153f51a..9b334ed 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -367,6 +367,7 @@ static const CHAR sss_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "WriteEnvironmentStrings\t\t4550\n" "CreateShortcuts\t\t4600\n" "StartServices\t\t5000\n" + "DeleteServices\t\t5500\n" "InstallFinalize\t\t6600\n" "InstallInitialize\t\t1500\n" "InstallValidate\t\t1400\n" @@ -1849,6 +1850,19 @@ static const msi_table sss_tables[] = ADD_TABLE(property) }; +static const msi_table sds_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(sss_install_exec_seq), + ADD_TABLE(service_control), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -7521,6 +7535,34 @@ static void test_start_services(void) } } +static void test_delete_services(void) +{ + UINT r; + + create_test_files(); + create_database(msifile, sds_tables, sizeof(sds_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -7614,6 +7656,7 @@ START_TEST(install) test_feature_override(); test_create_folder(); test_start_services(); + test_delete_services(); DeleteFileA(log_file);

1 0

Marcus Meissner : msi: Call Custom function via wrapper.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 9fab263d397cfd61c6940b049fadcc5906f3cd74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fab263d397cfd61c6940b049… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Feb 3 16:57:00 2010 +0100 msi: Call Custom function via wrapper. --- dlls/msi/custom.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 508bf6b..2b2a3e1 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -647,6 +647,28 @@ static UINT get_action_info( const GUID *guid, INT *type, MSIHANDLE *handle, return ERROR_SUCCESS; } +#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" ) +#else +static inline UINT CUSTOMPROC_wrapper( MsiCustomActionEntryPoint proc, MSIHANDLE handle ) +{ + return proc(handle); +} +#endif + static DWORD ACTION_CallDllFunction( const GUID *guid ) { MsiCustomActionEntryPoint fn; @@ -685,7 +707,7 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) __TRY { - r = fn( hPackage ); + r = CUSTOMPROC_wrapper( fn, hPackage ); } __EXCEPT_PAGE_FAULT {

1 0

Paul Chitescu : qedit: Mostly stubbed out implementation of SampleGrabber filter.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 40c60e8cd2911eadb1590c7d83ee96c0f06bbc64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c60e8cd2911eadb1590c7d8… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Thu Feb 4 02:02:59 2010 +0200 qedit: Mostly stubbed out implementation of SampleGrabber filter. --- dlls/qedit/Makefile.in | 3 +- dlls/qedit/main.c | 1 + dlls/qedit/qedit_private.h | 1 + dlls/qedit/regsvr.c | 6 + dlls/qedit/samplegrabber.c | 453 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 463 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40c60e8cd2911eadb1590…

1 0

Juan Lang : msi: Remove function name from fixme.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: aafcf1a53672e794a22641dff1feb47e6c77d99a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aafcf1a53672e794a22641dff… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 3 16:34:55 2010 -0800 msi: Remove function name from fixme. --- dlls/msi/appsearch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index b99b4f5..c4e4e58 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -463,7 +463,7 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT ACTION_ConvertRegValue(regType, value, sz, appValue); break; default: - FIXME("AppSearch unimplemented for type %d (key path %s, value %s)\n", + FIXME("unimplemented for type %d (key path %s, value %s)\n", type, debugstr_w(keyPath), debugstr_w(valueName)); } end:

1 0

Christian Costa : d3drm: Improve IDirect3DRMMeshBuilderImpl_Load and corresponding test.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: edd9e8cc5b9ba55276a9e3cd69013f92b63615cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=edd9e8cc5b9ba55276a9e3cd6… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Feb 4 08:26:47 2010 +0100 d3drm: Improve IDirect3DRMMeshBuilderImpl_Load and corresponding test. --- dlls/d3drm/meshbuilder.c | 48 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d3drm/tests/d3drm.c | 34 +++++++++++++++++++++++-------- 2 files changed, 71 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index ecf7d4f..0848920 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -39,8 +39,15 @@ typedef struct { LONG ref; } IDirect3DRMMeshBuilderImpl; +typedef struct { + WORD major; + WORD minor; + DWORD flags; +} Header; + static const struct IDirect3DRMMeshBuilderVtbl Direct3DRMMeshBuilder_Vtbl; +static const GUID GUID_Header = { 0x3D82AB43, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; static const GUID GUID_Mesh = { 0x3D82AB44, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; static char templates[] = { @@ -408,6 +415,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if LPDIRECTXFILEENUMOBJECT pEnumObject = NULL; LPDIRECTXFILEDATA pData = NULL; const GUID* pGuid; + DWORD size; + Header* pHeader; HRESULT hr; HRESULT ret = D3DRMERR_BADOBJECT; @@ -431,7 +440,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if if (hr != DXFILE_OK) goto end; - hr = IDirectXFile_RegisterTemplates(pDXFile, templates, sizeof(templates)); + hr = IDirectXFile_RegisterTemplates(pDXFile, templates, strlen(templates)); if (hr != DXFILE_OK) goto end; @@ -449,12 +458,47 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); - if (!IsEqualGUID(pGuid, &GUID_Mesh)) + if (!IsEqualGUID(pGuid, &GUID_Header)) { ret = D3DRMERR_BADFILE; goto end; } + hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&pHeader); + if ((hr != DXFILE_OK) || (size != sizeof(Header))) + goto end; + + TRACE("Version is %d %d %d\n", pHeader->major, pHeader->minor, pHeader->flags); + + /* Version must be 1.0.x */ + if ((pHeader->major != 1) || (pHeader->minor != 0)) + { + ret = D3DRMERR_BADFILE; + goto end; + } + + IDirectXFileData_Release(pData); + pData = NULL; + + hr = IDirectXFileEnumObject_GetNextDataObject(pEnumObject, &pData); + if (hr != DXFILE_OK) + { + ret = D3DRMERR_NOTFOUND; + goto end; + } + + hr = IDirectXFileData_GetType(pData, &pGuid); + if (hr != DXFILE_OK) + goto end; + + TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); + + if (!IsEqualGUID(pGuid, &GUID_Mesh)) + { + ret = D3DRMERR_NOTFOUND; + goto end; + } + ret = D3DRM_OK; end: diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 3a89aa3..d5fb645 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -47,19 +47,30 @@ static BOOL InitFunctionPtrs(void) return TRUE; } -char data_ok[] = +char data_bad_version[] = "xof 0302txt 0064\n" -"Mesh Object\n" +"Header Object\n" "{\n" -"0;\n" -"0;\n" +"1; 2; 3;\n" "}\n"; -char data_bad[] = +char data_no_mesh[] = "xof 0302txt 0064\n" "Header Object\n" "{\n" -"1; 2; 3;\n" +"1; 0; 1;\n" +"}\n"; + +char data_ok[] = +"xof 0302txt 0064\n" +"Header Object\n" +"{\n" +"1; 0; 1;\n" +"}\n" +"Mesh Object\n" +"{\n" +"0;\n" +"0;\n" "}\n"; static void MeshBuilderTest(void) @@ -75,13 +86,18 @@ static void MeshBuilderTest(void) hr = IDirect3DRM_CreateMeshBuilder(pD3DRM, &pMeshBuilder); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); - info.lpMemory = data_bad; - info.dSize = sizeof(data_bad); + info.lpMemory = data_bad_version; + info.dSize = strlen(data_bad_version); hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); ok(hr == D3DRMERR_BADFILE, "Sould have returned D3DRMERR_BADFILE (hr = %x)\n", hr); + info.lpMemory = data_no_mesh; + info.dSize = strlen(data_no_mesh); + hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + ok(hr == D3DRMERR_NOTFOUND, "Sould have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr); + info.lpMemory = data_ok; - info.dSize = sizeof(data_ok); + info.dSize = strlen(data_ok); hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);

1 0

Hans Leidekker : msi: Remove unused and redundant name field from STREAM structure.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 74d6fe35a2577c34a2ec5432fd2dbdb633c0cd53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d6fe35a2577c34a2ec5432f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 4 10:00:24 2010 +0100 msi: Remove unused and redundant name field from STREAM structure. --- dlls/msi/streams.c | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 92de01b..21357cd 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -41,7 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct tabSTREAM { UINT str_index; - LPWSTR name; IStream *stream; } STREAM; @@ -72,7 +71,6 @@ static STREAM *create_stream(MSISTREAMSVIEW *sv, LPWSTR name, BOOL encoded, IStr { STREAM *stream; WCHAR decoded[MAX_STREAM_NAME_LEN]; - LPWSTR ptr = name; stream = msi_alloc(sizeof(STREAM)); if (!stream) @@ -81,18 +79,11 @@ static STREAM *create_stream(MSISTREAMSVIEW *sv, LPWSTR name, BOOL encoded, IStr if (encoded) { decode_streamname(name, decoded); - ptr = decoded; TRACE("stream -> %s %s\n", debugstr_w(name), debugstr_w(decoded)); + name = decoded; } - stream->name = strdupW(ptr); - if (!stream->name) - { - msi_free(stream); - return NULL; - } - - stream->str_index = msi_addstringW(sv->db->strings, 0, stream->name, -1, 1, StringNonPersistent); + stream->str_index = msi_addstringW(sv->db->strings, 0, name, -1, 1, StringNonPersistent); stream->stream = stm; return stream; } @@ -404,8 +395,6 @@ static UINT STREAMS_delete(struct tagMSIVIEW *view) { if (sv->streams[i]->stream) IStream_Release(sv->streams[i]->stream); - - msi_free(sv->streams[i]->name); msi_free(sv->streams[i]); } }

1 0

Hans Leidekker : msi: Implement STREAMS_get_row.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 5741df2e582fa5b1f850ed4e9a1dcb50e49c98a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5741df2e582fa5b1f850ed4e9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 4 10:00:46 2010 +0100 msi: Implement STREAMS_get_row. --- dlls/msi/streams.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 21357cd..f7e8dc2 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -124,9 +124,9 @@ static UINT STREAMS_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; - FIXME("%p %d %p\n", sv, row, rec); + TRACE("%p %d %p\n", sv, row, rec); - return ERROR_CALL_NOT_IMPLEMENTED; + return msi_view_get_row( sv->db, view, row, rec ); } static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask)

1 0

Hans Leidekker : msi: Improve error handling in STREAMS_set_row and add_streams_to_table.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: b833ae026314306e2a18e975ff9d78444ef6d75e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b833ae026314306e2a18e975f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 4 10:01:09 2010 +0100 msi: Improve error handling in STREAMS_set_row and add_streams_to_table. --- dlls/msi/streams.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index f7e8dc2..00a4544 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -141,7 +141,7 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U ULONG count; UINT r = ERROR_FUNCTION_FAILED; - TRACE("(%p, %p)\n", view, rec); + TRACE("(%p, %d, %p, %08x)\n", view, row, rec, mask); if (row > sv->num_rows) return ERROR_FUNCTION_FAILED; @@ -158,7 +158,10 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U } if (stat.cbSize.QuadPart >> 32) + { + WARN("stream too large\n"); goto done; + } data = msi_alloc(stat.cbSize.QuadPart); if (!data) @@ -173,7 +176,10 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U name = strdupW(MSI_RecordGetString(rec, 1)); if (!name) + { + WARN("failed to retrieve stream name\n"); goto done; + } r = write_stream_data(sv->db->storage, name, data, count, FALSE); if (r != ERROR_SUCCESS) @@ -186,8 +192,13 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U if (!stream) goto done; - IStorage_OpenStream(sv->db->storage, name, 0, - STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); + hr = IStorage_OpenStream(sv->db->storage, name, 0, + STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); + if (FAILED(hr)) + { + WARN("failed to open stream: %08x\n", hr); + goto done; + } sv->streams[row] = stream; @@ -204,6 +215,8 @@ static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + TRACE("(%p, %p, %d, %d)\n", view, rec, row, temporary); + if (!streams_set_table_size(sv, ++sv->num_rows)) return ERROR_FUNCTION_FAILED; @@ -411,7 +424,7 @@ static UINT STREAMS_find_matching_rows(struct tagMSIVIEW *view, UINT col, MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; UINT index = PtrToUlong(*handle); - TRACE("(%d, %d): %d\n", *row, col, val); + TRACE("(%p, %d, %d, %p, %p)\n", view, col, val, row, handle); if (col == 0 || col > NUM_STREAMS_COLS) return ERROR_INVALID_PARAMETER; @@ -499,10 +512,17 @@ static INT add_streams_to_table(MSISTREAMSVIEW *sv) break; } - IStorage_OpenStream(sv->db->storage, stat.pwcsName, 0, - STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); + hr = IStorage_OpenStream(sv->db->storage, stat.pwcsName, 0, + STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); CoTaskMemFree(stat.pwcsName); + if (FAILED(hr)) + { + WARN("failed to open stream: %08x\n", hr); + count = -1; + break; + } + if (!streams_set_table_size(sv, ++count)) { count = -1;

1 0

Hans Leidekker : msi: Encode the stream name before trying to open it.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: dcbe0fdff23bb27e8b6fde8ee44c10a3e395b62e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcbe0fdff23bb27e8b6fde8ee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 4 10:01:32 2010 +0100 msi: Encode the stream name before trying to open it. --- dlls/msi/streams.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 00a4544..13dc7fa 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -135,7 +135,7 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U STREAM *stream; IStream *stm; STATSTG stat; - LPWSTR name = NULL; + LPWSTR encname = NULL, name = NULL; USHORT *data = NULL; HRESULT hr; ULONG count; @@ -181,6 +181,8 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U goto done; } + encname = encode_streamname(FALSE, name); + r = write_stream_data(sv->db->storage, name, data, count, FALSE); if (r != ERROR_SUCCESS) { @@ -192,7 +194,7 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U if (!stream) goto done; - hr = IStorage_OpenStream(sv->db->storage, name, 0, + hr = IStorage_OpenStream(sv->db->storage, encname, 0, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); if (FAILED(hr)) { @@ -205,6 +207,7 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U done: msi_free(name); msi_free(data); + msi_free(encname); IStream_Release(stm);

1 0

Hans Leidekker : msi: Allow overwriting an existing stream in STREAMS_set_row.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: c1940c1c5f19d83ed24c0f6472afbe9ec238ea28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1940c1c5f19d83ed24c0f647… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 4 10:01:56 2010 +0100 msi: Allow overwriting an existing stream in STREAMS_set_row. --- dlls/msi/streams.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 13dc7fa..bdb2e2c 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -182,6 +182,7 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U } encname = encode_streamname(FALSE, name); + IStorage_DestroyElement(sv->db->storage, encname); r = write_stream_data(sv->db->storage, name, data, count, FALSE); if (r != ERROR_SUCCESS)

1 0