September 2018 - Wine-commits

Nikolay Sivov : opcservices: Implement GetRelationship().
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 7e310f87fe1c781dcdbba854df84db29c86d1238 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e310f87fe1c781dcdbba854… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:14 2018 +0300 opcservices: Implement GetRelationship(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 25 +++++++++++++++++++++++-- dlls/opcservices/tests/opcservices.c | 21 ++++++++++++++++++++- include/opcbase.idl | 1 + 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 00f4a4f..d0d39a9 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -583,9 +583,30 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet *iface, const WCHAR *id, IOpcRelationship **relationship) { - FIXME("iface %p, id %s, relationship %p stub!\n", iface, debugstr_w(id), relationship); + struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); + size_t i; - return E_NOTIMPL; + TRACE("iface %p, id %s, relationship %p.\n", iface, debugstr_w(id), relationship); + + if (!relationship) + return E_POINTER; + + *relationship = NULL; + + if (!id) + return E_POINTER; + + for (i = 0; i < relationship_set->count; i++) + { + if (!strcmpW(id, relationship_set->relationships[i]->id)) + { + *relationship = &relationship_set->relationships[i]->IOpcRelationship_iface; + IOpcRelationship_AddRef(*relationship); + break; + } + } + + return *relationship ? S_OK : OPC_E_NO_SUCH_RELATIONSHIP; } static HRESULT WINAPI opc_relationship_set_CreateRelationship(IOpcRelationshipSet *iface, const WCHAR *id, diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index a2a032f..63809aa 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -232,8 +232,8 @@ static void test_relationship(void) static const WCHAR typeW[] = {'t','y','p','e',0}; static const WCHAR rootW[] = {'/',0}; IUri *target_uri, *target_uri2, *uri; + IOpcRelationship *rel, *rel2, *rel3; IOpcUri *source_uri, *source_uri2; - IOpcRelationship *rel, *rel2; IOpcRelationshipSet *rels; IOpcFactory *factory; IOpcPackage *package; @@ -283,6 +283,25 @@ todo_wine hr = IOpcRelationship_GetId(rel, &id); ok(SUCCEEDED(hr), "Failed to get id, hr %#x.\n", hr); ok(lstrlenW(id) == 9 && *id == 'R', "Unexpected relationship id %s.\n", wine_dbgstr_w(id)); + + hr = IOpcRelationshipSet_GetRelationship(rels, id, &rel3); + ok(SUCCEEDED(hr), "Failed to get relationship, hr %#x.\n", hr); + IOpcRelationship_Release(rel3); + + hr = IOpcRelationshipSet_GetRelationship(rels, id, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + rel3 = (void *)0xdeadbeef; + hr = IOpcRelationshipSet_GetRelationship(rels, NULL, &rel3); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(rel3 == NULL, "Expected null pointer.\n"); + + *id = 'r'; + rel3 = (void *)0xdeadbeef; + hr = IOpcRelationshipSet_GetRelationship(rels, id, &rel3); + ok(hr == OPC_E_NO_SUCH_RELATIONSHIP, "Unexpected hr %#x.\n", hr); + ok(rel3 == NULL, "Expected null pointer.\n"); + CoTaskMemFree(id); hr = IOpcRelationship_GetTargetUri(rel, &uri); diff --git a/include/opcbase.idl b/include/opcbase.idl index 80f459f..ca42ceb 100644 --- a/include/opcbase.idl +++ b/include/opcbase.idl @@ -42,3 +42,4 @@ typedef [v1_enum] enum } OPC_URI_TARGET_MODE; cpp_quote("#define OPC_E_INVALID_RELATIONSHIP_TARGET MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x12)") +cpp_quote("#define OPC_E_NO_SUCH_RELATIONSHIP MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x48)")

1 0

Nikolay Sivov : opcservices: Implement RelationshipExists().
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 89c2553503bae0539530fc13e37a96dd4e65a39f URL: https://source.winehq.org/git/wine.git/?a=commit;h=89c2553503bae0539530fc13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:15 2018 +0300 opcservices: Implement RelationshipExists(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 37 ++++++++++++++++++++++++++---------- dlls/opcservices/tests/opcservices.c | 19 ++++++++++++++++++ 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index d0d39a9..370b42e 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -580,11 +580,25 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) return refcount; } +static struct opc_relationship *opc_relationshipset_get_item(struct opc_relationship_set *relationship_set, + const WCHAR *id) +{ + size_t i; + + for (i = 0; i < relationship_set->count; i++) + { + if (!strcmpW(id, relationship_set->relationships[i]->id)) + return relationship_set->relationships[i]; + } + + return NULL; +} + static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet *iface, const WCHAR *id, IOpcRelationship **relationship) { struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); - size_t i; + struct opc_relationship *ret; TRACE("iface %p, id %s, relationship %p.\n", iface, debugstr_w(id), relationship); @@ -596,14 +610,10 @@ static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet * if (!id) return E_POINTER; - for (i = 0; i < relationship_set->count; i++) + if ((ret = opc_relationshipset_get_item(relationship_set, id))) { - if (!strcmpW(id, relationship_set->relationships[i]->id)) - { - *relationship = &relationship_set->relationships[i]->IOpcRelationship_iface; - IOpcRelationship_AddRef(*relationship); - break; - } + *relationship = &ret->IOpcRelationship_iface; + IOpcRelationship_AddRef(*relationship); } return *relationship ? S_OK : OPC_E_NO_SUCH_RELATIONSHIP; @@ -632,9 +642,16 @@ static HRESULT WINAPI opc_relationship_set_DeleteRelationship(IOpcRelationshipSe static HRESULT WINAPI opc_relationship_set_RelationshipExists(IOpcRelationshipSet *iface, const WCHAR *id, BOOL *exists) { - FIXME("iface %p, id %s, exists %p stub!\n", iface, debugstr_w(id), exists); + struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); - return E_NOTIMPL; + TRACE("iface %p, id %s, exists %p.\n", iface, debugstr_w(id), exists); + + if (!id || !exists) + return E_POINTER; + + *exists = opc_relationshipset_get_item(relationship_set, id) != NULL; + + return S_OK; } static HRESULT WINAPI opc_relationship_set_GetEnumerator(IOpcRelationshipSet *iface, diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 63809aa..4bb3d64 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -241,6 +241,7 @@ static void test_relationship(void) DWORD mode; HRESULT hr; WCHAR *id; + BOOL ret; BSTR str; factory = create_factory(); @@ -284,6 +285,19 @@ todo_wine ok(SUCCEEDED(hr), "Failed to get id, hr %#x.\n", hr); ok(lstrlenW(id) == 9 && *id == 'R', "Unexpected relationship id %s.\n", wine_dbgstr_w(id)); + ret = 123; + hr = IOpcRelationshipSet_RelationshipExists(rels, NULL, &ret); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(ret == 123, "Unexpected result %d.\n", ret); + + hr = IOpcRelationshipSet_RelationshipExists(rels, id, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + ret = FALSE; + hr = IOpcRelationshipSet_RelationshipExists(rels, id, &ret); + ok(SUCCEEDED(hr), "Failed to get relationship, hr %#x.\n", hr); + ok(ret, "Unexpected result %d.\n", ret); + hr = IOpcRelationshipSet_GetRelationship(rels, id, &rel3); ok(SUCCEEDED(hr), "Failed to get relationship, hr %#x.\n", hr); IOpcRelationship_Release(rel3); @@ -302,6 +316,11 @@ todo_wine ok(hr == OPC_E_NO_SUCH_RELATIONSHIP, "Unexpected hr %#x.\n", hr); ok(rel3 == NULL, "Expected null pointer.\n"); + ret = TRUE; + hr = IOpcRelationshipSet_RelationshipExists(rels, id, &ret); + ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(!ret, "Unexpected result %d.\n", ret); + CoTaskMemFree(id); hr = IOpcRelationship_GetTargetUri(rel, &uri);

1 0

Alexandre Julliard : shell32: Assume that system directory always contains a drive letter.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 54530bc4933ae1014c3697c95e22b8ca5a275bc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54530bc4933ae1014c3697c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:48:49 2018 +0200 shell32: Assume that system directory always contains a drive letter. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index fd375a3..afd6340 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3792,8 +3792,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) /* get the system drive */ GetSystemDirectoryW(def_val, MAX_PATH); - if (def_val[1] == ':') strcpyW( def_val + 3, szDefaultProfileDirW ); - else FIXME("non-drive system paths unsupported\n"); + strcpyW( def_val + 3, szDefaultProfileDirW ); hr = _SHGetProfilesValue(key, ProfilesDirectoryW, szProfilesPrefix, def_val ); } @@ -3807,8 +3806,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; GetSystemDirectoryW(def_val, MAX_PATH); - if (def_val[1] == ':') strcpyW( def_val + 3, UsersPublicW ); - else FIXME("non-drive system paths unsupported\n"); + strcpyW( def_val + 3, UsersPublicW ); hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); PathAppendW(szDest, szAllUsers); @@ -3833,8 +3831,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) if (!in_registry) { GetSystemDirectoryW(def_val, MAX_PATH); - if (def_val[1] == ':') strcpyW( def_val + 3, ProgramDataW ); - else FIXME("non-drive system paths unsupported\n"); + strcpyW( def_val + 3, ProgramDataW ); } hr = _SHGetProfilesValue(key, ProgramDataW, szProgramData, def_val); @@ -3854,16 +3851,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) else if (!strncmpiW(szTemp, SystemDriveW, strlenW(SystemDriveW))) { GetSystemDirectoryW(szDest, MAX_PATH); - if (szDest[1] != ':') - { - FIXME("non-drive system paths unsupported\n"); - hr = E_FAIL; - } - else - { - strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1); - hr = S_OK; - } + strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1); } else {

1 0

Alexandre Julliard : shell32: Avoid infinite loop in _SHExpandEnvironmentStrings.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: ceea5bda14ecf4c8ce262fc7ab88df49e500bc38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceea5bda14ecf4c8ce262fc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:59:45 2018 +0200 shell32: Avoid infinite loop in _SHExpandEnvironmentStrings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index afd6340..dccfbba 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3855,22 +3855,15 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) } else { - DWORD ret = ExpandEnvironmentStringsW(szSrc, szDest, MAX_PATH); + DWORD ret = ExpandEnvironmentStringsW(szTemp, szDest, MAX_PATH); if (ret > MAX_PATH) hr = E_NOT_SUFFICIENT_BUFFER; else if (ret == 0) hr = HRESULT_FROM_WIN32(GetLastError()); - else - hr = S_OK; - } - if (SUCCEEDED(hr) && szDest[0] == '%') - strcpyW(szTemp, szDest); - else - { - /* terminate loop */ - szTemp[0] = '\0'; + else if (!strcmpW( szTemp, szDest )) break; /* nothing expanded */ } + if (SUCCEEDED(hr)) strcpyW(szTemp, szDest); } end: if (key)

