July 2016 - Wine-Commits - list.winehq.org

Nikolay Sivov : include: Added IDWriteFontSetBuilder definition.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: cb6c8cdfa99088297773692adf163da3c6c8673b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb6c8cdfa99088297773692ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 6 15:31:34 2016 +0300 include: Added IDWriteFontSetBuilder definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index e312d5e..9e7a4c6 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -21,7 +21,6 @@ import "dwrite_2.idl"; interface IDWriteFontFaceReference; interface IDWriteFontFace3; interface IDWriteFontSet; -interface IDWriteFontSetBuilder; interface IDWriteFontDownloadQueue; cpp_quote("#ifndef _WINGDI_") @@ -330,6 +329,21 @@ interface IDWriteGdiInterop1 : IDWriteGdiInterop [ local, object, + uuid(2f642afe-9c68-4f40-b8be-457401afcb3d) +] +interface IDWriteFontSetBuilder : IUnknown +{ + HRESULT AddFontFaceReference_(IDWriteFontFaceReference *ref, + DWRITE_FONT_PROPERTY const *props, + UINT32 prop_count); + HRESULT AddFontFaceReference(IDWriteFontFaceReference *ref); + HRESULT AddFontSet(IDWriteFontSet *fontset); + HRESULT CreateFontSet(IDWriteFontSet **fontset); +} + +[ + local, + object, uuid(9a1b41c3-d3bb-466a-87fc-fe67556a3b65) ] interface IDWriteFactory3 : IDWriteFactory2

1 0

