wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Jacek Caban : mshtml.idl: Add missing MoveUnitBounded to IMarkupPointer2.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: ffbee79c88545a1ff308bc9d9783f4a2d662c718 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffbee79c88545a1ff308bc9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 16:56:57 2020 +0200 mshtml.idl: Add missing MoveUnitBounded to IMarkupPointer2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index 2fd1e6f76c..77f4a9e8bb 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28449,6 +28449,10 @@ interface IMarkupPointer2 : IMarkupPointer [in] IMarkupContainer *pContainer, [in] long lMP); + HRESULT MoveUnitBounded( + [in] MOVEUNIT_ACTION muAction, + [in] IMarkupPointer *pIBoundary); + HRESULT IsInsideURL( [in] IMarkupPointer *pRight, [out] BOOL *pfResult);

1 0

Jacek Caban : mshtml: Add IHTMLDocument4::namespaces property implementation.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: 2406590472620fbef8e7eb94f2e2f6ade8562d85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2406590472620fbef8e7eb94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 16:56:48 2020 +0200 mshtml: Add IHTMLDocument4::namespaces property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 25 +++++-- dlls/mshtml/mshtml_private.h | 4 ++ dlls/mshtml/omnavigator.c | 154 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 23 +++++++ 4 files changed, 202 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2406590472620fbef8e7…

1 0

Jacek Caban : mshtml.idl: Add IHTMLNamespaceCollection declaration.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: e89ef980948e92ea6044da00eb956e13f9f3f0f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e89ef980948e92ea6044da00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 16:56:33 2020 +0200 mshtml.idl: Add IHTMLNamespaceCollection declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 5 +++++ include/mshtml.idl | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 87b8877f4e..4b76d99996 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -4714,4 +4714,9 @@ /* IDocumentRange */ #define DISPID_IDOCUMENTRANGE_CREATERANGE DISPID_OMDOCUMENT+111 +/* IHTMLNamespaceCollection */ +#define DISPID_IHTMLNAMESPACECOLLECTION_LENGTH DISPID_NAMESPACE_COLLECTION +#define DISPID_IHTMLNAMESPACECOLLECTION_ITEM DISPID_VALUE +#define DISPID_IHTMLNAMESPACECOLLECTION_ADD DISPID_NAMESPACE_COLLECTION+1 + #endif /* __MSHTMDID_H__ */ diff --git a/include/mshtml.idl b/include/mshtml.idl index ba7ef0db16..2fd1e6f76c 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28003,6 +28003,61 @@ interface IDOMMessageEvent : IDispatch [in] IHTMLWindow2 *source); } + +/***************************************************************************** + * IHTMLNamespaceCollection interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f6b8-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLNamespaceCollection : IDispatch +{ + [propget, id(DISPID_IHTMLNAMESPACECOLLECTION_LENGTH)] + HRESULT length([out, retval] long *p); + + [id(DISPID_IHTMLNAMESPACECOLLECTION_ITEM)] + HRESULT item( + [in] VARIANT index, + [out, retval] IDispatch **ppNamespace); + + [id(DISPID_IHTMLNAMESPACECOLLECTION_ADD)] + HRESULT add( + [in] BSTR bstrNamespace, + [in] BSTR bstrUrn, + [in, optional] VARIANT implementationUrl, + [out, retval] IDispatch **ppNamespace); +} + +/***************************************************************************** + * DispHTMLNamespaceCollection dispinterface + */ +[ + hidden, + uuid(3050f550-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLNamespaceCollection +{ +properties: +methods: + [propget, id(DISPID_IHTMLNAMESPACECOLLECTION_LENGTH)] + long length(); + + [id(DISPID_IHTMLNAMESPACECOLLECTION_ITEM)] + IDispatch *item([in] VARIANT index); + + [id(DISPID_IHTMLNAMESPACECOLLECTION_ADD)] + IDispatch *add( + [in] BSTR bstrNamespace, + [in] BSTR bstrUrn, + [in, optional] VARIANT implementationUrl); + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch *constructor(); +} + /***************************************************************************** * ILineInfo interface */

1 0

