- Wine-Devel - list.winehq.org

[PATCH v2] wininet: Implement INTERNET_OPTION_SECURITY_CERTIFICATE flag for InternetQueryOption.
by Daniel Lehman Aug. 5, 2020

Aug. 5, 2020

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v2: remove FIXME --- dlls/wininet/http.c | 60 ++++++++++++++++++ dlls/wininet/resource.h | 3 + dlls/wininet/tests/http.c | 127 +++++++++++++++++++++++++++++++++++++- dlls/wininet/wininet.rc | 11 ++++ 4 files changed, 199 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 220493718c..635fc055b3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -54,6 +54,7 @@ #include "internet.h" #include "zlib.h" +#include "resource.h" #include "wine/debug.h" #include "wine/exception.h" @@ -2277,6 +2278,65 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return get_security_cert_struct(req, (INTERNET_CERTIFICATE_INFOA*)buffer); } + case INTERNET_OPTION_SECURITY_CERTIFICATE: { + DWORD err; + int needed; + char fmt[512]; + char strength[16]; + char start_date[32]; + char start_time[32]; + char expiry_date[32]; + char expiry_time[32]; + SYSTEMTIME start, expiry; + INTERNET_CERTIFICATE_INFOA info; + + if(!size) + return ERROR_INVALID_PARAMETER; + + if(!req->netconn) { + *size = 0; + return ERROR_INTERNET_INVALID_OPERATION; + } + + if(!buffer) { + *size = 1; + return ERROR_INSUFFICIENT_BUFFER; + } + + if((err = get_security_cert_struct(req, &info))) + return err; + + LoadStringA(WININET_hModule, IDS_CERT_FORMAT, fmt, sizeof(fmt)); + LoadStringA(WININET_hModule, info.dwKeySize >= 128 ? IDS_CERT_HIGH : IDS_CERT_LOW, + strength, sizeof(strength)); + + FileTimeToSystemTime(&info.ftStart, &start); + FileTimeToSystemTime(&info.ftExpiry, &expiry); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_date, sizeof(start_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_time, sizeof(start_time)); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_date, sizeof(expiry_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_time, sizeof(expiry_time)); + + needed = _scprintf(fmt, info.lpszSubjectInfo, info.lpszIssuerInfo, + start_date, start_time, expiry_date, expiry_time, + strength, info.dwKeySize); + if(needed < *size) { + err = ERROR_SUCCESS; + *size = snprintf(buffer, *size, fmt, info.lpszSubjectInfo, info.lpszIssuerInfo, + start_date, start_time, expiry_date, expiry_time, + strength, info.dwKeySize); + }else { + err = ERROR_INSUFFICIENT_BUFFER; + *size = 1; + } + + LocalFree(info.lpszSubjectInfo); + LocalFree(info.lpszIssuerInfo); + LocalFree(info.lpszProtocolName); + LocalFree(info.lpszSignatureAlgName); + LocalFree(info.lpszEncryptionAlgName); + return err; + } case INTERNET_OPTION_CONNECT_TIMEOUT: if (*size < sizeof(DWORD)) return ERROR_INSUFFICIENT_BUFFER; diff --git a/dlls/wininet/resource.h b/dlls/wininet/resource.h index 256a374af0..190d3cc397 100644 --- a/dlls/wininet/resource.h +++ b/dlls/wininet/resource.h @@ -38,3 +38,6 @@ #define IDS_CERT_DATE_INVALID 0x502 #define IDS_CERT_CN_INVALID 0x503 #define IDS_CERT_ERRORS 0x504 +#define IDS_CERT_FORMAT 0x505 +#define IDS_CERT_HIGH 0x506 +#define IDS_CERT_LOW 0x507 diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c07d60d2a9..e0a38e05c4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6112,9 +6112,26 @@ static const cert_struct_test_t test_winehq_com_cert = { "webmaster(a)winehq.org" }; +static const char *cert_string_fmt = + "Subject:\r\n%s\r\n" + "Issuer:\r\n%s\r\n" + "Effective Date:\t%s %s\r\n" + "Expiration Date:\t%s %s\r\n" + "Security Protocol:\t%s\r\n" + "Signature Type:\t%s\r\n" + "Encryption Type:\t%s\r\n" + "Privacy Strength:\t%s (%u bits)"; + static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) { INTERNET_CERTIFICATE_INFOA info; + SYSTEMTIME start, expiry; + char expiry_date[32]; + char expiry_time[32]; + char start_date[32]; + char start_time[32]; + char expect[512]; + char actual[512]; DWORD size; BOOL res; @@ -6138,6 +6155,42 @@ static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) ok(!info.lpszProtocolName, "lpszProtocolName = %s\n", info.lpszProtocolName); ok(info.dwKeySize >= 128 && info.dwKeySize <= 256, "dwKeySize = %u\n", info.dwKeySize); + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) + { + skip("Non-English locale (test with hardcoded English)\n"); + release_cert_info(&info); + return; + } + + size = sizeof(actual); + SetLastError(0xdeadbeef); + memset(actual, 0x55, sizeof(actual)); + res = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, actual, &size); + ok(res, "InternetQueryOption failed: %u\n", GetLastError()); + + FileTimeToSystemTime(&info.ftStart, &start); + FileTimeToSystemTime(&info.ftExpiry, &expiry); + + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_date, sizeof(start_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_time, sizeof(start_time)); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_date, sizeof(expiry_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_time, sizeof(expiry_time)); + + snprintf(expect, sizeof(expect), cert_string_fmt, info.lpszSubjectInfo, info.lpszIssuerInfo, + start_date, start_time, expiry_date, expiry_time, + info.lpszSignatureAlgName, info.lpszEncryptionAlgName, info.lpszProtocolName, + info.dwKeySize >= 128 ? "High" : "Low", info.dwKeySize); + ok(size == strlen(actual), "size = %u\n", size); + ok(!strcmp(actual, expect), "cert = actual\n%s\n", actual); + + --size; + SetLastError(0xdeadbeef); + memset(actual, 0x55, sizeof(actual)); + res = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, actual, &size); + ok(!res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == 1, "unexpected size: %u\n", size); + ok(actual[0] == 0x55, "unexpected byte: %02x\n", actual[0]); + release_cert_info(&info); } @@ -6217,7 +6270,7 @@ static void test_security_flags(void) INTERNET_CERTIFICATE_INFOA *cert; HINTERNET ses, conn, req; DWORD size, flags; - char buf[100]; + char buf[512]; BOOL res; if (!https_support) @@ -6378,6 +6431,30 @@ static void test_security_flags(void) } HeapFree(GetProcessHeap(), 0, cert); + SetLastError(0xdeadbeef); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, NULL, NULL); + ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, "InternetQueryOption failed: %d\n", GetLastError()); + + size = 0; + SetLastError(0xdeadbeef); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, NULL, &size); + ok(!res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == 1, "unexpected size: %u\n", size); + + size = 42; + SetLastError(0xdeadbeef); + memset(buf, 0x55, sizeof(buf)); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, buf, &size); + ok(!res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == 1, "unexpected size: %u\n", size); + ok(buf[0] == 0x55, "unexpected byte: %02x\n", buf[0]); + + size = sizeof(buf); + SetLastError(0xdeadbeef); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, buf, &size); + ok(res && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size < sizeof(buf), "unexpected size: %u\n", size); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTING_TO_SERVER, 2); CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTED_TO_SERVER, 2); CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); @@ -6562,9 +6639,10 @@ static void test_secure_connection(void) static const WCHAR get[] = {'G','E','T',0}; static const WCHAR testpage[] = {'/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; HINTERNET ses, con, req; - DWORD size, flags, err; + DWORD size, size2, flags, err; INTERNET_CERTIFICATE_INFOA *certificate_structA = NULL; INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; + char certstr1[512], certstr2[512]; BOOL ret; ses = InternetOpenA("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); @@ -6629,6 +6707,19 @@ static void test_secure_connection(void) } HeapFree(GetProcessHeap(), 0, certificate_structW); + SetLastError(0xdeadbeef); + size = sizeof(certstr1); + ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, certstr1, &size); + ok(ret && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + size2 = sizeof(certstr2); + ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, certstr2, &size2); + ok(ret && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + + ok(size == size2, "expected same size\n"); + ok(!strcmp(certstr1, certstr2), "expected same string\n"); + InternetCloseHandle(req); InternetCloseHandle(con); InternetCloseHandle(ses); @@ -7517,6 +7608,37 @@ static void test_concurrent_header_access(void) CloseHandle( wait ); } +static void test_cert_string(void) +{ + HINTERNET ses, con, req; + char actual[512]; + DWORD size; + BOOL res; + + ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, NULL, "/", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + size = sizeof(actual); + SetLastError( 0xdeadbeef ); + memset( actual, 0x55, sizeof(actual) ); + res = InternetQueryOptionA( req, INTERNET_OPTION_SECURITY_CERTIFICATE, actual, &size ); + ok( !res && GetLastError() == ERROR_INTERNET_INVALID_OPERATION, + "InternetQueryOption failed: %u\n", GetLastError() ); + ok( size == 0, "unexpected size: %u\n", size ); + ok( actual[0] == 0x55, "unexpected byte: %02x\n", actual[0] ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); +} + START_TEST(http) { HMODULE hdll; @@ -7566,5 +7688,6 @@ START_TEST(http) test_connection_failure(); test_default_service_port(); test_concurrent_header_access(); + test_cert_string(); free_events(); } diff --git a/dlls/wininet/wininet.rc b/dlls/wininet/wininet.rc index b6e35629ca..5bd5b48ccc 100644 --- a/dlls/wininet/wininet.rc +++ b/dlls/wininet/wininet.rc @@ -29,6 +29,17 @@ STRINGTABLE IDS_CERT_DATE_INVALID "The date on the certificate is invalid." IDS_CERT_CN_INVALID "The name on the certificate does not match the site." IDS_CERT_ERRORS "There is at least one unspecified security problem with this certificate." + + IDS_CERT_FORMAT "Subject:\015\n%s\015\n" \ + "Issuer:\015\n%s\015\n" \ + "Effective Date:\t%s %s\015\n" \ + "Expiration Date:\t%s %s\015\n" \ + "Security Protocol:\t(null)\015\n" \ + "Signature Type:\t(null)\015\n" \ + "Encryption Type:\t(null)\015\n" \ + "Privacy Strength:\t%s (%u bits)" + IDS_CERT_HIGH "High" + IDS_CERT_LOW "Low" } IDD_PROXYDLG DIALOG 36, 24, 220, 146 -- 2.25.1