1 0

Alexandre Julliard : shell32: Re-add support for expanding ALLUSERSPROFILE for backward compatibility.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 4a6855a575c02aa1569aab8b2e96720fc02f3f26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a6855a575c02aa1569aab8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 13:00:15 2018 +0200 shell32: Re-add support for expanding ALLUSERSPROFILE for backward compatibility. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index dccfbba..f08474b 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -951,7 +951,8 @@ static const WCHAR Videos_Sample_VideosW[] = {'V','i','d','e','o','s','\\','S',' static const WCHAR WindowsW[] = {'W','i','n','d','o','w','s',0}; static const WCHAR Windows_Sidebar_GadgetsW[] = {'W','i','n','d','o','w','s',' ','S','i','d','e','b','a','r','\\','G','a','d','g','e','t','s',0}; static const WCHAR DefaultW[] = {'.','D','e','f','a','u','l','t','\0'}; -static const WCHAR AllUsersProfileW[] = {'%','P','U','B','L','I','C','%',0}; +static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'}; +static const WCHAR PublicProfileW[] = {'%','P','U','B','L','I','C','%',0}; static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'}; static const WCHAR ProgramDataVarW[] = {'%','P','r','o','g','r','a','m','D','a','t','a','%','\0'}; static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'}; @@ -3474,7 +3475,7 @@ static HRESULT _SHGetDefaultValue(BYTE folder, LPWSTR pszPath) strcpyW(pszPath, UserProfileW); break; case CSIDL_Type_AllUsers: - strcpyW(pszPath, AllUsersProfileW); + strcpyW(pszPath, PublicProfileW); break; case CSIDL_Type_ProgramData: strcpyW(pszPath, ProgramDataVarW); @@ -3812,6 +3813,17 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) PathAppendW(szDest, szAllUsers); PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); } + else if (!strncmpiW(szTemp, PublicProfileW, strlenW(PublicProfileW))) + { + WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; + + GetSystemDirectoryW(def_val, MAX_PATH); + strcpyW( def_val + 3, UsersPublicW ); + + hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); + PathAppendW(szDest, szAllUsers); + PathAppendW(szDest, szTemp + strlenW(PublicProfileW)); + } else if (!strncmpiW(szTemp, ProgramDataVarW, strlenW(ProgramDataVarW))) { WCHAR szProgramData[MAX_PATH], def_val[MAX_PATH];

1 0

Dmitry Timoshkov : ntoskrnl.exe: Add a stub for MmCreateSection.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 847fb84d816cfaf9b671b2d859d025181fbfcdde URL: https://source.winehq.org/git/wine.git/?a=commit;h=847fb84d816cfaf9b671b2d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 6 17:01:20 2018 +0800 ntoskrnl.exe: Add a stub for MmCreateSection. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 577f5b3..292f89c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2358,6 +2358,18 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS } /*********************************************************************** + * MmCreateSection (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI MmCreateSection( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + LARGE_INTEGER *size, ULONG protect, ULONG alloc_attr, + HANDLE file, FILE_OBJECT *file_obj ) +{ + FIXME("%p %#x %p %s %#x %#x %p %p: stub\n", handle, access, attr, + wine_dbgstr_longlong(size->QuadPart), protect, alloc_attr, file, file_obj); + return STATUS_NOT_IMPLEMENTED; +} + +/*********************************************************************** * MmFreeNonCachedMemory (NTOSKRNL.EXE.@) */ void WINAPI MmFreeNonCachedMemory( void *addr, SIZE_T size ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8079114..e867dbe 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -669,7 +669,7 @@ @ stub MmCanFileBeTruncated @ stub MmCommitSessionMappedView @ stub MmCreateMdl -@ stub MmCreateSection +@ stdcall MmCreateSection(ptr long ptr ptr long long long ptr) @ stub MmDisableModifiedWriteOfSection @ stub MmFlushImageSection @ stub MmForceSectionClosed

1 0

Louis Lenders : pidgen: Add stub for PIDGenSimpW.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: db2d831600f9677f81023d639d30f21fcfa29eb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db2d831600f9677f81023d63… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Sep 6 13:23:29 2018 +0200 pidgen: Add stub for PIDGenSimpW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45770 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pidgen/main.c | 7 +++++++ dlls/pidgen/pidgen.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index cf165ea..95f5389 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -50,3 +50,10 @@ int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p return 0; } + +int WINAPI PIDGenSimpW(const WCHAR* str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) +{ + FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_w(str), p1, p2, p3, p4, p5, p6, p7, p8); + + return 0; +} diff --git a/dlls/pidgen/pidgen.spec b/dlls/pidgen/pidgen.spec index 8b7e778..aba0107 100644 --- a/dlls/pidgen/pidgen.spec +++ b/dlls/pidgen/pidgen.spec @@ -1,7 +1,7 @@ @ stub PIDGenA @ stub PIDGenW @ stdcall PIDGenSimpA(str long long long long long long long long) -@ stub PIDGenSimpW +@ stdcall PIDGenSimpW(wstr long long long long long long long long) @ stub SetupPIDGenA @ stub SetupPIDGenW @ stub VerifyPIDSequenceW