Paul Gofman : ntdll: Add PE frame handling to KiUserExceptionDispatcher() on x64.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: c02b63fb60458ec750e5991a7491235861c40061 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c02b63fb60458ec750e5991a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 2 15:34:47 2020 +0300 ntdll: Add PE frame handling to KiUserExceptionDispatcher() on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b575d63857..dde0bb7339 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -588,15 +588,22 @@ __ASM_GLOBAL_FUNC( KiUserExceptionDispatcher, "mov %rbp,-0x10(%rcx)\n\t" "mov %rdi,-0x18(%rcx)\n\t" "mov %rsi,-0x20(%rcx)\n\t" - "mov %rcx,%rbp\n\t" + "lea -0x10(%rcx),%rbp\n\t" "mov %rsp,%rdx\n\t" /* context */ "lea 0x4f0(%rsp),%rcx\n\t" /* rec */ + __ASM_SEH(".seh_pushreg %rbp\n\t") + __ASM_SEH(".seh_setframe %rbp,0\n\t") + __ASM_SEH(".seh_pushreg %rdi\n\t") + __ASM_SEH(".seh_pushreg %rsi\n\t") + __ASM_SEH(".seh_endprologue\n\t") + __ASM_CFI(".cfi_signal_frame\n\t") - __ASM_CFI(".cfi_def_cfa %rbp,0\n\t") - __ASM_CFI(".cfi_rel_offset %rip,-0x8\n\t") - __ASM_CFI(".cfi_rel_offset %rbp,-0x10\n\t") - __ASM_CFI(".cfi_rel_offset %rdi,-0x18\n\t") - __ASM_CFI(".cfi_rel_offset %rsi,-0x20\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0x10\n\t") + __ASM_CFI(".cfi_def_cfa %rbp,0x10\n\t") + __ASM_CFI(".cfi_rel_offset %rip,0x8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0x0\n\t") + __ASM_CFI(".cfi_rel_offset %rdi,-0x8\n\t") + __ASM_CFI(".cfi_rel_offset %rsi,-0x10\n\t") "call " __ASM_NAME("dispatch_exception") "\n\t" "int3")

1 0

