wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Nikolay Sivov : include: Added IDWriteFontSetBuilder definition.
by Alexandre Julliard 06 Jul '16

06 Jul '16

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,… [View More]

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: c0da44ee3abc8784b9209b5a6d0d0073db1db208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0da44ee3abc8784b9209b5a6… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Jul 6 11:38:05 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 58 ++++++++++++++++++++++++++++++++++-------------------… [View More]----- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1985884..f8f9dcb 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-05-24 22:38+0300\n" +"PO-Revision-Date: 2016-07-06 11:31+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11925,50 +11925,60 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgstr "" +"Naudojimas:\n" +" regedit [parametrai] [failas] [reg_key]\n" +"\n" +"Parametrai:\n" +" [be parametro] Paleidžia šios programos grafinę versiją.\n" +" /L:system.dat Modifikuojamo system.dat failo vieta.\n" +" Suderinamas su bet kuriuo kitu parametru. Ignoruojamas.\n" +" /R:user.dat Modifikuojamo user.dat failo vieta.\n" +" Suderinamas su bet kuriuo kitu parametru. Ignoruojamas.\n" +" /C Importuoti registro failo turinį.\n" +" /D Pašalinti nurodytą registro raktą.\n" +" /E Eksportuoti nurodyto registro rakto turinį į failą.\n" +" Jei nenurodytas raktas, eksportuojamas visas registras.\n" +" /S Tyli veiksena. Nebus rodomi pranešimai.\n" +" /V Paleisti grafinę sąsają išplėstinėje veiksenoje. " +"Ignoruojamas.\n" +" /? Parodyti šią informaciją ir išeiti.\n" +" [failas] Failo su registro informacija importui vieta.\n" +" Kai naudojama su [/E], šis parametras nurodo\n" +" failo vietą registro informacijos eksportui.\n" +" [reg_key] Registro raktas modifikavimui.\n" +"\n" +"Naudojimo pavyzdžiai:\n" +" regedit \"importui.reg\"\n" +" regedit /E \"eksportuota.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" #: regedit.rc:360 -#, fuzzy -#| msgid "" -#| "regsvr32: Invalid or unrecognized switch [%1]\n" -#| "\n" msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" -"regsvr32: Netinkamas arba neatpažintas parametras [%1]\n" -"\n" +msgstr "regedit: Netinkamas arba neatpažintas parametras [%1]\n" #: regedit.rc:361 -#, fuzzy -#| msgid "Type \"REG /?\" for help.\n" msgid "Type \"regedit /?\" for help.\n" -msgstr "Pagalbai įrašykite „REG /?“.\n" +msgstr "Pagalbai įrašykite „regedit /?“.\n" #: regedit.rc:362 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "Nenurodyta jokia komanda." +msgstr "regedit: Nenurodytas joks failas.\n" #: regedit.rc:363 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: Nenurodytas registro raktas šalinimui.\n" #: regedit.rc:364 -#, fuzzy -#| msgid "uninstaller: The application with GUID '%1' was not found\n" msgid "regedit: The file '%1' was not found.\n" -msgstr "šalinimo programa: Programa su GUID „%1“ nerasta\n" +msgstr "regedit: Failas „%1“ nerastas.\n" #: regedit.rc:365 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "reg: Nepavyko prieiti prie nuotolinio kompiuterio\n" +msgstr "regedit: Nepavyko atverti failo „%1“.\n" #: regedit.rc:366 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "Neteisinga rodyklės operacija.\n" +msgstr "regedit: Neapdorojamas veiksmas.\n" #: regedit.rc:163 msgid "Quits the registry editor" [View Less]

1 0

Józef Kucia : d3d11/tests: Mention debug flags when device creation fails.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 5a53347747fda3410025e5a57700be203d717cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a53347747fda3410025e5a57… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 6 12:02:34 2016 +0200 d3d11/tests: Mention debug flags when device creation fails. 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.… [View More]

1 0

Józef Kucia : d3d11/tests: Port test_timestamp_query( ) from d3d9.
by Alexandre Julliard 06 Jul '16

06 Jul '16

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> --… [View More]- 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(); [View Less]