1 0

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: backgroundClip property implementation.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 6ebfbcc6872c4099f75d210b661ef5f653b47d15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ebfbcc6872c4099f75d210b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 16:15:04 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::backgroundClip property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 13 ++++++++----- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 23 +++++++++++++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2454d86..6f59250 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -39,6 +39,8 @@ static const WCHAR backgroundW[] = {'b','a','c','k','g','r','o','u','n','d',0}; static const WCHAR background_attachmentW[] = {'b','a','c','k','g','r','o','u','n','d','-','a','t','t','a','c','h','m','e','n','t',0}; +static const WCHAR background_clipW[] = + {'b','a','c','k','g','r','o','u','n','d','-','c','l','i','p',0}; static const WCHAR background_colorW[] = {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0}; static const WCHAR background_imageW[] = @@ -333,6 +335,7 @@ typedef struct { static const style_tbl_entry_t style_tbl[] = { {backgroundW, DISPID_IHTMLSTYLE_BACKGROUND}, {background_attachmentW, DISPID_IHTMLSTYLE_BACKGROUNDATTACHMENT}, + {background_clipW, DISPID_UNKNOWN}, {background_colorW, DISPID_IHTMLSTYLE_BACKGROUNDCOLOR, ATTR_HEX_INT}, {background_imageW, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE, ATTR_FIX_URL}, {background_positionW, DISPID_IHTMLSTYLE_BACKGROUNDPOSITION}, @@ -7290,15 +7293,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_cssFloat(IHTMLCSSStyleDeclarat static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundClip(IHTMLCSSStyleDeclaration *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_BACKGROUND_CLIP, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_backgroundClip(IHTMLCSSStyleDeclaration *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_BACKGROUND_CLIP, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundOrigin(IHTMLCSSStyleDeclaration *iface, BSTR v) @@ -7760,7 +7763,7 @@ static HRESULT HTMLStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, const style_tbl_entry_t *style_entry; style_entry = lookup_style_tbl(name); - if(style_entry) { + if(style_entry && style_entry->dispid != DISPID_UNKNOWN) { *dispid = style_entry->dispid; return S_OK; } diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 9fb96f2..1a83d4f 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -36,6 +36,7 @@ struct HTMLStyle { typedef enum { STYLEID_BACKGROUND, STYLEID_BACKGROUND_ATTACHMENT, + STYLEID_BACKGROUND_CLIP, STYLEID_BACKGROUND_COLOR, STYLEID_BACKGROUND_IMAGE, STYLEID_BACKGROUND_POSITION, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 8c6ad20..309ca40 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -736,6 +736,26 @@ static void test_style6(IHTMLStyle6 *style) SysFreeString(str); } +static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLCSSStyleDeclaration_get_backgroundClip(css_style, &str); + ok(hres == S_OK, "get_backgroundClip failed: %08x\n", hres); + ok(!str, "backgroundClip = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("border-box"); + hres = IHTMLCSSStyleDeclaration_put_backgroundClip(css_style, str); + ok(hres == S_OK, "put_backgroundClip failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLCSSStyleDeclaration_get_backgroundClip(css_style, &str); + ok(hres == S_OK, "get_backgroundClip failed: %08x\n", hres); + ok(!strcmp_wa(str, "border-box"), "backgroundClip = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + static void test_body_style(IHTMLStyle *style) { IHTMLCSSStyleDeclaration *css_style; @@ -2817,6 +2837,9 @@ static void test_body_style(IHTMLStyle *style) win_skip("IHTMLStyle6 not available\n"); } + if(compat_mode >= COMPAT_IE9) + test_css_style_declaration(css_style); + if(css_style) IHTMLCSSStyleDeclaration_Release(css_style); }

1 0

Jacek Caban : xmllite: Prefer builtin version.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: wine Branch: master Commit: 5f11c441e0ef68e3c44707418c7c718c30191807 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f11c441e0ef68e3c4470741… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 3 15:35:38 2018 +0200 xmllite: Prefer builtin version. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/Makefile.in | 3 +-- dlls/xmllite/xmllite_main.c | 45 --------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/dlls/xmllite/Makefile.in b/dlls/xmllite/Makefile.in index a51c3dd..aeb4481 100644 --- a/dlls/xmllite/Makefile.in +++ b/dlls/xmllite/Makefile.in @@ -3,5 +3,4 @@ IMPORTLIB = xmllite C_SRCS = \ reader.c \ - writer.c \ - xmllite_main.c + writer.c diff --git a/dlls/xmllite/xmllite_main.c b/dlls/xmllite/xmllite_main.c deleted file mode 100644 index 63838a9..0000000 --- a/dlls/xmllite/xmllite_main.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * XML parsing library - * - * Copyright 2009 Christian Costa - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(xmllite); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %u, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Jactry Zeng : ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: wine Branch: master Commit: 68e35eb7456e68d4233ffc5e795511823a45ba6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=68e35eb7456e68d4233ffc5e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Sep 4 20:57:06 2018 +0800 ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42710 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2impl.c | 97 +++++++++++++++++++++++- dlls/ole32/tests/ole2.c | 191 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 286 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=68e35eb7456e68d4233f…

1 0