Jacek Caban : wininet: Added semi-stub INTERNET_OPTION_END_BROWSER_SESSION implementation.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 27ea3804ddc8077fedb7a0ea81ac96910f78a26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ea3804ddc8077fedb7a0ea8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 6 13:44:15 2016 +0200 wininet: Added semi-stub INTERNET_OPTION_END_BROWSER_SESSION implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 3 ++- dlls/wininet/tests/internet.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d3d6a38..19cf470 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2805,7 +2805,8 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, FIXME("Option INTERNET_OPTION_RESET_URLCACHE_SESSION: STUB\n"); break; case INTERNET_OPTION_END_BROWSER_SESSION: - FIXME("Option INTERNET_OPTION_END_BROWSER_SESSION: STUB\n"); + FIXME("Option INTERNET_OPTION_END_BROWSER_SESSION: semi-stub\n"); + free_cookie(); break; case INTERNET_OPTION_CONNECTED_STATE: FIXME("Option INTERNET_OPTION_CONNECTED_STATE: STUB\n"); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index ac8e9b3..5408af8 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1173,6 +1173,28 @@ static void test_InternetSetOption(void) ok(ret == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); } +static void test_end_browser_session(void) +{ + DWORD len; + BOOL ret; + + ret = InternetSetCookieA("http://www.example.com/test_end", NULL, "A=B"); + ok(ret == TRUE, "InternetSetCookie failed\n"); + + len = 1024; + ret = InternetGetCookieA("http://www.example.com/test_end", NULL, NULL, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); + ok(len != 0, "len = 0\n"); + + ret = InternetSetOptionA(NULL, INTERNET_OPTION_END_BROWSER_SESSION, NULL, 0); + ok(ret, "InternetSetOptio(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); + + len = 1024; + ret = InternetGetCookieA("http://www.example.com/test_end", NULL, NULL, &len); + ok(!ret && GetLastError() == ERROR_NO_MORE_ITEMS, "InternetGetCookie returned %x (%u)\n", ret, GetLastError()); + ok(!len, "len = %u\n", len); +} + #define verifyProxyEnable(e) r_verifyProxyEnable(__LINE__, e) static void r_verifyProxyEnable(LONG l, DWORD exp) { @@ -1805,4 +1827,5 @@ START_TEST(internet) win_skip("Privacy[SG]etZonePreferenceW are not available\n"); test_InternetSetOption(); + test_end_browser_session(); }

1 0

Jacek Caban : wininet: Always set returned size in InternetGetCookieExA.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: b53b717dadcaf5fb4e2af1985a42e5ca7f495062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53b717dadcaf5fb4e2af1985… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 6 13:44:01 2016 +0200 wininet: Always set returned size in InternetGetCookieExA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 4 ++-- dlls/wininet/tests/internet.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 3240633..5421fe1 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -808,7 +808,7 @@ BOOL WINAPI InternetGetCookieExA(LPCSTR lpszUrl, LPCSTR lpszCookieName, LPSTR lpCookieData, LPDWORD lpdwSize, DWORD flags, void *reserved) { WCHAR *url, *name; - DWORD len, size; + DWORD len, size = 0; BOOL r; TRACE("(%s %s %p %p(%u) %x %p)\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName), @@ -841,12 +841,12 @@ BOOL WINAPI InternetGetCookieExA(LPCSTR lpszUrl, LPCSTR lpszCookieName, r = FALSE; } } - *lpdwSize = size; } heap_free( szCookieData ); } } + *lpdwSize = size; heap_free( name ); heap_free( url ); return r; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 9b0a2e7..ac8e9b3 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -360,11 +360,13 @@ static void test_get_cookie(void) DWORD len; BOOL ret; + len = 1024; SetLastError(0xdeadbeef); ret = InternetGetCookieA("http://www.example.com", NULL, NULL, &len); ok(!ret && GetLastError() == ERROR_NO_MORE_ITEMS, "InternetGetCookie should have failed with %s and error %d\n", ret ? "TRUE" : "FALSE", GetLastError()); + ok(!len, "len = %u\n", len); }

1 0

Józef Kucia : d3d11/tests: Port test_timestamp_query( ) from d3d9.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 47c4b45256d5e23cb8d44b886e1d9cf36d680733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c4b45256d5e23cb8d44b886… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 6 12:02:33 2016 +0200 d3d11/tests: Port test_timestamp_query() from d3d9. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b3b67c4..2f69042 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4300,6 +4300,163 @@ static void test_create_query(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_timestamp_query(void) +{ + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + + ID3D11Asynchronous *timestamp_query, *timestamp_disjoint_query; + D3D11_QUERY_DATA_TIMESTAMP_DISJOINT disjoint, prev_disjoint; + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + D3D11_QUERY_DESC query_desc; + unsigned int data_size, i; + ID3D11Device *device; + UINT64 timestamp; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + query_desc.Query = D3D11_QUERY_TIMESTAMP; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&timestamp_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D11Asynchronous_GetDataSize(timestamp_query); + ok(data_size == sizeof(UINT64), "Got unexpected data size %u.\n", data_size); + + query_desc.Query = D3D11_QUERY_TIMESTAMP_DISJOINT; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&timestamp_disjoint_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D11Asynchronous_GetDataSize(timestamp_disjoint_query); + ok(data_size == sizeof(disjoint), "Got unexpected data size %u.\n", data_size); + + /* Test a TIMESTAMP_DISJOINT query. */ + ID3D11DeviceContext_Begin(context, timestamp_disjoint_query); + ID3D11DeviceContext_End(context, timestamp_disjoint_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + disjoint.Frequency = 0xdeadbeef; + disjoint.Disjoint = 0xff; + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency != 0xdeadbeef, "Frequency data was not modified.\n"); + ok(disjoint.Disjoint == TRUE || disjoint.Disjoint == FALSE, "Got unexpected disjoint %#x.\n", disjoint.Disjoint); + + prev_disjoint = disjoint; + + disjoint.Frequency = 0xdeadbeef; + disjoint.Disjoint = 0xff; + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint) - 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint) + 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint) / 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint) * 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency == 0xdeadbeef, "Frequency data was modified.\n"); + ok(disjoint.Disjoint == 0xff, "Disjoint data was modified.\n"); + + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, NULL, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), + D3D11_ASYNC_GETDATA_DONOTFLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!memcmp(&disjoint, &prev_disjoint, sizeof(disjoint)), "Disjoint data mismatch.\n"); + + hr = ID3D11DeviceContext_GetData(context, timestamp_query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + /* Test a TIMESTAMP query inside a TIMESTAMP_DISJOINT query. */ + ID3D11DeviceContext_Begin(context, timestamp_disjoint_query); + + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + draw_color_quad(&test_context, &red); + + ID3D11DeviceContext_End(context, timestamp_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, timestamp_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + timestamp = 0xdeadbeef; + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp) / 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(timestamp == 0xdeadbeef, "Timestamp was modified.\n"); + + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(timestamp != 0xdeadbeef, "Timestamp was not modified.\n"); + + timestamp = 0xdeadbeef; + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp) - 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp) + 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp) / 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp) * 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(timestamp == 0xdeadbeef, "Timestamp was modified.\n"); + + ID3D11DeviceContext_End(context, timestamp_disjoint_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + disjoint.Frequency = 0xdeadbeef; + disjoint.Disjoint = 0xff; + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency != 0xdeadbeef, "Frequency data was not modified.\n"); + ok(disjoint.Disjoint == TRUE || disjoint.Disjoint == FALSE, "Got unexpected disjoint %#x.\n", disjoint.Disjoint); + + /* It's not strictly necessary for the TIMESTAMP query to be inside a TIMESTAMP_DISJOINT query. */ + ID3D11Asynchronous_Release(timestamp_query); + query_desc.Query = D3D11_QUERY_TIMESTAMP; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&timestamp_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + draw_color_quad(&test_context, &red); + + ID3D11DeviceContext_End(context, timestamp_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, timestamp_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D11Asynchronous_Release(timestamp_query); + ID3D11Asynchronous_Release(timestamp_disjoint_query); + release_test_context(&test_context); +} + static void test_device_removed_reason(void) { ID3D11Device *device; @@ -8915,6 +9072,7 @@ START_TEST(d3d11) test_create_depthstencil_state(); test_create_rasterizer_state(); test_create_query(); + test_timestamp_query(); test_device_removed_reason(); test_private_data(); test_blend();

1 0

Józef Kucia : d3d11: Implement d3d11_query_GetDataSize().
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 7a756ad1b4ba639265cb8dac3d02fe285b979236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a756ad1b4ba639265cb8dac3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 6 12:02:32 2016 +0200 d3d11: Implement d3d11_query_GetDataSize(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index f91a053..38c8a28 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -136,9 +136,16 @@ static HRESULT STDMETHODCALLTYPE d3d11_query_SetPrivateDataInterface(ID3D11Query static UINT STDMETHODCALLTYPE d3d11_query_GetDataSize(ID3D11Query *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_query *query = impl_from_ID3D11Query(iface); + unsigned int data_size; - return 0; + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + data_size = wined3d_query_get_data_size(query->wined3d_query); + wined3d_mutex_unlock(); + + return data_size; } static void STDMETHODCALLTYPE d3d11_query_GetDesc(ID3D11Query *iface, D3D11_QUERY_DESC *desc)

1 0

Alistair Leslie-Hughes : inetcomm: Return S_OK from IMimeMessgae Commit.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: bf026723597747663ae3e872051a483bdf5b7c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf026723597747663ae3e8720… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 1 07:57:30 2016 +0000 inetcomm: Return S_OK from IMimeMessgae Commit. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index f98c2db..486ac57 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2077,7 +2077,7 @@ static HRESULT WINAPI MimeMessage_Commit( DWORD dwFlags) { FIXME("(%p)->(0x%x)\n", iface, dwFlags); - return E_NOTIMPL; + return S_OK; }

1 0

Alistair Leslie-Hughes : propsys: Support VT_LPWSTR in PropVariantChangeType.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 173515e7333e6c06405c2999f93825aa96c82452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=173515e7333e6c06405c2999f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 1 07:56:55 2016 +0000 propsys: Support VT_LPWSTR in PropVariantChangeType. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 14 ++++++++++++++ dlls/propsys/tests/propsys.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 7b1cec5..002555e 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -257,6 +257,9 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p FIXME("(%p, %p, %d, %d, %d): semi-stub!\n", ppropvarDest, propvarSrc, propvarSrc->vt, flags, vt); + if(vt == propvarSrc->vt) + return PropVariantCopy(ppropvarDest, propvarSrc); + switch (vt) { case VT_I2: @@ -325,6 +328,17 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p } return hr; } + case VT_LPWSTR: + { + WCHAR *res; + hr = PropVariantToStringAlloc(propvarSrc, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_LPWSTR; + ppropvarDest->u.pwszVal = res; + } + return hr; + } } switch (propvarSrc->vt) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index d7d83d8..b658678 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -891,6 +891,42 @@ static void test_intconversions(void) ok(llval == -7, "got wrong value %s\n", debugstr_longlong(llval)); } +static void test_PropVariantChangeType_LPWSTR(void) +{ + PROPVARIANT dest, src; + HRESULT hr; + + PropVariantInit(&dest); + + src.vt = VT_NULL; + hr = PropVariantChangeType(&dest, &src, 0, VT_LPWSTR); + ok(hr == S_OK, "hr=%x\n", hr); + ok(dest.vt == VT_LPWSTR, "got %d\n", dest.vt); + ok(!lstrcmpW(dest.u.pwszVal, emptyW), "got %s\n", wine_dbgstr_w(dest.u.pwszVal)); + PropVariantClear(&dest); + PropVariantClear(&src); + + src.vt = VT_LPSTR; + src.u.pszVal = CoTaskMemAlloc(strlen(topic)+1); + strcpy(src.u.pszVal, topic); + hr = PropVariantChangeType(&dest, &src, 0, VT_LPWSTR); + ok(hr == S_OK, "hr=%x\n", hr); + ok(dest.vt == VT_LPWSTR, "got %d\n", dest.vt); + ok(!lstrcmpW(dest.u.pwszVal, topicW), "got %s\n", wine_dbgstr_w(dest.u.pwszVal)); + PropVariantClear(&dest); + PropVariantClear(&src); + + src.vt = VT_LPWSTR; + src.u.pwszVal = CoTaskMemAlloc( (lstrlenW(topicW)+1) * sizeof(WCHAR)); + lstrcpyW(src.u.pwszVal, topicW); + hr = PropVariantChangeType(&dest, &src, 0, VT_LPWSTR); + ok(hr == S_OK, "hr=%x\n", hr); + ok(dest.vt == VT_LPWSTR, "got %d\n", dest.vt); + ok(!lstrcmpW(dest.u.pwszVal, topicW), "got %s\n", wine_dbgstr_w(dest.u.pwszVal)); + PropVariantClear(&dest); + PropVariantClear(&src); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -902,4 +938,5 @@ START_TEST(propsys) test_PropVariantToStringAlloc(); test_PropVariantCompare(); test_intconversions(); + test_PropVariantChangeType_LPWSTR(); }