4 4

[PATCH 2/2] xactengine3_7: Use CLSID defined from global header.
by Alistair Leslie-Hughes Aug. 5, 2020

Aug. 5, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/Makefile.in | 1 + dlls/xactengine3_7/xact_dll.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/Makefile.in b/dlls/xactengine3_7/Makefile.in index 6fce27d1628..6d486171622 100644 --- a/dlls/xactengine3_7/Makefile.in +++ b/dlls/xactengine3_7/Makefile.in @@ -1,5 +1,6 @@ MODULE = xactengine3_7.dll IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0307 EXTRALIBS = $(FAUDIO_LIBS) EXTRAINCL = $(FAUDIO_CFLAGS) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 69570e8ceff..2a55b49de25 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -27,7 +27,6 @@ #include "initguid.h" #include "xact3.h" #include "rpcproxy.h" -#include "xact_classes.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xact3); @@ -511,7 +510,7 @@ HRESULT WINAPI DllCanUnloadNow(void) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - if (IsEqualGUID(rclsid, &CLSID_XACTEngine37)) + if (IsEqualGUID(rclsid, &CLSID_XACTEngine)) { TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return IClassFactory_QueryInterface(&XACTFactory, riid, ppv); -- 2.27.0

1 0

[PATCH] gdiplus: Avoid a few unnecessary calculations for arc2polybezier.
by Jeff Smith Aug. 5, 2020

