wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Rosanne DiMesio : Do not show preview button on new, unqueued test reports
by Jeremy Newman 12 Jul '17

12 Jul '17

Module: appdb Branch: master Commit: ad993f6e0284f986ffbed65b5afbbcdec0688246 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ad993f6e0284f986ffbed65b… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jul 12 10:07:02 2017 -0500 Do not show preview button on new, unqueued test reports Preview can display incorrect or missing information when run on test reports that have not yet been submitted/queued. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData_queue.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/testData_queue.php b/include/testData_queue.php index 0877535..23a09a4 100644 --- a/include/testData_queue.php +++ b/include/testData_queue.php @@ -180,7 +180,10 @@ class testData_queue function objectShowPreview() { - return $this->oTestData->objectShowPreview(); + if(!$this->oTestData->iTestingId) + return FALSE; + else + return $this->oTestData->objectShowPreview(); } function display()

1 0

Alistair Leslie-Hughes : wmvcore: Support IWMReaderStreamClock interface in IWMReader.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: 437c6674b06663908472d31ed68fcab6e2fdd5f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=437c6674b06663908472d31ed… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 9 02:30:17 2017 +0000 wmvcore: Support IWMReaderStreamClock interface in IWMReader. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 2 +- dlls/wmvcore/wmvcore_main.c | 58 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index d8a7889..c4d8115 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -133,7 +133,7 @@ static void test_wmreader_interfaces(void) ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMReaderStreamClock, (void **)&clock); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTypeNegotiation, (void **)&negotiation); todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 46e967d..f7fa6e9 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -68,6 +68,7 @@ typedef struct { IWMReaderAdvanced6 IWMReaderAdvanced6_iface; IWMReaderAccelerator IWMReaderAccelerator_iface; IWMReaderNetworkConfig2 IWMReaderNetworkConfig2_iface; + IWMReaderStreamClock IWMReaderStreamClock_iface; LONG ref; } WMReader; @@ -113,6 +114,9 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi }else if(IsEqualGUID(riid, &IID_IWMReaderNetworkConfig2)) { TRACE("(%p)->(IWMReaderNetworkConfig2 %p)\n", This, ppv); *ppv = &This->IWMReaderNetworkConfig2_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderStreamClock)) { + TRACE("(%p)->(IWMReaderStreamClock %p)\n", This, ppv); + *ppv = &This->IWMReaderStreamClock_iface; }else { *ppv = NULL; FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -1132,6 +1136,59 @@ static const IWMReaderNetworkConfig2Vtbl WMReaderNetworkConfig2Vtbl = networkconfig_GetMaxNetPacketSize }; +static inline WMReader *impl_from_IWMReaderStreamClock(IWMReaderStreamClock *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderStreamClock_iface); +} + +static HRESULT WINAPI readclock_QueryInterface(IWMReaderStreamClock *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReaderStreamClock(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI readclock_AddRef(IWMReaderStreamClock *iface) +{ + WMReader *This = impl_from_IWMReaderStreamClock(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI readclock_Release(IWMReaderStreamClock *iface) +{ + WMReader *This = impl_from_IWMReaderStreamClock(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI readclock_GetTime(IWMReaderStreamClock *iface, QWORD *now) +{ + WMReader *This = impl_from_IWMReaderStreamClock(iface); + FIXME("%p, %p\n", This, now); + return E_NOTIMPL; +} + +static HRESULT WINAPI readclock_SetTimer(IWMReaderStreamClock *iface, QWORD when, void *param, DWORD *id) +{ + WMReader *This = impl_from_IWMReaderStreamClock(iface); + FIXME("%p, %s, %p, %p\n", This, wine_dbgstr_longlong(when), param, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI readclock_KillTimer(IWMReaderStreamClock *iface, DWORD id) +{ + WMReader *This = impl_from_IWMReaderStreamClock(iface); + FIXME("%p, %d\n", This, id); + return E_NOTIMPL; +} + +static const IWMReaderStreamClockVtbl WMReaderStreamClockVtbl = +{ + readclock_QueryInterface, + readclock_AddRef, + readclock_Release, + readclock_GetTime, + readclock_SetTimer, + readclock_KillTimer +}; HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) { @@ -1147,6 +1204,7 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ reader->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; reader->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl; + reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; reader->ref = 1; *ret_reader = &reader->IWMReader_iface;

1 0

Alexandre Julliard : user32: Match cursor size in priority over color depth.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: 55d247ef13656eb703dfb943f309adb8c5b37f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d247ef13656eb703dfb943f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 11 21:22:54 2017 +0200 user32: Match cursor size in priority over color depth. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 4b2d6bd..f408c22 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -580,11 +580,14 @@ static int CURSORICON_FindBestCursor( LPCVOID dir, DWORD size, fnGetCIEntry get_ { if (cx > width || cy > height) continue; if (cx < maxwidth || cy < maxheight) continue; - if (loadflags & LR_MONOCHROME) + if (cx == maxwidth && cy == maxheight) { - if (maxbits && bits >= maxbits) continue; + if (loadflags & LR_MONOCHROME) + { + if (maxbits && bits >= maxbits) continue; + } + else if (bits <= maxbits) continue; } - else if (bits <= maxbits) continue; bestEntry = i; maxwidth = cx; maxheight = cy; @@ -598,11 +601,14 @@ static int CURSORICON_FindBestCursor( LPCVOID dir, DWORD size, fnGetCIEntry get_ for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { if (cx > maxwidth || cy > maxheight) continue; - if (loadflags & LR_MONOCHROME) + if (cx == maxwidth && cy == maxheight) { - if (maxbits && bits >= maxbits) continue; + if (loadflags & LR_MONOCHROME) + { + if (maxbits && bits >= maxbits) continue; + } + else if (bits <= maxbits) continue; } - else if (bits <= maxbits) continue; bestEntry = i; maxwidth = cx; maxheight = cy;

1 0

Alistair Leslie-Hughes : mfreadwrite.idl: Add enum MF_SOURCE_READER_FLAG and EXTERN_GUID defines.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: 06b90fe09d453081665c888b505a076cc383bc79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b90fe09d453081665c888b5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 8 04:14:53 2017 +0000 mfreadwrite.idl: Add enum MF_SOURCE_READER_FLAG and EXTERN_GUID defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfreadwrite.idl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index dd8c124..5cb3501 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -31,6 +31,17 @@ enum MF_SOURCE_READER_CURRENT_TYPE_INDEX = 0xffffffff }; +typedef enum MF_SOURCE_READER_FLAG +{ + MF_SOURCE_READERF_ERROR = 0x001, + MF_SOURCE_READERF_ENDOFSTREAM = 0x002, + MF_SOURCE_READERF_NEWSTREAM = 0x004, + MF_SOURCE_READERF_NATIVEMEDIATYPECHANGED = 0x010, + MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED = 0x020, + MF_SOURCE_READERF_STREAMTICK = 0x100, + MF_SOURCE_READERF_ALLEFFECTSREMOVED = 0x200 +} MF_SOURCE_READER_FLAG; + typedef struct _MF_SINK_WRITER_STATISTICS { DWORD cb; @@ -51,6 +62,23 @@ typedef struct _MF_SINK_WRITER_STATISTICS DWORD dwAverageSampleRateProcessed; } MF_SINK_WRITER_STATISTICS; +cpp_quote("EXTERN_GUID(CLSID_MFReadWriteClassFactory, 0x48e2ed0f, 0x98c2, 0x4a37, 0xbe, 0xd5, 0x16, 0x63, 0x12, 0xdd, 0xd8, 0x3f);") +cpp_quote("EXTERN_GUID(CLSID_MFSourceReader, 0x1777133c, 0x0881, 0x411b, 0xa5, 0x77, 0xad, 0x54, 0x5f, 0x07, 0x14, 0xc4);") +cpp_quote("EXTERN_GUID(CLSID_MFSinkWriter, 0xa3bbfb17, 0x8273, 0x4e52, 0x9e, 0x0e, 0x97, 0x39, 0xdc, 0x88, 0x79, 0x90);") + +cpp_quote("EXTERN_GUID(MF_SINK_WRITER_ASYNC_CALLBACK, 0x48cb183e, 0x7b0b, 0x46f4, 0x82, 0x2e, 0x5e, 0x1d, 0x2d, 0xda, 0x43, 0x54);") +cpp_quote("EXTERN_GUID(MF_SINK_WRITER_DISABLE_THROTTLING, 0x08b845d8, 0x2b74, 0x4afe, 0x9d, 0x53, 0xbe, 0x16, 0xd2, 0xd5, 0xae, 0x4f);") +cpp_quote("EXTERN_GUID(MF_SINK_WRITER_D3D_MANAGER, 0xec822da2, 0xe1e9, 0x4b29, 0xa0, 0xd8, 0x56, 0x3c, 0x71, 0x9f, 0x52, 0x69);") +cpp_quote("EXTERN_GUID(MF_SINK_WRITER_ENCODER_CONFIG, 0xad91cd04, 0xa7cc, 0x4ac7, 0x99, 0xb6, 0xa5, 0x7b, 0x9a, 0x4a, 0x7c, 0x70);") + +cpp_quote("EXTERN_GUID(MF_READWRITE_DISABLE_CONVERTERS, 0x98d5b065, 0x1374, 0x4847, 0x8d, 0x5d, 0x31, 0x52, 0x0f, 0xee, 0x71, 0x56);") +cpp_quote("EXTERN_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0);") +cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_CLASS, 0x39384300, 0xd0eb, 0x40b1, 0x87, 0xa0, 0x33, 0x18, 0x87, 0x1b, 0x5a, 0x53);") +cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_PRIORITY, 0x43ad19ce, 0xf33f, 0x4ba9, 0xa5, 0x80, 0xe4, 0xcd, 0x12, 0xf2, 0xd1, 0x44);") +cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_CLASS_AUDIO, 0x430847da, 0x0890, 0x4b0e, 0x93, 0x8c, 0x05, 0x43, 0x32, 0xc5, 0x47, 0xe1);") +cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_PRIORITY_AUDIO, 0x273db885, 0x2de2, 0x4db2, 0xa6, 0xa7, 0xfd, 0xb6, 0x6f, 0xb4, 0x0b, 0x61);") +cpp_quote("EXTERN_GUID(MF_READWRITE_D3D_OPTIONAL, 0x216479d9, 0x3071, 0x42ca, 0xbb, 0x6c, 0x4c, 0x22, 0x10, 0x2e, 0x1d, 0x18);") + interface IMFMediaSource; [

1 0

Nikolay Sivov : advapi32/tests: Fix a sid string leak (Valgrind).
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: a0ac14456b5f31ef97698a1d711f10e99378f49c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ac14456b5f31ef97698a1d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 11 12:01:42 2017 +0300 advapi32/tests: Fix a sid string leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index fe84dbe..4121908 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6777,6 +6777,7 @@ static void test_token_label(void) sid = (SID *)&ace->SidStart; ConvertSidToStringSidA(sid, &str); ok(EqualSid(sid, &medium_sid) || EqualSid(sid, &high_sid), "Got unexpected SID %s\n", str); + LocalFree(str); } ret = GetSecurityDescriptorDacl(sd, &present, &dacl, &defaulted);

1 0

Nikolay Sivov : advapi32/tests: Statically link to ConvertSidToStringSidA( ).
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: df522c5a0613bf339e21bf9a59e90ec4407b0174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df522c5a0613bf339e21bf9a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 11 12:01:41 2017 +0300 advapi32/tests: Statically link to ConvertSidToStringSidA(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f71d45f..fe84dbe 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -81,7 +81,6 @@ static VOID (WINAPI *pBuildTrusteeWithObjectsAndSidA)( PTRUSTEEA pTrustee, PSID pSid ); static LPSTR (WINAPI *pGetTrusteeNameA)( PTRUSTEEA pTrustee ); static BOOL (WINAPI *pMakeSelfRelativeSD)( PSECURITY_DESCRIPTOR, PSECURITY_DESCRIPTOR, LPDWORD ); -static BOOL (WINAPI *pConvertSidToStringSidA)( PSID pSid, LPSTR *str ); static BOOL (WINAPI *pConvertStringSidToSidA)( LPCSTR str, PSID pSid ); static BOOL (WINAPI *pCheckTokenMembership)(HANDLE, PSID, PBOOL); static BOOL (WINAPI *pConvertStringSecurityDescriptorToSecurityDescriptorA)(LPCSTR, DWORD, @@ -156,9 +155,8 @@ static const char* debugstr_sid(PSID sid) DWORD le = GetLastError(); char* res = debugsid_str[debugsid_index]; debugsid_index = (debugsid_index + 1) % SID_SLOTS; - if (!pConvertSidToStringSidA) - strcpy(res, "missing ConvertSidToStringSidA"); - else if (!pConvertSidToStringSidA(sid, &sidstr)) + + if (!ConvertSidToStringSidA(sid, &sidstr)) sprintf(res, "ConvertSidToStringSidA failed le=%u", GetLastError()); else if (strlen(sidstr) > sizeof(*debugsid_str) - 1) { @@ -223,7 +221,6 @@ static void init(void) pGetSecurityInfo = (void *)GetProcAddress(hmod, "GetSecurityInfo"); pSetSecurityInfo = (void *)GetProcAddress(hmod, "SetSecurityInfo"); pCreateRestrictedToken = (void *)GetProcAddress(hmod, "CreateRestrictedToken"); - pConvertSidToStringSidA = (void *)GetProcAddress(hmod, "ConvertSidToStringSidA"); pConvertStringSidToSidA = (void *)GetProcAddress(hmod, "ConvertStringSidToSidA"); pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation"); pGetAce = (void *)GetProcAddress(hmod, "GetAce"); @@ -327,7 +324,7 @@ static void test_sid(void) BOOL r; LPSTR str = NULL; - if( !pConvertSidToStringSidA || !pConvertStringSidToSidA ) + if( !pConvertStringSidToSidA ) { win_skip("ConvertSidToStringSidA or ConvertStringSidToSidA not available\n"); return; @@ -371,7 +368,7 @@ static void test_sid(void) r = AllocateAndInitializeSid( &refs[i].auth, 1,1,0,0,0,0,0,0,0, &psid ); ok( r, "failed to allocate sid\n" ); - r = pConvertSidToStringSidA( psid, &str ); + r = ConvertSidToStringSidA( psid, &str ); ok( r, "failed to convert sid\n" ); if (r) { @@ -427,7 +424,7 @@ static void test_sid(void) if (r) { - if ((winetest_debug > 1) && (pConvertSidToStringSidA(psid, &temp))) + if ((winetest_debug > 1) && (ConvertSidToStringSidA(psid, &temp))) { trace(" %s: %s\n", strsid_table[i].str, temp); LocalFree(temp); @@ -1766,12 +1763,6 @@ static void test_token_attr(void) CloseHandle(Token); } - if(!pConvertSidToStringSidA) - { - win_skip("ConvertSidToStringSidA is not available\n"); - return; - } - SetLastError(0xdeadbeef); ret = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &Token); ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); @@ -1822,7 +1813,7 @@ static void test_token_attr(void) ret = LookupAccountSidA(NULL, Groups->Groups[i].Sid, Name, &NameLength, Domain, &DomainLength, &SidNameUse); if (ret) { - pConvertSidToStringSidA(Groups->Groups[i].Sid, &SidString); + ConvertSidToStringSidA(Groups->Groups[i].Sid, &SidString); trace("%s, %s\\%s use: %d attr: 0x%08x\n", SidString, Domain, Name, SidNameUse, Groups->Groups[i].Attributes); LocalFree(SidString); } @@ -1839,7 +1830,7 @@ static void test_token_attr(void) ok(ret, "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); - pConvertSidToStringSidA(User->User.Sid, &SidString); + ConvertSidToStringSidA(User->User.Sid, &SidString); trace("TokenUser: %s attr: 0x%08x\n", SidString, User->User.Attributes); LocalFree(SidString); HeapFree(GetProcessHeap(), 0, User); @@ -1954,7 +1945,7 @@ typedef union _MAX_SID static void test_sid_str(PSID * sid) { char *str_sid; - BOOL ret = pConvertSidToStringSidA(sid, &str_sid); + BOOL ret = ConvertSidToStringSidA(sid, &str_sid); ok(ret, "ConvertSidToStringSidA() failed: %d\n", GetLastError()); if (ret) { @@ -2071,7 +2062,7 @@ static void test_CreateWellKnownSid(void) ok(pCreateWellKnownSid(i, value->without_domain ? NULL : domainsid, sid_buffer, &cb), "Couldn't create well known sid %u\n", i); expect_eq(GetSidLengthRequired(*GetSidSubAuthorityCount(sid_buffer)), cb, DWORD, "%d"); ok(IsValidSid(sid_buffer), "The sid is not valid\n"); - ok(pConvertSidToStringSidA(sid_buffer, &str), "Couldn't convert SID to string\n"); + ok(ConvertSidToStringSidA(sid_buffer, &str), "Couldn't convert SID to string\n"); ok(strcmp(str, value->sid_string) == 0, "%d: SID mismatch - expected %s, got %s\n", i, value->sid_string, str); LocalFree(str); @@ -2294,7 +2285,7 @@ static void test_LookupAccountSid(void) } HeapFree(GetProcessHeap(), 0, ptiUser); - if (pCreateWellKnownSid && pConvertSidToStringSidA) + if (pCreateWellKnownSid) { trace("Well Known SIDs:\n"); for (i = 0; i <= 60; i++) @@ -2302,7 +2293,7 @@ static void test_LookupAccountSid(void) size = SECURITY_MAX_SID_SIZE; if (pCreateWellKnownSid(i, NULL, &max_sid.sid, &size)) { - if (pConvertSidToStringSidA(&max_sid.sid, &str_sidA)) + if (ConvertSidToStringSidA(&max_sid.sid, &str_sidA)) { acc_sizeA = MAX_PATH; dom_sizeA = MAX_PATH; @@ -6784,7 +6775,7 @@ static void test_token_label(void) ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, "Unexpected ACE mask %#x\n", ace->Mask); sid = (SID *)&ace->SidStart; - pConvertSidToStringSidA(sid, &str); + ConvertSidToStringSidA(sid, &str); ok(EqualSid(sid, &medium_sid) || EqualSid(sid, &high_sid), "Got unexpected SID %s\n", str); }

1 0

Piotr Caban : gdiplus: Support GdipSetPixelOffsetMode in metafiles.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: f7160291dfbf8b61349526f44a0c72bb4bd28131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7160291dfbf8b61349526f44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 10:59:03 2017 +0200 gdiplus: Support GdipSetPixelOffsetMode in metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7a6fcb1..f20178a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5913,6 +5913,19 @@ GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics *graphics, PixelOffsetMode if(graphics->busy) return ObjectBusy; + if(graphics->pixeloffset == mode) + return Ok; + + if(graphics->image && graphics->image->type == ImageTypeMetafile) + { + GpStatus stat; + + stat = METAFILE_AddSimpleProperty((GpMetafile*)graphics->image, + EmfPlusRecordTypeSetPixelOffsetMode, mode); + if(stat != Ok) + return stat; + } + graphics->pixeloffset = mode; return Ok;

1 0

Piotr Caban : gdiplus: Support GdipSetTextRenderingHint in metafiles.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: 683315d111f99c527ae04391634e3f41e685cb08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=683315d111f99c527ae043916… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 10:58:58 2017 +0200 gdiplus: Support GdipSetTextRenderingHint in metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 12 ++++++++++++ dlls/gdiplus/metafile.c | 18 ++++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 6fd0968..f24f38e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -110,6 +110,7 @@ extern GpStatus METAFILE_DrawImagePointsRect(GpMetafile* metafile, GpImage *imag GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, DrawImageAbort callback, VOID *callbackData) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7ef0d11..7a6fcb1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5987,6 +5987,18 @@ GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics *graphics, if(graphics->busy) return ObjectBusy; + if(graphics->texthint == hint) + return Ok; + + if(graphics->image && graphics->image->type == ImageTypeMetafile) { + GpStatus stat; + + stat = METAFILE_AddSimpleProperty((GpMetafile*)graphics->image, + EmfPlusRecordTypeSetTextRenderingHint, hint); + if(stat != Ok) + return stat; + } + graphics->texthint = hint; return Ok; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 1aafdf7..df87a66 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2551,3 +2551,21 @@ GpStatus METAFILE_DrawImagePointsRect(GpMetafile *metafile, GpImage *image, METAFILE_WriteRecords(metafile); return Ok; } + +GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) +{ + EmfPlusRecordHeader *record; + GpStatus stat; + + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + stat = METAFILE_AllocateRecord(metafile, sizeof(*record), (void**)&record); + if (stat != Ok) return stat; + + record->Type = prop; + record->Flags = val; + + METAFILE_WriteRecords(metafile); + return Ok; +}

1 0

Alistair Leslie-Hughes : widl: Only generate Proxy Stubs when functions have the call_as attribute.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: 084fa63e606ca6d289e98e5ca7c11718591f5f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=084fa63e606ca6d289e98e5ca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 11 02:30:15 2017 +0000 widl: Only generate Proxy Stubs when functions have the call_as attribute. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 3 +++ include/unknwn.idl | 10 ++++++++++ tools/widl/header.c | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 9da82f1..fba7fc7 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -45,6 +45,9 @@ typedef struct BitmapTestSrc { const bitmap_data *data; } BitmapTestSrc; +extern HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_WriteSource_Proxy(IWICBitmapFrameEncode* This, + IWICBitmapSource *pIBitmapSource, WICRect *prc); + static BOOL near_equal(float a, float b) { return fabsf(a - b) < 0.001; diff --git a/include/unknwn.idl b/include/unknwn.idl index 78a2d9d..7856a7f 100644 --- a/include/unknwn.idl +++ b/include/unknwn.idl @@ -46,6 +46,16 @@ interface IUnknown ULONG Release(); } +cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown* This, REFIID riid, void **ppvObject);") +cpp_quote("void __RPC_STUB IUnknown_QueryInterface_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") +cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown* This);") +cpp_quote("void __RPC_STUB IUnknown_AddRef_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") +cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown* This);") +cpp_quote("void __RPC_STUB IUnknown_Release_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") + cpp_quote("#ifdef SAVE_WIDL_C_INLINE_WRAPPERS") cpp_quote("#define WIDL_C_INLINE_WRAPPERS") cpp_quote("#endif") diff --git a/tools/widl/header.c b/tools/widl/header.c index 7b97158..e48b488 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1172,7 +1172,7 @@ static void write_method_proto(FILE *header, const type_t *iface) { const var_t *func = stmt->u.var; - if (!is_local(func->attrs)) { + if (is_callas(func->attrs)) { const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); if (!callconv) callconv = "STDMETHODCALLTYPE"; /* proxy prototype */

1 0

Zebediah Figura : msi: Properly parse empty format strings.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: 51bd884384da29872faf878fc41b4572da634aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51bd884384da29872faf878fc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 11 00:18:34 2017 -0500 msi: Properly parse empty format strings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/format.c | 87 +++++++++++++++++++++---------------------------- dlls/msi/tests/format.c | 27 +++++++++++++++ 2 files changed, 64 insertions(+), 50 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 581dd55..4297fbc 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -276,7 +276,7 @@ static WCHAR *deformat_environment( FORMAT *format, FORMSTR *str, int *ret_len ) } static WCHAR *deformat_literal( FORMAT *format, FORMSTR *str, BOOL *propfound, - BOOL *nonprop, int *type, int *len ) + int *type, int *len ) { LPCWSTR data = get_formstr_data(format, str); WCHAR *replaced = NULL; @@ -343,58 +343,24 @@ static LPWSTR build_default_format(const MSIRECORD* record) { int i; int count; - LPWSTR rc, buf; - static const WCHAR fmt[] = {'%','i',':',' ','%','s',' ',0}; - static const WCHAR fmt_null[] = {'%','i',':',' ',' ',0}; - static const WCHAR fmt_index[] = {'%','i',0}; - LPCWSTR str; - WCHAR index[10]; - DWORD size, max_len, len; + WCHAR *rc, buf[26]; + static const WCHAR fmt[] = {'%','i',':',' ','[','%','i',']',' ',0}; + DWORD size; count = MSI_RecordGetFieldCount(record); - max_len = MAX_PATH; - buf = msi_alloc((max_len + 1) * sizeof(WCHAR)); - - rc = NULL; + rc = msi_alloc(1); + rc[0] = 0; size = 1; + for (i = 1; i <= count; i++) { - sprintfW(index, fmt_index, i); - str = MSI_RecordGetString(record, i); - len = (str) ? lstrlenW(str) : 0; - len += (sizeof(fmt_null)/sizeof(fmt_null[0]) - 3) + lstrlenW(index); - size += len; - - if (len > max_len) - { - max_len = len; - buf = msi_realloc(buf, (max_len + 1) * sizeof(WCHAR)); - if (!buf) - { - msi_free(rc); - return NULL; - } - } - - if (str) - sprintfW(buf, fmt, i, str); - else - sprintfW(buf, fmt_null, i); - - if (!rc) - { - rc = msi_alloc(size * sizeof(WCHAR)); - lstrcpyW(rc, buf); - } - else - { - rc = msi_realloc(rc, size * sizeof(WCHAR)); - lstrcatW(rc, buf); - } + sprintfW(buf, fmt, i, i); + size += lstrlenW(buf); + rc = msi_realloc(rc, size * sizeof(WCHAR)); + lstrcatW(rc, buf); } - msi_free(buf); return rc; } @@ -685,7 +651,7 @@ static WCHAR *replace_stack_prop( FORMAT *format, STACK *values, content->len = *oldsize - 2; content->type = *type; - if (*type == FORMAT_NUMBER) + if (*type == FORMAT_NUMBER && format->record) { replaced = deformat_index( format, content, len ); if (replaced) @@ -699,7 +665,7 @@ static WCHAR *replace_stack_prop( FORMAT *format, STACK *values, } else if (format->package) { - replaced = deformat_literal( format, content, propfound, nonprop, type, len ); + replaced = deformat_literal( format, content, propfound, type, len ); } else { @@ -791,7 +757,7 @@ static BOOL verify_format(LPWSTR data) static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, WCHAR** data, DWORD *len, - MSIRECORD* record, INT* failcount) + MSIRECORD* record) { FORMAT format; FORMSTR *str = NULL; @@ -877,15 +843,34 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, WCHAR *format, *deformated; UINT rc = ERROR_INVALID_PARAMETER; DWORD len; + MSIRECORD *record_deformated; + int field_count, i; TRACE("%p %p %p %p\n", package, record, buffer, size); + dump_record(record); if (!(format = msi_dup_record_field( record, 0 ))) format = build_default_format( record ); - TRACE("%s\n", debugstr_w(format)); + field_count = MSI_RecordGetFieldCount(record); + record_deformated = MSI_CloneRecord(record); + if (!record_deformated) + { + rc = ERROR_OUTOFMEMORY; + goto end; + } + MSI_RecordSetStringW(record_deformated, 0, format); + for (i = 1; i <= field_count; i++) + { + if (MSI_RecordGetString(record, i)) + { + deformat_string_internal(package, MSI_RecordGetString(record, i), &deformated, &len, NULL); + MSI_RecordSetStringW(record_deformated, i, deformated); + msi_free(deformated); + } + } - deformat_string_internal( package, format, &deformated, &len, record, NULL ); + deformat_string_internal(package, format, &deformated, &len, record_deformated); if (buffer) { if (*size>len) @@ -907,6 +892,8 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, else rc = ERROR_SUCCESS; *size = len; + msiobj_release(&record_deformated->hdr); +end: msi_free( format ); msi_free( deformated ); return rc; diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 6209399..b476c6b 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -494,6 +494,15 @@ static void test_formatrecord(void) ok( sz == 7, "size wrong\n"); ok( 0 == strcmp(buffer,"boo hoo"), "wrong output\n"); + /* self-referential format field */ + r = MsiRecordSetStringA(hrec, 0, "[1] test [0]"); + ok( r == ERROR_SUCCESS, "set string failed\n"); + sz = sizeof buffer; + r = MsiFormatRecordA(0, hrec, buffer, &sz); + ok( r == ERROR_SUCCESS, "format failed\n"); + ok( sz == 21, "size wrong\n"); + ok( 0 == strcmp(buffer,"boo test [1] test [0]"), "wrong output\n"); + /* empty string */ r = MsiRecordSetStringA(hrec, 0, ""); ok( r == ERROR_SUCCESS, "set string failed\n"); @@ -504,6 +513,18 @@ static void test_formatrecord(void) ok( 0 == strcmp(buffer,"1: boo 2: hoo 3: 4: 5: 6: "), "wrong output(%s)\n",buffer); + /* empty string with numbers */ + r = MsiRecordSetStringA(hrec, 1, "123"); + ok( r == ERROR_SUCCESS, "set string failed\n"); + r = MsiRecordSetInteger(hrec, 2, 4567); + ok( r == ERROR_SUCCESS, "set string failed\n"); + sz = sizeof buffer; + r = MsiFormatRecordA(0, hrec, buffer, &sz); + ok( r == ERROR_SUCCESS, "format failed\n"); + ok( sz == 31, "size wrong %i\n",sz); + ok( 0 == strcmp(buffer,"1: 123 2: 4567 3: 4: 5: 6: "), + "wrong output(%s)\n",buffer); + /* play games with recursive lookups */ r = MsiRecordSetStringA(hrec, 0, "[[1]] [2]"); ok( r == ERROR_SUCCESS, "set string failed\n"); @@ -2575,6 +2596,12 @@ static void test_formatrecord_tables(void) ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); ok( !lstrcmpA( buf, "1: ringer " ), "Expected '1: ringer ', got %s\n", buf ); + size = MAX_PATH; + MsiRecordSetStringA( hrec, 0, "1: [1] " ); + r = MsiFormatRecordA( hpkg, hrec, buf, &size ); + ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); + ok( !lstrcmpA( buf, "1: ringer " ), "Expected '1: ringer ', got %s\n", buf ); + /* environment variable doesn't exist */ size = MAX_PATH; MsiRecordSetStringA( hrec, 1, "[%idontexist]" );

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
64
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 2017