1 0

Michael Stefaniuc : ole32: Avoid casts from the IMultiQI iface to the COM object.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 08e571cf95c50fe2be7d4ad07c3d288f014fbca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e571cf95c50fe2be7d4ad07… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 08:46:56 2016 +0200 ole32: Avoid casts from the IMultiQI iface to the COM object. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/marshal.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index e0a3c3d..b39dac0 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -73,6 +73,11 @@ struct proxy_manager void *dest_context_data; /* reserved context value (LOCK) */ }; +static inline struct proxy_manager *impl_from_IMultiQI( IMultiQI *iface ) +{ + return CONTAINING_RECORD(iface, struct proxy_manager, IMultiQI_iface); +} + static inline struct proxy_manager *impl_from_IMarshal( IMarshal *iface ) { return CONTAINING_RECORD(iface, struct proxy_manager, IMarshal_iface); @@ -231,16 +236,16 @@ static HRESULT WINAPI ClientIdentity_QueryInterface(IMultiQI * iface, REFIID rii return hr; } -static ULONG WINAPI ClientIdentity_AddRef(IMultiQI * iface) +static ULONG WINAPI ClientIdentity_AddRef(IMultiQI *iface) { - struct proxy_manager * This = (struct proxy_manager *)iface; + struct proxy_manager *This = impl_from_IMultiQI(iface); TRACE("%p - before %d\n", iface, This->refs); return InterlockedIncrement(&This->refs); } -static ULONG WINAPI ClientIdentity_Release(IMultiQI * iface) +static ULONG WINAPI ClientIdentity_Release(IMultiQI *iface) { - struct proxy_manager * This = (struct proxy_manager *)iface; + struct proxy_manager *This = impl_from_IMultiQI(iface); ULONG refs = InterlockedDecrement(&This->refs); TRACE("%p - after %d\n", iface, refs); if (!refs) @@ -250,7 +255,7 @@ static ULONG WINAPI ClientIdentity_Release(IMultiQI * iface) static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, ULONG cMQIs, MULTI_QI *pMQIs) { - struct proxy_manager * This = (struct proxy_manager *)iface; + struct proxy_manager *This = impl_from_IMultiQI(iface); REMQIRESULT *qiresults = NULL; ULONG nonlocal_mqis = 0; ULONG i;

1 0

Ken Thomases : winspool.drv: Include <cups/ppd.h> to fix building against the macOS 10.12 SDK.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 10065d2acd0a9e1e852a8151c95569b99d1b3294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10065d2acd0a9e1e852a8151c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 27 15:34:07 2016 -0500 winspool.drv: Include <cups/ppd.h> to fix building against the macOS 10.12 SDK. The cupsGetPPD() function was moved there from <cups/cups.h> because it's deprecated. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 12 ++++++++++++ configure.ac | 3 ++- dlls/winspool.drv/info.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 0e1694c..6379e31 100755 --- a/configure +++ b/configure @@ -13054,6 +13054,18 @@ _ACEOF CUPS_CFLAGS="$ac_cups_cflags" fi + for ac_header in cups/ppd.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "cups/ppd.h" "ac_cv_header_cups_ppd_h" "$ac_includes_default" +if test "x$ac_cv_header_cups_ppd_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_CUPS_PPD_H 1 +_ACEOF + +fi + +done + fi done diff --git a/configure.ac b/configure.ac index 7f234b2..e7c1dd1 100644 --- a/configure.ac +++ b/configure.ac @@ -1543,7 +1543,8 @@ then AC_CHECK_HEADERS(cups/cups.h, [WINE_CHECK_SONAME(cups,cupsGetDefault, [CUPS_CFLAGS="$ac_cups_cflags"],, - [$ac_cups_libs])]) + [$ac_cups_libs]) + AC_CHECK_HEADERS(cups/ppd.h)]) CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(cups,[test "x$ac_cv_lib_soname_cups" = "x"], diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 95f397c..4dea531 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -44,6 +44,9 @@ #ifdef HAVE_CUPS_CUPS_H # include <cups/cups.h> #endif +#ifdef HAVE_CUPS_PPD_H +# include <cups/ppd.h> +#endif #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H #define GetCurrentProcess GetCurrentProcess_Mac diff --git a/include/config.h.in b/include/config.h.in index 8cffef9..6fd84bf 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -89,6 +89,9 @@ /* Define to 1 if you have the <cups/cups.h> header file. */ #undef HAVE_CUPS_CUPS_H +/* Define to 1 if you have the <cups/ppd.h> header file. */ +#undef HAVE_CUPS_PPD_H + /* Define to 1 if you have the <curses.h> header file. */ #undef HAVE_CURSES_H

1 0

Józef Kucia : wined3d: Implement d3d11_immediate_context_Begin().
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: ed9b4ca3b7b04d3a47e149add50197a91d5a51df URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9b4ca3b7b04d3a47e149add… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 6 12:02:29 2016 +0200 wined3d: Implement d3d11_immediate_context_Begin(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 5 +++++ dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 10 +++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index c100e73..f91a053 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -171,6 +171,11 @@ struct d3d_query *unsafe_impl_from_ID3D11Query(ID3D11Query *iface) return CONTAINING_RECORD(iface, struct d3d_query, ID3D11Query_iface); } +struct d3d_query *unsafe_impl_from_ID3D11Asynchronous(ID3D11Asynchronous *iface) +{ + return unsafe_impl_from_ID3D11Query((ID3D11Query *)iface); +} + /* ID3D10Query methods */ static inline struct d3d_query *impl_from_ID3D10Query(ID3D10Query *iface) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 8fde578..6fd5210 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -464,6 +464,7 @@ HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc struct d3d_query **query) DECLSPEC_HIDDEN; struct d3d_query *unsafe_impl_from_ID3D11Query(ID3D11Query *iface) DECLSPEC_HIDDEN; struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; +struct d3d_query *unsafe_impl_from_ID3D11Asynchronous(ID3D11Asynchronous *iface) DECLSPEC_HIDDEN; /* ID3D11DeviceContext - immediate context */ struct d3d11_immediate_context diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2fa0f9d..ed902c7 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -492,7 +492,15 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_Begin(ID3D11DeviceContext *iface, ID3D11Asynchronous *asynchronous) { - FIXME("iface %p, asynchronous %p stub!\n", iface, asynchronous); + struct d3d_query *query = unsafe_impl_from_ID3D11Asynchronous(asynchronous); + HRESULT hr; + + TRACE("iface %p, asynchronous %p.\n", iface, asynchronous); + + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_BEGIN))) + ERR("Failed to issue query, hr %#x.\n", hr); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_End(ID3D11DeviceContext *iface,

1 0