Paul Gofman : ntdll: Don't reset rsp to context->Rsp until exception data is copied.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: 69b6572338396134a3e20189cb35445d68757ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=69b6572338396134a3e20189… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 2 11:06:04 2020 +0300 ntdll: Don't reset rsp to context->Rsp until exception data is copied. Context record may be stored on stack below context stack. This happens, e. g., with RtlRaiseException(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 5334a4d7cc..cb0fdfb00f 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1979,17 +1979,18 @@ __ASM_GLOBAL_FUNC( user_exception_dispatcher_trampoline, void WINAPI do_call_user_exception_dispatcher(EXCEPTION_RECORD *rec, CONTEXT *context, struct stack_layout *stack) { - memcpy(&stack->context, context, sizeof(*context)); + memmove(&stack->context, context, sizeof(*context)); memcpy(&stack->rec, rec, sizeof(*rec)); user_exception_dispatcher_trampoline( stack, pKiUserExceptionDispatcher ); } __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, - "movq 0x98(%rdx),%rsp\n\t" /* context->Rsp */ - "and $~0xf,%rsp\n\t" - "sub $0x630,%rsp\n\t" /* sizeof(struct stack_layout) */ - "movq %rsp,%r8\n\t" + "movq 0x98(%rdx),%r8\n\t" /* context->Rsp */ + "andq $~0xf,%r8\n\t" + "subq $0x630,%r8\n\t" /* sizeof(struct stack_layout) */ + "cmpq %r8,%rsp\n\t" + "cmovbq %r8,%rsp\n\t" "jmp " __ASM_NAME("do_call_user_exception_dispatcher") "\n\t") /***********************************************************************

1 0

Piotr Caban : msi: Install feature when new component is added.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: 877540b522c46134aa1b843519fa5694adb187ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=877540b522c46134aa1b8435… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 1 10:44:00 2020 +0200 msi: Install feature when new component is added. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49350 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 112 ++++++++++++++++++++++++++++++++++++++++++++----- dlls/msi/msipriv.h | 2 + dlls/msi/patch.c | 5 +++ dlls/msi/tests/patch.c | 2 +- 4 files changed, 110 insertions(+), 11 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index bc7fecbd73..d02860e4d7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1374,6 +1374,49 @@ static UINT load_all_patches(MSIPACKAGE *package) return rc; } +static UINT iterate_patched_component( MSIRECORD *row, LPVOID param ) +{ + MSIPACKAGE *package = param; + const WCHAR *name; + MSICOMPONENT *c; + + name = MSI_RecordGetString( row, 1 ); + TRACE( "found patched component: %s\n", wine_dbgstr_w(name) ); + c = msi_get_loaded_component( package, name ); + if (!c) + return ERROR_SUCCESS; + + c->updated = 1; + if (!wcscmp( MSI_RecordGetString( row, 2 ), L"INSERT" )) + c->added = 1; + return ERROR_SUCCESS; +} + +static void mark_patched_components( MSIPACKAGE *package ) +{ + static const WCHAR select[] = L"SELECT `Row`, `Column` FROM `_TransformView` WHERE `Table`='Component'"; + MSIQUERY *q; + UINT r; + + r = MSI_OpenQuery( package->db, &q, select ); + if (r != ERROR_SUCCESS) + return; + + MSI_IterateRecords( q, NULL, iterate_patched_component, package ); + msiobj_release( &q->hdr ); + + while (1) + { + r = MSI_OpenQuery( package->db, &q, L"ALTER TABLE `_TransformView` FREE" ); + if (r != ERROR_SUCCESS) + return; + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + if (r != ERROR_SUCCESS) + return; + } +} + static UINT load_folder_persistence( MSIPACKAGE *package, MSIFOLDER *folder ) { static const WCHAR query[] = { @@ -1518,6 +1561,7 @@ static UINT ACTION_CostInitialize(MSIPACKAGE *package) msi_load_all_features( package ); load_all_files( package ); load_all_patches( package ); + mark_patched_components( package ); load_all_media( package ); return ERROR_SUCCESS; @@ -1802,12 +1846,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } } } - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - { - if (feature->Feature_Parent) continue; - disable_children( feature, level ); - follow_parent( feature ); - } } else if (!msi_get_property_int( package->db, szInstalled, 0 )) { @@ -1834,15 +1872,69 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } } } - /* disable child features of unselected parent or follow parent */ + } + else + { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - if (feature->Feature_Parent) continue; - disable_children( feature, level ); - follow_parent( feature ); + ComponentList *cl; + MSIFEATURE *cur; + + if (!is_feature_selected( feature, level )) continue; + if (feature->ActionRequest != INSTALLSTATE_UNKNOWN) continue; + + LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) + { + if (!cl->component->updated && !cl->component->added) + continue; + + cur = feature; + while (cur) + { + if (cur->ActionRequest != INSTALLSTATE_UNKNOWN) + break; + + if (cur->Installed != INSTALLSTATE_ABSENT) + { + cur->Action = cur->Installed; + cur->ActionRequest = cur->Installed; + } + else if (!cl->component->added) + { + break; + } + else if (cur->Attributes & msidbFeatureAttributesFavorSource) + { + cur->Action = INSTALLSTATE_SOURCE; + cur->ActionRequest = INSTALLSTATE_SOURCE; + } + else if (cur->Attributes & msidbFeatureAttributesFavorAdvertise) + { + cur->Action = INSTALLSTATE_ADVERTISED; + cur->ActionRequest = INSTALLSTATE_ADVERTISED; + } + else + { + cur->Action = INSTALLSTATE_LOCAL; + cur->ActionRequest = INSTALLSTATE_LOCAL; + } + + if (!cur->Feature_Parent) + break; + cur = msi_get_loaded_feature(package, cur->Feature_Parent); + } + } } } + /* disable child features of unselected parent or follow parent */ + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + { + if (feature->Feature_Parent) continue; + disable_children( feature, level ); + follow_parent( feature ); + } + /* now we want to set component state based based on feature state */ LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index dbe833e613..a1b7f033c3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -544,6 +544,8 @@ typedef struct tagMSICOMPONENT unsigned int hasAdvertisedFeature:1; unsigned int hasLocalFeature:1; unsigned int hasSourceFeature:1; + unsigned int added:1; + unsigned int updated:1; } MSICOMPONENT; typedef struct tagComponentList diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index 1233ec306b..67da577841 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -274,9 +274,14 @@ static UINT apply_substorage_transform( MSIPACKAGE *package, MSIDATABASE *patch_ { ret = check_transform_applicable( package, stg ); if (ret == ERROR_SUCCESS) + { + msi_table_apply_transform( package->db, stg, MSITRANSFORM_ERROR_VIEWTRANSFORM ); msi_table_apply_transform( package->db, stg, 0 ); + } else + { TRACE("substorage transform %s wasn't applicable\n", debugstr_w(name)); + } IStorage_Release( stg ); } else diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index a846defef4..87f64d6c83 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -844,7 +844,7 @@ static void test_simple_patch( void ) size = get_pf_file_size( "msitest\\patch.txt" ); ok( size == 1002, "expected 1002, got %u\n", size ); size = get_pf_file_size( "msitest\\file.txt" ); - todo_wine ok( size == 1000, "expected 1000, got %u\n", size ); + ok( size == 1000, "expected 1000, got %u\n", size ); /* show that MsiOpenPackage applies registered patches */ r = MsiOpenPackageA( path, &hpackage );

1 0

Piotr Caban : msi: Add disabled feature to show that it's not getting installed by patch.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: 99e7c801e4d5032110190acbb04d85eb069df867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99e7c801e4d5032110190acb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 1 10:43:18 2020 +0200 msi: Add disabled feature to show that it's not getting installed by patch. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/patch.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 6449b7e67a..a846defef4 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -73,7 +73,8 @@ static const char file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" "File\tFile\n" - "patch.txt\tpatch\tpatch.txt\t1000\t\t\t0\t1\n"; + "patch.txt\tpatch\tpatch.txt\t1000\t\t\t0\t1\n" + "disable.txt\tdisable\tdisable.txt\t1000\t\t\t0\t1\n"; static const char directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -87,19 +88,22 @@ static const char component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" - "patch\t{4B79D87E-6D28-4FD3-92D6-CD9B26AF64F1}\tMSITESTDIR\t0\t\tpatch.txt\n"; + "patch\t{4B79D87E-6D28-4FD3-92D6-CD9B26AF64F1}\tMSITESTDIR\t0\t\tpatch.txt\n" + "disable\t{BDDBA0EE-0031-4591-ADC0-33308175AC19}\tMSITESTDIR\t0\t\tdisable.txt\n"; static const char feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" "Feature\tFeature\n" - "patch\t\t\tpatch feature\t1\t1\tMSITESTDIR\t0\n"; + "patch\t\t\tpatch feature\t1\t1\tMSITESTDIR\t0\n" + "disable\t\t\tdisabled feature\t1\t1\tMSITESTDIR\t0\n"; static const char feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" "FeatureComponents\tFeature_\tComponent_\n" - "patch\tpatch\n"; + "patch\tpatch\n" + "disable\tdisable\n"; static const char install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -121,6 +125,12 @@ static const char install_exec_seq_dat[] = "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; +static const char condition_dat[] = + "Feature_\tLevel\tCondition\n" + "s38\ti2\tS255\n" + "Condition\tFeature_\tLevel\n" + "disable\t0\tDISABLE_FEATURE\n"; + struct msi_table { const char *filename; @@ -139,7 +149,8 @@ static const struct msi_table tables[] = ADD_TABLE( feature_comp ), ADD_TABLE( property ), ADD_TABLE( install_exec_seq ), - ADD_TABLE( media ) + ADD_TABLE( media ), + ADD_TABLE( condition ) }; static void init_function_pointers( void ) @@ -757,7 +768,7 @@ static void test_simple_patch( void ) MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); - r = MsiInstallProductA( msifile, NULL ); + r = MsiInstallProductA( msifile, "DISABLE_FEATURE=1" ); if (r != ERROR_SUCCESS) { skip("Product installation failed with error code %u\n", r); @@ -1101,7 +1112,7 @@ static void test_system_tables( void ) MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); - r = MsiInstallProductA( msifile, NULL ); + r = MsiInstallProductA( msifile, "DISABLE_FEATURE=1" ); if (r != ERROR_SUCCESS) { skip("Product installation failed with error code %d\n", r); @@ -1290,7 +1301,7 @@ static void test_patch_registration( void ) MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); - r = MsiInstallProductA( msifile, NULL ); + r = MsiInstallProductA( msifile, "DISABLE_FEATURE=1" ); if (r != ERROR_SUCCESS) { skip("Product installation failed with error code %d\n", r);

1 0

Piotr Caban : msi: Test adding new feature in patch.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: cc8bc83e9ecd2aba8e322a974af268e715fbd372 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc8bc83e9ecd2aba8e322a97… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 1 10:43:13 2020 +0200 msi: Test adding new feature in patch. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/patch.c | 126 ++++++++++++++++++++++++++++++------------------- 1 file changed, 77 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc8bc83e9ecd2aba8e32…

1 0

Piotr Caban : msi: Add support for appending data to _TransformView table.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: 3459c90cd6a49e817213b6e6764bdfafa7d4bcc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3459c90cd6a49e817213b6e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 1 10:43:08 2020 +0200 msi: Add support for appending data to _TransformView table. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 27f3763d34..612a369597 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2336,7 +2336,7 @@ static UINT TransformView_fetch_stream( MSIVIEW *view, UINT row, UINT col, IStre static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) { static const WCHAR query_pfx[] = - L"INSERT INTO `_TransformView` (`Table`, `Column`, `Row`, `Data`, `Current`) VALUES ('"; + L"INSERT INTO `_TransformView` (`new`, `Table`, `Column`, `Row`, `Data`, `Current`) VALUES (1, '"; MSITABLEVIEW *tv = (MSITABLEVIEW*)view; WCHAR buf[256], *query; @@ -2372,7 +2372,7 @@ static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT if (tv->columns[i].type & MSITYPE_KEY) continue; - qlen = p = wcslen( query_pfx ); + qlen = p = ARRAY_SIZE( query_pfx ) - 1; qlen += wcslen( tv->name ) + 3; /* strlen("','") */ qlen += wcslen( tv->columns[i].colname ) + 3; qlen += wcslen( key ) + 3; @@ -2481,7 +2481,7 @@ static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT static UINT TransformView_create_table( MSITABLEVIEW *tv, MSIRECORD *rec ) { static const WCHAR query_fmt[] = - L"INSERT INTO `_TransformView` (`Table`, `Column`) VALUES ('%s', 'CREATE')"; + L"INSERT INTO `_TransformView` (`Table`, `Column`, `new`) VALUES ('%s', 'CREATE', 1)"; WCHAR buf[256], *query = buf; const WCHAR *name; @@ -2516,7 +2516,7 @@ static UINT TransformView_create_table( MSITABLEVIEW *tv, MSIRECORD *rec ) static UINT TransformView_add_column( MSITABLEVIEW *tv, MSIRECORD *rec ) { static const WCHAR query_pfx[] = - L"INSERT INTO `_TransformView` (`Table`, `Current`, `Column`, `Data`) VALUES ('"; + L"INSERT INTO `_TransformView` (`new`, `Table`, `Current`, `Column`, `Data`) VALUES (1, '"; WCHAR buf[256], *query = buf; UINT i, p, len, r, qlen; @@ -2569,7 +2569,7 @@ static UINT TransformView_add_column( MSITABLEVIEW *tv, MSIRECORD *rec ) static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary ) { static const WCHAR query_fmt[] = - L"INSERT INTO `_TransformView` (`Table`, `Column`, `Row`) VALUES ('%s', 'INSERT', '%s')"; + L"INSERT INTO `_TransformView` (`new`, `Table`, `Column`, `Row`) VALUES (1, '%s', 'INSERT', '%s')"; MSITABLEVIEW *tv = (MSITABLEVIEW*)view; WCHAR buf[256], *query = buf; @@ -2617,7 +2617,7 @@ static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, B static UINT TransformView_drop_table( MSITABLEVIEW *tv, UINT row ) { - static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` ( `Table`, `Column` ) VALUES ( '"; + static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` ( `new`, `Table`, `Column` ) VALUES ( 1, '"; static const WCHAR query_sfx[] = L"', 'DROP' )"; WCHAR buf[256], *query = buf; @@ -2661,7 +2661,7 @@ static UINT TransformView_drop_table( MSITABLEVIEW *tv, UINT row ) static UINT TransformView_delete_row( MSIVIEW *view, UINT row ) { - static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` ( `Table`, `Column`, `Row`) VALUES ( '"; + static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` ( `new`, `Table`, `Column`, `Row`) VALUES ( 1, '"; static const WCHAR query_column[] = L"', 'DELETE', '"; static const WCHAR query_sfx[] = L"')"; @@ -2780,7 +2780,7 @@ static const MSIVIEWOPS transform_view_ops = UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIVIEW **view ) { static const WCHAR query_pfx[] = L"SELECT `Column`, `Data`, `Current` FROM `_TransformView` WHERE `Table`='"; - static const WCHAR query_sfx[] = L"' AND `Row` IS NULL AND `Current` IS NOT NULL"; + static const WCHAR query_sfx[] = L"' AND `Row` IS NULL AND `Current` IS NOT NULL AND `new` = 1"; WCHAR buf[256], *query = buf; UINT r, len, name_len, size, add_col; @@ -3392,7 +3392,7 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg, int err_cond ) UINT ret = ERROR_FUNCTION_FAILED; UINT bytes_per_strref; BOOL property_update = FALSE; - BOOL free_transform_view = FALSE; + MSIVIEW *transform_view = NULL; TRACE("%p %p\n", db, stg ); @@ -3472,11 +3472,19 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg, int err_cond ) if (r == ERROR_SUCCESS) MSI_ViewClose( query ); msiobj_release( &query->hdr ); + if (r != ERROR_BAD_QUERY_SYNTAX && r != ERROR_SUCCESS) + goto end; + + if (TABLE_CreateView(db, L"_TransformView", &transform_view) != ERROR_SUCCESS) + goto end; + if (r == ERROR_BAD_QUERY_SYNTAX) - FIXME( "support adding to _TransformView\n" ); + transform_view->ops->add_ref( transform_view ); + + r = transform_view->ops->add_column( transform_view, L"new", + MSITYPE_TEMPORARY | MSITYPE_NULLABLE | 0x402 /* INT */, FALSE ); if (r != ERROR_SUCCESS) goto end; - free_transform_view = TRUE; } /* @@ -3520,16 +3528,16 @@ end: IEnumSTATSTG_Release( stgenum ); if ( strings ) msi_destroy_stringtable( strings ); - if (ret != ERROR_SUCCESS && free_transform_view) + if (transform_view) { - MSIQUERY *query; - if (MSI_DatabaseOpenViewW( db, L"ALTER TABLE `_TransformView` FREE", - &query ) == ERROR_SUCCESS) - { - if (MSI_ViewExecute( query, NULL ) == ERROR_SUCCESS) - MSI_ViewClose( query ); - msiobj_release( &query->hdr ); - } + struct tagMSITABLE *table = ((MSITABLEVIEW*)transform_view)->table; + + if (ret != ERROR_SUCCESS) + transform_view->ops->release( transform_view ); + + if (!wcscmp(table->colinfo[table->col_count - 1].colname, L"new")) + TABLE_remove_column( transform_view, table->colinfo[table->col_count - 1].number ); + transform_view->ops->delete( transform_view ); } return ret;

1 0

Piotr Caban : msi: Remove no longer needed parameter from TABLE_remove_column.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: d579b17eb425ac5e28f9263ebf302ea2282996ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d579b17eb425ac5e28f9263e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 1 10:43:05 2020 +0200 msi: Remove no longer needed parameter from TABLE_remove_column. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 3febcb3aa9..27f3763d34 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1949,7 +1949,7 @@ static UINT TABLE_add_ref(struct tagMSIVIEW *view) return InterlockedIncrement(&tv->table->ref_count); } -static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT number) +static UINT TABLE_remove_column(struct tagMSIVIEW *view, UINT number) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; MSIRECORD *rec = NULL; @@ -1974,7 +1974,7 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num if (!rec) return ERROR_OUTOFMEMORY; - MSI_RecordSetStringW(rec, 1, table); + MSI_RecordSetStringW(rec, 1, tv->name); MSI_RecordSetInteger(rec, 2, number); r = TABLE_CreateView(tv->db, szColumns, &columns); @@ -1992,7 +1992,7 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num if (r != ERROR_SUCCESS) goto done; - msi_update_table_columns(tv->db, table); + msi_update_table_columns(tv->db, tv->name); done: msiobj_release(&rec->hdr); @@ -2016,8 +2016,7 @@ static UINT TABLE_release(struct tagMSIVIEW *view) { if (tv->table->colinfo[i].type & MSITYPE_TEMPORARY) { - r = TABLE_remove_column(view, tv->table->colinfo[i].tablename, - tv->table->colinfo[i].number); + r = TABLE_remove_column(view, tv->table->colinfo[i].number); if (r != ERROR_SUCCESS) break; } @@ -2145,8 +2144,7 @@ static UINT TABLE_drop(struct tagMSIVIEW *view) for (i = tv->table->col_count - 1; i >= 0; i--) { - r = TABLE_remove_column(view, tv->table->colinfo[i].tablename, - tv->table->colinfo[i].number); + r = TABLE_remove_column(view, tv->table->colinfo[i].number); if (r != ERROR_SUCCESS) return r; }

1 0

← Newer
1
...
74
75
76
77
78
79
80
...
83
Older →

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 2020