1 0

Józef Kucia : d3d11: Implement d3d11_query_GetDataSize().
by Alexandre Julliard 06 Jul '16

06 Jul '16

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> --- … [View More]

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_GetData().
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 882a8f2b18326704eec7d518aade37da198de635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=882a8f2b18326704eec7d518a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 6 12:02:31 2016 +0200 d3d11: Implement d3d11_immediate_context_GetData(). 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> --… [View More]- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 22 ++++++++++++++++++++-- dlls/d3d11/utils.c | 11 +++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 6fd5210..cdada42 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -57,6 +57,7 @@ const char *debug_float4(const float *values) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +unsigned int wined3d_getdata_flags_from_d3d11_async_getdata_flags(unsigned int d3d11_flags) DECLSPEC_HIDDEN; DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *resource) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8bf8f0c..e0e12a1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -520,10 +520,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_End(ID3D11DeviceContext *i static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetData(ID3D11DeviceContext *iface, ID3D11Asynchronous *asynchronous, void *data, UINT data_size, UINT data_flags) { - FIXME("iface %p, asynchronous %p, data %p, data_size %u, data_flags %#x stub!\n", + struct d3d_query *query = unsafe_impl_from_ID3D11Asynchronous(asynchronous); + unsigned int wined3d_flags; + HRESULT hr; + + TRACE("iface %p, asynchronous %p, data %p, data_size %u, data_flags %#x.\n", iface, asynchronous, data, data_size, data_flags); - return E_NOTIMPL; + wined3d_flags = wined3d_getdata_flags_from_d3d11_async_getdata_flags(data_flags); + + wined3d_mutex_lock(); + if (!data_size || wined3d_query_get_data_size(query->wined3d_query) == data_size) + { + hr = wined3d_query_get_data(query->wined3d_query, data, data_size, wined3d_flags); + } + else + { + WARN("Invalid data size %u.\n", data_size); + hr = E_INVALIDARG; + } + wined3d_mutex_unlock(); + + return hr; } static void STDMETHODCALLTYPE d3d11_immediate_context_SetPredication(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 7b08d13..36cad41 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -374,6 +374,17 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) } } +unsigned int wined3d_getdata_flags_from_d3d11_async_getdata_flags(unsigned int d3d11_flags) +{ + if (d3d11_flags & ~D3D11_ASYNC_GETDATA_DONOTFLUSH) + FIXME("Unhandled async getdata flags %#x.\n", d3d11_flags); + + if (d3d11_flags & D3D11_ASYNC_GETDATA_DONOTFLUSH) + return 0; + + return WINED3DGETDATA_FLUSH; +} + DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) { static const DWORD handled = D3D11_BIND_SHADER_RESOURCE [View Less]

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_End().
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 0f6c5444c5bb93a6dd42705a711ee99e90ed37f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f6c5444c5bb93a6dd42705a7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 6 12:02:30 2016 +0200 d3d11: Implement d3d11_immediate_context_End(). 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> --- … [View More]

1 0

Józef Kucia : wined3d: Implement d3d11_immediate_context_Begin().
by Alexandre Julliard 06 Jul '16

06 Jul '16

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> --… [View More]- 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, [View Less]

1 0

Andrey Gusev : wined3d: Fix a typo in comment.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 83f72793f06c3b539b80b346fbb39839423f38e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f72793f06c3b539b80b346f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jul 5 15:38:25 2016 +0300 wined3d: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/… [View More]

1 0

Alistair Leslie-Hughes : include: Complete IMimeAddressTable interface definition.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: b77aa5cafb81890833a4d09e35b30b07bdc69221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77aa5cafb81890833a4d09e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 1 07:58:00 2016 +0000 include: Complete IMimeAddressTable interface definition. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mimeole.idl | … [View More]94 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index 437781d..9b7826d 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -705,6 +705,22 @@ cpp_quote("#endif") AFT_RFC822_TRANSMIT, } ADDRESSFORMAT; + cpp_quote("#define IAT_UNKNOWN 0x00000000") + cpp_quote("#define IAT_FROM 0x00000001") + cpp_quote("#define IAT_SENDER 0x00000002") + cpp_quote("#define IAT_TO 0x00000004") + cpp_quote("#define IAT_CC 0x00000008") + cpp_quote("#define IAT_BCC 0x00000010") + cpp_quote("#define IAT_REPLYTO 0x00000020") + cpp_quote("#define IAT_RETURNPATH 0x00000040") + cpp_quote("#define IAT_RETRCPTTO 0x00000080") + cpp_quote("#define IAT_RR 0x00000100") + cpp_quote("#define IAT_APPARTO 0x00000200") + cpp_quote("#define IAT_DISP_NOTIFICATION_TO 0x00000400") + cpp_quote("#define IAT_ALL 0xffffffff") + cpp_quote("#define IAT_KNOWN (IAT_FROM | IAT_TO | IAT_CC | IAT_BCC | IAT_REPLYTO | IAT_SENDER)") + cpp_quote("#define IAT_RECIPS (IAT_TO | IAT_CC | IAT_BCC)") + typedef struct tagADDRESSPROPS { DWORD dwProps; @@ -723,13 +739,89 @@ cpp_quote("#endif") DWORD dwReserved2; } ADDRESSPROPS, *LPADDRESSPROPS; + cpp_quote("#define IAP_CHARSET 0x00000001") + cpp_quote("#define IAP_HANDLE 0x00000002") + cpp_quote("#define IAP_ADRTYPE 0x00000004") + cpp_quote("#define IAP_FRIENDLY 0x00000008") + cpp_quote("#define IAP_EMAIL 0x00000020") + cpp_quote("#define IAP_CERTSTATE 0x00000100") + cpp_quote("#define IAP_SIGNING_PRINT 0x00000200") + cpp_quote("#define IAP_ENCRYPTION_PRINT 0x00000400") + cpp_quote("#define IAP_ENCODING 0x00000800") + cpp_quote("#define IAP_COOKIE 0x00001000") + cpp_quote("#define IAP_FRIENDLYW 0x00002000") + cpp_quote("#define IAP_ALL 0xffffffff") + typedef struct tagADDRESSLIST { ULONG cAdrs; LPADDRESSPROPS prgAdr; } ADDRESSLIST, *LPADDRESSLIST; - /* FIXME: fill this in */ + HRESULT Append( + [in] DWORD addrtype, + [in] ENCODINGTYPE encoding, + [in] const char *friendly, + [in,unique] const char *email, + [in,out,unique] HADDRESS *address); + + HRESULT Insert( + [in] ADDRESSPROPS *addressprop, + [in,out,unique] HADDRESS *address); + + HRESULT SetProps( + [in] HADDRESS address, + [in] ADDRESSPROPS *addressprop); + + HRESULT GetProps( + [in] HADDRESS address, + [in] ADDRESSPROPS *addressprop); + + HRESULT GetSender( + [in,out] ADDRESSPROPS *addressprop); + + HRESULT CountTypes( + [in] DWORD addrtype, + [out] ULONG *count); + + HRESULT GetTypes( + [in] DWORD addrtype, + [in] DWORD dwProps, + [in,out] ADDRESSLIST *list); + + HRESULT EnumTypes( + [in] DWORD addrtype, + [in] DWORD props, + [out] IMimeEnumAddressTypes **types); + + HRESULT Delete( + [in] HADDRESS hAddress); + + HRESULT DeleteTypes( + [in] DWORD addrtype); + + HRESULT GetFormat( + [in] DWORD addrtype, + [in] ADDRESSFORMAT addrformat, + [out] char **format); + + HRESULT AppendRfc822( + [in] DWORD addrtype, + [in] ENCODINGTYPE encoding, + [in] const char *rfcaddr); + + HRESULT ParseRfc822( + [in] DWORD addrtype, + [in] ENCODINGTYPE encoding, + [in] const char *rfcaddr, + [in,out] ADDRESSLIST *list); + + HRESULT Clone( + [out] IMimeAddressTable **table); + + HRESULT BindToObject( + [in] REFIID riid, + [out, iid_is(riid)] void **obj); } [ [View Less]

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
68
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 2016