Aug. 5, 2020

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- 1. If width and height are equal, the 'unstretch' is not needed, though the unit conversion still is. 2. When the ratio between width and height is all that is needed, scaling them both equally is waste. 3. The start of a new partial is going to be the same as the end of the previous partial. dlls/gdiplus/gdiplus.c | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index d114ff797e..ee98d024f8 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -202,54 +202,54 @@ static void add_arc_part(GpPointF * pt, REAL x1, REAL y1, REAL x2, REAL y2, * adjusts the angles so that when we stretch the points they will end in the * right place. This is only complicated because atan and atan2 do not behave * conveniently. */ -static void unstretch_angle(REAL * angle, REAL rad_x, REAL rad_y) +static REAL unstretch_angle(REAL angle, REAL dia_x, REAL dia_y) { REAL stretched; INT revs_off; - *angle = deg2rad(*angle); + if(fabs(cos(angle)) < 0.00001 || fabs(sin(angle)) < 0.00001) + return angle; - if(fabs(cos(*angle)) < 0.00001 || fabs(sin(*angle)) < 0.00001) - return; - - stretched = gdiplus_atan2(sin(*angle) / fabs(rad_y), cos(*angle) / fabs(rad_x)); - revs_off = gdip_round(*angle / (2.0 * M_PI)) - gdip_round(stretched / (2.0 * M_PI)); + stretched = gdiplus_atan2(sin(angle) / fabs(dia_y), cos(angle) / fabs(dia_x)); + revs_off = gdip_round(angle / (2.0 * M_PI)) - gdip_round(stretched / (2.0 * M_PI)); stretched += ((REAL)revs_off) * M_PI * 2.0; - *angle = stretched; + return stretched; } /* Stores the bezier points that correspond to the arc in points. If points is * null, just return the number of points needed to represent the arc. */ -INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, - REAL startAngle, REAL sweepAngle) +INT arc2polybezier(GpPointF * points, REAL left, REAL top, REAL width, REAL height, + REAL start_angle, REAL sweep_angle) { INT i; - REAL end_angle, start_angle, endAngle; + REAL partial_end_angle, end_angle; - endAngle = startAngle + sweepAngle; - unstretch_angle(&startAngle, x2 / 2.0, y2 / 2.0); - unstretch_angle(&endAngle, x2 / 2.0, y2 / 2.0); + end_angle = deg2rad(start_angle + sweep_angle); + start_angle = deg2rad(start_angle); - /* start_angle and end_angle are the iterative variables */ - start_angle = startAngle; + if (width != height) + { + start_angle = unstretch_angle(start_angle, width, height); + end_angle = unstretch_angle(end_angle, width, height); + } for(i = 0; i < MAX_ARC_PTS - 1; i += 3){ /* check if we've overshot the end angle */ - if( sweepAngle > 0.0 ) + if( sweep_angle > 0.0 ) { - if (start_angle >= endAngle) break; - end_angle = min(start_angle + M_PI_2, endAngle); + if (start_angle >= end_angle) break; + partial_end_angle = min(start_angle + M_PI_2, end_angle); } else { - if (start_angle <= endAngle) break; - end_angle = max(start_angle - M_PI_2, endAngle); + if (start_angle <= end_angle) break; + partial_end_angle = max(start_angle - M_PI_2, end_angle); } if (points) - add_arc_part(&points[i], x1, y1, x2, y2, start_angle, end_angle, i == 0); + add_arc_part(&points[i], left, top, width, height, start_angle, partial_end_angle, i == 0); - start_angle += M_PI_2 * (sweepAngle < 0.0 ? -1.0 : 1.0); + start_angle = partial_end_angle; } if (i == 0) return 0; -- 2.23.0

2 1

[PATCH v2] dmime: Parse TimeSig track data.
by Alistair Leslie-Hughes Aug. 4, 2020

Aug. 4, 2020

The tims data actually has a DWORD (size) before the structure. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/timesigtrack.c | 61 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 697b3e3593b..f61e87806e9 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -37,6 +37,11 @@ static inline IDirectMusicTimeSigTrack *impl_from_IDirectMusicTrack(IDirectMusic return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, IDirectMusicTrack_iface); } +static inline IDirectMusicTimeSigTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, void **ret_iface) { @@ -207,10 +212,62 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { IDirectMusicTrackImpl_Clone }; +struct timesig_item +{ + DWORD size; + DMUS_IO_TIMESIGNATURE_ITEM timesig; +}; + +static HRESULT parse_timetrack_list(IDirectMusicTimeSigTrack *This, IStream *stream, + struct chunk_entry *timesig) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = timesig}; + struct timesig_item item; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(timesig)); + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + if (chunk.id != DMUS_FOURCC_TIMESIGNATURE_TRACK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &item, sizeof(item)))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + + TRACE(" Size %d\n", item.size); + + TRACE("Found DMUS_IO_TIMESIGNATURE_ITEM\n"); + TRACE(" - lTime %d\n", item.timesig.lTime); + TRACE(" - bBeatsPerMeasure %d\n", item.timesig.bBeatsPerMeasure); + TRACE(" - bBeat %d\n", item.timesig.bBeat); + TRACE(" - wGridsPerBeat %d\n", item.timesig.wGridsPerBeat); + } + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI time_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicTimeSigTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_TIMESIGTRACK_LIST) + hr = parse_timetrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { -- 2.27.0

2 2

[PATCH 2/2] dmime: Simplify loading/storing of the Tempo Track data
by Michael Stefaniuc Aug. 4, 2020

Aug. 4, 2020

Fixes loading more than one tempo items. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Turns out the pattern of storing an array in a chunk as DWORD - size of element elements[] - array of elements is pretty common. 10 IDirectMusicTrack implementations have it, some of them in multiple chunk types. dlls/dmime/dmobject.c | 45 ++++++++++++++++++ dlls/dmime/dmobject.h | 2 + dlls/dmime/tempotrack.c | 102 +++++++++++++++------------------------- 3 files changed, 85 insertions(+), 64 deletions(-) diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index 0ef007530fd..e6a1ce906a7 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -28,6 +28,7 @@ #include "dmusics.h" #include "dmobject.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmobj); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -371,6 +372,50 @@ HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk) return stream_get_chunk(stream, chunk); } +/* Reads chunk data of the form: + DWORD - size of array element + element[] - Array of elements + The caller needs to heap_free() the array. +*/ +HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array, + unsigned int *count, DWORD elem_size) +{ + DWORD size; + HRESULT hr; + + *array = NULL; + *count = 0; + + if (chunk->size < sizeof(DWORD)) { + WARN_(dmfile)("%s: Too short to read element size\n", debugstr_chunk(chunk)); + return E_FAIL; + } + if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD)))) + return hr; + if (size != elem_size) { + WARN_(dmfile)("%s: Array element size mismatch: got %u, expected %u\n", + debugstr_chunk(chunk), size, elem_size); + return DMUS_E_UNSUPPORTED_STREAM; + } + + *count = (chunk->size - sizeof(DWORD)) / elem_size; + size = *count * elem_size; + if (!(*array = heap_alloc(size))) + return E_OUTOFMEMORY; + if (FAILED(hr = stream_read(stream, *array, size))) { + heap_free(*array); + *array = NULL; + return hr; + } + + if (chunk->size > size + sizeof(DWORD)) { + WARN_(dmfile)("%s: Extraneous data at end of array\n", debugstr_chunk(chunk)); + stream_skip_chunk(stream, chunk); + return S_FALSE; + } + return S_OK; +} + HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data, ULONG size) { diff --git a/dlls/dmime/dmobject.h b/dlls/dmime/dmobject.h index a1729c83232..afe721dc824 100644 --- a/dlls/dmime/dmobject.h +++ b/dlls/dmime/dmobject.h @@ -35,6 +35,8 @@ HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HI HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; HRESULT stream_skip_chunk(IStream *stream, const struct chunk_entry *chunk) DECLSPEC_HIDDEN; +HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array, + unsigned int *count, DWORD elem_size) DECLSPEC_HIDDEN; HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data, ULONG size) DECLSPEC_HIDDEN; HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str, diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 94e4430b7f9..9d25ccc298c 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -29,11 +29,13 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicTempoTrack implementation */ + typedef struct IDirectMusicTempoTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; struct dmobject dmobj; /* IPersistStream only */ LONG ref; - struct list Items; + DMUS_IO_TEMPO_ITEM *items; + unsigned int count; } IDirectMusicTempoTrack; /* IDirectMusicTempoTrack IDirectMusicTrack8 part: */ @@ -83,16 +85,7 @@ static ULONG WINAPI tempo_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { - struct list *cursor, *cursor2; - DMUS_PRIVATE_TEMPO_ITEM *item; - - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) { - item = LIST_ENTRY(cursor, DMUS_PRIVATE_TEMPO_ITEM, entry); - list_remove(cursor); - - heap_free(item); - } - + heap_free(This->items); heap_free(This); DMIME_UnlockModule(); } @@ -157,8 +150,8 @@ static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty MUSIC_TIME *next, void *param) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - DMUS_PRIVATE_TEMPO_ITEM *item = NULL; DMUS_TEMPO_PARAM *prm = param; + unsigned int i; TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); @@ -174,15 +167,15 @@ static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty prm->mtTime = 0; prm->dblTempo = 0.123456; - LIST_FOR_EACH_ENTRY(item, &This->Items, DMUS_PRIVATE_TEMPO_ITEM, entry) { - if (item->item.lTime <= time) { - MUSIC_TIME ofs = item->item.lTime - time; + for (i = 0; i < This->count; i++) { + if (This->items[i].lTime <= time) { + MUSIC_TIME ofs = This->items[i].lTime - time; if (ofs > prm->mtTime) { prm->mtTime = ofs; - prm->dblTempo = item->item.dblTempo; + prm->dblTempo = This->items[i].dblTempo; } - if (next && item->item.lTime > time && item->item.lTime < *next) - *next = item->item.lTime; + if (next && This->items[i].lTime > time && This->items[i].lTime < *next) + *next = This->items[i].lTime; } } @@ -334,53 +327,35 @@ static inline IDirectMusicTempoTrack *impl_from_IPersistStream(IPersistStream *i return CONTAINING_RECORD(iface, IDirectMusicTempoTrack, dmobj.IPersistStream_iface); } -static HRESULT WINAPI tempo_IPersistStream_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI tempo_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - IDirectMusicTempoTrack *This = impl_from_IPersistStream(iface); - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount; - LARGE_INTEGER liMove; - DMUS_IO_TEMPO_ITEM item; - LPDMUS_PRIVATE_TEMPO_ITEM pNewItem = NULL; - DWORD nItem = 0; - FIXME("(%p, %p): Loading not fully implemented yet\n", This, pStm); - - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_TEMPO_TRACK: { - TRACE_(dmfile)(": Tempo track\n"); - IStream_Read (pStm, &StreamSize, sizeof(DWORD), NULL); - StreamSize -= sizeof(DWORD); - StreamCount = 0; - TRACE_(dmfile)(" - sizeof(DMUS_IO_TEMPO_ITEM): %u (chunkSize = %u)\n", StreamSize, Chunk.dwSize); - do { - IStream_Read (pStm, &item, sizeof(item), NULL); - ++nItem; - TRACE_(dmfile)("DMUS_IO_TEMPO_ITEM #%d\n", nItem); - TRACE_(dmfile)(" - lTime = %u\n", item.lTime); - TRACE_(dmfile)(" - dblTempo = %g\n", item.dblTempo); - pNewItem = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_TEMPO_ITEM)); - if (NULL == pNewItem) - return E_OUTOFMEMORY; - - pNewItem->item = item; - list_add_tail (&This->Items, &pNewItem->entry); - pNewItem = NULL; - StreamCount += sizeof(item); - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); - } while (StreamCount < StreamSize); - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - return E_FAIL; - } - } + IDirectMusicTempoTrack *This = impl_from_IPersistStream(iface); + struct chunk_entry chunk = {0}; + unsigned int i; + HRESULT hr; - return S_OK; + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + if (chunk.id != DMUS_FOURCC_TEMPO_TRACK) + return DMUS_E_UNSUPPORTED_STREAM; + + hr = stream_chunk_get_array(stream, &chunk, (void **)&This->items, &This->count, + sizeof(DMUS_IO_TEMPO_ITEM)); + if (FAILED(hr)) + return hr; + + for (i = 0; i < This->count; i++) { + TRACE_(dmfile)("DMUS_IO_TEMPO_ITEM #%u\n", i); + TRACE_(dmfile)(" - lTime = %u\n", This->items[i].lTime); + TRACE_(dmfile)(" - dblTempo = %g\n", This->items[i].dblTempo); + } + + return S_OK; } static const IPersistStreamVtbl persiststream_vtbl = { @@ -410,7 +385,6 @@ HRESULT WINAPI create_dmtempotrack(REFIID lpcGUID, void **ppobj) dmobject_init(&track->dmobj, &CLSID_DirectMusicTempoTrack, (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - list_init(&track->Items); DMIME_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); -- 2.26.2

1 0

[PATCH 1/2] dmime: Constify the chunk parameter of stream_skip_chunk()
by Michael Stefaniuc Aug. 4, 2020

Aug. 4, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/dmobject.c | 2 +- dlls/dmime/dmobject.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index 2a0a540fdb7..0ef007530fd 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -349,7 +349,7 @@ HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk) return S_OK; } -HRESULT stream_skip_chunk(IStream *stream, struct chunk_entry *chunk) +HRESULT stream_skip_chunk(IStream *stream, const struct chunk_entry *chunk) { LARGE_INTEGER end; diff --git a/dlls/dmime/dmobject.h b/dlls/dmime/dmobject.h index fcbb89fd28b..a1729c83232 100644 --- a/dlls/dmime/dmobject.h +++ b/dlls/dmime/dmobject.h @@ -33,7 +33,7 @@ struct chunk_entry { HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; -HRESULT stream_skip_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; +HRESULT stream_skip_chunk(IStream *stream, const struct chunk_entry *chunk) DECLSPEC_HIDDEN; HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data, ULONG size) DECLSPEC_HIDDEN; -- 2.26.2

1 0

[PATCH 3/3 v2] msvcrt: Import sqrt from musl.
by Piotr Caban Aug. 4, 2020

Aug. 4, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 119 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 116 insertions(+), 3 deletions(-)

2 2

[PATCH 1/2] ntdll: Use unique handle numbers in generated SMBIOS tables.
by Brendan Shanks Aug. 4, 2020

Aug. 4, 2020

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 3756bd7cee0..de33d52ed2e 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1257,6 +1257,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON size_t chassis_vendor_len, chassis_version_len, chassis_serial_len, chassis_asset_tag_len; char *buffer = (char*)sfti->TableBuffer; BYTE string_count; + BYTE handle_count = 0; struct smbios_prologue *prologue; struct smbios_bios *bios; struct smbios_system *system; @@ -1321,7 +1322,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON bios = (struct smbios_bios*)buffer; bios->hdr.type = 0; bios->hdr.length = sizeof(struct smbios_bios); - bios->hdr.handle = 0; + bios->hdr.handle = handle_count++; bios->vendor = bios_vendor_len ? ++string_count : 0; bios->version = bios_version_len ? ++string_count : 0; bios->start = 0; @@ -1346,7 +1347,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON system = (struct smbios_system*)buffer; system->hdr.type = 1; system->hdr.length = sizeof(struct smbios_system); - system->hdr.handle = 0; + system->hdr.handle = handle_count++; system->vendor = system_vendor_len ? ++string_count : 0; system->product = system_product_len ? ++string_count : 0; system->version = system_version_len ? ++string_count : 0; @@ -1370,7 +1371,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON board = (struct smbios_board*)buffer; board->hdr.type = 2; board->hdr.length = sizeof(struct smbios_board); - board->hdr.handle = 0; + board->hdr.handle = handle_count++; board->vendor = board_vendor_len ? ++string_count : 0; board->product = board_product_len ? ++string_count : 0; board->version = board_version_len ? ++string_count : 0; @@ -1388,7 +1389,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON chassis = (struct smbios_chassis*)buffer; chassis->hdr.type = 3; chassis->hdr.length = sizeof(struct smbios_chassis); - chassis->hdr.handle = 0; + chassis->hdr.handle = handle_count++; chassis->vendor = chassis_vendor_len ? ++string_count : 0; chassis->type = atoi(chassis_type); chassis->version = chassis_version_len ? ++string_count : 0; -- 2.26.2

1 1

[PATCH v2] vbscript: Support conversion to string in InStr
by Dmitry Kislyuk Aug. 4, 2020

Aug. 4, 2020

2 1

[PATCH v2] ieframe: Deactivate UI when processing IOleObject::DoVerb(OLEIVERB_HIDE).
by Dmitry Timoshkov Aug. 4, 2020

Aug. 4, 2020

This fixes an application that expects to go through full UI activation after IOleObject::DoVerb(OLEIVERB_HIDE) + IOleObject::DoVerb(OLEIVERB_UIACTIVATE). v2: Move the tests to test_WebBrowser_DoVerb(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/ieframe.h | 2 + dlls/ieframe/oleobject.c | 44 ++++++--- dlls/ieframe/tests/webbrowser.c | 154 +++++++++++++++++++++++++++++++- 3 files changed, 183 insertions(+), 17 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 329cea2f7c..24d490c272 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -210,6 +210,8 @@ struct WebBrowser { OLEINPLACEFRAMEINFO frameinfo; SIZEL extent; + BOOL ui_activated; + HWND shell_embedding_hwnd; VARIANT_BOOL register_browser; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 031994caa5..a2f87dda2f 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -214,6 +214,9 @@ static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site) if(FAILED(hres)) return hres; + if(This->ui_activated) + return S_OK; + IOleInPlaceSiteEx_OnUIActivate(This->inplace); if(This->doc_host.frame) @@ -227,6 +230,8 @@ static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site) SetFocus(This->shell_embedding_hwnd); notify_on_focus(This, TRUE); + This->ui_activated = TRUE; + return S_OK; } @@ -579,6 +584,26 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szCont return S_OK; } +static void deactivate_ui(WebBrowser *This) +{ + if(This->ui_activated) { + if(This->doc_host.frame) + IOleInPlaceFrame_SetActiveObject(This->doc_host.frame, NULL, NULL); + + if(This->uiwindow) + IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, NULL, NULL); + + if(This->inplace) + IOleInPlaceSiteEx_OnUIDeactivate(This->inplace, FALSE); + notify_on_focus(This, FALSE); + + This->ui_activated = FALSE; + } + + if(This->inplace) + IOleInPlaceSiteEx_OnInPlaceDeactivate(This->inplace); +} + static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { WebBrowser *This = impl_from_IOleObject(iface); @@ -592,17 +617,7 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) return E_NOTIMPL; } - if(This->doc_host.frame) - IOleInPlaceFrame_SetActiveObject(This->doc_host.frame, NULL, NULL); - - if(This->uiwindow) - IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, NULL, NULL); - - if(This->inplace) - IOleInPlaceSiteEx_OnUIDeactivate(This->inplace, FALSE); - notify_on_focus(This, FALSE); - if(This->inplace) - IOleInPlaceSiteEx_OnInPlaceDeactivate(This->inplace); + deactivate_ui(This); /* store old client site - we need to restore it in DoVerb */ client = This->client; @@ -677,8 +692,11 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag return activate_inplace(This, pActiveSite); case OLEIVERB_HIDE: TRACE("OLEIVERB_HIDE\n"); - if(This->inplace) - IOleInPlaceSiteEx_OnInPlaceDeactivate(This->inplace); + if(This->inplace) { + deactivate_ui(This); + IOleInPlaceSiteEx_Release(This->inplace); + This->inplace = NULL; + } if(This->shell_embedding_hwnd) ShowWindow(This->shell_embedding_hwnd, SW_HIDE); return S_OK; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index e0af0d4642..9c2c393aaf 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -167,7 +167,8 @@ static VARIANT_BOOL exvb; static IWebBrowser2 *wb; static HWND container_hwnd, shell_embedding_hwnd; -static BOOL is_downloading, do_download, is_first_load, use_container_olecmd, test_close, is_http, use_container_dochostui; +static BOOL is_downloading, do_download, is_first_load, use_container_olecmd; +static BOOL test_close, test_hide, is_http, use_container_dochostui; static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; static const WCHAR *current_url; @@ -1265,7 +1266,7 @@ static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) { CHECK_EXPECT(UIWindow_SetActiveObject); - if(!test_close) { + if(!test_close && !test_hide) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); } else { @@ -1279,7 +1280,7 @@ static HRESULT WINAPI InPlaceFrame_SetActiveObject(IOleInPlaceFrame *iface, IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) { CHECK_EXPECT(Frame_SetActiveObject); - if(!test_close) { + if(!test_close && !test_hide) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); } else { @@ -3743,7 +3744,7 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) SET_EXPECT(Advise_OnClose); hres = IOleObject_Close(oo, OLECLOSE_NOSAVE); ok(hres == S_OK, "OleObject_Close failed: %x\n", hres); - todo_wine CHECK_NOT_CALLED(OnFocus_FALSE); + CHECK_NOT_CALLED(OnFocus_FALSE); todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); CHECK_CALLED(Advise_OnClose); @@ -4018,6 +4019,8 @@ static void test_WebBrowser_DoVerb(void) HWND hwnd; ULONG ref; BOOL res; + HRESULT hres; + VARIANT_BOOL b; webbrowser = create_webbrowser(); init_test(webbrowser, 0); @@ -4050,6 +4053,149 @@ static void test_WebBrowser_DoVerb(void) call_DoVerb(webbrowser, OLEIVERB_HIDE); CHECK_CALLED(OnInPlaceDeactivate); + b = 0x100; + hres = IWebBrowser2_get_Visible(webbrowser, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + SET_EXPECT(CanInPlaceActivate); + SET_EXPECT(Site_GetWindow); + SET_EXPECT(OnInPlaceActivate); + SET_EXPECT(GetWindowContext); + SET_EXPECT(ShowObject); + SET_EXPECT(GetContainer); + SET_EXPECT(Frame_GetWindow); + SET_EXPECT(OnUIActivate); + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(SetMenu); + SET_EXPECT(OnFocus_TRUE); + call_DoVerb(webbrowser, OLEIVERB_SHOW); + CHECK_CALLED(CanInPlaceActivate); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(OnInPlaceActivate); + CHECK_CALLED(GetWindowContext); + CHECK_CALLED(ShowObject); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Frame_GetWindow); + CHECK_CALLED(OnUIActivate); + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(SetMenu); + CHECK_CALLED(OnFocus_TRUE); + + b = 0x100; + hres = IWebBrowser2_get_Visible(webbrowser, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + call_DoVerb(webbrowser, OLEIVERB_SHOW); + call_DoVerb(webbrowser, OLEIVERB_UIACTIVATE); + + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(OnUIDeactivate); + SET_EXPECT(OnFocus_FALSE); + SET_EXPECT(OnInPlaceDeactivate); + test_hide = TRUE; + call_DoVerb(webbrowser, OLEIVERB_HIDE); + test_hide = FALSE; + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(OnUIDeactivate); + CHECK_CALLED(OnFocus_FALSE); + CHECK_CALLED(OnInPlaceDeactivate); + + b = 0x100; + hres = IWebBrowser2_get_Visible(webbrowser, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + SET_EXPECT(CanInPlaceActivate); + SET_EXPECT(Site_GetWindow); + SET_EXPECT(OnInPlaceActivate); + SET_EXPECT(GetWindowContext); + SET_EXPECT(ShowObject); + SET_EXPECT(GetContainer); + SET_EXPECT(Frame_GetWindow); + SET_EXPECT(OnUIActivate); + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(SetMenu); + SET_EXPECT(OnFocus_TRUE); + call_DoVerb(webbrowser, OLEIVERB_SHOW); + CHECK_CALLED(CanInPlaceActivate); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(OnInPlaceActivate); + CHECK_CALLED(GetWindowContext); + CHECK_CALLED(ShowObject); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Frame_GetWindow); + CHECK_CALLED(OnUIActivate); + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(SetMenu); + CHECK_CALLED(OnFocus_TRUE); + + b = 0x100; + hres = IWebBrowser2_get_Visible(webbrowser, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(OnUIDeactivate); + SET_EXPECT(OnFocus_FALSE); + SET_EXPECT(OnInPlaceDeactivate); + test_hide = TRUE; + call_DoVerb(webbrowser, OLEIVERB_HIDE); + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(OnUIDeactivate); + CHECK_CALLED(OnFocus_FALSE); + CHECK_CALLED(OnInPlaceDeactivate); + + call_DoVerb(webbrowser, OLEIVERB_HIDE); + test_hide = FALSE; + + b = 0x100; + hres = IWebBrowser2_get_Visible(webbrowser, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + SET_EXPECT(CanInPlaceActivate); + SET_EXPECT(Site_GetWindow); + SET_EXPECT(OnInPlaceActivate); + SET_EXPECT(GetWindowContext); + SET_EXPECT(ShowObject); + SET_EXPECT(GetContainer); + SET_EXPECT(Frame_GetWindow); + SET_EXPECT(OnUIActivate); + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(SetMenu); + SET_EXPECT(OnFocus_TRUE); + call_DoVerb(webbrowser, OLEIVERB_UIACTIVATE); + CHECK_CALLED(CanInPlaceActivate); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(OnInPlaceActivate); + CHECK_CALLED(GetWindowContext); + CHECK_CALLED(ShowObject); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Frame_GetWindow); + CHECK_CALLED(OnUIActivate); + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(SetMenu); + CHECK_CALLED(OnFocus_TRUE); + + b = 0x100; + hres = IWebBrowser2_get_Visible(webbrowser, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + call_DoVerb(webbrowser, OLEIVERB_SHOW); + test_ClientSite(webbrowser, NULL, FALSE); ref = IWebBrowser2_Release(webbrowser); -- 2.26.2

2 1